diff --git a/ElunaTemplate.h b/ElunaTemplate.h
index d0bb6b8..b2dc902 100644
--- a/ElunaTemplate.h
+++ b/ElunaTemplate.h
@@ -401,4 +401,7 @@ ElunaObject::ElunaObject(T * obj, bool manageMemory) : _isvalid(false), _invalid
     SetValid(true);
 }
 
+template<typename T> const char* ElunaTemplate<T>::tname = NULL;
+template<typename T> bool ElunaTemplate<T>::manageMemory = false;
+
 #endif
diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index 075bbaa..e8cbb66 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -1263,9 +1263,6 @@ ElunaRegister<BattleGround> BattleGroundMethods[] =
     { NULL, NULL }
 };
 
-template<typename T> const char* ElunaTemplate<T>::tname = NULL;
-template<typename T> bool ElunaTemplate<T>::manageMemory = false;
-
 #if (!defined(TBC) && !defined(CLASSIC))
 // fix compile error about accessing vehicle destructor
 template<> int ElunaTemplate<Vehicle>::CollectGarbage(lua_State* L)