diff --git a/stepmania/src/LuaBinding.h b/stepmania/src/LuaBinding.h
index c538aecd19..7b082a23e7 100644
--- a/stepmania/src/LuaBinding.h
+++ b/stepmania/src/LuaBinding.h
@@ -20,12 +20,6 @@ inline bool MyLua_checkboolean (lua_State *L, int numArg)
 	return !!lua_toboolean(L,numArg);
 }
 
-#define SArg(n) (luaL_checkstring(L,n))
-#define IArg(n) (luaL_checkint(L,n))
-#define BArg(n) (MyLua_checkboolean(L,n))
-#define FArg(n) ((float) luaL_checknumber(L,n))
-
-
 template <typename T>
 struct RegType
 {
diff --git a/stepmania/src/LuaFunctions.h b/stepmania/src/LuaFunctions.h
index c08abd31f5..5b070c312b 100644
--- a/stepmania/src/LuaFunctions.h
+++ b/stepmania/src/LuaFunctions.h
@@ -1,14 +1,7 @@
 #ifndef LUA_FUNCTIONS_H
 #define LUA_FUNCTIONS_H
 
-#include "LuaBinding.h"
-
-extern "C"
-{
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-}
+#include "LuaManager.h"
 
 /* Linked list of functions we make available to Lua. */
 struct LuaFunctionList
diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h
index a475e59b23..ea2b959a20 100644
--- a/stepmania/src/LuaManager.h
+++ b/stepmania/src/LuaManager.h
@@ -159,6 +159,11 @@ namespace LuaHelpers
 	class Register##Fn { public: Register##Fn() { LuaManager::Register( Fn ); } }; \
 	static Register##Fn register##Fn;
 
+#define SArg(n) (luaL_checkstring(L,n))
+#define IArg(n) (luaL_checkint(L,n))
+#define BArg(n) (MyLua_checkboolean(L,n))
+#define FArg(n) ((float) luaL_checknumber(L,n))
+
 #endif
 
 /*