diff --git a/src/mesa/shader/shaderobjects.h b/src/mesa/shader/shaderobjects.h
index e5bed02ebcf..7cea462aeed 100644
--- a/src/mesa/shader/shaderobjects.h
+++ b/src/mesa/shader/shaderobjects.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
  * Copyright (C) 2004-2005  Brian Paul   All Rights Reserved.
  *
@@ -27,10 +27,6 @@
 
 #include "mtypes.h"
 
-/**
- ** XXX do these gl2 structs really neeed to be here?
- **/
-
 /**
  * gl2 unique interface identifier.
  * Each gl2 interface has its own interface id used for object queries.
@@ -237,14 +233,13 @@ extern void GLAPIENTRY
 _mesa_GetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
 
 extern GLint GLAPIENTRY
-_mesa_GetAttribLocationARB (GLhandleARB, const GLcharARB *);
-
-#endif
+_mesa_GetAttribLocationARB (GLhandleARB, const GLcharARB *);
 
-extern void
+#endif /* FEATURE_ARB_vertex_shader */
+
+extern void
 _mesa_init_shaderobjects (GLcontext *ctx);
 
-#endif
+#endif /* FEATURE_ARB_shader_objects */
 
-#endif
-
+#endif /* SHADEROBJECTS_H */