diff --git a/CMakeLists.txt b/CMakeLists.txt
index 924d6c3..dcd234a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,20 +9,15 @@ set(states abstractAppState.cpp)
 set(core inputManager.cpp mapping.h stateManager.cpp luaManager.cpp)
 set(util util.cpp)
 
-set(GLFW_DIR vb01/external/glfw)
-set(LUA_DIR external/lua-cmake)
-
-include_directories(../${GLFW_DIR}/include/GLFW)
-
-set(LUA_LIB_DIR ${LUA_DIR})
-add_subdirectory(${LUA_DIR})
-
 set(LIB_NAME gameBase)
 add_library(${LIB_NAME} STATIC ${states} ${core} ${util})
-set(GLFW_DIR ../vb01/external/glfw)
 
+set(GLFW_DIR external/glfw)
 set(GLFW_LIB_DIR ../vb01/build/external/glfw/src)
 target_include_directories(${LIB_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
 target_link_directories(${LIB_NAME} PUBLIC ${GLFW_LIB_DIR})
 
+set(LUA_DIR external/lua-cmake)
+add_subdirectory(${LUA_DIR})
+target_include_directories(${LIB_NAME} PUBLIC ${LUA_DIR}/external/upstream)
 target_link_libraries(${LIB_NAME} glfw lua::lib)
diff --git a/luaManager.h b/luaManager.h
index fcd0826..f65fdd5 100644
--- a/luaManager.h
+++ b/luaManager.h
@@ -1,9 +1,11 @@
 #ifndef LUA_MANAGER_H
 #define LUA_MANAGER_H
 
-#include <lua.hpp>
-#include <lauxlib.h>
-#include <lualib.h>
+extern "C"{
+	#include <lua.h>
+	#include <lauxlib.h>
+	#include <lualib.h>
+}
 
 #include <string>
 #include <vector>