diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 63ebbdc3a4..07ef01156c 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -9,7 +9,6 @@
 #include "Foreach.h"
 #include "XmlFile.h"
 #include "LuaBinding.h"
-#include "ActorCommands.h"
 #include "ThemeManager.h"
 #include "LuaReference.h"
 #include "MessageManager.h"
diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp
index 4eb1eee003..f31b683749 100644
--- a/stepmania/src/ActorFrame.cpp
+++ b/stepmania/src/ActorFrame.cpp
@@ -5,7 +5,7 @@
 #include "XmlFile.h"
 #include "ActorUtil.h"
 #include "LuaBinding.h"
-#include "ActorCommands.h"
+#include "ActorUtil.h"
 #include "RageDisplay.h"
 #include "ScreenDimensions.h"
 #include "Foreach.h"
diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp
index 36c4dfd52f..f152e22de7 100644
--- a/stepmania/src/NoteSkinManager.cpp
+++ b/stepmania/src/NoteSkinManager.cpp
@@ -11,6 +11,7 @@
 #include "arch/Dialog/Dialog.h"
 #include "PrefsManager.h"
 #include "Foreach.h"
+#include "ActorUtil.h"
 
 
 NoteSkinManager*	NOTESKIN = NULL;	// global object accessable from anywhere in the program
diff --git a/stepmania/src/NoteSkinManager.h b/stepmania/src/NoteSkinManager.h
index fad91ea19c..ccbed72f29 100644
--- a/stepmania/src/NoteSkinManager.h
+++ b/stepmania/src/NoteSkinManager.h
@@ -3,8 +3,7 @@
 #ifndef NOTE_SKIN_MANAGER_H
 #define NOTE_SKIN_MANAGER_H
 
-#include "ActorCommands.h"
-#include "ActorUtil.h"
+#include "Actor.h"
 #include "RageTypes.h"
 #include "PlayerNumber.h"
 #include "IniFile.h"
diff --git a/stepmania/src/PaneDisplay.h b/stepmania/src/PaneDisplay.h
index 0459226866..ebbca7f856 100644
--- a/stepmania/src/PaneDisplay.h
+++ b/stepmania/src/PaneDisplay.h
@@ -4,7 +4,7 @@
 #define PANE_DISPLAY_H
 
 #include "ActorFrame.h"
-#include "ActorCommands.h"
+#include "ActorUtil.h"
 #include "PlayerNumber.h"
 #include "BitmapText.h"
 #include "AutoActor.h"
diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h
index afd70e94c9..9d8194fc2b 100644
--- a/stepmania/src/ScreenSelectMusic.h
+++ b/stepmania/src/ScreenSelectMusic.h
@@ -12,7 +12,6 @@
 #include "FadingBanner.h"
 #include "RageUtil_BackgroundLoader.h"
 #include "ThemeMetric.h"
-#include "ActorCommands.h"
 #include "RageTexturePreloader.h"
 #include "TimingData.h"