diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index cf2fcd1487..7ff4640c49 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -690,13 +690,13 @@ bool RageDisplay::SaveScreenshot( CString sPath, GraphicsFileFormat format )
 	switch( format )
 	{
 	case SAVE_LOSSLESS:
-		bSuccess = RageSurface_Save_BMP( surface, out );
+		bSuccess = RageSurfaceUtils::SaveBMP( surface, out );
 		break;
 	case SAVE_LOSSY_LOW_QUAL:
-		bSuccess = IMG_SaveJPG_RW( surface, out, false );
+		bSuccess = RageSurfaceUtils::SaveJPEG( surface, out, false );
 		break;
 	case SAVE_LOSSY_HIGH_QUAL:
-		bSuccess = IMG_SaveJPG_RW( surface, out, true );
+		bSuccess = RageSurfaceUtils::SaveJPEG( surface, out, true );
 		break;
 	default:
 		ASSERT(0);
diff --git a/stepmania/src/RageSurfaceUtils_Dither.h b/stepmania/src/RageSurfaceUtils_Dither.h
index 0c817b12fc..825e0583ec 100644
--- a/stepmania/src/RageSurfaceUtils_Dither.h
+++ b/stepmania/src/RageSurfaceUtils_Dither.h
@@ -1,5 +1,5 @@
-#ifndef SM_SDL_DITHER_H
-#define SM_SDL_DITHER_H
+#ifndef RAGE_SURFACE_UTILS_DITHER_H
+#define RAGE_SURFACE_UTILS_DITHER_H
 
 struct RageSurface;
 namespace RageSurfaceUtils
diff --git a/stepmania/src/RageSurfaceUtils_Zoom.h b/stepmania/src/RageSurfaceUtils_Zoom.h
index 83bcef46fe..23e7440a5a 100644
--- a/stepmania/src/RageSurfaceUtils_Zoom.h
+++ b/stepmania/src/RageSurfaceUtils_Zoom.h
@@ -1,5 +1,5 @@
-#ifndef SDL_ROTOZOOM_H
-#define SDL_ROTOZOOM_H
+#ifndef RAGE_SURFACE_UTILS_ZOOM_H
+#define RAGE_SURFACE_UTILS_ZOOM_H
 
 struct RageSurface;
 namespace RageSurfaceUtils
diff --git a/stepmania/src/RageSurface_Save_JPEG.h b/stepmania/src/RageSurface_Save_JPEG.h
index 84e10f42bf..c3572ac372 100644
--- a/stepmania/src/RageSurface_Save_JPEG.h
+++ b/stepmania/src/RageSurface_Save_JPEG.h
@@ -1,5 +1,5 @@
-#ifndef SDL_SAVE_JPEG_H
-#define SDL_SAVE_JPEG_H
+#ifndef RAGE_SURFACE_SAVE_JPEG_H
+#define RAGE_SURFACE_SAVE_JPEG_H
 
 struct RageSurface;
 class RageFile;