diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 8284db5e..9f42d01f 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -585,7 +585,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_USE_ALIGNED_GENTYPES GLM_ENABLE
 #else
 #	define GLM_USE_ALIGNED_GENTYPES GLM_DISABLE
diff --git a/glm/gtc/type_aligned.hpp b/glm/gtc/type_aligned.hpp
index 6d9f11dd..b42ffcf5 100644
--- a/glm/gtc/type_aligned.hpp
+++ b/glm/gtc/type_aligned.hpp
@@ -13,7 +13,7 @@
 #pragma once
 
 #if !GLM_USE_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/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 67e5db85..d348953b 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_USE_ALIGNED_GENTYPES == GLM_ENABLE
diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp
index d8ae8696..f3634232 100644
--- a/test/gtx/gtx_load.cpp
+++ b/test/gtx/gtx_load.cpp
@@ -1,4 +1,3 @@
-#define GLM_FORCE_ALIGNED_GENTYPES
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
 /*