3 files changed, 16 insertions, 0 deletions
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 3557fa33257c..ec7628bd3453 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -42,6 +42,8 @@ const GUID* const guidList[ SUPPORTED_FACTORIES_NUM ] = {
     &OID_MathOASISServer
 };
 
+namespace {
+
 class CurThreadData
 {
     public:
@@ -56,6 +58,8 @@ class CurThreadData
         oslThreadKey m_hKey;
 };
 
+}
+
 CurThreadData::CurThreadData() : m_hKey(osl_createThreadKey( nullptr ))
 {
 }
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index a4cd899b6de1..00260481c0a8 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -31,6 +31,7 @@
 static HCURSOR afxCursors[10] = { nullptr, };
 static HBRUSH afxHalftoneBrush = nullptr;
 
+namespace {
 
 // the struct below is used to determine the qualities of a particular handle
 struct AFX_HANDLEINFO
@@ -45,6 +46,8 @@ struct AFX_HANDLEINFO
     int nInvertY;       // handle converts to this when Y inverted
 };
 
+}
+
 // this array describes all 8 handles (clock-wise)
 const AFX_HANDLEINFO afxHandleInfo[] =
 {
@@ -61,6 +64,8 @@ const AFX_HANDLEINFO afxHandleInfo[] =
     { offsetof(RECT, left), offsetof(RECT, top),        0, 1,  0,  0, 5, 7 }
 };
 
+namespace {
+
 // the struct below gives us information on the layout of a RECT struct and
 //  the relationship between its members
 struct AFX_RECTINFO
@@ -69,6 +74,8 @@ struct AFX_RECTINFO
     int nSignAcross;        // sign relative to that point (ie. add/subtract)
 };
 
+}
+
 // this array is indexed by the offset of the RECT member / sizeof(int)
 const AFX_RECTINFO afxRectInfo[] =
 {
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index f5e46e12fbe2..78b7d18edf0a 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -132,6 +132,8 @@ namespace {
 namespace inprocserv
 {
 
+namespace {
+
 class InprocEmbedProvider_Impl : public IClassFactory, public InprocCountedObject_Impl
 {
 public:
@@ -153,6 +155,9 @@ protected:
     ULONG               m_refCount;
     GUID                m_guid;
 };
+
+}
+
 }; // namespace inprocserv