diff --git a/auto/Makefile b/auto/Makefile
index 02f2eb9..734919c 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -26,11 +26,11 @@ ifeq (custom,$(MAKECMDGOALS))
 GL_EXT_SPEC := $(shell grep "^[ \t]*GL_" custom.txt | grep -v GL_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;')
 WGL_EXT_SPEC := $(shell grep "^[ \t]*WGL_" custom.txt | sed -e 's/\(.*\)/$(EXT)\/\1/g;')
 #GLX_CORE_SPEC := $(shell grep GLX_VERSION custom.txt | sed -e 's/\(.*\)/$(CORE)\/\1/g;')
-GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | sed -e 's/\(.*\)/$(EXT)\/\1/g;')
+GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | grep -v GLX_OML_sync_control | sed -e 's/\(.*\)/$(EXT)\/\1/g;')
 else
 GL_EXT_SPEC := $(EXT)/GL_*
 WGL_EXT_SPEC := $(EXT)/WGL_*
-GLX_EXT_SPEC := $(EXT)/GLX_*
+GLX_EXT_SPEC := $(shell echo $(EXT)/GLX_* | grep -v GLX_OML_sync_control)
 endif
 
 PARSE_SPEC = parse_spec.pl
diff --git a/auto/bin/make_init.pl b/auto/bin/make_init.pl
index 61b3386..5427ea1 100755
--- a/auto/bin/make_init.pl
+++ b/auto/bin/make_init.pl
@@ -38,7 +38,7 @@ if (@ARGV)
 			parse_ext($ext);
 
 		#make_separator($extname);
-		#print "#ifdef $extname\n\n";
+		print "#ifdef $extname\n\n";
 		my $extvar = $extname;
 		my $extvardef = $extname;
 		$extvar =~ s/GL(X*)_/GL$1EW_/;
@@ -50,6 +50,6 @@ if (@ARGV)
 			print "\n  return r;\n}\n\n";
 		}
 		#print "\nGLboolean " . prefix_varname($extvar) . " = GL_FALSE;\n\n";
-		#print "#endif /* $extname */\n\n";
+		print "#endif /* $extname */\n\n";
 	}
 }
diff --git a/auto/src/glew_head.c b/auto/src/glew_head.c
index e15b040..7d0502d 100644
--- a/auto/src/glew_head.c
+++ b/auto/src/glew_head.c
@@ -121,7 +121,7 @@ GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
   return i == n ? GL_TRUE : GL_FALSE;
 }
 
-GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
 {
   if(*na >= nb)
   {
diff --git a/auto/src/glew_utils.c b/auto/src/glew_utils.c
index f56e689..6d5a182 100644
--- a/auto/src/glew_utils.c
+++ b/auto/src/glew_utils.c
@@ -108,7 +108,7 @@ GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
   return i == n ? GL_TRUE : GL_FALSE;
 }
 
-GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
 {
   if(*na >= nb)
   {
diff --git a/auto/src/glew_utils.h b/auto/src/glew_utils.h
index e7f95ff..08e4a57 100644
--- a/auto/src/glew_utils.h
+++ b/auto/src/glew_utils.h
@@ -94,7 +94,7 @@
 extern GLuint _glewStrLen (const GLubyte* s);
 extern GLuint _glewStrCLen (const GLubyte* s, GLubyte c);
 extern GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n);
-extern GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb);
+extern GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb);
 extern GLboolean _glewStrSame3 (const GLubyte* a, GLuint na, const GLubyte* b, GLuint nb);
 
 #endif /* __glew_utils_h__ */