diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 2106f71ee..67d2b87c4 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -57,6 +57,7 @@
 #include <inttypes.h>
 #include <limits>
 #include <typeinfo>
+#include <type_traits>
 #include <utility>
 
 #ifdef _WIN32
diff --git a/aegisub/src/auto4_lua_utils.h b/aegisub/src/auto4_lua_utils.h
index f47872a3a..0ed36ab7c 100644
--- a/aegisub/src/auto4_lua_utils.h
+++ b/aegisub/src/auto4_lua_utils.h
@@ -21,17 +21,19 @@
 #include <libaegisub/fs.h>
 
 #include <string>
+#include <type_traits>
 #include <wx/string.h>
 
 inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); }
 inline void push_value(lua_State *L, const char *value) { lua_pushstring(L, value); }
 inline void push_value(lua_State *L, double value) { lua_pushnumber(L, value); }
 inline void push_value(lua_State *L, int value) { lua_pushinteger(L, value); }
-inline void push_value(lua_State *L, size_t value) { lua_pushinteger(L, value); }
-inline void push_value(lua_State *L, int64_t value) { lua_pushinteger(L, value); }
-inline void push_value(lua_State *L, long value) { lua_pushinteger(L, value); }
 inline void push_value(lua_State *L, void *p) { lua_pushlightuserdata(L, p); }
 
+template<typename Integer>
+typename std::enable_if<std::is_integral<Integer>::value>::type
+push_value(lua_State *L, Integer value) { lua_pushinteger(L, value); }
+
 inline void push_value(lua_State *L, wxString const& value) {
 	lua_pushstring(L, value.utf8_str());
 }