3 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/pipe/softpipe/sp_headers.h b/src/mesa/pipe/softpipe/sp_headers.h
index 561597d9e2..82f03ec078 100644
--- a/src/mesa/pipe/softpipe/sp_headers.h
+++ b/src/mesa/pipe/softpipe/sp_headers.h
@@ -27,8 +27,10 @@
 
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
-#ifndef G_HEADERS_H
-#define G_HEADERS_H
+
+#ifndef SP_HEADERS_H
+#define SP_HEADERS_H
+
 
 #define PRIM_POINT 1
 #define PRIM_LINE  2
@@ -89,7 +91,4 @@ struct quad_header {
 };
 
 
-
-
-
-#endif
+#endif /* SP_HEADERS_H */
diff --git a/src/mesa/pipe/softpipe/sp_quad.h b/src/mesa/pipe/softpipe/sp_quad.h
index 351cd4d323..79f52721a3 100644
--- a/src/mesa/pipe/softpipe/sp_quad.h
+++ b/src/mesa/pipe/softpipe/sp_quad.h
@@ -27,8 +27,10 @@
 
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
-#ifndef G_TILE_H
-#define G_TILE_H
+
+#ifndef SP_TILE_H
+#define SP_TILE_H
+
 
 struct softpipe_context;
 struct quad_header;
@@ -44,14 +46,13 @@ struct quad_stage {
 };
 
 
-
 struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_alpha_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_depth_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_blend_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_output_stage( struct softpipe_context *softpipe );
 
-void
-sp_build_quad_pipeline(struct softpipe_context *sp);
+void sp_build_quad_pipeline(struct softpipe_context *sp);
+
 
-#endif
+#endif /* SP_TILE_H */
diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/mesa/pipe/softpipe/sp_surface.h
index 05b125d17b..ac66ffe891 100644
--- a/src/mesa/pipe/softpipe/sp_surface.h
+++ b/src/mesa/pipe/softpipe/sp_surface.h
@@ -28,8 +28,8 @@
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#ifndef G_SURFACE_H
-#define G_SURFACE_H
+#ifndef SP_SURFACE_H
+#define SP_SURFACE_H
 
 #include "glheader.h"
 #include "sp_headers.h"
@@ -93,4 +93,4 @@ softpipe_surface(struct pipe_surface *ps)
 }
 
 
-#endif
+#endif /* SP_SURFACE_H */