make some classes module-private

Change-Id: I95845d7217fc5e77e3f8e205030e9cd761ad0cc5
Reviewed-on: https://gerrit.libreoffice.org/82116
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

69 files changed, 98 insertions, 98 deletions

diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx
index f1e33434079d..d6b611da31f5 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -42,7 +42,7 @@ private:
     css::uno::Reference< css::frame::XModel > mxModel;
 };
 
-class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuard
+class ControllerLockGuard
 {
 public:
     explicit ControllerLockGuard( ChartModel& rModel );
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 9e6cfa35a430..085f348b61d4 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -44,7 +44,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory
     {}
 };
 
-class OOO_DLLPUBLIC_CHARTTOOLS SplitCategoriesProvider
+class SplitCategoriesProvider
 {
 public:
     virtual ~SplitCategoriesProvider();
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index 412e24c333cf..e20f00a1692d 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { template <class
 namespace chart
 {
 
-class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper
+class FormattedStringHelper
 {
 public:
     static css::uno::Sequence<
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 73d2b70cbbab..755227d30a9d 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -81,19 +81,19 @@ class CloseableLifeTimeManager final : public LifeTimeManager
     bool volatile       m_bOwnership;
 
 public:
-OOO_DLLPUBLIC_CHARTTOOLS    CloseableLifeTimeManager( css::util::XCloseable* pCloseable
+    CloseableLifeTimeManager( css::util::XCloseable* pCloseable
         , css::lang::XComponent* pComponent );
-OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager() override;
+    virtual ~CloseableLifeTimeManager() override;
 
-OOO_DLLPUBLIC_CHARTTOOLS    bool    impl_isDisposedOrClosed( bool bAssert=true );
+    bool    impl_isDisposedOrClosed( bool bAssert=true );
 /// @throws css::uno::Exception
-OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_startTryClose(bool bDeliverOwnership);
+    bool    g_close_startTryClose(bool bDeliverOwnership);
 /// @throws css::util::CloseVetoException
-OOO_DLLPUBLIC_CHARTTOOLS    void    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException const & ex );
-OOO_DLLPUBLIC_CHARTTOOLS    void    g_close_endTryClose(bool bDeliverOwnership );
-OOO_DLLPUBLIC_CHARTTOOLS    void    g_close_endTryClose_doClose();
+    void    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException const & ex );
+    void    g_close_endTryClose(bool bDeliverOwnership );
+    void    g_close_endTryClose_doClose();
 /// @throws css::uno::RuntimeException
-OOO_DLLPUBLIC_CHARTTOOLS    void    g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener );
+    void    g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener );
 
 private:
     virtual bool    impl_canStartApiCall() override;
@@ -165,7 +165,7 @@ your XComponent::dispose method has to be implemented in the following way:
 
 */
 
-class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeGuard
+class LifeTimeGuard
 {
 
 public:
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 48de142db752..4083edad9bc6 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -38,7 +38,7 @@ namespace chart
 namespace ModifyListenerHelper
 {
 
-OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder();
+css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder();
 
 /** This helper class serves as forwarder of modify events.  It can be used
     whenever an object has to send modify events after it gets a modify event of
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index 7170d96966e9..828ef6a3cc4d 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -51,7 +51,7 @@ private: //private member
     css::uno::Any m_aNullDate;
 };
 
-class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter final
+class FixedNumberFormatter final
 {
 public:
     FixedNumberFormatter( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier
diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx
index 36121f309aca..38671d3a441f 100644
--- a/chart2/source/inc/TrueGuard.hxx
+++ b/chart2/source/inc/TrueGuard.hxx
@@ -25,7 +25,7 @@ namespace chart
 {
 /** This guard sets the given boolean reference to true in the constructor and to false in the destructor
  */
-class OOO_DLLPUBLIC_CHARTTOOLS TrueGuard final
+class TrueGuard final
 {
 public:
     explicit TrueGuard( bool& rbTrueDuringGuardedTime );
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index e56d64d21dce..6e1f093025f4 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -52,7 +52,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData
     Date        NullDate;
 };
 
-struct OOO_DLLPUBLIC_CHARTVIEW ExplicitSubIncrement
+struct ExplicitSubIncrement
 {
     ExplicitSubIncrement();
 
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index 94b3a1c6b60b..2066d0a1b835 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -44,7 +44,7 @@ typedef css::uno::Sequence< css::uno::Any > tAnySequence;
  * shape objects (those whose service names begin with
  * com.sun.star.drawing.).
  */
-class OOO_DLLPUBLIC_CHARTTOOLS PropertyMapper
+class PropertyMapper
 {
 public:
     static void setMappedProperties(
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 6ce3f3052493..50c725258234 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -30,7 +30,7 @@ namespace connectivity
 {
     namespace mork
     {
-        class SAL_DLLPUBLIC_EXPORT OColumnAlias
+        class OColumnAlias
         {
         public:
             struct AliasEntry
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 7cd49f4bcf3a..5f0e728be354 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -34,7 +34,7 @@ namespace connectivity
 
     typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData>   ODatabaseMetaResultSetMetaData_BASE;
 
-    class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData :    public  ODatabaseMetaResultSetMetaData_BASE
+    class ODatabaseMetaDataResultSetMetaData :    public  ODatabaseMetaResultSetMetaData_BASE
     {
         std::map<sal_Int32,connectivity::OColumn> m_mColumns;
         std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter;
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index b338d34e2cfe..8df2c00d744f 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -60,7 +60,7 @@ struct OOO_DLLPUBLIC_DBTOOLS ParseError
     ParseError( const char* ) {}
 };
 
-class OOO_DLLPUBLIC_DBTOOLS FunctionParser
+class FunctionParser
 {
 public:
 
diff --git a/connectivity/source/inc/component/CColumns.hxx b/connectivity/source/inc/component/CColumns.hxx
index 99a18f1d21b9..2a37db2b56ee 100644
--- a/connectivity/source/inc/component/CColumns.hxx
+++ b/connectivity/source/inc/component/CColumns.hxx
@@ -27,7 +27,7 @@ namespace connectivity
     namespace component
     {
         /// Columns implementation for Writer tables and Calc sheets.
-        class OOO_DLLPUBLIC_FILE OComponentColumns : public file::OColumns
+        class OComponentColumns : public file::OColumns
         {
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
diff --git a/connectivity/source/inc/component/CResultSet.hxx b/connectivity/source/inc/component/CResultSet.hxx
index ca1423a9a969..e3abc8e78beb 100644
--- a/connectivity/source/inc/component/CResultSet.hxx
+++ b/connectivity/source/inc/component/CResultSet.hxx
@@ -37,7 +37,7 @@ namespace connectivity
 
 
         /// ResultSet implementation for Writer tables and Calc sheets.
-        class OOO_DLLPUBLIC_FILE OComponentResultSet : public OComponentResultSet_BASE2,
+        class OComponentResultSet : public OComponentResultSet_BASE2,
                                 public OComponentResultSet_BASE,
                                 public OComponentResultSet_BASE3
         {
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 85527e99c13c..bc519c79318f 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -36,7 +36,7 @@ namespace connectivity
 
         typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData>   OResultSetMetaData_BASE;
 
-        class OOO_DLLPUBLIC_FILE OResultSetMetaData :
+        class OResultSetMetaData :
             public  OResultSetMetaData_BASE
         {
             OUString     m_aTableName;
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index a2463870d1c9..f90613343bd4 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -28,7 +28,7 @@ namespace connectivity
     namespace file
     {
         class OConnection;
-        class OOO_DLLPUBLIC_FILE OSQLAnalyzer final
+        class OSQLAnalyzer final
         {
             typedef std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates;
 
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 77bc2a199ee1..06c8f544f819 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -73,7 +73,7 @@ namespace connectivity
 
         };
 
-        class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand
+        class OOperandRow : public OOperand
         {
             sal_uInt16  m_nRowPos;
             OValueRefRow    m_pRow;
@@ -88,7 +88,7 @@ namespace connectivity
         };
 
         // Attributes from a result row
-        class OOO_DLLPUBLIC_FILE OOperandAttr : public OOperandRow
+        class OOperandAttr : public OOperandRow
         {
         public:
             OOperandAttr(sal_uInt16 _nPos,
diff --git a/dbaccess/source/filter/hsqldb/alterparser.hxx b/dbaccess/source/filter/hsqldb/alterparser.hxx
index 6f2e3535307e..9b0fb011bb5c 100644
--- a/dbaccess/source/filter/hsqldb/alterparser.hxx
+++ b/dbaccess/source/filter/hsqldb/alterparser.hxx
@@ -21,7 +21,7 @@ enum class AlterAction
     IDENTITY_RESTART
 };
 
-class SAL_DLLPUBLIC_EXPORT AlterStmtParser
+class AlterStmtParser
 {
 private:
     OUString m_sStmt;
diff --git a/dbaccess/source/filter/hsqldb/fbalterparser.hxx b/dbaccess/source/filter/hsqldb/fbalterparser.hxx
index d8ede453c99c..e1546996ce8a 100644
--- a/dbaccess/source/filter/hsqldb/fbalterparser.hxx
+++ b/dbaccess/source/filter/hsqldb/fbalterparser.hxx
@@ -14,7 +14,7 @@
 
 namespace dbahsql
 {
-class SAL_DLLPUBLIC_EXPORT FbAlterStmtParser : public AlterStmtParser
+class FbAlterStmtParser : public AlterStmtParser
 {
 protected:
     void ensureProperTableLengths() const;
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 7a930d69eb5e..a41c8d1b4321 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -35,7 +35,7 @@ namespace basegfx
 
         @see B2ITuple
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple
+    class SAL_WARN_UNUSED B2IPoint : public ::basegfx::B2ITuple
     {
     public:
         /** Create a 2D Point
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index f32fa5ecc3d8..2bd2b47708e8 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -126,7 +126,7 @@ namespace comphelper
         calls which your derived class gets to the dispose method of this class.</p>
     */
 
-    class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 <   css::lang::XEventListener
+    class OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 <   css::lang::XEventListener
                                                                         >
                                             ,private OProxyAggregation
     {
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 7442ad1b0b8a..8e1aa77e19b3 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -114,7 +114,7 @@ namespace connectivity
         typedef sdbcx::OColumn OOrderColumn_BASE;
         typedef ::comphelper::OPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP;
 
-        class OOO_DLLPUBLIC_DBTOOLS OOrderColumn :
+        class OOrderColumn :
             public OOrderColumn_BASE, public OOrderColumn_PROP
         {
             const   bool        m_bAscending;
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index a17fa6a75ade..841a96222aa2 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -28,7 +28,7 @@ namespace dbtools
 
     //= OParameterContinuation
 
-    class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation final : public comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
+    class OParameterContinuation final : public comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
     {
         css::uno::Sequence< css::beans::PropertyValue >       m_aValues;
 
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index 452828f27039..de03af913e6b 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OIndexHelper final : public connectivity::sdbcx::OIndex
+    class OIndexHelper final : public connectivity::sdbcx::OIndex
     {
         OTableHelper*   m_pTable;
     public:
diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 8de56e7fc063..37eecea0497c 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OIndexHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OIndexColumns final : public sdbcx::OCollection
+    class OIndexColumns final : public sdbcx::OCollection
     {
         OIndexHelper* m_pIndex;
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index aecd75525343..131d1c7fcbee 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper final : public connectivity::sdbcx::OKey
+    class OTableKeyHelper final : public connectivity::sdbcx::OKey
     {
         OTableHelper*   m_pTable;
     public:
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index 13039cbd39d9..7d8b16489125 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableKeyHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper final : public connectivity::sdbcx::OCollection
+    class OKeyColumnsHelper final : public connectivity::sdbcx::OCollection
     {
         OTableKeyHelper* m_pKey;
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index f09e3049e4d8..32bf388e7bb3 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -29,7 +29,7 @@ namespace connectivity
 
     /** special node for avoiding memory leaks
     */
-    class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode final : public OSQLParseNode
+    class OSQLInternalNode final : public OSQLParseNode
     {
     public:
         OSQLInternalNode(const sal_Char* pNewValue,
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index 6eecf9459e22..b64c536fd61c 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -30,7 +30,7 @@ namespace connectivity
         class OKeyColumn;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP;
 
-        class OOO_DLLPUBLIC_DBTOOLS OKeyColumn :
+        class OKeyColumn :
             public OColumn, public OKeyColumn_PROP
         {
             OUString m_ReferencedColumn;
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 61c9ff5efc3b..99facc07da56 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -71,7 +71,7 @@ namespace connectivity
 
     //= SQLParseNodeParameter
 
-    struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter
+    struct SQLParseNodeParameter
     {
         const css::lang::Locale&                              rLocale;
         ::dbtools::DatabaseMetaData                           aMetaData;
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 0a0025644fc3..40b60ee07c6b 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -58,7 +58,7 @@ namespace connectivity
 
     //= OParseContext
 
-    class OOO_DLLPUBLIC_DBTOOLS OParseContext final : public IParseContext
+    class OParseContext final : public IParseContext
     {
     public:
         OParseContext();
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 2ceac71c9ec1..e09ede20ea8d 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -29,7 +29,7 @@ namespace connectivity
 
     /** Scanner for SQL92
     */
-    class OOO_DLLPUBLIC_DBTOOLS OSQLScanner
+    class OSQLScanner
     {
         const IParseContext*    m_pContext;                 // context for parse, knows all international stuff
         OString          m_sStatement;               // statement to parse
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 08f2b50a4789..0b50a51d2fdb 100644
--- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer
             Of course this is a primitive, so feel free to just ignore all that
             stuff and use the automatically generated decomposition. Sigh.
         */
-        class DRAWINGLAYER_DLLPUBLIC CropPrimitive2D final : public GroupPrimitive2D
+        class CropPrimitive2D final : public GroupPrimitive2D
         {
         private:
             // the transformation already applied to the child geometry
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index 4e0a34692f72..78f6a53f6158 100644
--- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
     namespace primitive2d
     {
         /** EpsPrimitive2D class */
-        class DRAWINGLAYER_DLLPUBLIC EpsPrimitive2D final : public BufferedDecompositionPrimitive2D
+        class EpsPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// the geometry definition
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index c721b2116f1f..4be6aaccc5c5 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -48,7 +48,7 @@ namespace drawinglayer
 
             The decomposition will deliver the hatch lines.
          */
-        class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometrically visible area
diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 1438f3437fd9..0915ef1a8aae 100644
--- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer
             should process it (Currently it is only used for grid visualisation,
             but this may change).
          */
-        class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D final : public BasePrimitive2D
+        class PointArrayPrimitive2D final : public BasePrimitive2D
         {
         private:
             /// the array of positions
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index d37a8eb6c25e..cda854fe144c 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -210,7 +210,7 @@ namespace drawinglayer
             This primitive defines a waveline based on a PolygonStrokePrimitive2D
             where the wave is defined by wave width and wave length.
          */
-        class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D
+        class PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D
         {
         private:
             /// wave definition
diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 274034bc1089..9c2d31160ac8 100644
--- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -306,7 +306,7 @@ namespace drawinglayer
             It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent
             decompositions allowing reduced color steps
          **/
-        class DRAWINGLAYER_DLLPUBLIC SvgLinearAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class SvgLinearAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometric definition in unit coordinates
@@ -350,7 +350,7 @@ namespace drawinglayer
             It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent
             decompositions allowing reduced color steps
          **/
-        class DRAWINGLAYER_DLLPUBLIC SvgRadialAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class SvgRadialAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometric definition in unit coordinates
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 1f57ec4a54e3..74ca61e23b8b 100644
--- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
             also be used for any other primitives) which have some TextEffect applied
             and create the needed geometry and embedding on decomposition.
         */
-        class DRAWINGLAYER_DLLPUBLIC TextEffectPrimitive2D final : public BufferedDecompositionPrimitive2D
+        class TextEffectPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// the text (or other) content
diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
index e092db8a2906..c9bf017a6589 100644
--- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextLinePrimitive2D final : public BufferedDecompositionPrimitive2D
+        class TextLinePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// geometric definitions
diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index 3247cfad3569..de0658910192 100644
--- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D
+        class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
             /// geometric definitions
@@ -67,7 +67,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
+        class TextCharacterStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
         {
         private:
             sal_Unicode                             maStrikeoutChar;
@@ -106,7 +106,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextGeometryStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
+        class TextGeometryStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
         {
         private:
             double                                  mfHeight;
diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index a9dd81dadac8..092337c3bf2c 100644
--- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer
             layouting which is dependent from WallpaperStyle; thus it does not need
             to be handled anywhere else in the future.
          */
-        class DRAWINGLAYER_DLLPUBLIC WallpaperBitmapPrimitive2D final : public ViewTransformationDependentPrimitive2D
+        class WallpaperBitmapPrimitive2D final : public ViewTransformationDependentPrimitive2D
         {
         private:
             basegfx::B2DRange                   maObjectRange;
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index 639e471cd1e8..a2526539da02 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -38,7 +38,7 @@ namespace accessibility {
     are all the specified property names and values that differ from the
     default values in the style.</p>
 */
-class SVX_DLLPUBLIC DescriptionGenerator
+class DescriptionGenerator
 {
 public:
     enum class PropertyType {
@@ -122,12 +122,12 @@ private:
 
     /** Add a property value formatted as color to the description string.
     */
-    SVX_DLLPRIVATE void AddColor (const OUString& sPropertyName,
+    void AddColor (const OUString& sPropertyName,
         const OUString& sLocalizedName);
 
     /** Add a property value formatted as integer to the description string.
     */
-    SVX_DLLPRIVATE void AddInteger (const OUString& sPropertyName,
+    void AddInteger (const OUString& sPropertyName,
         const OUString& sLocalizedName);
 };
 
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 08f7c866aa4d..b985b3a728ac 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -110,7 +110,7 @@ public:
 
 class ImpXPolyPolygon;
 
-class SVX_DLLPUBLIC XPolyPolygon final
+class XPolyPolygon final
 {
     o3tl::cow_wrapper< ImpXPolyPolygon > pImpXPolyPolygon;
 
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index f1446b9e215a..a7ec8c67cc27 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -30,7 +30,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC XOutdevItemPool : public SfxItemPool
+class XOutdevItemPool : public SfxItemPool
 {
 protected:
     std::vector<SfxPoolItem*>*     mpLocalPoolDefaults;
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 3240dac27e99..9550d8b48c02 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -31,7 +31,7 @@
 //  class VCLXContainer
 
 
-class TOOLKIT_DLLPUBLIC VCLXContainer : public css::awt::XVclContainer,
+class VCLXContainer : public css::awt::XVclContainer,
                         public css::awt::XVclContainerPeer,
                         public VCLXWindow
 {
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index 186cb7b915b6..04e65d1b5df6 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -26,7 +26,7 @@
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
+class VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
                                                     public VCLXWindow
 {
 public:
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 08777e280cee..188f128f793e 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -35,7 +35,7 @@ typedef ::cppu::ImplHelper1 <   css::awt::XTopWindow2
 typedef ::cppu::ImplHelper1 <   css::awt::XSystemDependentWindowPeer
                             >   VCLXTopWindow_SBase;
 
-class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base  :public VCLXTopWindow_XBase
+class VCLXTopWindow_Base  :public VCLXTopWindow_XBase
                                             ,public VCLXTopWindow_SBase
 {
 protected:
@@ -75,7 +75,7 @@ public:
 //  class VCLXTopWindow
 
 
-class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base,
+class VCLXTopWindow: public VCLXTopWindow_Base,
                      public VCLXContainer
 {
 protected:
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 0a5d0a7b79b2..ab3d0a4ec53a 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -66,7 +66,7 @@ class TabPage;
 //    deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model
 
 
-class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow
+class VCLXGraphicControl : public VCLXWindow
 {
 private:
     /// the image we currently display
@@ -350,7 +350,7 @@ public:
 
 //  class VCLXDialog
 
-class TOOLKIT_DLLPUBLIC VCLXDialog final : public css::awt::XDialog2,
+class VCLXDialog final : public css::awt::XDialog2,
                     public VCLXTopWindow
 {
 public:
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 0bed25484bee..6c1dc600a7ea 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -30,7 +30,7 @@
 //  class UnoControlBase
 
 
-class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
+class UnoControlBase : public UnoControl
 {
 protected:
     UnoControlBase() :UnoControl() {}
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index f171a59c364b..34dbb3ce277e 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -57,7 +57,7 @@ typedef ::cppu::WeakAggImplHelper7  <   css::awt::XControlModel
                                     ,   css::util::XCloneable
                                     >   UnoControlModel_Base;
 
-class TOOLKIT_DLLPUBLIC UnoControlModel :public UnoControlModel_Base
+class UnoControlModel :public UnoControlModel_Base
                                         ,public MutexAndBroadcastHelper
                                         ,public ::cppu::OPropertySetHelper
 {
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index c3c16b2fe6c4..4bf493915b2d 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -738,7 +738,7 @@ struct UnoControlListBoxModel_Data;
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
                                             ,   css::awt::XItemList
                                             >   UnoControlListBoxModel_Base;
-class TOOLKIT_DLLPUBLIC UnoControlListBoxModel : public UnoControlListBoxModel_Base
+class UnoControlListBoxModel : public UnoControlListBoxModel_Base
 {
 protected:
     enum ConstructorMode
@@ -845,7 +845,7 @@ typedef ::cppu::AggImplInheritanceHelper5   <   UnoControlBase
                                             ,   css::awt::XTextLayoutConstrains
                                             ,   css::awt::XItemListListener
                                             >   UnoListBoxControl_Base;
-class TOOLKIT_DLLPUBLIC UnoListBoxControl final : public UnoListBoxControl_Base
+class UnoListBoxControl final : public UnoListBoxControl_Base
 {
 public:
                         UnoListBoxControl();
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 57ca15260f05..f60014bb315d 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -370,7 +370,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclPaned : public VclContainer
+class VclPaned : public VclContainer
 {
 protected:
     VclPtr<Splitter> m_pSplitter;
@@ -384,7 +384,7 @@ public:
     void set_position(long nPosition) { m_nPosition = nPosition; }
 };
 
-class VCL_DLLPUBLIC VclVPaned final : public VclPaned
+class VclVPaned final : public VclPaned
 {
 private:
     DECL_LINK(SplitHdl, Splitter*, void);
@@ -396,7 +396,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclHPaned final : public VclPaned
+class VclHPaned final : public VclPaned
 {
 private:
     DECL_LINK(SplitHdl, Splitter*, void);
@@ -408,7 +408,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclFrame final : public VclBin
+class VclFrame final : public VclBin
 {
 private:
     VclPtr<vcl::Window> m_pLabel;
@@ -458,7 +458,7 @@ private:
     sal_Int32 m_nTopPadding;
 };
 
-class VCL_DLLPUBLIC VclExpander final : public VclBin
+class VclExpander final : public VclBin
 {
 public:
     VclExpander(vcl::Window *pParent)
@@ -494,7 +494,7 @@ private:
     bool m_bResizeTopLevel;
     VclPtr<DisclosureButton> m_pDisclosureButton;
     Link<VclExpander&,void> maExpandedHdl;
-    DECL_DLLPRIVATE_LINK(ClickHdl, CheckBox&, void);
+    DECL_LINK(ClickHdl, CheckBox&, void);
 };
 
 class VCL_DLLPUBLIC VclScrolledWindow final : public VclBin
@@ -526,7 +526,7 @@ private:
     VclPtr<ScrollBarBox> m_aScrollBarBox;
 };
 
-class VCL_DLLPUBLIC VclViewport final : public VclBin
+class VclViewport final : public VclBin
 {
 public:
     VclViewport(vcl::Window *pParent)
@@ -544,7 +544,7 @@ private:
 //
 //by default the Commands are discarded, inherit from this
 //and implement "Command" to get them
-class VCL_DLLPUBLIC VclEventBox final : public VclBin
+class VclEventBox final : public VclBin
 {
 private:
     //Any Commands an EventBoxHelper receives are forwarded to its parent
@@ -585,7 +585,7 @@ public:
     virtual void Command(const CommandEvent& rCEvt) override;
 };
 
-class VCL_DLLPUBLIC VclSizeGroup
+class VclSizeGroup
 {
 private:
     std::set< VclPtr<vcl::Window> > m_aWindows;
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 4ae64ace4602..f396b94c5f52 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -450,7 +450,7 @@ class SAL_DLLPUBLIC_RTTI SpinbuttonValue final : public ImplControlValue
  *
  *  Value container for toolbars detailing the grip position
  */
-class VCL_DLLPUBLIC ToolbarValue final : public ImplControlValue
+class ToolbarValue final : public ImplControlValue
 {
 public:
     ToolbarValue() : ImplControlValue( ControlType::Toolbar, 0 )
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 9afbdbc5a3b4..f33fc5a29b89 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -406,7 +406,7 @@ private:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC TreeListUIObject final : public WindowUIObject
+class TreeListUIObject final : public WindowUIObject
 {
 public:
     TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList);
@@ -429,7 +429,7 @@ private:
     VclPtr<SvTreeListBox> mxTreeList;
 };
 
-class UITEST_DLLPUBLIC TreeListEntryUIObject final : public UIObject
+class TreeListEntryUIObject final : public UIObject
 {
 public:
 
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 14356b5b7487..12c7f7361366 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -23,7 +23,7 @@ namespace com { namespace sun { namespace star { namespace uno { template <typen
 
 class UIObject;
 
-class UITEST_DLLPUBLIC UITest
+class UITest
 {
 public:
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 13270c1258a8..38d1026706bc 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -228,7 +228,7 @@ public:
 /// RotateFlyFrame3: Helper class when you want to make your SwFrame derivate
 /// transformable. It provides some tooling to do so. To use, add as member
 /// (see e.g. SwFlyFreeFrame which uses 'std::unique_ptr< TransformableSwFrame >')
-class SW_DLLPUBLIC TransformableSwFrame
+class TransformableSwFrame
 {
 private:
     // The SwFrameAreaDefinition to work on
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e0976ce43803..eeb6fd480fce 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4478,7 +4478,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class SW_DLLPUBLIC SwBorderRectanglePrimitive2D : public BufferedDecompositionPrimitive2D
+        class SwBorderRectanglePrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
             /// the transformation defining the geometry of this BorderRectangle
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 99884d843243..420314e97640 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -29,7 +29,7 @@
 
 //  class UnoPropertyArrayHelper
 
-class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper final : public ::cppu::IPropertyArrayHelper
+class UnoPropertyArrayHelper final : public ::cppu::IPropertyArrayHelper
 {
     std::set<sal_Int32>       maIDs;
 
diff --git a/vcl/inc/TypeSerializer.hxx b/vcl/inc/TypeSerializer.hxx
index 45f7219300d6..861da5681178 100644
--- a/vcl/inc/TypeSerializer.hxx
+++ b/vcl/inc/TypeSerializer.hxx
@@ -24,7 +24,7 @@
 #include <tools/GenericTypeSerializer.hxx>
 #include <vcl/gradient.hxx>
 
-class VCL_DLLPUBLIC TypeSerializer : public tools::GenericTypeSerializer
+class TypeSerializer : public tools::GenericTypeSerializer
 {
 public:
     TypeSerializer(SvStream& rStream);
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index 6ecaf3f62f05..a35b833004c2 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -19,7 +19,7 @@
 
 struct TextureCombo;
 
-class VCL_PLUGIN_PUBLIC X11OpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl, public X11GraphicsImpl
+class X11OpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl, public X11GraphicsImpl
 {
 private:
     X11SalGraphics&     mrX11Parent;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 72283421d224..78b9c9c7a09c 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -34,7 +34,7 @@ class   ImplSalDDB;
 class   ImplSalBitmapCache;
 
 
-class VCLPLUG_GEN_PUBLIC X11SalBitmap final : public SalBitmap
+class X11SalBitmap final : public SalBitmap
 {
 private:
 
@@ -74,7 +74,7 @@ private:
 
 public:
 
-    SAL_DLLPRIVATE bool         ImplCreateFromDrawable(
+    bool         ImplCreateFromDrawable(
                                     Drawable aDrawable,
                                     SalX11Screen nXScreen,
                                     long nDrawableDepth,
@@ -84,14 +84,14 @@ public:
                                     long nHeight
                                 );
 
-    SAL_DLLPRIVATE XImage*      ImplCreateXImage(
+    XImage*      ImplCreateXImage(
                                     SalDisplay const * pSalDisp,
                                     SalX11Screen nXScreen,
                                     long nDepth,
                                     const SalTwoRect& rTwoRect
                                 ) const;
 
-    SAL_DLLPRIVATE ImplSalDDB*  ImplGetDDB(
+    ImplSalDDB*  ImplGetDDB(
                                     Drawable,
                                     SalX11Screen nXScreen,
                                     long nDrawableDepth,
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 14cf63473215..58dd1b26fbfa 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -30,7 +30,7 @@ class SalXLib;
 class SalDisplay;
 class SalPrinter;
 
-class VCLPLUG_GEN_PUBLIC X11SalData : public GenericUnixSalData
+class X11SalData : public GenericUnixSalData
 {
     struct XErrorStackEntry
     {
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index c511097d0c57..4bc756a01639 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -58,7 +58,7 @@ enum class WMWindowType
     Dock
 };
 
-class VCLPLUG_GEN_PUBLIC X11SalFrame final : public SalFrame, public NativeWindowHandleProvider
+class X11SalFrame final : public SalFrame, public NativeWindowHandleProvider
 {
     friend class vcl_sal::WMAdaptor;
     friend class vcl_sal::NetWMAdaptor;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index d2bbeeb128af..11996ef88210 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -61,7 +61,7 @@ namespace basegfx {
     class B2DTrapezoid;
 }
 
-class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
+class X11SalGraphics : public SalGraphics
 {
     friend class X11SalGraphicsImpl;
     friend class X11OpenGLSalGraphicsImpl;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index bd28d6895f78..1b4b6c1af6f8 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -34,7 +34,7 @@ class SalXLib;
 class X11SalGraphics;
 class SalX11Display;
 
-class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance
+class X11SalInstance : public SalGenericInstance
 {
 private:
     std::unordered_map< Atom, css::uno::Reference< css::datatransfer::clipboard::XClipboard > > m_aInstances;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index a07a8453d3b7..fc6609309285 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -53,7 +53,7 @@ private:
     int         maxClipRectangles;
 };
 
-class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
+class X11SalObject : public SalObject
 {
 public:
     SystemEnvData maSystemChildData;
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 085a36d7718f..3a25e71a315a 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -23,7 +23,7 @@
 #include <unx/gensys.h>
 #include <vclpluginapi.h>
 
-class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem
+class X11SalSystem : public SalGenericSystem
 {
 public:
     X11SalSystem() {}
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 43815a224ff8..d17e2f49ccc6 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -28,7 +28,7 @@
 #include <libxml/tree.h>
 #include <xsecxmlsecdllapi.h>
 
-class XSECXMLSEC_DLLPUBLIC XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper
+class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper
 <
     css::xml::wrapper::XXMLElementWrapper,
     css::lang::XUnoTunnel,