diff --git a/stepmania/src/RadarValues.h b/stepmania/src/RadarValues.h
index e9589330f4..864483d1e0 100644
--- a/stepmania/src/RadarValues.h
+++ b/stepmania/src/RadarValues.h
@@ -1,5 +1,4 @@
-/* This is just cached song data.  Not all of it may actually be displayed
- * in the radar. */
+/* RadarValues - Cached song statistics. */
 
 #ifndef RARAR_VALUES_H
 #define RARAR_VALUES_H
diff --git a/stepmania/src/RageBitmapTexture.h b/stepmania/src/RageBitmapTexture.h
index bb6a177a3c..49356c7351 100644
--- a/stepmania/src/RageBitmapTexture.h
+++ b/stepmania/src/RageBitmapTexture.h
@@ -1,4 +1,4 @@
-/* RageBitmapTexture: Holder for a static texture with metadata. */
+/* RageBitmapTexture - Loads a static texture. */
 
 #ifndef RAGEBITMAPTEXTURE_H
 #define RAGEBITMAPTEXTURE_H
diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h
index 471e9a898f..a2669815e5 100644
--- a/stepmania/src/RageDisplay.h
+++ b/stepmania/src/RageDisplay.h
@@ -1,6 +1,4 @@
-/*
- * RageDisplay: Methods common to all RageDisplays
- */
+/* RageDisplay - Renderer base class. */
 
 #ifndef RAGEDISPLAY_H
 #define RAGEDISPLAY_H
diff --git a/stepmania/src/RageDisplay_Null.h b/stepmania/src/RageDisplay_Null.h
index 0fd867d2c4..c9e6e02113 100644
--- a/stepmania/src/RageDisplay_Null.h
+++ b/stepmania/src/RageDisplay_Null.h
@@ -1,4 +1,4 @@
-/* RageDisplay_Null: diagnostic display device */
+/* RageDisplay_Null - No-op diagnostic renderer. */
 
 #ifndef RAGEDISPLAY_NULL_H
 #define RAGEDISPLAY_NULL_H
diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h
index 9b8df3fef1..b9c6044c5b 100644
--- a/stepmania/src/RageDisplay_OGL.h
+++ b/stepmania/src/RageDisplay_OGL.h
@@ -1,4 +1,4 @@
-/* RageDisplay_OGL: OpenGL display implementation */
+/* RageDisplay_OGL: OpenGL renderer. */
 
 #ifndef RAGEDISPLAY_OGL_H
 #define RAGEDISPLAY_OGL_H
diff --git a/stepmania/src/RageDisplay_OGL_Extensions.h b/stepmania/src/RageDisplay_OGL_Extensions.h
index 474db4ff21..792a225fef 100644
--- a/stepmania/src/RageDisplay_OGL_Extensions.h
+++ b/stepmania/src/RageDisplay_OGL_Extensions.h
@@ -1,3 +1,5 @@
+/* RageDisplay_OGL_Extensions - OpenGL extension helpers. */
+
 #ifndef RAGE_DISPLAY_OGL_EXTENSIONS_H
 #define RAGE_DISPLAY_OGL_EXTENSIONS_H
 
diff --git a/stepmania/src/RageException.h b/stepmania/src/RageException.h
index df69718745..0efcf03cdb 100644
--- a/stepmania/src/RageException.h
+++ b/stepmania/src/RageException.h
@@ -1,9 +1,7 @@
-/*
- * RageException: Class for thowing fatal error exceptions
- */
+/* RageException - Class for thowing fatal errors. */
 
-#ifndef RAGEEXCEPTION_H
-#define RAGEEXCEPTION_H
+#ifndef RAGE_EXCEPTION_H
+#define RAGE_EXCEPTION_H
 
 namespace RageException
 {
diff --git a/stepmania/src/RageFileDriverDirect.h b/stepmania/src/RageFileDriverDirect.h
index 96b5fba3ea..a8c772c78e 100644
--- a/stepmania/src/RageFileDriverDirect.h
+++ b/stepmania/src/RageFileDriverDirect.h
@@ -1,3 +1,5 @@
+/* RageFileDriverDirect - File driver for accessing a regular filesystem. */
+
 #ifndef RAGE_FILE_DRIVER_DIRECT_H
 #define RAGE_FILE_DRIVER_DIRECT_H
 
diff --git a/stepmania/src/RageFileDriverDirectHelpers.h b/stepmania/src/RageFileDriverDirectHelpers.h
index e54cbc48b2..6e39eaf6b4 100644
--- a/stepmania/src/RageFileDriverDirectHelpers.h
+++ b/stepmania/src/RageFileDriverDirectHelpers.h
@@ -1,4 +1,4 @@
-/* Internal helper functions for RageFileDriverDirect. */
+/* RageFileDriverDirectHelpers - Internal helpers for RageFileDriverDirect. */
 
 #ifndef RAGE_FILE_DRIVER_DIRECT_HELPERS_H
 #define RAGE_FILE_DRIVER_DIRECT_HELPERS_H