diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 7ca4b9056b..621c3ff3d3 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -11,16 +11,10 @@
 */
 
 #include "ScreenPlayerOptions.h"
-#include "RageTextureManager.h"
 #include "RageUtil.h"
-#include "RageMusic.h"
 #include "ScreenManager.h"
-#include "GameConstantsAndTypes.h"
-#include "PrefsManager.h"
 #include "RageLog.h"
-#include "GameManager.h"
 #include "GameState.h"
-#include "RageSound.h"
 
 
 enum {
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index b9d121cf89..97f8171758 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -7,18 +7,11 @@
  Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
 -----------------------------------------------------------------------------
 */
-#ifndef _WINDOWPLAYEROPTIONS_H_
-#define _WINDOWPLAYEROPTIONS_H_
+#ifndef SCREEN_PLAYER_OPTIONS_H
+#define SCREEN_PLAYER_OPTIONS_H
 
 
-#include "Screen.h"
 #include "ScreenOptions.h"
-#include "Sprite.h"
-#include "BitmapText.h"
-#include "RandomSample.h"
-#include "TransitionFade.h"
-#include "Quad.h"
-
 
 
 class ScreenPlayerOptions : public ScreenOptions
diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h
index cd775c4d89..5f4cf13fd4 100644
--- a/stepmania/src/ScreenSongOptions.h
+++ b/stepmania/src/ScreenSongOptions.h
@@ -7,20 +7,10 @@
  Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
 -----------------------------------------------------------------------------
 */
-#ifndef _ScreenSongOptions_H_
-#define _ScreenSongOptions_H_
+#ifndef SCREEN_SONG_OPTIONS_H
+#define SCREEN_SONG_OPTIONS_H
 
-
-
-#include "Screen.h"
 #include "ScreenOptions.h"
-#include "Sprite.h"
-#include "BitmapText.h"
-#include "RandomSample.h"
-#include "TransitionFade.h"
-#include "Quad.h"
-
-
 
 class ScreenSongOptions : public ScreenOptions
 {
@@ -35,8 +25,4 @@ private:
 	void GoToPrevState();
 };
 
-
-
-
-
 #endif
\ No newline at end of file