Index: /trunk/nv/lib/detail/gl_core/gl_types_1_1.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_1_1.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_1_1.inc	(revision 465)
@@ -1,2 +1,4 @@
+#ifndef NV_LIB_GL_TYPES_1_1_INC
+#define NV_LIB_GL_TYPES_1_1_INC
 /* OpenGL 1.0 non-deprecated types/enums */
 typedef void GLvoid;
@@ -218,2 +220,3 @@
 #define GL_RGBA16                         0x805B
 #define GL_VERTEX_ARRAY                   0x8074
+#endif // NV_LIB_GL_TYPES_1_1_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_1_2.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_1_2.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_1_2.inc	(revision 465)
@@ -1,2 +1,4 @@
+#ifndef NV_LIB_GL_TYPES_1_2_INC
+#define NV_LIB_GL_TYPES_1_2_INC
 /* OpenGL 1.2 non-deprecated types/enums */
 #include <nv/lib/detail/gl_core/gl_types_1_1.inc>
@@ -37,2 +39,3 @@
 #define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
 #define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif // NV_LIB_GL_TYPES_1_2_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_1_3.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_1_3.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_1_3.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 1.3 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_1_3_INC
+#define NV_LIB_GL_TYPES_1_3_INC
 #include <nv/lib/detail/gl_core/gl_types_1_2.inc>
 #define GL_TEXTURE0                       0x84C0
@@ -60,2 +62,3 @@
 #define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
 #define GL_CLAMP_TO_BORDER                0x812D
+#endif // NV_LIB_GL_TYPES_1_3_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_1_4.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_1_4.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_1_4.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 1.4 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_1_4_INC
+#define NV_LIB_GL_TYPES_1_4_INC
 #include <nv/lib/detail/gl_core/gl_types_1_3.inc>
 #define GL_BLEND_DST_RGB                  0x80C8
@@ -26,2 +28,3 @@
 #define GL_CONSTANT_ALPHA                 0x8003
 #define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#endif // NV_LIB_GL_TYPES_1_4_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_1_5.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_1_5.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_1_5.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 1.5 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_1_5_INC
+#define NV_LIB_GL_TYPES_1_5_INC
 #include <nv/lib/detail/gl_core/gl_types_1_4.inc>
 typedef ptrdiff_t GLsizeiptr;
@@ -31,2 +33,3 @@
 #define GL_SAMPLES_PASSED                 0x8914
 #define GL_SRC1_ALPHA                     0x8589
+#endif // NV_LIB_GL_TYPES_1_3_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_2_0.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_2_0.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_2_0.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 2.0 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_2_0_INC
+#define NV_LIB_GL_TYPES_2_0_INC
 #include <nv/lib/detail/gl_core/gl_types_1_5.inc>
 typedef char GLchar;
@@ -86,2 +88,3 @@
 #define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
 #define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif // NV_LIB_GL_TYPES_2_0_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_2_1.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_2_1.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_2_1.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 2.1 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_2_1_INC
+#define NV_LIB_GL_TYPES_2_1_INC
 #include <nv/lib/detail/gl_core/gl_types_2_0.inc>
 #define GL_PIXEL_PACK_BUFFER              0x88EB
@@ -17,2 +19,3 @@
 #define GL_COMPRESSED_SRGB                0x8C48
 #define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#endif // NV_LIB_GL_TYPES_2_1_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_3_0.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_3_0.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_3_0.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 3.0 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_3_0_INC
+#define NV_LIB_GL_TYPES_3_0_INC
 #include <nv/lib/detail/gl_core/gl_types_2_1.inc>
 typedef unsigned short GLhalf;
@@ -233,2 +235,3 @@
 #define GL_RG32UI                         0x823C
 #define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif // NV_LIB_GL_TYPES_3_0_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_3_1.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_3_1.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_3_1.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 3.1 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_3_1_INC
+#define NV_LIB_GL_TYPES_3_1_INC
 #include <nv/lib/detail/gl_core/gl_types_3_0.inc>
 #define GL_SAMPLER_2D_RECT                0x8B63
@@ -62,2 +64,3 @@
 #define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
 #define GL_INVALID_INDEX                  0xFFFFFFFFu
+#endif // NV_LIB_GL_TYPES_3_1_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_3_2.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_3_2.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_3_2.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 3.2 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_3_2_INC
+#define NV_LIB_GL_TYPES_3_2_INC
 #include <nv/lib/detail/gl_core/gl_types_3_1.inc>
 typedef struct __GLsync *GLsync;
@@ -68,2 +70,3 @@
 #define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
 #define GL_MAX_INTEGER_SAMPLES            0x9110
+#endif // NV_LIB_GL_TYPES_3_2_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_3_3.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_3_3.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_3_3.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 3.3 non-deprecated types/enums */
+#ifndef NV_LIB_GL_TYPES_3_3_INC
+#define NV_LIB_GL_TYPES_3_3_INC
 #include <nv/lib/detail/gl_core/gl_types_3_2.inc>
 #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
@@ -17,2 +19,3 @@
 #define GL_TIMESTAMP                      0x8E28
 #define GL_INT_2_10_10_10_REV             0x8D9F
+#endif // NV_LIB_GL_TYPES_3_3_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_0.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_0.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_0.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.0 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_0_INC
+#define NV_LIB_GL_TYPES_4_0_INC
 #include <nv/lib/detail/gl_core/gl_types_3_3.inc>
 #define GL_SAMPLE_SHADING                 0x8C36
@@ -78,2 +80,3 @@
 #define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
 #define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+#endif // NV_LIB_GL_TYPES_4_0_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_1.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_1.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_1.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.1 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_1_INC
+#define NV_LIB_GL_TYPES_4_1_INC
 #include <nv/lib/detail/gl_core/gl_types_4_0.inc>
 #define GL_FIXED                          0x140C
@@ -36,2 +38,3 @@
 #define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
 #define GL_UNDEFINED_VERTEX               0x8260
+#endif // NV_LIB_GL_TYPES_4_1_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_2.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_2.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_2.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.2 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_2_INC
+#define NV_LIB_GL_TYPES_4_2_INC
 #include <nv/lib/detail/gl_core/gl_types_4_1.inc>
 #define GL_COPY_READ_BUFFER_BINDING       0x8F36
@@ -113,2 +115,3 @@
 #define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
 #define GL_TEXTURE_IMMUTABLE_FORMAT       0x912F
+#endif // NV_LIB_GL_TYPES_4_2_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_3.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_3.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_3.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.3 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_3_INC
+#define NV_LIB_GL_TYPES_4_3_INC
 #include <nv/lib/detail/gl_core/gl_types_4_2.inc>
 typedef void (APIENTRY  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
@@ -260,2 +262,3 @@
 #define GL_MAX_VERTEX_ATTRIB_BINDINGS     0x82DA
 #define GL_VERTEX_BINDING_BUFFER          0x8F4F
+#endif // NV_LIB_GL_TYPES_4_3_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_4.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_4.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_4.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.4 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_4_INC
+#define NV_LIB_GL_TYPES_4_4_INC
 #include <nv/lib/detail/gl_core/gl_types_4_3.inc>
 #define GL_MAX_VERTEX_ATTRIB_STRIDE       0x82E5
@@ -20,2 +22,3 @@
 #define GL_QUERY_RESULT_NO_WAIT           0x9194
 #define GL_MIRROR_CLAMP_TO_EDGE           0x8743
+#endif // NV_LIB_GL_TYPES_4_4_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_4_5.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_4_5.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_4_5.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* OpenGL 4.5 types/enums */
+#ifndef NV_LIB_GL_TYPES_4_5_INC
+#define NV_LIB_GL_TYPES_4_5_INC
 #include <nv/lib/detail/gl_core/gl_types_4_4.inc>
 #define GL_CONTEXT_LOST                   0x0507
@@ -23,2 +25,3 @@
 #define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
 #define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
+#endif // NV_LIB_GL_TYPES_4_5_INC
Index: /trunk/nv/lib/detail/gl_core/gl_types_arb.inc
===================================================================
--- /trunk/nv/lib/detail/gl_core/gl_types_arb.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_core/gl_types_arb.inc	(revision 465)
@@ -1,3 +1,5 @@
 /* GL_ARB_bindless_texture */
+#ifndef NV_LIB_GL_TYPES_ARB_INC
+#define NV_LIB_GL_TYPES_ARB_INC
 typedef uint64_t GLuint64EXT;
 #define GL_UNSIGNED_INT64_ARB             0x140F
@@ -158,2 +160,3 @@
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
 #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+#endif // NV_LIB_GL_TYPES_ARB_INC
Index: /trunk/nv/lib/detail/gl_ext/gl_ext_framebuffer_object_types.inc
===================================================================
--- /trunk/nv/lib/detail/gl_ext/gl_ext_framebuffer_object_types.inc	(revision 464)
+++ /trunk/nv/lib/detail/gl_ext/gl_ext_framebuffer_object_types.inc	(revision 465)
@@ -41,5 +41,5 @@
 #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
 #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS     0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS 0x8CDA
 #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER    0x8CDB
 #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER    0x8CDC
Index: /trunk/nv/lib/gl.hh
===================================================================
--- /trunk/nv/lib/gl.hh	(revision 464)
+++ /trunk/nv/lib/gl.hh	(revision 465)
@@ -53,10 +53,9 @@
 #define GL_GENERATE_MIPMAP                0x8191
 
-#include <nv/lib/detail/gl_core/gl_types_2_1.inc>
-#include <nv/lib/detail/gl_types.inc>
+#include <nv/lib/detail/gl_core/gl_types_3_1.inc>
 #if NV_PLATFORM == NV_WINDOWS
 #include <nv/lib/detail/wgl_types.inc>
 #endif
-#include <nv/lib/detail/gl_ext/gl_ext_all_types.inc>
+//#include <nv/lib/detail/gl_ext/gl_ext_all_types.inc>
 
 #if defined(NV_GL_DYNAMIC)
@@ -68,9 +67,9 @@
 #define NV_GL_FUN_EXT NV_GL_FUN
 
-#include <nv/lib/detail/gl_core/gl_functions_2_1.inc>
+#include <nv/lib/detail/gl_core/gl_functions_3_1.inc>
 #if NV_PLATFORM == NV_WINDOWS
 #include <nv/lib/detail/wgl_functions.inc>
 #endif
-#include <nv/lib/detail/gl_ext/gl_ext_all_functions.inc>
+//#include <nv/lib/detail/gl_ext/gl_ext_all_functions.inc>
 
 #undef NV_GL_FUN_REN