diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index b61135af1e..6a70c8154c 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -13,6 +13,7 @@
 #include "RageFile.h"
 #if !defined(SMPACKAGE)
 #include "ScreenManager.h"
+#include "ActorUtil.h"
 #endif
 #include "Foreach.h"
 #include "ThemeMetric.h"
@@ -23,7 +24,6 @@
 #include "SpecialFiles.h"
 #include "EnumHelper.h"
 #include "PrefsManager.h"
-#include "ActorUtil.h"
 
 ThemeManager*	THEME = NULL;	// global object accessable from anywhere in the program
 
diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h
index 59edc7bec7..7d8c1ca9a5 100644
--- a/stepmania/src/ThemeManager.h
+++ b/stepmania/src/ThemeManager.h
@@ -7,7 +7,7 @@
 #include <set>
 #include <deque>
 #if !defined(SMPACKAGE)
-#include "ActorCommands.h"
+#include "Actor.h"
 #endif
 #include "LuaReference.h"