diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index 1b8e37dfeb..5210a46d44 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -1,14 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- File: BPMDisplay.h
-
- Desc: A graphic displayed in the BPMDisplay during Dancing.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
------------------------------------------------------------------------------
-*/
-
 #include "BPMDisplay.h"
 #include "RageUtil.h"
 #include "GameConstantsAndTypes.h"
diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp
index 3ee80510b3..57b5e38aa3 100644
--- a/stepmania/src/RageBitmapTexture.cpp
+++ b/stepmania/src/RageBitmapTexture.cpp
@@ -34,9 +34,6 @@ static void GetResolutionFromFileName( CString sPath, int &Width, int &Height )
 	Height = atoi(matches[1].c_str());
 }
 
-//-----------------------------------------------------------------------------
-// RageBitmapTexture constructor
-//-----------------------------------------------------------------------------
 RageBitmapTexture::RageBitmapTexture( RageTextureID name ) :
 	RageTexture( name )
 {
@@ -345,4 +342,3 @@ void RageBitmapTexture::Destroy()
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */ 
-
diff --git a/stepmania/src/RageTexture.h b/stepmania/src/RageTexture.h
index a95d7136e5..2122058ff5 100644
--- a/stepmania/src/RageTexture.h
+++ b/stepmania/src/RageTexture.h
@@ -1,6 +1,4 @@
-/*
- *  RageTexture - Abstract class for a texture and metadata.
- */
+/* RageTexture - Abstract class for a texture and metadata.  */
 
 #ifndef RAGE_TEXTURE_H
 #define RAGE_TEXTURE_H
@@ -8,10 +6,6 @@
 #include "RageTypes.h"
 #include "RageTextureID.h"
 
-
-//-----------------------------------------------------------------------------
-// RageTexture Class Declarations
-//-----------------------------------------------------------------------------
 class RageTexture
 {
 public:
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index 6ac276e6b3..2efb7efa29 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -1,15 +1,10 @@
-/*
- * RageUtil - Miscellaneous helper macros and functions.
- */
+/* RageUtil - Miscellaneous helper macros and functions.  */
 
 #ifndef RAGEUTIL_H
 #define RAGEUTIL_H
 
 #include <map>
 
-//-----------------------------------------------------------------------------
-// SAFE_ Macros
-//-----------------------------------------------------------------------------
 #define SAFE_DELETE(p)       { if(p) { delete (p);     (p)=NULL; } }
 #define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p);   (p)=NULL; } }
 #define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
@@ -72,11 +67,6 @@ inline void wrap( float &x, float n)
 }
 
 
-
-//-----------------------------------------------------------------------------
-// Misc helper functions
-//-----------------------------------------------------------------------------
-
 // Fast random number generators
 // Taken from "Numerical Recipes in C"
 
diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 5edefcbf2a..c3e1fb8a09 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -1,15 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- Class: ScreenDemonstration
-
- Desc: See header.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
------------------------------------------------------------------------------
-*/
-
 #include "ScreenDemonstration.h"
 #include "RageLog.h"
 #include "ThemeManager.h"
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 6bdb3309e2..417fbd484c 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1,15 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- Class: ScreenEdit
-
- Desc: See header.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
------------------------------------------------------------------------------
-*/
-
 #include "ScreenEdit.h"
 #include "PrefsManager.h"
 #include "SongManager.h"
diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp
index 0709b125d2..ab4264e324 100644
--- a/stepmania/src/ScreenGameOver.cpp
+++ b/stepmania/src/ScreenGameOver.cpp
@@ -1,15 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- Class: ScreenGameOver
-
- Desc: See header.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
------------------------------------------------------------------------------
-*/
-
 #include "ScreenGameOver.h"
 #include "ScreenManager.h"
 #include "AnnouncerManager.h"
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 8c64ff0f12..e1af05e5a8 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -1,15 +1,11 @@
-#include "global.h"
 /*
  * Area for testing.  Throw whatever you're working on in here.  If you
  * don't want stuff in here to be wiped out by the next guy who works on something,
  * make a separate screen and add a hook into ScreenTest; this one's just a
  * scratchpad.
- *
- * Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
- * (there is no actual code here)
------------------------------------------------------------------------------
-*/
+ */
 
+#include "global.h"
 #include "ScreenSandbox.h"
 #include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp
index b3bfd75706..2bc08f0752 100644
--- a/stepmania/src/ScreenTest.cpp
+++ b/stepmania/src/ScreenTest.cpp
@@ -1,15 +1,3 @@
-#include "global.h"
-/*
------------------------------------------------------------------------------
- File: ScreenTest.h
-
- Desc: Area for testing.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford, Glenn Maynard, Lance Gilbert
------------------------------------------------------------------------------
-*/
-
 #include "global.h"
 #include "ScreenTest.h"
 #include "ScreenSandbox.h"
diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp
index f4856b76fe..597b2a778a 100644
--- a/stepmania/src/ScreenTestSound.cpp
+++ b/stepmania/src/ScreenTestSound.cpp
@@ -1,17 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- File: ScreenTestSound.h
-
- Desc: Area for testing.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Glenn Maynard
------------------------------------------------------------------------------
-*/
-
-#include "global.h"
-
 #include "ScreenTestSound.h"
 #include "RageDisplay.h"
 #include "SDL.h"
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 86121306e3..dd25f48be1 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -1,15 +1,4 @@
 #include "global.h"
-/*
------------------------------------------------------------------------------
- Class: ScreenTextEntry
-
- Desc: See header.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
------------------------------------------------------------------------------
-*/
-
 #include "ScreenTextEntry.h"
 #include "PrefsManager.h"
 #include "ScreenManager.h"