diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
index a9a697b961..caed11982e 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.h
@@ -1,3 +1,5 @@
+/* MovieTexture_DShow - DirectShow movie renderer. */
+
 #ifndef RAGE_MOVIE_TEXTURE_DSHOW_H
 #define RAGE_MOVIE_TEXTURE_DSHOW_H
 
@@ -27,9 +29,6 @@ typedef char TCHAR, *PTCHAR;
 #include "RageTexture.h"
 #include "RageThreads.h"
 
-//-----------------------------------------------------------------------------
-// RageMovieTexture Class Declarations
-//-----------------------------------------------------------------------------
 class MovieTexture_DShow : public RageMovieTexture
 {
 public:
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShowHelper.h b/stepmania/src/arch/MovieTexture/MovieTexture_DShowHelper.h
index 8d2dde15f6..3bfa9d6727 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShowHelper.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShowHelper.h
@@ -1,12 +1,6 @@
-#ifndef RAGEMOVIETEXTURE_HELPER_H
-#define RAGEMOVIETEXTURE_HELPER_H
+#ifndef RAGE_MOVIE_TEXTURE_DSHOW_HELPER_H
+#define RAGE_MOVIE_TEXTURE_DSHOW_HELPER_H
 
-
-// #include <windows.h>
-// #include <atlbase.h>
-
-//#include "baseclasses/streams.h"
-//#include "baseclasses/streams.h"
 #include "MovieTexture_DShow.h"
 
 //-----------------------------------------------------------------------------
@@ -24,13 +18,11 @@ public:
     CTextureRenderer();
     ~CTextureRenderer();
 
-	// overridden methods
-    HRESULT CheckMediaType(const CMediaType *pmt );     // Format acceptable?
-    HRESULT SetMediaType(const CMediaType *pmt );       // Video format notification
-    HRESULT DoRenderSample(IMediaSample *pMediaSample); // New video sample
+	HRESULT CheckMediaType( const CMediaType *pmt );     // Format acceptable?
+	HRESULT SetMediaType( const CMediaType *pmt );       // Video format notification
+	HRESULT DoRenderSample( IMediaSample *pMediaSample ); // New video sample
 	void OnReceiveFirstSample( IMediaSample * pSample );
 
-	// new methods
 	long GetVidWidth() const { return m_lVidWidth; }
 	long GetVidHeight() const { return m_lVidHeight; }
 	void SetRenderTarget( MovieTexture_DShow* pTexture );