diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 067cae2149..7f8d67897c 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -41,7 +41,7 @@ const int framesize = 2 * channels; /* 16-bit */
  * as the largest hardware buffer. */
 const int internal_buffer_size = 1024*16;
 
-/* The amount of data to read from SDL_sound at once. */
+/* The amount of data to read at once. */
 const unsigned read_block_size = 1024;
 
 RageSoundParams::RageSoundParams():
diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp
index e641c30f50..f8cb533937 100644
--- a/stepmania/src/RageSoundReader_MP3.cpp
+++ b/stepmania/src/RageSoundReader_MP3.cpp
@@ -4,7 +4,6 @@
 #include "RageSoundReader_MP3.h"
 #include "RageLog.h"
 #include "RageUtil.h"
-#include "SDL_utils.h"
 
 #include <cstdio>
 #include <cerrno>
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp
index bb94aae8c4..25541d2193 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.cpp
+++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp
@@ -1,7 +1,6 @@
 #include "global.h"
 
 #include "RageUtil.h"
-#include "SDL_utils.h"
 #include "RageSoundReader_Vorbisfile.h"
 #include "RageLog.h"
 
diff --git a/stepmania/src/RageSoundReader_WAV.cpp b/stepmania/src/RageSoundReader_WAV.cpp
index bcdb165ae1..32d65859eb 100644
--- a/stepmania/src/RageSoundReader_WAV.cpp
+++ b/stepmania/src/RageSoundReader_WAV.cpp
@@ -546,7 +546,7 @@ int RageSoundReader_WAV::Read(char *buf, unsigned len)
 	if( Conversion == CONV_16LSB_TO_16SYS )
 	{
 		/* Do this in place. */
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#if defined(ENDIAN_BIG)
 		const int cnt = len / sizeof(int16_t);
 		int16_t *tbuf = (int16_t *) buf;
 		for( int i = 0; i < cnt; ++i )
diff --git a/stepmania/src/RageSounds.cpp b/stepmania/src/RageSounds.cpp
index 43c86ec0a8..2ff47cc177 100644
--- a/stepmania/src/RageSounds.cpp
+++ b/stepmania/src/RageSounds.cpp
@@ -10,7 +10,6 @@
 #include "PrefsManager.h"
 #include "RageDisplay.h"
 #include "AnnouncerManager.h"
-#include "SDL_utils.h"
 
 RageSounds *SOUND = NULL;
 
diff --git a/stepmania/src/RageThreads.h b/stepmania/src/RageThreads.h
index 29b39672dc..b5d3403594 100644
--- a/stepmania/src/RageThreads.h
+++ b/stepmania/src/RageThreads.h
@@ -1,8 +1,6 @@
 #ifndef RAGE_THREADS_H
 #define RAGE_THREADS_H
 
-struct SDL_Thread;
-
 struct ThreadSlot;
 class RageThread
 {
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index bb553c4fdc..2eab02a5eb 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -9,7 +9,6 @@
 #include "PrefsManager.h"
 #include "RageDisplay.h"
 #include "RageTexture.h"
-#include "SDL_utils.h"
 #include "ActorUtil.h"
 #include "arch/Dialog/Dialog.h"