diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp
index 9c9d81e1..55e07da8 100644
--- a/glm/gtc/half_float.hpp
+++ b/glm/gtc/half_float.hpp
@@ -17,11 +17,7 @@
 #	pragma message("GLM: GLM_GTC_half_float extension included")
 #endif
 
-namespace glm
-{
-	namespace test{
-		bool main_gtc_half_float();
-	}//namespace 
+namespace glm{
 	namespace detail
 	{
 #ifndef _MSC_EXTENSIONS
diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp
index cfd487b8..8536ae31 100644
--- a/glm/gtc/matrix_integer.hpp
+++ b/glm/gtc/matrix_integer.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		bool main_gtc_matrix_integer();
-	}//namespace test
-
 	namespace gtc{
 	//! GLM_GTC_matrix_integer extension: Add integer matrices
 	namespace matrix_integer
diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp
index 241bb3ac..95cdb420 100644
--- a/glm/gtc/matrix_transform.hpp
+++ b/glm/gtc/matrix_transform.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		bool main_gtc_matrix_transform();
-	}//namespace test
-
 	namespace gtc{
 	//! GLM_GTC_matrix_transform extension: Add transformation matrices
 	namespace matrix_transform
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index bc4890fd..16be3d1f 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -28,10 +28,6 @@
 
 namespace glm
 {
-	namespace test{
-		bool main_gtc_quaternion();
-	}//namespace test
-
 	namespace detail
 	{
 		//! \brief Template for quaternion. 
diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp
index a2bf601d..945b440e 100644
--- a/glm/gtc/swizzle.hpp
+++ b/glm/gtc/swizzle.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtc_swizzle();
-	}//namespace test
-
 	namespace gtc{
 	//! GLM_GTC_swizzle extension
 	namespace swizzle
diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp
index ab307277..b7ca27ff 100644
--- a/glm/gtc/type_precision.hpp
+++ b/glm/gtc/type_precision.hpp
@@ -26,10 +26,6 @@
 
 namespace glm
 {
-	namespace test{
-		bool main_gtc_type_precision();
-	}//namespace test
-
 	namespace gtc{
 	//! GLM_GTC_type_precision extension: Defined types with specific size.
 	namespace type_precision
diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp
index e1612e80..3d55e8f2 100644
--- a/glm/gtc/type_ptr.hpp
+++ b/glm/gtc/type_ptr.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtc_type_ptr();
-	}//namespace test
-
 	namespace gtc{
 	//! GLM_GTC_type_ptr extension: Get access to vectors & matrices value type address.
 	namespace type_ptr{
diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp
index 15c74c34..dfa0adf0 100644
--- a/glm/gtx/associated_min_max.hpp
+++ b/glm/gtx/associated_min_max.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_associated_min_max();
-	}//namespace test
-
 	namespace gtx
 	{
 		//! GLM_GTX_associated_min_max extension: Min and max functions that return associated values not the compared onces.
diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp
index f6c689f2..6c94e0fb 100644
--- a/glm/gtx/bit.hpp
+++ b/glm/gtx/bit.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_bit();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_bit extension: Allow to perform bit operations on integer values
 	namespace bit
diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp
index 7e74927a..f739aa59 100644
--- a/glm/gtx/closest_point.hpp
+++ b/glm/gtx/closest_point.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_closest_point();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_closest_point extension: Find the point on a straight line which is the closet of a point.
 	namespace closest_point{
diff --git a/glm/gtx/color_cast.hpp b/glm/gtx/color_cast.hpp
index 0dc4e720..b88d3516 100644
--- a/glm/gtx/color_cast.hpp
+++ b/glm/gtx/color_cast.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_ext_gtx_color_cast();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_color_cast extension: Conversion between two color types
 	namespace color_cast
diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp
index b754d731..fdbe61b8 100644
--- a/glm/gtx/color_space.hpp
+++ b/glm/gtx/color_space.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_color_space();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_color_space extension: Related to RGB to HSV conversions and operations
     namespace color_space
diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp
index ca93986d..efa2a006 100644
--- a/glm/gtx/color_space_YCoCg.hpp
+++ b/glm/gtx/color_space_YCoCg.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_color_space_YCoCg();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_color_space_YCoCg extension: RGB to YCoCg conversions and operations
     namespace color_space_YCoCg
diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp
index 2537d240..124dc16b 100644
--- a/glm/gtx/compatibility.hpp
+++ b/glm/gtx/compatibility.hpp
@@ -30,10 +30,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_compatibility();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_compatibility extension: Provide functions to increase the compatibility with Cg and HLSL languages
 	namespace compatibility
diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp
index f9cd362b..94b1375e 100644
--- a/glm/gtx/component_wise.hpp
+++ b/glm/gtx/component_wise.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_component_wise();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_component_wise extension: Operations between components of a type
 	namespace component_wise
diff --git a/glm/gtx/epsilon.hpp b/glm/gtx/epsilon.hpp
index f362edc1..1461c1e6 100644
--- a/glm/gtx/epsilon.hpp
+++ b/glm/gtx/epsilon.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_epsilon();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_epsilon extension: Comparison functions for a user defined epsilon values.
 	namespace epsilon
diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp
index 9bda8cd1..cc457ea8 100644
--- a/glm/gtx/extend.hpp
+++ b/glm/gtx/extend.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_extend();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_extend extension: Extend a position from a source to a position at a defined length.
 	namespace extend
diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp
index bf496576..b84d8144 100644
--- a/glm/gtx/extented_min_max.hpp
+++ b/glm/gtx/extented_min_max.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_ext_gtx_extented_min_max();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_extented_min_max extension: Min and max functions for 3 to 4 parameters.
 	namespace extented_min_max
diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp
index cc4c75ca..23894f3c 100644
--- a/glm/gtx/fast_exponential.hpp
+++ b/glm/gtx/fast_exponential.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_fast_exponential();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_fast_exponential extension: Fast but less accurate implementations of exponential based functions.
 	namespace fast_exponential
diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp
index 863cb6b3..1a86ca56 100644
--- a/glm/gtx/fast_square_root.hpp
+++ b/glm/gtx/fast_square_root.hpp
@@ -26,10 +26,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_fast_square_root();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_fast_square_root extension: Fast but less accurate implementations of square root based functions.
 	namespace fast_square_root
diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp
index 2b1228bb..eaa3d4bf 100644
--- a/glm/gtx/fast_trigonometry.hpp
+++ b/glm/gtx/fast_trigonometry.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_fast_trigonometry();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_fast_trigonometry extension: Fast but less accurate implementations of trigonometric functions.
     namespace fast_trigonometry
diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp
index 5ada9760..aac89b89 100644
--- a/glm/gtx/gradient_paint.hpp
+++ b/glm/gtx/gradient_paint.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_gradient_paint();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_gradient_paint extension: Compute a radient gradient according section OpenVG 1.1 specifications, 9.3.2 Radial Gradients
 	namespace gradient_paint
diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp
index c473a83e..87e0400a 100644
--- a/glm/gtx/intersect.hpp
+++ b/glm/gtx/intersect.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_intesect();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_intersect extension: Add intersection functions
 	namespace intersect
diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp
index bf7b5eea..1335de41 100644
--- a/glm/gtx/log_base.hpp
+++ b/glm/gtx/log_base.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_ext_gtx_log_base();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_log_base extension: Logarithm for any base. base can be a vector or a scalar.
 	namespace log_base
diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp
index 2ccdd6b1..5e0bc5c4 100644
--- a/glm/gtx/matrix_cross_product.hpp
+++ b/glm/gtx/matrix_cross_product.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_matrix_cross_product();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_matrix_cross_product: Build cross product matrices
 	namespace matrix_cross_product
diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp
index 7d9d6135..84b6450b 100644
--- a/glm/gtx/matrix_interpolation.hpp
+++ b/glm/gtx/matrix_interpolation.hpp
@@ -25,10 +25,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_transform();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_matrix_interpolation extension: Add transformation matrices
 	namespace matrix_interpolation
diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp
index c4834093..57b8c3d8 100644
--- a/glm/gtx/matrix_operation.hpp
+++ b/glm/gtx/matrix_operation.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_matrix_operation();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_matrix_operation: Build diagonal matrices
 	namespace matrix_operation
diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp
index 222f1f88..5db3f0e1 100644
--- a/glm/gtx/matrix_query.hpp
+++ b/glm/gtx/matrix_query.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_matrix_query();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_matrix_query: Query to evaluate matrix properties
 	namespace matrix_query
diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp
index cad47e9e..2701017a 100644
--- a/glm/gtx/mixed_product.hpp
+++ b/glm/gtx/mixed_product.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_matrix_selection();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_mixed_product extension: Mixed product of 3 vectors.
 	namespace mixed_product
diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp
index 5cf1e855..6c823d3d 100644
--- a/glm/gtx/multiple.hpp
+++ b/glm/gtx/multiple.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		bool main_img_multiple();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_multiple: Find the closest number of a number multiple of other number.
 	namespace multiple
diff --git a/glm/gtx/noise.hpp b/glm/gtx/noise.hpp
index 0e1a32e8..30552c20 100644
--- a/glm/gtx/noise.hpp
+++ b/glm/gtx/noise.hpp
@@ -27,10 +27,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_noise();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_noise extension: Comparison functions for a user defined epsilon values.
 	namespace noise
diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp
index 599a3995..272c18dd 100644
--- a/glm/gtx/norm.hpp
+++ b/glm/gtx/norm.hpp
@@ -27,10 +27,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_norm();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_norm extension: Various way to compute vector norms.
 	namespace norm
diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp
index 8c27798d..068d61a8 100644
--- a/glm/gtx/normal.hpp
+++ b/glm/gtx/normal.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_normal();
-	}//namespace test
-	
 	namespace gtx{
 	//! GLM_GTX_normal extension: Compute the normal of a triangle.
     namespace normal
diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp
index 90bd0966..36512786 100644
--- a/glm/gtx/optimum_pow.hpp
+++ b/glm/gtx/optimum_pow.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_optimum_pow();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_optimum_pow extension: Integer exponentiation of power functions.
     namespace optimum_pow
diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp
index 73d8625c..9490efc3 100644
--- a/glm/gtx/orthonormalize.hpp
+++ b/glm/gtx/orthonormalize.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_orthonormalize();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_orthonormalize extension: Orthonormalize matrices.
     namespace orthonormalize
diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp
index c9212e68..93c6e82c 100644
--- a/glm/gtx/perpendicular.hpp
+++ b/glm/gtx/perpendicular.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_perpendicular();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_perpendicular extension: Perpendicular of a vector from other one
     namespace perpendicular
diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp
index 4f4f0dc5..a92ca3b5 100644
--- a/glm/gtx/projection.hpp
+++ b/glm/gtx/projection.hpp
@@ -22,10 +22,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_projection();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_projection extension: Projection of a vector to other one
 	namespace projection
diff --git a/glm/gtx/reciprocal.hpp b/glm/gtx/reciprocal.hpp
index 27763c22..eb8ea688 100644
--- a/glm/gtx/reciprocal.hpp
+++ b/glm/gtx/reciprocal.hpp
@@ -19,10 +19,6 @@
 
 namespace glm
 {
-   	namespace test{
-		void main_gtx_reciprocal();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_reciprocal extension: Define secant, cosecant and cotangent functions.
 	namespace reciprocal
diff --git a/glm/gtx/simplex.hpp b/glm/gtx/simplex.hpp
index fd17deaa..4100cba2 100644
--- a/glm/gtx/simplex.hpp
+++ b/glm/gtx/simplex.hpp
@@ -20,49 +20,48 @@
 #	pragma message("GLM: GLM_GTX_simplex extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+//! GLM_GTX_simplex extension: Spline functions
+namespace spline
 {
-    namespace gtx{
-        //! GLM_GTX_simplex extension: Spline functions
-        namespace spline
-        {
-            /// \addtogroup gtx_spline
-            ///@{
+    /// \addtogroup gtx_spline
+    ///@{
             
-            //! Return a point from a catmull rom curve.
-            //! From GLM_GTX_spline extension.
-            template <typename genType> 
-            genType catmullRom(
-                               genType const & v1, 
-                               genType const & v2, 
-                               genType const & v3, 
-                               genType const & v4, 
-                               typename genType::value_type const & s);
+    //! Return a point from a catmull rom curve.
+    //! From GLM_GTX_spline extension.
+    template <typename genType> 
+    genType catmullRom(
+                        genType const & v1, 
+                        genType const & v2, 
+                        genType const & v3, 
+                        genType const & v4, 
+                        typename genType::value_type const & s);
             
-            //! Return a point from a hermite curve.
-            //! From GLM_GTX_spline extension.
-            template <typename genType> 
-            genType hermite(
-                            genType const & v1, 
-                            genType const & t1, 
-                            genType const & v2, 
-                            genType const & t2, 
-                            typename genType::value_type const & s);
+    //! Return a point from a hermite curve.
+    //! From GLM_GTX_spline extension.
+    template <typename genType> 
+    genType hermite(
+                    genType const & v1, 
+                    genType const & t1, 
+                    genType const & v2, 
+                    genType const & t2, 
+                    typename genType::value_type const & s);
             
-            //! Return a point from a cubic curve. 
-            //! From GLM_GTX_spline extension.
-            template <typename genType> 
-            genType cubic(
-                          genType const & v1, 
-                          genType const & v2, 
-                          genType const & v3, 
-                          genType const & v4, 
-                          typename genType::value_type const & s);
+    //! Return a point from a cubic curve. 
+    //! From GLM_GTX_spline extension.
+    template <typename genType> 
+    genType cubic(
+                    genType const & v1, 
+                    genType const & v2, 
+                    genType const & v3, 
+                    genType const & v4, 
+                    typename genType::value_type const & s);
             
-            ///@}
+    ///@}
             
-        }//namespace simplex
-    }//namespace gtx
+}//namespace simplex
+}//namespace gtx
 }//namespace glm
 
 #include "simplex.inl"
diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp
index e791d1dc..fd57e15c 100644
--- a/glm/gtx/spline.hpp
+++ b/glm/gtx/spline.hpp
@@ -21,51 +21,50 @@
 #	pragma message("GLM: GLM_GTX_spline extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+//! GLM_GTX_spline extension: Spline functions
+namespace spline
 {
-    namespace gtx{
-	//! GLM_GTX_spline extension: Spline functions
-    namespace spline
-    {
-		using namespace gtx::optimum_pow;
+	using namespace gtx::optimum_pow;
 
-		/// \addtogroup gtx_spline
-		///@{
+	/// \addtogroup gtx_spline
+	///@{
 
-		//! Return a point from a catmull rom curve.
-		//! From GLM_GTX_spline extension.
-		template <typename genType> 
-		genType catmullRom(
-			genType const & v1, 
-			genType const & v2, 
-			genType const & v3, 
-			genType const & v4, 
-			typename genType::value_type const & s);
+	//! Return a point from a catmull rom curve.
+	//! From GLM_GTX_spline extension.
+	template <typename genType> 
+	genType catmullRom(
+		genType const & v1, 
+		genType const & v2, 
+		genType const & v3, 
+		genType const & v4, 
+		typename genType::value_type const & s);
 		
-		//! Return a point from a hermite curve.
-		//! From GLM_GTX_spline extension.
-        template <typename genType> 
-		genType hermite(
-			genType const & v1, 
-			genType const & t1, 
-			genType const & v2, 
-			genType const & t2, 
-			typename genType::value_type const & s);
+	//! Return a point from a hermite curve.
+	//! From GLM_GTX_spline extension.
+    template <typename genType> 
+	genType hermite(
+		genType const & v1, 
+		genType const & t1, 
+		genType const & v2, 
+		genType const & t2, 
+		typename genType::value_type const & s);
 		
-        //! Return a point from a cubic curve. 
-		//! From GLM_GTX_spline extension.
-		template <typename genType> 
-		genType cubic(
-			genType const & v1, 
-			genType const & v2, 
-			genType const & v3, 
-			genType const & v4, 
-			typename genType::value_type const & s);
+    //! Return a point from a cubic curve. 
+	//! From GLM_GTX_spline extension.
+	template <typename genType> 
+	genType cubic(
+		genType const & v1, 
+		genType const & v2, 
+		genType const & v3, 
+		genType const & v4, 
+		typename genType::value_type const & s);
 
-		///@}
+	///@}
 
-	}//namespace spline
-    }//namespace gtx
+}//namespace spline
+}//namespace gtx
 }//namespace glm
 
 #include "spline.inl"
diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp
index b70ebbe2..b9f321ea 100644
--- a/glm/gtx/std_based_type.hpp
+++ b/glm/gtx/std_based_type.hpp
@@ -23,10 +23,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_std_based_type();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_std_based_type extension: Add support vector types based on C++ standard type
 	namespace std_based_type
diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp
index 565268f6..b0c88df7 100644
--- a/glm/gtx/string_cast.hpp
+++ b/glm/gtx/string_cast.hpp
@@ -30,10 +30,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_string_cast();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_string_cast extension: Setup strings for GLM type values
 	namespace string_cast
diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp
index adf18639..092cf3f0 100644
--- a/glm/gtx/transform.hpp
+++ b/glm/gtx/transform.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_transform();
-	}//namespace test
-
 	namespace gtx{
 	//! GLM_GTX_transform extension: Add transformation matrices
 	namespace transform
diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp
index 82c1151c..40c026d8 100644
--- a/glm/gtx/transform2.hpp
+++ b/glm/gtx/transform2.hpp
@@ -24,10 +24,6 @@
 
 namespace glm
 {
-	namespace test{
-		void main_gtx_transform2();
-	}//namespace test
-
     namespace gtx{
 	//! GLM_GTX_transform2 extension: Add extra transformation matrices
 	namespace transform2
diff --git a/glm/gtx/ulp.hpp b/glm/gtx/ulp.hpp
index 81f588db..39c51592 100644
--- a/glm/gtx/ulp.hpp
+++ b/glm/gtx/ulp.hpp
@@ -20,49 +20,47 @@
 #	pragma message("GLM: GLM_GTX_ulp extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace ulp ///< GLM_GTX_ulp extension: Precision calculation functions
 {
-	namespace gtx{
-	//! GLM_GTX_ulp extension: Precision calculation functions
-	namespace ulp
-	{
-		/// \addtogroup gtx_ulp
-		///@{
+	/// \addtogroup gtx_ulp
+	///@{
 
-		//! Return the next ULP value(s) after the input value(s).
-		//! From GLM_GTX_ulp extension.
-        template <typename genType>
-        genType next_float(genType const & x);
+	//! Return the next ULP value(s) after the input value(s).
+	//! From GLM_GTX_ulp extension.
+    template <typename genType>
+    genType next_float(genType const & x);
         
-		//! Return the previous ULP value(s) before the input value(s).
-		//! From GLM_GTX_ulp extension.
-        template <typename genType>
-        genType prev_float(genType const & x);
+	//! Return the previous ULP value(s) before the input value(s).
+	//! From GLM_GTX_ulp extension.
+    template <typename genType>
+    genType prev_float(genType const & x);
 
-		//! Return the value(s) ULP distance after the input value(s).
-		//! From GLM_GTX_ulp extension.
-        template <typename genType>
-        genType next_float(genType const & x, uint const & Distance);
+	//! Return the value(s) ULP distance after the input value(s).
+	//! From GLM_GTX_ulp extension.
+    template <typename genType>
+    genType next_float(genType const & x, uint const & Distance);
         
-        //! Return the value(s) ULP distance before the input value(s).
-		//! From GLM_GTX_ulp extension.
-        template <typename genType>
-        genType prev_float(genType const & x, uint const & Distance);
+    //! Return the value(s) ULP distance before the input value(s).
+	//! From GLM_GTX_ulp extension.
+    template <typename genType>
+    genType prev_float(genType const & x, uint const & Distance);
         
-        //! Return the distance in the number of ULP between 2 scalars.
-		//! From GLM_GTX_ulp extension.
-        template <typename T>
-        uint float_distance(T const & x, T const & y);
+    //! Return the distance in the number of ULP between 2 scalars.
+	//! From GLM_GTX_ulp extension.
+    template <typename T>
+    uint float_distance(T const & x, T const & y);
         
-        //! Return the distance in the number of ULP between 2 vectors.
-		//! From GLM_GTX_ulp extension.
-        template<typename T, template<typename> class vecType>
-        vecType<uint> float_distance(vecType<T> const & x, vecType<T> const & y);
+    //! Return the distance in the number of ULP between 2 vectors.
+	//! From GLM_GTX_ulp extension.
+    template<typename T, template<typename> class vecType>
+    vecType<uint> float_distance(vecType<T> const & x, vecType<T> const & y);
         
-		///@}
+	///@}
 
-	}//namespace ulp
-	}//namespace gtx
+}//namespace ulp
+}//namespace gtx
 }//namespace glm
 
 #include "ulp.inl"
diff --git a/glm/gtx/unsigned_int.hpp b/glm/gtx/unsigned_int.hpp
index a8f210d0..77f11fa6 100644
--- a/glm/gtx/unsigned_int.hpp
+++ b/glm/gtx/unsigned_int.hpp
@@ -22,41 +22,35 @@
 #	pragma message("GLM: GLM_GTX_unsigned_int extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace unsigned_int ///< GLM_GTX_unsigned_int extension: Add support for unsigned integer for core functions
 {
-	namespace test{
-		void main_gtx_unsigned_int();
-	}//namespace test
+	using namespace gtx::integer;
 
-	namespace gtx{
-	//! GLM_GTX_unsigned_int extension: Add support for unsigned integer for core functions
-	namespace unsigned_int
-	{
-		using namespace gtx::integer;
+	/// \addtogroup gtx_unsigned_int
+	///@{
 
-		/// \addtogroup gtx_unsigned_int
-		///@{
+	//! 32bit signed integer. 
+	//! From GLM_GTX_unsigned_int extension.
+	typedef signed int					sint;
 
-		//! 32bit signed integer. 
-		//! From GLM_GTX_unsigned_int extension.
-		typedef signed int					sint;
+	//! Returns x raised to the y power.
+	//! From GLM_GTX_unsigned_int extension.
+	uint pow(uint x, uint y);
 
-		//! Returns x raised to the y power.
-		//! From GLM_GTX_unsigned_int extension.
-		uint pow(uint x, uint y);
+	//! Returns the positive square root of x. 
+	//! From GLM_GTX_unsigned_int extension.
+	uint sqrt(uint x);
 
-		//! Returns the positive square root of x. 
-		//! From GLM_GTX_unsigned_int extension.
-		uint sqrt(uint x);
+	//! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y.
+	//! From GLM_GTX_unsigned_int extension.
+	uint mod(uint x, uint y);
 
-		//! Modulus. Returns x - y * floor(x / y) for each component in x using the floating point value y.
-		//! From GLM_GTX_unsigned_int extension.
-		uint mod(uint x, uint y);
+	///@}
 
-		///@}
-
-	}//namespace unsigned_int
-	}//namespace gtx
+}//namespace unsigned_int
+}//namespace gtx
 }//namespace glm
 
 #include "unsigned_int.inl"
diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp
index df7fb1d4..552cce92 100644
--- a/glm/gtx/vec1.hpp
+++ b/glm/gtx/vec1.hpp
@@ -21,103 +21,96 @@
 #	pragma message("GLM: GLM_GTX_vec1 extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace vector1{ ///< GLM_GTX_vec1 extension: 1 component vector.
+namespace precision
 {
-	namespace test{
-		void main_gtx_vector1();
-	}//namespace test
+	//! 1 component vector of high precision floating-point numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::highp_vec1_t			highp_vec1;
+	//! 1 component vector of medium precision floating-point numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::mediump_vec1_t			mediump_vec1;
+	//! 1 component vector of low precision floating-point numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::lowp_vec1_t				lowp_vec1;
 
-	namespace gtx{
-	//! GLM_GTX_vector1 extension: 1 component vector.
-	namespace vector1
-	{
-		namespace precision
-		{
-			//! 1 component vector of high precision floating-point numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::highp_vec1_t			highp_vec1;
-			//! 1 component vector of medium precision floating-point numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::mediump_vec1_t			mediump_vec1;
-			//! 1 component vector of low precision floating-point numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::lowp_vec1_t				lowp_vec1;
+	//! 1 component vector of high precision signed integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::highp_ivec1_t			highp_ivec1;
+	//! 1 component vector of medium precision signed integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::mediump_ivec1_t			mediump_ivec1;
+	//! 1 component vector of low precision signed integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::lowp_ivec1_t			lowp_ivec1;
 
-			//! 1 component vector of high precision signed integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::highp_ivec1_t			highp_ivec1;
-			//! 1 component vector of medium precision signed integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::mediump_ivec1_t			mediump_ivec1;
-			//! 1 component vector of low precision signed integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::lowp_ivec1_t			lowp_ivec1;
+	//! 1 component vector of high precision unsigned integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::highp_uvec1_t			highp_uvec1;
+	//! 1 component vector of medium precision unsigned integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::mediump_uvec1_t			mediump_uvec1;
+	//! 1 component vector of low precision unsigned integer numbers. 
+	//! There is no guarantee on the actual precision.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::lowp_uvec1_t			lowp_uvec1;
+}//namespace precision
 
-			//! 1 component vector of high precision unsigned integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::highp_uvec1_t			highp_uvec1;
-			//! 1 component vector of medium precision unsigned integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::mediump_uvec1_t			mediump_uvec1;
-			//! 1 component vector of low precision unsigned integer numbers. 
-			//! There is no guarantee on the actual precision.
-			//! From GLM_GTX_vec1 extension.
-			typedef detail::lowp_uvec1_t			lowp_uvec1;
-		}//namespace precision
+	//////////////////////////
+	// vec1 definition
 
-		//////////////////////////
-		// vec1 definition
-
-		//! 1 component vector of boolean.
-		//! From GLM_GTX_vec1 extension.
-		typedef detail::tvec1<bool>	bvec1;
+	//! 1 component vector of boolean.
+	//! From GLM_GTX_vec1 extension.
+	typedef detail::tvec1<bool>	bvec1;
 
 #if(defined(GLM_PRECISION_HIGHP_FLOAT))
-		typedef precision::highp_vec1			vec1;
+	typedef precision::highp_vec1			vec1;
 #elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
-		typedef precision::mediump_vec1			vec1;
+	typedef precision::mediump_vec1			vec1;
 #elif(defined(GLM_PRECISION_LOWP_FLOAT))
-		typedef precision::lowp_vec1			vec1;
+	typedef precision::lowp_vec1			vec1;
 #else
-		//! 1 component vector of floating-point numbers.
-		//! From GLM_GTX_vec1 extension.
-		typedef precision::mediump_vec1			vec1;
+	//! 1 component vector of floating-point numbers.
+	//! From GLM_GTX_vec1 extension.
+	typedef precision::mediump_vec1			vec1;
 #endif//GLM_PRECISION
 
 #if(defined(GLM_PRECISION_HIGHP_INT))
-		typedef precision::highp_ivec1			ivec1;
+	typedef precision::highp_ivec1			ivec1;
 #elif(defined(GLM_PRECISION_MEDIUMP_INT))
-		typedef precision::mediump_ivec1		ivec1;
+	typedef precision::mediump_ivec1		ivec1;
 #elif(defined(GLM_PRECISION_LOWP_INT))
-		typedef precision::lowp_ivec1			ivec1;
+	typedef precision::lowp_ivec1			ivec1;
 #else
-		//! 1 component vector of signed integer numbers. 
-		//! From GLM_GTX_vec1 extension.
-		typedef precision::mediump_ivec1		ivec1;
+	//! 1 component vector of signed integer numbers. 
+	//! From GLM_GTX_vec1 extension.
+	typedef precision::mediump_ivec1		ivec1;
 #endif//GLM_PRECISION
 
 #if(defined(GLM_PRECISION_HIGHP_UINT))
-		typedef precision::highp_uvec1			uvec1;
+	typedef precision::highp_uvec1			uvec1;
 #elif(defined(GLM_PRECISION_MEDIUMP_UINT))
-		typedef precision::mediump_uvec1		uvec1;
+	typedef precision::mediump_uvec1		uvec1;
 #elif(defined(GLM_PRECISION_LOWP_UINT))
-		typedef precision::lowp_uvec1			uvec1;
+	typedef precision::lowp_uvec1			uvec1;
 #else
-		//! 1 component vector of unsigned integer numbers. 
-		//! From GLM_GTX_vec1 extension.
-		typedef precision::mediump_uvec1		uvec1;
+	//! 1 component vector of unsigned integer numbers. 
+	//! From GLM_GTX_vec1 extension.
+	typedef precision::mediump_uvec1		uvec1;
 #endif//GLM_PRECISION
 
-	}//namespace vec1
-	}//namespace gtx
+}//namespace vec1
+}//namespace gtx
 }//namespace glm
 
 #include "vec1.inl"
diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp
index 1968d4f9..86ca1d97 100644
--- a/glm/gtx/vector_access.hpp
+++ b/glm/gtx/vector_access.hpp
@@ -20,50 +20,44 @@
 #	pragma message("GLM: GLM_GTX_vector_access extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace vector_access ///< GLM_GTX_vector_access extension: Function to set values to vectors
 {
-	namespace test{
-		void main_gtx_vector_access();
-	}//namespace test
+	/// \addtogroup gtx_vector_access
+	///@{
 
-    namespace gtx{
-	//! GLM_GTX_vector_access extension: Function to set values to vectors
-    namespace vector_access
-    {
-		/// \addtogroup gtx_vector_access
-		///@{
+	//! Set values to a 2 components vector.
+	//! From GLM_GTX_vector_access extension.
+    template <typename valType> 
+	void set(
+		detail::tvec2<valType> & v, 
+		valType const & x, 
+		valType const & y);
 
-		//! Set values to a 2 components vector.
-		//! From GLM_GTX_vector_access extension.
-        template <typename valType> 
-		void set(
-			detail::tvec2<valType> & v, 
-			valType const & x, 
-			valType const & y);
+	//! Set values to a 3 components vector.
+	//! From GLM_GTX_vector_access extension.
+    template <typename valType> 
+	void set(
+		detail::tvec3<valType> & v, 
+		valType const & x, 
+		valType const & y, 
+		valType const & z);
 
-		//! Set values to a 3 components vector.
-		//! From GLM_GTX_vector_access extension.
-        template <typename valType> 
-		void set(
-			detail::tvec3<valType> & v, 
-			valType const & x, 
-			valType const & y, 
-			valType const & z);
+	//! Set values to a 4 components vector.
+	//! From GLM_GTX_vector_access extension.
+    template <typename valType> 
+	void set(
+		detail::tvec4<valType> & v, 
+		valType const & x, 
+		valType const & y, 
+		valType const & z, 
+		valType const & w);
 
-		//! Set values to a 4 components vector.
-		//! From GLM_GTX_vector_access extension.
-        template <typename valType> 
-		void set(
-			detail::tvec4<valType> & v, 
-			valType const & x, 
-			valType const & y, 
-			valType const & z, 
-			valType const & w);
+	///@}
 
-		///@}
-
-    }//namespace vector_access
-    }//namespace gtx
+}//namespace vector_access
+}//namespace gtx
 }//namespace glm
 
 #include "vector_access.inl"
diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp
index 0d1acbf5..ece7d358 100644
--- a/glm/gtx/vector_angle.hpp
+++ b/glm/gtx/vector_angle.hpp
@@ -27,8 +27,7 @@
 
 namespace glm{
 namespace gtx{
-//! GLM_GTX_vector_angle extension: Compute angle between vectors
-namespace vector_angle
+namespace vector_angle ///< GLM_GTX_vector_angle extension: Compute angle between vectors
 {
 	using namespace quaternion;
 	using namespace epsilon;
diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp
index 47fac281..ae2879a0 100644
--- a/glm/gtx/vector_query.hpp
+++ b/glm/gtx/vector_query.hpp
@@ -22,77 +22,71 @@
 #	pragma message("GLM: GLM_GTX_vector_query extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace vector_query ///< GLM_GTX_vector_query extension: Query informations of vector types
 {
-	namespace test{
-		void main_ext_gtx_vector_query();
-	}//namespace test
+	/// \addtogroup gtx_vector_query
+	///@{
 
-    namespace gtx{
-	//! GLM_GTX_vector_query extension: Query informations of vector types
-    namespace vector_query
-    {
-		/// \addtogroup gtx_vector_query
-		///@{
-
-		//! Check if two vectors are collinears.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool areCollinear(
-			genType const & v0, 
-			genType const & v1, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+	//! Check if two vectors are collinears.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool areCollinear(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 		
-        //! Check if two vectors are opposites.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool areOpposite(
-			genType const & v0, 
-			genType const & v1, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+    //! Check if two vectors are opposites.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool areOpposite(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 		
-        //! Check if two vectors are orthogonals.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool areOrthogonal(
-			genType const & v0, 
-			genType const & v1, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+    //! Check if two vectors are orthogonals.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool areOrthogonal(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
-		//! Check if a vector is normalized.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool isNormalized(
-			genType const & v, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+	//! Check if a vector is normalized.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool isNormalized(
+		genType const & v, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 		
-		//! Check if a vector is null.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool isNull(
-			genType const & v, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+	//! Check if a vector is null.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool isNull(
+		genType const & v, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
-		//! Check if two vectors are orthonormal.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType>
-		bool areOrthonormal(
-			genType const & v0, 
-			genType const & v1, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+	//! Check if two vectors are orthonormal.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType>
+	bool areOrthonormal(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
-		//! Check if two vectors are similar.
-		//! From GLM_GTX_vector_query extensions.
-		template <typename genType> 
-		bool areSimilar(
-			genType const & v0, 
-			genType const & v1, 
-			typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
+	//! Check if two vectors are similar.
+	//! From GLM_GTX_vector_query extensions.
+	template <typename genType> 
+	bool areSimilar(
+		genType const & v0, 
+		genType const & v1, 
+		typename genType::value_type const & epsilon = std::numeric_limits<typename genType::value_type>::epsilon());
 
-		///@}
+	///@}
 
-    }//namespace vector_query
-    }//namespace gtx
+}//namespace vector_query
+}//namespace gtx
 }//namespace glm
 
 #include "vector_query.inl"
diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp
index 951ea47f..28fd1d20 100644
--- a/glm/gtx/verbose_operator.hpp
+++ b/glm/gtx/verbose_operator.hpp
@@ -20,47 +20,41 @@
 #	pragma message("GLM: GLM_GTX_verbose_operator extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace verbose_operator ///< GLM_GTX_verbose_operator extension: Use words to replace operators
 {
-	namespace test{
-		void main_ext_gtx_verbose_operator();
-	}//namespace test
+	/// \addtogroup gtx_verbose_operator
+	///@{
 
-	namespace gtx{
-	//! GLM_GTX_verbose_operator extension: Use words to replace operators
-	namespace verbose_operator
-	{
-		/// \addtogroup gtx_verbose_operator
-		///@{
+	//! Addition of two values
+	//! From GLM_GTX_verbose_operator extension.
+	template <typename genTypeT, typename genTypeU> 
+	genTypeT add(genTypeT const & a, genTypeU const & b);
 
-		//! Addition of two values
-		//! From GLM_GTX_verbose_operator extension.
-		template <typename genTypeT, typename genTypeU> 
-		genTypeT add(genTypeT const & a, genTypeU const & b);
+	//! Substration of two values
+	//! From GLM_GTX_verbose_operator extension.
+	template <typename genTypeT, typename genTypeU> 
+	genTypeT sub(genTypeT const & a, genTypeU const & b);
 
-		//! Substration of two values
-		//! From GLM_GTX_verbose_operator extension.
-		template <typename genTypeT, typename genTypeU> 
-		genTypeT sub(genTypeT const & a, genTypeU const & b);
+	//! Multiplication of two values
+	//! From GLM_GTX_verbose_operator extension.
+	template <typename genTypeT, typename genTypeU> 
+	genTypeT mul(genTypeT const & a, genTypeU const & b);
 
-		//! Multiplication of two values
-		//! From GLM_GTX_verbose_operator extension.
-		template <typename genTypeT, typename genTypeU> 
-		genTypeT mul(genTypeT const & a, genTypeU const & b);
+	//! Division of two values
+	//! From GLM_GTX_verbose_operator extension.
+	template <typename genTypeT, typename genTypeU> 
+	genTypeT div(genTypeT const & a, genTypeU const & b);
 
-		//! Division of two values
-		//! From GLM_GTX_verbose_operator extension.
-		template <typename genTypeT, typename genTypeU> 
-		genTypeT div(genTypeT const & a, genTypeU const & b);
+	//! Multiplication and addition of three values
+	//! From GLM_GTX_verbose_operator extension.
+	template <typename genTypeT, typename genTypeU, typename genTypeV> 
+	genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c);
 
-		//! Multiplication and addition of three values
-		//! From GLM_GTX_verbose_operator extension.
-		template <typename genTypeT, typename genTypeU, typename genTypeV> 
-		genTypeT mad(genTypeT const & a, genTypeU const & b, genTypeV const & c);
-
-		///@}
-	}//namespace verbose_operator
-	}//namespace gtx
+	///@}
+}//namespace verbose_operator
+}//namespace gtx
 }//namespace glm
 
 #include "verbose_operator.inl"
diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp
index caac013c..41f439c8 100644
--- a/glm/gtx/wrap.hpp
+++ b/glm/gtx/wrap.hpp
@@ -20,38 +20,32 @@
 #	pragma message("GLM: GLM_GTX_wrap extension included")
 #endif
 
-namespace glm
+namespace glm{
+namespace gtx{
+namespace wrap ///< GLM_GTX_wrap: Wrapping mode using my texture samping.
 {
-	namespace test{
-		bool main_gtx_wrap();
-	}//namespace test
+	/// \addtogroup gtx_wrap
+	///@{
 
-	namespace gtx{
-	//! GLM_GTX_wrap: Wrapping mode using my texture samping.
-	namespace wrap
-	{
-		/// \addtogroup gtx_wrap
-		///@{
+	//! Simulate GL_CLAMP OpenGL wrap mode
+	//! From GLM_GTX_wrap extension.
+	template <typename genType> 
+	genType clamp(genType const & Texcoord);
 
-		//! Simulate GL_CLAMP OpenGL wrap mode
-		//! From GLM_GTX_wrap extension.
-		template <typename genType> 
-		genType clamp(genType const & Texcoord);
+	//! Simulate GL_REPEAT OpenGL wrap mode
+	//! From GLM_GTX_wrap extension.
+	template <typename genType> 
+	genType repeat(genType const & Texcoord);
 
-		//! Simulate GL_REPEAT OpenGL wrap mode
-		//! From GLM_GTX_wrap extension.
-		template <typename genType> 
-		genType repeat(genType const & Texcoord);
+	//! Simulate GL_MIRROR_REPEAT OpenGL wrap mode
+	//! From GLM_GTX_wrap extension.
+	template <typename genType> 
+	genType mirrorRepeat(genType const & Texcoord);
 
-		//! Simulate GL_MIRROR_REPEAT OpenGL wrap mode
-		//! From GLM_GTX_wrap extension.
-		template <typename genType> 
-		genType mirrorRepeat(genType const & Texcoord);
+	///@}
 
-		///@}
-
-	}//namespace wrap
-	}//namespace gtx
+}//namespace wrap
+}//namespace gtx
 }//namespace glm
 
 #include "wrap.inl"