Reorder some more includes.

stepmania/src/NotesLoaderSM.cpp

@@ -1,14 +1,14 @@
 #include "global.h"
 #include "NotesLoaderSM.h"
+#include "BackgroundUtil.h"
 #include "GameManager.h"
 #include "MsdFile.h"
+#include "NoteTypes.h"
+#include "RageFileManager.h"
 #include "RageLog.h"
 #include "RageUtil.h"
-#include "SongManager.h"
-#include "RageFileManager.h"
-#include "NoteTypes.h"
-#include "BackgroundUtil.h"
 #include "song.h"
+#include "SongManager.h"
 #include "Steps.h"
 
 const int MAX_EDIT_STEPS_SIZE_BYTES		= 30*1024;	// 30KB

stepmania/src/NotesWriterSM.cpp

@@ -1,20 +1,20 @@
+#include <cerrno>
+#include <cstring>
 #include "global.h"
 #include "NotesWriterSM.h"
-#include "Steps.h"
+#include "BackgroundUtil.h"
-#include "RageUtil.h"
+#include "Foreach.h"
 #include "GameManager.h"
-#include "RageLog.h"
+#include "LocalizedString.h"
+#include "NoteTypes.h"
+#include "Profile.h"
+#include "ProfileManager.h"
 #include "RageFile.h"
 #include "RageFileManager.h"
+#include "RageLog.h"
+#include "RageUtil.h"
 #include "song.h"
-#include "NoteTypes.h"
+#include "Steps.h"
-#include <cstring>
-#include <cerrno>
-#include "Foreach.h"
-#include "BackgroundUtil.h"
-#include "ProfileManager.h"
-#include "Profile.h"
-#include "LocalizedString.h"
 
 static RString BackgroundChangeToString( const BackgroundChange &bgc )
 {

stepmania/src/NotesWriterSM.h

@@ -5,7 +5,6 @@
 
 class Song;
 class Steps;
-class RageFile;
 namespace NotesWriterSM
 {
 	bool Write( RString sPath, const Song &out, bool bSavingCache );