4 files changed, 25 insertions, 0 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index de4a14015044..a410b6feeaa9 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -63,6 +63,8 @@
 
 #ifndef NDEBUG
 
+namespace {
+
 struct DebugData
 {
     DbgTestSolarMutexProc   pDbgTestSolarMutex;
@@ -74,6 +76,8 @@ struct DebugData
     }
 };
 
+}
+
 static DebugData aDebugData;
 
 void DbgSetTestSolarMutex( DbgTestSolarMutexProc pParam )
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index fe760decf852..6808bc4a132a 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -29,6 +29,8 @@
 #include <tools/config.hxx>
 #include <sal/log.hxx>
 
+namespace {
+
 struct ImplKeyData
 {
     ImplKeyData*    mpNext;
@@ -37,6 +39,8 @@ struct ImplKeyData
     bool            mbIsComment;
 };
 
+}
+
 struct ImplGroupData
 {
     ImplGroupData*  mpNext;
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 0a597fdff1fc..7c9ece60693b 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -639,6 +639,8 @@ void ImplPolygon::ImplCreateFlagArray()
     }
 }
 
+namespace {
+
 class ImplPointFilter
 {
 public:
@@ -670,6 +672,8 @@ public:
     ImplPolygon&    get() { return maPoly; }
 };
 
+}
+
 void ImplPolygonPointFilter::Input( const Point& rPoint )
 {
     if ( !mnSize || (rPoint != maPoly.mxPointAry[mnSize-1]) )
@@ -687,6 +691,8 @@ void ImplPolygonPointFilter::LastPoint()
         maPoly.ImplSetSize( mnSize );
 };
 
+namespace {
+
 class ImplEdgePointFilter : public ImplPointFilter
 {
     Point               maFirstPoint;
@@ -721,6 +727,8 @@ public:
     virtual void        LastPoint() override;
 };
 
+}
+
 inline int ImplEdgePointFilter::VisibleSide( const Point& rPoint ) const
 {
     if ( mnEdge & EDGE_HORZ )
@@ -1219,6 +1227,8 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
     }
 }
 
+namespace {
+
 class Vector2D
 {
 private:
@@ -1233,6 +1243,9 @@ public:
     bool         IsPositive( Vector2D const & rVec ) const { return ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0; }
     bool         IsNegative( Vector2D const & rVec ) const { return !IsPositive( rVec ); }
 };
+
+}
+
 Vector2D& Vector2D::Normalize()
 {
     double fLen = Scalar( *this );
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index 90679654cbbe..83b642368caa 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -13,6 +13,8 @@
 #include <cstdlib>
 #include <stdio.h>
 
+namespace {
+
 struct Encoder
 {
     rtl_UnicodeToTextConverter const m_aConverter;
@@ -55,6 +57,8 @@ struct Encoder
 
 };
 
+}
+
 int main()
 {
 #   define EXP(x) Encoder(x, #x)