diff --git a/glm/ext.hpp b/glm/ext.hpp
index 5e34faa8..fa8f0d60 100644
--- a/glm/ext.hpp
+++ b/glm/ext.hpp
@@ -30,7 +30,6 @@
 #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/epsilon.hpp"
diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp
index deee0154..5251a13a 100644
--- a/glm/gtc/half_float.hpp
+++ b/glm/gtc/half_float.hpp
@@ -13,7 +13,7 @@
 // Dependency:
 #include "../glm.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_half_float extension included")
 #endif
 
diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp
index 720cb5c3..6114420a 100644
--- a/glm/gtc/matrix_access.hpp
+++ b/glm/gtc/matrix_access.hpp
@@ -16,7 +16,7 @@
 // Dependency:
 #include "../glm.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_matrix_access extension included")
 #endif
 
diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp
index fea7f6b7..3b68bedd 100644
--- a/glm/gtc/matrix_inverse.hpp
+++ b/glm/gtc/matrix_inverse.hpp
@@ -16,7 +16,7 @@
 // Dependency:
 #include "../glm.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_matrix_inverse extension included")
 #endif
 
diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp
index 38afec8c..8b6d82c9 100644
--- a/glm/gtc/matrix_transform.hpp
+++ b/glm/gtc/matrix_transform.hpp
@@ -17,7 +17,7 @@
 // Dependency:
 #include "../glm.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_matrix_transform extension included")
 #endif
 
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index a154cbe4..87b96991 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -22,7 +22,7 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_quaternion extension included")
 #endif
 
diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp
index 6d92aab8..5d265874 100644
--- a/glm/gtc/swizzle.hpp
+++ b/glm/gtc/swizzle.hpp
@@ -17,7 +17,7 @@
 #include "../glm.hpp"
 #include "../gtc/type_precision.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_swizzle extension included")
 #endif
 
diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp
index e9df0386..b1635d79 100644
--- a/glm/gtc/type_precision.hpp
+++ b/glm/gtc/type_precision.hpp
@@ -20,7 +20,7 @@
 #include "../gtc/half_float.hpp"
 #include "../gtc/quaternion.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_type_precision extension included")
 #endif
 
diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp
index dea3ba41..119538f8 100644
--- a/glm/gtc/type_ptr.hpp
+++ b/glm/gtc/type_ptr.hpp
@@ -16,7 +16,7 @@
 // Dependency:
 #include "../glm.hpp"
 
-#if(!defined(glm_ext))
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_type_ptr extension included")
 #endif
 
diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp
index 7ace09ac..61fb7d7c 100644
--- a/glm/gtx/associated_min_max.hpp
+++ b/glm/gtx/associated_min_max.hpp
@@ -17,6 +17,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_associated_min_max extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp
index 850b032b..644bd135 100644
--- a/glm/gtx/bit.hpp
+++ b/glm/gtx/bit.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_bit extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp
index 3888e9bf..cd0360cd 100644
--- a/glm/gtx/closest_point.hpp
+++ b/glm/gtx/closest_point.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_closest_point extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/color_cast.hpp b/glm/gtx/color_cast.hpp
index ada3484e..127e005c 100644
--- a/glm/gtx/color_cast.hpp
+++ b/glm/gtx/color_cast.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/number_precision.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_color_cast extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp
index 225dcf33..f776fbb6 100644
--- a/glm/gtx/color_space.hpp
+++ b/glm/gtx/color_space.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_color_space extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp
index a10c72da..8b1988da 100644
--- a/glm/gtx/color_space_YCoCg.hpp
+++ b/glm/gtx/color_space_YCoCg.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/comparison.hpp b/glm/gtx/comparison.hpp
deleted file mode 100644
index 6928e7b5..00000000
--- a/glm/gtx/comparison.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Created : 2008-06-22
-// Updated : 2008-10-27
-// Licence : This source is under MIT License
-// File    : glm/gtx/comparison.hpp
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Dependency:
-// - GLM core
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifndef glm_gtx_comparison
-#define glm_gtx_comparison
-
-// Dependency:
-#include "../glm.hpp"
-
-namespace glm
-{
-	namespace test{
-		void main_gtx_comparison();
-	}//namespace test
-
-	namespace gtx{
-	//! GLM_GTX_comparison extension: Defined comparison operators for vectors.
-	namespace comparison
-	{
-/*
-		//! Define == operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator== (
-			detail::tvec2<T> const & x, 
-			detail::tvec2<T> const & y);
-
-		//! Define == operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator== (
-			detail::tvec3<T> const & x, 
-			detail::tvec3<T> const & y);
-
-		//! Define == operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator== (
-			detail::tvec4<T> const & x, 
-			detail::tvec4<T> const & y);
-
-		//! Define != operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator!= (
-			detail::tvec2<T> const & x, 
-			detail::tvec2<T> const & y);
-
-		//! Define != operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator!= (
-			detail::tvec3<T> const & x, 
-			detail::tvec3<T> const & y);
-
-		//! Define != operator for vectors
-		//! From GLM_GTX_comparison extension.
-		template <typename T>
-		bool operator!= (
-			detail::tvec4<T> const & x, 
-			detail::tvec4<T> const & y);
-*/
-	}//namespace comparison
-	}//namespace gtx
-}//namespace glm
-
-#include "comparison.inl"
-
-using namespace glm::gtx::comparison;
-
-#endif//glm_gtx_comparison
diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp
index d8d5f5ba..ef2cb84d 100644
--- a/glm/gtx/compatibility.hpp
+++ b/glm/gtx/compatibility.hpp
@@ -18,12 +18,15 @@
 #include "../glm.hpp"  
 #include "../gtc/half_float.hpp"
 
-#ifdef GLM_COMPILER_VC
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_compatibility extension included")
+#endif
+
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 #include <cfloat>
-#endif
-#ifdef GLM_COMPILER_GCC
+#elif(GLM_COMPILER & GLM_COMPILER_GCC)
 #include <cmath>
-#endif
+#endif//GLM_COMPILER
 
 namespace glm
 {
diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp
index 45f79456..08db24d2 100644
--- a/glm/gtx/component_wise.hpp
+++ b/glm/gtx/component_wise.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_component_wise extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/epsilon.hpp b/glm/gtx/epsilon.hpp
index 90f19081..b482eb68 100644
--- a/glm/gtx/epsilon.hpp
+++ b/glm/gtx/epsilon.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_epsilon extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp
index cffc1627..3c41fd6c 100644
--- a/glm/gtx/euler_angles.hpp
+++ b/glm/gtx/euler_angles.hpp
@@ -22,6 +22,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_euler_angles extension included")
+#endif
+
 namespace glm
 {
     namespace gtx{
diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp
index ae5761a7..ca304c76 100644
--- a/glm/gtx/extend.hpp
+++ b/glm/gtx/extend.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_extend extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp
index 246f11ca..70e072c6 100644
--- a/glm/gtx/extented_min_max.hpp
+++ b/glm/gtx/extented_min_max.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_extented_min_max extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp
index 0a683db0..0c9a345d 100644
--- a/glm/gtx/fast_exponential.hpp
+++ b/glm/gtx/fast_exponential.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_fast_exponential extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp
index 70a37a0e..8f639c60 100644
--- a/glm/gtx/fast_square_root.hpp
+++ b/glm/gtx/fast_square_root.hpp
@@ -20,6 +20,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_fast_square_root extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp
index 99edb9c8..1ac459be 100644
--- a/glm/gtx/fast_trigonometry.hpp
+++ b/glm/gtx/fast_trigonometry.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp
index d7739975..c316afda 100644
--- a/glm/gtx/gradient_paint.hpp
+++ b/glm/gtx/gradient_paint.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/optimum_pow.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_gradient_paint extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp
index 0022aca3..b5b096f0 100644
--- a/glm/gtx/handed_coordinate_space.hpp
+++ b/glm/gtx/handed_coordinate_space.hpp
@@ -4,7 +4,7 @@
 // Created : 2005-12-21
 // Updated : 2009-02-19
 // Licence : This source is under MIT License
-// File    : glm/gtx/handed_coordinate_space.h
+// File    : glm/gtx/handed_coordinate_space.hpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Dependency:
 // - GLM core
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp
index 476e0b56..8fa5652a 100644
--- a/glm/gtx/inertia.hpp
+++ b/glm/gtx/inertia.hpp
@@ -4,7 +4,7 @@
 // Created : 2006-04-21
 // Updated : 2006-11-13
 // Licence : This source is under MIT License
-// File    : glm/gtx/inertia.h
+// File    : glm/gtx/inertia.hpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Dependency:
 // - GLM core
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_inertia extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp
index 2108d935..da3d6e0e 100644
--- a/glm/gtx/int_10_10_10_2.hpp
+++ b/glm/gtx/int_10_10_10_2.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/raw_data.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_int_10_10_10_2 extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp
index e0667853..9d459f86 100644
--- a/glm/gtx/integer.hpp
+++ b/glm/gtx/integer.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_integer extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp
index f7a5830c..5028691b 100644
--- a/glm/gtx/intersect.hpp
+++ b/glm/gtx/intersect.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/closest_point.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_closest_point extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp
index 585254d5..c3b63253 100644
--- a/glm/gtx/log_base.hpp
+++ b/glm/gtx/log_base.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_log_base extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp
index 88fa6db1..a575f175 100644
--- a/glm/gtx/matrix_cross_product.hpp
+++ b/glm/gtx/matrix_cross_product.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp
index 0a04be85..a4b32c4d 100644
--- a/glm/gtx/matrix_major_storage.hpp
+++ b/glm/gtx/matrix_major_storage.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp
index 00e72627..97ad3502 100644
--- a/glm/gtx/matrix_operation.hpp
+++ b/glm/gtx/matrix_operation.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_matrix_operation extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp
index 10648686..3994b3ed 100644
--- a/glm/gtx/matrix_query.hpp
+++ b/glm/gtx/matrix_query.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_matrix_query extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp
index 81cc2d0f..02799aa9 100644
--- a/glm/gtx/mixed_product.hpp
+++ b/glm/gtx/mixed_product.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_mixed_product extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp
index 83dec9a2..205fece6 100644
--- a/glm/gtx/multiple.hpp
+++ b/glm/gtx/multiple.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_multiple extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp
index 15094e11..764c607b 100644
--- a/glm/gtx/norm.hpp
+++ b/glm/gtx/norm.hpp
@@ -21,6 +21,10 @@
 #include "../glm.hpp"
 #include "../gtx/quaternion.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_norm extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp
index 8a0a9b1b..1a15526b 100644
--- a/glm/gtx/normal.hpp
+++ b/glm/gtx/normal.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_normal extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp
index 9a954144..4df8b9e6 100644
--- a/glm/gtx/normalize_dot.hpp
+++ b/glm/gtx/normalize_dot.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/fast_square_root.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_normalize_dot extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp
index 7f556e1a..4f8a8220 100644
--- a/glm/gtx/number_precision.hpp
+++ b/glm/gtx/number_precision.hpp
@@ -19,6 +19,10 @@
 #include "../glm.hpp"
 #include "../gtc/type_precision.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_number_precision extension included")
+#endif
+
 namespace glm{
 namespace gtx{
 //! GLM_GTX_number_precision extension: Defined size types.
diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp
index f6e883a5..4146dc86 100644
--- a/glm/gtx/ocl_type.hpp
+++ b/glm/gtx/ocl_type.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_ocl_type extension included")
+#endif
+
 namespace glm{
 namespace gtx{
 //! GLM_GTX_ocl_type extension: OpenCL types.
diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp
index bb972b04..e87e27a0 100644
--- a/glm/gtx/optimum_pow.hpp
+++ b/glm/gtx/optimum_pow.hpp
@@ -4,7 +4,7 @@
 // Created : 2005-12-21
 // Updated : 2006-11-13
 // Licence : This source is under MIT License
-// File    : glm/gtx/optimum_pow.h
+// File    : glm/gtx/optimum_pow.hpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Dependency:
 // - GLM core
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_optimum_pow extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp
index b6914fad..5c0a16d9 100644
--- a/glm/gtx/orthonormalize.hpp
+++ b/glm/gtx/orthonormalize.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_orthonormalize extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp
index aeb69bec..0bc59b7a 100644
--- a/glm/gtx/perpendicular.hpp
+++ b/glm/gtx/perpendicular.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/projection.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_perpendicular extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp
index fd4601c1..c23212c4 100644
--- a/glm/gtx/polar_coordinates.hpp
+++ b/glm/gtx/polar_coordinates.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_polar_coordinates extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp
index 7878c00d..192d36e1 100644
--- a/glm/gtx/projection.hpp
+++ b/glm/gtx/projection.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_projection extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp
index 0c7d8acc..aeab13ac 100644
--- a/glm/gtx/quaternion.hpp
+++ b/glm/gtx/quaternion.hpp
@@ -21,6 +21,10 @@
 #include "../glm.hpp"
 #include "../gtc/quaternion.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_quaternion extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/random.hpp b/glm/gtx/random.hpp
index 8d5c304c..b9cdbc18 100644
--- a/glm/gtx/random.hpp
+++ b/glm/gtx/random.hpp
@@ -19,6 +19,10 @@
 #include "../glm.hpp"
 #include "../gtc/half_float.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_random extension included")
+#endif
+
 namespace glm{
 namespace gtx{
 //! GLM_GTX_random extension: Generate random number from varius distribution methods
diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp
index f3cbc136..8cf8565e 100644
--- a/glm/gtx/raw_data.hpp
+++ b/glm/gtx/raw_data.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtc/type_precision.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_raw_data extension included")
+#endif
+
 namespace glm{
 namespace gtx
 {
diff --git a/glm/gtx/reciprocal.hpp b/glm/gtx/reciprocal.hpp
index 961c05a7..908723f1 100644
--- a/glm/gtx/reciprocal.hpp
+++ b/glm/gtx/reciprocal.hpp
@@ -13,6 +13,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_reciprocal extension included")
+#endif
+
 namespace glm
 {
    	namespace test{
diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp
index c0bfbd71..29ebd117 100644
--- a/glm/gtx/rotate_vector.hpp
+++ b/glm/gtx/rotate_vector.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/transform.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_rotate_vector extension included")
+#endif
+
 namespace glm
 {
 	namespace gtx{
diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp
index 3b2a892b..aa14943d 100644
--- a/glm/gtx/simd_mat4.hpp
+++ b/glm/gtx/simd_mat4.hpp
@@ -19,6 +19,10 @@
 #include "../core/intrinsic_matrix.hpp"
 #include "../gtx/simd_vec4.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_simd_mat4 extension included")
+#endif
+
 namespace glm
 {
 	namespace detail
diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp
index 9bbd8214..396b2728 100644
--- a/glm/gtx/simd_vec4.hpp
+++ b/glm/gtx/simd_vec4.hpp
@@ -19,6 +19,10 @@
 #include "../core/intrinsic_common.hpp"
 #include "../core/intrinsic_geometric.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_simd_vec4 extension included")
+#endif
+
 namespace glm
 {
 	namespace detail
diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp
index e2b3906f..ddcb20ea 100644
--- a/glm/gtx/spline.hpp
+++ b/glm/gtx/spline.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/optimum_pow.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_spline extension included")
+#endif
+
 namespace glm
 {
     namespace gtx{
diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp
index e1dd1b70..5d69dd53 100644
--- a/glm/gtx/std_based_type.hpp
+++ b/glm/gtx/std_based_type.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include <cstdlib>
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_std_based_type extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp
index 486db58c..0c99ed3a 100644
--- a/glm/gtx/string_cast.hpp
+++ b/glm/gtx/string_cast.hpp
@@ -24,6 +24,10 @@
 #include "../gtx/quaternion.hpp"
 #include <string>
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_string_cast extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp
index e835b457..be998e6b 100644
--- a/glm/gtx/transform.hpp
+++ b/glm/gtx/transform.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/matrix_transform.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_transform extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp
index 07b1819c..9f05976c 100644
--- a/glm/gtx/transform2.hpp
+++ b/glm/gtx/transform2.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/transform.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_transform2 extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/unsigned_int.hpp b/glm/gtx/unsigned_int.hpp
index 8e944e7e..5a4a69c5 100644
--- a/glm/gtx/unsigned_int.hpp
+++ b/glm/gtx/unsigned_int.hpp
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtx/integer.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_unsigned_int extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp
index 777c4b6f..409a67e9 100644
--- a/glm/gtx/vec1.hpp
+++ b/glm/gtx/vec1.hpp
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../core/type_vec1.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_vec1 extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp
index 59e0620a..cf587252 100644
--- a/glm/gtx/vector_access.hpp
+++ b/glm/gtx/vector_access.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_vector_access extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp
index d2b1d01f..12e5cd21 100644
--- a/glm/gtx/vector_angle.hpp
+++ b/glm/gtx/vector_angle.hpp
@@ -20,6 +20,10 @@
 #include "../gtx/quaternion.hpp"
 #include "../gtx/epsilon.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_vector_angle extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp
index 969e07ae..300bd4ea 100644
--- a/glm/gtx/vector_query.hpp
+++ b/glm/gtx/vector_query.hpp
@@ -18,6 +18,10 @@
 #include <cfloat>
 #include <limits>
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_vector_query extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp
index e908bcdf..833dd46e 100644
--- a/glm/gtx/verbose_operator.hpp
+++ b/glm/gtx/verbose_operator.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_verbose_operator extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp
index 89a74aab..dd37e87d 100644
--- a/glm/gtx/wrap.hpp
+++ b/glm/gtx/wrap.hpp
@@ -16,6 +16,10 @@
 // Dependency:
 #include "../glm.hpp"
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_wrap extension included")
+#endif
+
 namespace glm
 {
 	namespace test{
diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp
index 283263b6..b0b2f219 100644
--- a/glm/virtrev/xstream.hpp
+++ b/glm/virtrev/xstream.hpp
@@ -19,6 +19,10 @@
 #include "../gtc/matrix_access.hpp"
 #include <iostream>
 
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_VIRTREV_xstream extension included")
+#endif
+
 namespace glm
 {
 	namespace virtrev_glmext