diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index aeb304a..f7eb118 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -37,7 +37,6 @@ target_include_directories(unisim_server
     PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_LIST_DIR}/simulators
-    ${CMAKE_CURRENT_LIST_DIR}/extensions/CAN
     ${CMAKE_CURRENT_LIST_DIR}/extensions
     PRIVATE
 )
@@ -70,7 +69,7 @@ foreach(sim ${sims})
     # Create a library for each .cpp file
     add_library(sim_${LIB_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.hpp ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.cpp)
     target_link_libraries(sim_${LIB_NAME} PRIVATE Qt::SerialBus magic_enum::magic_enum nlohmann_json::nlohmann_json)
-    target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_CURRENT_LIST_DIR}/extensions/CAN_R1 ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include)
+    target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include)
     add_custom_command(TARGET sim_${LIB_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:sim_${LIB_NAME}>
diff --git a/server/simulator_base.hpp b/server/simulator_base.hpp
index a996754..539291d 100644
--- a/server/simulator_base.hpp
+++ b/server/simulator_base.hpp
@@ -4,6 +4,7 @@
 #include <QThread>
 #include <QTimer>
 
+#include "extensions/CAN_interface.hpp"
 #ifndef INTERNAL
 #include "ui.hpp"
 #else
@@ -11,7 +12,6 @@
 
 using json = nlohmann::json;
 
-#include "extensions/CAN_interface.hpp"
 Q_FORWARD_DECLARE_OBJC_CLASS(UI_item);
 #endif
 
diff --git a/server/simulators/can_debugger.cpp b/server/simulators/can_debugger.cpp
index a6a154e..a128bd7 100644
--- a/server/simulators/can_debugger.cpp
+++ b/server/simulators/can_debugger.cpp
@@ -1,4 +1,5 @@
 #include "can_debugger.hpp"
+#include "extensions/CAN_interface.hpp"
 
 EXPORT_SIM(Can_Debugger);