diff --git a/auto/Makefile b/auto/Makefile
index 734919c..a261ad9 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -30,7 +30,7 @@ GLX_EXT_SPEC := $(shell grep "^[ \t]*GLX_" custom.txt | grep -v GLX_VERSION | gr
 else
 GL_EXT_SPEC := $(EXT)/GL_*
 WGL_EXT_SPEC := $(EXT)/WGL_*
-GLX_EXT_SPEC := $(shell echo $(EXT)/GLX_* | grep -v GLX_OML_sync_control)
+GLX_EXT_SPEC := $(EXT)/GLX_*
 endif
 
 PARSE_SPEC = parse_spec.pl
diff --git a/auto/bin/make_info.pl b/auto/bin/make_info.pl
index c48241f..c26c163 100755
--- a/auto/bin/make_info.pl
+++ b/auto/bin/make_info.pl
@@ -40,7 +40,7 @@ if (@ARGV)
 		$extpre = lc $extpre;
 
 		#make_separator($extname);
-		#print "#ifdef $extname\n\n";
+		print "#ifdef $extname\n\n";
 		print "static void _glewInfo_$extname (void)\n{\n";
 		if ($extvar =~ /VERSION/)
 		{
@@ -53,6 +53,6 @@ if (@ARGV)
 		}
 		output_decls($functions, \&make_pfn_info);
 		print "}\n\n";
-		#print "#endif /* $extname */\n\n";
+		print "#endif /* $extname */\n\n";
 	}
 }
diff --git a/auto/bin/make_list.pl b/auto/bin/make_list.pl
index eb8c58b..16b2ff7 100755
--- a/auto/bin/make_list.pl
+++ b/auto/bin/make_list.pl
@@ -42,7 +42,7 @@ if (@ARGV)
 
 		#my $pextvar = prefix_varname($extvar);
 
-		#print "#ifdef $extname\n";
+		print "#ifdef $extname\n";
 		print "  " . $extvar . " = " . $extpre . "GetExtension(\"$extname\");\n";
 		if (keys %$functions)
 		{
@@ -55,7 +55,7 @@ if (@ARGV)
 				print "  if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n";
 			}
 		}
-		#print "#endif /* $extname */\n";
+		print "#endif /* $extname */\n";
 	}
 
 }
diff --git a/auto/bin/make_str.pl b/auto/bin/make_str.pl
index 81c7957..f29e8d5 100755
--- a/auto/bin/make_str.pl
+++ b/auto/bin/make_str.pl
@@ -41,8 +41,10 @@ if (@ARGV)
 			print "    {\n";
 			$curexttype = $exttype;
 		}
+		print "#ifdef $extname\n";
 		print "      if (_glewStrSame3(pos, len, (const GLubyte*)\"$extrem\", ". length($extrem) . "))\n";
 		print "        return $extvar;\n";
+		print "#endif\n";
 	}
 
 	print "    }\n";