diff --git a/src/ActorUtil.h b/src/ActorUtil.h
index 4151064f9b..1be071be39 100644
--- a/src/ActorUtil.h
+++ b/src/ActorUtil.h
@@ -1,7 +1,7 @@
 #ifndef ActorUtil_H
 #define ActorUtil_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "RageTexture.h"
 
 class XNode;
diff --git a/src/AttackDisplay.h b/src/AttackDisplay.h
index 57f97512cd..5e4dccf3d3 100644
--- a/src/AttackDisplay.h
+++ b/src/AttackDisplay.h
@@ -1,7 +1,7 @@
 #ifndef AttackDisplay_H
 #define AttackDisplay_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Sprite.h"
 #include "GameConstantsAndTypes.h"	// for TapNoteScore
 #include "RageTexturePreloader.h"
diff --git a/src/AutoActor.cpp b/src/AutoActor.cpp
index 740aa38bcb..26fdb4757f 100644
--- a/src/AutoActor.cpp
+++ b/src/AutoActor.cpp
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "AutoActor.h"
 #include "ThemeManager.h"
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "ActorUtil.h"
 
 void AutoActor::Unload()
diff --git a/src/BGAnimation.h b/src/BGAnimation.h
index 3cb98374eb..db203eac50 100644
--- a/src/BGAnimation.h
+++ b/src/BGAnimation.h
@@ -1,7 +1,7 @@
 #ifndef BGANIMATION_H
 #define BGANIMATION_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 
 class XNode;
 
diff --git a/src/BGAnimationLayer.h b/src/BGAnimationLayer.h
index 5575ada9e7..ce3ed1c4ce 100644
--- a/src/BGAnimationLayer.h
+++ b/src/BGAnimationLayer.h
@@ -2,7 +2,7 @@
 #define BGANIMATIONLAYER_H
 
 #include "GameConstantsAndTypes.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include <map>
 
 class XNode;
diff --git a/src/Background.h b/src/Background.h
index f8bbe62825..9b86644750 100644
--- a/src/Background.h
+++ b/src/Background.h
@@ -1,7 +1,7 @@
 #ifndef BACKGROUND_H
 #define BACKGROUND_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Quad.h"
 #include "PlayerNumber.h"
 #include "BackgroundUtil.h"
diff --git a/src/BeginnerHelper.h b/src/BeginnerHelper.h
index cd95b032c1..a5941e7e85 100644
--- a/src/BeginnerHelper.h
+++ b/src/BeginnerHelper.h
@@ -1,7 +1,7 @@
 #ifndef BEGINNER_HELPER_H
 #define BEGINNER_HELPER_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Character.h"
 #include "Sprite.h"
 #include "AutoActor.h"
diff --git a/src/BitmapText.h b/src/BitmapText.h
index 213ba166dd..bc06c5c406 100644
--- a/src/BitmapText.h
+++ b/src/BitmapText.h
@@ -1,7 +1,7 @@
 #ifndef BITMAP_TEXT_H
 #define BITMAP_TEXT_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include <map>
 
 class RageTexture;
diff --git a/src/CombinedLifeMeter.h b/src/CombinedLifeMeter.h
index a324b824c4..ea2d2233d7 100644
--- a/src/CombinedLifeMeter.h
+++ b/src/CombinedLifeMeter.h
@@ -3,7 +3,7 @@
 
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 
 /** @brief Multiple Players sharing one LifeMeter. */
 class CombinedLifeMeter : public ActorFrame
diff --git a/src/ComboGraph.h b/src/ComboGraph.h
index 5b3c4675c5..b679c7043b 100644
--- a/src/ComboGraph.h
+++ b/src/ComboGraph.h
@@ -2,7 +2,7 @@
 #ifndef COMBO_GRAPH_H
 #define COMBO_GRAPH_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "PlayerNumber.h"
 #include "ThemeMetric.h"
 
diff --git a/src/ControllerStateDisplay.h b/src/ControllerStateDisplay.h
index 0e213b8ee6..c9c8ad9638 100644
--- a/src/ControllerStateDisplay.h
+++ b/src/ControllerStateDisplay.h
@@ -3,7 +3,7 @@
 #ifndef ControllerStateDisplay_H
 #define ControllerStateDisplay_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "ActorUtil.h"
 #include "PlayerNumber.h"
 #include "AutoActor.h"
diff --git a/src/CourseContentsList.h b/src/CourseContentsList.h
index 75aea2fece..11faae7443 100644
--- a/src/CourseContentsList.h
+++ b/src/CourseContentsList.h
@@ -1,7 +1,7 @@
 #ifndef COURSE_CONTENTS_LIST_H
 #define COURSE_CONTENTS_LIST_H
 
-#include "Actors/ActorScroller.h"
+#include "ActorScroller.h"
 class CourseEntryDisplay;
 /** @brief Holds course name and banner. */
 class CourseContentsList : public ActorScroller
diff --git a/src/DancingCharacters.h b/src/DancingCharacters.h
index 5603c729eb..4894b51191 100644
--- a/src/DancingCharacters.h
+++ b/src/DancingCharacters.h
@@ -1,7 +1,7 @@
 #ifndef DancingCharacters_H
 #define DancingCharacters_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "PlayerNumber.h"
 #include "ThemeManager.h"
 #include "RageTimer.h"
diff --git a/src/DifficultyList.h b/src/DifficultyList.h
index 65190110aa..0d0817fa91 100644
--- a/src/DifficultyList.h
+++ b/src/DifficultyList.h
@@ -2,7 +2,7 @@
 #ifndef DIFFICULTY_LIST_H
 #define DIFFICULTY_LIST_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "PlayerNumber.h"
 #include "StepsDisplay.h"
 #include "ThemeMetric.h"
diff --git a/src/DualScrollBar.h b/src/DualScrollBar.h
index 10ed7526f1..3bf67993d3 100644
--- a/src/DualScrollBar.h
+++ b/src/DualScrollBar.h
@@ -1,7 +1,7 @@
 #ifndef DUAL_SCROLLBAR_H
 #define DUAL_SCROLLBAR_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 #include "PlayerNumber.h"
 /** @brief A scrollbar with two independent thumbs. */
diff --git a/src/DynamicActorScroller.h b/src/DynamicActorScroller.h
index 348f063d47..2287804bb5 100644
--- a/src/DynamicActorScroller.h
+++ b/src/DynamicActorScroller.h
@@ -1,7 +1,7 @@
 #ifndef ACTOR_SCROLLER_H
 #define ACTOR_SCROLLER_H
 
-#include "Actors/ActorScroller.h"
+#include "ActorScroller.h"
 #include "LuaReference.h"
 /** @brief ActorScroller that fills in its children on the fly. */
 class DynamicActorScroller: public ActorScroller
diff --git a/src/EditMenu.h b/src/EditMenu.h
index 4ca35a193d..dac6767899 100644
--- a/src/EditMenu.h
+++ b/src/EditMenu.h
@@ -1,7 +1,7 @@
 #ifndef EDIT_MENU_H
 #define EDIT_MENU_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "FadingBanner.h"
 #include "TextBanner.h"
 #include "GameConstantsAndTypes.h"
diff --git a/src/FadingBanner.h b/src/FadingBanner.h
index c23005246b..0389f42602 100644
--- a/src/FadingBanner.h
+++ b/src/FadingBanner.h
@@ -4,7 +4,7 @@
 #define FADING_BANNER_H
 
 #include "Banner.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "RageTimer.h"
 
 class FadingBanner : public ActorFrame
diff --git a/src/Foreground.h b/src/Foreground.h
index beed9884d1..51a0b225fb 100644
--- a/src/Foreground.h
+++ b/src/Foreground.h
@@ -1,7 +1,7 @@
 #ifndef FOREGROUND_H
 #define FOREGROUND_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 
 class Song;
 /** @brief Foreground in front of notes while playing. */
diff --git a/src/GameState.cpp b/src/GameState.cpp
index 20b27e6117..2e48a84286 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "GameState.h"
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "AdjustSync.h"
 #include "AnnouncerManager.h"
 #include "Bookkeeper.h"
diff --git a/src/GhostArrowRow.h b/src/GhostArrowRow.h
index dc886c0adf..f93159eec9 100644
--- a/src/GhostArrowRow.h
+++ b/src/GhostArrowRow.h
@@ -1,7 +1,7 @@
 #ifndef GHOSTARROWROW_H
 #define GHOSTARROWROW_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
 #include "NoteTypes.h"
 
diff --git a/src/GradeDisplay.h b/src/GradeDisplay.h
index 9a3ebf2aaa..e2a3c09cf2 100644
--- a/src/GradeDisplay.h
+++ b/src/GradeDisplay.h
@@ -1,7 +1,7 @@
 #ifndef GRADE_DISPLAY_H
 #define GRADE_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Grade.h"
 #include "PlayerNumber.h"
 #include "AutoActor.h"
diff --git a/src/GraphDisplay.h b/src/GraphDisplay.h
index f957890085..42e17b8695 100644
--- a/src/GraphDisplay.h
+++ b/src/GraphDisplay.h
@@ -1,7 +1,7 @@
 #ifndef GRAPH_DISPLAY_H
 #define GRAPH_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 
 class StageStats;
diff --git a/src/GrooveRadar.h b/src/GrooveRadar.h
index 29ff396c5e..00e89e6c48 100644
--- a/src/GrooveRadar.h
+++ b/src/GrooveRadar.h
@@ -1,7 +1,7 @@
 #ifndef GROOVE_RADAR_H
 #define GROOVE_RADAR_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Sprite.h"
 #include "AutoActor.h"
 #include "PlayerNumber.h"
diff --git a/src/HoldJudgment.h b/src/HoldJudgment.h
index 31859c54c4..ffd3c42282 100644
--- a/src/HoldJudgment.h
+++ b/src/HoldJudgment.h
@@ -1,7 +1,7 @@
 #ifndef HOLD_JUDGMENT_H
 #define HOLD_JUDGMENT_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
 #include "PlayerNumber.h"
 #include "AutoActor.h"
diff --git a/src/Inventory.h b/src/Inventory.h
index 3924b15c00..5ad36dfe71 100644
--- a/src/Inventory.h
+++ b/src/Inventory.h
@@ -1,7 +1,7 @@
 #ifndef Inventory_H
 #define Inventory_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "PlayerNumber.h"
 #include "RageSound.h"
 #include "ScreenMessage.h"
diff --git a/src/LifeMeter.h b/src/LifeMeter.h
index d1196ebe77..33a74be67f 100644
--- a/src/LifeMeter.h
+++ b/src/LifeMeter.h
@@ -3,7 +3,7 @@
 
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "SongOptions.h"
 
 class PlayerState;
diff --git a/src/LightsManager.cpp b/src/LightsManager.cpp
index 8f7ffba78c..54e220bf07 100644
--- a/src/LightsManager.cpp
+++ b/src/LightsManager.cpp
@@ -8,7 +8,7 @@
 #include "InputMapper.h"
 #include "Game.h"
 #include "PrefsManager.h"
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "Preference.h"
 #include "Foreach.h"
 #include "GameManager.h"
diff --git a/src/LuaExpressionTransform.h b/src/LuaExpressionTransform.h
index 2571f28cd2..ecdb1bfca2 100644
--- a/src/LuaExpressionTransform.h
+++ b/src/LuaExpressionTransform.h
@@ -3,7 +3,7 @@
 #ifndef LuaExpressionTransform_H
 #define LuaExpressionTransform_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "LuaReference.h"
 #include <map>
 
diff --git a/src/LyricDisplay.h b/src/LyricDisplay.h
index a4a16b6bc0..7225ef0b1e 100644
--- a/src/LyricDisplay.h
+++ b/src/LyricDisplay.h
@@ -1,7 +1,7 @@
 #ifndef LYRIC_DISPLAY_H
 #define LYRIC_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 /** @brief Displays lyrics along with the song on Gameplay. */
 class LyricDisplay: public ActorFrame
diff --git a/src/MemoryCardDisplay.h b/src/MemoryCardDisplay.h
index 8cf0027faf..83b2aebe16 100644
--- a/src/MemoryCardDisplay.h
+++ b/src/MemoryCardDisplay.h
@@ -4,7 +4,7 @@
 #include "GameConstantsAndTypes.h"
 #include "PlayerNumber.h"
 #include "Sprite.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 /** @brief A graphic displaying the state of memory cards. */
 class MemoryCardDisplay : public ActorFrame
 {
diff --git a/src/MenuTimer.h b/src/MenuTimer.h
index 8e59f03aa7..cd3a211c54 100644
--- a/src/MenuTimer.h
+++ b/src/MenuTimer.h
@@ -3,7 +3,7 @@
 #ifndef MENU_TIMER_H
 #define MENU_TIMER_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 #include "RageSound.h"
 #include "ThemeMetric.h"
diff --git a/src/MeterDisplay.h b/src/MeterDisplay.h
index db2adde2cd..1b941f6f41 100644
--- a/src/MeterDisplay.h
+++ b/src/MeterDisplay.h
@@ -3,7 +3,7 @@
 #ifndef METER_DISPLAY_H
 #define METER_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 
 
diff --git a/src/ModIcon.h b/src/ModIcon.h
index 5ce9d75143..11fb08bbbd 100644
--- a/src/ModIcon.h
+++ b/src/ModIcon.h
@@ -1,7 +1,7 @@
 #ifndef ModIcon_H
 #define ModIcon_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 #include "BitmapText.h"
 #include "PlayerNumber.h"
diff --git a/src/ModIconRow.h b/src/ModIconRow.h
index 71e5432d2c..47c8a94ad8 100644
--- a/src/ModIconRow.h
+++ b/src/ModIconRow.h
@@ -3,7 +3,7 @@
 #ifndef ModIconRow_H
 #define ModIconRow_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "ModIcon.h"
 #include "ThemeMetric.h"
 class PlayerOptions;
diff --git a/src/Model.h b/src/Model.h
index 31f75ebb4a..afb70cc738 100644
--- a/src/Model.h
+++ b/src/Model.h
@@ -3,7 +3,7 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "RageTypes.h"
 #include "ModelTypes.h"
 #include <vector>
diff --git a/src/MusicWheelItem.h b/src/MusicWheelItem.h
index 12ed474ed1..6155e24d70 100644
--- a/src/MusicWheelItem.h
+++ b/src/MusicWheelItem.h
@@ -1,7 +1,7 @@
 #ifndef MUSIC_WHEEL_ITEM_H
 #define MUSIC_WHEEL_ITEM_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 #include "WheelNotifyIcon.h"
 #include "TextBanner.h"
diff --git a/src/NoteField.h b/src/NoteField.h
index aa6d70db93..f37023b2db 100644
--- a/src/NoteField.h
+++ b/src/NoteField.h
@@ -4,7 +4,7 @@
 #include "TimingData.h"
 #include "SongPosition.h"
 #include "Sprite.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 #include "Quad.h"
 #include "NoteDisplay.h"
diff --git a/src/NoteSkinManager.h b/src/NoteSkinManager.h
index cf4290d575..7534a51827 100644
--- a/src/NoteSkinManager.h
+++ b/src/NoteSkinManager.h
@@ -1,7 +1,7 @@
 #ifndef NOTE_SKIN_MANAGER_H
 #define NOTE_SKIN_MANAGER_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "RageTypes.h"
 #include "PlayerNumber.h"
 #include "IniFile.h"
diff --git a/src/OptionRow.h b/src/OptionRow.h
index df76b60725..6ca653f88e 100644
--- a/src/OptionRow.h
+++ b/src/OptionRow.h
@@ -3,7 +3,7 @@
 #ifndef OptionRow_H
 #define OptionRow_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 #include "OptionsCursor.h"
 #include "ModIcon.h"
diff --git a/src/OptionsCursor.h b/src/OptionsCursor.h
index acc22d2f2d..9f0652fe24 100644
--- a/src/OptionsCursor.h
+++ b/src/OptionsCursor.h
@@ -2,7 +2,7 @@
 #define OPTIONS_CURSOR_H
 
 #include "Sprite.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "PlayerNumber.h"
 #include "AutoActor.h"
 /** @brief A cursor for ScreenOptions. */
diff --git a/src/PaneDisplay.h b/src/PaneDisplay.h
index 7be000c7e1..1ebdb0bf83 100644
--- a/src/PaneDisplay.h
+++ b/src/PaneDisplay.h
@@ -1,7 +1,7 @@
 #ifndef PANE_DISPLAY_H
 #define PANE_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "ActorUtil.h"
 #include "PlayerNumber.h"
 #include "BitmapText.h"
diff --git a/src/PercentageDisplay.h b/src/PercentageDisplay.h
index 73459c3bb3..74888ae4e0 100644
--- a/src/PercentageDisplay.h
+++ b/src/PercentageDisplay.h
@@ -1,7 +1,7 @@
 #ifndef PERCENTAGE_DISPLAY_H
 #define PERCENTAGE_DISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "PlayerNumber.h"
 #include "BitmapText.h"
 #include "StageStats.h"
diff --git a/src/Player.h b/src/Player.h
index cb0c1ae8bc..f2cb2c9b5c 100644
--- a/src/Player.h
+++ b/src/Player.h
@@ -1,7 +1,7 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "HoldJudgment.h"
 #include "NoteDataWithScoring.h"
 #include "RageSound.h"
diff --git a/src/ReceptorArrow.h b/src/ReceptorArrow.h
index 219e661ae8..e0dc4bb378 100644
--- a/src/ReceptorArrow.h
+++ b/src/ReceptorArrow.h
@@ -1,7 +1,7 @@
 #ifndef RECEPTOR_ARROW_H
 #define RECEPTOR_ARROW_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
diff --git a/src/ReceptorArrowRow.h b/src/ReceptorArrowRow.h
index 17030d9826..1b93047386 100644
--- a/src/ReceptorArrowRow.h
+++ b/src/ReceptorArrowRow.h
@@ -2,7 +2,7 @@
 #define RECEPTOR_ARROW_ROW_H
 
 #include "ReceptorArrow.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
 
 class PlayerState;
diff --git a/src/RoomInfoDisplay.h b/src/RoomInfoDisplay.h
index 585ba59523..6f5157de32 100644
--- a/src/RoomInfoDisplay.h
+++ b/src/RoomInfoDisplay.h
@@ -4,7 +4,7 @@
 #define ROOM_INFO_DISPLAY_H
 
 #include "RoomWheel.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 
 class RoomInfoDisplay : public ActorFrame
 {
diff --git a/src/ScoreDisplay.h b/src/ScoreDisplay.h
index 7b51f0349d..73a7713356 100644
--- a/src/ScoreDisplay.h
+++ b/src/ScoreDisplay.h
@@ -2,7 +2,7 @@
 #define SCORE_DISPLAY_H
 
 #include "PlayerNumber.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "GameConstantsAndTypes.h"
 
 class PlayerState;
diff --git a/src/Screen.h b/src/Screen.h
index ebe4f4338e..d030bf4773 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -1,7 +1,7 @@
 #ifndef SCREEN_H
 #define SCREEN_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "ScreenMessage.h"
 #include "InputFilter.h"
 #include "ThemeMetric.h"
diff --git a/src/ScreenMapControllers.h b/src/ScreenMapControllers.h
index 3990f5fb11..6b7fbc7cfb 100644
--- a/src/ScreenMapControllers.h
+++ b/src/ScreenMapControllers.h
@@ -6,7 +6,7 @@
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
 #include "InputMapper.h"
-#include "Actors/ActorScroller.h"
+#include "ActorScroller.h"
 #include "RageSound.h"
 
 class ScreenMapControllers : public ScreenWithMenuElements
diff --git a/src/ScreenMapControllers2.h b/src/ScreenMapControllers2.h
index b68ec730af..463a8deced 100644
--- a/src/ScreenMapControllers2.h
+++ b/src/ScreenMapControllers2.h
@@ -6,7 +6,7 @@
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
 #include "InputMapper.h"
-#include "Actors\ActorScroller.h"
+#include "ActorScroller.h"
 #include "RageSound.h"
 #include "EnumHelper.h"
 #include "ThemeMetric.h"
diff --git a/src/ScreenNetSelectBase.cpp b/src/ScreenNetSelectBase.cpp
index ca2afeb8f2..5469a0bf20 100644
--- a/src/ScreenNetSelectBase.cpp
+++ b/src/ScreenNetSelectBase.cpp
@@ -6,7 +6,7 @@
 #include "ThemeManager.h"
 #include "RageTimer.h"
 #include "ActorUtil.h"
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "GameSoundManager.h"
 #include "MenuTimer.h"
 #include "NetworkSyncManager.h"
diff --git a/src/ScreenSelectMaster.h b/src/ScreenSelectMaster.h
index a137fc761d..5a6cc8e08f 100644
--- a/src/ScreenSelectMaster.h
+++ b/src/ScreenSelectMaster.h
@@ -5,7 +5,7 @@
 #include "RageSound.h"
 #include "RandomSample.h"
 #include "ActorUtil.h"
-#include "Actors/ActorScroller.h"
+#include "ActorScroller.h"
 
 enum MenuDir
 {
diff --git a/src/ScrollBar.h b/src/ScrollBar.h
index 6274833495..b0b2357b7f 100644
--- a/src/ScrollBar.h
+++ b/src/ScrollBar.h
@@ -3,7 +3,7 @@
 #ifndef SCROLL_BAR_H
 #define SCROLL_BAR_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 
 
diff --git a/src/SnapDisplay.h b/src/SnapDisplay.h
index f1d53a260c..6118c81cbb 100644
--- a/src/SnapDisplay.h
+++ b/src/SnapDisplay.h
@@ -1,7 +1,7 @@
 #ifndef SNAPDISPLAY_H
 #define SNAPDISPLAY_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "NoteTypes.h"
 #include "Sprite.h"
 
diff --git a/src/Sprite.h b/src/Sprite.h
index 830d6c278c..3a941ec28c 100644
--- a/src/Sprite.h
+++ b/src/Sprite.h
@@ -1,7 +1,7 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 
-#include "Actors/Actor.h"
+#include "Actor.h"
 #include "RageTextureID.h"
 
 void TexCoordArrayFromRect( float fImageCoords[8], const RectF &rect );
diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj
index 8934309119..e3ef087d43 100644
--- a/src/StepMania-net2008.vcproj
+++ b/src/StepMania-net2008.vcproj
@@ -50,7 +50,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -158,7 +158,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
@@ -371,7 +371,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
diff --git a/src/StepsDisplay.h b/src/StepsDisplay.h
index dd24566678..c3af3063a9 100644
--- a/src/StepsDisplay.h
+++ b/src/StepsDisplay.h
@@ -7,7 +7,7 @@
 #include "GameConstantsAndTypes.h"
 #include "ActorUtil.h"
 #include "Difficulty.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "ThemeMetric.h"
 #include "Sprite.h"
 
diff --git a/src/StreamDisplay.h b/src/StreamDisplay.h
index 38795155ab..71a28aca69 100644
--- a/src/StreamDisplay.h
+++ b/src/StreamDisplay.h
@@ -2,7 +2,7 @@
 #ifndef StreamDisplay_H
 #define StreamDisplay_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Sprite.h"
 #include "Quad.h"
 #include "LuaExpressionTransform.h"
diff --git a/src/TextBanner.h b/src/TextBanner.h
index 48a0f03242..7e4b619025 100644
--- a/src/TextBanner.h
+++ b/src/TextBanner.h
@@ -3,7 +3,7 @@
 #ifndef TEXTBANNER_H
 #define TEXTBANNER_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 class Song;
 
diff --git a/src/Transition.h b/src/Transition.h
index d72071d4a9..460eae535f 100644
--- a/src/Transition.h
+++ b/src/Transition.h
@@ -3,7 +3,7 @@
 #ifndef TRANSITION_H
 #define TRANSITION_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "AutoActor.h"
 #include "ScreenMessage.h"
 
diff --git a/src/WheelBase.h b/src/WheelBase.h
index af3de62377..51747fdddd 100644
--- a/src/WheelBase.h
+++ b/src/WheelBase.h
@@ -2,7 +2,7 @@
 #define WHEELBASE_H
 
 #include "AutoActor.h"
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "RageSound.h"
 #include "GameConstantsAndTypes.h"
 #include "ScreenMessage.h"
diff --git a/src/WheelItemBase.h b/src/WheelItemBase.h
index cfb38ed930..fa6f68e6d7 100644
--- a/src/WheelItemBase.h
+++ b/src/WheelItemBase.h
@@ -1,7 +1,7 @@
 #ifndef WHEEL_ITEM_BASE_H
 #define WHEEL_ITEM_BASE_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "BitmapText.h"
 #include "ThemeMetric.h"
 #include "GameConstantsAndTypes.h"
diff --git a/src/WorkoutGraph.h b/src/WorkoutGraph.h
index 1b289f17b4..bc193ad3ea 100644
--- a/src/WorkoutGraph.h
+++ b/src/WorkoutGraph.h
@@ -3,7 +3,7 @@
 #ifndef WorkoutGraph_H
 #define WorkoutGraph_H
 
-#include "Actors/ActorFrame.h"
+#include "ActorFrame.h"
 #include "Sprite.h"
 class Trail;