diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp
index 8f69c2b0b..683842033 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Math.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const float Math<float>::EPSILON = FLT_EPSILON;
 template<> const float Math<float>::ZERO_TOLERANCE = 1e-06f;
@@ -48,7 +49,6 @@ template<> const double Math<double>::LN_10 = Math<double>::Log(10.0);
 template<> const double Math<double>::INV_LN_2 = 1.0/Math<double>::LN_2;
 template<> const double Math<double>::INV_LN_10 = 1.0/Math<double>::LN_10;
 
-namespace Wm4 {
 //----------------------------------------------------------------------------
 //Does not compile with gcc 4.1.2
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.cpp
index 46cf71dad..7ed3e7830 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix2.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Matrix2.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Matrix2<float> Matrix2<float>::ZERO(
     0.0f,0.0f,
@@ -31,3 +32,4 @@ template<> const Matrix2<double> Matrix2<double>::ZERO(
 template<> const Matrix2<double> Matrix2<double>::IDENTITY(
     1.0,0.0,
     0.0,1.0);
+}
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.cpp
index 6d4d4e81a..85b2fb344 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix3.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Matrix3.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Matrix3<float> Matrix3<float>::ZERO(
     0.0f,0.0f,0.0f,
@@ -35,3 +36,5 @@ template<> const Matrix3<double> Matrix3<double>::IDENTITY(
     1.0,0.0,0.0,
     0.0,1.0,0.0,
     0.0,0.0,1.0);
+
+}
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.cpp
index d670ad1fd..0d9510b1a 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Matrix4.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Matrix4.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Matrix4<float> Matrix4<float>::ZERO(
     0.0f,0.0f,0.0f,0.0f,
@@ -39,3 +40,4 @@ template<> const Matrix4<double> Matrix4<double>::IDENTITY(
     0.0,1.0,0.0,0.0,
     0.0,0.0,1.0,0.0,
     0.0,0.0,0.0,1.0);
+}
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.cpp
index d2aaf2be8..4d35d1967 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector2.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Vector2.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Vector2<float> Vector2<float>::ZERO(0.0f,0.0f);
 template<> const Vector2<float> Vector2<float>::UNIT_X(1.0f,0.0f);
@@ -28,3 +29,4 @@ template<> const Vector2<double> Vector2<double>::UNIT_X(1.0,0.0);
 template<> const Vector2<double> Vector2<double>::UNIT_Y(0.0,1.0);
 template<> const Vector2<double> Vector2<double>::ONE(1.0,1.0);
 
+}
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.cpp
index 2e82bff05..643b23c0f 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector3.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Vector3.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Vector3<float> Vector3<float>::ZERO(0.0f,0.0f,0.0f);
 template<> const Vector3<float> Vector3<float>::UNIT_X(1.0f,0.0f,0.0f);
@@ -31,3 +32,5 @@ template<> const Vector3<double> Vector3<double>::UNIT_Y(0.0,1.0,0.0);
 template<> const Vector3<double> Vector3<double>::UNIT_Z(0.0,0.0,1.0);
 template<> const Vector3<double> Vector3<double>::ONE(1.0,1.0,1.0);
 /// @endcond
+
+}
diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.cpp
index bc9198c4f..5691c143d 100644
--- a/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.cpp
+++ b/src/Mod/Mesh/App/WildMagic4/Wm4Vector4.cpp
@@ -16,7 +16,8 @@
 
 #include "Wm4FoundationPCH.h"
 #include "Wm4Vector4.h"
-using namespace Wm4;
+
+namespace Wm4 {
 
 template<> const Vector4<float> Vector4<float>::ZERO(0.0f,0.0f,0.0f,0.0f);
 template<> const Vector4<float> Vector4<float>::UNIT_X(1.0f,0.0f,0.0f,0.0f);
@@ -31,3 +32,5 @@ template<> const Vector4<double> Vector4<double>::UNIT_Y(0.0,1.0,0.0,0.0);
 template<> const Vector4<double> Vector4<double>::UNIT_Z(0.0,0.0,1.0,0.0);
 template<> const Vector4<double> Vector4<double>::UNIT_W(0.0,0.0,0.0,1.0);
 template<> const Vector4<double> Vector4<double>::ONE(1.0,1.0,1.0,1.0);
+
+}