diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 6107de4c..3b012912 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -483,7 +483,8 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Clip control
+// Clip control, define GLM_FORCE_DEPTH_ZERO_TO_ONE before including GLM
+// to use a clip space between 0 to 1.
 
 #define GLM_DEPTH_ZERO_TO_ONE				0x00000001
 #define GLM_DEPTH_NEGATIVE_ONE_TO_ONE		0x00000002
diff --git a/glm/ext.hpp b/glm/ext.hpp
index 5f1ae318..c91e8e64 100644
--- a/glm/ext.hpp
+++ b/glm/ext.hpp
@@ -36,7 +36,7 @@
 #include "./gtc/type_ptr.hpp"
 #include "./gtc/ulp.hpp"
 #include "./gtc/vec1.hpp"
-#if GLM_HAS_ANONYMOUS_STRUCT
+#if GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
 #	include "./gtc/type_aligned.hpp"
 #endif
 
diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl
index 173a71d3..1b1f4398 100644
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -799,7 +799,7 @@ namespace detail
 	}
 }//namespace glm
 
-#if (GLM_ARCH & GLM_ARCH_SIMD_BIT) && (GLM_HAS_ANONYMOUS_STRUCT)
+#if GLM_USE_SIMD == GLM_ENABLE
 #	include "quaternion_simd.inl"
 #endif
 
diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp
index a1b5efa9..ad0b49b3 100644
--- a/test/gtx/gtx_io.cpp
+++ b/test/gtx/gtx_io.cpp
@@ -20,7 +20,7 @@ namespace
 			case glm::highp:			os << "uhi"; break;
 			case glm::mediump:			os << "umd"; break;
 			case glm::lowp:				os << "ulo"; break;
-#			if GLM_HAS_ANONYMOUS_STRUCT
+#			if GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
 				case glm::aligned_highp:	os << "ahi"; break;
 				case glm::aligned_mediump:	os << "amd"; break;
 				case glm::aligned_lowp:		os << "alo"; break;