diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp
index 2fb2c2ae61..b6d4bc5883 100644
--- a/stepmania/src/Difficulty.cpp
+++ b/stepmania/src/Difficulty.cpp
@@ -3,6 +3,7 @@
 #include "GameState.h"
 #include "ThemeMetric.h"
 #include "LuaManager.h"
+#include "LuaFunctions.h"
 
 
 static const CString DifficultyNames[] = {
diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp
index bd17e76139..5a1dcf5493 100644
--- a/stepmania/src/Grade.cpp
+++ b/stepmania/src/Grade.cpp
@@ -5,6 +5,7 @@
 #include "RageLog.h"
 #include "EnumHelper.h"
 #include "LuaManager.h"
+#include "LuaFunctions.h"
 
 LuaFunction_Int( GradeToString,			GradeToString((Grade)a1) )
 
diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h
index 17033ca267..f9e034cd1e 100644
--- a/stepmania/src/LuaManager.h
+++ b/stepmania/src/LuaManager.h
@@ -1,11 +1,16 @@
 #ifndef LUA_MANAGER_H
 #define LUA_MANAGER_H
 
-#include "LuaFunctions.h"
-
 struct lua_State;
 typedef void (*RegisterWithLuaFn)(lua_State*);
 
+extern "C"
+{
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+}
+
 class LuaManager;
 extern LuaManager *LUA;
 
diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h
index 5bbb193518..b0dd44ae72 100644
--- a/stepmania/src/OptionRowHandler.h
+++ b/stepmania/src/OptionRowHandler.h
@@ -6,6 +6,7 @@
 #include "OptionRow.h"
 #include "GameCommand.h"
 #include "LuaReference.h"
+#include "RageUtil.h"
 
 struct ConfOption;
 
diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index 2d983850ea..ec657fdd6a 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -8,6 +8,7 @@
 #include "RageLog.h"
 #include "StageStats.h"
 #include "PlayerState.h"
+#include "LuaFunctions.h"
 
 ThemeMetric<int> PERCENT_DECIMAL_PLACES	( "PercentageDisplay", "PercentDecimalPlaces" );
 ThemeMetric<int> PERCENT_TOTAL_SIZE		( "PercentageDisplay", "PercentTotalSize" );