diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp
index 5ba9f259fa..1336bee7d8 100644
--- a/stepmania/src/BannerCache.cpp
+++ b/stepmania/src/BannerCache.cpp
@@ -8,14 +8,14 @@
 #include "BannerCache.h"
 #include "Sprite.h"
 #include "PrefsManager.h"
-#include "SDL_dither.h"
-#include "RageSurfaceUtils_Zoom.h"
 #include "RageDisplay.h"
 #include "RageTexture.h"
 #include "RageTextureManager.h"
 #include "RageSurface.h"
 #include "RageSurfaceUtils.h"
 #include "RageSurfaceUtils_Palettize.h"
+#include "RageSurfaceUtils_Dither.h"
+#include "RageSurfaceUtils_Zoom.h"
 
 #include "Banner.h"
 
@@ -350,7 +350,6 @@ void BannerCache::CacheBannerInternal( CString BannerPath )
 
 		RageSurfaceUtils::BlitTransform( img, dst, fCustomImageCoords );
 
-//		SDL_SaveBMP( dst, BannerPath + "-test.bmp" );
 		delete img;
 		img = dst;
 
diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index ca06b21c24..30260e97b8 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -223,8 +223,7 @@ ScoreDisplay.cpp ScoreDisplay.h ScoreDisplayBattle.cpp ScoreDisplayBattle.h \
 ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni.h \
 ScoreDisplayPercentage.cpp ScoreDisplayPercentage.h ScoreDisplayRave.cpp ScoreDisplayRave.h
 
-Helpers = SDL_SaveJPEG.cpp SDL_SaveJPEG.h \
-	  SDL_dither.cpp SDL_dither.h
+Helpers = SDL_SaveJPEG.cpp SDL_SaveJPEG.h
 
 PCRE = pcre/chartables.c pcre/get.c pcre/internal.h pcre/maketables.c pcre/pcre.c pcre/pcre.h pcre/study.c
 
@@ -249,6 +248,7 @@ RageSoundReader_Resample_Good.cpp RageSoundReader_Resample_Good.h \
 RageSoundReader_Chain.cpp RageSoundReader_Chain.h \
 RageSoundResampler.cpp RageSoundResampler.h \
 RageSurface.cpp RageSurface.h RageSurfaceUtils.cpp RageSurfaceUtils.h \
+RageSurfaceUtils_Dither.cpp RageSurfaceUtils_Dither.h \
 RageSurfaceUtils_Palettize.cpp RageSurfaceUtils_Palettize.h \
 RageSurfaceUtils_Zoom.cpp RageSurfaceUtils_Zoom.h \
 RageSurface_Load.cpp RageSurface_Load.h RageSurface_Load_PNG.cpp RageSurface_Load_PNG.h \