diff --git a/BigBaseV2/src/common.hpp b/BigBaseV2/src/common.hpp
index 7b9c41cb..0b6ca9d1 100644
--- a/BigBaseV2/src/common.hpp
+++ b/BigBaseV2/src/common.hpp
@@ -53,9 +53,6 @@
 #include "core/globals.hpp"
 #include "CPed.hpp"
 
-#include "services/globals_service.hpp"
-#include "services/vehicle_service.hpp"
-
 namespace big
 {
 	using namespace std::chrono_literals;
diff --git a/BigBaseV2/src/gui/window/dbg/modals/new_globals.cpp b/BigBaseV2/src/gui/window/dbg/modals/new_globals.cpp
index 402311f8..b1559af9 100644
--- a/BigBaseV2/src/gui/window/dbg/modals/new_globals.cpp
+++ b/BigBaseV2/src/gui/window/dbg/modals/new_globals.cpp
@@ -3,6 +3,7 @@
 #include "thread_pool.hpp"
 #include "natives.hpp"
 #include "script.hpp"
+#include "services/globals_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/gui/window/handling/handling_tabs.hpp b/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
index d7ce9f76..4c5769e4 100644
--- a/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
+++ b/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "current_profile/current_profile_tabs.hpp"
+#include "services/vehicle_service.hpp"
 
 namespace big::tab_handling
 {
diff --git a/BigBaseV2/src/gui/window/handling/modals/save_handling.cpp b/BigBaseV2/src/gui/window/handling/modals/save_handling.cpp
index 3f60d13a..f5d93caf 100644
--- a/BigBaseV2/src/gui/window/handling/modals/save_handling.cpp
+++ b/BigBaseV2/src/gui/window/handling/modals/save_handling.cpp
@@ -3,6 +3,7 @@
 #include "thread_pool.hpp"
 #include "natives.hpp"
 #include "script.hpp"
+#include "services/vehicle_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/gui/window/handling/modals/update_handling.cpp b/BigBaseV2/src/gui/window/handling/modals/update_handling.cpp
index 7ec7e399..88db18ac 100644
--- a/BigBaseV2/src/gui/window/handling/modals/update_handling.cpp
+++ b/BigBaseV2/src/gui/window/handling/modals/update_handling.cpp
@@ -3,6 +3,7 @@
 #include "thread_pool.hpp"
 #include "natives.hpp"
 #include "script.hpp"
+#include "services/vehicle_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/gui/window/window_handling.cpp b/BigBaseV2/src/gui/window/window_handling.cpp
index ba9b0286..27c3dee7 100644
--- a/BigBaseV2/src/gui/window/window_handling.cpp
+++ b/BigBaseV2/src/gui/window/window_handling.cpp
@@ -2,6 +2,7 @@
 #include "gui/window.hpp"
 #include "handling/handling_tabs.hpp"
 #include "imgui.h"
+#include "services/vehicle_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/main.cpp b/BigBaseV2/src/main.cpp
index 99256ccc..befd8862 100644
--- a/BigBaseV2/src/main.cpp
+++ b/BigBaseV2/src/main.cpp
@@ -9,6 +9,10 @@
 #include "script_mgr.hpp"
 #include "thread_pool.hpp"
 
+#include "services/globals_service.hpp"
+#include "services/mobile_service.hpp"
+#include "services/vehicle_service.hpp"
+
 BOOL APIENTRY DllMain(HMODULE hmod, DWORD reason, PVOID)
 {
 	using namespace big;
diff --git a/BigBaseV2/src/services/vehicle_service.hpp b/BigBaseV2/src/services/vehicle_service.hpp
index 7b3b921a..8886094f 100644
--- a/BigBaseV2/src/services/vehicle_service.hpp
+++ b/BigBaseV2/src/services/vehicle_service.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 
 namespace big
 {