10 files changed, 21 insertions, 12 deletions
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 45383bd6fb9d..715636147747 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -10,6 +10,7 @@
 #ifndef INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 
+#include <config_options.h>
 #include <epoxy/gl.h>
 #include <sal/detail/log.h>
 #include <vcl/dllapi.h>
@@ -42,7 +43,7 @@
     } while (false)
 
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
-struct VCL_DLLPUBLIC OpenGLHelper
+struct UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) OpenGLHelper
 {
     OpenGLHelper() = delete; // Should not be instantiated
 
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index f7db263d2eac..9ac3b334497e 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -39,7 +39,7 @@ class ToolBox;
 #define TAB_PAGE_NOTFOUND   (sal_uInt16(0xFFFF))
 #endif /* !TAB_APPEND */
 
-class VCL_DLLPUBLIC TabControl : public Control
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) TabControl : public Control
 {
 protected:
     std::unique_ptr<ImplTabCtrlData> mpTabCtrlData;
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx
index ca96bc8e5718..925afdf40225 100644
--- a/include/vcl/toolkit/ivctrl.hxx
+++ b/include/vcl/toolkit/ivctrl.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <memory>
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
@@ -174,7 +175,7 @@ public:
 
 class MnemonicGenerator;
 
-class VCL_DLLPUBLIC SvtIconChoiceCtrl final : public Control
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvtIconChoiceCtrl final : public Control
 {
     friend class SvxIconChoiceCtrl_Impl;
 
diff --git a/include/vcl/toolkit/scrbar.hxx b/include/vcl/toolkit/scrbar.hxx
index 30aa2e925404..408ca90d7483 100644
--- a/include/vcl/toolkit/scrbar.hxx
+++ b/include/vcl/toolkit/scrbar.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
 #include <vcl/scrollable.hxx>
@@ -30,7 +31,7 @@
 
 struct ImplScrollBarData;
 
-class VCL_DLLPUBLIC ScrollBar final : public Control
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) ScrollBar final : public Control
                               , public Scrollable
 {
 private:
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index 1fd7b8b16e12..94b0077f44fe 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <vcl/dllapi.h>
 #include <vcl/toolkit/treelistbox.hxx>
 #include <vcl/accessibletableprovider.hxx>
@@ -39,7 +40,7 @@ enum class SvTabJustify
     AdjustCenter = static_cast<int>(SvLBoxTabFlags::ADJUST_CENTER)
 };
 
-class VCL_DLLPUBLIC SvTabListBox : public SvTreeListBox
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvTabListBox : public SvTreeListBox
 {
 private:
     std::vector<SvLBoxTab>      mvTabList;
@@ -90,7 +91,7 @@ namespace vcl {
     struct SvHeaderTabListBoxImpl;
 }
 
-class VCL_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public vcl::IAccessibleTableProvider
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvHeaderTabListBox : public SvTabListBox, public vcl::IAccessibleTableProvider
 {
 private:
     bool                            m_bFirstPaint;
diff --git a/include/vcl/toolkit/treelist.hxx b/include/vcl/toolkit/treelist.hxx
index d0306ce915a0..0f33e95f9f27 100644
--- a/include/vcl/toolkit/treelist.hxx
+++ b/include/vcl/toolkit/treelist.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <vcl/dllapi.h>
 #include <vcl/toolkit/treelistentries.hxx>
 
@@ -61,7 +62,7 @@ struct SvSortData
     const SvTreeListEntry* pRight;
 };
 
-class VCL_DLLPUBLIC SvTreeList final
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvTreeList final
 {
     friend class        SvListView;
 
@@ -199,7 +200,7 @@ public:
     void                Resort();
 };
 
-class VCL_DLLPUBLIC SvListView
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvListView
 {
     friend class SvTreeList;
 
diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx
index dd5562ed13e5..7b452e0ae4bd 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <vcl/dllapi.h>
 
 #include <deque>
@@ -173,7 +174,7 @@ typedef std::pair<vcl::RenderContext&, const SvTreeListEntry&> svtree_measure_ar
 typedef std::tuple<vcl::RenderContext&, const tools::Rectangle&, const SvTreeListEntry&> svtree_render_args;
 typedef std::pair<SvTreeListEntry*, OUString> IterString;
 
-class VCL_DLLPUBLIC SvTreeListBox
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvTreeListBox
                 :public Control
                 ,public SvListView
                 ,public DropTargetHelper
diff --git a/include/vcl/toolkit/treelistentry.hxx b/include/vcl/toolkit/treelistentry.hxx
index b8bffecefd30..58228711c377 100644
--- a/include/vcl/toolkit/treelistentry.hxx
+++ b/include/vcl/toolkit/treelistentry.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <vcl/dllapi.h>
 #include <tools/color.hxx>
 #include <vcl/toolkit/treelistbox.hxx>
@@ -52,7 +53,7 @@ namespace o3tl
     template<> struct typed_flags<SvTLEntryFlags> : is_typed_flags<SvTLEntryFlags, 0x801f> {};
 }
 
-class VCL_DLLPUBLIC SvTreeListEntry
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvTreeListEntry
 {
     friend class SvTreeList;
     friend class SvListView;
diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
index 2ca010451907..fd17e75fb48d 100644
--- a/include/vcl/toolkit/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -23,6 +23,7 @@
 #error "don't use this in new code"
 #endif
 
+#include <config_options.h>
 #include <tools/lineend.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/toolkit/edit.hxx>
@@ -75,7 +76,7 @@ public:
     void            DisableSelectionOnFocus() { mbSelectOnTab = false; }
 };
 
-class VCL_DLLPUBLIC VclMultiLineEdit : public Edit
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) VclMultiLineEdit : public Edit
 {
     friend class VCLXAccessibleEdit;
 
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 186fbe1ad611..e32fbc0b7cde 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_TXTATTR_HXX
 #define INCLUDED_VCL_TXTATTR_HXX
 
+#include <config_options.h>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/fontenum.hxx>
@@ -74,7 +75,7 @@ public:
 
 };
 
-class VCL_DLLPUBLIC TextAttribFontWeight final : public TextAttrib
+class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) TextAttribFontWeight final : public TextAttrib
 {
 private:
     FontWeight  meWeight;