diff --git a/stepmania/src/NotesLoader.cpp b/stepmania/src/NotesLoader.cpp
index 2ce5e5f0fc..ce715678c8 100644
--- a/stepmania/src/NotesLoader.cpp
+++ b/stepmania/src/NotesLoader.cpp
@@ -1,7 +1,9 @@
 #include "stdafx.h"
 #include "NotesLoader.h"
 #include "NoteTypes.h"
+#include "NoteData.h"
 #include "GameManager.h"
+#include "RageUtil.h"
 
 bool NotesLoader::Loadable( CString sPath )
 {
diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h
index 629dad17a6..c9d72df631 100644
--- a/stepmania/src/NotesLoader.h
+++ b/stepmania/src/NotesLoader.h
@@ -1,7 +1,7 @@
 #ifndef NOTES_LOADER_H
 #define NOTES_LOADER_H
 
-#include "song.h"
+#include "Song.h"
 
 typedef int DanceNote;
 enum {
@@ -23,7 +23,7 @@ enum {
 class NotesLoader {
 protected:
 	virtual void GetApplicableFiles( CString sPath, CStringArray &out )=0;
-	void GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut );
+	static void GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut );
 
 public:
 	virtual bool LoadFromDir( CString sPath, Song &out ) = 0;