diff --git a/stepmania/src/RageDisplay_Null.cpp b/stepmania/src/RageDisplay_Null.cpp
index 66eebb34bf..2e507dff1a 100644
--- a/stepmania/src/RageDisplay_Null.cpp
+++ b/stepmania/src/RageDisplay_Null.cpp
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "SDL_utils.h"
 #include "RageFile.h"
 
 #include "RageDisplay.h"
diff --git a/stepmania/src/RageSurface_Load_JPEG.cpp b/stepmania/src/RageSurface_Load_JPEG.cpp
index 7f9007eced..b5cb1249ab 100644
--- a/stepmania/src/RageSurface_Load_JPEG.cpp
+++ b/stepmania/src/RageSurface_Load_JPEG.cpp
@@ -2,7 +2,6 @@
 #include "RageSurface_Load_JPEG.h"
 #include "RageUtil.h"
 #include "RageLog.h"
-#include "SDL_utils.h"
 #include "RageFile.h"
 #include "RageSurface.h"
 
diff --git a/stepmania/src/RageSurface_Load_XPM.cpp b/stepmania/src/RageSurface_Load_XPM.cpp
index a55dec33ed..7f3bde5af2 100644
--- a/stepmania/src/RageSurface_Load_XPM.cpp
+++ b/stepmania/src/RageSurface_Load_XPM.cpp
@@ -5,7 +5,6 @@
 #include "RageFile.h"
 #include "RageUtil.h"
 #include "RageLog.h"
-#include "SDL_utils.h"
 #include "RageSurface.h"
 
 #define CheckLine() \
diff --git a/stepmania/src/ScreenBookkeeping.h b/stepmania/src/ScreenBookkeeping.h
index db52ccec65..6906866c1f 100644
--- a/stepmania/src/ScreenBookkeeping.h
+++ b/stepmania/src/ScreenBookkeeping.h
@@ -8,7 +8,6 @@
 #include "BitmapText.h"
 #include "PrefsManager.h"
 #include "InputMapper.h"
-#include "RageInputDevice.h"
 
 const int NUM_BOOKKEEPING_COLS = 4;
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 61c98c6092..186f0c8949 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -23,7 +23,6 @@
 #include "RageFileManager.h"
 #include "RageSurface.h"
 #include "NoteDataUtil.h"
-#include "SDL_utils.h"
 #include "ProfileManager.h"
 #include "StageStats.h"
 #include "StepsUtil.h"
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index d96550ccdb..3c5095c0a9 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -22,7 +22,9 @@
 
 #include "ProductInfo.h"
 
+#if defined(HAVE_SDL)
 #include "SDL_utils.h"
+#endif
 
 #include "Screen.h"
 #include "CodeDetector.h"