1151 files changed, 6970 insertions, 252 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index b7e28dc15c6d..3a2c0256a06a 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -101,6 +101,8 @@ using namespace ::com::sun::star::animations::AnimationNodeType;
 namespace animcore
 {
 
+namespace {
+
 class AnimationNodeBase :   public XAnimateMotion,
                             public XAnimateColor,
                             public XTransitionFilter,
@@ -365,6 +367,8 @@ private:
     Mutex                   maMutex;
 };
 
+}
+
 TimeContainerEnumeration::TimeContainerEnumeration( const std::vector< Reference< XAnimationNode > > &rChildren )
 : maChildren( rChildren )
 {
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 6bf425a65c8b..25633088e9eb 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1670,6 +1670,8 @@ void WatchWindow::Resize()
     Invalidate();
 }
 
+namespace {
+
 struct WatchItem
 {
     OUString        maName;
@@ -1700,6 +1702,8 @@ struct WatchItem
     SbxDimArray* GetRootArray();
 };
 
+}
+
 WatchItem* WatchItem::GetRootItem()
 {
     WatchItem* pItem = mpArrayParentItem;
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index f495e362a371..4e59686119bd 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -789,6 +789,7 @@ static std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq
     return avRet;
 }
 
+namespace {
 
 class NameClashQueryBox
 {
@@ -827,6 +828,8 @@ public:
     short run() { return m_xQueryBox->run(); }
 };
 
+}
+
 bool implImportDialog(weld::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName)
 {
     bool bDone = false;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 34db6905702f..0783d697b1ba 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -970,6 +970,8 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
 
 // Implementation XCommandEnvironment
 
+namespace {
+
 class OLibCommandEnvironment : public cppu::WeakImplHelper< XCommandEnvironment >
 {
     Reference< task::XInteractionHandler > mxInteraction;
@@ -984,6 +986,8 @@ public:
     virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
 };
 
+}
+
 Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler()
 {
     return mxInteraction;
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 87343028ecfe..4cf280cd5b91 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -29,6 +29,8 @@
 #include <memory>
 #include <vector>
 
+namespace {
+
 struct CoordinateData2D : public basegfx::B2DPoint
 {
 public:
@@ -552,6 +554,8 @@ public:
     }
 };
 
+}
+
 class ImplB2DPolygon
 {
 private:
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 9d672b4397c0..043f2c9bdfe3 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -510,6 +510,8 @@ namespace basegfx
             return aRetval;
         }
 
+        namespace {
+
         /*
         * let a plane be defined as
         *
@@ -536,6 +538,8 @@ namespace basegfx
             sal_uInt32 clipmask;    // clipping mask, e.g. 1000 1000
         };
 
+        }
+
         /*
         *
         * polygon clipping rules  (straight out of Foley and Van Dam)
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index ec3d037e6aa8..8bba58f8106e 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -36,6 +36,8 @@ namespace basegfx
         // class for this since holding the pointers is more effective and also can be
         // used as baseclass for the traversing edges
 
+        namespace {
+
         class TrDeSimpleEdge
         {
         protected:
@@ -58,6 +60,8 @@ namespace basegfx
             const B2DPoint& getEnd() const { return *mpEnd; }
         };
 
+        }
+
         // define vector of simple edges
 
         typedef std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
@@ -67,6 +71,8 @@ namespace basegfx
         // hold and used in SortValue to allow sorting traversing edges by Y, X and slope
         // (in that order)
 
+        namespace {
+
         class TrDeEdgeEntry : public TrDeSimpleEdge
         {
         private:
@@ -179,6 +185,8 @@ namespace basegfx
             }
         };
 
+        }
+
         // define double linked list of edges (for fast random insert)
 
         typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries;
@@ -192,6 +200,8 @@ namespace basegfx
     {
         // FIXME: templatize this and use it for TrDeEdgeEntries too ...
 
+        namespace {
+
         /// Class to allow efficient allocation and release of B2DPoints
         class PointBlockAllocator
         {
@@ -883,6 +893,8 @@ namespace basegfx
                 }
             }
         };
+
+        }
     } // end of anonymous namespace
 } // end of namespace basegfx
 
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 5d23be90562c..422353fba8ad 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -27,6 +27,8 @@
 #include <vector>
 #include <algorithm>
 
+namespace {
+
 class CoordinateData3D
 {
     basegfx::B3DPoint                               maPoint;
@@ -672,6 +674,8 @@ public:
     }
 };
 
+}
+
 class ImplB3DPolygon
 {
     // The point vector. This vector exists always and defines the
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index edc73fed8c4a..296e59327d8f 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -64,10 +64,16 @@ namespace basic
 
     typedef std::vector< BasicManagerCreationListener* >  CreationListeners;
 
+    namespace {
+
+    struct CreateImplRepository;
+
+    }
+
     class ImplRepository : public ::utl::OEventListenerAdapter, public SfxListener
     {
     private:
-        friend struct CreateImplRepository;
+        friend CreateImplRepository;
         ImplRepository();
 
     private:
@@ -192,6 +198,7 @@ namespace basic
         StarBASIC* impl_getDefaultAppBasicLibrary();
     };
 
+    namespace {
 
     struct CreateImplRepository
     {
@@ -202,6 +209,7 @@ namespace basic
         }
     };
 
+    }
 
     ImplRepository::ImplRepository()
     {
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 46fa3740777a..8adc59a9e874 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1586,6 +1586,7 @@ ErrCode BasicManager::ExecuteMacro( OUString const& i_fullyQualifiedName, OUStri
     return SbxBase::GetError();
 }
 
+namespace {
 
 class ModuleInfo_Impl : public ModuleInfoHelper
 {
@@ -1692,6 +1693,8 @@ public:
     virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
+}
+
 // Methods XElementAccess
 uno::Type ModuleContainer_Impl::getElementType()
 {
@@ -1794,6 +1797,7 @@ static SbxObject* implCreateDialog( const uno::Sequence< sal_Int8 >& aData )
 // which we can't include here, we have to use the value directly
 #define SBXID_DIALOG        101
 
+namespace {
 
 class DialogContainer_Impl : public NameContainerHelper
 {
@@ -1820,6 +1824,8 @@ public:
     virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
+}
+
 // Methods XElementAccess
 uno::Type DialogContainer_Impl::getElementType()
 {
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3ee34bc7e2fb..00454a759ef0 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -268,6 +268,8 @@ SbxVariable* StarBASIC::VBAFind( const OUString& rName, SbxClassType t )
     return nullptr;
 }
 
+namespace {
+
 // Create array for conversion SFX <-> VB error code
 struct SFX_VB_ErrorItem
 {
@@ -275,6 +277,8 @@ struct SFX_VB_ErrorItem
     ErrCode nErrorSFX;
 };
 
+}
+
 const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
 {
     { 1, ERRCODE_BASIC_EXCEPTION },  // #87844 Map exception to error code 1
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 8fbb3dd66c03..c8d9b7ec16fb 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -433,6 +433,8 @@ static void implHandleAnyException( const Any& _rCaughtException )
     }
 }
 
+namespace {
+
 // NativeObjectWrapper handling
 struct ObjectItem
 {
@@ -443,9 +445,16 @@ struct ObjectItem
     {}
 };
 
+}
+
 typedef std::vector< ObjectItem > NativeObjectWrapperVector;
+
+namespace {
+
 class GaNativeObjectWrapperVector : public rtl::Static<NativeObjectWrapperVector, GaNativeObjectWrapperVector> {};
 
+}
+
 void clearNativeObjectWrapperVector()
 {
     GaNativeObjectWrapperVector::get().clear();
@@ -3770,6 +3779,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     }
 }
 
+namespace {
 
 // Implementation of an EventAttacher-drawn AllListener, which
 // solely transmits several events to a general AllListener
@@ -3791,6 +3801,7 @@ public:
     virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
+}
 
 BasicAllListener_Impl::BasicAllListener_Impl(const OUString& aPrefixName_)
     : aPrefixName( aPrefixName_ )
@@ -3872,6 +3883,8 @@ void BasicAllListener_Impl ::disposing(const EventObject& )
 //  class InvocationToAllListenerMapper
 //  helper class to map XInvocation to XAllListener (also in project eventattacher!)
 
+namespace {
+
 class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation >
 {
 public:
@@ -3892,6 +3905,7 @@ private:
     Any                          m_Helper;
 };
 
+}
 
 // Function to replace AllListenerAdapterService::createAllListerAdapter
 static Reference< XInterface > createAllListenerAdapter
@@ -4158,6 +4172,7 @@ void RTL_Impl_CreateUnoValue( SbxArray& rPar )
     refVar->PutObject( xUnoAnyObject.get() );
 }
 
+namespace {
 
 class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
 {
@@ -4189,6 +4204,8 @@ public:
     virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
 };
 
+}
+
 ModuleInvocationProxy::ModuleInvocationProxy( OUString const & aPrefix, SbxObjectRef const & xScopeObj )
     : m_aMutex()
     , m_aPrefix( aPrefix + "_" )
@@ -4400,6 +4417,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const OUStrin
 
 typedef std::vector< WeakReference< XComponent > >  ComponentRefVector;
 
+namespace {
+
 struct StarBasicDisposeItem
 {
     StarBASIC*              m_pBasic;
@@ -4413,6 +4432,8 @@ struct StarBasicDisposeItem
     }
 };
 
+}
+
 typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
 
 static DisposeItemVector GaDisposeItemVector;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c837105a4dfe..f288f0ec99ae 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -83,6 +83,8 @@ using namespace com::sun::star::uno;
 typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE;
 typedef std::map< sal_Int16, Any > OutParamMap;
 
+namespace {
+
 class DocObjectWrapper : public DocObjectWrapper_BASE
 {
     Reference< XAggregation >  m_xAggProxy;
@@ -115,6 +117,8 @@ public:
     virtual Sequence< Type > SAL_CALL getTypes() override;
 };
 
+}
+
 DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
 {
     SbObjModule* pMod = dynamic_cast<SbObjModule*>( pVar );
@@ -1674,6 +1678,8 @@ bool SbModule::ExceedsLegacyModuleSize()
     return pImage && pImage->ExceedsLegacyLimits();
 }
 
+namespace {
+
 class ErrorHdlResetter
 {
     Link<StarBASIC*,bool> mErrHandler;
@@ -1695,6 +1701,8 @@ public:
     bool HasError() const { return mbError; }
 };
 
+}
+
 IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
     mbError = true;
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index bebedd8f852d..569824648fc1 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -386,6 +386,8 @@ void SbiCodeGen::Save()
     rMod.EndDefinitions();
 }
 
+namespace {
+
 template < class T >
 class PCodeVisitor
 {
@@ -399,9 +401,13 @@ public:
     virtual bool processParams() = 0;
 };
 
+}
+
 template <class T> PCodeVisitor< T >::~PCodeVisitor()
 {}
 
+namespace {
+
 template <class T>
 class PCodeBufferWalker
 {
@@ -544,6 +550,8 @@ public:
     }
 };
 
+}
+
 sal_uInt32
 SbiCodeGen::calcNewOffSet( sal_uInt8 const * pCode, sal_uInt16 nOffset )
 {
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 01da0420fd5e..d1ebb48c4c09 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -25,11 +25,15 @@
 
 // Transform table for token operators and opcodes
 
+namespace {
+
 struct OpTable {
         SbiToken  eTok;                 // Token
         SbiOpcode eOp;                  // Opcode
 };
 
+}
+
 static const OpTable aOpTable [] = {
     { EXPON,SbiOpcode::EXP_ },
     { MUL,  SbiOpcode::MUL_ },
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1de38c9c8541..45cf7e358fe6 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -33,6 +33,8 @@ struct SbiParseStack {              // "Stack" for statement-blocks
     sal_uInt32  nChain;                 // JUMP-Chain
 };
 
+namespace {
+
 struct SbiStatement {
     SbiToken eTok;
     void( SbiParser::*Func )();
@@ -40,6 +42,8 @@ struct SbiStatement {
     bool  bSubr;                    // true: OK inside the SUB
 };
 
+}
+
 #define Y   true
 #define N   false
 
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 2e0141827858..92fabfe98ddd 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -26,8 +26,12 @@
 #include <basiccharclass.hxx>
 #include <token.hxx>
 
+namespace {
+
 struct TokenTable { SbiToken t; const char *s; };
 
+}
+
 static const TokenTable aTokTable_Basic [] = {
     { CAT,      "&" },
     { MUL,      "*" },
@@ -174,6 +178,8 @@ static const TokenTable aTokTable_Basic [] = {
     { XOR,      "Xor" },
 };
 
+namespace {
+
 // #i109076
 class TokenLabelInfo
 {
@@ -188,6 +194,8 @@ public:
 
 class StaticTokenLabelInfo: public ::rtl::Static< TokenLabelInfo, StaticTokenLabelInfo >{};
 
+}
+
 // #i109076
 TokenLabelInfo::TokenLabelInfo()
 {
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 24a71850607b..296063d9534e 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -25,6 +25,8 @@
 #include <rtlproto.hxx>
 #include <memory>
 
+namespace {
+
 class SvRTLInputBox : public weld::GenericDialogController
 {
     std::unique_ptr<weld::Entry> m_xEdit;
@@ -45,6 +47,8 @@ public:
     OUString const & GetText() const { return m_aText; }
 };
 
+}
+
 SvRTLInputBox::SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt,
         const OUString& rTitle, const OUString& rDefault,
         long nXTwips, long nYTwips)
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e58c0a060df2..533ee4f4d6a4 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -47,6 +47,7 @@ using namespace com::sun::star::bridge;
 
 #include <iosys.hxx>
 
+namespace {
 
 class SbiInputDialog : public weld::GenericDialogController
 {
@@ -62,6 +63,8 @@ public:
     const OUString& GetInput() const { return m_aText; }
 };
 
+}
+
 SbiInputDialog::SbiInputDialog(weld::Window* pParent, const OUString& rPrompt)
     : GenericDialogController(pParent, "svt/ui/inputbox.ui", "InputBox")
     , m_xInput(m_xBuilder->weld_entry("entry"))
@@ -156,6 +159,7 @@ bool hasUno()
     return bRetVal;
 }
 
+namespace {
 
 class OslStream : public SvStream
 {
@@ -171,6 +175,8 @@ public:
     virtual void        SetSize( sal_uInt64 nSize) override;
 };
 
+}
+
 OslStream::OslStream( const OUString& rName, StreamMode nStrmMode )
     : maFile( rName )
 {
@@ -251,6 +257,7 @@ void OslStream::SetSize( sal_uInt64 nSize )
     maFile.setSize( nSize );
 }
 
+namespace {
 
 class UCBStream : public SvStream
 {
@@ -268,6 +275,8 @@ public:
     virtual void        SetSize( sal_uInt64 nSize ) override;
 };
 
+}
+
 UCBStream::UCBStream( Reference< XInputStream > const & rStm )
     : xIS( rStm )
     , xSeek( rStm, UNO_QUERY )
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index ea65461ff73c..ad782bc8ef38 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1787,8 +1787,6 @@ enum Interval
     INTERVAL_S
 };
 
-}
-
 struct IntervalInfo
 {
     Interval    meInterval;
@@ -1797,6 +1795,8 @@ struct IntervalInfo
     bool        mbSimple;
 };
 
+}
+
 static IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
 {
     static IntervalInfo const aIntervalTable[] =
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 033285d8f7fe..8451455fbe89 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1695,6 +1695,7 @@ void SbiRuntime::StepPUT()
         refVar->SetFlags( n );
 }
 
+namespace {
 
 // VBA Dim As New behavior handling, save init object information
 struct DimAsNewRecoverItem
@@ -1726,11 +1727,17 @@ struct SbxVariablePtrHash
         { return reinterpret_cast<size_t>(pVar); }
 };
 
+}
+
 typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem,
                               SbxVariablePtrHash >  DimAsNewRecoverHash;
 
+namespace {
+
 class GaDimAsNewRecoverHash : public rtl::Static<DimAsNewRecoverHash, GaDimAsNewRecoverHash> {};
 
+}
+
 void removeDimAsNewRecoverItem( SbxVariable* pVar )
 {
     DimAsNewRecoverHash &rDimAsNewRecoverHash = GaDimAsNewRecoverHash::get();
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 234deed57ea0..c8138e34ac60 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -55,6 +55,8 @@
 #define RWPROP_     0x4300  // mask Read/Write-Property
 #define CPROP_      0x4900  // mask for constant
 
+namespace {
+
 struct Methods {
     const char* pName;
     SbxDataType eType;
@@ -63,6 +65,8 @@ struct Methods {
     sal_uInt16      nHash;
 };
 
+}
+
 static Methods aMethods[] = {
 
 { "Abs",            SbxDOUBLE,    1 | FUNCTION_, RTLNAME(Abs),0             },
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 4092933be49f..b6c4c6ea9b35 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -144,6 +144,8 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
     }
 }
 
+namespace {
+
 union largest
 {
     sal_Int64 n;
@@ -152,6 +154,7 @@ union largest
     uno_Any a;
 };
 
+}
 
 jobject Bridge::call_uno(
     JNI_context const & jni,
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 9b7c45c6185b..eb152c110ec7 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -383,6 +383,8 @@ void Bridge::call_java(
     }
 }
 
+namespace {
+
 // a UNO proxy wrapping a Java interface
 struct UNO_proxy : public uno_Interface
 {
@@ -405,6 +407,7 @@ struct UNO_proxy : public uno_Interface
         JNI_interface_type_info const * info );
 };
 
+}
 
 inline UNO_proxy::UNO_proxy(
     JNI_context const & jni, Bridge const * bridge,
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index bed807ed4f1c..386c922f4397 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -143,6 +143,8 @@ namespace cairocanvas
         return nTransparency;
     }
 
+    namespace {
+
     class DeviceSettingsGuard
     {
     private:
@@ -168,6 +170,8 @@ namespace cairocanvas
         }
     };
 
+    }
+
     static bool setupTextOutput( OutputDevice&                                     rOutDev,
                           const rendering::XCanvas*                         pOwner,
                           ::Point&                                          o_rOutPos,
diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx
index d0ddfff51f66..ef70b824e9e0 100644
--- a/canvas/source/tools/surfaceproxymanager.cxx
+++ b/canvas/source/tools/surfaceproxymanager.cxx
@@ -26,6 +26,8 @@
 
 namespace canvas
 {
+    namespace {
+
     class SurfaceProxyManager : public ISurfaceProxyManager
     {
     public:
@@ -60,6 +62,8 @@ namespace canvas
         PageManagerSharedPtr mpPageManager;
     };
 
+    }
+
     std::shared_ptr<ISurfaceProxyManager> createSurfaceProxyManager( const std::shared_ptr<IRenderModule>& rRenderModule )
     {
         return std::shared_ptr<ISurfaceProxyManager>(
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 3e768f5ef118..00acbe9a5d82 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -53,6 +53,8 @@ static void PrintHelp()
     fprintf( stdout, "canvasdemo - Exercise the new canvas impl\n" );
 }
 
+namespace {
+
 class TestWindow : public WorkWindow
 {
     public:
@@ -533,6 +535,7 @@ class DemoRenderer
         }
 };
 
+}
 
 void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
 {
@@ -595,6 +598,8 @@ void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
     }
 }
 
+namespace {
+
 class DemoApp : public Application
 {
 public:
@@ -606,6 +611,8 @@ protected:
     void DeInit() override;
 };
 
+}
+
 int DemoApp::Main()
 {
     bool bHelp = false;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 5696d6b5c3f4..73811542998d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -106,6 +106,8 @@ struct lcl_Operator
     }
 };
 
+namespace {
+
 struct lcl_AllOperator : public lcl_Operator
 {
     explicit lcl_AllOperator( const Reference< XChartData >& xDataToApply )
@@ -365,6 +367,8 @@ struct lcl_DateCategoriesOperator : public lcl_Operator
     const Sequence< double >& m_rDates;
 };
 
+}
+
 ChartDataWrapper::ChartDataWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
     : m_spChart2ModelContact(spChart2ModelContact)
     , m_aEventListenerContainer(m_aMutex)
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 406df92db13a..cb3c49687f82 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -248,6 +248,8 @@ namespace chart
 namespace wrapper
 {
 
+namespace {
+
 //PROP_DOCUMENT_LABELS_IN_FIRST_ROW
 class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
 {
@@ -265,6 +267,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("DataSourceLabelsInFirstRow",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -335,6 +339,8 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen
     return aRet;
 }
 
+namespace {
+
 //PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN
 class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
 {
@@ -352,6 +358,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("DataSourceLabelsInFirstColumn",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -422,6 +430,8 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe
     return aRet;
 }
 
+namespace {
+
 //PROP_DOCUMENT_HAS_LEGEND
 class WrappedHasLegendProperty : public WrappedProperty
 {
@@ -438,6 +448,8 @@ private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
 };
 
+}
+
 WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
     : WrappedProperty("HasLegend",OUString())
     , m_spChart2ModelContact( spChart2ModelContact )
@@ -495,6 +507,8 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope
     return aRet;
 }
 
+namespace {
+
 //PROP_DOCUMENT_HAS_MAIN_TITLE
 class WrappedHasMainTitleProperty : public WrappedProperty
 {
@@ -511,6 +525,8 @@ private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
 };
 
+}
+
 WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
     : WrappedProperty("HasMainTitle",OUString())
     , m_spChart2ModelContact( spChart2ModelContact )
@@ -557,6 +573,8 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr
     return aRet;
 }
 
+namespace {
+
 //PROP_DOCUMENT_HAS_SUB_TITLE
 class WrappedHasSubTitleProperty : public WrappedProperty
 {
@@ -573,6 +591,8 @@ private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
 };
 
+}
+
 WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("HasSubTitle",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 3ba2fe5323db..07d48ff4eb9d 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1096,6 +1096,8 @@ void SAL_CALL DiagramWrapper::removeEventListener(
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
+namespace {
+
 //PROP_DIAGRAM_DATAROW_SOURCE
 class WrappedDataRowSourceProperty : public WrappedProperty
 {
@@ -1113,6 +1115,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("DataRowSource",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1184,6 +1188,8 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_STACKED
 //PROP_DIAGRAM_DEEP
 //PROP_DIAGRAM_PERCENT_STACKED
@@ -1207,6 +1213,8 @@ std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
     mutable Any                             m_aOuterValue;
 };
 
+}
+
 WrappedStackingProperty::WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty(OUString(),OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1285,6 +1293,8 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_THREE_D
 class WrappedDim3DProperty : public WrappedProperty
 {
@@ -1302,6 +1312,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("Dim3D",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1345,6 +1357,8 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_VERTICAL
 class WrappedVerticalProperty : public WrappedProperty
 {
@@ -1362,6 +1376,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("Vertical",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1410,6 +1426,8 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_NUMBER_OF_LINES
 class WrappedNumberOfLinesProperty : public WrappedProperty
 {
@@ -1430,6 +1448,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("NumberOfLines",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1553,6 +1573,8 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS
 class WrappedAttributedDataPointsProperty : public WrappedProperty
 {
@@ -1570,6 +1592,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("AttributedDataPoints",OUString())
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1654,6 +1678,8 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_SOLIDTYPE
 class WrappedSolidTypeProperty : public WrappedProperty
 {
@@ -1671,6 +1697,8 @@ private: //member
     mutable Any                                 m_aOuterValue;
 };
 
+}
+
 WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty( "SolidType", OUString() )
             , m_spChart2ModelContact( spChart2ModelContact )
@@ -1717,6 +1745,8 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope
     return uno::Any( css::chart::ChartSolidType::RECTANGULAR_SOLID );
 }
 
+namespace {
+
 class WrappedAutomaticSizeProperty : public WrappedProperty
 {
 public:
@@ -1729,6 +1759,8 @@ public:
     virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 };
 
+}
+
 WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
             : WrappedProperty( "AutomaticSize", OUString() )
 {
@@ -1777,6 +1809,8 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP
     return aRet;
 }
 
+namespace {
+
 //PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
 class WrappedIncludeHiddenCellsProperty : public WrappedProperty
 {
@@ -1790,6 +1824,8 @@ private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
 };
 
+}
+
 WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
             : WrappedProperty("IncludeHiddenCells","IncludeHiddenCells")
             , m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 994dfcd034e4..21da1f1c6ceb 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -49,6 +49,8 @@ using ::com::sun::star::uno::Sequence;
 
 namespace chart
 {
+namespace {
+
 class WrappedLegendAlignmentProperty : public WrappedProperty
 {
 public:
@@ -62,6 +64,8 @@ protected:
     virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const override;
 };
 
+}
+
 WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty()
     : ::chart::WrappedProperty( "Alignment", "AnchorPosition" )
 {
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 8a30633ac935..20495fc8e7e5 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -50,6 +50,8 @@ using ::com::sun::star::uno::Sequence;
 
 namespace chart
 {
+namespace {
+
 class WrappedTitleStringProperty : public WrappedProperty
 {
 public:
@@ -63,6 +65,8 @@ protected:
     Reference< uno::XComponentContext > m_xContext;
 };
 
+}
+
 WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext )
     : ::chart::WrappedProperty( "String", OUString() )
     , m_xContext( xContext )
@@ -101,12 +105,16 @@ Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPro
     return uno::Any( OUString() );//default title is an empty String
 }
 
+namespace {
+
 class WrappedStackedTextProperty : public WrappedProperty
 {
 public:
     WrappedStackedTextProperty();
 };
 
+}
+
 WrappedStackedTextProperty::WrappedStackedTextProperty()
     : ::chart::WrappedProperty( "StackedText", "StackCharacters" )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 8ac56ce8c446..58e89e439b00 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -35,6 +35,8 @@ namespace chart
 namespace wrapper
 {
 
+namespace {
+
 class WrappedAutomaticPositionProperty : public WrappedProperty
 {
 public:
@@ -45,6 +47,8 @@ public:
     virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 };
 
+}
+
 WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
     : ::chart::WrappedProperty( "AutomaticPosition" , OUString() )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index ad349fa0275a..3949037a8a93 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -34,6 +34,8 @@ namespace chart
 namespace wrapper
 {
 
+namespace {
+
 class WrappedAxisAndGridExistenceProperty : public WrappedProperty
 {
 public:
@@ -53,6 +55,8 @@ private: //member
     sal_Int32   m_nDimensionIndex;
 };
 
+}
+
 void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
             , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
 {
@@ -190,6 +194,8 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< be
     return aRet;
 }
 
+namespace {
+
 class WrappedAxisTitleExistenceProperty : public WrappedProperty
 {
 public:
@@ -207,6 +213,8 @@ private: //member
     TitleHelper::eTitleType             m_eTitleType;
 };
 
+}
+
 void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
             , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
 {
@@ -292,6 +300,8 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean
     return aRet;
 }
 
+namespace {
+
 class WrappedAxisLabelExistenceProperty : public WrappedProperty
 {
 public:
@@ -310,6 +320,8 @@ private: //member
     sal_Int32   m_nDimensionIndex;
 };
 
+}
+
 void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
             , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 6468d64acec8..4d9b77f29eb3 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -36,6 +36,9 @@ namespace chart
 namespace wrapper
 {
 
+namespace
+{
+
 class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
 {
 public:
@@ -46,8 +49,6 @@ public:
                                         tSeriesOrDiagramPropertyType ePropertyType );
 };
 
-namespace
-{
 enum
 {
     //data caption properties
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 003c3b877514..047ad10740f1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -37,6 +37,8 @@ namespace chart
 namespace wrapper
 {
 
+namespace {
+
 class WrappedScaleTextProperty : public WrappedProperty
 {
 public:
@@ -50,6 +52,8 @@ private:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
 };
 
+}
+
 WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
     : ::chart::WrappedProperty( "ScaleText" , OUString() )
     , m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index ae114a30ea64..15645fa0c174 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -40,6 +40,9 @@ namespace chart
 namespace wrapper
 {
 
+namespace
+{
+
 //PROPERTYTYPE is the type of the outer property
 
 template< typename PROPERTYTYPE >
@@ -167,8 +170,6 @@ public:
     virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override;
 };
 
-namespace
-{
 enum
 {
     //spline properties
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 954c61aba2ff..d5508eccef44 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -168,8 +168,6 @@ void lcl_ConvertRangeToXML(
     }
 }
 
-}//anonymous namespace
-
 template< typename PROPERTYTYPE >
 class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTYTYPE >
 {
@@ -217,6 +215,8 @@ private:
     mutable Any m_aOuterValue;
 };
 
+}//anonymous namespace
+
 WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -253,6 +253,8 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_CONST_ERROR_HIGH
 class WrappedConstantErrorHighProperty : public WrappedStatisticProperty< double >
 {
@@ -267,6 +269,8 @@ private:
     mutable Any m_aOuterValue;
 };
 
+}
+
 WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -303,6 +307,8 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_MEAN_VALUE
 class WrappedMeanValueProperty : public WrappedStatisticProperty< bool >
 {
@@ -314,6 +320,8 @@ public:
                                        tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedMeanValueProperty::WrappedMeanValueProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -342,6 +350,8 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_CATEGORY
 // deprecated, replaced by ErrorBarStyle
 class WrappedErrorCategoryProperty : public WrappedStatisticProperty< css::chart::ChartErrorCategory >
@@ -354,6 +364,8 @@ public:
                                            tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -437,6 +449,8 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_PERCENT_ERROR
 class WrappedPercentageErrorProperty : public WrappedStatisticProperty< double >
 {
@@ -451,6 +465,8 @@ private:
     mutable Any m_aOuterValue;
 };
 
+}
+
 WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -487,6 +503,8 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_MARGIN
 class WrappedErrorMarginProperty : public WrappedStatisticProperty< double >
 {
@@ -501,6 +519,8 @@ private:
     mutable Any m_aOuterValue;
 };
 
+}
+
 WrappedErrorMarginProperty::WrappedErrorMarginProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -537,6 +557,8 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_INDICATOR
 class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >
 {
@@ -548,6 +570,8 @@ public:
                                             tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -605,6 +629,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_BAR_STYLE
 // this is the new constant group that replaces the deprecated enum ChartErrorCategory
 class WrappedErrorBarStyleProperty : public WrappedStatisticProperty< sal_Int32 >
@@ -617,6 +643,8 @@ public:
                                            tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -648,6 +676,8 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE
 class WrappedErrorBarRangePositiveProperty : public WrappedStatisticProperty< OUString >
 {
@@ -659,6 +689,8 @@ public:
                                                    tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -708,6 +740,8 @@ void WrappedErrorBarRangePositiveProperty::setValueToSeries( const Reference< be
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE
 class WrappedErrorBarRangeNegativeProperty : public WrappedStatisticProperty< OUString >
 {
@@ -719,6 +753,8 @@ public:
                                                    tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -768,6 +804,8 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_REGRESSION_CURVES
 class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< css::chart::ChartRegressionCurveType >
 {
@@ -779,6 +817,8 @@ public:
                                               tSeriesOrDiagramPropertyType ePropertyType );
 };
 
+}
+
 WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
@@ -815,6 +855,8 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::
     }
 }
 
+namespace {
+
 //PROP_CHART_STATISTIC_REGRESSION_PROPERTIES
 //PROP_CHART_STATISTIC_ERROR_PROPERTIES
 //PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES
@@ -840,6 +882,8 @@ private:
     PropertySetType m_eType;
 };
 
+}
+
 WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty(
     PropertySetType ePropertySetType
     , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 9123543d9036..3155a969102f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -37,6 +37,8 @@ namespace chart
 namespace wrapper
 {
 
+namespace {
+
 class WrappedStockProperty : public WrappedProperty
 {
 public:
@@ -56,6 +58,8 @@ protected:
     css::uno::Any                           m_aDefaultValue;
 };
 
+}
+
 WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
     , const css::uno::Any& rDefaulValue
     , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact )
@@ -107,6 +111,8 @@ css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Referenc
     return m_aDefaultValue;
 }
 
+namespace {
+
 class WrappedVolumeProperty : public WrappedStockProperty
 {
 public:
@@ -117,6 +123,8 @@ public:
     uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
 };
 
+}
+
 WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
         : WrappedStockProperty( "Volume", uno::Any(false) , spChart2ModelContact )
 {
@@ -172,6 +180,8 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla
     return xTemplate;
 }
 
+namespace {
+
 class WrappedUpDownProperty : public WrappedStockProperty
 {
 public:
@@ -182,6 +192,8 @@ public:
     uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
 };
 
+}
+
 WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
         : WrappedStockProperty( "UpDown", uno::Any(false) , spChart2ModelContact )
 {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 20f9da101be9..79ed7047331c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -43,6 +43,9 @@ namespace chart
 namespace wrapper
 {
 
+namespace
+{
+
 class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
 {
 public:
@@ -98,8 +101,6 @@ public:
                                            tSeriesOrDiagramPropertyType ePropertyType);
 };
 
-namespace
-{
 enum
 {
     //symbol properties
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 283357686553..7d5c4670b81c 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -37,6 +37,8 @@ using ::com::sun::star::uno::Reference;
 namespace chart
 {
 
+namespace {
+
 class DocumentChartTypeTemplateProvider : public ChartTypeTemplateProvider
 {
 public:
@@ -50,6 +52,8 @@ private:
     Reference< chart2::XChartTypeTemplate > m_xTemplate;
 };
 
+}
+
 DocumentChartTypeTemplateProvider::DocumentChartTypeTemplateProvider(
     const Reference< chart2::XChartDocument > & xDoc )
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 8bb45729b6f4..39000a96949a 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -57,6 +57,8 @@ void LightButton::switchLightOn(bool bOn)
         m_xButton->set_from_icon_name(RID_SVXBMP_LAMP_OFF);
 }
 
+namespace {
+
 struct LightSource
 {
     Color nDiffuseColor;
@@ -70,6 +72,8 @@ struct LightSource
     {}
 };
 
+}
+
 struct LightSourceInfo
 {
     LightButton* pButton;
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 9a5d60ed3afd..bbe54492cbd9 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -44,8 +44,6 @@ ItemPropertyMapType & lcl_GetTitlePropertyMap()
     return aTitlePropertyMap;
 };
 
-} // anonymous namespace
-
 class FormattedStringsConverter : public MultipleItemConverter
 {
 public:
@@ -59,6 +57,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
 };
 
+} // anonymous namespace
+
 FormattedStringsConverter::FormattedStringsConverter(
     const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
     SfxItemPool & rItemPool,
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index dc1ba9f657a6..2d1dcfcf9b6e 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -38,7 +38,6 @@ bool lcl_IsMetric()
 
     return ( eSys == MeasurementSystem::Metric );
 }
-}//end anonymous namespace
 
 class CalcConfigItem : public ::utl::ConfigItem
 {
@@ -52,6 +51,8 @@ public:
     virtual void                    Notify( const uno::Sequence<OUString>& aPropertyNames) override;
 };
 
+}//end anonymous namespace
+
 CalcConfigItem::CalcConfigItem()
     : ConfigItem( "Office.Calc/Layout" )
 {
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 023ab553b345..f295bc288eb2 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -122,6 +122,8 @@ namespace chart
                 throw DisposedException( OUString(), getThis() );
         }
 
+        namespace {
+
         /** guard for public UNO methods of the UndoManager
 
             The only purpose of this guard is to check for the instance being disposed already. Everything else,
@@ -155,6 +157,8 @@ namespace chart
             virtual void release() override { }
         };
 
+        }
+
         ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
         {
             static DummyMutex s_aDummyMutex;
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index b6652e25f11d..46036e5b9d3f 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -208,6 +208,8 @@ SplitCategoriesProvider::~SplitCategoriesProvider()
 {
 }
 
+namespace {
+
 class SplitCategoriesProvider_ForLabeledDataSequences : public SplitCategoriesProvider
 {
 public:
@@ -230,6 +232,8 @@ private:
     ChartModel& mrModel;
 };
 
+}
+
 sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const
 {
     return m_rSplitCategoriesList.getLength();
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index efb87de74026..7257a6432605 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -230,6 +230,8 @@ static void removeShapesAtWrongRhythm( TickIter& rIter
     }
 }
 
+namespace {
+
 /**
  * If the labels are staggered and bInnerLine is true we iterate through
  * only those labels that are closer to the diagram.
@@ -255,6 +257,8 @@ private: //member
     bool m_bInnerLine;
 };
 
+}
+
 LabelIterator::LabelIterator( TickInfoArrayType& rTickInfoVector
             , const AxisLabelStaggering eAxisLabelStaggering
             , bool bInnerLine )
@@ -448,6 +452,8 @@ static void getAxisLabelProperties(
         rPropValues, rPropNames, rAxisProp.maLabelAlignment.meAlignment);
 }
 
+namespace {
+
 /**
  * Iterate through only 3 ticks including the one that has the longest text
  * length.  When the first tick has the longest text, it iterates through
@@ -468,6 +474,8 @@ private:
     size_t m_nCurrentIndex;
 };
 
+}
+
 MaxLabelTickIter::MaxLabelTickIter(
     TickInfoArrayType& rTickInfoVector, size_t nLongestLabelIndex ) :
     m_rTickInfoVector(rTickInfoVector), m_nCurrentIndex(0)
@@ -1152,6 +1160,9 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
 }
 
 typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
+
+namespace {
+
 struct lcl_LessXPos
 {
     bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
@@ -1168,6 +1179,8 @@ struct lcl_GreaterYPos
     }
 };
 
+}
+
 void VCartesianAxis::get2DAxisMainLine(
     B2DVector& rStart, B2DVector& rEnd, AxisLabelAlignment& rAlignment, double fCrossesOtherAxis ) const
 {
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index f8cfe828d0ae..61050a12500f 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -34,6 +34,8 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 
+namespace {
+
 class TextualDataProvider : public ::cppu::WeakImplHelper<
         css::chart2::data::XTextualDataSequence
         >
@@ -54,6 +56,8 @@ private: //member
     uno::Sequence< OUString > m_aTextSequence;
 };
 
+}
+
 VCartesianCoordinateSystem::VCartesianCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys )
     : VCoordinateSystem(xCooSys)
 {
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 45df4131faff..36a143df4545 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -39,6 +39,8 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
+namespace {
+
 struct GridLinePoints
 {
     Sequence< double > P0;
@@ -54,6 +56,8 @@ struct GridLinePoints
     sal_Int32 m_nDimensionIndex;
 };
 
+}
+
 GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_Int32 nDimensionIndex
                 , CuboidPlanePosition eLeftWallPos
                 , CuboidPlanePosition eBackWallPos
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index e9c54add6c0f..ca2218087a43 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -581,8 +581,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >&  rZSlots
     rZSlots = std::move(aRet);
 }
 
-}//anonymous namespace
-
 //better performance for big data
 struct FormerPoint
 {
@@ -601,6 +599,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}//anonymous namespace
+
 void AreaChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 47c137b32ab4..e50fbe36ff74 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -385,6 +385,8 @@ void BarChart::addSeries( std::unique_ptr<VDataSeries> pSeries, sal_Int32 zSlot,
     VSeriesPlotter::addSeries( std::move(pSeries), zSlot, xSlot, ySlot );
 }
 
+namespace {
+
 //better performance for big data
 struct FormerBarPoint
 {
@@ -405,6 +407,8 @@ struct FormerBarPoint
     double m_fZ;
 };
 
+}
+
 void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 {
     //adapt m_aOverlapSequence and m_aGapwidthSequence for the groupBarsPerAxis feature
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 1a0123f0c094..ef2a75934dfb 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -136,6 +136,8 @@ drawing::Direction3D BubbleChart::getPreferredDiagramAspectRatio() const
     return drawing::Direction3D(-1,-1,-1);
 }
 
+namespace {
+
 //better performance for big data
 struct FormerPoint
 {
@@ -154,6 +156,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}
+
 void BubbleChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/ConfigAccess.cxx b/chart2/source/view/charttypes/ConfigAccess.cxx
index 2e6e507408b4..964e58ce43f7 100644
--- a/chart2/source/view/charttypes/ConfigAccess.cxx
+++ b/chart2/source/view/charttypes/ConfigAccess.cxx
@@ -28,6 +28,8 @@ namespace chart
 {
 using namespace ::com::sun::star;
 
+namespace
+{
 class ChartConfigItem : public ::utl::ConfigItem
 {
 private:
@@ -39,6 +41,7 @@ public:
     bool getUseErrorRectangle();
     virtual void Notify(const uno::Sequence<OUString>& aPropertyNames) override;
 };
+}
 
 ChartConfigItem::ChartConfigItem()
     : ConfigItem("Office.Chart/ErrorProperties")
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 823004d2091a..2f99bece1cfc 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -293,8 +293,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >&  rZSlots
     rZSlots = std::move(aRet);
 }
 
-}//anonymous namespace
-
 //better performance for big data
 struct FormerPoint
 {
@@ -313,6 +311,8 @@ struct FormerPoint
     double m_fZ;
 };
 
+}//anonymous namespace
+
 void NetChart::createShapes()
 {
     if( m_aZSlots.empty() ) //no series
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 8bd9bf75f660..4d28c496fe2e 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -31,6 +31,8 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
+namespace {
+
 struct ContainerStats {
     int m_nAlive;
     int m_nDisposed;
@@ -50,6 +52,8 @@ public:
     }
 };
 
+}
+
 namespace comphelper_ifcontainer
 {
     static const int nTests = 10;
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index e4cec19feeed..7a31f10f1f71 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -31,6 +31,8 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
 
+namespace {
+
 class AnyCompare : public ::cppu::WeakImplHelper< XAnyCompare >
 {
     Reference< XCollator > m_xCollator;
@@ -68,6 +70,8 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
+}
+
 sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
 {
     sal_Int16 aResult = 0;
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 0053cc8e4374..ecd1c2dbb2f8 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -34,6 +34,8 @@ using namespace com::sun::star;
 
 typedef std::vector < uno::Sequence< beans::PropertyValue > > IndexedPropertyValues;
 
+namespace {
+
 class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::XIndexContainer, lang::XServiceInfo >
 {
 public:
@@ -63,6 +65,8 @@ private:
     IndexedPropertyValues maProperties;
 };
 
+}
+
 IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw()
 {
 }
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 13b8f855866f..79a7d714b5e6 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -32,6 +32,8 @@ using namespace com::sun::star;
 
 typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues;
 
+namespace {
+
 class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNameContainer, lang::XServiceInfo >
 {
 public:
@@ -62,6 +64,8 @@ private:
     NamedPropertyValues maProperties;
 };
 
+}
+
 NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw()
 {
 }
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index bee5d03963b2..f9e5cfa8989a 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -76,9 +76,16 @@ namespace comphelper
     using ::com::sun::star::uno::TypeDescription;
     using ::com::sun::star::lang::DisposedException;
 
+    namespace {
+
     class MapEnumerator;
 
+    }
+
     typedef std::map< Any, Any, LessPredicateAdapter > KeyedValues;
+
+    namespace {
+
     struct MapData
     {
         Type                                        m_aKeyType;
@@ -106,6 +113,7 @@ namespace comphelper
         MapData& operator=( const MapData& _source ) = delete;
     };
 
+    }
 
     static void lcl_registerMapModificationListener( MapData& _mapData, MapEnumerator& _listener )
     {
@@ -141,6 +149,8 @@ namespace comphelper
                                                 ,   XServiceInfo
                                                 > Map_IFace;
 
+    namespace {
+
     class EnumerableMap: public Map_IFace, public ComponentBase
     {
     protected:
@@ -194,15 +204,11 @@ namespace comphelper
         MapData             m_aData;
     };
 
-    namespace {
-
     enum EnumerationType
     {
         eKeys, eValues, eBoth
     };
 
-    }
-
     class MapEnumerator final
     {
     public:
@@ -249,6 +255,8 @@ namespace comphelper
         bool                        m_disposed;
     };
 
+    }
+
     static void lcl_notifyMapDataListeners_nothrow( const MapData& _mapData )
     {
         for ( MapEnumerator* loop : _mapData.m_aModListeners )
@@ -259,6 +267,9 @@ namespace comphelper
 
     typedef ::cppu::WeakImplHelper <   XEnumeration
                                    >   MapEnumeration_Base;
+
+    namespace {
+
     class MapEnumeration :public ComponentBase
                          ,public MapEnumeration_Base
     {
@@ -294,6 +305,7 @@ namespace comphelper
         MapEnumerator               m_aEnumerator;
     };
 
+    }
 
     EnumerableMap::EnumerableMap()
         :Map_IFace( m_aMutex )
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 0f905fac9124..bed257ca50c7 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -31,6 +31,8 @@ typedef std::map<OUString, css::uno::Any> SvGenericNameContainerMapImpl;
 
 namespace comphelper
 {
+    namespace {
+
     /** this is the base helper class for NameContainer that's also declared in this header. */
     class NameContainer : public ::cppu::WeakImplHelper< css::container::XNameContainer >
     {
@@ -58,6 +60,8 @@ namespace comphelper
         const css::uno::Type maType;
         osl::Mutex maMutex;
     };
+
+    }
 }
 
 using namespace ::comphelper;
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 209d0ac6deb6..6651c6033bb6 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -62,6 +62,7 @@ using namespace osl;
 namespace comphelper
 {
 
+namespace {
 
 struct AttachedObject_Impl
 {
@@ -149,6 +150,7 @@ public:
     virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
+}
 
 AttacherAllListener_Impl::AttacherAllListener_Impl
 (
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index f4d2a8b5d260..bb77544c957e 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -49,6 +49,8 @@ namespace comphelper
     using ::com::sun::star::util::Time;
     using ::com::sun::star::util::DateTime;
 
+    namespace {
+
     class DatePredicateLess : public IKeyPredicateLess
     {
     public:
@@ -158,6 +160,7 @@ namespace comphelper
         }
     };
 
+    }
 
     std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
     {
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index c73bd22cf163..a360b7207fe4 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -38,6 +38,8 @@ namespace comphelper
     {
     }
 
+    namespace {
+
     struct ProcessableEvent
     {
         AnyEventRef                         aEvent;
@@ -54,9 +56,11 @@ namespace comphelper
         }
     };
 
+    }
 
     typedef std::deque< ProcessableEvent >    EventQueue;
 
+    namespace {
 
     struct EqualProcessor
     {
@@ -69,6 +73,8 @@ namespace comphelper
         }
     };
 
+    }
+
     struct EventNotifierImpl
     {
         ::osl::Mutex        aMutex;
@@ -178,7 +184,12 @@ namespace comphelper
         return AsyncEventNotifierBase::terminate();
     }
 
+    namespace {
+
     struct theNotifiersMutex : public rtl::Static<osl::Mutex, theNotifiersMutex> {};
+
+    }
+
     static std::vector<std::weak_ptr<AsyncEventNotifierAutoJoin>> g_Notifiers;
 
     void JoinAsyncEventNotifiers()
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index e1092df36f0b..56644d4d6e59 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -41,6 +41,7 @@ using ::com::sun::star::task::XInteractionPassword2;
 
 namespace comphelper {
 
+namespace {
 
 class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort >
 {
@@ -48,6 +49,7 @@ public:
     virtual void SAL_CALL select() override {}
 };
 
+}
 
 class PasswordContinuation : public ::cppu::WeakImplHelper< XInteractionPassword2 >
 {
diff --git a/comphelper/source/misc/random.cxx b/comphelper/source/misc/random.cxx
index ddc970efe321..f001b06195d6 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -38,6 +38,8 @@ namespace rng
 // http://en.wikipedia.org/wiki/Mersenne_twister
 #define STD_RNG_ALGO  std::mt19937
 
+namespace {
+
 struct RandomNumberGenerator
 {
     std::mutex mutex;
@@ -77,6 +79,8 @@ struct RandomNumberGenerator
 
 class theRandomNumberGenerator : public rtl::Static<RandomNumberGenerator, theRandomNumberGenerator> {};
 
+}
+
 // uniform ints [a,b] distribution
 int uniform_int_distribution(int a, int b)
 {
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 95b6f2dff091..9b1991b7f3a1 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -105,6 +105,8 @@ ThreadPool::~ThreadPool()
     assert(maTasks.empty());
 }
 
+namespace {
+
 struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPool >,
                                                       ThreadPoolStatic >
 {
@@ -114,6 +116,8 @@ struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPoo
     };
 };
 
+}
+
 ThreadPool& ThreadPool::getSharedOptimalPool()
 {
     return *ThreadPoolStatic::get();
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 61e6f84ecdd5..82f9d85d7525 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -28,6 +28,8 @@
 #include <memory>
 #include <vector>
 
+namespace {
+
 class AutoOGuardArray
 {
     std::vector<std::unique_ptr< osl::Guard< comphelper::SolarMutex > >>  maGuardArray;
@@ -38,6 +40,8 @@ public:
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > &  operator[] ( sal_Int32 i ) { return maGuardArray[i]; }
 };
 
+}
+
 AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : maGuardArray(nNumElements)
 {
 }
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index b5414b5c52d8..72cec45e2992 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -42,6 +42,8 @@ using namespace ::com::sun::star::lang;
 
 namespace comphelper
 {
+    namespace {
+
     struct IMPL_GenericPropertySet_MutexContainer
     {
         Mutex maMutex;
@@ -84,6 +86,7 @@ namespace comphelper
         virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     };
 
+    }
 }
 
 
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 8d120989eec6..940c9012f149 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -45,6 +45,8 @@ using namespace ::osl;
 namespace comphelper
 {
 
+namespace {
+
 class UNOMemoryStream : public WeakImplHelper<XServiceInfo, XStream, XSeekableInputStream, XOutputStream, XTruncate>
 {
 public:
@@ -84,6 +86,8 @@ private:
     sal_Int32 mnCursor;
 };
 
+}
+
 UNOMemoryStream::UNOMemoryStream()
 : mnCursor(0)
 {
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 21f097531363..46785b35cbba 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -39,6 +39,8 @@ using namespace ::com::sun::star;
 
 namespace comphelper {
 
+namespace {
+
 // this helper class is designed to allow to parse ContentType- and Relationship-related information from OfficeOpenXML format
 class OFOPXMLHelper_Impl
     : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
@@ -65,6 +67,7 @@ public:
     virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
+}
 
 namespace OFOPXMLHelper {
 
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 737330dd10c0..60abc11c222b 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -117,7 +117,7 @@ public:
             || type.Class("weak_ptr").StdNamespace() // not owning
             || type.Class("ImplWallpaper").GlobalNamespace() // very odd static instance here
             || type.Class("Application").GlobalNamespace() // numerous odd subclasses in vclmain::createApplication()
-            || type.Class("DemoMtfApp").GlobalNamespace() // one of these Application with own VclPtr
+            || type.Class("DemoMtfApp").AnonymousNamespace().GlobalNamespace() // one of these Application with own VclPtr
            )
         {
             return std::make_pair(false, std::vector<FieldDecl const*>());
diff --git a/compilerplugins/clang/external.cxx b/compilerplugins/clang/external.cxx
index 64da725cfff9..b31f620cf5ef 100644
--- a/compilerplugins/clang/external.cxx
+++ b/compilerplugins/clang/external.cxx
@@ -133,9 +133,6 @@ public:
 
     bool VisitTagDecl(TagDecl* decl)
     {
-        /*TODO:*/
-        if (!isa<EnumDecl>(decl))
-            return true; // in general, moving classes into an unnamed namespace can break ADL
         if (isa<ClassTemplateSpecializationDecl>(decl))
         {
             return true;
@@ -266,8 +263,6 @@ public:
 
     bool VisitClassTemplateDecl(ClassTemplateDecl* decl)
     {
-        /*TODO:*/
-        return true; // in general, moving classes or enumerations into an unnamed namespace can break ADL
         if (!decl->isThisDeclarationADefinition())
         {
             return true;
@@ -329,6 +324,7 @@ private:
         }
         else
         {
+            //TODO: Derived types are also affected!
             CXXRecordDecl const* rec;
             if (auto const d = dyn_cast<ClassTemplateDecl>(decl))
             {
@@ -400,6 +396,10 @@ private:
                 if (auto const d1 = dyn_cast<FriendDecl>(d))
                 {
                     d = d1->getFriendDecl();
+                    if (d == nullptr) // happens for 'friend struct S;'
+                    {
+                        continue;
+                    }
                 }
                 FunctionDecl const* f;
                 if (auto const d1 = dyn_cast<FunctionTemplateDecl>(d))
diff --git a/compilerplugins/clang/refcounting.cxx b/compilerplugins/clang/refcounting.cxx
index c002a1499977..168d775b28d2 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -256,7 +256,7 @@ bool containsSalhelperReferenceObjectSubclass(const clang::Type* pType0) {
         if (pTemplate) {
             auto const dc = loplugin::DeclCheck(pTemplate);
             if (dc.Class("Reference").Namespace("rtl").GlobalNamespace()
-                || (dc.Class("OStoreHandle").Namespace("store")
+                || (dc.Class("OStoreHandle").AnonymousNamespace().Namespace("store")
                     .GlobalNamespace()))
             {
                 return false;
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 25e4d2c77473..6070ce860d82 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -173,7 +173,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
     // used in a function-pointer-table
     if ((cdc.Class("SbiRuntime").GlobalNamespace()
          && startsWith(pCXXMethodDecl->getNameAsString(), "Step"))
-        || (cdc.Class("OoxFormulaParserImpl").Namespace("xls").Namespace("oox")
+        || (cdc.Class("OoxFormulaParserImpl").AnonymousNamespace().Namespace("xls").Namespace("oox")
             .GlobalNamespace())
         || cdc.Class("SwTableFormula").GlobalNamespace()
         || (cdc.Class("BiffFormulaParserImpl").Namespace("xls").Namespace("oox")
diff --git a/compilerplugins/clang/test/external.cxx b/compilerplugins/clang/test/external.cxx
index 28b7c6df01b7..6eb486a57fc1 100644
--- a/compilerplugins/clang/test/external.cxx
+++ b/compilerplugins/clang/test/external.cxx
@@ -20,6 +20,7 @@ int const n2 = 0; // no warning, internal linkage
 
 constexpr int n3 = 0; // no warning, internal linkage
 
+// expected-error@+1 {{externally available entity 'S1' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
 struct S1
 {
     friend void f1() {} // no warning for injected function (no place where to mark it `static`)
@@ -28,6 +29,7 @@ struct S1
     friend void f2() {}
 };
 
+// expected-error@+1 {{externally available entity 'S2' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
 struct S2
 {
     friend void f1();
@@ -76,11 +78,21 @@ extern "C++" {
 void fc(E const*);
 }
 
+// expected-error@+1 {{externally available entity 'S1' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
 struct S1
 {
     struct S2;
     // No note about associating function; injected friend function not found by ADL:
     friend void f2(E const*);
+    // expected-note@+1 {{a function associating 'N::S1' is declared here [loplugin:external]}}
+    friend void h(S1);
+};
+
+// expected-error@+1 {{externally available entity 'S3' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
+struct S3
+{
+    // expected-note@+1 {{another declaration is here [loplugin:external]}}
+    friend void h(S1);
 };
 
 inline namespace I2
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index bf79ffd5ac7b..69f0933ef7cb 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2131,6 +2131,8 @@ namespace detail
         virtual ~IValueSource() { }
     };
 
+    namespace {
+
     class RowValue : public IValueSource
     {
     public:
@@ -2192,6 +2194,8 @@ namespace detail
     private:
         const Reference< XColumn >  m_xColumn;
     };
+
+    }
 }
 
 
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 0658c517a07d..76bbafaeb13a 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -24,6 +24,8 @@
 
 using namespace connectivity;
 
+namespace {
+
 /// Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool
 struct TKeyValueFunc
 {
@@ -76,6 +78,7 @@ struct TKeyValueFunc
     }
 };
 
+}
 
 ::rtl::Reference<OKeySet> OSortIndex::CreateKeySet()
 {
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 7ac1845911a1..c347e5ad84c9 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -75,6 +75,8 @@ OConnectionPool::~OConnectionPool()
     clear(false);
 }
 
+namespace {
+
 struct TRemoveEventListenerFunctor
 {
     OConnectionPool* m_pConnectionPool;
@@ -125,6 +127,8 @@ struct TConnectionPoolFunctor
     }
 };
 
+}
+
 void OConnectionPool::clear(bool _bDispose)
 {
     MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 343c9fcb6305..91f58219cac3 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -75,6 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_calc_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index c269ddf997f0..9e24128912b2 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -75,6 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* dbase_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index c802778cff2e..12096bdade87 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -38,12 +38,17 @@ static const char *eBookLibNames[] = {
 typedef void (*SymbolFunc) ();
 
 #define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
+
+namespace {
+
 struct ApiMap
 {
     const char *sym_name;
     SymbolFunc *ref_value;
 };
 
+}
+
 static const ApiMap aCommonApiMap[] =
 {
     SYM_MAP( eds_check_version ),
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d6d55c272bfa..1341e5a33c68 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -375,8 +375,6 @@ bool isBookBackend( EBookClient *pBook, const char *backendname)
     return isSourceBackend(pSource, backendname);
 }
 
-}
-
 class OEvoabVersion36Helper : public OEvoabVersionHelper
 {
 private:
@@ -490,8 +488,6 @@ protected:
     }
 };
 
-namespace {
-
 ESource * findSource( const char *id )
 {
     ESourceList *pSourceList = nullptr;
@@ -519,8 +515,6 @@ bool isAuthRequired( EBook *pBook )
                                   "auth" ) != nullptr;
 }
 
-}
-
 class OEvoabVersion35Helper : public OEvoabVersionHelper
 {
 private:
@@ -610,6 +604,8 @@ public:
     }
 };
 
+}
+
 OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pConnection )
     :OResultSet_BASE(m_aMutex)
     ,::comphelper::OPropertyContainer( OResultSet_BASE::rBHelper )
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 94b6f7867438..afc6291307cb 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -77,6 +78,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* evoab2_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index dd4917634dab..b3b5ac9ee1da 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -109,6 +109,8 @@ Connection::~Connection()
         close();
 }
 
+namespace {
+
 struct ConnectionGuard
 {
     oslInterlockedCount& m_refCount;
@@ -123,6 +125,8 @@ struct ConnectionGuard
     }
 };
 
+}
+
 void Connection::construct(const OUString& url, const Sequence< PropertyValue >& info)
 {
     ConnectionGuard aGuard(m_refCount);
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 69b05e471263..f85d5dbb48d5 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -38,6 +38,8 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
+namespace {
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -76,6 +78,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* firebird_sdbc_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 62884acef137..4b8b6c4b2879 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -75,6 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* flat_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index a7ce2346374a..b41389a6d118 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -76,6 +77,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* hsqldb_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 281d8936d488..3044724735db 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -75,6 +76,8 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* jdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 6eeaf3a23897..0db740478993 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -55,6 +55,8 @@ namespace connectivity
 {
 namespace mysql
 {
+namespace
+{
 class OMySQLKeysHelper : public OKeysHelper
 {
 protected:
@@ -69,6 +71,7 @@ public:
 };
 }
 }
+}
 
 OMySQLTable::OMySQLTable(sdbcx::OCollection* _pTables, const Reference<XConnection>& _xConnection)
     : OTableHelper(_pTables, _xConnection, true)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
index d23cf66aba06..56a2242e5e50 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
@@ -35,6 +35,8 @@ typedef Reference<XSingleServiceFactory> (*createFactoryFunc)(
     ::cppu::ComponentInstantiation pCreateFunction, const Sequence<OUString>& rServiceNames,
     rtl_ModuleCount*);
 
+namespace
+{
 struct ProviderRequest
 {
     Reference<XSingleServiceFactory> xRet;
@@ -65,6 +67,7 @@ struct ProviderRequest
 
     void* getProvider() const { return xRet.get(); }
 };
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory(const sal_Char* pImplementationName,
                                                            void* pServiceManager,
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 8b76f4cf1cc6..1c7bc80ae203 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -26,6 +26,8 @@ namespace connectivity
 {
     namespace odbc
     {
+        namespace {
+
         class ORealObdcDriver : public ODBCDriver
         {
         protected:
@@ -35,6 +37,7 @@ namespace connectivity
             explicit ORealObdcDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {}
         };
 
+        }
 
 oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
 {
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 71fd857ec19e..9c4994172422 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
             rtl_ModuleCount*
         );
 
+namespace {
 
 struct ProviderRequest
 {
@@ -76,6 +77,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* odbc_component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 56670cef1aa5..868a011584c5 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -94,6 +94,7 @@ using com::sun::star::sdbc::XDatabaseMetaData;
 namespace pq_sdbc_driver
 {
 
+namespace {
 
 // Helper class for statement lifetime management
 class ClosableReference : public cppu::WeakImplHelper< css::uno::XReference >
@@ -116,6 +117,8 @@ public:
     }
 };
 
+}
+
 static OUString    ConnectionGetImplementationName()
 {
     return "org.openoffice.comp.connectivity.pq.Connection.noext";
@@ -393,6 +396,8 @@ void Connection::clearWarnings()
 {
 }
 
+namespace {
+
 class cstr_vector
 {
     std::vector<char*> values;
@@ -426,6 +431,8 @@ public:
     char const** c_array() const { return const_cast <const char**>(values.data()); }
 };
 
+}
+
 static void properties2arrays( const Sequence< PropertyValue > & args,
                                const Reference< XTypeConverter> &tc,
                                rtl_TextEncoding enc,
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index b11dc491d016..a8e915a5cc67 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -158,6 +158,7 @@ static Reference< XInterface > DriverCreateInstance( const Reference < XComponen
     return ret;
 }
 
+namespace {
 
 class OOneInstanceComponentFactory :
     public MutexHolder,
@@ -212,6 +213,8 @@ private:
     Reference< XComponentContext > m_defaultContext;
 };
 
+}
+
 Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext(
     Sequence< Any > const &, const Reference< XComponentContext > & ctx )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 564ab7910567..1b8c1cc116e3 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -51,6 +51,8 @@ using com::sun::star::beans::Property;
 namespace pq_sdbc_driver
 {
 
+namespace {
+
 struct DefColumnMetaData
 {
     const sal_Char * columnName;
@@ -83,6 +85,8 @@ struct PropertyDefEx : public PropertyDef
     sal_Int32 attribute;
 };
 
+}
+
 static cppu::IPropertyArrayHelper * createPropertyArrayHelper(
     PropertyDef const *props, int count , sal_Int16 attr )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 2082816813fd..147f5c17a465 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -66,6 +66,8 @@ using com::sun::star::lang::XEventListener;
 namespace pq_sdbc_driver
 {
 
+namespace {
+
 class ReplacedBroadcaster : public EventBroadcastHelper
 {
     ContainerEvent m_event;
@@ -131,6 +133,8 @@ public:
     }
 };
 
+}
+
 Container::Container(
     const ::rtl::Reference< comphelper::RefCountedMutex > & refMutex,
     const css::uno::Reference< css::sdbc::XConnection >  & origin,
@@ -201,6 +205,7 @@ sal_Int32 Container::getCount()
     return m_values.size();
 }
 
+namespace {
 
 class ContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
 {
@@ -219,6 +224,8 @@ public:
 
 };
 
+}
+
 sal_Bool ContainerEnumeration::hasMoreElements()
 {
     return static_cast<int>(m_vec.size()) > m_index +1;
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 10e0e3ef32e7..69f88016231d 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -28,6 +28,8 @@ using createFactoryFunc = uno::Reference<lang::XSingleServiceFactory> (*)(
     const OUString& rComponentName, ::cppu::ComponentInstantiation pCreateFunction,
     const uno::Sequence<OUString>& rServiceNames, rtl_ModuleCount*);
 
+namespace
+{
 struct ProviderRequest
 {
 private:
@@ -60,6 +62,7 @@ public:
 
     uno::XInterface* getProvider() const { return xRet.get(); }
 };
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
 connectivity_writer_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager,
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index c88e117414fa..b3291cf89f5f 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -102,6 +102,7 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
     return makeAny( *m_aPos++ );
 }
 
+    namespace {
 
     /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
     struct EnsureDriver
@@ -173,6 +174,8 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
         }
     };
 
+    }
+
     static sal_Int32 lcl_getDriverPrecedence( const Reference<XComponentContext>& _rContext, Sequence< OUString >& _rPrecedence )
     {
         _rPrecedence.realloc( 0 );
@@ -208,6 +211,8 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
         return _rPrecedence.getLength();
     }
 
+    namespace {
+
     /// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names
     struct CompareDriverAccessByName
     {
@@ -230,6 +235,7 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
         }
     };
 
+    }
 
 OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
     :m_xContext( _rxContext )
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 4cb00394faa3..2c928216707c 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -109,6 +109,7 @@ namespace connectivity
         }
     };
 
+    namespace {
 
     /** helper class for temporarily adding a query name to a list of forbidden query names
     */
@@ -132,6 +133,8 @@ namespace connectivity
             m_rpAllForbiddenNames->erase( m_sForbiddenQueryName );
         }
     };
+
+    }
 }
 
 OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rxConnection,
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 87185d66b83a..bab95793452d 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -29,7 +29,7 @@
 
 namespace connectivity
 {
-
+    namespace {
 
     class SharedResources_Impl
     {
@@ -59,6 +59,8 @@ namespace connectivity
         }
     };
 
+    }
+
     SharedResources_Impl*   SharedResources_Impl::s_pInstance( nullptr );
     oslInterlockedCount     SharedResources_Impl::s_nClients( 0 );
 
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 1e2a45ac84cf..156d6eb9c7a0 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -29,6 +29,7 @@
 #include <cppu/helper/purpenv/Mapping.hxx>
 #include <memory>
 
+namespace {
 
 class InnerThread;
 class OuterThread;
@@ -86,6 +87,8 @@ public:
         }
 };
 
+}
+
 void InnerThread::run()
 {
     osl_setThreadName("UNO AffineBridge InnerThread");
@@ -95,6 +98,8 @@ void InnerThread::run()
     m_pAffineBridge->leave();
 }
 
+namespace {
+
 class OuterThread : public osl::Thread
 {
     virtual void SAL_CALL run() override;
@@ -105,6 +110,8 @@ public:
     explicit OuterThread(AffineBridge * threadEnvironment);
 };
 
+}
+
 OuterThread::OuterThread(AffineBridge * threadEnvironment)
     : m_pAffineBridge(threadEnvironment)
 {
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 7cf945d44391..491a888c3921 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -26,6 +26,8 @@
 #include <cppu/helper/purpenv/Environment.hxx>
 #include <cppu/helper/purpenv/Mapping.hxx>
 
+namespace {
+
 class UnsafeBridge : public cppu::Enterable
 {
     osl::Mutex          m_mutex;
@@ -46,6 +48,8 @@ public:
     virtual bool v_isValid(OUString * pReason) override;
 };
 
+}
+
 UnsafeBridge::UnsafeBridge()
     : m_count   (0),
       m_threadId(0)
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index ceeee6eb0deb..bb8af537c4b8 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -59,6 +59,8 @@ typedef void ExtEnv_releaseInterface       (uno_ExtEnvironment                 *
                                                      void                               * pInterface);
 }
 
+namespace {
+
 class Base : public cppu::Enterable
 {
 public:
@@ -117,6 +119,8 @@ protected:
     virtual  ~Base() override;
 };
 
+}
+
 extern "C" {
 static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
 {
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 19c341f15d34..6255b2f0b52a 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -29,6 +29,8 @@
 
 using namespace com::sun::star;
 
+namespace {
+
 class Mapping : public uno_Mapping
 {
     uno::Environment   m_from;
@@ -55,6 +57,8 @@ public:
     void release();
 };
 
+}
+
 static void s_mapInterface(
     uno_Mapping                       * puno_Mapping,
     void                             ** ppOut,
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index f788e005a031..665f1b7c636e 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -81,6 +81,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
     return s_type_XCurrentContext;
 }
 
+namespace {
 
 class ThreadKey
 {
@@ -119,6 +120,8 @@ public:
     }
 };
 
+}
+
 extern "C" {
 
 static void delete_IdContainer( void * p )
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 40b031c85732..d11268b85784 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -44,6 +44,8 @@ namespace cppu_threadpool
         rtl::Reference<ORequestThread> const & theThread): thread(theThread)
     {}
 
+    namespace {
+
     struct theDisposedCallerAdmin :
         public rtl::StaticWithInit< DisposedCallerAdminHolder, theDisposedCallerAdmin >
     {
@@ -52,6 +54,8 @@ namespace cppu_threadpool
         }
     };
 
+    }
+
     DisposedCallerAdminHolder const & DisposedCallerAdmin::getInstance()
     {
         return theDisposedCallerAdmin::get();
@@ -328,6 +332,8 @@ namespace cppu_threadpool
 
 using namespace cppu_threadpool;
 
+namespace {
+
 struct uno_ThreadPool_Equal
 {
     bool operator () ( const uno_ThreadPool &a , const uno_ThreadPool &b ) const
@@ -344,6 +350,7 @@ struct uno_ThreadPool_Hash
         }
 };
 
+}
 
 typedef std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
 
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 5a400817115d..b2638979936a 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -40,6 +40,8 @@ extern "C"
 #pragma pack(push, 8)
 #endif
 
+namespace {
+
 /**
  * The double member determines the alignment.
  * Under OS2 and MS-Windows the Alignment is min( 8, sizeof( type ) ).
@@ -59,6 +61,8 @@ struct AlignSize_Impl
 #endif
 };
 
+}
+
 #ifdef _WIN32
 #pragma pack(pop)
 #endif
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 1604cf7b7997..c94ee1a80ec2 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -46,6 +46,8 @@ using namespace osl;
 #pragma pack(push, 8)
 #endif
 
+namespace {
+
 /**
  * The double member determines the alignment.
  * Under OS2 and MS-Windows the Alignment is min( 8, sizeof( type ) ).
@@ -65,6 +67,8 @@ struct AlignSize_Impl
 #endif
 };
 
+}
+
 #ifdef _WIN32
 #pragma pack(pop)
 #endif
@@ -138,6 +142,7 @@ static sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
     return nSize;
 }
 
+namespace {
 
 struct equalStr_Impl
 {
@@ -152,6 +157,7 @@ struct hashStr_Impl
         { return rtl_ustr_hashCode( s ); }
 };
 
+}
 
 // Heavy hack, the const sal_Unicode * is hold by the typedescription reference
 typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
@@ -164,6 +170,8 @@ typedef list< typelib_TypeDescription * > TypeDescriptionList_Impl;
 // # of cached elements
 static sal_Int32 nCacheSize = 256;
 
+namespace {
+
 struct TypeDescriptor_Init_Impl
 {
     //sal_Bool          bDesctructorCalled;
@@ -206,6 +214,8 @@ struct TypeDescriptor_Init_Impl
     ~TypeDescriptor_Init_Impl();
 };
 
+}
+
 inline Mutex & TypeDescriptor_Init_Impl::getMutex()
 {
     if( !pMutex )
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 71c87bec7c37..f6b11352cf14 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -33,12 +33,15 @@
 
 using namespace com::sun::star;
 
+namespace {
 
 struct oslThreadIdentifier_equal
 {
     bool operator()(oslThreadIdentifier s1, oslThreadIdentifier s2) const;
 };
 
+}
+
 bool oslThreadIdentifier_equal::operator()(oslThreadIdentifier s1, oslThreadIdentifier s2) const
 {
     bool result = s1 == s2;
@@ -46,12 +49,15 @@ bool oslThreadIdentifier_equal::operator()(oslThreadIdentifier s1, oslThreadIden
     return result;
 }
 
+namespace {
 
 struct oslThreadIdentifier_hash
 {
     size_t operator()(oslThreadIdentifier s1) const;
 };
 
+}
+
 size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
 {
     return s1;
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 6b7ad09f98c6..c6dab40cefe8 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -28,6 +28,8 @@
 
 using namespace ::com::sun::star;
 
+namespace {
+
 struct IdentityMapping : public uno_Mapping
 {
     sal_Int32        m_nRef;
@@ -36,6 +38,8 @@ struct IdentityMapping : public uno_Mapping
     explicit IdentityMapping(uno::Environment const & rEnv);
 };
 
+}
+
 extern "C"
 {
 
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 13df4d8814e7..f57f7dc0ac87 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -30,6 +30,8 @@
 
 using namespace com::sun::star;
 
+namespace {
+
 class MediatorMapping : public uno_Mapping
 {
     oslInterlockedCount m_refCount;
@@ -53,6 +55,8 @@ public:
                     uno_Environment * pTo);
 };
 
+}
+
 extern "C" {
 static void s_acquire(uno_Mapping * mapping)
 {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index a97d2a0dc829..ad27087b9b02 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -53,6 +53,8 @@ using namespace com::sun::star::uno;
 namespace cppu
 {
 
+namespace {
+
 class Mapping
 {
     uno_Mapping * _pMapping;
@@ -80,6 +82,8 @@ public:
         { return (_pMapping != nullptr); }
 };
 
+}
+
 inline Mapping::Mapping( uno_Mapping * pMapping )
     : _pMapping( pMapping )
 {
@@ -110,6 +114,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping )
     return *this;
 }
 
+namespace {
 
 struct MappingEntry
 {
@@ -134,6 +139,8 @@ struct FctPtrHash
         { return reinterpret_cast<size_t>(pKey); }
 };
 
+}
+
 typedef std::unordered_map<
     OUString, MappingEntry * > t_OUString2Entry;
 typedef std::unordered_map<
@@ -141,6 +148,7 @@ typedef std::unordered_map<
 
 typedef set< uno_getMappingFunc > t_CallbackSet;
 
+namespace {
 
 struct MappingsData
 {
@@ -155,6 +163,8 @@ struct MappingsData
     set<OUString>       aNegativeLibs;
 };
 
+}
+
 static MappingsData & getMappingsData()
 {
     //TODO  This memory is leaked; see #i63473# for when this should be
@@ -164,6 +174,8 @@ static MappingsData & getMappingsData()
     return *s_p;
 }
 
+namespace {
+
 /**
  * This class mediates two different mapping via uno, e.g. form any language to uno,
  * then from uno to any other language.
@@ -185,6 +197,9 @@ struct uno_Mediate_Mapping : public uno_Mapping
         const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
         const OUString & rAddPurpose );
 };
+
+}
+
 extern "C"
 {
 
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 43a9d87df927..0dcebbbac16a 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -32,6 +32,8 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
+namespace {
+
 struct ContainerStats {
     int m_nAlive;
     int m_nDisposed;
@@ -51,6 +53,8 @@ public:
     }
 };
 
+}
+
 namespace cppu_ifcontainer
 {
     class IfTest : public CppUnit::TestFixture
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 5d6294704f7f..6d70b7817fa7 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -72,6 +72,8 @@ static void try_dispose( Reference< lang::XComponent > const & xComp )
     }
 }
 
+namespace {
+
 class DisposingForwarder
     : public WeakImplHelper< lang::XEventListener >
 {
@@ -91,6 +93,8 @@ public:
     virtual void SAL_CALL disposing( lang::EventObject const & rSource ) override;
 };
 
+}
+
 inline void DisposingForwarder::listen(
     Reference< lang::XComponent > const & xSource,
     Reference< lang::XComponent > const & xTarget )
@@ -107,6 +111,7 @@ void DisposingForwarder::disposing( lang::EventObject const & )
     m_xTarget.clear();
 }
 
+namespace {
 
 struct MutexHolder
 {
@@ -167,6 +172,8 @@ public:
     virtual sal_Bool SAL_CALL hasElements() override;
 };
 
+}
+
 // XNameContainer
 
 void ComponentContext::insertByName(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index d61639566110..8a951033cc08 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -54,6 +54,8 @@ using namespace com::sun::star::registry;
 namespace cppu
 {
 
+namespace {
+
 class OSingleFactoryHelper
     : public XServiceInfo
     , public XSingleServiceFactory
@@ -113,6 +115,9 @@ protected:
     Sequence< OUString >             aServiceNames;
     OUString                         aImplementationName;
 };
+
+}
+
 OSingleFactoryHelper::~OSingleFactoryHelper()
 {
 }
@@ -222,6 +227,8 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
     return aServiceNames;
 }
 
+namespace {
+
 struct OFactoryComponentHelper_Mutex
 {
     Mutex   aMutex;
@@ -285,6 +292,7 @@ protected:
     bool isInstance() const {return xTheInstance.is();}
 };
 
+}
 
 Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
 {
@@ -426,6 +434,8 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification()
     return true;
 }
 
+namespace {
+
 class ORegistryFactoryHelper : public OFactoryComponentHelper,
                                public OPropertySetHelper
 
@@ -495,6 +505,8 @@ protected:
     using OPropertySetHelper::getTypes;
 };
 
+}
+
 // XInterface
 
 Any SAL_CALL ORegistryFactoryHelper::queryInterface(
@@ -800,6 +812,8 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification()
     return retVal;
 }
 
+namespace {
+
 class OFactoryProxyHelper : public WeakImplHelper< XServiceInfo, XSingleServiceFactory,
                                                     XUnloadingPreference >
 {
@@ -824,6 +838,8 @@ public:
 
 };
 
+}
+
 // XSingleServiceFactory
 Reference<XInterface > OFactoryProxyHelper::createInstance()
 {
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 3f39522b008c..53aeb8f4d4b1 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -67,6 +67,8 @@ static int compare_OUString_Property_Impl( const void *arg1, const void *arg2 )
  * The class which implements the PropertySetInfo interface.
  */
 
+namespace {
+
 class OPropertySetHelperInfo_Impl
     : public WeakImplHelper< css::beans::XPropertySetInfo >
 {
@@ -81,6 +83,7 @@ public:
     virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) override;
 };
 
+}
 
 /**
  * Create an object that implements XPropertySetInfo IPropertyArrayHelper.
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 8666fadc6554..970688d736b6 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -597,6 +597,7 @@ static void typelib_callback(
 }
 }
 
+namespace {
 
 class EventListenerImpl
     : public WeakImplHelper< lang::XEventListener >
@@ -613,6 +614,8 @@ public:
     virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) override;
 };
 
+}
+
 void EventListenerImpl::disposing( lang::EventObject const & rEvt )
 {
     if (rEvt.Source != m_xTDMgr) {
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 3dbfdfa843d6..98f437482d94 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -223,6 +223,8 @@ static Reference< XInterface > loadComponent(
     return xInstance;
 }
 
+namespace {
+
 class OInstanceProvider
     : public WeakImplHelper< XInstanceProvider >
 {
@@ -260,6 +262,8 @@ public:
     virtual Reference< XInterface > SAL_CALL getInstance( const OUString & rName ) override;
 };
 
+}
+
 inline Reference< XInterface > OInstanceProvider::createInstance()
 {
     Reference< XInterface > xRet;
@@ -318,6 +322,8 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
         "no such element \"" + rName + "\"!" );
 }
 
+namespace {
+
 struct ODisposingListener : public WeakImplHelper< XEventListener >
 {
     Condition cDisposed;
@@ -328,6 +334,8 @@ struct ODisposingListener : public WeakImplHelper< XEventListener >
     static void waitFor( const Reference< XComponent > & xComp );
 };
 
+}
+
 void ODisposingListener::disposing( const EventObject & )
 {
     cDisposed.set();
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9c65d47cf6da..44bca8f89a5b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1805,6 +1805,8 @@ void SentenceEditWindow_Impl::SetText( const OUString& rStr )
     m_xEditEngine->SetText(rStr);
 }
 
+namespace {
+
 struct LanguagePosition_Impl
 {
     sal_Int32       nPosition;
@@ -1815,6 +1817,9 @@ struct LanguagePosition_Impl
         eLanguage(eLang)
         {}
 };
+
+}
+
 typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl;
 
 static void lcl_InsertBreakPosition_Impl(
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index e3b46bcdec87..565c3ca2c8b1 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -144,6 +144,8 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f
     }
 }
 
+namespace {
+
 class ColorPreviewControl : public weld::CustomWidgetController
 {
 private:
@@ -172,6 +174,8 @@ public:
     }
 };
 
+}
+
 void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     rRenderContext.SetFillColor(m_aColor);
@@ -187,6 +191,8 @@ enum ColorMode { HUE, SATURATION, BRIGHTNESS, RED, GREEN, BLUE };
 
 const ColorMode DefaultMode = HUE;
 
+namespace {
+
 class ColorFieldControl : public weld::CustomWidgetController
 {
 public:
@@ -243,6 +249,8 @@ private:
     std::vector<sal_uInt16> maPercent_Vert;
 };
 
+}
+
 void ColorFieldControl::UpdateBitmap()
 {
     const Size aSize(GetOutputSizePixel());
@@ -506,6 +514,8 @@ void ColorFieldControl::UpdatePosition()
     ShowPosition(Point(static_cast<long>(mdX * aSize.Width()), static_cast<long>((1.0 - mdY) * aSize.Height())), false);
 }
 
+namespace {
+
 class ColorSliderControl : public weld::CustomWidgetController
 {
 public:
@@ -540,6 +550,8 @@ private:
     double mdValue;
 };
 
+}
+
 ColorSliderControl::ColorSliderControl()
     : meMode( DefaultMode )
     , mnLevel( 0 )
@@ -714,6 +726,8 @@ void ColorSliderControl::SetValue(const Color& rColor, ColorMode eMode, double d
     }
 }
 
+namespace {
+
 class ColorPickerDialog : public weld::GenericDialogController
 {
 private:
@@ -774,6 +788,8 @@ private:
     double mdCyan, mdMagenta, mdYellow, mdKey;
 };
 
+}
+
 ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nDialogMode)
     : GenericDialogController(pParent, "cui/ui/colorpickerdialog.ui", "ColorPicker")
     , m_xColorField(new weld::CustomWeld(*m_xBuilder, "colorField", m_aColorField))
@@ -1192,6 +1208,8 @@ void ColorPickerDialog::setColorComponent( ColorComponent nComp, double dValue )
 
 typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase;
 
+namespace {
+
 class ColorPicker : protected ::cppu::BaseMutex,    // Struct for right initialization of mutex member! Must be first of baseclasses.
                     public ColorPickerBase
 {
@@ -1220,6 +1238,8 @@ private:
     Reference<css::awt::XWindow> mxParent;
 };
 
+}
+
 OUString ColorPicker_getImplementationName()
 {
     return "com.sun.star.cui.ColorPicker";
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index e3b0b2e5d592..a90d1725a50d 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -76,7 +76,6 @@ namespace svx
                 m_rDev.Pop();
             }
         };
-    }
 
     /** a class which allows to draw two texts in a pseudo-ruby way (which basically
         means one text above or below the other, and a little bit smaller)
@@ -105,6 +104,8 @@ namespace svx
             ::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation );
     };
 
+    }
+
     PseudoRubyText::PseudoRubyText()
         : m_ePosition(eAbove)
     {
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 3e875bef1994..a68388d83031 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -55,6 +55,8 @@ using namespace ::com::sun::star;
 |*
 |************************************************************************/
 
+namespace {
+
 struct DocumentTypeData
 {
     OUString aStrURL;
@@ -63,6 +65,8 @@ struct DocumentTypeData
     {}
 };
 
+}
+
 bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const
 {
     bool bIsValidURL = !rPath.isEmpty();
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 08d1798b42e5..3b985b2b0d40 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -41,6 +41,8 @@
 
 using namespace ::com::sun::star;
 
+namespace {
+
 // Userdata-struct for tree-entries
 struct TargetData
 {
@@ -55,6 +57,8 @@ struct TargetData
     }
 };
 
+}
+
 //*** Window-Class ***
 // Constructor / Destructor
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(weld::Window* pParentDialog, SvxHyperlinkTabPageBase *pParentPage)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index f8388ece411c..c70fa676a315 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -46,6 +46,8 @@
 using namespace sfx2;
 using namespace ::com::sun::star;
 
+namespace {
+
 class SvBaseLinkMemberList {
 private:
     std::vector<SvBaseLink*> mLinks;
@@ -71,6 +73,8 @@ public:
     }
 };
 
+}
+
 SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent, LinkManager* pMgr, bool bHtmlMode)
     : GenericDialogController(pParent, "cui/ui/baselinksdialog.ui", "BaseLinksDialog")
     , aStrAutolink( CuiResId( STR_AUTOLINK ) )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 80e28b271b63..039f713d2279 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1375,6 +1375,8 @@ VclPtr<AbstractSvxPostItDialog> AbstractDialogFactory_Impl::CreateSvxPostItDialo
     return VclPtr<AbstractSvxPostItDialog_Impl>::Create(std::make_unique<SvxPostItDialog>(pParent, rCoreSet, bPrevNext));
 }
 
+namespace {
+
 class SvxMacroAssignDialog : public VclAbstractDialog
 {
 public:
@@ -1393,6 +1395,8 @@ private:
     std::unique_ptr<SvxMacroAssignDlg>      m_xDialog;
 };
 
+}
+
 short SvxMacroAssignDialog::Execute()
 {
     return m_xDialog->run();
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 89feb5760f41..07d68df2dd65 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -44,12 +44,16 @@ using namespace com::sun::star::beans;
 const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation";
 const sal_Char cCharacterCompressionType[] = "CharacterCompressionType";
 
+namespace {
+
 struct SvxForbiddenChars_Impl
 {
     bool                                  bRemoved;
     std::unique_ptr<ForbiddenCharacters>  pCharacters;
 };
 
+}
+
 struct SvxAsianLayoutPage_Impl
 {
     SvxAsianConfig  aConfig;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 56e75fecd969..244cbbbf0dea 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -159,8 +159,6 @@ const vEntryInfo[] =
     #undef IDS
 };
 
-} // namespace
-
 // ColorConfigWindow_Impl
 
 class ColorConfigWindow_Impl
@@ -260,6 +258,8 @@ private:
     bool IsGroupVisible (Group) const;
 };
 
+} // namespace
+
 // ColorConfigWindow_Impl::Chapter
 
 // ctor for default groups
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5e394e9753e3..dca1b491932f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -113,6 +113,8 @@ static bool KillFile_Impl( const OUString& rURL )
 #define TYPE_HYPH       sal_uInt8(3)
 #define TYPE_THES       sal_uInt8(4)
 
+namespace {
+
 class ModuleUserData_Impl
 {
     bool bParent;
@@ -156,6 +158,7 @@ public:
     bool        IsDeletable() const         { return static_cast<bool>((nVal >> 10) & 0x01); }
 };
 
+}
 
 DicUserData::DicUserData(
         sal_uInt16 nEID,
@@ -212,6 +215,8 @@ static OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
     return OUString::createFromAscii( aEidToPropName[ static_cast<int>(eEntryId) ] );
 }
 
+namespace {
+
 class OptionsBreakSet : public weld::GenericDialogController
 {
     std::unique_ptr<weld::Widget> m_xBeforeFrame;
@@ -273,6 +278,8 @@ public:
     void        SetNumericValue( sal_uInt8 nNumVal );
 };
 
+}
+
 OptionsUserData::OptionsUserData( sal_uInt16 nEID,
         bool bHasNV, sal_uInt16 nNumVal,
         bool bCheckable, bool bChecked )
@@ -298,6 +305,8 @@ void OptionsUserData::SetNumericValue( sal_uInt8 nNumVal )
 
 // ServiceInfo_Impl ----------------------------------------------------
 
+namespace {
+
 struct ServiceInfo_Impl
 {
     OUString                    sDisplayName;
@@ -314,6 +323,8 @@ struct ServiceInfo_Impl
     ServiceInfo_Impl() : bConfigured(false) {}
 };
 
+}
+
 typedef std::vector< ServiceInfo_Impl >                   ServiceInfoArr;
 typedef std::map< LanguageType, Sequence< OUString > >    LangImplNameTable;
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index b287852f2329..a35f98ec3248 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -74,6 +74,8 @@ struct OptPath_Impl
     }
 };
 
+namespace {
+
 struct PathUserData_Impl
 {
     sal_uInt16      nRealId;
@@ -96,6 +98,8 @@ struct Handle2CfgNameMapping_Impl
     const char* m_pCfgName;
 };
 
+}
+
 static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
 {
     { SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" },
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f36a8ab76029..8b7c32b051bd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -130,6 +130,8 @@ static OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
     return aUserData;
 }
 
+namespace {
+
 struct ModuleToGroupNameMap_Impl
 {
     const char* m_pModule;
@@ -137,6 +139,8 @@ struct ModuleToGroupNameMap_Impl
     sal_uInt16  m_nNodeId;
 };
 
+}
+
 static ModuleToGroupNameMap_Impl ModuleMap[] =
 {
     { "ProductName", OUString(), SID_GENERAL_OPTIONS },
@@ -232,6 +236,8 @@ static sal_uInt16 getGroupNodeId( const OUString& rModule )
     return nNodeId;
 }
 
+namespace {
+
 class MailMergeCfg_Impl : public utl::ConfigItem
 {
 private:
@@ -250,6 +256,8 @@ public:
 
 };
 
+}
+
 MailMergeCfg_Impl::MailMergeCfg_Impl() :
     utl::ConfigItem("Office.Writer/MailMergeWizard"),
     bIsEmailSupported(false)
@@ -314,6 +322,8 @@ static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, weld::Co
     return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
 }
 
+namespace {
+
 struct OptionsMapping_Impl
 {
     const char* m_pGroupName;
@@ -321,6 +331,8 @@ struct OptionsMapping_Impl
     sal_uInt16      m_nPageId;
 };
 
+}
+
 static OptionsMapping_Impl const OptionsMap_Impl[] =
 {
 //    GROUP                 PAGE                    PAGE-ID
@@ -450,6 +462,8 @@ struct OptionsPageInfo
     explicit OptionsPageInfo( sal_uInt16 nId ) : m_nPageId( nId ) {}
 };
 
+namespace {
+
 struct OptionsGroupInfo
 {
     std::unique_ptr<SfxItemSet> m_pInItemSet;
@@ -463,6 +477,8 @@ struct OptionsGroupInfo
         m_pModule( pMod ), m_nDialogId( nId ) {}
 };
 
+}
+
 #define INI_LIST() \
     , m_pParent           ( pParent )\
     , sTitle              ( m_xDialog->get_title() )\
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index edb129d8c227..4952e7b8203c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -283,6 +283,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet* )
 /*                                                                   */
 /*********************************************************************/
 
+namespace {
+
 struct ImpUserData
 {
     OUString  *pString;
@@ -321,8 +323,6 @@ public:
 /*                                                                   */
 /*********************************************************************/
 
-namespace {
-
 enum OfaAutoFmtOptions
 {
     USE_REPLACE_TABLE,
@@ -2139,6 +2139,8 @@ std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(weld::Container* p
     return std::make_unique<OfaSmartTagOptionsTabPage>(pPage, pController, *rSet);
 }
 
+namespace {
+
 /** This struct is used to associate list box entries with smart tag data
 */
 struct ImplSmartTagLBUserData
@@ -2155,6 +2157,8 @@ struct ImplSmartTagLBUserData
         mnSmartTagIdx( nSmartTagIdx ) {}
 };
 
+}
+
 /** Clears m_xSmartTagTypesLB
 */
 void OfaSmartTagOptionsTabPage::ClearListBox()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 33a0649d21e6..24251a1800c1 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -55,6 +55,8 @@ struct FrmMap
     LB                              nLBRelations;
 };
 
+namespace {
+
 struct RelationMap
 {
     SvxSwFramePosString::StringId   eStrId;
@@ -68,8 +70,6 @@ struct StringIdPair_Impl
     SvxSwFramePosString::StringId eVert;
 };
 
-namespace {
-
 enum class LB {
     NONE                = 0x000000,
     Frame               = 0x000001, // paragraph text area
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index e1bb46b087f7..bbbe232a292d 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -44,11 +44,14 @@ void Tdf119625Test::setUp()
     osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData);
 }
 
+namespace
+{
 struct expect_t
 {
     sal_Int16 id;
     sal_Int16 h, m, s;
 };
+}
 
 /* The values here assume that our results are in UTC.  However,
    tdf#119675 "Firebird: Migration: User dialog to set treatment of
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 9d41b95809aa..45b386ed1901 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -43,11 +43,14 @@ void Tdf126268Test::setUp()
     osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData);
 }
 
+namespace
+{
 struct expect_t
 {
     sal_Int16 id;
     OUString number;
 };
+}
 
 static const expect_t expect[] = {
     { 1, "0.00" },   { 2, "25.00" },  { 3, "26.00" }, { 4, "30.4" },  { 5, "45.8" },
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index c69cc4158a14..3cc33cfe323b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -100,6 +100,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::
     }
 
     typedef ::boost::optional< OUString >    OptionalString;
+
+    namespace {
+
     struct TableInfo
     {
         OptionalString  sComposedName;
@@ -123,6 +126,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::
         {
         }
     };
+
+    }
+
     typedef std::vector< TableInfo >    TableInfos;
 
     static void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 30ffe0cfadda..c8a287cde253 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2031,6 +2031,8 @@ Reference< XInterface > ODatabaseDocument::getThis() const
     return *const_cast< ODatabaseDocument* >( this );
 }
 
+namespace {
+
 struct CreateAny
 {
     Any operator() (const Reference<XController>& lhs) const
@@ -2039,6 +2041,8 @@ struct CreateAny
     }
 };
 
+}
+
 // XModel2
 Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers(  )
 {
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 9178e60efd85..516873746d7a 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -70,6 +70,9 @@ namespace dbaccess
     // DatabaseRegistrations - declaration
     typedef ::cppu::WeakAggImplHelper1  <   XDatabaseRegistrations
                                         >   DatabaseRegistrations_Base;
+
+    namespace {
+
     class DatabaseRegistrations :public ::cppu::BaseMutex
                                 ,public DatabaseRegistrations_Base
     {
@@ -137,6 +140,8 @@ namespace dbaccess
         ::comphelper::OInterfaceContainerHelper2  m_aRegistrationListeners;
     };
 
+    }
+
     // DatabaseRegistrations - implementation
     DatabaseRegistrations::DatabaseRegistrations( const Reference<XComponentContext> & _rxContext )
         :m_aContext( _rxContext )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 95aef3c1a236..a605b2e0c907 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -98,6 +98,8 @@ using namespace ::comphelper;
 namespace dbaccess
 {
 
+namespace {
+
 /** helper class which implements a XFlushListener, and forwards all
     notification events to another XFlushListener
 
@@ -133,6 +135,8 @@ protected:
     virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 };
 
+}
+
 FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
     :m_aBroadcaster( _rxBroadcaster )
     ,m_aListener( _rxListener )
@@ -255,6 +259,8 @@ void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentic
     SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!");
 }
 
+namespace {
+
 /** The class OSharedConnectionManager implements a structure to share connections.
     It owns the master connections which will be disposed when the last connection proxy is gone.
 */
@@ -269,6 +275,8 @@ struct TDigestHolder
 
 };
 
+}
+
 class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener >
 {
 
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index c30f15000323..05f0da16f474 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -59,6 +59,8 @@ using namespace ::cppu;
 namespace dbaccess
 {
 
+namespace {
+
 // LocalNameApproval
 class LocalNameApproval : public IContainerApprove
 {
@@ -68,6 +70,8 @@ public:
     void approveElement( const OUString& _rName ) override;
 };
 
+}
+
 void LocalNameApproval::approveElement( const OUString& _rName )
 {
     if ( _rName.indexOf( '/' ) != -1 )
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 9c89e4da2b8a..511cc0147775 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -156,6 +156,9 @@ namespace dbaccess
 
     // OEmbedObjectHolder
     typedef ::cppu::WeakComponentImplHelper<   embed::XStateChangeListener > TEmbedObjectHolder;
+
+    namespace {
+
     class OEmbedObjectHolder :   public ::cppu::BaseMutex
                                 ,public TEmbedObjectHolder
     {
@@ -184,6 +187,8 @@ namespace dbaccess
         virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
     };
 
+    }
+
     void SAL_CALL OEmbedObjectHolder::disposing()
     {
         if ( m_xBroadCaster.is() )
@@ -235,6 +240,8 @@ namespace dbaccess
         }
     };
 
+    namespace {
+
     // LockModifiable
     class LockModifiable
     {
@@ -267,9 +274,14 @@ namespace dbaccess
         Reference< XModifiable2 >   m_xModifiable;
     };
 
+    }
+
     // LifetimeCoupler
     typedef ::cppu::WeakImplHelper<   css::lang::XEventListener
                                   >   LifetimeCoupler_Base;
+
+    namespace {
+
     /** helper class which couples the lifetime of a component to the lifetime
         of another component
 
@@ -309,11 +321,15 @@ namespace dbaccess
     protected:
     };
 
+    }
+
     void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ )
     {
         m_xClient.clear();
     }
 
+    namespace {
+
     // ODocumentSaveContinuation
     class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave >
     {
@@ -330,6 +346,8 @@ namespace dbaccess
         virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) override;
     };
 
+    }
+
     void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent)
     {
         m_sName = _sName;
@@ -531,6 +549,8 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const
     return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) );
 }
 
+namespace {
+
 class OExecuteImpl
 {
     bool& m_rbSet;
@@ -539,8 +559,6 @@ public:
     ~OExecuteImpl(){ m_rbSet = false; }
 };
 
-namespace
-{
     bool lcl_extractOpenMode( const Any& _rValue, sal_Int32& _out_rMode )
     {
         OpenCommandArgument aOpenCommand;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 418d466ad816..a6705d850161 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -56,6 +56,8 @@ namespace dbaccess
         const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete;
     };
 
+    namespace {
+
     // helper
     struct DocumentEventData
     {
@@ -63,8 +65,6 @@ namespace dbaccess
         bool            bNeedsSyncNotify;
     };
 
-    namespace
-    {
         const DocumentEventData* lcl_getDocumentEventData()
         {
             static const DocumentEventData s_aData[] = {
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 7a567de02326..b0143978df73 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -89,12 +89,16 @@ OInterceptor::~OInterceptor()
 {
 }
 
+namespace {
+
 struct DispatchHelper
 {
     URL aURL;
     Sequence<PropertyValue > aArguments;
 };
 
+}
+
 //XDispatch
 void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments )
 {
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index f1d03b10e915..04db3216cef0 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -42,6 +42,8 @@ using namespace dbaccess;
 namespace dbaccess
 {
 
+namespace {
+
 // struct ResultListEntry.
 struct ResultListEntry
 {
@@ -54,6 +56,8 @@ struct ResultListEntry
     explicit ResultListEntry(const ContentProperties& rEntry) : rData( rEntry ) {}
 };
 
+}
+
 // struct DataSupplier_Impl.
 struct DataSupplier_Impl
 {
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 41020966602b..f569307fdf3a 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -165,6 +165,8 @@ namespace dbaccess
         static const char sCurrentQueryDesignName[] = "ooo:current-query-design";
     }
 
+    namespace {
+
     // SettingsExportContext
     class SettingsExportContext : public ::xmloff::XMLSettingsExportContext
     {
@@ -202,6 +204,8 @@ namespace dbaccess
         const OUString m_aNamespace;
     };
 
+    }
+
     void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue )
     {
         m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue );
@@ -239,6 +243,9 @@ namespace dbaccess
     // SettingsDocumentHandler
     typedef ::cppu::WeakImplHelper<   XDocumentHandler
                                   >   SettingsDocumentHandler_Base;
+
+    namespace {
+
     class SettingsDocumentHandler : public SettingsDocumentHandler_Base
     {
     public:
@@ -269,6 +276,8 @@ namespace dbaccess
         ::comphelper::NamedValueCollection                  m_aSettings;
     };
 
+    }
+
     void SAL_CALL SettingsDocumentHandler::startDocument(  )
     {
     }
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index ee3478412a81..0116f8691986 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -90,6 +90,8 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 namespace dbaxml
 {
 
+namespace {
+
 class DBTypeDetection : public ::cppu::WeakImplHelper< XExtendedFilterDetection, XServiceInfo>
 {
     const Reference< XComponentContext >  m_aContext;
@@ -114,6 +116,8 @@ public:
     virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 };
 
+}
+
 DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContext)
     :m_aContext( _rxContext )
 {
@@ -220,6 +224,8 @@ extern "C" void createRegistryInfo_DBTypeDetection()
 namespace dbaxml
 {
 
+namespace {
+
 class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader, XServiceInfo>
 {
 private:
@@ -256,6 +262,7 @@ private:
     bool impl_executeNewDatabaseWizard( Reference< XModel > const & _rxModel, bool& _bShouldStartTableWizard );
 };
 
+}
 
 DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactory)
     :m_aContext( _rxFactory )
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index cf9f3a75dff7..43a199f2b91e 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -67,6 +67,8 @@ using namespace ::com::sun::star;
 
 namespace dbaxml
 {
+    namespace {
+
     class ODBExportHelper
     {
     public:
@@ -85,6 +87,8 @@ namespace dbaxml
         static Sequence< OUString > getSupportedServiceNames_Static(  );
         static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
+
+    }
 }
 
 extern "C" void createRegistryInfo_ODBFilterExport( )
@@ -165,6 +169,8 @@ namespace dbaxml
         }
     }
 
+    namespace {
+
     class OSpecialHandleXMLExportPropertyMapper : public SvXMLExportPropertyMapper
     {
     public:
@@ -184,6 +190,9 @@ namespace dbaxml
             // nothing to do here
         }
     };
+
+    }
+
 ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag)
 : SvXMLExport( util::MeasureUnit::MM_10TH, _rxContext, implementationName, XML_DATABASE,
         SvXMLExportFlags::OASIS | nExportFlag)
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 80faab524164..2d5733dfee07 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -408,6 +408,8 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
+namespace {
+
 class DBXMLDocumentSettingsContext : public SvXMLImportContext
 {
 public:
@@ -541,6 +543,8 @@ public:
     }
 };
 
+}
+
 SvXMLImportContext* ODBFilter::CreateDocumentContext(sal_uInt16 const nPrefix,
                                       const OUString& rLocalName,
                                       const uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index f5b8455b037d..d067a042afa8 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -55,6 +55,8 @@ namespace sdbtools
     namespace CommandType = ::com::sun::star::sdb::CommandType;
     namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
+    namespace {
+
     // INameValidation
     class INameValidation
     {
@@ -64,8 +66,13 @@ namespace sdbtools
 
         virtual ~INameValidation() { }
     };
+
+    }
+
     typedef std::shared_ptr< INameValidation >   PNameValidation;
 
+    namespace {
+
     // PlainExistenceCheck
     class PlainExistenceCheck : public INameValidation
     {
@@ -263,6 +270,8 @@ namespace sdbtools
         static  void    verifyCommandType( sal_Int32 _nCommandType );
     };
 
+    }
+
     void NameCheckFactory::verifyCommandType( sal_Int32 _nCommandType )
     {
         if  (   ( _nCommandType != CommandType::TABLE )
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f79c6d3e030f..df35c9a36111 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -179,6 +179,12 @@ Reference< XInterface > OApplicationController::Create(const Reference<XMultiSer
     return *(new OApplicationController( comphelper::getComponentContext(_rxFactory)));
 }
 
+namespace {
+
+class SelectionGuard;
+
+}
+
 // OApplicationController
 class SelectionNotifier
 {
@@ -214,7 +220,7 @@ public:
         m_aSelectionListeners.disposeAndClear( aEvent );
     }
 
-    struct SelectionGuardAccess { friend class SelectionGuard; private: SelectionGuardAccess() { }  };
+    struct SelectionGuardAccess { friend SelectionGuard; private: SelectionGuardAccess() { }  };
 
     /** enters a block which modifies the selection of our owner.
 
@@ -243,6 +249,8 @@ public:
     }
 };
 
+namespace {
+
 class SelectionGuard
 {
 public:
@@ -264,6 +272,8 @@ private:
     SelectionNotifier&  m_rNotifier;
 };
 
+}
+
 // OApplicationController
 OApplicationController::OApplicationController(const Reference< XComponentContext >& _rxORB)
     :OGenericUnoController( _rxORB )
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 803f00f56e5a..818b423a205b 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -133,6 +133,8 @@ using namespace ::svt;
 namespace dbaui
 {
 
+namespace {
+
 // OParameterContinuation
 class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
 {
@@ -147,6 +149,8 @@ public:
     virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
 };
 
+}
+
 void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
 {
     m_aValues = _rValues;
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 35df7976f0d6..5a5c46048f0a 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -62,6 +62,8 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace dbaui;
 
+namespace {
+
 class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader, XServiceInfo>
 {
 private:
@@ -92,6 +94,7 @@ public:
     virtual void SAL_CALL cancel() override;
 };
 
+}
 
 DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContext)
     :m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 644c3417065e..a5dc5e061720 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -87,6 +87,8 @@ typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
 namespace dbaui
 {
 
+namespace {
+
 // UserDefinedFeatures
 class UserDefinedFeatures
 {
@@ -99,6 +101,8 @@ private:
     css::uno::WeakReference< XController > m_aController;
 };
 
+}
+
 UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxController )
     :m_aController( _rxController )
 {
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 42ed0377446c..43655259bc06 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1188,6 +1188,8 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
 
 }
 
+    namespace {
+
 /// unary_function Functor object for class ZZ returntype is void
     struct SbaGridControlPrec
     {
@@ -1204,6 +1206,9 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
             return false;
         }
     };
+
+    }
+
 sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
 {
     sal_Int8 nAction = DND_ACTION_NONE;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index c5cb06c6c645..40efd0d7485b 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -543,12 +543,16 @@ OUString ODbDataSourceAdministrationHelper::getConnectionURL() const
     return sNewUrl;
 }
 
+namespace {
+
 struct PropertyValueLess
 {
     bool operator() (const PropertyValue& x, const PropertyValue& y) const
         { return x.Name < y.Name; }      // construct prevents a MSVC6 warning
 };
 
+}
+
 typedef std::set<PropertyValue, PropertyValueLess> PropertyValueSet;
 
 void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPropertySet >& _rxSource, SfxItemSet& _rDest)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 0310967fa290..3a2804b3ac32 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -50,6 +50,8 @@ using namespace dbaui;
 using namespace ucbhelper;
 using namespace comphelper;
 
+namespace {
+
 class OPasswordDialog : public weld::GenericDialogController
 {
     std::unique_ptr<weld::Frame> m_xUser;
@@ -68,6 +70,8 @@ public:
     OUString        GetNewPassword() const { return m_xEDPassword->get_text(); }
 };
 
+}
+
 OPasswordDialog::OPasswordDialog(weld::Window* _pParent,const OUString& rUserName)
     : GenericDialogController(_pParent, "dbaccess/ui/password.ui", "PasswordDialog")
     , m_xUser(m_xBuilder->weld_frame("userframe"))
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e69987042145..04dceaa09259 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -54,6 +54,8 @@ TableObjectListFacade::~TableObjectListFacade()
 {
 }
 
+namespace {
+
 class TableListFacade : public ::cppu::BaseMutex
                     ,   public TableObjectListFacade
                     ,   public ::comphelper::OContainerListener
@@ -84,6 +86,8 @@ private:
     virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 };
 
+}
+
 TableListFacade::~TableListFacade()
 {
     if ( m_pContainerListener.is() )
@@ -233,6 +237,8 @@ bool TableListFacade::isLeafSelected() const
     return bEntry && !rTableList.iter_has_child(*xEntry);
 }
 
+namespace {
+
 class QueryListFacade : public ::cppu::BaseMutex
                     ,   public TableObjectListFacade
                     ,   public ::comphelper::OContainerListener
@@ -261,6 +267,8 @@ private:
     virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 };
 
+}
+
 QueryListFacade::~QueryListFacade()
 {
     if ( m_pContainerListener.is() )
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index c48c4c224c12..047758341b58 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -260,6 +260,8 @@ namespace
     }
 }
 
+namespace {
+
 class OExceptionChainDialog : public weld::GenericDialogController
 {
     std::unique_ptr<weld::TreeView> m_xExceptionList;
@@ -277,6 +279,8 @@ protected:
     DECL_LINK(OnExceptionSelected, weld::TreeView&, void);
 };
 
+}
+
 OExceptionChainDialog::OExceptionChainDialog(weld::Window* pParent, const ExceptionDisplayChain& rExceptions)
     : GenericDialogController(pParent, "dbaccess/ui/sqlexception.ui", "SQLExceptionDialog")
     , m_xExceptionList(m_xBuilder->weld_tree_view("list"))
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 98ec40a808b6..6be2d87fa9a9 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -387,6 +387,8 @@ OUString NamedTableCopySource::getSelectStatement() const
     return const_cast< NamedTableCopySource* >( this )->impl_ensureStatement_throw();
 }
 
+namespace {
+
 // DummyCopySource
 class DummyCopySource : public ICopyTableSourceObject
 {
@@ -410,6 +412,8 @@ public:
                                 getPreparedSelectStatement() const override;
 };
 
+}
+
 const DummyCopySource& DummyCopySource::Instance()
 {
     static DummyCopySource s_aTheInstance;
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 2f1b3e27b194..3c59a58f8b85 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -32,6 +32,8 @@ namespace dbaui
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::Exception;
 
+    namespace {
+
     // AsyncDialogExecutor
     class DialogExecutor_Impl
     {
@@ -57,6 +59,8 @@ namespace dbaui
         DECL_LINK( onExecute, void*, void );
     };
 
+    }
+
     IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute, void*, void )
     {
         try
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 4bd0c9e4426d..599398e5d00f 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -64,6 +64,9 @@ namespace dbaui
     // FrameWindowActivationListener
     typedef ::cppu::WeakImplHelper<   XTopWindowListener
                                   >   FrameWindowActivationListener_Base;
+
+    namespace {
+
     class FrameWindowActivationListener : public FrameWindowActivationListener_Base
     {
     public:
@@ -94,6 +97,8 @@ namespace dbaui
         ControllerFrame_Data*   m_pData;
     };
 
+    }
+
     // ControllerFrame_Data
     struct ControllerFrame_Data
     {
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 0ee8e9985590..d8659ce6157d 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -78,6 +78,8 @@ namespace dbaui
         return static_cast< XUndoManager* >( &rAntiImpl );
     }
 
+    namespace {
+
     // OslMutexFacade
     class OslMutexFacade : public ::framework::IMutex
     {
@@ -96,6 +98,8 @@ namespace dbaui
         ::osl::Mutex&   m_rMutex;
     };
 
+    }
+
     void OslMutexFacade::acquire()
     {
         m_rMutex.acquire();
@@ -106,6 +110,8 @@ namespace dbaui
         m_rMutex.release();
     }
 
+    namespace {
+
     // UndoManagerMethodGuard
     /** guard for public UNO methods of the UndoManager
     */
@@ -133,6 +139,8 @@ namespace dbaui
         OslMutexFacade              m_aMutexFacade;
     };
 
+    }
+
     ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
     {
         return m_aMutexFacade;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 505391d7cdb8..eb3331d6fe88 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -81,6 +81,8 @@ namespace dbaui
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::frame::XUntitledNumbers;
 
+    namespace {
+
     class DataSourceHolder
     {
     public:
@@ -116,6 +118,8 @@ namespace dbaui
         Reference< XOfficeDatabaseDocument >    m_xDocument;
     };
 
+    }
+
     struct DBSubComponentController_Impl
     {
     private:
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 82ccab986fd6..045f5b10bcdc 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -31,6 +31,8 @@ namespace dbaui
     using namespace dbaccess;
     using namespace ::com::sun::star;
 
+    namespace {
+
     struct FeatureSupport
     {
         // authentication mode of the data source
@@ -54,6 +56,8 @@ namespace dbaui
         const sal_Char* pAsciiFeatureName;
     };
 
+    }
+
     // global tables
     static const FeatureMapping* lcl_getFeatureMappings()
     {
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 1d6694c5bf99..3937c3d09d0d 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -96,6 +96,8 @@ namespace dbaui
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::lang;
 
+    namespace {
+
     class OViewController : public OQueryController
     {
         virtual OUString SAL_CALL getImplementationName() override
@@ -127,6 +129,8 @@ namespace dbaui
             return *(new OViewController(comphelper::getComponentContext(_rM)));
         }
     };
+
+    }
 }
 
 extern "C" void createRegistryInfo_OViewControl()
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index bd8e33d436dc..9a2d0e652176 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -35,6 +35,8 @@ namespace dbaui
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
 
+    namespace {
+
     // OAdvancedSettingsDialog
     class OAdvancedSettingsDialog
             :public ODatabaseAdministrationDialog
@@ -71,6 +73,8 @@ namespace dbaui
         virtual std::unique_ptr<weld::DialogController> createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) override;
     };
 
+    }
+
     OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB)
         :ODatabaseAdministrationDialog(_rxORB)
     {
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index edb6805853eb..90fb3cc95b4f 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -142,6 +142,9 @@ namespace dbaui
     typedef ::cppu::ImplInheritanceHelper<   CopyTableWizard_DialogBase
                                          ,   XCopyTableWizard
                                          >   CopyTableWizard_Base;
+
+    namespace {
+
     class CopyTableWizard
             :public CopyTableWizard_Base
             ,public ::comphelper::OPropertyArrayUsageHelper< CopyTableWizard >
@@ -372,6 +375,8 @@ private:
     CopyTableWizard&    m_rWizard;
 };
 
+}
+
 CopyTableWizard::CopyTableWizard( const Reference< XComponentContext >& _rxORB )
     :CopyTableWizard_Base( _rxORB )
     ,m_xContext( _rxORB )
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index ff9e8a3dee0a..879a633cc00e 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -51,12 +51,19 @@ namespace dbaui
 
     // OTextConnectionSettingsDialog
 
+    namespace {
+
     class OTextConnectionSettingsDialog;
+
+    }
+
     typedef ::cppu::ImplInheritanceHelper<   ODatabaseAdministrationDialog
                                          ,   css::sdb::XTextConnectionSettings
                                          >   OTextConnectionSettingsDialog_BASE;
     typedef ::comphelper::OPropertyArrayUsageHelper< OTextConnectionSettingsDialog >    OTextConnectionSettingsDialog_PBASE;
 
+    namespace {
+
     class OTextConnectionSettingsDialog
             :public OTextConnectionSettingsDialog_BASE
             ,public OTextConnectionSettingsDialog_PBASE
@@ -108,6 +115,8 @@ namespace dbaui
         using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
     };
 
+    }
+
     // OTextConnectionSettingsDialog
     OTextConnectionSettingsDialog::OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext )
         :OTextConnectionSettingsDialog_BASE( _rContext )
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2c2d03b967ea..242a539cf08e 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1794,6 +1794,8 @@ void DesktopLOKTest::testRedlineCalc()
         CPPUNIT_ASSERT_EQUAL(std::string("Cell B4 changed from '5' to 't'"), rRedline.second.get<std::string>("description"));
 }
 
+namespace {
+
 class ViewCallback
 {
     LibLODocument_Impl* mpDocument;
@@ -1864,6 +1866,8 @@ public:
     }
 };
 
+}
+
 void DesktopLOKTest::testPaintPartTile()
 {
     // Load an impress doc of 2 slides.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 82422c835210..f448d6e7e507 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1207,6 +1207,8 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
     HandleAppEvent( rAppEvent );
 }
 
+namespace {
+
 struct ExecuteGlobals
 {
     Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
@@ -1221,6 +1223,8 @@ struct ExecuteGlobals
     {}
 };
 
+}
+
 static ExecuteGlobals* pExecGlobals = nullptr;
 
 int Desktop::Main()
@@ -1888,6 +1892,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
     rSettings.SetStyleSettings ( hStyleSettings );
 }
 
+namespace {
 
 class ExitTimer : public Timer
 {
@@ -1903,6 +1908,8 @@ class ExitTimer : public Timer
     }
 };
 
+}
+
 IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
 {
     try {
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 642733efceb2..dc2095a14af5 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -175,6 +175,8 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
     }
 }
 
+namespace {
+
 class enable
 {
     private:
@@ -190,6 +192,8 @@ class enable
     }
 };
 
+}
+
 // enable acceptors
 IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl, void*, void)
 {
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index f3857d8cff57..ade5ad25acc8 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -83,6 +83,8 @@ namespace document = ::com::sun::star::document;
 namespace desktop
 {
 
+namespace {
+
 struct DispatchHolder
 {
     DispatchHolder( const URL& rURL, Reference< XDispatch > const & rDispatch ) :
@@ -92,9 +94,6 @@ struct DispatchHolder
     Reference< XDispatch > xDispatch;
 };
 
-namespace
-{
-
 std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString& rUrl, const OUString& rFactory )
 {
     // create the list of filters
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index e375c17f683c..5a79206c96ee 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -266,6 +266,8 @@ static OUString CreateMD5FromString( const OUString& aMsg )
     return OUString();
 }
 
+namespace {
+
 class ProcessEventsClass_Impl
 {
 public:
@@ -273,6 +275,8 @@ public:
     DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
 };
 
+}
+
 IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
 {
     // Application events are processed by the Desktop::HandleAppEvent implementation.
@@ -1300,6 +1304,8 @@ static void AddConversionsToDispatchList(
     }
 }
 
+namespace {
+
 struct ConditionSetGuard
 {
     osl::Condition* m_pCondition;
@@ -1307,6 +1313,8 @@ struct ConditionSetGuard
     ~ConditionSetGuard() { if (m_pCondition) m_pCondition->set(); }
 };
 
+}
+
 bool RequestHandler::ExecuteCmdLineRequests(
     ProcessDocumentsRequest& aRequest, bool noTerminate)
 {
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 3cfdb338d9b7..000dc46b347c 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -46,6 +46,7 @@ namespace dp_log {
 
 typedef ::cppu::WeakComponentImplHelper<ucb::XProgressHandler> t_log_helper;
 
+namespace {
 
 class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
 {
@@ -65,6 +66,7 @@ public:
     virtual void SAL_CALL pop() override;
 };
 
+}
 
 ProgressLogImpl::~ProgressLogImpl()
 {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e48bb2d0912d..5fb33529c395 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -87,6 +87,7 @@ namespace dp_gui {
 #define SHARED_PACKAGE_MANAGER  "shared"
 #define BUNDLED_PACKAGE_MANAGER "bundled"
 
+namespace {
 
 struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
 {
@@ -97,6 +98,8 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
     }
 };
 
+}
+
 // ExtBoxWithBtns_Impl
 class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
 {
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 31f29368708e..179304795611 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -109,6 +109,7 @@ OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
 
 namespace dp_gui {
 
+namespace {
 
 class ProgressCmdEnv
     : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment,
@@ -199,6 +200,8 @@ struct ExtensionCmd
           m_vExtensionList( vExtensionList ) {};
 };
 
+}
+
 typedef std::shared_ptr< ExtensionCmd > TExtensionCmd;
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 10325631d6a2..fbcb4ed13232 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -49,6 +49,7 @@ namespace sdecl = comphelper::service_decl;
 
 namespace dp_gui {
 
+namespace {
 
 class MyApp : public Application
 {
@@ -63,6 +64,8 @@ public:
     virtual void DeInit() override;
 };
 
+}
+
 MyApp::MyApp()
 {
 }
@@ -133,6 +136,7 @@ static OUString ReplaceProductNameHookProc( const OUString& rStr )
     return sRet;
 }
 
+namespace {
 
 class ServiceImpl
     : public ::cppu::WeakImplHelper<ui::dialogs::XAsynchronousExecutableDialog,
@@ -157,6 +161,7 @@ public:
     virtual void SAL_CALL trigger( OUString const & event ) override;
 };
 
+}
 
 ServiceImpl::ServiceImpl( Sequence<Any> const& args,
                           Reference<XComponentContext> const& xComponentContext)
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9ab343730d89..7f7f14402278 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -41,6 +41,8 @@ using namespace ::com::sun::star::uno;
 
 namespace dp_gui {
 
+namespace {
+
 struct LicenseDialogImpl : public weld::GenericDialogController
 {
     bool m_bLicenseRead;
@@ -74,6 +76,8 @@ struct LicenseDialogImpl : public weld::GenericDialogController
     bool IsEndReached() const;
 };
 
+}
+
 LicenseDialogImpl::LicenseDialogImpl(
     weld::Window * pParent,
     const OUString & sExtensionName,
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 5eafb605c91a..2866d0dccac3 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -61,6 +61,8 @@ namespace xml = com::sun::star::xml ;
 
 namespace dp_info {
 
+namespace {
+
 class PackageInformationProvider :
         public ::cppu::WeakImplHelper< deployment::XPackageInformationProvider >
 
@@ -83,6 +85,7 @@ private:
     uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation;
 };
 
+}
 
 PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) :
     mxContext( xContext ),
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index ac814592daf8..7c79ab43405e 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -90,6 +90,8 @@ extern comphelper::service_decl::ServiceDecl const serviceDecl;
 
 namespace dp_manager {
 
+namespace {
+
 struct MatchTempDir
 {
     OUString m_str;
@@ -99,8 +101,6 @@ struct MatchTempDir
     }
 };
 
-
-namespace {
 OUString getExtensionFolder(OUString const &  parentFolder,
                             Reference<ucb::XCommandEnvironment> const & xCmdEnv,
                             Reference<uno::XComponentContext> const & xContext)
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 5b7c7e11a3f0..f284c7e3cceb 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -36,6 +36,7 @@ namespace factory {
 typedef ::cppu::WeakComponentImplHelper<
     deployment::XPackageManagerFactory > t_pmfac_helper;
 
+namespace {
 
 class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
 {
@@ -63,6 +64,7 @@ public:
         OUString const & context ) override;
 };
 
+}
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<PackageManagerFactoryImpl> const servicePMFI;
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 0701a3492e86..4b66e51ede80 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -48,6 +48,7 @@ namespace backend
 namespace sfwk
 {
 
+namespace {
 
 class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 {
@@ -103,6 +104,8 @@ public:
     virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 };
 
+}
+
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
 {
     BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1e97c1aecc4b..9298be14c0dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -177,12 +177,16 @@ static void SetLastExceptionMsg(const OUString& s = OUString())
         gImpl->maLastExceptionMsg = s;
 }
 
+namespace {
+
 struct ExtensionMap
 {
     const char *extn;
     const char *filterName;
 };
 
+}
+
 static const ExtensionMap aWriterExtensionMap[] =
 {
     { "doc",   "MS Word 97" },
@@ -3237,6 +3241,8 @@ static size_t doc_renderShapeSelection(LibreOfficeKitDocument* pThis, char** pOu
     return 0;
 }
 
+namespace {
+
 /** Class to react on finishing of a dispatched command.
 
     This will call a LOK_COMMAND_FINISHED callback when postUnoCommand was
@@ -3279,6 +3285,8 @@ public:
     virtual void SAL_CALL disposing(const css::lang::EventObject&) override {}
 };
 
+}
+
 static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWindowId, const char* pArguments)
 {
     SolarMutexGuard aGuard;
@@ -5410,6 +5418,8 @@ static void preloadData()
     rtl::Bootstrap::set("UserInstallation", sUserPath);
 }
 
+namespace {
+
 class ProfileZoneDumper : public AutoTimer
 {
     static const int dumpTimeoutMS = 5000;
@@ -5435,6 +5445,8 @@ public:
     }
 };
 
+}
+
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl)
 {
     enum {
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 034a526a810f..e0c13c7767ee 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -58,6 +58,8 @@ using namespace com::sun::star::configuration::backend;
 namespace migration
 {
 
+namespace {
+
 class JavaMigration : public ::cppu::WeakImplHelper<
     css::lang::XServiceInfo,
     css::lang::XInitialization,
@@ -140,6 +142,8 @@ private:
 
 };
 
+}
+
 JavaMigration::~JavaMigration()
 {
     OSL_ASSERT(m_aStack.empty());
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index a6f53af028fa..b47ffc6cda69 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -44,6 +44,8 @@ namespace drawinglayer
 {
     namespace unorenderer
     {
+        namespace {
+
         class XPrimitive2DRenderer:
             public cppu::WeakAggImplHelper2<
                 css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>
@@ -68,6 +70,8 @@ namespace drawinglayer
             virtual sal_Bool SAL_CALL supportsService(const OUString&) override;
             virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
         };
+
+        }
     } // end of namespace unorenderer
 } // end of namespace drawinglayer
 
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index b19d90783744..4db80991dd93 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -52,6 +52,8 @@ namespace drawinglayer
             return (getPrimitive2DID() == rPrimitive.getPrimitive2DID());
         }
 
+        namespace {
+
         // Visitor class to get the B2D range from a tree of Primitive2DReference's
         //
         class B2DRangeVisitor : public Primitive2DDecompositionVisitor {
@@ -69,6 +71,9 @@ namespace drawinglayer
                 maRetval.expand(r.getB2DRange(mrViewInformation));
             }
         };
+
+        }
+
         basegfx::B2DRange BasePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
         {
             B2DRangeVisitor aVisitor(rViewInformation);
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 421e1a5a19e2..75de37a701c6 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -45,6 +45,8 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
+        namespace {
+
         class AnimatedGraphicPrimitive2D : public AnimatedSwitchPrimitive2D
         {
         private:
@@ -339,6 +341,8 @@ namespace drawinglayer
             virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
         };
 
+        }
+
         AnimatedGraphicPrimitive2D::AnimatedGraphicPrimitive2D(
             const Graphic& rGraphic,
             const basegfx::B2DHomMatrix& rTransform)
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 88755d2e9d2e..485000f3cf76 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -58,6 +58,8 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
+        namespace {
+
         /** NonOverlappingFillGradientPrimitive2D class
 
         This is a special version of the FillGradientPrimitive2D which decomposes
@@ -85,6 +87,8 @@ namespace drawinglayer
             }
         };
 
+        }
+
         void NonOverlappingFillGradientPrimitive2D::create2DDecomposition(
             Primitive2DContainer& rContainer,
             const geometry::ViewInformation2D& /*rViewInformation*/) const
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index c68c79ebea8f..62ba3b0f7905 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -837,6 +837,8 @@ namespace accessibility
         return aNames;
     }
 
+    namespace {
+
     struct IndexCompare
     {
         const PropertyValue* pValues;
@@ -846,6 +848,8 @@ namespace accessibility
             return pValues[a].Name < pValues[b].Name;
         }
     };
+
+    }
 }
 
 namespace
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 8a7ce274e5d0..5d6be4dd60b5 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -267,6 +267,8 @@ namespace accessibility
                                                            nStateId ) );
     }
 
+    namespace {
+
     // not generic yet, no arguments...
     class AccessibleParaManager_DisposeChildren
     {
@@ -278,6 +280,8 @@ namespace accessibility
         }
     };
 
+    }
+
     void AccessibleParaManager::Dispose()
     {
         AccessibleParaManager_DisposeChildren aFunctor;
@@ -286,6 +290,8 @@ namespace accessibility
                          WeakChildAdapter< AccessibleParaManager_DisposeChildren > (aFunctor) );
     }
 
+    namespace {
+
     // not generic yet, too many method arguments...
     class StateChangeEvent
     {
@@ -308,6 +314,8 @@ namespace accessibility
         const uno::Any& mrOldValue;
     };
 
+    }
+
     void AccessibleParaManager::FireEvent( sal_Int32 nStartPara,
                                            sal_Int32 nEndPara,
                                            const sal_Int16 nEventId,
@@ -337,6 +345,8 @@ namespace accessibility
         }
     }
 
+    namespace {
+
     class ReleaseChild
     {
     public:
@@ -349,6 +359,8 @@ namespace accessibility
         }
     };
 
+    }
+
     void AccessibleParaManager::Release( sal_Int32 nStartPara, sal_Int32 nEndPara )
     {
         DBG_ASSERT( 0 <= nStartPara && 0 <= nEndPara &&
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index c85cc3c9a589..8cef86269d1d 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -64,6 +64,8 @@ namespace accessibility
 {
     typedef std::vector< beans::PropertyValue > PropertyValueVector;
 
+    namespace {
+
     class PropertyValueEqualFunctor
     {
         const beans::PropertyValue& m_rPValue;
@@ -77,6 +79,9 @@ namespace accessibility
             return ( m_rPValue.Name == rhs.Name && m_rPValue.Value == rhs.Value );
         }
     };
+
+    }
+
     sal_Unicode const cNewLine(0x0a);
 
 
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ad09f1d543dc..2128434ed05d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -88,6 +88,8 @@ using namespace ::com::sun::star::linguistic2;
 
 #define WRONG_SHOW_MIN       5
 
+namespace {
+
 struct TabInfo
 {
     bool        bValid;
@@ -106,6 +108,8 @@ struct TabInfo
 
 };
 
+}
+
 Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
 {
     double nRealOrientation = nOrientation*F_PI1800;
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 2f9119a0f143..58cc0ddab5da 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -571,6 +571,8 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont )
     return *this;
 }
 
+namespace {
+
 class SvxDoGetCapitalSize : public SvxDoCapitals
 {
 protected:
@@ -592,6 +594,8 @@ public:
     const Size &GetSize() const { return aTxtSize; };
 };
 
+}
+
 void SvxDoGetCapitalSize::Do( const OUString &_rTxt, const sal_Int32 _nIdx,
                               const sal_Int32 _nLen, const bool bUpper )
 {
@@ -633,6 +637,8 @@ Size SvxFont::GetCapitalSize( const OutputDevice *pOut, const OUString &rTxt,
     return aTxtSize;
 }
 
+namespace {
+
 class SvxDoDrawCapital : public SvxDoCapitals
 {
 protected:
@@ -656,6 +662,8 @@ public:
                      const sal_Int32 nLen, const bool bUpper ) override;
 };
 
+}
+
 void SvxDoDrawCapital::DoSpace( const bool bDraw )
 {
     if ( bDraw || pFont->IsWordLineMode() )
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 2158e48b0cc6..712eea464024 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -88,6 +88,8 @@ void TextRanger::SetVertical( bool bNew )
     }
 }
 
+namespace {
+
 //! SvxBoundArgs is used to perform temporary calculations on a range array.
 //! Temporary instances are created in TextRanger::GetTextRanges()
 class SvxBoundArgs
@@ -140,6 +142,8 @@ public:
     bool IsConcat() const { return bConcat; }
 };
 
+}
+
 SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, LongDqPtr pLong,
     const Range& rRange )
     : pLongArr(pLong)
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 10c184aaa2f7..8aa7a229bc64 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -72,6 +72,8 @@ static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl()
     return xRes;
 }
 
+namespace {
+
 //! Dummy implementation in order to avoid loading of lingu DLL
 //! when only the XSupportedLocales interface is used.
 //! The dummy accesses the real implementation (and thus loading the DLL)
@@ -103,6 +105,7 @@ public:
                 const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
 };
 
+}
 
 void ThesDummy_Impl::GetCfgLocales()
 {
@@ -186,6 +189,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
     return aRes;
 }
 
+namespace {
 
 //! Dummy implementation in order to avoid loading of lingu DLL.
 //! The dummy accesses the real implementation (and thus loading the DLL)
@@ -214,6 +218,7 @@ public:
                 const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
 };
 
+}
 
 void SpellDummy_Impl::GetSpell_Impl()
 {
@@ -270,6 +275,7 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
     return xRes;
 }
 
+namespace {
 
 //! Dummy implementation in order to avoid loading of lingu DLL.
 //! The dummy accesses the real implementation (and thus loading the DLL)
@@ -311,6 +317,7 @@ public:
                 const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
 };
 
+}
 
 void HyphDummy_Impl::GetHyph_Impl()
 {
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 915fe7193eaa..c7ac1bc3786b 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -45,6 +45,7 @@
 
 using namespace ::com::sun::star;
 
+namespace {
 
 class SvxAccessibleTextIndex
 {
@@ -120,6 +121,8 @@ private:
     bool  mbInBullet;
 };
 
+}
+
 static ESelection MakeEESelection( const SvxAccessibleTextIndex& rStart, const SvxAccessibleTextIndex& rEnd )
 {
     // deal with field special case: to really get a field contained
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 3742a02a1db5..dea25ce79a08 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -494,12 +494,16 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxN
     }
 }
 
+namespace {
+
 class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
 {
 public:
     virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override;
 };
 
+}
+
 sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 )
 {
     return SvxUnoNumberingRules::Compare( Any1, Any2 );
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 646d6819b1d3..89ab645e3283 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -248,6 +248,7 @@ void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference<
 {
 }
 
+namespace {
 
 class SvxXMLTextExportComponent : public SvXMLExport
 {
@@ -268,6 +269,7 @@ private:
     css::uno::Reference< css::text::XText > mxText;
 };
 
+}
 
 SvxXMLTextExportComponent::SvxXMLTextExportComponent(
     const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index b3e40380fba0..ac28c0d6b457 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -55,6 +55,7 @@ using namespace com::sun::star::text;
 using namespace cppu;
 using namespace xmloff::token;
 
+namespace {
 
 class SvxXMLTextImportContext : public SvXMLImportContext
 {
@@ -67,6 +68,7 @@ private:
     const uno::Reference< XText > mxText;
 };
 
+}
 
 SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XText >& xText )
 : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
@@ -97,6 +99,7 @@ SvXMLImportContextRef SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nP
     return pContext;
 }
 
+namespace {
 
 class SvxXMLXTextImportComponent : public SvXMLImport
 {
@@ -112,6 +115,8 @@ private:
     const uno::Reference< XText > mxText;
 };
 
+}
+
 SvXMLImportContext *SvxXMLXTextImportComponent::CreateDocumentContext(
         sal_uInt16 const nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/)
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6b9bb85ea5e0..4c35ffc156e6 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -73,6 +73,8 @@
 
 using namespace ::com::sun::star;
 
+namespace {
+
 class IntCounterGuard
 {
     sal_Int32& m_rFlag;
@@ -90,6 +92,8 @@ public:
     }
 };
 
+}
+
 static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& xTargetMenu,
                             sal_Int32 nTargetIndex,
                             const uno::Reference< container::XIndexAccess >& xSourceMenu,
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 7d938cfd15ba..3344bc6804ed 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -49,6 +49,8 @@
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
+namespace {
+
 class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandler >
 {
 public:
@@ -57,6 +59,7 @@ public:
     virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest ) override;
 };
 
+}
 
 void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& )
 {
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index f28633a73446..c5aad2411b2b 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -55,6 +55,8 @@ namespace emfio
 {
     namespace emfreader
     {
+        namespace {
+
         class XEmfParser : public ::cppu::WeakAggImplHelper2< graphic::XEmfParser, lang::XServiceInfo >
         {
         private:
@@ -78,6 +80,8 @@ namespace emfio
             virtual sal_Bool SAL_CALL supportsService(const OUString&) override;
             virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
         };
+
+        }
     } // end of namespace emfreader
 } // end of namespace emfio
 
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 2ade05a1fd25..1a8af4411fd4 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -62,6 +62,8 @@ namespace comp_EventAttacher {
 //  class InvocationToAllListenerMapper
 //  helper class to map XInvocation to XAllListener
 
+namespace {
+
 class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation >
 {
 public:
@@ -82,6 +84,7 @@ private:
     Any                          m_Helper;
 };
 
+}
 
 // Function to replace AllListenerAdapterService::createAllListerAdapter
 static Reference< XInterface > createAllListenerAdapter
@@ -199,6 +202,8 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam
 //  class EventAttacherImpl
 //  represents an implementation of the EventAttacher service
 
+namespace {
+
 class EventAttacherImpl : public WeakImplHelper < XEventAttacher2, XInitialization, XServiceInfo >
 {
 public:
@@ -269,6 +274,7 @@ private:
     Reference< XInvocationAdapterFactory2 >  getInvocationAdapterService();
 };
 
+}
 
 EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxContext )
     : m_xContext( rxContext )
@@ -403,6 +409,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter()
     return m_xConverter;
 }
 
+namespace {
 
 // Implementation of an EventAttacher-related AllListeners, which brings
 // a few Events to a general AllListener
@@ -430,6 +437,7 @@ private:
     Reference< XAllListener >   m_AllListener;
 };
 
+}
 
 FilterAllListenerImpl::FilterAllListenerImpl( EventAttacherImpl * pEA_, const OUString& EventMethod_,
                                               const Reference< XAllListener >& AllListener_ )
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index dc861bbeb3e3..6edbddd3c744 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -75,6 +75,8 @@ using namespace ::com::sun::star::frame;
 
 static Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
 
+namespace {
+
 class BibliographyLoader : public cppu::WeakImplHelper
                             < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
 {
@@ -130,7 +132,7 @@ public:
     static Sequence<OUString> getSupportedServiceNames_Static() throw(  );
 
     /// @throws Exception
-    friend  Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
+    friend  Reference< XInterface > (::BibliographyLoader_CreateInstance)( const Reference< XMultiServiceFactory > & rSMgr );
 
     // XLoader
     virtual void            SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
@@ -139,6 +141,8 @@ public:
     virtual void            SAL_CALL cancel() override;
 };
 
+}
+
 BibliographyLoader::BibliographyLoader() :
     m_pBibMod(nullptr)
 {
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 8364deb9e657..c9ccfc133919 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -179,6 +179,8 @@ static Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
     return xReturn;
 }
 
+namespace {
+
 class MappingDialog_Impl : public weld::GenericDialogController
 {
     BibDataManager* pDatMan;
@@ -227,6 +229,8 @@ public:
     MappingDialog_Impl(weld::Window* pParent, BibDataManager* pDatMan);
 };
 
+}
+
 static sal_uInt16 lcl_FindLogicalName(BibConfig const * pConfig ,
                                       const OUString& rLogicalColumnName)
 {
@@ -397,6 +401,8 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, weld::Button&, void)
     m_xDialog->response(bModified ? RET_OK : RET_CANCEL);
 }
 
+namespace {
+
 class DBChangeDialog_Impl : public weld::GenericDialogController
 {
     DBChangeDialogConfig_Impl aConfig;
@@ -411,6 +417,8 @@ public:
     OUString     GetCurrentURL()const;
 };
 
+}
+
 DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan )
     : GenericDialogController(pParent, "modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog")
     , pDatMan(pMan)
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index fcb4851d91bc..4a9c23d0c97d 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -71,6 +71,8 @@ namespace bib
         m_xForm = _rxForm;
     }
 
+    namespace {
+
     struct ControlModeSwitch
     {
         bool bDesign;
@@ -83,6 +85,8 @@ namespace bib
         }
     };
 
+    }
+
     void FormControlContainer::implSetDesignMode( bool _bDesign )
     {
         try
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index a36efe9b550a..80d2ae7b8f52 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -60,6 +60,7 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
+namespace {
 
 struct DispatchInfo
 {
@@ -74,6 +75,8 @@ struct CacheDispatchInfo
     bool      bActiveConnection;
 };
 
+}
+
 // Attention: commands must be sorted by command groups. Implementation is dependent
 // on this!!
 static const DispatchInfo SupportedCommandsArray[] =
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 11163a1227be..450bcc9ef882 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -70,6 +70,8 @@ static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos
     return sRet;
 }
 
+namespace {
+
 class BibPosListener    :public cppu::WeakImplHelper <sdbc::XRowSetListener>
 {
     VclPtr<BibGeneralPage>     pParentPage;
@@ -86,6 +88,8 @@ public:
 
 };
 
+}
+
 BibPosListener::BibPosListener(BibGeneralPage* pParent) :
     pParentPage(pParent)
 {
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index a241126cc7d6..d1455baa3178 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -50,6 +50,9 @@ namespace logging
     typedef ::cppu::WeakComponentImplHelper    <   XConsoleHandler
                                                 ,   XServiceInfo
                                                 >   ConsoleHandler_Base;
+
+    namespace {
+
     class ConsoleHandler    :public ::cppu::BaseMutex
                             ,public ConsoleHandler_Base
     {
@@ -91,6 +94,8 @@ namespace logging
         void    leaveMethod( MethodGuard::Access );
     };
 
+    }
+
     ConsoleHandler::ConsoleHandler(const Reference<XComponentContext> &context,
             const css::uno::Sequence<css::uno::Any> &arguments)
         :ConsoleHandler_Base( m_aMutex )
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index bce6922dcb62..42c51a348701 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -39,6 +39,8 @@ namespace logging
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::logging::LogRecord;
 
+    namespace {
+
     // formats for csv files as defined by RFC4180
     class CsvFormatter : public cppu::WeakImplHelper<css::logging::XCsvLogFormatter, css::lang::XServiceInfo>
     {
@@ -79,6 +81,8 @@ namespace logging
         bool m_MultiColumn;
         css::uno::Sequence< OUString > m_Columnnames;
     };
+
+    }
 } // namespace logging
 
 // private helpers
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index bec33521418c..cd62535ad15c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -60,6 +60,9 @@ namespace logging
     typedef ::cppu::WeakComponentImplHelper    <   XLogHandler
                                                 ,   XServiceInfo
                                                 >   FileHandler_Base;
+
+    namespace {
+
     class FileHandler   :public ::cppu::BaseMutex
                         ,public FileHandler_Base
     {
@@ -122,6 +125,8 @@ namespace logging
         void    impl_doStringsubstitution_nothrow( OUString& _inout_rURL );
     };
 
+    }
+
     FileHandler::FileHandler(const css::uno::Reference<XComponentContext> &context,
             const css::uno::Sequence<css::uno::Any> &arguments)
         :FileHandler_Base( m_aMutex )
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 43dbe1a3a2a2..1770ca377175 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -49,6 +49,8 @@ namespace logging
     using ::com::sun::star::logging::XLogHandler;
     using ::com::sun::star::logging::LogRecord;
 
+    namespace {
+
     class EventLogger : public cppu::BaseMutex,
                         public cppu::WeakImplHelper<css::logging::XLogger>
     {
@@ -110,6 +112,8 @@ namespace logging
         virtual Reference< XLogger > SAL_CALL getDefaultLogger(  ) override;
     };
 
+    }
+
     EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName )
         :m_aHandlers( m_aMutex )
         ,m_nEventNumber( 0 )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 58884a36512c..23392b61c491 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -38,6 +38,8 @@ namespace logging
     using ::com::sun::star::logging::LogRecord;
     using ::com::sun::star::uno::XInterface;
 
+    namespace {
+
     class PlainTextFormatter : public cppu::WeakImplHelper<css::logging::XLogFormatter, css::lang::XServiceInfo>
     {
     public:
@@ -55,6 +57,8 @@ namespace logging
         virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     };
 
+    }
+
     PlainTextFormatter::PlainTextFormatter()
     {
     }
diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx
index 003c978233b1..542f696e5d34 100644
--- a/extensions/source/logging/simpletextformatter.cxx
+++ b/extensions/source/logging/simpletextformatter.cxx
@@ -37,6 +37,8 @@ namespace logging
 using css::logging::LogRecord;
 using namespace css::uno;
 
+namespace
+{
 class SimpleTextFormatter
     : public cppu::WeakImplHelper<css::logging::XLogFormatter, css::lang::XServiceInfo>
 {
@@ -54,6 +56,7 @@ private:
     virtual sal_Bool SAL_CALL supportsService(const OUString& _rServiceName) override;
     virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
+}
 
 SimpleTextFormatter::SimpleTextFormatter() {}
 
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 1e77361f9400..b98f3c1e25c0 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -68,8 +68,6 @@ namespace pcr
         ACTIVATE_NEXT
     };
 
-    }
-
     struct ControlEvent : public ::comphelper::AnyEvent
     {
         Reference< XPropertyControl >   xControl;
@@ -95,6 +93,7 @@ namespace pcr
             getNotifier();
     };
 
+    }
 
     ::rtl::Reference< ::comphelper::AsyncEventNotifier > SharedNotifier::s_pNotifier;
 
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 679a894795ee..4d59e51f9544 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -66,6 +66,9 @@ namespace pcr
 
     typedef ::cppu::WeakImplHelper <   css::inspection::XObjectInspectorUI
                                     >   CachedInspectorUI_Base;
+
+    namespace {
+
     struct CachedInspectorUI : public CachedInspectorUI_Base
     {
     private:
@@ -167,6 +170,7 @@ namespace pcr
         };
     };
 
+    }
 
     CachedInspectorUI::CachedInspectorUI( ComposedPropertyUIUpdate& _rMaster, FNotifySingleUIChange _pUIChangeNotification )
         :m_bDisposed( false )
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index e368bdf5f100..646e4feec6f0 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -296,6 +296,9 @@ namespace pcr
 
     typedef ::cppu::WeakImplHelper <   css::container::XNameReplace
                                     >   EventHolder_Base;
+
+    namespace {
+
     /* A UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */
     class EventHolder : public EventHolder_Base
     {
@@ -331,6 +334,7 @@ namespace pcr
         ScriptEventDescriptor const & impl_getDescriptor_throw( const OUString& _rEventName ) const;
     };
 
+    }
 
     EventHolder::EventHolder()
     {
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index d065e7b63429..43ad19ce294a 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -69,6 +69,8 @@ namespace pcr
 
     //= OFontPropertyExtractor
 
+    namespace {
+
     class OFontPropertyExtractor
     {
     protected:
@@ -95,6 +97,7 @@ namespace pcr
                             bool _bForceInvalidation = false);
     };
 
+    }
 
     OFontPropertyExtractor::OFontPropertyExtractor(const Reference< XPropertySet >& _rxProps)
         :m_xPropValueAccess(_rxProps)
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7feca01b5a55..833359fdb583 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -173,6 +173,7 @@ namespace pcr
         return aSupported;
     }
 
+    namespace {
 
     // TODO: -> export from toolkit
     struct LanguageDependentProp
@@ -181,6 +182,8 @@ namespace pcr
         sal_Int32   nPropNameLength;
     };
 
+    }
+
     static const LanguageDependentProp aLanguageDependentProp[] =
     {
         { "Text",            4 },
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 8ea36b02a7bb..f6a2d7a15d31 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -96,6 +96,8 @@ namespace pcr
 
     //= BroadcastHelperBase
 
+    namespace {
+
     class BroadcastHelperBase
     {
     protected:
@@ -111,6 +113,7 @@ namespace pcr
         ::cppu::OBroadcastHelper    maBHelper;
     };
 
+    }
 
     //= ShapeGeometryChangeNotifier - declaration
 
@@ -121,6 +124,8 @@ namespace pcr
     typedef ::cppu::WeakImplHelper <   css::beans::XPropertyChangeListener
                                     >   ShapeGeometryChangeNotifier_IBase;
 
+    namespace {
+
     class ShapeGeometryChangeNotifier   :public BroadcastHelperBase
                                         ,public ShapeGeometryChangeNotifier_CBase
                                         ,public ShapeGeometryChangeNotifier_IBase
@@ -195,13 +200,22 @@ namespace pcr
         Reference< XShape >                 m_xShape;
     };
 
+    }
 
     //= FormGeometryHandler - declaration
 
+    namespace {
+
     class FormGeometryHandler;
+
+    }
+
     typedef HandlerComponentBase< FormGeometryHandler > FormGeometryHandler_Base;
     /** a property handler for any virtual string properties
     */
+
+    namespace {
+
     class FormGeometryHandler : public FormGeometryHandler_Base
     {
     public:
@@ -247,6 +261,7 @@ namespace pcr
         ::rtl::Reference< ShapeGeometryChangeNotifier > m_xChangeNotifier;
     };
 
+    }
 
     //= FormGeometryHandler - implementation
 
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 2592c47c57eb..f2e3c0328c84 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -66,6 +66,7 @@ namespace pcr
     {
     }
 
+    namespace {
 
     // Compare PropertyInfo
     struct PropertyInfoLessByName
@@ -76,6 +77,7 @@ namespace pcr
         }
     };
 
+    }
 
     //= OPropertyInfoService
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index c393e3921137..d30d80918077 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -63,6 +63,8 @@ namespace pcr
     using ::com::sun::star::awt::XActionListener;
     using ::com::sun::star::awt::ActionEvent;
 
+    namespace {
+
     class EnumRepresentation : public IPropertyEnumRepresentation
     {
     private:
@@ -84,6 +86,8 @@ namespace pcr
         void            impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const;
     };
 
+    }
+
     EnumRepresentation::EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType )
         :m_aEnumType( _rEnumType )
     {
@@ -177,6 +181,9 @@ namespace pcr
 
     typedef ::cppu::WeakImplHelper <   XActionListener
                                     >   UrlClickHandler_Base;
+
+    namespace {
+
     class UrlClickHandler : public UrlClickHandler_Base
     {
         Reference<XComponentContext>    m_xContext;
@@ -196,6 +203,7 @@ namespace pcr
         void impl_dispatch_throw( const OUString& _rURL );
     };
 
+    }
 
     UrlClickHandler::UrlClickHandler( const Reference<XComponentContext>& _rContext, const Reference< XHyperlinkControl >& _rxControl )
         :m_xContext( _rContext )
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index aa0628555e59..00520029b490 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -42,6 +42,8 @@ namespace pcr
 
     //= ObjectInspectorModel
 
+    namespace {
+
     class ObjectInspectorModel : public ImplInspectorModel
     {
     private:
@@ -81,6 +83,7 @@ namespace pcr
         void    impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition );
     };
 
+    }
 
     //= ObjectInspectorModel
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 42d638c2f9e5..c16565028355 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -66,6 +66,8 @@ namespace pcr{
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+namespace {
+
 class StringRepresentation:
     public ::cppu::WeakImplHelper<
         lang::XServiceInfo,
@@ -141,6 +143,8 @@ private:
 
 };
 
+}
+
 StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContext > const & context) :
     m_xContext(context)
 {}
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 3fc08b9599a5..90d28f8794bc 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -79,8 +79,6 @@ namespace pcr
         return sImageId;
     }
 
-    }
-
     //= OSimpleTabModel
 
     class OSimpleTabModel : public ::cppu::WeakImplHelper< XTabControllerModel>
@@ -104,6 +102,8 @@ namespace pcr
         virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) override {};
     };
 
+    }
+
     //= TabOrderDialog
     TabOrderDialog::TabOrderDialog(weld::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
                     const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB)
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index a9ee05e5164e..83df6c32d5d2 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -76,6 +76,7 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB()
     return aValue;
 }
 
+namespace {
 
 struct SaneHolder
 {
@@ -88,9 +89,6 @@ struct SaneHolder
     SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
 };
 
-
-namespace
-{
     typedef std::vector< std::shared_ptr<SaneHolder> > sanevec;
     class allSanes
     {
@@ -119,8 +117,6 @@ namespace
 
     struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
     struct theSanes : public rtl::Static<allSanes, theSanes> {};
-}
-
 
 class ScannerThread : public osl::Thread
 {
@@ -138,6 +134,7 @@ public:
     virtual ~ScannerThread() override;
 };
 
+}
 
 ScannerThread::ScannerThread(const std::shared_ptr<SaneHolder>& pHolder,
                              const Reference< css::lang::XEventListener >& listener,
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 06d273f2cbd3..a012b5542a8a 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -320,6 +320,7 @@ std::vector<OUString> FilterFactory::impl_queryMatchByDocumentService(const Quer
     return lResult;
 }
 
+namespace {
 
 class stlcomp_removeIfMatchFlags
 {
@@ -361,6 +362,7 @@ class stlcomp_removeIfMatchFlags
         }
 };
 
+}
 
 std::vector<OUString> FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lTokens) const
 {
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index eac3e9385ad9..a0cae19a890f 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -59,6 +59,8 @@ using ::com::sun::star::container::XIndexAccess;
 
 namespace swf {
 
+namespace {
+
 class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream>
 {
     osl::File maFile;
@@ -76,6 +78,8 @@ public:
     virtual void SAL_CALL closeOutput(  ) override;
 };
 
+}
+
 void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
 {
     sal_uInt64 uBytesToWrite = aData.getLength();
@@ -132,6 +136,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput(  )
     }
 }
 
+namespace {
 
 class FlashExportFilter : public cppu::WeakImplHelper
 <
@@ -173,6 +178,8 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
+}
+
 FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext)
     : mxDoc()
     , mxContext(rxContext)
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 428c807c50ca..3b6e57d2974e 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -531,6 +531,7 @@ void FillStyle::addTo( Tag* pTag ) const
     }
 }
 
+namespace {
 
 struct GradRecord
 {
@@ -540,6 +541,8 @@ struct GradRecord
     GradRecord( sal_uInt8 nRatio, const Color& rColor ) : mnRatio( nRatio ), maColor( rColor ) {}
 };
 
+}
+
 // TODO: better emulation of our gradients
 void FillStyle::Impl_addGradient( Tag* pTag ) const
 {
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 42ad6ce71a64..b7e4ac40fe06 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -30,6 +30,7 @@
 #include "giflzwc.hxx"
 #include <memory>
 
+namespace {
 
 class GIFWriter
 {
@@ -72,6 +73,7 @@ public:
     bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
 };
 
+}
 
 GIFWriter::GIFWriter(SvStream &rStream)
     : m_rGIF(rStream)
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index cac944a1ec64..e933763c9140 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -64,6 +64,8 @@ using namespace ::com::sun::star::uno;
 
 // -----------------------------field-types------------------------------
 
+namespace {
+
 struct StackMember
 {
     struct      StackMember * pSucc;
@@ -231,6 +233,8 @@ public:
     PSWriter();
 };
 
+}
+
 //========================== methods from PSWriter ==========================
 
 
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 8e70295203e7..456088d0c234 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -44,6 +44,7 @@
 #define ResolutionUnit              296
 #define ColorMap                    320
 
+namespace {
 
 struct TIFFLZWCTreeNode
 {
@@ -112,6 +113,7 @@ public:
     bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem const * pFilterConfigItem );
 };
 
+}
 
 TIFFWriter::TIFFWriter(SvStream &rStream)
     : m_rOStm(rStream)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 39c2d1fe784d..b8942d13e48c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -269,6 +269,8 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
     return bRet;
 }
 
+namespace {
+
 struct WriteData
 {
     oslFileHandle   m_pFile;
@@ -276,6 +278,8 @@ struct WriteData
     sal_uInt32      m_nBytesToWrite;
 };
 
+}
+
 extern "C" {
 
 static void WriteFileInThread(void *wData)
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index b0426d5c47d3..1ec1754d0d71 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -213,6 +213,8 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
 
 //============================ OS2METReader ==================================
 
+namespace {
+
 struct OSPalette {
     OSPalette * pSucc;
     sal_uInt32 * p0RGB; // May be NULL!
@@ -420,6 +422,8 @@ public:
 
 };
 
+}
+
 //=================== Methods of OS2METReader ==============================
 
 OS2METReader::OS2METReader()
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index f192c847ab5e..3e882aa3c884 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -26,6 +26,8 @@
 
 //============================ PBMReader ==================================
 
+namespace {
+
 class PBMReader {
 
 private:
@@ -49,6 +51,8 @@ public:
     bool                ReadPBM(Graphic & rGraphic );
 };
 
+}
+
 //=================== Methods of PBMReader ==============================
 
 PBMReader::PBMReader(SvStream & rPBM)
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index c1b3f0061201..9c9fc0983f30 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -42,8 +42,6 @@ enum PCDResolution {
     PCDRES_16BASE   // 3072 x 3072
 };
 
-}
-
 class PCDReader {
 
 private:
@@ -95,6 +93,8 @@ public:
     bool ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem );
 };
 
+}
+
 //=================== Methods of PCDReader ==============================
 
 bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 93cebc1e6dce..e4e4575618cd 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -27,6 +27,8 @@ class FilterConfigItem;
 
 //============================ PCXReader ==================================
 
+namespace {
+
 class PCXReader {
 
 private:
@@ -59,6 +61,8 @@ public:
                         // Reads a PCX file from the stream and fills the GDIMetaFile
 };
 
+}
+
 //=================== methods of PCXReader ==============================
 
 PCXReader::PCXReader(SvStream &rStream)
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 8fc618bc3b10..a916f090ea4c 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -37,6 +37,8 @@
     // complete FilterConfigItem for GraphicImport under -fsanitize=function
 
 namespace PictReaderInternal {
+  namespace {
+
   //! utilitary class to store a pattern, ...
   class Pattern {
   public:
@@ -86,6 +88,8 @@ namespace PictReaderInternal {
     bool isRead;
   };
 
+  }
+
   sal_uLong Pattern::read(SvStream &stream) {
     unsigned char nbyte[8];
     sal_uLong nHiBytes, nLoBytes;
@@ -145,8 +149,6 @@ enum class PictDrawingMethod {
     TEXT, UNDEFINED
 };
 
-}
-
 class PictReader {
   typedef class PictReaderInternal::Pattern Pattern;
 private:
@@ -266,6 +268,8 @@ public:
 
 };
 
+}
+
 static void SetByte(sal_uInt16& nx, sal_uInt16 ny, vcl::bitmap::RawBitmap& rBitmap, sal_uInt16 nPixelSize, sal_uInt8 nDat, sal_uInt16 nWidth, std::vector<Color> const & rvPalette)
 {
     switch (nPixelSize)
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index a404e6f63b45..0f8f0dfa3b04 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -40,6 +40,8 @@ class FilterConfigItem;
 #define PSD_DUOTONE         8
 #define PSD_LAB             9
 
+namespace {
+
 struct PSDFileHeader
 {
     sal_uInt32  nSignature;
@@ -82,6 +84,8 @@ public:
     bool ReadPSD(Graphic & rGraphic);
 };
 
+}
+
 //=================== Methods of PSDReader ==============================
 
 PSDReader::PSDReader(SvStream &rStream)
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index f2fca2cdf960..4bafe0fe8e9c 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -38,6 +38,8 @@ class FilterConfigItem;
 
 //============================ RASReader ==================================
 
+namespace {
+
 class RASReader {
 
 private:
@@ -61,6 +63,8 @@ public:
     bool                ReadRAS(Graphic & rGraphic);
 };
 
+}
+
 //=================== Methods of RASReader ==============================
 
 RASReader::RASReader(SvStream &rRAS)
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 1408bf5ff4cc..f7748022fadb 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -27,6 +27,8 @@ class FilterConfigItem;
 
 //============================ TGAReader ==================================
 
+namespace {
+
 struct TGAFileHeader
 {
     sal_uInt8       nImageIDLength;
@@ -110,6 +112,8 @@ public:
     bool                ReadTGA(Graphic &rGraphic);
 };
 
+}
+
 //=================== Methods of TGAReader ==============================
 
 TGAReader::TGAReader(SvStream &rTGA)
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 0d1bf7ae059d..d81cc2d7b073 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -40,8 +40,6 @@ template< typename T > T BYTESWAP(T nByte) {
         ( ( nByte & 128 ) >> 7 );
 }
 
-}
-
 //============================ TIFFReader ==================================
 
 class TIFFReader
@@ -188,6 +186,8 @@ public:
     bool ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
 };
 
+}
+
 //=================== Methods of TIFFReader ==============================
 
 sal_uInt32 TIFFReader::DataTypeSize()
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 0279bc6684e7..69559fbc98b0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4403,6 +4403,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
     return nBlibId;
 }
 
+namespace {
+
 struct EscherConnectorRule
 {
     sal_uInt32  nRuleId;
@@ -4413,6 +4415,8 @@ struct EscherConnectorRule
     sal_uInt32  ncptiB;         // Connection site Index of shape B
 };
 
+}
+
 struct EscherShapeListEntry
 {
     uno::Reference<drawing::XShape>aXShape;
@@ -4892,6 +4896,8 @@ SvStream* EscherExGlobal::ImplQueryPictureStream()
     return nullptr;
 }
 
+namespace {
+
 // Implementation of an empty stream that silently succeeds, but does nothing.
 //
 // In fact, this is a hack.  The right solution is to abstract EscherEx to be
@@ -4910,6 +4916,8 @@ public:
     SvNullStream() : SvStream() {}
 };
 
+}
+
 EscherEx::EscherEx(const std::shared_ptr<EscherExGlobal>& rxGlobal, SvStream* pOutStrm, bool bOOXML)
     : mxGlobal(rxGlobal)
     , mpOutStrm(pOutStrm)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 10a0ca1f6382..3d791bbb9bc8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -191,6 +191,8 @@ using namespace container           ;
 static sal_uInt32 nMSOleObjCntr = 0;
 #define MSO_OLE_Obj "MSO_OLE_Obj"
 
+namespace {
+
 struct SvxMSDffBLIPInfo
 {
     sal_uLong  nFilePos;    ///< offset of the BLIP in data stream
@@ -200,6 +202,8 @@ struct SvxMSDffBLIPInfo
     }
 };
 
+}
+
 /// the following will be sorted by the order of their appearance:
 struct SvxMSDffBLIPInfos : public std::vector<SvxMSDffBLIPInfo> {};
 
@@ -1123,6 +1127,8 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
         rSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
 }
 
+namespace {
+
 struct ShadeColor
 {
     Color       aColor;
@@ -1131,6 +1137,8 @@ struct ShadeColor
     ShadeColor( const Color& rC, double fR ) : aColor( rC ), fDist( fR ) {};
 };
 
+}
+
 static void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& rProperties, SvStream& rIn, std::vector< ShadeColor >& rShadeColors )
 {
     sal_uInt32 nPos = rIn.Tell();
@@ -6800,11 +6808,16 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
     return xStm->GetError() == ERRCODE_NONE;
 }
 
+namespace {
+
 struct ClsIDs {
     sal_uInt32      nId;
     const sal_Char* pSvrName;
     const sal_Char* pDspName;
 };
+
+}
+
 static const ClsIDs aClsIDs[] = {
 
     { 0x000212F0, "MSWordArt",          "Microsoft Word Art"            },
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index ffebbaaf70e4..736f65887764 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -643,12 +643,16 @@ static sal_uInt16 parseChar( sal_Unicode c )
     return nVclKey;
 }
 
+namespace {
+
 struct KeyCodeEntry
 {
    const char* sName;
    sal_uInt16 nCode;
 };
 
+}
+
 KeyCodeEntry const aMSKeyCodesData[] = {
     { "BACKSPACE", KEY_BACKSPACE },
     { "BS", KEY_BACKSPACE },
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index a007c709b66a..8654458b98cf 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -558,12 +558,16 @@ EquationResult ParseCombinedChars(const OUString& rStr)
     return aResult;
 }
 
+namespace {
+
 struct CustomShapeTypeTranslationTable
 {
     const char* sOOo;
     const char* sMSO;
 };
 
+}
+
 static const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] =
 {
     // { "non-primitive", mso_sptMin },
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 8e0a4beb076e..cf7f37b9f993 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -52,6 +52,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace filter {
     namespace odfflatxml {
+        namespace {
+
         /*
          * OdfFlatXml export and imports ODF flat XML documents by plugging a pass-through
          * filter implementation into XmlFilterAdaptor.
@@ -102,6 +104,8 @@ namespace filter {
 
             static Reference< XInterface > SAL_CALL impl_createInstance(const Reference< XMultiServiceFactory >& fact);
         };
+
+        }
     }
 }
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index c24e3e6581f4..039ac09de19c 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -284,6 +284,8 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
     return bRet;
 }
 
+namespace {
+
 class PDFExportStreamDoc : public vcl::PDFOutputStream
 {
 private:
@@ -301,6 +303,8 @@ public:
     virtual void write( const Reference< XOutputStream >& xStream ) override;
 };
 
+}
+
 void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
 {
     Reference< css::frame::XStorable > xStore( m_xSrcDoc, UNO_QUERY );
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 698735c969e0..b79cc7884346 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -172,6 +172,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
+namespace {
 
 class FocusWindowWaitCursor
 {
@@ -202,6 +203,7 @@ public:
     DECL_LINK( DestroyedLink, VclWindowEvent&, void );
 };
 
+}
 
 IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
 {
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7913d3704e73..7fbf85283d7f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -103,6 +103,8 @@ static const char    constSvgNamespace[] = "http://www.w3.org/2000/svg";
     This is a set of classes for exporting text field meta info.
   */
 
+namespace {
+
 class TextField
 {
 protected:
@@ -310,11 +312,12 @@ public:
 };
 
 
-static bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField )
+bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField )
 {
     return aLhsTextField.equalTo( aRhsTextField );
 }
 
+}
 
 SVGExport::SVGExport(
     const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 5677d63fcc6c..ba3e56cf045c 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -616,6 +616,8 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc
     mxDstDoc = xDoc;
 }
 
+namespace {
+
 // There is already another SVG-Type_Detector, see
 // vcl/source/filter/graphicfilter.cxx ("DOCTYPE svg"),
 // but since these start from different preconditions it is not
@@ -788,6 +790,8 @@ public:
     }
 };
 
+}
+
 OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor)
 {
     utl::MediaDescriptor aMediaDescriptor(rDescriptor);
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index f454dfda5627..efaf7a32ff83 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -52,6 +52,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::frame;
 
+namespace {
 
 class XMLFilterDialogComponentBase
 {
@@ -109,6 +110,8 @@ private:
     std::shared_ptr<XMLFilterSettingsDialog> mxDialog;
 };
 
+}
+
 XMLFilterDialogComponent::XMLFilterDialogComponent(const css::uno::Reference< XComponentContext >& rxContext)
     : OComponentHelper(maMutex)
     , mxContext(rxContext)
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c0352343adb6..94780eef3324 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -66,6 +66,7 @@ using namespace com::sun::star::system;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
+namespace {
 
 class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< css::document::XDocumentEventListener >
 {
@@ -81,6 +82,8 @@ private:
     XMLFilterTestDialog* mpDialog;
 };
 
+}
+
 GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog )
 : mpDialog( pDialog )
 {
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 42980eeeaff7..a98b6537855f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -70,6 +70,8 @@ namespace XSLT
 
     const sal_Int32 Reader::INPUT_BUFFER_SIZE = 4096;
 
+    namespace {
+
     /**
      * ParserInputBufferCallback forwards IO call-backs to libxml stream IO.
      */
@@ -201,6 +203,8 @@ namespace XSLT
         }
     };
 
+    }
+
     Reader::Reader(LibXSLTTransformer* transformer) :
         Thread("LibXSLTTransformer"), m_transformer(transformer),
         m_readBuf(INPUT_BUFFER_SIZE), m_writeBuf(OUTPUT_BUFFER_SIZE),
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 340414598e9c..cdc5b5497dec 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -92,6 +92,8 @@ using namespace ::com::sun::star::task;
 
 namespace XSLT
 {
+    namespace {
+
     /*
      * XSLTFilter reads flat XML streams from the XML filter framework and passes
      * them to an XSLT transformation service. XSLT transformation errors are
@@ -163,6 +165,8 @@ namespace XSLT
         endDocument() override;
     };
 
+    }
+
     XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r):
         m_xContext(r), m_bTerminated(false), m_bError(false)
     {}
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 31f87284d0d4..ffa29b1bb6ce 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -537,6 +537,7 @@ void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListen
     m_aActionListeners.removeInterface(_rxListener);
 }
 
+namespace {
 
 class DoPropertyListening
 {
@@ -555,6 +556,7 @@ public:
     void    handleListening( const OUString& _rPropertyName );
 };
 
+}
 
 DoPropertyListening::DoPropertyListening(
         const Reference< XInterface >& _rxComponent, const Reference< XPropertyChangeListener >& _rxListener,
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index f2b307c702ad..3bd03fce0b03 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -98,6 +98,8 @@ using namespace ::com::sun::star::util;
 namespace frm
 {
 
+namespace {
+
 class DocumentModifyGuard
 {
 public:
@@ -129,6 +131,8 @@ private:
     Reference< XModifiable2 >   m_xDocumentModify;
 };
 
+}
+
 // submitting and resetting html-forms asynchronously
 class OFormSubmitResetThread: public OComponentEventThread
 {
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 7ab3e7732f7d..fb584d478ced 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -89,6 +89,8 @@ void ControlModelLock::addPropertyNotification( const sal_Int32 _nHandle, const
     m_aNewValues.push_back( _rNewValue );
 }
 
+namespace {
+
 class FieldChangeNotifier
 {
 public:
@@ -112,6 +114,8 @@ private:
     Reference< XPropertySet >   m_xOldField;
 };
 
+}
+
 // base class for form layer controls
 OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUString& _rAggregateService, const bool _bSetDelegator )
             :OComponentHelper(m_aMutex)
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 178cf037312d..805076b545d1 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -76,6 +76,8 @@ using namespace css::form::binding;
 
 namespace frm
 {
+namespace {
+
 class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public ::utl::ITerminationListener
 {
 protected:
@@ -90,6 +92,9 @@ protected:
     virtual bool    queryTermination() const override;
     virtual void    notifyTermination() override;
 };
+
+}
+
 WeakReference< XNumberFormatsSupplier > StandardFormatsSupplier::s_xDefaultFormatsSupplier;
 StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XComponentContext > & _rxContext,LanguageType _eSysLanguage)
     :SvNumberFormatsSupplierObj()
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index c1b72d90daed..848b2ce0629b 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -34,6 +34,7 @@
 #include <svtools/imageresourceaccess.hxx>
 #include <comphelper/processfactory.hxx>
 
+namespace {
 
 class ImgProdLockBytes : public SvLockBytes
 {
@@ -52,6 +53,7 @@ public:
     virtual ErrCode     Stat( SvLockBytesStat* ) const override;
 };
 
+}
 
 ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, bool bOwner ) :
         SvLockBytes( pStm, bOwner )
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index a40783149416..6569c8a4373e 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -52,6 +52,8 @@ namespace frm
 
     namespace ImageType = ::com::sun::star::ui::ImageType;
 
+    namespace {
+
     class DocumentCommandImageProvider : public ICommandImageProvider
     {
     public:
@@ -71,6 +73,7 @@ namespace frm
         Reference< XImageManager >    m_xModuleImageManager;
     };
 
+    }
 
     void DocumentCommandImageProvider::impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index ac86a12b0454..c318b936d8af 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -347,6 +347,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre
         lcl_restoreEvents( aSave, m_xEventAttacher );
 }
 
+namespace {
 
 struct TransformEventTo52Format
 {
@@ -370,6 +371,7 @@ struct TransformEventTo52Format
     }
 };
 
+}
 
 void OInterfaceContainer::transformEvents()
 {
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index c079591e61b8..e7f0fb4cb352 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -76,6 +76,7 @@ namespace frm
         return s_aSystem;
     }
 
+    namespace {
 
     struct FormatEntry
     {
@@ -84,6 +85,7 @@ namespace frm
         LocaleType      eLocale;
     };
 
+    }
 
     static FormatEntry* lcl_getFormatTable(sal_Int16 nTableId)
     {
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 17594207234f..88c5d3a57de1 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1023,6 +1023,8 @@ inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp )
     }
 }
 
+namespace {
+
 class FormulaMissingContext
 {
     public:
@@ -1036,6 +1038,8 @@ class FormulaMissingContext
                     void    AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const;
 };
 
+}
+
 void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const
 {
     if ( !mpFunc )
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index c544da915ec7..9fda18b2a36f 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -116,9 +116,6 @@ namespace
         virtual void SAL_CALL onShot() override;
     };
 
-
-}
-
 class ViewTabListBox_Impl
 {
 private:
@@ -226,6 +223,8 @@ public:
     void            ExecuteContextMenuAction(const OString& rSelectedPopentry);
 };
 
+}
+
 //= SvtFileView_Impl
 class SvtFileView_Impl  :public ::svt::IEnumerationResultHandler
 {
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 2f17a19eaa86..ef851093e70e 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -26,6 +26,8 @@ using namespace ::com::sun::star;
 
 namespace framework{
 
+namespace {
+
 /*-************************************************************************************************************
     @short          declaration of special continuation for filter selection
     @descr          Sometimes filter detection during loading document failed. Then we need a possibility
@@ -63,6 +65,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< css::document:
 
 };  // class ContinuationFilterSelect
 
+}
+
 // initialize continuation with right start values
 
 ContinuationFilterSelect::ContinuationFilterSelect()
@@ -180,6 +184,8 @@ uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
     return mxImpl.get();
 }
 
+namespace {
+
 class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
     uno::Any m_aRequest;
@@ -197,6 +203,8 @@ public:
     virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 };
 
+}
+
 uno::Any SAL_CALL InteractionRequest_Impl::getRequest()
 {
     return m_aRequest;
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index c4aac1619b1e..5f7d16041caa 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -43,6 +43,9 @@ namespace framework
 
     typedef ::cppu::WeakImplHelper <   XUndoManagerListener
                                     >   UndoManagerContextListener_Base;
+
+    namespace {
+
     class UndoManagerContextListener : public UndoManagerContextListener_Base
     {
     public:
@@ -97,6 +100,8 @@ namespace framework
         bool                            m_documentDisposed;
     };
 
+    }
+
     void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& )
     {
         // not interested in
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 080b70eef4c6..a621a39ae320 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -67,6 +67,8 @@ namespace framework
 
     //= UndoActionWrapper
 
+    namespace {
+
     class UndoActionWrapper : public SfxUndoAction
     {
     public:
@@ -84,6 +86,8 @@ namespace framework
         const Reference< XUndoAction >  m_xUndoAction;
     };
 
+    }
+
     UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction )
         :SfxUndoAction()
         ,m_xUndoAction( i_undoAction )
@@ -136,6 +140,8 @@ namespace framework
 
     //= UndoManagerRequest
 
+    namespace {
+
     class UndoManagerRequest : public ::comphelper::AnyEvent
     {
     public:
@@ -187,6 +193,8 @@ namespace framework
         ::osl::Condition            m_finishCondition;
     };
 
+    }
+
     //= UndoManagerHelper_Impl
 
     class UndoManagerHelper_Impl : public SfxUndoListener
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 1e69c23e5b2d..144c6c600d22 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -92,12 +92,16 @@ using namespace ::com::sun::star::ui;
 namespace framework
 {
 
+namespace {
+
 struct MenuStyleItem
 {
     sal_Int16 nBit;
     const char* attrName;
 };
 
+}
+
 const MenuStyleItem MenuItemStyles[ ] = {
     { css::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
     { css::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 18b6388d41d3..43d6cc12e811 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -126,12 +126,16 @@ static void ExtractStatusbarItemParameters(
     }
 }
 
+namespace {
+
 struct StatusBarEntryProperty
 {
     OReadStatusBarDocumentHandler::StatusBar_XML_Namespace  nNamespace;
     char                                                    aEntryName[20];
 };
 
+}
+
 StatusBarEntryProperty const StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_ENTRY_COUNT] =
 {
     { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR,   ELEMENT_STATUSBAR       },
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 7089623094b7..1ded389cdcce 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -81,12 +81,16 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
     }
 }
 
+namespace {
+
 struct ToolboxStyleItem
 {
     sal_Int16 nBit;
     const char* attrName;
 };
 
+}
+
 const ToolboxStyleItem Styles[ ] = {
     { css::ui::ItemStyle::RADIO_CHECK,   ATTRIBUTE_ITEMSTYLE_RADIO },
     { css::ui::ItemStyle::ALIGN_LEFT,    ATTRIBUTE_ITEMSTYLE_LEFT },
@@ -100,12 +104,16 @@ const ToolboxStyleItem Styles[ ] = {
 
 sal_Int32 const nStyleItemEntries = SAL_N_ELEMENTS(Styles);
 
+namespace {
+
 struct ToolBarEntryProperty
 {
     OReadToolBoxDocumentHandler::ToolBox_XML_Namespace  nNamespace;
     char                                                aEntryName[20];
 };
 
+}
+
 ToolBarEntryProperty const ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_COUNT] =
 {
     { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,   ELEMENT_TOOLBAR             },
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 8bab8ca452c0..f00ce08eb043 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -41,8 +41,13 @@
 namespace framework{
 
 sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0;  ///< static counter for rescheduling
+
+namespace {
+
 struct RescheduleLock: public rtl::Static<osl::Mutex, RescheduleLock> {}; ///< mutex to guard the m_nInReschedule
 
+}
+
 const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar";
 
 StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext)
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a4ed4a3ef23b..96e9b6f2a970 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -96,6 +96,8 @@ namespace framework {
 
 using namespace com::sun::star;
 
+namespace {
+
 class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventListener      ,
                                                         css::frame::XDispatchResultListener >
 {
@@ -124,6 +126,8 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 };
 
+}
+
 LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : m_xContext(xContext)
     , m_nSearchFlags(0)
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 288e81a676c0..f8a492299b95 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -40,6 +40,8 @@ namespace framework
 
 //  Configuration access class for WindowState supplier implementation
 
+namespace {
+
 class GlobalSettings_Access : public ::cppu::WeakImplHelper<
                                   css::lang::XComponent,
                                   css::lang::XEventListener>
@@ -73,6 +75,8 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper<
         css::uno::Reference< css::uno::XComponentContext>         m_xContext;
 };
 
+}
+
 GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :
     m_bDisposed( false ),
     m_bConfigRead( false ),
@@ -217,7 +221,12 @@ void GlobalSettings_Access::impl_initConfigAccess()
 
 //  global class
 
+namespace {
+
 struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {};
+
+}
+
 static GlobalSettings_Access* pStaticSettings = nullptr;
 
 static GlobalSettings_Access* GetGlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 058cbeee3a3c..e36ec92ea4aa 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -41,6 +41,8 @@ typedef cppu::ImplInheritanceHelper< svt::ToolboxController,
                                      css::awt::XDockableWindowListener,
                                      css::lang::XServiceInfo > ToolBarBase;
 
+namespace {
+
 class SubToolBarController : public ToolBarBase
 {
     OUString m_aSubTbName;
@@ -88,6 +90,8 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
+}
+
 SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs )
 {
     css::beans::PropertyValue aPropValue;
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index bfff4cb778a0..6cae0457f61d 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -29,6 +29,8 @@
 
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 
+namespace {
+
 class ThesaurusMenuController : public svt::PopupMenuControllerBase
 {
 public:
@@ -50,6 +52,8 @@ private:
     OUString m_aLastWord;
 };
 
+}
+
 ThesaurusMenuController::ThesaurusMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :
     svt::PopupMenuControllerBase( rxContext ),
     m_xLinguServiceManager( css::linguistic2::LinguServiceManager::create( rxContext ) ),
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index f9f79ee19f76..3caf634f32c4 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -77,6 +77,8 @@ namespace framework
 
 typedef std::unordered_map< OUString, OUString > ToolbarHashMap;
 
+namespace {
+
 struct ToolBarEntry
 {
     OUString           aUIName;
@@ -86,6 +88,8 @@ struct ToolBarEntry
     const CollatorWrapper*  pCollatorWrapper;
 };
 
+}
+
 static bool CompareToolBarEntry( const ToolBarEntry& aOne, const ToolBarEntry& aTwo )
 {
     sal_Int32 nComp = aOne.pCollatorWrapper->compareString( aOne.aUIName, aTwo.aUIName );
@@ -109,12 +113,16 @@ static Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< X
     return xLayoutManager;
 }
 
+namespace {
+
 struct ToolBarInfo
 {
     OUString aToolBarResName;
     OUString aToolBarUIName;
 };
 
+}
+
 DEFINE_XSERVICEINFO_MULTISERVICE_2      (   ToolbarsMenuController                  ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index afbaba2f08cf..85c97cee559d 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -60,6 +60,8 @@ namespace framework
 
 //  Configuration access class for PopupMenuControllerFactory implementation
 
+namespace {
+
 class ConfigurationAccess_UICommand : // Order is necessary for right initialization!
                                         public  ::cppu::WeakImplHelper<XNameAccess,XContainerListener>
 {
@@ -145,6 +147,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
         bool                          m_bGenericDataRetrieved;
 };
 
+}
+
+
 //  XInterface, XTypeProvider
 
 ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 90c717afad8b..45a5387186b9 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -67,12 +67,16 @@ using namespace ::com::sun::star::xml::sax;
 namespace framework
 {
 
+namespace {
+
 struct ImageXMLEntryProperty
 {
     OReadImagesDocumentHandler::Image_XML_Namespace nNamespace;
     char                                            aEntryName[20];
 };
 
+}
+
 ImageXMLEntryProperty const ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_COUNT] =
 {
     { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGECONTAINER          },
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 70159a2c65fd..8be6842fd3a1 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -240,6 +240,8 @@ xmlNodePtr HelpCompiler::clone(xmlNodePtr node, const std::string& appl)
     return root;
 }
 
+namespace {
+
 class myparser
 {
 public:
@@ -265,6 +267,8 @@ private:
     std::string dump(xmlNodePtr node);
 };
 
+}
+
 std::string myparser::dump(xmlNodePtr node)
 {
     std::string app;
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 44444902eb71..cad47dad0b08 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -122,6 +122,8 @@ void IndexerPreProcessor::processDocument
     }
 }
 
+namespace {
+
 struct Data
 {
     std::vector<std::string> _idList;
@@ -140,6 +142,8 @@ struct Data
     }
 };
 
+}
+
 static void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const std::string& aValueStr )
 {
     if( pFile == nullptr )
@@ -164,6 +168,8 @@ static void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const
         fprintf(stderr, "fwrite to db failed\n");
 }
 
+namespace {
+
 class HelpKeyword
 {
 private:
@@ -190,6 +196,8 @@ public:
     }
 };
 
+}
+
 namespace URLEncoder
 {
     static std::string encode(const std::string &rIn)
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index 533769d879ac..f9e33b1f40f7 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -22,6 +22,8 @@
 #include <vector>
 #include "attributes.hxx"
 
+namespace {
+
 struct TagAttribute
 {
     TagAttribute( const OUString &rName, const OUString &rType , const OUString &rValue )
@@ -36,6 +38,8 @@ struct TagAttribute
     OUString sValue;
 };
 
+}
+
 struct AttributeListImpl_impl
 {
     AttributeListImpl_impl()
diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx
index 52fffd8f910a..fcd6c4822169 100644
--- a/hwpfilter/source/fontmap.cxx
+++ b/hwpfilter/source/fontmap.cxx
@@ -27,12 +27,17 @@
 #include <sal/types.h>
 #include "fontmap.hxx"
 
+namespace {
+
 struct FontEntry
 {
     const char *familyname;
     int key;
      double ratio;
 };
+
+}
+
 /**
  * ratio\xb4\xc2 \xc7\xd1\xb1\xdb 70%, \xbc\xfd\xc0\xda 10% \xbf\xb5\xb9\xae 20%\xc0\xc7 \xba\xf1\xc0\xb2\xb7\xce \xb1\xb8\xbc\xba\xb5\xc7\xbe\xfa\xb4\xd9\xb4\xc2 \xb0\xa1\xc1\xa4\xc7\xcf\xbf\xa1 \xc1\xa4\xc7\xd8\xc1\xf8\xb4\xd9.
  */
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index fda36e0953ca..99885d00460b 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -653,12 +653,17 @@ static const hchar jamo_to_unicode[] =
     0x11f6, 0x11f7, 0x11f8, 0x11f9
 };
 
+namespace {
+
 struct JamoComp{
     int size;
     hchar v1;
     hchar v2;
     hchar v3;
 };
+
+}
+
 /* 704 + 12 = 706 */
 static const JamoComp jamocomp1_to_unicode[] =
 {
diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index e0573edf9cad..e80a9c1a8b0d 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -30,6 +30,8 @@ enum
 
 #define DATA static_cast<StyleData *>(style)
 
+namespace {
+
 struct StyleData
 {
     char name[MAXSTYLENAME + 1];
@@ -37,6 +39,8 @@ struct StyleData
     ParaShape pshape;
 };
 
+}
+
 static char buffer[MAXSTYLENAME + 1];
 
 HWPStyle::HWPStyle()
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index d3bd46207469..00cf2182866c 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -68,6 +68,8 @@ enum { SCRIPT_NONE, SCRIPT_SUB, SCRIPT_SUP, SCRIPT_ALL};
 static int  eq_word(MzString& outs, istream *strm, int script = SCRIPT_NONE);
 static bool eq_sentence(MzString& outs, istream *strm, const char *end = nullptr);
 
+namespace {
+
 struct hwpeq {
   const char    *key;       // hwp math keyword
   const char    *latex;     // corresponding latex keyword
@@ -75,6 +77,8 @@ struct hwpeq {
   unsigned char flag;       // case sensitive?
 };
 
+}
+
 static const hwpeq eq_tbl[] = {
   { "!=",         "\\equiv ", 0,  0   },
   { "#",          "\\\\",     0,  0   },
@@ -452,6 +456,8 @@ static void make_keyword( char *keyword, const char *token)
     }
 }
 
+namespace {
+
 // token reading function
 struct eq_stack {
   MzString  white;
@@ -465,6 +471,8 @@ struct eq_stack {
   }
 };
 
+}
+
 static eq_stack *stk = nullptr;
 
 static void push_token(MzString const &white, MzString const &token, istream *strm)
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 4144d20e0bde..51f072fed4ad 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -927,6 +927,7 @@ void HwpReader::makeAutoStyles()
     rendEl("office:automatic-styles");
 }
 
+namespace {
 
 struct PageSetting
 {
@@ -951,6 +952,8 @@ struct PageSetting
     bool bIsSet;
 };
 
+}
+
 void HwpReader::makeMasterStyles()
 {
     rstartEl("office:master-styles", mxList.get());
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index d70d81a92923..829431cfcc50 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -89,8 +89,12 @@
 /* Size of default input buffer. */
 #define YY_BUF_SIZE 16384
 
+namespace {
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
+}
+
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
@@ -103,6 +107,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
  */
 typedef unsigned int yy_size_t;
 
+namespace {
 
 struct yy_buffer_state
     {
@@ -161,6 +166,8 @@ struct yy_buffer_state
 #define YY_BUFFER_EOF_PENDING 2
     };
 
+}
+
 static YY_BUFFER_STATE yy_current_buffer = nullptr;
 
 /* We provide macros for accessing buffer states in case in the
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 3d8da21708b1..60fbe5ff4e0a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -104,6 +104,8 @@ struct Bcp47CountryEntry
     css::lang::Locale getLocale() const;
 };
 
+namespace {
+
 struct IsoLangEngEntry
 {
     LanguageType        mnLang;
@@ -123,6 +125,7 @@ struct IsoLangOtherEntry
     const sal_Char*     mpLanguage;
 };
 
+}
 
 // Entries for languages are lower case, for countries upper case, as
 // recommended by rfc5646 (obsoletes rfc4646 (obsoletes rfc3066 (obsoletes
@@ -1412,6 +1415,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLa
     return convertIsoNamesToLanguage( aLang, aCountry, false);
 }
 
+namespace {
 
 struct IsoLangGLIBCModifiersEntry
 {
@@ -1421,6 +1425,8 @@ struct IsoLangGLIBCModifiersEntry
     sal_Char      maAtString[9];
 };
 
+}
+
 static IsoLangGLIBCModifiersEntry const aImplIsoLangGLIBCModifiersEntries[] =
 {
     // MS-LANGID codes               ISO639-1/2/3 ISO3166            glibc modifier
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 7f580dfc9dd3..ef47e54579bc 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -33,6 +33,7 @@
 
 using namespace com::sun::star;
 
+namespace {
 
 // Helper to ensure lt_error_t is free'd
 struct myLtError
@@ -43,7 +44,6 @@ struct myLtError
 };
 
 // "statics" to be returned as const reference to an empty locale and string.
-namespace {
 struct theEmptyLocale : public rtl::Static< lang::Locale, theEmptyLocale > {};
 struct theEmptyBcp47 : public rtl::Static< OUString, theEmptyBcp47 > {};
 }
@@ -141,6 +141,7 @@ bool LanguageTag::isOnTheFlyID( LanguageType nLang )
         LANGUAGE_ON_THE_FLY_SUB_START <= nSub && nSub <= LANGUAGE_ON_THE_FLY_SUB_END;
 }
 
+namespace {
 
 /** A reference holder for liblangtag data de/initialization, one static
     instance. Currently implemented such that the first "ref" inits and dtor
@@ -165,7 +166,6 @@ private:
     static void teardown();
 };
 
-namespace {
 struct theDataRef : public rtl::Static< LiblangtagDataRef, theDataRef > {};
 }
 
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index e1675ec6a41d..93f81fa9cc6c 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -58,6 +58,8 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
 {
 }
 
+namespace {
+
 /*
     Wrapper class to provide public access to the icu::RuleBasedBreakIterator's
     setbreakType method.
@@ -79,6 +81,8 @@ class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
 
 };
 
+}
+
 // loading ICU breakiterator on demand.
 void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale,
         sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText)
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 996d01d73f49..549bae3c12aa 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -128,6 +128,7 @@ static sal_Int32 LastDayOfHebrewMonth(sal_Int32 month, sal_Int32 year) {
         return 30;
 }
 
+namespace {
 
 class HebrewDate {
 private:
@@ -187,6 +188,8 @@ public:
 
 };
 
+}
+
 //  Gregorian dates
 
 static int LastDayOfGregorianMonth(int month, int year) {
@@ -207,6 +210,8 @@ static int LastDayOfGregorianMonth(int month, int year) {
     }
 }
 
+namespace {
+
 class GregorianDate {
 private:
     int year;   // 1...
@@ -246,6 +251,8 @@ public:
 
 };
 
+}
+
 // map field value from gregorian calendar to other calendar, it can be overwritten by derived class.
 void Calendar_jewish::mapFromGregorian()
 {
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 273d40698a8f..80972f61092c 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1966,10 +1966,15 @@ void LCTransliterationNode::generateCode (const OFileWriter &of) const
     of.writeFunction("getTransliterations_", "nbOfTransliterations", "LCTransliterationsArray");
 }
 
+namespace {
+
 struct NameValuePair {
     const sal_Char *name;
     const sal_Char *value;
 };
+
+}
+
 static const NameValuePair ReserveWord[] = {
     { "trueWord", "true" },
     { "falseWord", "false" },
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 0679407cc81b..91e4c5de21bb 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1318,6 +1318,8 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale )
 
 // OutlineNumbering helper class
 
+namespace {
+
 struct OutlineNumberingLevel_Impl
 {
     OUString        sPrefix;
@@ -1351,6 +1353,8 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
+}
+
 Sequence< Reference<container::XIndexAccess> >
 LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale )
 {
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index ace747d8286f..e667f523316c 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -46,6 +46,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::io;
 
+namespace {
 
 /************
  * Sequence of bytes -> InputStream
@@ -88,6 +89,7 @@ public:
     Sequence< sal_Int8> m_seq;
 };
 
+}
 
 // Helper : create an input stream from a file
 
@@ -135,6 +137,7 @@ static Reference< XInputStream > createStreamFromFile(
     return r;
 }
 
+namespace {
 
 class TestDocumentHandler :
     public WeakImplHelper< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
@@ -292,6 +295,7 @@ public:
     OFileWriter of;
 };
 
+}
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index c19e6521d347..89d56a97826d 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -38,6 +38,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 
+namespace {
+
 struct Number {
     sal_Int16 number;
     const sal_Unicode *multiplierChar;
@@ -46,6 +48,7 @@ struct Number {
     const sal_Int16 *multiplierExponent;
 };
 
+}
 
 #define NUMBER_OMIT_ZERO (1 << 0)
 #define NUMBER_OMIT_ONLY_ZERO  (1 << 1)
@@ -65,8 +68,12 @@ struct Number {
 
 namespace i18npool {
 
+namespace {
+
 struct theNatNumMutex : public rtl::Static<osl::Mutex, theNatNumMutex> {};
 
+}
+
 static OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh);
 
 static OUString getCyrillicNativeNumberString(const OUString& aNumberString);
@@ -981,10 +988,16 @@ sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const
 // see numerical system in the Hebrew Numbering System in following link for details,
 // http://smontagu.org/writings/HebrewNumbers.html
 
+namespace {
+
 struct HebrewNumberChar {
     sal_Unicode code;
     sal_Int16 value;
-} const HebrewNumberCharArray[] = {
+};
+
+}
+
+HebrewNumberChar const HebrewNumberCharArray[] = {
     { 0x05ea, 400 },
     { 0x05ea, 400 },
     { 0x05e9, 300 },
@@ -1089,10 +1102,16 @@ static const sal_Unicode cyrillicThousandsMark = 0x0482;
 static const sal_Unicode cyrillicTitlo = 0x0483;
 static const sal_Unicode cyrillicTen = 0x0456;
 
+namespace {
+
 struct CyrillicNumberChar {
     sal_Unicode code;
     sal_Int16 value;
-} const CyrillicNumberCharArray[] = {
+};
+
+}
+
+CyrillicNumberChar const CyrillicNumberCharArray[] = {
     { 0x0446, 900 },
     { 0x047f, 800 },
     { 0x0471, 700 },
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index dd891558696d..eb71012e90eb 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -247,11 +247,17 @@ IMPL_CREATEINSTANCE( halfwidthKatakanaToFullwidthKatakana )
 IMPL_CREATEINSTANCE( fullwidthToHalfwidthLikeASC )
 IMPL_CREATEINSTANCE( halfwidthToFullwidthLikeJIS )
 
-static const struct InstancesArray {
+namespace {
+
+struct InstancesArray {
         const sal_Char* pServiceNm;
         const sal_Char* pImplementationNm;
         FN_CreateInstance pFn;
-} aInstances[] = {
+};
+
+}
+
+static const InstancesArray aInstances[] = {
     {   "com.sun.star.i18n.IndexEntrySupplier",
         "com.sun.star.i18n.IndexEntrySupplier",
         &IndexEntrySupplier_CreateInstance },
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 4173d898622d..8cebdb7f1a52 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -319,6 +319,7 @@ void make_stc_char(FILE *sfp, FILE *cfp)
     fprintf (cfp, "\tconst sal_Unicode* getSTC_CharData_T2S() { return STC_CharData_T2S; }\n");
 }
 
+namespace {
 
 struct Index {
     sal_uInt16 address;
@@ -326,6 +327,8 @@ struct Index {
     sal_Unicode *data;
 };
 
+}
+
 extern "C" {
 static int Index_comp(const void* s1, const void* s2)
 {
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 6b59399e9124..a8476334622e 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -39,6 +39,8 @@
 #endif
 #endif
 
+namespace {
+
 struct PageDesc
 {
     long m_nWidth;
@@ -47,6 +49,8 @@ struct PageDesc
     const char *m_pAltPSName;
 };
 
+}
+
 #define PT2MM100( v ) \
     long(((v) * 35.27777778) + 0.5)
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 2629c2d457cb..7613e0a59c6d 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -500,6 +500,8 @@ void SvIdlDataBase::AddDepFile(OUString const& rFileName)
     m_DepFiles.insert(rFileName);
 }
 
+namespace {
+
 struct WriteDep
 {
     SvFileStream & m_rStream;
@@ -524,6 +526,8 @@ struct WriteDummy
     }
 };
 
+}
+
 void SvIdlDataBase::WriteDepFile(
         SvFileStream & rStream, OUString const& rTarget)
 {
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index cd532f91320f..61190845f1ba 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -282,6 +282,8 @@ static void lcl_writeString(::osl::File & rFile, ::osl::FileBase::RC & o_rRC,
     }
 }
 
+namespace {
+
 struct WriteDep
 {
     ::osl::File& m_rFile;
@@ -310,6 +312,8 @@ struct WriteDummy
     }
 };
 
+}
+
 bool
 Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget)
 {
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index d90f30976ec8..fc860b1063b1 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -55,6 +55,8 @@ namespace io_TextInputStream
 #define INITIAL_UNICODE_BUFFER_CAPACITY     0x100
 #define READ_BYTE_COUNT                     0x100
 
+namespace {
+
 class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo >
 {
     Reference< XInputStream > mxStream;
@@ -105,6 +107,8 @@ public:
         virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
 };
 
+}
+
 OTextInputStream::OTextInputStream()
     : mbEncodingInitialized(false)
     , mConvText2Unicode(nullptr)
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 22fab1f01bd0..5f39c8afbb5e 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -47,6 +47,8 @@ namespace io_TextOutputStream
 
 // Implementation XTextOutputStream
 
+namespace {
+
 class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInfo >
 {
     Reference< XOutputStream > mxStream;
@@ -83,6 +85,8 @@ public:
         virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
 };
 
+}
+
 OTextOutputStream::OTextOutputStream()
     : mbEncodingInitialized(false)
     , mConvUnicode2Text(nullptr)
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index ad9ce09a20cb..b06b0aa678bc 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -37,6 +37,7 @@ using namespace ::com::sun::star::io;
 
 namespace io_acceptor
 {
+    namespace {
 
     class PipeConnection :
         public WeakImplHelper< XConnection >
@@ -55,6 +56,7 @@ namespace io_acceptor
         OUString m_sDescription;
     };
 
+    }
 
     PipeConnection::PipeConnection( const OUString &sConnectionDescription) :
         m_nStatus( 0 ),
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index a72179ecb356..9700cd566bb8 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -41,6 +41,7 @@ namespace io_acceptor {
     typedef std::unordered_set< css::uno::Reference< css::io::XStreamListener> >
             XStreamListener_hash_set;
 
+    namespace {
 
     class SocketConnection : public ::cppu::WeakImplHelper<
         css::connection::XConnection,
@@ -75,6 +76,8 @@ namespace io_acceptor {
         XStreamListener_hash_set _listeners;
     };
 
+    }
+
     template<class T>
     static void notifyListeners(SocketConnection * pCon, bool * notified, T t)
     {
@@ -98,6 +101,8 @@ namespace io_acceptor {
         xStreamListener->started();
     }
 
+    namespace {
+
     struct callError {
         const Any & any;
 
@@ -106,6 +111,8 @@ namespace io_acceptor {
         void operator () (const Reference<XStreamListener>& xStreamListener);
     };
 
+    }
+
     callError::callError(const Any & aAny)
         : any(aAny)
     {
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 217c23b9a845..d1f2bb54bf40 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -46,6 +46,8 @@ using namespace ::com::sun::star::connection;
 
 namespace io_acceptor
 {
+    namespace {
+
     class OAcceptor : public WeakImplHelper< XAcceptor, XServiceInfo >
     {
     public:
@@ -73,6 +75,7 @@ namespace io_acceptor
         Reference<XAcceptor>         _xAcceptor;
     };
 
+    }
 
     OAcceptor::OAcceptor( const Reference< XComponentContext > & xCtx )
         : m_bInAccept( false )
@@ -85,6 +88,8 @@ namespace io_acceptor
         m_pPipe.reset();
     }
 
+    namespace {
+
     struct BeingInAccept
     {
         /// @throws AlreadyAcceptingException
@@ -102,6 +107,8 @@ namespace io_acceptor
         bool *m_pFlag;
     };
 
+    }
+
     Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescription )
     {
         // if there is a thread already accepting in this object, throw an exception.
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index c21a34d17eac..0f4792f3aa8e 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -45,6 +45,8 @@ using namespace ::com::sun::star::connection;
 
 namespace stoc_connector
 {
+    namespace {
+
     class OConnector : public WeakImplHelper< XConnector, XServiceInfo >
     {
         Reference< XMultiComponentFactory > _xSMgr;
@@ -62,6 +64,8 @@ namespace stoc_connector
                 virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
     };
 
+    }
+
     OConnector::OConnector(const Reference< XComponentContext > &xCtx)
         : _xSMgr( xCtx->getServiceManager() )
         , _xCtx( xCtx )
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index ada34a6e2016..164cd4f6f31c 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -53,6 +53,8 @@ namespace stoc_connector {
         xStreamListener->started();
     }
 
+    namespace {
+
     struct callError {
         const Any & any;
 
@@ -61,6 +63,8 @@ namespace stoc_connector {
         void operator () (const Reference<XStreamListener>& xStreamListener);
     };
 
+    }
+
     callError::callError(const Any & aAny)
         : any(aAny)
     {
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 0c1dd29f9bb1..6ffd12c89387 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -49,6 +49,8 @@ using namespace ::com::sun::star::lang;
 
 namespace io_stm {
 
+namespace {
+
 class ODataInputStream :
     public WeakImplHelper <
                               XDataInputStream,
@@ -106,6 +108,8 @@ protected:
     bool m_bValidStream;
 };
 
+}
+
 // XInputStream
 sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
 {
@@ -428,6 +432,7 @@ Sequence<OUString> ODataInputStream_getSupportedServiceNames()
     return aRet;
 }
 
+namespace {
 
 class ODataOutputStream :
     public WeakImplHelper <
@@ -480,6 +485,8 @@ protected:
     bool m_bValidStream;
 };
 
+}
+
 // XOutputStream
 void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 {
@@ -732,6 +739,7 @@ Sequence<OUString> ODataOutputStream_getSupportedServiceNames()
     return aRet;
 }
 
+namespace {
 
 struct equalObjectContainer_Impl
 {
@@ -751,6 +759,8 @@ struct hashObjectContainer_Impl
     }
 };
 
+}
+
 typedef std::unordered_map
 <
     Reference< XInterface >,
@@ -759,6 +769,8 @@ typedef std::unordered_map
     equalObjectContainer_Impl
 > ObjectContainer_Impl;
 
+namespace {
+
 class OObjectOutputStream:
     public ImplInheritanceHelper<
             ODataOutputStream, /* parent */
@@ -827,6 +839,8 @@ private:
     bool                            m_bValidMarkable;
 };
 
+}
+
 void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj )
 {
 
@@ -998,6 +1012,8 @@ Sequence< OUString > OObjectOutputStream::getSupportedServiceNames()
     return OObjectOutputStream_getSupportedServiceNames();
 }
 
+namespace {
+
 class OObjectInputStream:
     public ImplInheritanceHelper<
         ODataInputStream, /* parent */
@@ -1073,6 +1089,8 @@ private:
 
 };
 
+}
+
 Reference< XPersistObject >  OObjectInputStream::readObject()
 {
     // check if chain contains a XMarkableStream
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 19191e4a957b..7623392b4277 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -52,6 +52,8 @@ using namespace ::com::sun::star::lang;
 
 namespace io_stm {
 
+namespace {
+
 /***********************
 *
 * OMarkableOutputStream.
@@ -122,6 +124,8 @@ private:
     Mutex m_mutex;
 };
 
+}
+
 OMarkableOutputStream::OMarkableOutputStream( )
     : m_bValidStream(false)
     , m_pBuffer( new MemRingBuffer )
@@ -386,6 +390,7 @@ Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames()
 
 // XMarkableInputStream
 
+namespace {
 
 class OMarkableInputStream :
     public WeakImplHelper
@@ -448,6 +453,8 @@ private:
     Mutex m_mutex;
 };
 
+}
+
 OMarkableInputStream::OMarkableInputStream()
     : m_bValidStream(false)
     , m_nCurrentPos(0)
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 4815a69bc862..07331472d5e5 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -52,6 +52,8 @@ namespace com::sun::star::uno { class XComponentContext; }
 
 namespace io_stm{
 
+namespace {
+
 class OPipeImpl :
     public WeakImplHelper< XPipe , XConnectable , XServiceInfo >
 {
@@ -98,6 +100,7 @@ private:
     std::unique_ptr<MemFIFO> m_pFIFO;
 };
 
+}
 
 OPipeImpl::OPipeImpl()
     : m_nBytesToSkip(0 )
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index fc6ba14c8488..29f09bdd3e81 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -46,6 +46,8 @@ using namespace com::sun::star::io;
 
 namespace io_stm {
 
+    namespace {
+
     class Pump : public WeakImplHelper<
           XActiveDataSource, XActiveDataSink, XActiveDataControl, XConnectable, XServiceInfo >
     {
@@ -98,6 +100,8 @@ namespace io_stm {
         virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) override;
     };
 
+    }
+
 Pump::Pump() : m_aThread( nullptr ),
                m_cnt( m_aMutex ),
                m_closeFired( false )
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f703fb4c200b..3afa7fcbbd07 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -193,6 +193,7 @@ rtl::Bootstrap * getBootstrap()
             InitBootstrap(), ::osl::GetGlobalMutex(), InitBootstrapData());
 }
 
+namespace {
 
 class FileHandleGuard
 {
@@ -211,6 +212,8 @@ private:
     oslFileHandle & m_rHandle;
 };
 
+}
+
 inline FileHandleGuard::~FileHandleGuard()
 {
     if (m_rHandle != nullptr)
@@ -222,6 +225,7 @@ inline FileHandleGuard::~FileHandleGuard()
     }
 }
 
+namespace {
 
 class FileHandleReader
 {
@@ -248,6 +252,8 @@ private:
     bool m_bLf;
 };
 
+}
+
 FileHandleReader::Result
 FileHandleReader::readLine(OString * pLine)
 {
@@ -304,6 +310,8 @@ FileHandleReader::readLine(OString * pLine)
     }
 }
 
+namespace {
+
 class AsynchReader: public salhelper::Thread
 {
     size_t  m_nDataSize;
@@ -326,6 +334,8 @@ public:
     OString getData();
 };
 
+}
+
 AsynchReader::AsynchReader(oslFileHandle & rHandle):
     Thread("jvmfwkAsyncReader"), m_nDataSize(0),
     m_aGuard(rHandle)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index b6598991f44b..fcbd57dda73e 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -14,11 +14,15 @@
 
 #include <string>
 
+namespace {
+
 struct GtvApplicationPrivate
 {
     GtvRenderingArgs* m_pRenderingArgs;
 };
 
+}
+
 #if defined __clang__
 #if __has_warning("-Wdeprecated-volatile")
 #pragma clang diagnostic push
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 7e6e14d0a9d9..c28349046cb6 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@@ -21,6 +21,8 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/optional.hpp>
 
+namespace {
+
 struct GtvCalcHeaderBarPrivateImpl
 {
     /// Stores size and content of a single row header.
@@ -52,6 +54,8 @@ struct GtvCalcHeaderBarPrivate
     }
 };
 
+}
+
 #if defined __clang__
 #if __has_warning("-Wdeprecated-volatile")
 #pragma clang diagnostic push
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index 3c9e68747074..fcb336fb248b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -28,6 +28,8 @@
 #include <map>
 #include <boost/property_tree/json_parser.hpp>
 
+namespace {
+
 struct GtvLokDialogPrivate
 {
     LOKDocView* lokdocview;
@@ -54,6 +56,8 @@ struct GtvLokDialogPrivate
     guint dialogid;
 };
 
+}
+
 #if defined __clang__
 #if __has_warning("-Wdeprecated-volatile")
 #pragma clang diagnostic push
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index bdb1192f94da..cdbb236a600a 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -22,6 +22,8 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/optional.hpp>
 
+namespace {
+
 struct GtvMainToolbarPrivateImpl
 {
     GtkWidget* toolbar1;
@@ -66,6 +68,8 @@ struct GtvMainToolbarPrivate
     }
 };
 
+}
+
 #if defined __clang__
 #if __has_warning("-Wdeprecated-volatile")
 #pragma clang diagnostic push
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx
index 2a8142de9a7c..aceed1fa59b2 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -48,6 +48,9 @@ static double getTimeNow()
 }
 
 static double origin;
+
+namespace {
+
 struct TimeRecord {
     const char *mpName;
     double mfTime;
@@ -59,6 +62,9 @@ struct TimeRecord {
         fprintf(stderr, "%3.3fs - %s\n", (mfTime - origin), mpName);
     }
 };
+
+}
+
 static std::vector< TimeRecord > aTimes;
 
 /// Dump an array (or sub-array) of RGBA or BGRA to an RGB PPM file.
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 89e16dcfd19b..a5695bb8dd69 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -72,6 +72,8 @@ static osl::Mutex &  GetLangGuessMutex()
     return aMutex;
 }
 
+namespace {
+
 class LangGuess_Impl :
     public ::cppu::WeakImplHelper<
         XLanguageGuessing,
@@ -107,6 +109,8 @@ public:
     void SetFingerPrintsDB( const OUString &fileName );
 };
 
+}
+
 LangGuess_Impl::LangGuess_Impl() :
     m_bInitialized( false )
 {
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
index 3220935e1688..76b3b65c3632 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -68,6 +68,8 @@ static int startsAsciiCaseInsensitive(const std::string &s1, const std::string &
             return ret;
  }
 
+namespace {
+
 /**
  * This following structure is from textcat.c
  */
@@ -83,6 +85,8 @@ typedef struct textcat_t{
 } textcat_t;
 // end of the 3 structs
 
+}
+
 SimpleGuesser::SimpleGuesser()
 {
     h = nullptr;
diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx
index fea2cb50e2c7..7ea2db473b04 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -66,6 +66,8 @@ static osl::Mutex& GetNumberTextMutex()
     return aMutex;
 }
 
+namespace
+{
 class NumberText_Impl : public ::cppu::WeakImplHelper<XNumberText, XServiceInfo>
 {
 #if ENABLE_LIBNUMBERTEXT
@@ -92,6 +94,7 @@ public:
                                             const ::css::lang::Locale& rLocale) override;
     virtual css::uno::Sequence<css::lang::Locale> SAL_CALL getAvailableLanguages() override;
 };
+}
 
 NumberText_Impl::NumberText_Impl()
     : m_bInitialized(false)
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 979a33ab8464..ccd52688108e 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -68,6 +68,7 @@ static sal_Int16 GetConversionTypeFromText( const OUString &rText )
     return nRes;
 }
 
+namespace {
 
 class ConvDicXMLImportContext :
     public SvXMLImportContext
@@ -154,6 +155,7 @@ public:
     const OUString &    GetLeftText() const     { return rEntryContext.GetLeftText(); }
 };
 
+}
 
 void ConvDicXMLImportContext::characters(const OUString & /*rChars*/)
 {
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index e2d6d652460a..0bd9883f999e 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -78,12 +78,16 @@ LinguOptions::~LinguOptions()
     }
 }
 
+namespace {
+
 struct WID_Name
 {
     sal_Int32        nWID;
     const char  *pPropertyName;
 };
 
+}
+
 //! order of entries is import (see LinguOptions::GetName)
 //! since the WID is used as index in this table!
 WID_Name const aWID_Name[] =
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index ef64ac9d25b3..eb10b709e21d 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -58,11 +58,15 @@ using namespace com::sun::star::linguistic2;
 namespace linguistic
 {
 
+namespace {
+
 //!! multi-thread safe mutex for all platforms !!
 struct LinguMutex : public rtl::Static< osl::Mutex, LinguMutex >
 {
 };
 
+}
+
 osl::Mutex &    GetLinguMutex()
 {
     return LinguMutex::get();
@@ -115,6 +119,8 @@ static sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 )
     return std::min(std::min(n1, n2), n3);
 }
 
+namespace {
+
 class IntArray2D
 {
 private:
@@ -127,6 +133,8 @@ public:
     sal_Int32 & Value( int i, int k  );
 };
 
+}
+
 IntArray2D::IntArray2D( int nDim1, int nDim2 )
 {
     n1 = nDim1;
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index ba0c45f08bc5..42ae281fd917 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -46,6 +46,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
+namespace {
 
 // ProposalList: list of proposals for misspelled words
 // The order of strings in the array should be left unchanged because the
@@ -73,6 +74,7 @@ public:
     std::vector< OUString > GetVector() const;
 };
 
+}
 
 bool ProposalList::HasEntry( const OUString &rText ) const
 {
diff --git a/o3tl/qa/test-lru_map.cxx b/o3tl/qa/test-lru_map.cxx
index 5ceec149571c..a03a6bf37200 100644
--- a/o3tl/qa/test-lru_map.cxx
+++ b/o3tl/qa/test-lru_map.cxx
@@ -182,6 +182,8 @@ void lru_map_test::testLruRemoval()
     CPPUNIT_ASSERT_EQUAL(700, lru.find(7)->second);
 }
 
+namespace {
+
 struct TestClassKey
 {
     int mA;
@@ -210,6 +212,8 @@ struct TestClassKeyHashFunction
     }
 };
 
+}
+
 void lru_map_test::testCustomHash()
 {
     // check lru_map with custom hash function
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 92fab00cd186..8b335040ee84 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -17,6 +17,7 @@
 
 using namespace ::o3tl;
 
+namespace {
 
 // helper class
 class SwContent
@@ -32,6 +33,8 @@ public:
     }
 };
 
+}
+
 class sorted_vector_test : public CppUnit::TestFixture
 {
 public:
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index ed52ccf5c2b1..b071126be53d 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -570,6 +570,8 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
 
 struct ObjectFormatterData;
 
+namespace {
+
 class DetailFormatterBase
 {
 public:
@@ -700,6 +702,8 @@ private:
     const ObjectTypeFormatEntry& mrEntry;   /// Additional settings.
 };
 
+}
+
 struct ObjectFormatterData
 {
     typedef RefMap< ObjectType, ObjectTypeFormatter > ObjectTypeFormatterMap;
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index 47d9426e0646..e1d184f9f413 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -45,6 +45,8 @@ void ClrMap::setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken )
     maClrMap[ nClrToken ] = nMappedClrToken;
 }
 
+namespace {
+
 struct find_by_token
 {
     explicit find_by_token(sal_Int32 token):
@@ -61,6 +63,8 @@ private:
     sal_Int32 const m_token;
 };
 
+}
+
 bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, ::Color& rColor ) const
 {
     OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0);
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 20db50d0d865..6b436c05cdb8 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -63,13 +63,14 @@ enum FormularCommand
     FC_VAL
 };
 
-}
-
 struct FormularCommandNameTable
 {
     const char*     pS;
     FormularCommand const pE;
 };
+
+}
+
 static const FormularCommandNameTable pFormularCommandNameTable[] =
 {
     { "*/",     FC_MULDIV },
@@ -426,6 +427,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
     return aRet;
 }
 
+namespace {
+
 // CT_GeomGuideList
 class GeomGuideListContext : public ContextHandler2
 {
@@ -438,6 +441,8 @@ protected:
     CustomShapeProperties&              mrCustomShapeProperties;
 };
 
+}
+
 GeomGuideListContext::GeomGuideListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList )
 : ContextHandler2( rParent )
 , mrGuideList( rGuideList )
@@ -628,6 +633,8 @@ static const OUString& GetGeomGuideName( const OUString& rValue )
     return rValue;
 }
 
+namespace {
+
 // CT_AdjPoint2D
 class AdjPoint2DContext : public ContextHandler2
 {
@@ -635,6 +642,8 @@ public:
     AdjPoint2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
 };
 
+}
+
 AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 {
@@ -642,6 +651,8 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper const & rParent, con
     rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_y ).get() );
 }
 
+namespace {
+
 // CT_XYAdjustHandle
 class XYAdjustHandleContext : public ContextHandler2
 {
@@ -654,6 +665,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 XYAdjustHandleContext::XYAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
 : ContextHandler2( rParent )
 , mrAdjustHandle( rAdjustHandle )
@@ -692,6 +705,8 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
     return nullptr;
 }
 
+namespace {
+
 // CT_PolarAdjustHandle
 class PolarAdjustHandleContext : public ContextHandler2
 {
@@ -704,6 +719,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 PolarAdjustHandleContext::PolarAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
 : ContextHandler2( rParent )
 , mrAdjustHandle( rAdjustHandle )
@@ -745,6 +762,8 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
     return nullptr;
 }
 
+namespace {
+
 // CT_AdjustHandleList
 class AdjustHandleListContext : public ContextHandler2
 {
@@ -757,6 +776,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 AdjustHandleListContext::AdjustHandleListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList )
 : ContextHandler2( rParent )
 , mrAdjustHandleList( rAdjustHandleList )
@@ -781,6 +802,8 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
     return nullptr;
 }
 
+namespace {
+
 // CT_ConnectionSite
 class ConnectionSiteContext : public ContextHandler2
 {
@@ -793,6 +816,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 ConnectionSiteContext::ConnectionSiteContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite )
 : ContextHandler2( rParent )
 , mrConnectionSite( rConnectionSite )
@@ -808,6 +833,8 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DMoveTo
 class Path2DMoveToContext : public ContextHandler2
 {
@@ -820,6 +847,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 Path2DMoveToContext::Path2DMoveToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 , mrAdjPoint2D( rAdjPoint2D )
@@ -834,6 +863,8 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DLineTo
 class Path2DLineToContext : public ContextHandler2
 {
@@ -846,6 +877,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 Path2DLineToContext::Path2DLineToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 , mrAdjPoint2D( rAdjPoint2D )
@@ -860,6 +893,8 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DQuadBezierTo
 class Path2DQuadBezierToContext : public ContextHandler2
 {
@@ -874,6 +909,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 Path2DQuadBezierToContext::Path2DQuadBezierToContext( ContextHandler2Helper const & rParent,
     CustomShapeProperties& rCustomShapeProperties,
         EnhancedCustomShapeParameterPair& rPt1,
@@ -893,6 +930,8 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DCubicBezierTo
 class Path2DCubicBezierToContext : public ContextHandler2
 {
@@ -909,6 +948,8 @@ protected:
     int nCount;
 };
 
+}
+
 Path2DCubicBezierToContext::Path2DCubicBezierToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties,
     EnhancedCustomShapeParameterPair& rControlPt1,
         EnhancedCustomShapeParameterPair& rControlPt2,
@@ -930,6 +971,8 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DContext
 class Path2DContext : public ContextHandler2
 {
@@ -945,6 +988,8 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
+}
+
 Path2DContext::Path2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D )
 : ContextHandler2( rParent )
 , mrPath2D( rPath2D )
@@ -1127,6 +1172,8 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
     return nullptr;
 }
 
+namespace {
+
 // CT_Path2DList
 class Path2DListContext : public ContextHandler2
 {
@@ -1143,6 +1190,8 @@ protected:
     std::vector< Path2D >& mrPath2DList;
 };
 
+}
+
 Path2DListContext:: Path2DListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments,
                                         std::vector< Path2D >& rPath2DList )
 : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index b98d0ee87ccf..3746addb8550 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -31,6 +31,8 @@ using namespace ::com::sun::star::uno;
 
 namespace oox { namespace drawingml {
 
+namespace {
+
 // CT_CxnList
 class CxnListContext
     : public ContextHandler2
@@ -320,6 +322,8 @@ private:
     DiagramDataPtr mpDataModel;
 };
 
+}
+
 DataModelContext::DataModelContext( ContextHandler2Helper const & rParent,
                                     const DiagramDataPtr & pDataModel )
     : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 3547aad28a7a..35128debddb9 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -34,6 +34,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
+namespace {
+
 class IfContext
     : public LayoutNodeContext
 {
@@ -169,6 +171,8 @@ private:
     LayoutNode::VarMap & mVariables;
 };
 
+}
+
 // CT_LayoutNode
 LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper const & rParent,
                                       const AttributeList& rAttribs,
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 4e574af50869..68f0d3c62b51 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -347,6 +347,8 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
     mbLocked = rReferencedShape.mbLocked;
 }
 
+namespace {
+
 struct ActionLockGuard
 {
     explicit ActionLockGuard(Reference<drawing::XShape> const& xShape)
@@ -366,6 +368,8 @@ private:
     Reference<document::XActionLockable> m_xLockable;
 };
 
+}
+
 // for group shapes, the following method is also adding each child
 void Shape::addChildren(
         XmlFilterBase& rFilterBase,
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index cbd1e420ee5a..0f8c90ab4c89 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -40,6 +40,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
+namespace {
+
 // CT_TextParagraph
 class TextParagraphContext : public ContextHandler2
 {
@@ -52,6 +54,8 @@ protected:
     TextParagraph& mrParagraph;
 };
 
+}
+
 TextParagraphContext::TextParagraphContext( ContextHandler2Helper const & rParent, TextParagraph& rPara )
 : ContextHandler2( rParent )
 , mrParagraph( rPara )
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index 8c94a9bf74db..3919a3790bd6 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -38,6 +38,8 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox {
 namespace drawingml {
 
+namespace {
+
 class FillStyleListContext : public ContextHandler2
 {
 public:
@@ -48,6 +50,8 @@ private:
     FillStyleList& mrFillStyleList;
 };
 
+}
+
 FillStyleListContext::FillStyleListContext( ContextHandler2Helper const & rParent, FillStyleList& rFillStyleList ) :
     ContextHandler2( rParent ),
     mrFillStyleList( rFillStyleList )
@@ -70,6 +74,8 @@ ContextHandlerRef FillStyleListContext::onCreateContext( sal_Int32 nElement, con
     return nullptr;
 }
 
+namespace {
+
 class LineStyleListContext : public ContextHandler2
 {
 public:
@@ -80,6 +86,8 @@ private:
     LineStyleList& mrLineStyleList;
 };
 
+}
+
 LineStyleListContext::LineStyleListContext( ContextHandler2Helper const & rParent, LineStyleList& rLineStyleList ) :
     ContextHandler2( rParent ),
     mrLineStyleList( rLineStyleList )
@@ -97,6 +105,8 @@ ContextHandlerRef LineStyleListContext::onCreateContext( sal_Int32 nElement, con
     return nullptr;
 }
 
+namespace {
+
 class EffectStyleListContext : public ContextHandler2
 {
 public:
@@ -107,6 +117,8 @@ private:
     EffectStyleList& mrEffectStyleList;
 };
 
+}
+
 EffectStyleListContext::EffectStyleListContext( ContextHandler2Helper const & rParent, EffectStyleList& rEffectStyleList ) :
     ContextHandler2( rParent ),
     mrEffectStyleList( rEffectStyleList )
@@ -129,6 +141,8 @@ ContextHandlerRef EffectStyleListContext::onCreateContext( sal_Int32 nElement, c
     return nullptr;
 }
 
+namespace {
+
 class FontSchemeContext : public ContextHandler2
 {
 public:
@@ -141,6 +155,8 @@ private:
     TextCharacterPropertiesPtr mxCharProps;
 };
 
+}
+
 FontSchemeContext::FontSchemeContext( ContextHandler2Helper const & rParent, FontScheme& rFontScheme ) :
     ContextHandler2( rParent ),
     mrFontScheme( rFontScheme )
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 7f0f948a4d85..89513746bcca 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -136,8 +136,6 @@ bool isPrimaryAxes(sal_Int32 nIndex)
     return nIndex != 1;
 }
 
-}
-
 class lcl_MatchesRole
 {
 public:
@@ -161,6 +159,8 @@ private:
     OUString const m_aRole;
 };
 
+}
+
 static Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Reference< chart2::XDiagram > & xDiagram )
 {
     Reference< chart2::data::XLabeledDataSequence >  xResult;
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index cf74b0341736..351b8e1422f5 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -72,6 +72,8 @@ void ProgressBar::setPosition( double fPosition )
 
 namespace prv {
 
+namespace {
+
 class SubSegment : public ISegmentProgressBar
 {
 public:
@@ -91,6 +93,8 @@ private:
     double              mfFreeStart;
 };
 
+}
+
 SubSegment::SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ) :
     mrParentProgress( rParentProgress ),
     mfStartPos( fStartPos ),
diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx
index ec338c451638..557f34016148 100644
--- a/oox/source/mathml/import.cxx
+++ b/oox/source/mathml/import.cxx
@@ -28,6 +28,8 @@ FormulaImportBase::FormulaImportBase()
 
 namespace formulaimport {
 
+namespace {
+
 class LazyMathBufferingContext : public core::ContextHandler
 {
 private:
@@ -47,6 +49,8 @@ public:
 
 };
 
+}
+
 LazyMathBufferingContext::LazyMathBufferingContext(
         core::ContextHandler const& rParent, drawingml::TextParagraph & rPara)
     : core::ContextHandler(rParent)
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index 0a8174cd053f..3be796d639d9 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -29,6 +29,8 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
 
+namespace {
+
 class CustomShowContext : public ::oox::core::FragmentHandler2
 {
     CustomShow mrCustomShow;
@@ -41,6 +43,8 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 };
 
+}
+
 CustomShowContext::CustomShowContext( FragmentHandler2 const & rParent,
     const Reference< XFastAttributeList >& rxAttribs,
         CustomShow const & rCustomShow )
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index b965dfea1b6f..1a69bb97a729 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -98,6 +98,8 @@ namespace {
 
 namespace oox { namespace ppt {
 
+    namespace {
+
     struct AnimColor
     {
         AnimColor(sal_Int16 cs, sal_Int32 o, sal_Int32 t, sal_Int32 th )
@@ -897,6 +899,8 @@ namespace oox { namespace ppt {
         Any maProgress;
     };
 
+    }
+
     TimeNodeContext * TimeNodeContext::makeContext(
             FragmentHandler2 const & rParent, sal_Int32  aElement,
             const Reference< XFastAttributeList >& xAttribs,
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 43f10ee05df9..ab524c513e58 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -39,6 +39,8 @@ using namespace ::oox::core;
 
 namespace oox { namespace ppt {
 
+    namespace {
+
     // CT_TLShapeTargetElement
     class ShapeTargetElementContext
         : public FragmentHandler2
@@ -97,6 +99,8 @@ namespace oox { namespace ppt {
         ShapeTargetElement & maShapeTarget;
     };
 
+    }
+
     TimeTargetElementContext::TimeTargetElementContext( FragmentHandler2 const & rParent, const AnimTargetElementPtr & pValue )
         : FragmentHandler2( rParent ),
             mpTarget( pValue )
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index 562504090f76..6f96395c2806 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -77,6 +77,8 @@ OUString ShapeFilterBase::getImplementationName()
     return OUString();
 }
 
+namespace {
+
 /// Graphic helper for shapes, that can manage color schemes.
 class ShapeGraphicHelper : public GraphicHelper
 {
@@ -87,6 +89,8 @@ private:
     const ShapeFilterBase& mrFilter;
 };
 
+}
+
 ShapeGraphicHelper::ShapeGraphicHelper( const ShapeFilterBase& rFilter ) :
     GraphicHelper( rFilter.getComponentContext(), rFilter.getTargetFrame(), rFilter.getStorage() ),
     mrFilter( rFilter )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 63178c7fec24..a7e632472c67 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -106,6 +106,8 @@ using namespace com::sun::star::packages::zip::ZipConstants;
 #define THROW_WHERE ""
 #endif
 
+namespace {
+
 class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer >
 {
     uno::Reference< XStream > mStream;
@@ -136,6 +138,8 @@ class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream >
         {}
 };
 
+}
+
 ZipPackage::ZipPackage ( const uno::Reference < XComponentContext > &xContext )
 : m_aMutexHolder( new comphelper::RefCountedMutex )
 , m_nStartKeyGenerationID( xml::crypto::DigestID::SHA1 )
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index ffdb81143961..8f1a0f6a89a3 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -175,6 +175,8 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
     osl_setEnvironment(envVar.pData, envValue.pData);
 }
 
+namespace {
+
 struct PythonInit
 {
 PythonInit() {
@@ -237,6 +239,8 @@ PythonInit() {
 }
 };
 
+}
+
 static Reference<XInterface> CreateInstance(const Reference<XComponentContext> & ctx)
 {
     // tdf#114815 thread-safe static to init python only once
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 656d1c84cb0e..9be3e1f1aef8 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -31,6 +31,8 @@ using com::sun::star::script::XInvocation2;
 
 namespace pyuno
 {
+namespace {
+
 struct PyUNO_callable_Internals
 {
     Reference<XInvocation2> xInvocation;
@@ -44,6 +46,8 @@ struct PyUNO_callable
     PyUNO_callable_Internals* members;
 };
 
+}
+
 static void PyUNO_callable_del (PyObject* self)
 {
     PyUNO_callable* me;
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index 1be9cd4ed69b..e4ed6cb9d0a6 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -28,6 +28,9 @@ namespace pyuno
 {
 
 static bool g_destructorsOfStaticObjectsHaveBeenCalled;
+
+namespace {
+
 class StaticDestructorGuard
 {
 public:
@@ -36,6 +39,9 @@ public:
         g_destructorsOfStaticObjectsHaveBeenCalled = true;
     }
 };
+
+}
+
 static StaticDestructorGuard guard;
 
 static bool isAfterUnloadOrPy_Finalize()
@@ -44,6 +50,8 @@ static bool isAfterUnloadOrPy_Finalize()
         !Py_IsInitialized();
 }
 
+namespace {
+
 class GCThread: public salhelper::Thread {
 public:
     GCThread( PyInterpreterState *interpreter, PyObject * object );
@@ -57,6 +65,8 @@ private:
     PyInterpreterState *mPyInterpreter;
 };
 
+}
+
 GCThread::GCThread( PyInterpreterState *interpreter, PyObject * object ) :
     Thread( "pyunoGCThread" ), mPyObject( object ),
     mPyInterpreter( interpreter )
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index b799e8b30ef2..501ad3096804 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -52,6 +52,8 @@ const sal_uInt16 majorVersion = 0x0001;
 
 **************************************************************************/
 
+namespace {
+
 class BlopObject
 {
 public:
@@ -148,6 +150,8 @@ public:
     }
 };
 
+}
+
 BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
     : m_bufferLen(len)
 {
@@ -160,6 +164,8 @@ BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
 
 **************************************************************************/
 
+namespace {
+
 class StringCache
 {
 public:
@@ -172,6 +178,8 @@ public:
     sal_uInt16 createString(const sal_uInt8* buffer); // throws std::bad_alloc
 };
 
+}
+
 StringCache::StringCache(sal_uInt16 size)
     : m_stringTable(size)
     , m_stringsCopied(0)
@@ -208,6 +216,8 @@ sal_uInt16 StringCache::createString(const sal_uInt8* buffer)
 
 **************************************************************************/
 
+namespace {
+
 class ConstantPool : public BlopObject
 {
 public:
@@ -242,6 +252,8 @@ public:
         // throws std::bad_alloc
 };
 
+}
+
 sal_uInt32 ConstantPool::parseIndex()
 {
     m_pIndex.reset();
@@ -524,6 +536,8 @@ const sal_Unicode* ConstantPool::readStringConstant(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class FieldList : public BlopObject
 {
 public:
@@ -558,6 +572,7 @@ public:
     const sal_Char* getFieldFileName(sal_uInt16 index) const;
 };
 
+}
 
 const sal_Char* FieldList::getFieldName(sal_uInt16 index) const
 {
@@ -708,6 +723,8 @@ const sal_Char* FieldList::getFieldFileName(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class ReferenceList : public BlopObject
 {
 public:
@@ -737,6 +754,7 @@ public:
     RTFieldAccess   getReferenceAccess(sal_uInt16 index) const;
 };
 
+}
 
 const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index) const
 {
@@ -808,6 +826,8 @@ RTFieldAccess ReferenceList::getReferenceAccess(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class MethodList : public BlopObject
 {
 public:
@@ -850,6 +870,8 @@ private:
     sal_uInt16 calcMethodParamIndex( const sal_uInt16 index ) const;
 };
 
+}
+
 sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index ) const
 {
     return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
@@ -1069,6 +1091,8 @@ const sal_Char* MethodList::getMethodDoku(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class TypeRegistryEntry: public BlopObject {
 public:
     std::unique_ptr<ConstantPool> m_pCP;
@@ -1086,6 +1110,8 @@ public:
     typereg_Version getVersion() const;
 };
 
+}
+
 TypeRegistryEntry::TypeRegistryEntry(
     const sal_uInt8* buffer, sal_uInt32 len):
     BlopObject(buffer, len), m_refCount(1), m_nSuperTypes(0),
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 6b29fab9e448..409773a7017d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -30,6 +30,8 @@
 
 using namespace registry::tools;
 
+namespace {
+
 class Options_Impl : public Options
 {
     bool m_bVerbose;
@@ -45,6 +47,8 @@ protected:
     virtual bool initOptions_Impl(std::vector< std::string > & rArgs) override;
 };
 
+}
+
 void Options_Impl::printUsage_Impl() const
 {
     fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n");
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index eb94a0706c35..ddafd346bc7e 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -55,6 +55,8 @@ static OUString resolver_getImplementationName()
     return IMPLNAME;
 }
 
+namespace {
+
 class ResolverImpl : public WeakImplHelper< XServiceInfo, XUnoUrlResolver >
 {
     Reference< XMultiComponentFactory > _xSMgr;
@@ -72,6 +74,8 @@ public:
     virtual Reference< XInterface > SAL_CALL resolve( const OUString & rUnoUrl ) override;
 };
 
+}
+
 ResolverImpl::ResolverImpl( const Reference< XComponentContext > & xCtx )
     : _xSMgr( xCtx->getServiceManager() )
     , _xCtx( xCtx )
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index a051e20ea484..296419e4f2db 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -229,11 +229,19 @@ static void lcl_extractAndStartStatusIndicator( const utl::MediaDescriptor& _rDe
 }
 
 typedef ::comphelper::OPropertyStateContainer       OStyle_PBASE;
+
+namespace {
+
 class OStyle;
+
+}
+
 typedef ::comphelper::OPropertyArrayUsageHelper <   OStyle
                                                 >   OStyle_PABASE;
 typedef ::cppu::WeakImplHelper< style::XStyle, beans::XMultiPropertyStates> TStyleBASE;
 
+namespace {
+
 class OStyle :   public ::comphelper::OMutexAndBroadcastHelper
                 ,public TStyleBASE
                 ,public OStyle_PBASE
@@ -275,6 +283,8 @@ public:
     uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
+}
+
 OStyle::OStyle()
 :OStyle_PBASE(m_aBHelper)
 ,m_aSize(21000,29700)
@@ -2216,6 +2226,9 @@ OUString SAL_CALL OReportDefinition::getShapeType(  )
 typedef ::cppu::WeakImplHelper< container::XNameContainer,
                              container::XIndexAccess
                             > TStylesBASE;
+
+namespace {
+
 class OStylesHelper:
     public cppu::BaseMutex, public TStylesBASE
 {
@@ -2251,6 +2264,8 @@ public:
     virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 };
 
+}
+
 OStylesHelper::OStylesHelper(const uno::Type& rType)
     : cppu::BaseMutex()
     , m_aType(rType)
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 80aab3c3a428..645797498c04 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -59,6 +59,7 @@ namespace rptui
     using namespace container;
     using namespace report;
 
+namespace {
 
 struct PropertyInfo
 {
@@ -70,8 +71,12 @@ struct PropertyInfo
     }
 };
 
+}
+
 typedef std::unordered_map< OUString, PropertyInfo >    PropertiesInfo;
 
+namespace {
+
 struct ObjectInfo
 {
     PropertiesInfo              aProperties;
@@ -84,6 +89,8 @@ struct ObjectInfo
     }
 };
 
+}
+
 typedef ::std::map< Reference< XPropertySet >, ObjectInfo >    PropertySetInfoCache;
 
 
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 2f00950b265c..0c3ad1e70ce3 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -154,6 +154,7 @@ namespace rptxml
         return aSupported;
     }
 
+    namespace {
 
     class OSpecialHandleXMLExportPropertyMapper : public SvXMLExportPropertyMapper
     {
@@ -175,6 +176,8 @@ namespace rptxml
         }
     };
 
+    }
+
 static void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
 {
     for (auto& rEntry : _rGrid)
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 94842e6bdb4c..0f33f91e98a9 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -36,6 +36,8 @@ namespace rptxml
 {
     using namespace ::com::sun::star;
 
+namespace {
+
 class OXMLCharContent: public XMLCharContext
 {
     OXMLFixedContent* m_pFixedContent;
@@ -62,6 +64,9 @@ public:
     virtual void InsertControlCharacter(sal_Int16   _nControl) override;
     virtual void InsertString(const OUString& _sString) override;
 };
+
+}
+
 OXMLCharContent::OXMLCharContent(
         SvXMLImport& rImport,
         OXMLFixedContent* _pFixedContent,
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 092f928b22a1..6c454eda45d0 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -44,6 +44,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace xmloff::token;
 
+namespace {
 
 class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper
 {
@@ -64,6 +65,7 @@ public:
     }
 };
 
+}
 
 OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index e4df625cacce..b39b315ce13b 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -83,6 +83,8 @@ using namespace ::com::sun::star::xml::sax;
 using namespace xmloff;
 using namespace ::com::sun::star::util;
 
+namespace {
+
 class RptMLMasterStylesContext_Impl:
     public XMLTextMasterStylesContext
 {
@@ -101,6 +103,8 @@ public:
     virtual void EndElement() override;
 };
 
+}
+
 RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
         ORptFilter& rImport, sal_uInt16 nPrfx,
         const OUString& rLName ,
@@ -576,6 +580,8 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
+namespace {
+
 class RptXMLDocumentSettingsContext : public SvXMLImportContext
 {
 public:
@@ -651,6 +657,8 @@ public:
     }
 };
 
+}
+
 SvXMLImportContextRef RptXMLDocumentBodyContext::CreateChildContext(
         sal_uInt16 const nPrefix,
         const OUString& rLocalName,
@@ -678,6 +686,8 @@ SvXMLImportContextRef RptXMLDocumentBodyContext::CreateChildContext(
     }
 }
 
+namespace {
+
 class RptXMLDocumentContentContext : public SvXMLImportContext
 {
 public:
@@ -720,6 +730,8 @@ public:
     }
 };
 
+}
+
 SvXMLImportContext* ORptFilter::CreateDocumentContext( sal_uInt16 nPrefix,
                                       const OUString& rLocalName,
                                       const uno::Reference< xml::sax::XAttributeList >& xAttrList )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index abd9102c46fa..b3219be00fe0 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -77,6 +77,9 @@ using namespace ::comphelper;
   * Separated out from OFieldExpressionControl to prevent collision of ref-counted base classes
   */
 class OFieldExpressionControl;
+
+namespace {
+
 class OFieldExpressionControlContainerListener : public ::cppu::WeakImplHelper< container::XContainerListener >
 {
     VclPtr<OFieldExpressionControl> mpParent;
@@ -91,6 +94,8 @@ public:
     virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 };
 
+}
+
 class OFieldExpressionControl : public ::svt::EditBrowseBox
 {
     ::osl::Mutex                    m_aMutex;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 80d018d88220..ef09f4ae2455 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -102,6 +102,7 @@ static OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElemen
     return sName.makeStringAndClear();
 }
 
+namespace {
 
 class NavigatorTree :   public ::cppu::BaseMutex
                     ,   public SvTreeListBox
@@ -205,6 +206,8 @@ private:
     using SvTreeListBox::ExecuteDrop;
 };
 
+}
+
 NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController )
         :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
         ,comphelper::OSelectionChangeListener()
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 2fd4bc6bf20d..fe968c7fddd6 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -63,6 +63,7 @@ namespace rptui
     {
     }
 
+    namespace {
 
     // compare PropertyInfo
     struct PropertyInfoLessByName
@@ -73,6 +74,7 @@ namespace rptui
         }
     };
 
+    }
 
     //= OPropertyInfoService
 
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index de49c0361817..a970d73b9873 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -55,6 +55,8 @@ using namespace container;
 #define REPORT_ID           2
 #define TASKPANE_ID         3
 
+namespace {
+
 class OTaskWindow : public vcl::Window
 {
     VclPtr<PropBrw> m_pPropWin;
@@ -76,6 +78,7 @@ public:
     }
 };
 
+}
 
 // class ODesignView
 
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index 5f157c120b2d..76bdc4cd26ed 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -27,6 +27,8 @@
 namespace osl
 {
 
+namespace {
+
 class OGlobalTimer
 {
 
@@ -38,6 +40,8 @@ public:
 
 };
 
+}
+
 static OGlobalTimer aGlobalTimer;
 
 } // namespace osl
diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index cede35a86d04..d73d67e91b37 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -29,6 +29,8 @@
 #include <osl/conditn.h>
 #include <osl/time.h>
 
+namespace {
+
 struct oslConditionImpl
 {
     pthread_cond_t  m_Condition;
@@ -36,6 +38,8 @@ struct oslConditionImpl
     bool            m_State;
 };
 
+}
+
 oslCondition SAL_CALL osl_createCondition()
 {
     oslConditionImpl* pCond;
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index b6a0acaae2c4..cfd71419d3fe 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -60,6 +60,8 @@
 #include <android/asset_manager.h>
 #endif
 
+namespace {
+
 struct FileHandle_Impl
 {
     pthread_mutex_t m_mutex;
@@ -155,6 +157,8 @@ struct FileHandle_Impl
     };
 };
 
+}
+
 FileHandle_Impl::Guard::Guard(pthread_mutex_t * pMutex)
     : m_mutex(pMutex)
 {
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 4d629f849868..163deb0c2493 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -158,6 +158,8 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry(
             dirent == "..");
 }
 
+namespace {
+
 /** Simple iterator for a path list separated by the specified character
 */
 class path_list_iterator
@@ -225,6 +227,8 @@ private:
     const sal_Unicode*  m_path_segment_end;
 };
 
+}
+
 bool osl_searchPath(
     const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 41d6de0b04ea..d479e0d40cfc 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -788,6 +788,8 @@ void SAL_CALL osl_freeProcessHandle(oslProcess Process)
 }
 
 #if defined(LINUX)
+namespace {
+
 struct osl_procStat
 {
    /* from 'stat' */
@@ -848,6 +850,8 @@ struct osl_procStat
     unsigned long vm_lib;     /* library size */
 };
 
+}
+
 static bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat)
 {
     int fd = 0;
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 35a5b90ece0d..fe7dc9db5ccf 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -140,6 +140,8 @@ oslProcessError bootstrap_getExecutableFile(rtl_uString ** ppFileURL)
 
 #endif
 
+namespace {
+
 struct CommandArgs_Impl
 {
     pthread_mutex_t m_mutex;
@@ -147,6 +149,8 @@ struct CommandArgs_Impl
     rtl_uString **  m_ppArgs;
 };
 
+}
+
 static struct CommandArgs_Impl g_command_args =
 {
     PTHREAD_MUTEX_INITIALIZER,
@@ -409,12 +413,16 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir
     return result;
 }
 
+namespace {
+
 struct ProcessLocale_Impl
 {
     pthread_mutex_t m_mutex;
     rtl_Locale *    m_pLocale;
 };
 
+}
+
 static struct ProcessLocale_Impl g_process_locale =
 {
     PTHREAD_MUTEX_INITIALIZER,
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index ad8868b5490c..717316c0817c 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -58,8 +58,6 @@ enum osl_TLockMode
     un_lock, read_lock, write_lock
 };
 
-}
-
 struct osl_TFile
 {
     int     m_Handle;
@@ -104,6 +102,8 @@ struct osl_TProfileImpl
     bool        m_bIsValid;
 };
 
+}
+
 static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags);
 static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags);
 static bool   OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 5ea77495daa6..fb694ebd92cd 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -75,6 +75,8 @@
 #define THREADIMPL_FLAGS_ATTACHED   0x00010
 #define THREADIMPL_FLAGS_DESTROYED  0x00020
 
+namespace {
+
 typedef struct osl_thread_impl_st
 {
     pthread_t           m_hThread;
@@ -95,18 +97,26 @@ struct osl_thread_priority_st
     int m_Lowest;
 };
 
+}
+
 #define OSL_THREAD_PRIORITY_INITIALIZER { 127, 96, 64, 32, 0 }
 static void osl_thread_priority_init_Impl();
 
+namespace {
+
 struct osl_thread_textencoding_st
 {
     pthread_key_t    m_key;     /* key to store thread local text encoding */
     rtl_TextEncoding m_default; /* the default text encoding */
 };
 
+}
+
 #define OSL_THREAD_TEXTENCODING_INITIALIZER { 0, RTL_TEXTENCODING_DONTKNOW }
 static void osl_thread_textencoding_init_Impl();
 
+namespace {
+
 struct osl_thread_global_st
 {
     pthread_once_t                    m_once;
@@ -114,6 +124,8 @@ struct osl_thread_global_st
     struct osl_thread_textencoding_st m_textencoding;
 };
 
+}
+
 static struct osl_thread_global_st g_thread =
 {
     PTHREAD_ONCE_INIT,
@@ -555,6 +567,8 @@ void SAL_CALL osl_setThreadName(char const * name)
 
 /* osl_getThreadIdentifier @@@ see TODO @@@ */
 
+namespace {
+
 struct HashEntry
 {
     pthread_t            Handle;
@@ -562,6 +576,8 @@ struct HashEntry
     HashEntry *          Next;
 };
 
+}
+
 static HashEntry* HashTable[31];
 static const int HashSize = SAL_N_ELEMENTS(HashTable);
 
@@ -951,12 +967,16 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
     return Priority;
 }
 
+namespace {
+
 struct wrapper_pthread_key
 {
     pthread_key_t m_key;
     oslThreadKeyCallbackFunction pfnCallback;
 };
 
+}
+
 oslThreadKey SAL_CALL osl_createThreadKey( oslThreadKeyCallbackFunction pCallback )
 {
     wrapper_pthread_key *pKey = static_cast<wrapper_pthread_key*>(malloc(sizeof(wrapper_pthread_key)));
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 0d3cba799583..0e6a56f37c3b 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -31,8 +31,6 @@ enum ConditionType
     thread_type_wait
 };
 
-}
-
 /** thread for testing Condition.
  */
 class ConditionThread : public Thread
@@ -61,6 +59,8 @@ protected:
     }
 };
 
+}
+
 namespace osl_Condition
 {
     /** testing the method:
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 54c0e01b90ff..3811ab29d3e8 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -4997,6 +4997,8 @@ namespace osl_Directory
         }
     }
 
+    namespace {
+
     class DirCreatedObserver : public DirectoryCreationObserver
     {
     public:
@@ -5009,6 +5011,8 @@ namespace osl_Directory
         int i;
     };
 
+    }
+
     class createPath : public CppUnit::TestFixture
     {
     public:
@@ -5149,6 +5153,8 @@ OUString getCurrentPID()
     return OUString::number(nPID);
 }
 
+namespace {
+
 //~ do some clean up work after all test completed.
 class GlobalObject
 {
@@ -5197,6 +5203,8 @@ public:
     }
 };
 
+}
+
 static GlobalObject theGlobalObject;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 52112cb9f151..f440a715162f 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -44,6 +44,7 @@ static OUString getDllURL()
 
 namespace osl_Module
 {
+    namespace {
 
     /** class and member function that is available for module test :
     */
@@ -57,6 +58,8 @@ namespace osl_Module
         };
     };
 
+    }
+
     /** testing the methods:
         Module();
         Module( const OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index d0b8283c68e3..c345ae33eb2b 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -49,6 +49,8 @@ namespace ThreadHelper
 
 // Beginning of the test cases for osl_Mutex class
 
+namespace {
+
 /** mutually exclusive data
 */
 struct resource {
@@ -229,6 +231,8 @@ protected:
     }
 };
 
+}
+
 namespace osl_Mutex
 {
 
@@ -524,6 +528,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::getGlobalMutex, "osl_Mutex");
 
 // Beginning of the test cases for osl_Guard class
 
+namespace {
+
 class GuardThread : public Thread
 {
 public:
@@ -545,6 +551,8 @@ protected:
     }
 };
 
+}
+
 namespace osl_Guard
 {
     class ctor : public CppUnit::TestFixture
@@ -607,6 +615,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Guard::ctor, "osl_Guard");
 
 // Beginning of the test cases for osl_ClearableGuard class
 
+namespace {
+
 /** Thread for test ClearableGuard
  */
 class ClearGuardThread : public Thread
@@ -635,6 +645,8 @@ protected:
     }
 };
 
+}
+
 namespace osl_ClearableGuard
 {
 
@@ -748,6 +760,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::clear, "osl_Clearable
 
 // Beginning of the test cases for osl_ResettableGuard class
 
+namespace {
+
 /** Thread for test ResettableGuard
  */
 class ResetGuardThread : public Thread
@@ -774,6 +788,8 @@ protected:
     }
 };
 
+}
+
 namespace osl_ResettableGuard
 {
     class ctor : public CppUnit::TestFixture
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 482ae750f36f..d7bedb5baaa8 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -744,6 +744,8 @@ namespace osl_StreamPipe
     }
     // test read/write & send/recv data to pipe
 
+    namespace {
+
     class Pipe_DataSink_Thread : public Thread
     {
     public:
@@ -838,6 +840,8 @@ namespace osl_StreamPipe
             }
     };
 
+    }
+
     /** testing the method: read/write/send/recv and Pipe::accept
      */
     class recv : public CppUnit::TestFixture
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 0b97d0b95d8c..3c9891b76e54 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -48,6 +48,8 @@
 
 using namespace osl;
 
+namespace {
+
 // Small stopwatch
 class StopWatch {
     TimeValue t1,t2;                                // Start and stoptime
@@ -69,6 +71,8 @@ public:
     double getTenthSec() const;
 };
 
+}
+
 // ================================= Stop Watch =================================
 
 // A small stopwatch for internal use
@@ -145,6 +149,8 @@ double StopWatch::getTenthSec() const
     return nValue ;
 }
 
+namespace {
+
 template <class T>
 class ThreadSafeValue
 {
@@ -168,6 +174,8 @@ public:
     void release() {m_aMutex.release();}
 };
 
+}
+
 namespace ThreadHelper
 {
     static void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
@@ -205,6 +213,8 @@ namespace ThreadHelper
     }
 }
 
+namespace {
+
 /** Simple thread for testing Thread-create.
 
     Just add 1 of value 0, and after running, result is 1.
@@ -393,6 +403,8 @@ public:
 
 };
 
+}
+
 namespace osl_Thread
 {
 
@@ -1671,6 +1683,8 @@ static void destroyCallback(void * data)
 
 static ThreadData myThreadData(destroyCallback);
 
+namespace {
+
 class myKeyThread : public Thread
 {
 public:
@@ -1708,8 +1722,12 @@ public:
         }
 };
 
+}
+
 static ThreadData idData;
 
+namespace {
+
 class idThread: public Thread
 {
 public:
@@ -1735,6 +1753,8 @@ public:
         }
 };
 
+}
+
 namespace osl_ThreadData
 {
 
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index eaf34bd46d5b..104f9238eea6 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -80,6 +80,8 @@ static OUString getExecutablePath()
 
 #if !defined _WIN32
 
+namespace {
+
 class exclude
 {
 public:
@@ -118,8 +120,6 @@ private:
     std::vector<OString> exclude_list_;
 };
 
-namespace
-{
     void tidy_container(std::vector<OString> &env_container)
     {
         //sort them because there are no guarantees to ordering
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 3bce893731cc..bc00d27a21e7 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -309,6 +309,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer);
     */
 #include <cppunit/plugin/TestPlugInDefaultImpl.h>
 
+namespace {
+
 class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl
 {
     public:
@@ -317,6 +319,8 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl
                    const CPPUNIT_NS::PlugInParameters &parameters ) override;
 };
 
+}
+
 void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
                    const CPPUNIT_NS::PlugInParameters & )
 {
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index d2e094d19c12..6f59e55e62cd 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -50,7 +50,6 @@ struct Gregorian : public rtl::StaticWithInit<OUString, Gregorian> {
         return CONST_TEST_STRING;
     }
 };
-}
 
 /** Simple thread for testing Thread-create.
  * Just add 1 of value 0, and after running, result is 1.
@@ -108,6 +107,8 @@ public:
         }
 };
 
+}
+
 namespace rtl_DoubleLocking
 {
 
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 1e0eb625d5f5..c43638277c90 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -139,6 +139,8 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class addBytes
 
+namespace {
+
 class Statistics
 {
     int m_nDispensation[256];
@@ -208,6 +210,8 @@ public:
 
 };
 
+}
+
 class getBytes : public CppUnit::TestFixture
 {
 public:
diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
index 2c7d3aae5276..2bf7c9803f3d 100644
--- a/sal/qa/rtl/ref/rtl_ref.cxx
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -16,6 +16,8 @@
 namespace rtl_ref
 {
 
+namespace {
+
 class MoveTestClass
 {
 private:
@@ -45,6 +47,8 @@ public:
     void set_inc_flag() { m_bIncFlag = true; }
 };
 
+}
+
 static rtl::Reference< MoveTestClass > get_reference( MoveTestClass* pcTestClass )
 {
     // constructor will increment the reference count
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 626d05c7b895..f126efdabd27 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <stdio.h>
 
+namespace {
+
 /**
     @internal
 */
@@ -38,6 +40,8 @@ struct rtl_arena_list_st
     rtl_arena_type       m_arena_head;
 };
 
+}
+
 static rtl_arena_list_st g_arena_list;
 
 /**
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 7f5d4317636a..dae54a88df66 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -55,11 +55,11 @@
 using osl::DirectoryItem;
 using osl::FileStatus;
 
-struct Bootstrap_Impl;
-
 namespace
 {
 
+struct Bootstrap_Impl;
+
 static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:";
 
 bool isPathnameUrl(OUString const & url)
@@ -111,8 +111,6 @@ OUString recursivelyExpandMacros(
     return expandMacros(file, text, mode, &link);
 }
 
-} // end namespace
-
 struct rtl_bootstrap_NameValue
 {
     OUString sName;
@@ -126,6 +124,8 @@ struct rtl_bootstrap_NameValue
         {}
 };
 
+} // end namespace
+
 typedef std::vector<rtl_bootstrap_NameValue> NameValueVector;
 
 static bool find(
@@ -281,6 +281,8 @@ static void EnsureNoFinalSlash (OUString & url)
         url = url.copy(0, i - 1);
 }
 
+namespace {
+
 struct Bootstrap_Impl
 {
     sal_Int32 _nRefCount;
@@ -313,6 +315,8 @@ struct Bootstrap_Impl
         ExpandRequestLink const * requestStack) const;
 };
 
+}
+
 Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
     : _nRefCount( 0 ),
       _base_ini( nullptr ),
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 26d9cca29afc..9bc438114651 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -105,6 +105,8 @@ typedef rtlCipherError(cipher_update_t) (
 
 typedef void (cipher_delete_t) (rtlCipher Cipher);
 
+namespace {
+
 struct Cipher_Impl
 {
     rtlCipherAlgorithm  m_algorithm;
@@ -117,6 +119,8 @@ struct Cipher_Impl
     cipher_delete_t    *m_delete;
 };
 
+}
+
 rtlCipher SAL_CALL rtl_cipher_create(
     rtlCipherAlgorithm Algorithm,
     rtlCipherMode      Mode) SAL_THROW_EXTERN_C()
@@ -192,6 +196,8 @@ void SAL_CALL rtl_cipher_destroy(rtlCipher Cipher) SAL_THROW_EXTERN_C()
         pImpl->m_delete(Cipher);
 }
 
+namespace {
+
 #if !defined LIBO_CIPHER_OPENSSL_BACKEND
 #define CIPHER_ROUNDS_BF 16
 
@@ -223,6 +229,8 @@ struct CipherBF_Impl
     CipherContextBF m_context;
 };
 
+}
+
 #if !defined LIBO_CIPHER_OPENSSL_BACKEND
 static rtlCipherError BF_init(
     CipherContextBF *ctx,
@@ -1150,6 +1158,8 @@ void SAL_CALL rtl_cipher_destroyBF(rtlCipher Cipher) SAL_THROW_EXTERN_C()
 #define CIPHER_CBLOCK_ARCFOUR 256
 #endif
 
+namespace {
+
 struct ContextARCFOUR_Impl
 {
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
@@ -1166,6 +1176,8 @@ struct CipherARCFOUR_Impl
     ContextARCFOUR_Impl m_context;
 };
 
+}
+
 static rtlCipherError rtl_cipherARCFOUR_update_Impl(
     ContextARCFOUR_Impl *ctx,
     const sal_uInt8     *pData,   sal_Size nDatLen,
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index 1000fc0aed02..55af5ad7c3b2 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -52,6 +52,8 @@ typedef rtlDigestError (Digest_update_t) (
 typedef rtlDigestError (Digest_get_t) (
     void *ctx, sal_uInt8 *Buffer, sal_uInt32 BufLen);
 
+namespace {
+
 struct Digest_Impl
 {
     rtlDigestAlgorithm  m_algorithm;
@@ -63,6 +65,8 @@ struct Digest_Impl
     Digest_get_t       *m_get;
 };
 
+}
+
 static void swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen)
 {
     sal_uInt32 *X;
@@ -175,6 +179,8 @@ void SAL_CALL rtl_digest_destroy(rtlDigest Digest) SAL_THROW_EXTERN_C()
 #define DIGEST_CBLOCK_MD2 16
 #define DIGEST_LBLOCK_MD2 16
 
+namespace {
+
 struct DigestContextMD2
 {
     sal_uInt32 m_nDatLen;
@@ -189,6 +195,8 @@ struct DigestMD2_Impl
     DigestContextMD2 m_context;
 };
 
+}
+
 static void initMD2   (DigestContextMD2 *ctx);
 static void updateMD2 (DigestContextMD2 *ctx);
 static void endMD2    (DigestContextMD2 *ctx);
@@ -437,6 +445,8 @@ void SAL_CALL rtl_digest_destroyMD2(rtlDigest Digest) SAL_THROW_EXTERN_C()
 #define DIGEST_CBLOCK_MD5 64
 #define DIGEST_LBLOCK_MD5 16
 
+namespace {
+
 struct DigestContextMD5
 {
     sal_uInt32 m_nDatLen;
@@ -451,6 +461,8 @@ struct DigestMD5_Impl
     DigestContextMD5 m_context;
 };
 
+}
+
 static void initMD5 (DigestContextMD5 *ctx);
 static void updateMD5 (DigestContextMD5 *ctx);
 static void endMD5 (DigestContextMD5 *ctx);
@@ -824,6 +836,8 @@ typedef sal_uInt32 DigestSHA_update_t(sal_uInt32 x);
 static sal_uInt32 updateSHA_0(sal_uInt32 x);
 static sal_uInt32 updateSHA_1(sal_uInt32 x);
 
+namespace {
+
 struct DigestContextSHA
 {
     DigestSHA_update_t *m_update;
@@ -839,6 +853,8 @@ struct DigestSHA_Impl
     DigestContextSHA m_context;
 };
 
+}
+
 static void initSHA(
     DigestContextSHA *ctx, DigestSHA_update_t *fct);
 
@@ -1390,6 +1406,8 @@ void SAL_CALL rtl_digest_destroySHA1(rtlDigest Digest) SAL_THROW_EXTERN_C()
 
 #define DIGEST_CBLOCK_HMAC_MD5 64
 
+namespace {
+
 struct ContextHMAC_MD5
 {
     DigestMD5_Impl m_hash;
@@ -1402,6 +1420,8 @@ struct DigestHMAC_MD5_Impl
     ContextHMAC_MD5 m_context;
 };
 
+}
+
 static void initHMAC_MD5(ContextHMAC_MD5 * ctx);
 static void ipadHMAC_MD5(ContextHMAC_MD5 * ctx);
 static void opadHMAC_MD5(ContextHMAC_MD5 * ctx);
@@ -1586,6 +1606,8 @@ void SAL_CALL rtl_digest_destroyHMAC_MD5(rtlDigest Digest) SAL_THROW_EXTERN_C()
 
 #define DIGEST_CBLOCK_HMAC_SHA1 64
 
+namespace {
+
 struct ContextHMAC_SHA1
 {
     DigestSHA_Impl m_hash;
@@ -1598,6 +1620,8 @@ struct DigestHMAC_SHA1_Impl
     ContextHMAC_SHA1 m_context;
 };
 
+}
+
 static void initHMAC_SHA1(ContextHMAC_SHA1 * ctx);
 static void ipadHMAC_SHA1(ContextHMAC_SHA1 * ctx);
 static void opadHMAC_SHA1(ContextHMAC_SHA1 * ctx);
diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx
index 4cbe1da785c6..4fed60889f50 100644
--- a/sal/rtl/hash.cxx
+++ b/sal/rtl/hash.cxx
@@ -26,12 +26,16 @@
 #include <osl/diagnose.h>
 #include <sal/macros.h>
 
+namespace {
+
 struct StringHashTableImpl {
     sal_uInt32    nEntries;
     sal_uInt32    nSize;
     rtl_uString **pData;
 };
 
+}
+
 typedef StringHashTableImpl StringHashTable;
 
 // Only for use in the implementation
diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx
index e362a342bcbc..bae0f40b3d66 100644
--- a/sal/rtl/locale.cxx
+++ b/sal/rtl/locale.cxx
@@ -26,6 +26,8 @@
 #include <memory>
 #include <unordered_map>
 
+namespace {
+
 struct locale_deleter
 {
     void operator() (rtl_Locale* p) noexcept
@@ -37,6 +39,8 @@ struct locale_deleter
     }
 };
 
+}
+
 using locale_unique_ptr = std::unique_ptr<rtl_Locale, locale_deleter>;
 
 static std::unordered_map<sal_Int32, locale_unique_ptr>* g_pLocaleTable = nullptr;
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index c9cc0f841ea9..418358b22e22 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -46,6 +46,8 @@
     if ((z) < 0) (z) += 30307; \
 }
 
+namespace {
+
 struct RandomData_Impl
 {
     sal_Int16 m_nX;
@@ -53,12 +55,16 @@ struct RandomData_Impl
     sal_Int16 m_nZ;
 };
 
+}
+
 static double data (RandomData_Impl *pImpl);
 
 #define RTL_RANDOM_DIGEST      rtl_Digest_AlgorithmMD5
 #define RTL_RANDOM_SIZE_DIGEST RTL_DIGEST_LENGTH_MD5
 #define RTL_RANDOM_SIZE_POOL   1023
 
+namespace {
+
 struct RandomPool_Impl
 {
     rtlDigest  m_hDigest;
@@ -69,6 +75,8 @@ struct RandomPool_Impl
     sal_uInt32 m_nCount;
 };
 
+}
+
 static bool initPool(RandomPool_Impl *pImpl);
 
 static void seedPool(
diff --git a/sal/rtl/uuid.cxx b/sal/rtl/uuid.cxx
index bb9490ef8b99..130be12456d6 100644
--- a/sal/rtl/uuid.cxx
+++ b/sal/rtl/uuid.cxx
@@ -55,6 +55,8 @@
                      ( (  static_cast<sal_uInt32>(p[3])) & 0xff);\
                }
 
+namespace {
+
 struct UUID
 {
       sal_uInt32          time_low;
@@ -65,6 +67,8 @@ struct UUID
       sal_uInt8           node[6];
 };
 
+}
+
 static void write_v3( sal_uInt8 *pUuid  )
 {
     UUID uuid;
diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx
index b8566ed6a51e..ae25d811df2d 100644
--- a/sal/textenc/convertisciidevangari.cxx
+++ b/sal/textenc/convertisciidevangari.cxx
@@ -22,6 +22,8 @@
 using namespace sal::detail::textenc;
 using namespace rtl::textenc;
 
+namespace {
+
 struct IsciiDevanagariToUnicode
 {
     sal_uInt8 m_cPrevChar;
@@ -57,6 +59,8 @@ struct UnicodeToIsciiDevanagari
         sal_uInt32 * pInfo, sal_Size * pSrcCvtChars);
 };
 
+}
+
 static const sal_Unicode IsciiDevanagariMap[256] =
 {
     0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx
index b09ccd47f1d8..1a1ca7603241 100644
--- a/sal/textenc/tcvtutf7.cxx
+++ b/sal/textenc/tcvtutf7.cxx
@@ -91,6 +91,8 @@ static unsigned char const aImplMustShiftTab[128] =
 
 /* ----------------------------------------------------------------------- */
 
+namespace {
+
 struct ImplUTF7ToUCContextData
 {
     bool                    mbShifted;
@@ -100,6 +102,8 @@ struct ImplUTF7ToUCContextData
     sal_uInt32              mnBufferBits;
 };
 
+}
+
 /* ----------------------------------------------------------------------- */
 
 void* ImplUTF7CreateUTF7TextToUnicodeContext()
@@ -410,6 +414,8 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
 
 /* ======================================================================= */
 
+namespace {
+
 struct ImplUTF7FromUCContextData
 {
     bool                    mbShifted;
@@ -417,6 +423,8 @@ struct ImplUTF7FromUCContextData
     sal_uInt32              mnBufferBits;
 };
 
+}
+
 /* ----------------------------------------------------------------------- */
 
 void* ImplUTF7CreateUnicodeToTextContext()
diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx
index 950d810e8b85..ca29156c418f 100644
--- a/sal/textenc/tcvtutf8.cxx
+++ b/sal/textenc/tcvtutf8.cxx
@@ -30,6 +30,8 @@
 #include "tenchelp.hxx"
 #include "unichars.hxx"
 
+namespace {
+
 struct ImplUtf8ToUnicodeContext
 {
     sal_uInt32 nUtf32;
@@ -43,6 +45,8 @@ struct ImplUnicodeToUtf8Context
     sal_Unicode nHighSurrogate; /* 0xFFFF: write BOM */
 };
 
+}
+
 void * ImplCreateUtf8ToUnicodeContext()
 {
     ImplUtf8ToUnicodeContext * p = new ImplUtf8ToUnicodeContext;
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index f541fcb20004..b69cf4c586fd 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -102,6 +102,8 @@ static bool Impl_matchString( const char* pCompStr, const char* pMatchStr )
 
 /* ======================================================================= */
 
+namespace {
+
 struct ImplStrCharsetDef
 {
     const char*             mpCharsetStr;
@@ -114,6 +116,8 @@ struct ImplStrFirstPartCharsetDef
     const ImplStrCharsetDef*    mpSecondPartTab;
 };
 
+}
+
 /* ======================================================================= */
 
 sal_Bool SAL_CALL rtl_getTextEncodingInfo( rtl_TextEncoding eTextEncoding, rtl_TextEncodingInfo* pEncInfo )
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index 49a8fda8c244..a64104e661f1 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -45,6 +45,8 @@ static utl::TempFile createTempCopy(OUString const& url)
     return tmp;
 }
 
+namespace
+{
 struct TempFileBase
 {
     utl::TempFile m_TempFile;
@@ -53,6 +55,7 @@ struct TempFileBase
     {
     }
 };
+}
 
 class ScDDELinkObj : public CalcUnoApiTest,
                      public TempFileBase,
diff --git a/sc/qa/extras/scuniquecellformatsenumeration.cxx b/sc/qa/extras/scuniquecellformatsenumeration.cxx
index c0a8f9cdf8fa..ea6a76e7680d 100644
--- a/sc/qa/extras/scuniquecellformatsenumeration.cxx
+++ b/sc/qa/extras/scuniquecellformatsenumeration.cxx
@@ -30,6 +30,8 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
+namespace
+{
 struct RGBColor
 {
     int m_nRed;
@@ -45,6 +47,7 @@ struct RGBColor
 
     sal_Int32 hashCode() const { return (255 << 24) | (m_nRed << 16) | (m_nGreen << 8) | m_nBlue; }
 };
+}
 
 class ScUniqueCellFormatsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
 {
diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx
index f6c2e81ef356..6c2d3e870370 100644
--- a/sc/qa/unit/mark_test.cxx
+++ b/sc/qa/unit/mark_test.cxx
@@ -16,10 +16,20 @@
 #include <markdata.hxx>
 #include "../../source/core/data/markarr.cxx"
 #include "../../source/core/data/markmulti.cxx"
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsubobject-linkage"
+    // automatically suppressed in the main .cxx, but not in this included one
+#endif
 #include "../../source/core/data/segmenttree.cxx"
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#endif
 
 #include <utility>
 
+namespace {
+
 struct MarkTestData  // To represent a single rectangle part of a multiselection
 {
     ScRange aRange;
@@ -80,6 +90,8 @@ struct MultiMarkTestData
     std::vector<std::pair<SCCOL,SCCOL>> aColsWithUnequalMarksList;
 };
 
+}
+
 class Test : public CppUnit::TestFixture
 {
 public:
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 9110505667fc..e3c7bfae4d82 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1015,6 +1015,8 @@ void ScFiltersTest::testBorderODS()
     xDocSh->DoClose();
 }
 
+namespace {
+
 struct Border
 {
     sal_Int16 column;
@@ -1049,6 +1051,8 @@ struct Border
     lStyle(static_cast<SvxBorderLineStyle>(lSt)), tStyle(static_cast<SvxBorderLineStyle>(tSt)), rStyle(static_cast<SvxBorderLineStyle>(rSt)), bStyle(static_cast<SvxBorderLineStyle>(bSt)) {};
 };
 
+}
+
 void ScFiltersTest::testBordersOoo33()
 {
     std::vector<Border> borders;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ae28aadeae31..5f5e79cb7933 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1677,6 +1677,8 @@ static void checkMatrixElements(const ScMatrix& rMat)
     }
 }
 
+namespace {
+
 struct AllZeroMatrix
 {
     void operator() (SCSIZE /*nCol*/, SCSIZE /*nRow*/, const ScMatrixValue& rVal) const
@@ -1743,6 +1745,8 @@ struct PartiallyFilledEmptyMatrix
     }
 };
 
+}
+
 void Test::testMatrix()
 {
     svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool();
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 6bbe59d067ea..a8a98ce2fa44 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5437,11 +5437,15 @@ void Test::testFuncVLOOKUP()
     m_pDoc->DeleteTab(0);
 }
 
+namespace {
+
 struct StrStrCheck {
     const char* pVal;
     const char* pRes;
 };
 
+}
+
 template<size_t DataSize, size_t FormulaSize, int Type>
 static void runTestMATCH(ScDocument* pDoc, const char* aData[DataSize], const StrStrCheck aChecks[FormulaSize])
 {
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 7cb85e8c9bbf..b67880171d63 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -599,6 +599,8 @@ void Test::testSharedFormulasRefUpdateRange()
     m_pDoc->DeleteTab(0);
 }
 
+namespace {
+
 struct SortByArea
 {
     bool operator ()( const sc::AreaListener& rLeft, const sc::AreaListener& rRight ) const
@@ -622,6 +624,8 @@ struct SortByArea
     }
 };
 
+}
+
 void Test::testSharedFormulasRefUpdateRangeDeleteRow()
 {
     sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index c904ad716bd1..227a6d751e63 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -53,6 +53,8 @@ constexpr int BCA_SLOTS  = BCA_SLOTS_COL * BCA_SLOTS_ROW;
 // anyway, once you reached these values...
 static_assert(BCA_SLOTS <= 268435456, "DOOMed");
 
+namespace {
+
 struct ScSlotData
 {
     SCROW const  nStartRow;   // first row of this segment
@@ -62,6 +64,9 @@ struct ScSlotData
 
     ScSlotData( SCROW r1, SCROW r2, SCSIZE s, SCSIZE c ) : nStartRow(r1), nStopRow(r2), nSlice(s), nCumulated(c) {}
 };
+
+}
+
 typedef ::std::vector< ScSlotData > ScSlotDistribution;
 // Logarithmic or any other distribution.
 // Upper sheet part usually is more populated and referenced and gets fine
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 90a0dcec43aa..18f505f45bd2 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -93,6 +93,8 @@ void ScColumn::BroadcastRows( SCROW nStartRow, SCROW nEndRow, SfxHintId nHint )
     BroadcastCells(aRows, nHint);
 }
 
+namespace {
+
 struct DirtyCellInterpreter
 {
     void operator() (size_t, ScFormulaCell* p)
@@ -102,6 +104,8 @@ struct DirtyCellInterpreter
     }
 };
 
+}
+
 void ScColumn::InterpretDirtyCells( SCROW nRow1, SCROW nRow2 )
 {
     if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 > nRow2)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index ac2a1e786939..c4e6c06327ed 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -143,8 +143,6 @@ void collectUIInformation(const std::map<OUString, OUString>& aParameters, const
     UITestLogger::getInstance().logEvent(aDescription);
 }
 
-}
-
 struct ScDefaultAttr
 {
     const ScPatternAttr*    pAttr;
@@ -161,6 +159,8 @@ struct ScLessDefaultAttr
     }
 };
 
+}
+
 typedef std::set<ScDefaultAttr, ScLessDefaultAttr>  ScDefaultAttrSet;
 
 void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck )
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 0327dcb5c44f..026d1a2639b7 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -43,6 +43,8 @@ using ::std::shared_ptr;
 
 const sal_uInt16 SC_DP_LEAPYEAR = 1648;     // arbitrary leap year for date calculations
 
+namespace {
+
 class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase
 {
 public:
@@ -55,6 +57,8 @@ private:
     ScDPNumGroupInfo const maNumInfo;
 };
 
+}
+
 ScDPGroupNumFilter::ScDPGroupNumFilter(const std::vector<ScDPItemData>& rValues, const ScDPNumGroupInfo& rInfo) :
     maValues(rValues), maNumInfo(rInfo) {}
 
@@ -99,6 +103,8 @@ std::vector<ScDPItemData> ScDPGroupNumFilter::getMatchValues() const
     return std::vector<ScDPItemData>();
 }
 
+namespace {
+
 class ScDPGroupDateFilter : public ScDPFilteredCache::FilterBase
 {
 public:
@@ -114,6 +120,8 @@ private:
     ScDPNumGroupInfo const maNumInfo;
 };
 
+}
+
 ScDPGroupDateFilter::ScDPGroupDateFilter(
     const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo) :
     maValues(rValues),
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 67f742dece8b..43fb34e75e7d 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -129,8 +129,6 @@ public:
     }
 };
 
-}
-
 // function objects for sorting of the column and row members:
 
 class ScDPRowMembersOrder
@@ -165,6 +163,8 @@ public:
     bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
 };
 
+}
+
 static bool lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMember* pDataMember2, long nMeasure, bool bAscending )
 {
     // members can be NULL if used for rows
@@ -2677,6 +2677,8 @@ void ScDPDataMember::Dump(int nIndent) const
 //  Helper class to select the members to include in
 //  ScDPResultDimension::InitFrom or LateInitFrom if groups are used
 
+namespace {
+
 class ScDPGroupCompare
 {
 private:
@@ -2693,6 +2695,8 @@ public:
     bool    TestIncluded( const ScDPMember& rMember );
 };
 
+}
+
 ScDPGroupCompare::ScDPGroupCompare( const ScDPResultData* pData, const ScDPInitState& rState, long nDimension ) :
     pResultData( pData ),
     rInitState( rState ),
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index f656370a5686..caadfb5bc458 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1848,6 +1848,8 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
     return nullptr;    //TODO: exception?
 }
 
+namespace {
+
 class ScDPGlobalMembersOrder
 {
     ScDPLevel&  rLevel;
@@ -1862,6 +1864,8 @@ public:
     bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
 };
 
+}
+
 bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
 {
     sal_Int32 nCompare = 0;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index acfe85bd332b..d07619e07fc4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4247,8 +4247,6 @@ int splitup(int N, int K, int& A)
     return num_parts;
 }
 
-} // anonymous namespace
-
 struct ScDependantsCalculator
 {
     ScDocument& mrDoc;
@@ -4558,6 +4556,8 @@ struct ScDependantsCalculator
     }
 };
 
+} // anonymous namespace
+
 bool ScFormulaCell::InterpretFormulaGroup(SCROW nStartOffset, SCROW nEndOffset)
 {
     if (!mxGroup || !pCode)
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index abeccaba4b9f..690c033abf7c 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -38,6 +38,8 @@
 
 #include <memory>
 
+namespace {
+
 struct ScFuncDescCore
 {
     /*
@@ -88,6 +90,8 @@ struct ScFuncDescCore
     sal_uInt8 const aOptionalArgs[7];
 };
 
+}
+
 static void ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc*, bool& rbSuppressed);
 
 // class ScFuncDesc:
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index b47f1e7b9f3c..3e7bfd9aca48 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -27,6 +27,8 @@
 
 using ::std::numeric_limits;
 
+namespace {
+
 template<typename ValueType_, typename ExtValueType_ = ValueType_>
 class ScFlatSegmentsImpl
 {
@@ -72,6 +74,8 @@ private:
     bool mbTreeSearchEnabled:1;
 };
 
+}
+
 template<typename ValueType_, typename ExtValueType_>
 ScFlatSegmentsImpl<ValueType_, ExtValueType_>::ScFlatSegmentsImpl(SCCOLROW nMax, ValueType nDefault) :
     maSegments(0, nMax+1, nDefault),
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 41a130d65f6c..9f4eeb59e6a7 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -219,12 +219,16 @@ static short Compare( const OUString &sInput1, const OUString &sInput2,
 
 }
 
+namespace {
+
 struct ScSortInfo final
 {
     ScRefCellValue maCell;
     SCCOLROW        nOrg;
 };
 
+}
+
 class ScSortInfoArray
 {
 public:
@@ -1894,6 +1898,8 @@ static void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow )
     }
 }
 
+namespace {
+
 struct RowEntry
 {
     sal_uInt16  nGroupNo;
@@ -1903,6 +1909,7 @@ struct RowEntry
     SCROW   nFuncEnd;
 };
 
+}
 
 static const char* lcl_GetSubTotalStrId(int id)
 {
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 24815b4937b1..12eb62bbe1eb 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -345,6 +345,8 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, cl_program )
 /// automatically disables use of OpenCL for a formula group. If at some point there are resources
 /// to drain the OpenCL swamp, this should go away.
 
+namespace {
+
 class ConstStringArgument : public DynamicKernelArgument
 {
 public:
@@ -875,6 +877,8 @@ public:
     virtual size_t Marshal( cl_kernel, int, int, cl_program ) override;
 };
 
+}
+
 /// Marshal a string vector reference
 size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, cl_program )
 {
@@ -964,6 +968,8 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, cl_pro
     return 1;
 }
 
+namespace {
+
 /// A mixed string/numeric vector
 class DynamicKernelMixedArgument : public VectorRef
 {
@@ -1304,6 +1310,8 @@ private:
     std::vector<DynamicKernelArgumentRef> mParams;
 };
 
+}
+
 void SymbolTable::Marshal( cl_kernel k, int nVectorWidth, cl_program pProgram )
 {
     int i = 1; //The first argument is reserved for results
@@ -1313,6 +1321,8 @@ void SymbolTable::Marshal( cl_kernel k, int nVectorWidth, cl_program pProgram )
     }
 }
 
+namespace {
+
 /// Handling a Double Vector that is used as a sliding window input
 /// Performs parallel reduction based on given operator
 template<class Base>
@@ -2316,7 +2326,7 @@ public:
     }
     virtual std::string BinFuncName() const override { return "fsop"; }
 };
-namespace {
+
 struct SumIfsArgs
 {
     explicit SumIfsArgs(cl_mem x) : mCLMem(x), mConst(0.0) { }
@@ -2324,7 +2334,6 @@ struct SumIfsArgs
     cl_mem mCLMem;
     double mConst;
 };
-}
 
 /// Helper functions that have multiple buffers
 class DynamicKernelSoPArguments : public DynamicKernelArgument
@@ -2619,6 +2628,8 @@ private:
     cl_mem mpClmem2;
 };
 
+}
+
 static DynamicKernelArgumentRef SoPHelper( const ScCalcConfig& config,
     const std::string& ts, const FormulaTreeNodeRef& ft, SlidingFunctionBase* pCodeGen,
     int nResultSize )
@@ -3793,6 +3804,8 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
     }
 }
 
+namespace {
+
 class DynamicKernel : public CompiledFormula
 {
 public:
@@ -3833,6 +3846,8 @@ private:
     int const mnResultSize;
 };
 
+}
+
 DynamicKernel::DynamicKernel( const ScCalcConfig& config, const FormulaTreeNodeRef& r, int nResultSize ) :
     mCalcConfig(config),
     mpRoot(r),
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index d750f377d1ad..b943edf34af1 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -705,6 +705,8 @@ static bool lcl_getLastTabName( OUString& rTabName2, const OUString& rTabName1,
     return true;
 }
 
+namespace {
+
 struct Convention_A1 : public ScCompiler::Convention
 {
     explicit Convention_A1( FormulaGrammar::AddressConvention eConv ) : ScCompiler::Convention( eConv ) { }
@@ -737,6 +739,8 @@ struct Convention_A1 : public ScCompiler::Convention
     }
 };
 
+}
+
 void Convention_A1::MakeColStr( OUStringBuffer& rBuffer, SCCOL nCol )
 {
     if ( !ValidCol( nCol) )
@@ -753,6 +757,8 @@ void Convention_A1::MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow )
         rBuffer.append(sal_Int32(nRow + 1));
 }
 
+namespace {
+
 struct ConventionOOO_A1 : public Convention_A1
 {
     ConventionOOO_A1() : Convention_A1 (FormulaGrammar::CONV_OOO) { }
@@ -1549,6 +1555,8 @@ struct ConventionXL_OOX : public ConventionXL_A1
     }
 };
 
+}
+
 static void
 r1c1_add_col( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress& rAbsRef )
 {
@@ -1577,6 +1585,8 @@ r1c1_add_row( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress
         rBuf.append( OUString::number( rAbsRef.Row() + 1 ) );
 }
 
+namespace {
+
 struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
 {
     ConventionXL_R1C1() : ScCompiler::Convention( FormulaGrammar::CONV_XL_R1C1 ) { }
@@ -1764,6 +1774,8 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
     }
 };
 
+}
+
 ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, ScTokenArray& rArr,
                         bool bComputeII, bool bMatrixFlag, const ScInterpreterContext* pContext )
     : FormulaCompiler(rArr, bComputeII, bMatrixFlag),
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 3ea84ef59bbf..b253e6c4bbbb 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -114,6 +114,8 @@ public:
     sal_uInt16      GetMaxLevel() const             { return nMaxLevel; }
 };
 
+namespace {
+
 class ScCommentData
 {
 public:
@@ -126,6 +128,8 @@ private:
     SfxItemSet          aCaptionSet;
 };
 
+}
+
 Color ScDetectiveFunc::nArrowColor = Color(0);
 Color ScDetectiveFunc::nErrorColor = Color(0);
 Color ScDetectiveFunc::nCommentColor = Color(0);
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9069138c3013..a62e6885c0eb 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8937,11 +8937,15 @@ void ScInterpreter::ScLeft()
     }
 }
 
+namespace {
+
 struct UBlockScript {
     UBlockCode const from;
     UBlockCode const to;
 };
 
+}
+
 static const UBlockScript scriptList[] = {
     {UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO},
     {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES},
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index f219beca9386..31dee4ce707e 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -51,6 +51,8 @@ using namespace formula;
 const double ScInterpreter::fMaxGammaArgument = 171.624376956302;  // found experimental
 const double fMachEps = ::std::numeric_limits<double>::epsilon();
 
+namespace {
+
 class ScDistFunc
 {
 public:
@@ -60,6 +62,8 @@ protected:
     ~ScDistFunc() {}
 };
 
+}
+
 //  iteration for inverse distributions
 
 //template< class T > double lcl_IterateInverse( const T& rFunction, double x0, double x1, bool& rConvError )
@@ -4765,6 +4769,8 @@ static SCSIZE lcl_bitReverse(SCSIZE nIn, SCSIZE nBound)
     return nOut;
 }
 
+namespace {
+
 // Computes and stores twiddle factors for computing DFT later.
 struct ScTwiddleFactors
 {
@@ -4790,6 +4796,8 @@ struct ScTwiddleFactors
     bool mbInverse;
 };
 
+}
+
 void ScTwiddleFactors::Compute()
 {
     mfWReal.resize(mnN);
@@ -4905,6 +4913,8 @@ void ScTwiddleFactors::Compute()
     }
 }
 
+namespace {
+
 // A radix-2 decimation in time FFT algorithm for complex valued input.
 class ScComplexFFT2
 {
@@ -4995,6 +5005,8 @@ private:
     bool mbSubSampleTFs:1;
 };
 
+}
+
 void ScComplexFFT2::prepare()
 {
     SCSIZE nPoints = mnPoints;
@@ -5094,6 +5106,8 @@ void ScComplexFFT2::Compute()
         lcl_normalize(mrArray, mbPolar);
 }
 
+namespace {
+
 // Bluestein's algorithm or chirp z-transform algorithm that can be used to
 // compute DFT of a complex valued input of any length N in O(N lgN) time.
 class ScComplexBluesteinFFT
@@ -5123,6 +5137,8 @@ private:
     bool mbDisableNormalize:1;
 };
 
+}
+
 void ScComplexBluesteinFFT::Compute()
 {
     std::vector<double> aRealScalars(mnPoints);
@@ -5213,6 +5229,8 @@ void ScComplexBluesteinFFT::Compute()
         lcl_normalize(mrArray, mbPolar);
 }
 
+namespace {
+
 // Computes DFT of an even length(N) real-valued input by using a
 // ScComplexFFT2 if N == 2^k for some k or else by using a ScComplexBluesteinFFT
 // with a complex valued input of length = N/2.
@@ -5239,6 +5257,8 @@ private:
     bool mbPolar:1;
 };
 
+}
+
 void ScRealFFT::Compute()
 {
     // input length has to be even to do this optimization.
@@ -5338,6 +5358,8 @@ void ScRealFFT::Compute()
 
 using ScMatrixGenerator = ScMatrixRef(SCSIZE, SCSIZE, std::vector<double>&);
 
+namespace {
+
 // Generic FFT class that decides which FFT implementation to use.
 class ScFFT
 {
@@ -5361,6 +5383,8 @@ private:
     bool mbPolar:1;
 };
 
+}
+
 ScMatrixRef ScFFT::Compute(const std::function<ScMatrixGenerator>& rMatGenFunc)
 {
     std::vector<double> aArray;
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index c2655fceb3d7..7038e4de1f81 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -203,6 +203,8 @@ double ScInterpreter::GetGammaDist( double fX, double fAlpha, double fLambda )
         return GetLowRegIGamma( fAlpha, fX / fLambda);
 }
 
+namespace {
+
 class NumericCellAccumulator
 {
     double mfFirst;
@@ -399,6 +401,8 @@ public:
     sal_uInt32 getNumberFormat() const { return mnNumFmt; }
 };
 
+}
+
 static void IterateMatrix(
     const ScMatrixRef& pMat, ScIterFunc eFunc, bool bTextAsZero,
     sal_uLong& rCount, SvNumFormatType& rFuncFmtType, double& fRes, double& fMem )
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 9738c2ce7421..39706cf7882c 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -23,6 +23,8 @@
 
 using namespace formula;
 
+namespace {
+
 struct DataPoint
 {
     double X, Y;
@@ -30,6 +32,8 @@ struct DataPoint
     DataPoint( double rX, double rY ) : X( rX ), Y( rY ) {};
 };
 
+}
+
 static bool lcl_SortByX( const DataPoint &lhs, const DataPoint &rhs ) { return lhs.X < rhs.X; }
 
 /*
@@ -70,6 +74,9 @@ static bool lcl_SortByX( const DataPoint &lhs, const DataPoint &rhs ) { return l
  * Intervals for Future Values
  *
  */
+
+namespace {
+
 class ScETSForecastCalculation
 {
 private:
@@ -128,6 +135,8 @@ public:
     void GetETSPredictionIntervals( const ScMatrixRef& rTMat, const ScMatrixRef& rPIMat, double fPILevel );
 };
 
+}
+
 ScETSForecastCalculation::ScETSForecastCalculation( SCSIZE nSize, SvNumberFormatter* pFormatter )
     : mpFormatter(pFormatter)
     , mnSmplInPrd(0)
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 90bda2d1f9dc..76b68d1a1b27 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -1243,6 +1243,8 @@ ScRangePairList* ScRangePairList::Clone() const
     return pNew;
 }
 
+namespace {
+
 class ScRangePairList_sortNameCompare
 {
 public:
@@ -1319,6 +1321,8 @@ private:
     ScDocument * const mpDoc;
 };
 
+}
+
 void ScRangePairList::Join( const ScRangePair& r, bool bIsInList )
 {
     if ( maPairs.empty() )
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 34ee65302349..3e5bb647db9f 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -55,6 +55,8 @@ using std::endl;
 using ::std::pair;
 using ::std::advance;
 
+namespace {
+
 /**
  * Custom string trait struct to tell mdds::multi_type_matrix about the
  * custom string type and how to handle blocks storing them.
@@ -67,6 +69,8 @@ struct matrix_trait
     typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func;
 };
 
+}
+
 typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
 
 namespace {
@@ -2194,6 +2198,8 @@ void ScMatrixImpl::MergeDoubleArrayMultiply( std::vector<double>& rArray ) const
 
 namespace Op {
 
+namespace {
+
 template<typename T>
 struct return_type
 {
@@ -2214,6 +2220,10 @@ struct return_type<char>
 
 }
 
+}
+
+namespace {
+
 template<typename T, typename U, typename return_type>
 struct wrapped_iterator
 {
@@ -2320,8 +2330,6 @@ public:
     }
 };
 
-namespace {
-
 MatrixImplType::position_type increment_position(const MatrixImplType::position_type& pos, size_t n)
 {
     MatrixImplType::position_type ret = pos;
@@ -2343,8 +2351,6 @@ MatrixImplType::position_type increment_position(const MatrixImplType::position_
     return ret;
 }
 
-}
-
 template<typename T>
 struct MatrixOpWrapper
 {
@@ -2419,6 +2425,8 @@ public:
     }
 };
 
+}
+
 template<typename T>
 void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl& rMat)
 {
@@ -3281,6 +3289,8 @@ void ScMatrix::MergeDoubleArrayMultiply( std::vector<double>& rArray ) const
 
 namespace matop {
 
+namespace {
+
 /**
  * COp struct is used in MatOp class to provide (through template specialization)
  * different actions for empty entries in a matrix.
@@ -3288,6 +3298,8 @@ namespace matop {
 template <typename T, typename S>
 struct COp {};
 
+}
+
 template <typename T>
 struct COp<T, svl::SharedString>
 {
@@ -3306,6 +3318,8 @@ struct COp<T, double>
     }
 };
 
+namespace {
+
 /** A template for operations where operands are supposed to be numeric.
     A non-numeric (string) operand leads to the configured conversion to number
     method being called if in interpreter context and a FormulaError::NoValue DoubleError
@@ -3371,6 +3385,8 @@ public:
 
 }
 
+}
+
 void ScMatrix::NotOp( const ScMatrix& rMat)
 {
     auto not_ = [](double a, double){return double(a == 0.0);};
diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx
index 6e42c06a5df1..61ec2a3c37a1 100644
--- a/sc/source/core/tool/stylehelper.cxx
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -44,12 +44,16 @@
 #define SC_PIVOT_STYLE_PROG_FIELDNAME              "Pivot Table Field"
 #define SC_PIVOT_STYLE_PROG_TOP                    "Pivot Table Corner"
 
+namespace {
+
 struct ScDisplayNameMap
 {
     OUString  aDispName;
     OUString  aProgName;
 };
 
+}
+
 static const ScDisplayNameMap* lcl_GetStyleNameMap( SfxStyleFamily nType )
 {
     if ( nType == SfxStyleFamily::Para )
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 95d2d0fb94c8..67520923d96f 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -65,6 +65,8 @@ using namespace ::comphelper;
 
 //OleNameOverrideContainer
 
+namespace {
+
 class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
 {
 private:
@@ -127,8 +129,6 @@ public:
     }
 };
 
-namespace {
-
 /** Future Record Type header.
     @return whether read rt matches nRecordID
  */
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 98079cd96345..f0cb4cd2646f 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -63,6 +63,8 @@ using ::com::sun::star::sheet::XAreaLink;
 
 // Shared string table ========================================================
 
+namespace {
+
 /** A single string entry in the hash table. */
 struct XclExpHashEntry
 {
@@ -79,6 +81,8 @@ struct XclExpHashEntrySWO
                             { return *rLeft.mpString < *rRight.mpString; }
 };
 
+}
+
 /** Implementation of the SST export.
     @descr  Stores all passed strings in a hash table and prevents repeated
     insertion of equal strings. */
diff --git a/sc/source/filter/excel/xedbdata.cxx b/sc/source/filter/excel/xedbdata.cxx
index 6eacd6ef1a61..043c1791acf6 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -16,6 +16,8 @@
 
 using namespace oox;
 
+namespace {
+
 /** (So far) dummy implementation of table export for BIFF5/BIFF7. */
 class XclExpTablesImpl5 : public XclExpTables
 {
@@ -36,6 +38,7 @@ public:
     virtual void        SaveXml( XclExpXmlStream& rStrm ) override;
 };
 
+}
 
 XclExpTablesImpl5::XclExpTablesImpl5( const XclExpRoot& rRoot ) :
     XclExpTables( rRoot )
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 4142ae5e625e..3dd30eb9a9fa 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -49,6 +49,8 @@ using namespace oox;
 
 // External names =============================================================
 
+namespace {
+
 /** This is a base class for any external name (i.e. add-in names or DDE links).
     @descr  Derived classes implement creation and export of the external names. */
 class XclExpExtNameBase : public XclExpRecord, protected XclExpRoot
@@ -190,7 +192,7 @@ private:
     SCROW               mnScRow;    /// Row index of the external cells.
 };
 
-namespace { class XclExpCrnList; }
+class XclExpCrnList;
 
 /** Represents the record XCT which is the header record of a CRN record list.
  */
@@ -387,7 +389,7 @@ struct XclExpXti
                             { rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; }
 };
 
-static bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
+bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
 {
     return
         (rLeft.mnSupbook    == rRight.mnSupbook)    &&
@@ -483,6 +485,8 @@ private:
     sal_uInt16          mnAddInSB;          /// Index to add-in SUPBOOK.
 };
 
+}
+
 // Export link manager ========================================================
 
 /** Abstract base class for implementation classes of the link manager. */
@@ -535,6 +539,8 @@ protected:
     explicit            XclExpLinkManagerImpl( const XclExpRoot& rRoot );
 };
 
+namespace {
+
 /** Implementation of the link manager for BIFF5/BIFF7. */
 class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl
 {
@@ -658,6 +664,8 @@ private:
     XclExpXtiVec        maXtiVec;       /// List of XTI structures for the EXTERNSHEET record.
 };
 
+}
+
 // *** Implementation ***
 
 // Excel sheet indexes ========================================================
@@ -869,6 +877,8 @@ void XclExpTabInfo::CalcXclIndexes()
 
 typedef ::std::pair< OUString, SCTAB > XclExpTabName;
 
+namespace {
+
 struct XclExpTabNameSort {
     bool operator ()( const XclExpTabName& rArg1, const XclExpTabName& rArg2 )
     {
@@ -877,6 +887,8 @@ struct XclExpTabNameSort {
     }
 };
 
+}
+
 void XclExpTabInfo::CalcSortedIndexes()
 {
     ScDocument& rDoc = GetDoc();
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 67a1fd3464df..01b778eb044b 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -40,6 +40,8 @@ using namespace ::oox;
 
 // *** Helper classes ***
 
+namespace {
+
 /** Represents an internal defined name, supports writing it to a NAME record. */
 class XclExpName : public XclExpRecord, protected XclExpRoot
 {
@@ -107,6 +109,8 @@ private:
     sal_uInt16          mnXclTab;       /// The 1-based Excel sheet index for local names.
 };
 
+}
+
 /** Implementation class of the name manager. */
 class XclExpNameManagerImpl : protected XclExpRoot
 {
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 9783ea5e5fc0..41c531264b15 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -335,6 +335,8 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
         maData.maVerPageBreaks.push_back(rColBreak);
 }
 
+namespace {
+
 class XclExpXmlStartHeaderFooterElementRecord : public XclExpXmlElementRecord
 {
 public:
@@ -344,6 +346,8 @@ public:
     virtual void        SaveXml( XclExpXmlStream& rStrm ) override;
 };
 
+}
+
 void XclExpXmlStartHeaderFooterElementRecord::SaveXml(XclExpXmlStream& rStrm)
 {
     // OOXTODO: we currently only emit oddHeader/oddFooter elements, and
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 7b6a3b5a5665..2ee1648432a8 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1309,6 +1309,8 @@ size_t XclExpFontBuffer::Find( const XclFontData& rFontData )
 
 // FORMAT record - number formats =============================================
 
+namespace {
+
 /** Predicate for search algorithm. */
 struct XclExpNumFmtPred
 {
@@ -1318,6 +1320,8 @@ struct XclExpNumFmtPred
                             { return rFormat.mnScNumFmt == mnScNumFmt; }
 };
 
+}
+
 void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
@@ -2346,6 +2350,8 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() :
 {
 }
 
+namespace {
+
 /** Predicate for search algorithm. */
 struct XclExpBorderPred
 {
@@ -2355,6 +2361,8 @@ struct XclExpBorderPred
     bool                operator()( const XclExpCellBorder& rBorder ) const;
 };
 
+}
+
 bool XclExpBorderPred::operator()( const XclExpCellBorder& rBorder ) const
 {
     return
@@ -2377,6 +2385,8 @@ bool XclExpBorderPred::operator()( const XclExpCellBorder& rBorder ) const
         mrBorder.mnDiagColorId   == rBorder.mnDiagColorId;
 }
 
+namespace {
+
 struct XclExpFillPred
 {
     const XclExpCellArea&
@@ -2385,6 +2395,8 @@ struct XclExpFillPred
     bool                operator()( const XclExpCellArea& rFill ) const;
 };
 
+}
+
 bool XclExpFillPred::operator()( const XclExpCellArea& rFill ) const
 {
     return
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 4604b860172f..132f48c2f44b 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2149,6 +2149,8 @@ void XclExpRowBuffer::CreateRows( SCROW nFirstFreeScRow )
         GetOrCreateRow(  ::std::max ( nFirstFreeScRow - 1, GetMaxPos().Row() ), true );
 }
 
+namespace {
+
 class RowFinalizeTask : public comphelper::ThreadTask
 {
     bool mbProgress;
@@ -2170,6 +2172,8 @@ public:
     }
 };
 
+}
+
 void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt16Vec& rColXFIndexes )
 {
     // *** Finalize all rows *** ----------------------------------------------
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index fe59a3495ba4..47ca45d10f25 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3559,6 +3559,8 @@ void XclImpDffConverter::ProcessClientAnchor2( SvStream& rDffStrm,
     }
 }
 
+namespace {
+
 struct XclImpDrawObjClientData : public SvxMSDffClientData
 {
     const XclImpDrawObjBase* m_pTopLevelObj;
@@ -3570,6 +3572,8 @@ struct XclImpDrawObjClientData : public SvxMSDffClientData
     virtual void NotifyFreeObj(SdrObject*) override {}
 };
 
+}
+
 SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffObjData,
         SvxMSDffClientData& rClientData, tools::Rectangle& /*rTextRect*/, SdrObject* pOldSdrObj )
 {
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 40128838a629..3e86e5bea064 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -38,6 +38,8 @@
 
 // Cached external cells ======================================================
 
+namespace {
+
 /**
  * Contains the address and value of an external referenced cell.
  * Note that this is non-copyable, so cannot be used in most stl/boost containers.
@@ -80,6 +82,8 @@ private:
     OUString            maTabName;      /// Name of the external sheet.
 };
 
+}
+
 // External document (SUPBOOK) ================================================
 
 /** This class represents an external linked document (record SUPBOOK).
@@ -134,6 +138,8 @@ private:
 
 // Import link manager ========================================================
 
+namespace {
+
 /** Contains the SUPBOOK index and sheet indexes of an external link.
     @descr  It is possible to enter a formula like =SUM(Sheet1:Sheet3!A1),
     therefore here occurs a sheet range. */
@@ -145,7 +151,7 @@ struct XclImpXti
     explicit     XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
 };
 
-static XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
+XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
 {
     rXti.mnSupbook = rStrm.ReaduInt16();
     rXti.mnSBTabFirst = rStrm.ReaduInt16();
@@ -153,6 +159,8 @@ static XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
     return rStrm;
 }
 
+}
+
 /** Implementation of the link manager. */
 class XclImpLinkManagerImpl : protected XclImpRoot
 {
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index dea7ab2886c5..66d7429b6c6a 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -80,6 +80,8 @@ using namespace ::com::sun::star;
 typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
 typedef ::std::vector< Color > ColorVec;
 
+namespace {
+
 class PaletteIndex : public XIndexAccess_BASE
 {
 public:
@@ -111,6 +113,8 @@ private:
     ColorVec        maColor;
 };
 
+}
+
 void
 XclImpPalette::ExportPalette()
 {
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index cd3a355f252a..c65e1919541e 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -21,6 +21,8 @@ using namespace com::sun::star;
 
 typedef std::map< sal_Int16, OUString > IdToString;
 
+namespace {
+
 class MSOExcelCommandConvertor : public MSOCommandConvertor
 {
    IdToString msoToOOcmd;
@@ -31,6 +33,8 @@ public:
     virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) override;
 };
 
+}
+
 MSOExcelCommandConvertor::MSOExcelCommandConvertor()
 {
 /*
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index ae46949e4b21..3da6e228d0e8 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1768,6 +1768,8 @@ ScHTMLTable* ScHTMLTableMap::CreateTable( const HtmlImportInfo& rInfo, bool bPre
     return pTable;
 }
 
+namespace {
+
 /** Simplified forward iterator for convenience.
 
     Before the iterator can be dereferenced, it must be tested with the is()
@@ -1791,6 +1793,8 @@ private:
     const ScHTMLTableMap* mpTableMap;
 };
 
+}
+
 ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ) :
     mpTableMap(pTableMap)
 {
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 0426e3c433e1..d44c7a9407f9 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -1168,6 +1168,8 @@ OUString FormulaParserImpl::resolveDefinedName( sal_Int32 nTokenIndex ) const
 
 // OOXML/BIFF12 parser implementation =========================================
 
+namespace {
+
 class OoxFormulaParserImpl : public FormulaParserImpl
 {
 public:
@@ -1219,6 +1221,8 @@ private:
     bool                mbNeedExtRefs;      /// True = parser needs initialization of external reference info.
 };
 
+}
+
 OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) :
     FormulaParserImpl( rParent ),
     maApiParser( rParent.getBaseFilter().getModelFactory(), rParent ),
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 14e4f9baaf82..dc92ad40ca11 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -353,8 +353,6 @@ enum HFPortionId
     HF_COUNT
 };
 
-}
-
 struct HFPortionInfo
 {
     Reference<text::XText>  mxText;                 /// XText interface of this portion.
@@ -366,6 +364,8 @@ struct HFPortionInfo
     bool                initialize( const Reference<text::XText>& rxText );
 };
 
+}
+
 bool HFPortionInfo::initialize( const Reference<text::XText>& rxText )
 {
     mfTotalHeight = mfCurrHeight = 0.0;
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index efd7f55a73e3..f7c8a5177e04 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -298,6 +298,8 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
     return maSheets.back().get();
 }
 
+namespace {
+
 class FindSheetByIndex
 {
     SCTAB const mnTab;
@@ -309,6 +311,8 @@ public:
     }
 };
 
+}
+
 orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char* sheet_name, size_t sheet_name_length)
 {
     OUString aTabName(sheet_name, sheet_name_length, maGlobalSettings.getTextEncoding());
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 9a7ee2fa7392..e80aed2267da 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1366,6 +1366,8 @@ void ExcXmlRecord::Save( XclExpStream& )
     // Do nothing; ignored for BIFF output.
 }
 
+namespace {
+
 class EndXmlElement : public ExcXmlRecord
 {
     sal_Int32           mnElement;
@@ -1374,6 +1376,8 @@ public:
     virtual void        SaveXml( XclExpXmlStream& rStrm ) override;
 };
 
+}
+
 void EndXmlElement::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream();
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index da91d360aee3..d05afbf27334 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -565,6 +565,8 @@ void XclObjComment::Save( XclExpStream& rStrm )
     XclObj::Save( rStrm );
 }
 
+namespace {
+
 class VmlCommentExporter : public VMLExport
 {
     ScAddress           maScPos;
@@ -583,6 +585,8 @@ protected:
     virtual void        EndShape( sal_Int32 nShapeElement ) override;
 };
 
+}
+
 VmlCommentExporter::VmlCommentExporter( const sax_fastparser::FSHelperPtr& p, const ScAddress& aScPos, SdrCaptionObj* pCaption,
                                         bool bVisible, const tools::Rectangle &aFrom, const tools::Rectangle &aTo )
     : VMLExport( p )
@@ -1537,12 +1541,16 @@ std::size_t ExcEScenarioManager::GetLen() const
     return 8;
 }
 
+namespace {
+
 struct XclExpTabProtectOption
 {
     ScTableProtection::Option   eOption;
     sal_uInt16                  nMask;
 };
 
+}
+
 XclExpSheetProtectOptions::XclExpSheetProtectOptions( const XclExpRoot& rRoot, SCTAB nTab ) :
     XclExpRecord( 0x0867, 23 )
 {
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index c8e652f4522b..2b0e2afa0171 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -39,6 +39,8 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
+namespace {
+
 class ScXMLChangeInfoContext : public ScXMLImportContext
 {
     ScMyActionInfo                      aInfo;
@@ -348,6 +350,8 @@ public:
     virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
 };
 
+}
+
 ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
                                               const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
                                               ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 78dc7fd49597..cff9a046c0da 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -33,6 +33,8 @@ using namespace com::sun::star;
 using namespace xmloff::token;
 using namespace ::formula;
 
+namespace {
+
 class ScXMLContentValidationContext : public ScXMLImportContext
 {
     OUString      sName;
@@ -136,6 +138,8 @@ public:
     virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
 };
 
+}
+
 ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport ) :
     ScXMLImportContext( rImport )
 {
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index a1fdf72f53b1..4e98d40ddb45 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -303,6 +303,8 @@ Calc_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* co
     return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisSettingsExporter", SvXMLExportFlags::SETTINGS|SvXMLExportFlags::OASIS));
 }
 
+namespace {
+
 class ScXMLShapeExport : public XMLShapeExport
 {
 public:
@@ -312,6 +314,8 @@ public:
     virtual void onExport( const uno::Reference < drawing::XShape >& xShape ) override;
 };
 
+}
+
 void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShape )
 {
     uno::Reference< beans::XPropertySet > xShapeProp( xShape, uno::UNO_QUERY );
diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx
index 773848bfdf47..22b31e73f27e 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -30,6 +30,8 @@
 #include <stlpool.hxx>
 #include <attrib.hxx>
 
+namespace {
+
 class ScXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
 {
 private:
@@ -43,6 +45,8 @@ public:
     virtual ~ScXMLFontAutoStylePool_Impl() override;
 };
 
+}
+
 void ScXMLFontAutoStylePool_Impl::AddFontItems(const sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const bool bExportDefaults)
 {
     for( sal_uInt16 i=0; i < nIdCount; ++i )
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index f97b06884261..08e01b8cf7cd 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -222,6 +222,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
     return *pTableRowCellAttrTokenMap;
 }
 
+namespace {
+
 // NB: virtually inherit so we can multiply inherit properly
 //     in ScXMLFlatDocContext_Impl
 class ScXMLDocContext_Impl : public virtual SvXMLImportContext
@@ -248,11 +250,15 @@ public:
     virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
+}
+
 ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport ) :
 SvXMLImportContext( rImport )
 {
 }
 
+namespace {
+
 // context for flat file xml format
 class ScXMLFlatDocContext_Impl
     : public ScXMLDocContext_Impl, public SvXMLMetaDocumentContext
@@ -274,6 +280,8 @@ public:
         const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
+}
+
 ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
                                                    const uno::Reference<document::XDocumentProperties>& i_xDocProps) :
 SvXMLImportContext(i_rImport),
@@ -308,6 +316,8 @@ void SAL_CALL ScXMLFlatDocContext_Impl::characters(const OUString& rChars)
     SvXMLMetaDocumentContext::characters(rChars);
 }
 
+namespace {
+
 class ScXMLBodyContext_Impl : public ScXMLImportContext
 {
 public:
@@ -318,6 +328,8 @@ public:
         const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
+}
+
 ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport ) :
 ScXMLImportContext( rImport )
 {
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 792e59594bc7..1a92449707ec 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -260,6 +260,8 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r
     // don't access pointers to rProperties elements after push_back!
 }
 
+namespace {
+
 class XMLTableCellPropsContext : public SvXMLPropertySetContext
 {
     using SvXMLPropertySetContext::CreateChildContext;
@@ -279,6 +281,8 @@ class XMLTableCellPropsContext : public SvXMLPropertySetContext
            const XMLPropertyState& rProp ) override;
 };
 
+}
+
 XMLTableCellPropsContext::XMLTableCellPropsContext(
              SvXMLImport& rImport, sal_uInt16 nPrfx,
              const OUString& rLName,
@@ -329,6 +333,8 @@ SvXMLImportContextRef XMLTableCellPropsContext::CreateChildContext( sal_uInt16 n
     return SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp );
 }
 
+namespace {
+
 class ScXMLMapContext : public SvXMLImportContext
 {
     OUString msApplyStyle;
@@ -346,6 +352,8 @@ public:
     ScCondFormatEntry* CreateConditionEntry();
 };
 
+}
+
 ScXMLMapContext::ScXMLMapContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList )
     : SvXMLImportContext( rImport, nPrfx, rLName )
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 836106cf193e..74d0b60ffe52 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -86,6 +86,8 @@ using namespace ::com::sun::star::accessibility;
 
     //=====  internal  ========================================================