diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp
index 0395e23b..9fbb93ec 100644
--- a/glm/core/dummy.cpp
+++ b/glm/core/dummy.cpp
@@ -1,3 +1,6 @@
+#include "../glm.hpp"
+#include "../ext.hpp"
+
 int main()
 {
 
diff --git a/glm/ext.hpp b/glm/ext.hpp
index 20bd110e..f59d7bec 100644
--- a/glm/ext.hpp
+++ b/glm/ext.hpp
@@ -18,17 +18,17 @@
 #include "gtc/matrix_transform.hpp"
 #include "gtc/quaternion.hpp"
 #include "gtc/swizzle.hpp"
+#include "gtc/type_precision.hpp"
 
-//#include "./gtx/array_range.hpp"
 #include "./gtx/associated_min_max.hpp"
 #include "./gtx/bit.hpp"
 #include "./gtx/closest_point.hpp"
 #include "./gtx/color_cast.hpp"
 #include "./gtx/color_space.hpp"
 #include "./gtx/color_space_YCoCg.hpp"
+#include "./gtx/comparison.hpp"
 #include "./gtx/compatibility.hpp"
 #include "./gtx/component_wise.hpp"
-//#include "./gtx/complex.hpp"
 #include "./gtx/determinant.hpp"
 #include "./gtx/double_float.hpp"
 #include "./gtx/epsilon.hpp"
@@ -38,8 +38,6 @@
 #include "./gtx/fast_exponential.hpp"
 #include "./gtx/fast_square_root.hpp"
 #include "./gtx/fast_trigonometry.hpp"
-//#include "./gtx/flexible_mix.hpp"
-//#include "./gtx/gpu_shader4.hpp"
 #include "./gtx/gradient_paint.hpp"
 #include "./gtx/half_float.hpp"
 #include "./gtx/handed_coordinate_space.hpp"
@@ -48,11 +46,11 @@
 #include "./gtx/intersect.hpp"
 #include "./gtx/inverse.hpp"
 #include "./gtx/inverse_transpose.hpp"
-//#include "./gtx/mat_mn.hpp"
 #include "./gtx/log_base.hpp"
 #include "./gtx/matrix_access.hpp"
 #include "./gtx/matrix_cross_product.hpp"
 #include "./gtx/matrix_major_storage.hpp"
+#include "./gtx/matrix_operation.hpp"
 #include "./gtx/matrix_projection.hpp"
 #include "./gtx/matrix_query.hpp"
 #include "./gtx/matrix_selection.hpp"
@@ -62,6 +60,7 @@
 #include "./gtx/normal.hpp"
 #include "./gtx/normalize_dot.hpp"
 #include "./gtx/number_precision.hpp"
+#include "./gtx/ocl_type.hpp"
 #include "./gtx/optimum_pow.hpp"
 #include "./gtx/orthonormalize.hpp"
 #include "./gtx/perpendicular.hpp"
@@ -90,7 +89,6 @@
 
 #include "./virtrev/address.hpp"
 #include "./virtrev/equal_operator.hpp"
-#include "./virtrev/xstream.hpp"
 
 //const float goldenRatio = 1.618033988749894848f;
 //const float pi = 3.141592653589793238f;
diff --git a/glm/virtrev/address.hpp b/glm/virtrev/address.hpp
index 8977088b..c64071a5 100644
--- a/glm/virtrev/address.hpp
+++ b/glm/virtrev/address.hpp
@@ -183,10 +183,7 @@ namespace glm
 	}
 }
 
-#define GLM_VIRTREV_address namespace virtrev_glmext::address
-#ifndef GLM_VIRTREV_GLOBAL
-namespace glm {using GLM_VIRTREV_address;}
-#endif//GLM_VIRTREV_GLOBAL
+namespace glm{using namespace virtrev_glmext::address;}
 
 #endif//GLM_EXT_VIRTREV_ADDRESS_HPP
 
diff --git a/glm/virtrev/equal_operator.hpp b/glm/virtrev/equal_operator.hpp
index ae106664..a6aaef3f 100644
--- a/glm/virtrev/equal_operator.hpp
+++ b/glm/virtrev/equal_operator.hpp
@@ -62,7 +62,7 @@ namespace glm
 	}
 }
 
-namespace glm {namespace virtrev_glmext::equal_operator;}
+namespace glm {using namespace virtrev_glmext::equal_operator;}
 
 #endif//glm_virtrev_equal_operator
 
diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp
index 8141f36f..de5e37b0 100644
--- a/glm/virtrev/xstream.hpp
+++ b/glm/virtrev/xstream.hpp
@@ -139,9 +139,6 @@ namespace glm
 	}
 }
 
-#define GLM_VIRTREV_xstream namespace glm::virtrev_glmext::xstream
-#ifndef GLM_VIRTREV_GLOBAL
-namespace glm {using GLM_VIRTREV_xstream;}
-#endif//GLM_VIRTREV_GLOBAL
+namespace glm{using namespace glm::virtrev_glmext::xstream;}
 
-#endif
+#endif//GLM_EXT_VIRTREV_XSTREAM_HPP