5 files changed, 10 insertions, 5 deletions
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 2603070589e8..0165cff1c5b8 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -24,6 +24,7 @@
 #include <limits.h>
 #include <algorithm>
 #include <ostream>
+#include <config_options.h>
 
 class SvStream;
 namespace rtl
@@ -67,7 +68,7 @@ inline bool equal(Pair const & p1, Pair const & p2)
 // Point
 
 class Size;
-class SAL_WARN_UNUSED SAL_DLLPUBLIC_EXPORT Point final : protected Pair
+class SAL_WARN_UNUSED UNLESS_MERGELIBS(SAL_DLLPUBLIC_EXPORT) Point final : protected Pair
 {
 public:
                         Point() {}
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index ed0e074fb167..dd8073d61937 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -28,6 +28,7 @@
 #include <vector>
 #include <map>
 #include <memory>
+#include <config_options.h>
 
 class DateTime;
 
@@ -70,7 +71,7 @@ enum class InetMessageMime
     NUMHDR                     = 4,
 };
 
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
+class SAL_WARN_UNUSED UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) INetMIMEMessage
 {
     ::std::vector< std::unique_ptr<INetMessageHeader> >
                     m_aHeaderList;
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index f85fc3436f09..50b0d25f4363 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -23,10 +23,11 @@
 #include <sal/types.h>
 #include <vector>
 #include <memory>
+#include <config_options.h>
 
 class INetMIMEMessage;
 
-class TOOLS_DLLPUBLIC INetMIMEMessageStream
+class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) INetMIMEMessageStream
 {
     INetMIMEMessage *pSourceMsg;
     bool            bHeaderGenerated;
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index ba4692f663e2..3fbf4afaa5b2 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_TOOLS_VCOMPAT_HXX
 
 #include <tools/toolsdllapi.h>
+#include <config_options.h>
 
 inline sal_uInt32 COMPAT_FORMAT( char char1, char char2, char char3, char char4 )
 {
@@ -33,7 +34,7 @@ inline sal_uInt32 COMPAT_FORMAT( char char1, char char2, char char3, char char4
 class SvStream;
 enum class StreamMode;
 
-class TOOLS_DLLPUBLIC VersionCompat
+class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) VersionCompat
 {
     SvStream*       mpRWStm;
     sal_uInt32      mnCompatPos;
diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h
index 458381e47fff..648e1b77e960 100644
--- a/include/tools/weakbase.h
+++ b/include/tools/weakbase.h
@@ -22,6 +22,7 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>
 #include <tools/toolsdllapi.h>
+#include <config_options.h>
 
 /** the template classes in this header are helper to implement weak references
     to implementation objects that are not refcounted.
@@ -123,7 +124,7 @@ private:
 };
 
 /** derive your implementation classes from this class if you want them to support weak references */
-class TOOLS_DLLPUBLIC WeakBase
+class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) WeakBase
 {
     template<typename T> friend class WeakReference;