diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 412698a035..3951edf593 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -8,6 +8,14 @@
 #include "SDL_utils.h"
 #include "SDL_endian.h"
 
+namespace avcodec
+{
+#if defined(_WIN32)
+#include "ffmpeg/include/ffmpeg/avformat.h"
+#else
+#include <ffmpeg/avformat.h>
+#endif
+};
 
 #if defined(_WIN32)
 	#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
index 2f2574b064..8e02ae9663 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
@@ -16,15 +16,6 @@
 #include <inttypes.h>
 #endif
 
-namespace avcodec
-{
-#if defined(_WIN32)
-#include "ffmpeg/include/ffmpeg/avformat.h"
-#else
-#include <ffmpeg/avformat.h>
-#endif
-};
-
 class FFMpeg_Helper;
 
 class MovieTexture_FFMpeg: public RageMovieTexture
@@ -65,10 +56,6 @@ private:
 	 * PAUSE_DECODER: The decoder thread is idle.
 	 *
 	 * PLAYING: The decoder thread is running.
-	 *
-	 * PLAYING_ONE: The decoder thread will decode one frame, post the
-	 * m_FrameDecoded semaphore and change to the PAUSE_DECODER state.
-	 * This is only used by Create().
 	 */
 	enum State { DECODER_QUIT, PAUSE_DECODER, PLAYING } m_State;