Commits

yotis committed 468e7cf

Flattened gl_... headers includes

  • Participants
  • Parent commits c287c3b

Comments (0)

Files changed (36)

File generator/include_proto/glxx/gl_1_2.h

 #ifndef GLXX_1_2
 #define GLXX_1_2
 
-#include "gl_1_1.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
 #include "private/gl_version_1_2.h"
 #include "private/gl_version_1_2_deprecated.h"
 
 namespace gl_1_2
 {
-    using namespace gl_1_1;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
     using namespace gl_version_1_2;
     using namespace gl_version_1_2_deprecated;
 }

File generator/include_proto/glxx/gl_1_3.h

 #ifndef GLXX_1_3
 #define GLXX_1_3
 
-#include "gl_1_2.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
 #include "private/gl_version_1_3.h"
 #include "private/gl_version_1_3_deprecated.h"
 
 namespace gl_1_3
 {
-    using namespace gl_1_2;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
     using namespace gl_version_1_3;
     using namespace gl_version_1_3_deprecated;
 }

File generator/include_proto/glxx/gl_1_4.h

 #ifndef GLXX_1_4
 #define GLXX_1_4
 
-#include "gl_1_3.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
 #include "private/gl_version_1_4.h"
 #include "private/gl_version_1_4_deprecated.h"
 
 namespace gl_1_4
 {
-    using namespace gl_1_3;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
     using namespace gl_version_1_4;
     using namespace gl_version_1_4_deprecated;
 }

File generator/include_proto/glxx/gl_1_5.h

 #ifndef GLXX_1_5
 #define GLXX_1_5
 
-#include "gl_1_4.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
 #include "private/gl_version_1_5.h"
 #include "private/gl_version_1_5_deprecated.h"
 
 namespace gl_1_5
 {
-    using namespace gl_1_4;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
     using namespace gl_version_1_5;
 }
 

File generator/include_proto/glxx/gl_2_0.h

 #ifndef GLXX_2_0
 #define GLXX_2_0
 
-#include "gl_1_5.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
 #include "private/gl_version_2_0.h"
 #include "private/gl_version_2_0_deprecated.h"
 
 namespace gl_2_0
 {
-    using namespace gl_1_5;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
     using namespace gl_version_2_0;
 }
 

File generator/include_proto/glxx/gl_2_1.h

 #ifndef GLXX_2_1
 #define GLXX_2_1
 
-#include "gl_2_0.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
 #include "private/gl_version_2_1.h"
 #include "private/gl_version_2_1_deprecated.h"
 
 namespace gl_2_1
 {
-    using namespace gl_2_0;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
     using namespace gl_version_2_1;
 }
 

File generator/include_proto/glxx/gl_3_0.h

 #ifndef GLXX_3_0
 #define GLXX_3_0
 
-#include "gl_2_1.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
 #include "private/gl_version_3_0.h"
 #include "private/gl_version_3_0_deprecated.h"
 
 namespace gl_3_0
 {
-    using namespace gl_2_1;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
     using namespace gl_version_3_0;
 }
 

File generator/include_proto/glxx/gl_3_1_compatibility.h

 #ifndef GLXX_3_1_COMPATIBILITY
 #define GLXX_3_1_COMPATIBILITY
 
-#include "gl_3_0.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
 #include "private/gl_version_3_1.h"
 
 namespace gl_3_1_compatibility
 {
-    using namespace gl_3_0;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
     using namespace gl_version_3_1;
 }
 

File generator/include_proto/glxx/gl_3_2_compatibility.h

 #ifndef GLXX_3_2_COMPATIBILITY
 #define GLXX_3_2_COMPATIBILITY
 
-#include "gl_3_1_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
 #include "private/gl_version_3_2.h"
 
 namespace gl_3_2_compatibility
 {
-    using namespace gl_3_1_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
     using namespace gl_version_3_2;
 }
 

File generator/include_proto/glxx/gl_3_2_core.h

 #ifndef GLXX_3_2_CORE
 #define GLXX_3_2_CORE
 
-#include "gl_3_1_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
 #include "private/gl_version_3_2.h"
 
 namespace gl_3_2_core
 {
-    using namespace gl_3_1_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
     using namespace gl_version_3_2;
 }
 

File generator/include_proto/glxx/gl_3_3_compatibility.h

 #ifndef GLXX_3_3_COMPATIBILITY
 #define GLXX_3_3_COMPATIBILITY
 
-#include "gl_3_2_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
 #include "private/gl_version_3_3.h"
 
 namespace gl_3_3_compatibility
 {
-    using namespace gl_3_2_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
     using namespace gl_version_3_3;
 }
 

File generator/include_proto/glxx/gl_3_3_core.h

 #ifndef GLXX_3_3_CORE
 #define GLXX_3_3_CORE
 
-#include "gl_3_2_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
 #include "private/gl_version_3_3.h"
 
 namespace gl_3_3_core
 {
-    using namespace gl_3_2_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
     using namespace gl_version_3_3;
 }
 

File generator/include_proto/glxx/gl_4_0_compatibility.h

 #ifndef GLXX_4_0_COMPATIBILITY
 #define GLXX_4_0_COMPATIBILITY
 
-#include "gl_3_3_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
 #include "private/gl_version_4_0.h"
 
 namespace gl_4_0_compatibility
 {
-    using namespace gl_3_3_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
     using namespace gl_version_4_0;
 }
 

File generator/include_proto/glxx/gl_4_0_core.h

 #ifndef GLXX_4_0_CORE
 #define GLXX_4_0_CORE
 
-#include "gl_3_3_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
 #include "private/gl_version_4_0.h"
 
 namespace gl_4_0_core
 {
-    using namespace gl_3_3_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
     using namespace gl_version_4_0;
 }
 

File generator/include_proto/glxx/gl_4_1_compatibility.h

 #ifndef GLXX_4_1_COMPATIBILITY
 #define GLXX_4_1_COMPATIBILITY
 
-#include "gl_4_0_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
 #include "private/gl_version_4_1.h"
 
 namespace gl_4_1_compatibility
 {
-    using namespace gl_4_0_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
     using namespace gl_version_4_1;
 }
 

File generator/include_proto/glxx/gl_4_1_core.h

 #ifndef GLXX_4_1_CORE
 #define GLXX_4_1_CORE
 
-#include "gl_4_0_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
 #include "private/gl_version_4_1.h"
 
 namespace gl_4_1_core
 {
-    using namespace gl_4_0_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
     using namespace gl_version_4_1;
 }
 

File generator/include_proto/glxx/gl_4_2_compatibility.h

 #ifndef GLXX_4_2_COMPATIBILITY
 #define GLXX_4_2_COMPATIBILITY
 
-#include "gl_4_1_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
+#include "private/gl_version_4_1.h"
 #include "private/gl_version_4_2.h"
 
 namespace gl_4_2_compatibility
 {
-    using namespace gl_4_1_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
+    using namespace gl_version_4_1;
     using namespace gl_version_4_2;
 }
 

File generator/include_proto/glxx/gl_4_2_core.h

 #ifndef GLXX_4_2_CORE
 #define GLXX_4_2_CORE
 
-#include "gl_4_1_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
+#include "private/gl_version_4_1.h"
 #include "private/gl_version_4_2.h"
 
 namespace gl_4_2_core
 {
-    using namespace gl_4_1_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
+    using namespace gl_version_4_1;
     using namespace gl_version_4_2;
 }
 

File include/glxx/gl_1_2.h

 #ifndef GLXX_1_2
 #define GLXX_1_2
 
-#include "gl_1_1.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
 #include "private/gl_version_1_2.h"
 #include "private/gl_version_1_2_deprecated.h"
 
 namespace gl_1_2
 {
-    using namespace gl_1_1;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
     using namespace gl_version_1_2;
     using namespace gl_version_1_2_deprecated;
 }

File include/glxx/gl_1_3.h

 #ifndef GLXX_1_3
 #define GLXX_1_3
 
-#include "gl_1_2.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
 #include "private/gl_version_1_3.h"
 #include "private/gl_version_1_3_deprecated.h"
 
 namespace gl_1_3
 {
-    using namespace gl_1_2;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
     using namespace gl_version_1_3;
     using namespace gl_version_1_3_deprecated;
 }

File include/glxx/gl_1_4.h

 #ifndef GLXX_1_4
 #define GLXX_1_4
 
-#include "gl_1_3.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
 #include "private/gl_version_1_4.h"
 #include "private/gl_version_1_4_deprecated.h"
 
 namespace gl_1_4
 {
-    using namespace gl_1_3;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
     using namespace gl_version_1_4;
     using namespace gl_version_1_4_deprecated;
 }

File include/glxx/gl_1_5.h

 #ifndef GLXX_1_5
 #define GLXX_1_5
 
-#include "gl_1_4.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
 #include "private/gl_version_1_5.h"
 #include "private/gl_version_1_5_deprecated.h"
 
 namespace gl_1_5
 {
-    using namespace gl_1_4;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
     using namespace gl_version_1_5;
 }
 

File include/glxx/gl_2_0.h

 #ifndef GLXX_2_0
 #define GLXX_2_0
 
-#include "gl_1_5.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
 #include "private/gl_version_2_0.h"
 #include "private/gl_version_2_0_deprecated.h"
 
 namespace gl_2_0
 {
-    using namespace gl_1_5;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
     using namespace gl_version_2_0;
 }
 

File include/glxx/gl_2_1.h

 #ifndef GLXX_2_1
 #define GLXX_2_1
 
-#include "gl_2_0.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
 #include "private/gl_version_2_1.h"
 #include "private/gl_version_2_1_deprecated.h"
 
 namespace gl_2_1
 {
-    using namespace gl_2_0;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
     using namespace gl_version_2_1;
 }
 

File include/glxx/gl_3_0.h

 #ifndef GLXX_3_0
 #define GLXX_3_0
 
-#include "gl_2_1.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
 #include "private/gl_version_3_0.h"
 #include "private/gl_version_3_0_deprecated.h"
 
 namespace gl_3_0
 {
-    using namespace gl_2_1;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
     using namespace gl_version_3_0;
 }
 

File include/glxx/gl_3_1_compatibility.h

 #ifndef GLXX_3_1_COMPATIBILITY
 #define GLXX_3_1_COMPATIBILITY
 
-#include "gl_3_0.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
 #include "private/gl_version_3_1.h"
 
 namespace gl_3_1_compatibility
 {
-    using namespace gl_3_0;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
     using namespace gl_version_3_1;
 }
 

File include/glxx/gl_3_2_compatibility.h

 #ifndef GLXX_3_2_COMPATIBILITY
 #define GLXX_3_2_COMPATIBILITY
 
-#include "gl_3_1_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
 #include "private/gl_version_3_2.h"
 
 namespace gl_3_2_compatibility
 {
-    using namespace gl_3_1_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
     using namespace gl_version_3_2;
 }
 

File include/glxx/gl_3_2_core.h

 #ifndef GLXX_3_2_CORE
 #define GLXX_3_2_CORE
 
-#include "gl_3_1_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
 #include "private/gl_version_3_2.h"
 
 namespace gl_3_2_core
 {
-    using namespace gl_3_1_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
     using namespace gl_version_3_2;
 }
 

File include/glxx/gl_3_3_compatibility.h

 #ifndef GLXX_3_3_COMPATIBILITY
 #define GLXX_3_3_COMPATIBILITY
 
-#include "gl_3_2_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
 #include "private/gl_version_3_3.h"
 
 namespace gl_3_3_compatibility
 {
-    using namespace gl_3_2_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
     using namespace gl_version_3_3;
 }
 

File include/glxx/gl_3_3_core.h

 #ifndef GLXX_3_3_CORE
 #define GLXX_3_3_CORE
 
-#include "gl_3_2_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
 #include "private/gl_version_3_3.h"
 
 namespace gl_3_3_core
 {
-    using namespace gl_3_2_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
     using namespace gl_version_3_3;
 }
 

File include/glxx/gl_4_0_compatibility.h

 #ifndef GLXX_4_0_COMPATIBILITY
 #define GLXX_4_0_COMPATIBILITY
 
-#include "gl_3_3_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
 #include "private/gl_version_4_0.h"
 
 namespace gl_4_0_compatibility
 {
-    using namespace gl_3_3_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
     using namespace gl_version_4_0;
 }
 

File include/glxx/gl_4_0_core.h

 #ifndef GLXX_4_0_CORE
 #define GLXX_4_0_CORE
 
-#include "gl_3_3_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
 #include "private/gl_version_4_0.h"
 
 namespace gl_4_0_core
 {
-    using namespace gl_3_3_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
     using namespace gl_version_4_0;
 }
 

File include/glxx/gl_4_1_compatibility.h

 #ifndef GLXX_4_1_COMPATIBILITY
 #define GLXX_4_1_COMPATIBILITY
 
-#include "gl_4_0_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
 #include "private/gl_version_4_1.h"
 
 namespace gl_4_1_compatibility
 {
-    using namespace gl_4_0_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
     using namespace gl_version_4_1;
 }
 

File include/glxx/gl_4_1_core.h

 #ifndef GLXX_4_1_CORE
 #define GLXX_4_1_CORE
 
-#include "gl_4_0_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
 #include "private/gl_version_4_1.h"
 
 namespace gl_4_1_core
 {
-    using namespace gl_4_0_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
     using namespace gl_version_4_1;
 }
 

File include/glxx/gl_4_2_compatibility.h

 #ifndef GLXX_4_2_COMPATIBILITY
 #define GLXX_4_2_COMPATIBILITY
 
-#include "gl_4_1_compatibility.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_1_deprecated.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_2_deprecated.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_3_deprecated.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_4_deprecated.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_1_5_deprecated.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_0_deprecated.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_2_1_deprecated.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_0_deprecated.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
+#include "private/gl_version_4_1.h"
 #include "private/gl_version_4_2.h"
 
 namespace gl_4_2_compatibility
 {
-    using namespace gl_4_1_compatibility;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_1_deprecated;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_2_deprecated;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_3_deprecated;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_4_deprecated;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
+    using namespace gl_version_4_1;
     using namespace gl_version_4_2;
 }
 

File include/glxx/gl_4_2_core.h

 #ifndef GLXX_4_2_CORE
 #define GLXX_4_2_CORE
 
-#include "gl_4_1_core.h"
+#include "private/gl_version_1_1.h"
+#include "private/gl_version_1_2.h"
+#include "private/gl_version_1_3.h"
+#include "private/gl_version_1_4.h"
+#include "private/gl_version_1_5.h"
+#include "private/gl_version_2_0.h"
+#include "private/gl_version_2_1.h"
+#include "private/gl_version_3_0.h"
+#include "private/gl_version_3_1.h"
+#include "private/gl_version_3_2.h"
+#include "private/gl_version_3_3.h"
+#include "private/gl_version_4_0.h"
+#include "private/gl_version_4_1.h"
 #include "private/gl_version_4_2.h"
 
 namespace gl_4_2_core
 {
-    using namespace gl_4_1_core;
+    using namespace gl_version_1_1;
+    using namespace gl_version_1_2;
+    using namespace gl_version_1_3;
+    using namespace gl_version_1_4;
+    using namespace gl_version_1_5;
+    using namespace gl_version_2_0;
+    using namespace gl_version_2_1;
+    using namespace gl_version_3_0;
+    using namespace gl_version_3_1;
+    using namespace gl_version_3_2;
+    using namespace gl_version_3_3;
+    using namespace gl_version_4_0;
+    using namespace gl_version_4_1;
     using namespace gl_version_4_2;
 }