diff --git a/stepmania/src/NoteField.h b/stepmania/src/NoteField.h
index 9a7f3e0ee5..1c3d7c87f5 100644
--- a/stepmania/src/NoteField.h
+++ b/stepmania/src/NoteField.h
@@ -1,4 +1,4 @@
-/* NoteField - renders a NoteData */
+/* NoteField - An Actor that renders a NoteData. */
 
 #ifndef NOTE_FIELD_H
 #define NOTE_FIELD_H
diff --git a/stepmania/src/NoteSkinManager.h b/stepmania/src/NoteSkinManager.h
index 8061306c80..38829b20fd 100644
--- a/stepmania/src/NoteSkinManager.h
+++ b/stepmania/src/NoteSkinManager.h
@@ -1,5 +1,7 @@
-#ifndef NoteSkinMANAGER_H
-#define NoteSkinMANAGER_H
+/* NoteSkinManager - Loads note skins. */
+
+#ifndef NOTE_SKIN_MANAGER_H
+#define NOTE_SKIN_MANAGER_H
 
 #include "Command.h"
 #include "RageTypes.h"
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index 7463a4663e..b7538a9e27 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -1,3 +1,5 @@
+/* NoteTypes - Types for holding tap notes and scores. */
+
 #ifndef NOTE_TYPES_H
 #define NOTE_TYPES_H
 
diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h
index 16572d33c8..9d1b832379 100644
--- a/stepmania/src/NotesLoader.h
+++ b/stepmania/src/NotesLoader.h
@@ -1,3 +1,5 @@
+/* NotesLoader - Base class for step file loaders. */
+
 #ifndef NOTES_LOADER_H
 #define NOTES_LOADER_H
 
diff --git a/stepmania/src/NotesLoaderBMS.h b/stepmania/src/NotesLoaderBMS.h
index b97c6f2b7c..7cb629b61e 100644
--- a/stepmania/src/NotesLoaderBMS.h
+++ b/stepmania/src/NotesLoaderBMS.h
@@ -1,3 +1,5 @@
+/* KSFLoader - reads a Song from a set of .BMS files. */
+
 #ifndef NOTES_LOADER_BMS_H
 #define NOTES_LOADER_BMS_H
 
diff --git a/stepmania/src/NotesLoaderKSF.h b/stepmania/src/NotesLoaderKSF.h
index 926a3f6e1d..f3d6c3567a 100644
--- a/stepmania/src/NotesLoaderKSF.h
+++ b/stepmania/src/NotesLoaderKSF.h
@@ -1,4 +1,4 @@
-/* KSFLoader - reads a Song from a .KSF file. */
+/* KSFLoader - Reads a Song from a set of .KSF files. */
 
 #ifndef NOTES_LOADER_KSF_H
 #define NOTES_LOADER_KSF_H
diff --git a/stepmania/src/NotesWriterDWI.h b/stepmania/src/NotesWriterDWI.h
index 9787d6ac2a..e660b820ea 100644
--- a/stepmania/src/NotesWriterDWI.h
+++ b/stepmania/src/NotesWriterDWI.h
@@ -1,4 +1,4 @@
-/* NotesWriterDWI - writes a Song to a .DWI file. */
+/* NotesWriterDWI - Writes a Song to a .DWI file. */
 
 #ifndef NOTES_WRITER_DWI_H
 #define NOTES_WRITER_DWI_H
diff --git a/stepmania/src/NotesWriterSM.h b/stepmania/src/NotesWriterSM.h
index 5f050ccb26..57d8e6ee10 100644
--- a/stepmania/src/NotesWriterSM.h
+++ b/stepmania/src/NotesWriterSM.h
@@ -1,4 +1,4 @@
-/* NotesWriterSM - writes a Song to an .SM file. */
+/* NotesWriterSM - Writes a Song to an .SM file. */
 
 #ifndef NOTES_WRITER_SM_H
 #define NOTES_WRITER_SM_H
diff --git a/stepmania/src/OptionsCursor.h b/stepmania/src/OptionsCursor.h
index 673e57f90c..5ecc0b5c01 100644
--- a/stepmania/src/OptionsCursor.h
+++ b/stepmania/src/OptionsCursor.h
@@ -1,4 +1,4 @@
-/* OptionsCursor - cursor for ScreenOptions. */
+/* OptionsCursor - A cursor for ScreenOptions. */
 
 #ifndef OPTIONS_CURSOR_H
 #define OPTIONS_CURSOR_H
diff --git a/stepmania/src/PaneDisplay.h b/stepmania/src/PaneDisplay.h
index 6a4c7ffe31..c747413437 100644
--- a/stepmania/src/PaneDisplay.h
+++ b/stepmania/src/PaneDisplay.h
@@ -1,3 +1,5 @@
+/* PaneDisplay - An Actor that displays song information. */
+
 #ifndef PANE_DISPLAY_H
 #define PANE_DISPLAY_H
 
diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h
index 9357bca17c..31486c437d 100644
--- a/stepmania/src/PercentageDisplay.h
+++ b/stepmania/src/PercentageDisplay.h
@@ -1,3 +1,5 @@
+/* PercentageDisplay - An Actor that displays a percentage. */
+
 #ifndef PERCENTAGE_DISPLAY_H
 #define PERCENTAGE_DISPLAY_H
 
diff --git a/stepmania/src/PlayerAI.h b/stepmania/src/PlayerAI.h
index 930850a617..83d060b884 100644
--- a/stepmania/src/PlayerAI.h
+++ b/stepmania/src/PlayerAI.h
@@ -1,3 +1,5 @@
+/* PlayerAI - Chooses which notes the AI steps on. */
+
 #ifndef PlayerAI_H
 #define PlayerAI_H
 
diff --git a/stepmania/src/PlayerNumber.h b/stepmania/src/PlayerNumber.h
index ef0bc52e4b..8b9b7521e0 100644
--- a/stepmania/src/PlayerNumber.h
+++ b/stepmania/src/PlayerNumber.h
@@ -1,4 +1,4 @@
-/* PlayerNumber */
+/* PlayerNumber - A simple type representing a player. */
 
 #ifndef PlayerNumber_H
 #define PlayerNumber_H
diff --git a/stepmania/src/PlayerState.h b/stepmania/src/PlayerState.h
index bb778707ec..be9ae54ae3 100644
--- a/stepmania/src/PlayerState.h
+++ b/stepmania/src/PlayerState.h
@@ -1,4 +1,4 @@
-/* PlayerNumber */
+/* PlayerState - Holds per-player game state. */
 
 #ifndef PlayerState_H
 #define PlayerState_H
diff --git a/stepmania/src/ProfileManager.h b/stepmania/src/ProfileManager.h
index 092a513854..5b23bf0b5f 100644
--- a/stepmania/src/ProfileManager.h
+++ b/stepmania/src/ProfileManager.h
@@ -1,4 +1,4 @@
-/* ProfileManager -  Interface to profiles that exist on the machine or a memory card. */
+/* ProfileManager - Interface to machine and memory card profiles. */
 
 #ifndef ProfileManager_H
 #define ProfileManager_H