diff --git a/stepmania/src/CryptManager.cpp b/stepmania/src/CryptManager.cpp
index 248b7bafae..7655ee5e18 100644
--- a/stepmania/src/CryptManager.cpp
+++ b/stepmania/src/CryptManager.cpp
@@ -2,6 +2,7 @@
 #include "CryptManager.h"
 #include "RageUtil.h"
 #include "RageLog.h"
+#include "RageFile.h"
 #include "PrefsManager.h"
 #include "RageFileManager.h"
 #include "crypto/CryptMD5.h"
diff --git a/stepmania/src/RageFileDriverDirect.cpp b/stepmania/src/RageFileDriverDirect.cpp
index 19e40a1361..44f026189e 100644
--- a/stepmania/src/RageFileDriverDirect.cpp
+++ b/stepmania/src/RageFileDriverDirect.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "RageFileDriverDirect.h"
 #include "RageFileDriverDirectHelpers.h"
+#include "RageFile.h"
 #include "RageUtil.h"
 #include "RageUtil_FileDB.h"
 #include "RageLog.h"
diff --git a/stepmania/src/RageFileDriverMemory.cpp b/stepmania/src/RageFileDriverMemory.cpp
index 416c5e8b87..80d5f0fed0 100644
--- a/stepmania/src/RageFileDriverMemory.cpp
+++ b/stepmania/src/RageFileDriverMemory.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "RageFileDriverMemory.h"
+#include "RageFile.h"
 #include "RageUtil.h"
 #include "RageUtil_FileDB.h"
 #include <errno.h>
diff --git a/stepmania/src/RageFileDriverMemory.h b/stepmania/src/RageFileDriverMemory.h
index 0f73970a37..16d514b875 100644
--- a/stepmania/src/RageFileDriverMemory.h
+++ b/stepmania/src/RageFileDriverMemory.h
@@ -4,6 +4,7 @@
 #define RAGE_FILE_DRIVER_MEMORY_H
 
 #include "RageFileDriver.h"
+#include "RageFileBasic.h"
 #include "RageThreads.h"
 
 struct RageFileObjMemFile;
diff --git a/stepmania/src/RageFileDriverTimeout.cpp b/stepmania/src/RageFileDriverTimeout.cpp
index c2b39d277b..7b789fb885 100644
--- a/stepmania/src/RageFileDriverTimeout.cpp
+++ b/stepmania/src/RageFileDriverTimeout.cpp
@@ -42,6 +42,7 @@
 
 #include "global.h"
 #include "RageFileDriverTimeout.h"
+#include "RageFile.h"
 #include "RageUtil.h"
 #include "RageUtil_FileDB.h"
 #include "RageUtil_WorkerThread.h"
diff --git a/stepmania/src/RageFileDriverZip.cpp b/stepmania/src/RageFileDriverZip.cpp
index 01bd18a85b..79882b7154 100644
--- a/stepmania/src/RageFileDriverZip.cpp
+++ b/stepmania/src/RageFileDriverZip.cpp
@@ -6,6 +6,7 @@
 #include "RageFileDriverZip.h"
 #include "RageFileDriverSlice.h"
 #include "RageFileDriverDeflate.h"
+#include "RageFile.h"
 #include "RageLog.h"
 #include "RageUtil.h"
 #include "RageUtil_FileDB.h"
diff --git a/stepmania/src/ScreenPackages.h b/stepmania/src/ScreenPackages.h
index 7543c4150c..bbf009fe06 100644
--- a/stepmania/src/ScreenPackages.h
+++ b/stepmania/src/ScreenPackages.h
@@ -5,6 +5,7 @@
 #include "BitmapText.h"
 #include "ezsockets.h"
 #include "RageFileManager.h"
+#include "RageFile.h"
 
 #if !defined(WITHOUT_NETWORKING)