diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 3d938783..ac444b42 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -597,7 +597,7 @@ namespace glm
 ///////////////////////////////////////////////////////////////////////////////////
 // Configure the use of aligned gentypes
 
-#if defined(GLM_FORCE_ALIGNED_GENTYPES) && GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
+#if GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
 #	define GLM_CONFIG_ALIGNED_GENTYPES GLM_ENABLE
 #else
 #	define GLM_CONFIG_ALIGNED_GENTYPES GLM_DISABLE
diff --git a/glm/gtc/type_aligned.hpp b/glm/gtc/type_aligned.hpp
index c2b90b3a..ccb7b6b0 100644
--- a/glm/gtc/type_aligned.hpp
+++ b/glm/gtc/type_aligned.hpp
@@ -13,7 +13,7 @@
 #pragma once
 
 #if !GLM_CONFIG_ANONYMOUS_STRUCT
-#	error "GLM: Aligned gentypes require to enable C++ language extensions and to define GLM_FORCE_ALIGNED_GENTYPES before including GLM headers."
+#	error "GLM: Aligned gentypes require to enable C++ language extensions."
 #endif
 
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
diff --git a/manual.md b/manual.md
index 8f33a6ae..f4c82e7e 100644
--- a/manual.md
+++ b/manual.md
@@ -78,7 +78,7 @@
 + [9.4. Tutorials using GLM](#section9_4)
 + [9.5. Equivalent for other languages](#section9_5)
 + [9.6. Alternatives to GLM](#section9_6)
-+ [9.8. Acknowledgements](#section9_8)
++ [9.7. Acknowledgements](#section9_7)
 
 ---
 ## <a name="section0"></a> Licenses
diff --git a/test/core/core_force_aligned_gentypes.cpp b/test/core/core_force_aligned_gentypes.cpp
index 068d7efa..70713c4b 100644
--- a/test/core/core_force_aligned_gentypes.cpp
+++ b/test/core/core_force_aligned_gentypes.cpp
@@ -1,5 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
-
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 
diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp
index e3e9dca3..4449b5c7 100644
--- a/test/gtc/gtc_type_aligned.cpp
+++ b/test/gtc/gtc_type_aligned.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #include <glm/glm.hpp>
 
 #if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp
index 35f9d7e7..94e36442 100644
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,13 +1,19 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #define GLM_ENABLE_EXPERIMENTAL
+#include <glm/glm.hpp>
+/*
+#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
+
 #include <glm/gtx/common.hpp>
 #include <glm/gtc/integer.hpp>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/type_aligned.hpp>
 #include <glm/ext/vector_relational.hpp>
+<<<<<<< HEAD
 #include <glm/glm.hpp>
 /*
 #if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
+=======
+>>>>>>> b4a2eb14070b391370d94b0165681387ff37dc9c
 
 namespace glm
 {