diff --git a/stepmania/src/ScreenInputOptions.h b/stepmania/src/ScreenInputOptions.h
index 16f986bc8c..4d75f4896f 100644
--- a/stepmania/src/ScreenInputOptions.h
+++ b/stepmania/src/ScreenInputOptions.h
@@ -9,14 +9,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "Screen.h"
 #include "ScreenOptions.h"
-#include "Sprite.h"
-#include "BitmapText.h"
-#include "RandomSample.h"
-#include "TransitionFade.h"
-#include "Quad.h"
-
 
 class ScreenInputOptions : public ScreenOptions
 {
diff --git a/stepmania/src/ScreenMachineOptions.h b/stepmania/src/ScreenMachineOptions.h
index bbfbcde0dd..b6c9e734af 100644
--- a/stepmania/src/ScreenMachineOptions.h
+++ b/stepmania/src/ScreenMachineOptions.h
@@ -8,15 +8,10 @@
 	Chris Danford
 -----------------------------------------------------------------------------
 */
+#ifndef SCREEN_MACHINE_OPTIONS_H
+#define SCREEN_MACHINE_OPTIONS_H
 
-#include "Screen.h"
 #include "ScreenOptions.h"
-#include "Sprite.h"
-#include "BitmapText.h"
-#include "RandomSample.h"
-#include "TransitionFade.h"
-#include "Quad.h"
-
 
 class ScreenMachineOptions : public ScreenOptions
 {
@@ -30,3 +25,5 @@ private:
 	void GoToNextState();
 	void GoToPrevState();
 };
+
+#endif
\ No newline at end of file
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index 97f8171758..3c31722812 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -29,4 +29,4 @@ private:
 
 
 
-#endif 
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/stepmania/src/ScreenSelectStyle.h b/stepmania/src/ScreenSelectStyle.h
index d48d5f9605..363ad8b22b 100644
--- a/stepmania/src/ScreenSelectStyle.h
+++ b/stepmania/src/ScreenSelectStyle.h
@@ -9,13 +9,13 @@
 -----------------------------------------------------------------------------
 */
 
+#ifndef SCREEN_SELECT_STYLE_H
+#define SCREEN_SELECT_STYLE_H
+
 #include "Screen.h"
 #include "Sprite.h"
-#include "BitmapText.h"
 #include "TransitionFade.h"
-#include "Quad.h"
 #include "RandomSample.h"
-#include "Quad.h"
 #include "MenuElements.h"
 
 
@@ -63,4 +63,4 @@ private:
 	Style	GetSelectedStyle() { return m_aPossibleStyles[m_iSelection]; };
 };
 
-
+#endif