diff --git a/include/osg/GLDefines b/include/osg/GLDefines
index 18af2d9af..1fb8be64a 100644
--- a/include/osg/GLDefines
+++ b/include/osg/GLDefines
@@ -178,27 +178,27 @@ typedef char GLchar;
 #endif
 
 // EXT_geometry_shader4
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT                       0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT_EXT                 0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT                   0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT                  0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT      0x8C29
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT       0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT         0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT                0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT       0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT          0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT  0x8DE1
-#define GL_LINES_ADJACENCY_EXT                       0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT                  0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT                   0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT              0x000D
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT  0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT    0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT        0x8DA7
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT  0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT                    0x8642
+#ifndef GL_VERSION_3_2
+#define GL_GEOMETRY_SHADER                       0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT                 0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE                   0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE                  0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS      0x8C29
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS       0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS         0x8DDE
+#define GL_MAX_VARYING_COMPONENTS                0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS       0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES          0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS  0x8DE1
+#define GL_LINES_ADJACENCY                       0x000A
+#define GL_LINE_STRIP_ADJACENCY                  0x000B
+#define GL_TRIANGLES_ADJACENCY                   0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY              0x000D
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS  0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT    0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED        0x8DA7
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER  0x8CD4
+#define GL_PROGRAM_POINT_SIZE                    0x8642
 #endif
 
 // ARB_tessellation_shader
diff --git a/include/osg/PrimitiveSet b/include/osg/PrimitiveSet
index df7df534d..81794f1bd 100644
--- a/include/osg/PrimitiveSet
+++ b/include/osg/PrimitiveSet
@@ -189,10 +189,10 @@ class OSG_EXPORT PrimitiveSet : public BufferData
             QUADS = GL_QUADS,
             QUAD_STRIP = GL_QUAD_STRIP,
             POLYGON = GL_POLYGON,
-            LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT,
-            LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT,
-            TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT,
-            TRIANGLE_STRIP_ADJACENCY = GL_TRIANGLE_STRIP_ADJACENCY_EXT,
+            LINES_ADJACENCY = GL_LINES_ADJACENCY,
+            LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY,
+            TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY,
+            TRIANGLE_STRIP_ADJACENCY = GL_TRIANGLE_STRIP_ADJACENCY,
             PATCHES = GL_PATCHES
         };
 
diff --git a/src/osgDB/ObjectWrapper.cpp b/src/osgDB/ObjectWrapper.cpp
index d95fb456d..203611228 100644
--- a/src/osgDB/ObjectWrapper.cpp
+++ b/src/osgDB/ObjectWrapper.cpp
@@ -624,10 +624,14 @@ ObjectWrapperManager::ObjectWrapperManager()
     primitiveTable.add( "GL_QUADS", GL_QUADS );
     primitiveTable.add( "GL_QUAD_STRIP", GL_QUAD_STRIP );
     primitiveTable.add( "GL_POLYGON", GL_POLYGON );
-    primitiveTable.add( "GL_LINES_ADJACENCY_EXT", GL_LINES_ADJACENCY_EXT );
-    primitiveTable.add( "GL_LINE_STRIP_ADJACENCY_EXT", GL_LINE_STRIP_ADJACENCY_EXT );
-    primitiveTable.add( "GL_TRIANGLES_ADJACENCY_EXT", GL_TRIANGLES_ADJACENCY_EXT );
-    primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY_EXT", GL_TRIANGLE_STRIP_ADJACENCY_EXT );
+    primitiveTable.add( "GL_LINES_ADJACENCY_EXT", GL_LINES_ADJACENCY );
+    primitiveTable.add( "GL_LINE_STRIP_ADJACENCY_EXT", GL_LINE_STRIP_ADJACENCY );
+    primitiveTable.add( "GL_TRIANGLES_ADJACENCY_EXT", GL_TRIANGLES_ADJACENCY );
+    primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY_EXT", GL_TRIANGLE_STRIP_ADJACENCY );
+    primitiveTable.add( "GL_LINES_ADJACENCY", GL_LINES_ADJACENCY );
+    primitiveTable.add( "GL_LINE_STRIP_ADJACENCY", GL_LINE_STRIP_ADJACENCY );
+    primitiveTable.add( "GL_TRIANGLES_ADJACENCY", GL_TRIANGLES_ADJACENCY );
+    primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY", GL_TRIANGLE_STRIP_ADJACENCY );
     primitiveTable.add( "GL_PATCHES", GL_PATCHES );
 }