diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4a106a..897d9e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,4 +44,3 @@ set(PRE_CONFIGURE_FILE "git.h.in")
 set(POST_CONFIGURE_FILE "src/git.h")
 include(git_watcher.cmake)
 add_dependencies(PokemonScriptTester check_git)
-target_include_directories(PokemonScriptTester PRIVATE extern/AngelscriptDebugger/extern/asio-1.18.2/include)
diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 10aca87..0865b4e 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -44,9 +44,10 @@ function(include_pkmnlib)
             ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib/extern)
 
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include)
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/extern/AngelscriptDebuggerServer/extern/asio-1.18.2/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include)
 
 
 endfunction()
\ No newline at end of file
diff --git a/src/Tester/TestRunner.hpp b/src/Tester/TestRunner.hpp
index e9d77e1..ad53065 100644
--- a/src/Tester/TestRunner.hpp
+++ b/src/Tester/TestRunner.hpp
@@ -3,7 +3,6 @@
 
 #include <PkmnLib/ScriptResolving/AngelScript/AngelScriptMetadata.hpp>
 #include <PkmnLib/ScriptResolving/AngelScript/ContextPool.hpp>
-#include "../../extern/AngelscriptDebugger/src/AngelscriptDebugger.hpp"
 #include "../../extern/termcolor.hpp"
 #include "Test.hpp"
 
@@ -36,7 +35,8 @@ public:
     i32 RunAll(bool waitForDebugger) {
         auto ctx = _scriptResolver->GetContextPool()->RequestContext();
         ctx->SetUserData(_scriptResolver->GetUserdata());
-        auto debugger = AngelscriptDebugger();
+        _scriptResolver->SetDebugger(new AngelscriptDebugger());
+        auto& debugger = *_scriptResolver->GetDebugger().GetValue();
         debugger.Run(8684);
         debugger.RegisterContext(ctx);
         if (waitForDebugger) {