diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp
index 99da2c7f..d88bee85 100644
--- a/src/backend/backend.cpp
+++ b/src/backend/backend.cpp
@@ -14,8 +14,6 @@
 #include "services/vehicle/vehicle_control_service.hpp"
 #include "services/vehicle/xml_vehicles_service.hpp"
 #include "services/xml_maps/xml_map_service.hpp"
-#include "thread_pool.hpp"
-
 
 namespace big
 {
diff --git a/src/backend/commands/misc/recovery.cpp b/src/backend/commands/misc/recovery.cpp
index bf358b1b..40a97e12 100644
--- a/src/backend/commands/misc/recovery.cpp
+++ b/src/backend/commands/misc/recovery.cpp
@@ -1,5 +1,4 @@
 #include "backend/command.hpp"
-#include "natives.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/kick/breakup_kick.cpp b/src/backend/commands/player/kick/breakup_kick.cpp
index 98101f22..1bf7d0ff 100644
--- a/src/backend/commands/player/kick/breakup_kick.cpp
+++ b/src/backend/commands/player/kick/breakup_kick.cpp
@@ -1,8 +1,5 @@
-#include "backend/bool_command.hpp"
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
 #include "gta_util.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 #include <network/Network.hpp>
diff --git a/src/backend/commands/player/kick/complaint_kick.cpp b/src/backend/commands/player/kick/complaint_kick.cpp
index 955c97af..ea782862 100644
--- a/src/backend/commands/player/kick/complaint_kick.cpp
+++ b/src/backend/commands/player/kick/complaint_kick.cpp
@@ -1,8 +1,5 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
 #include "gta_util.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 
 #include <network/Network.hpp>
 
diff --git a/src/backend/commands/player/kick/end_session_kick.cpp b/src/backend/commands/player/kick/end_session_kick.cpp
index 42f7787e..8739771d 100644
--- a/src/backend/commands/player/kick/end_session_kick.cpp
+++ b/src/backend/commands/player/kick/end_session_kick.cpp
@@ -1,7 +1,5 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/scripts.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/kick/oom_kick.cpp b/src/backend/commands/player/kick/oom_kick.cpp
index 2d2f5ba3..985dab49 100644
--- a/src/backend/commands/player/kick/oom_kick.cpp
+++ b/src/backend/commands/player/kick/oom_kick.cpp
@@ -1,9 +1,5 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "packet.hpp"
-#include "pointers.hpp"
-#include "util/scripts.hpp"
 
 #include <network/snSession.hpp>
 
diff --git a/src/backend/commands/player/kick/script_host_kick.cpp b/src/backend/commands/player/kick/script_host_kick.cpp
index 798ad708..273c91fc 100644
--- a/src/backend/commands/player/kick/script_host_kick.cpp
+++ b/src/backend/commands/player/kick/script_host_kick.cpp
@@ -1,7 +1,5 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/scripts.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/kick/smart_kick.cpp b/src/backend/commands/player/kick/smart_kick.cpp
index d898dd22..12ed2f7d 100644
--- a/src/backend/commands/player/kick/smart_kick.cpp
+++ b/src/backend/commands/player/kick/smart_kick.cpp
@@ -1,8 +1,4 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/misc/clear_wanted_level.cpp b/src/backend/commands/player/misc/clear_wanted_level.cpp
index 2ceda5d4..05657955 100644
--- a/src/backend/commands/player/misc/clear_wanted_level.cpp
+++ b/src/backend/commands/player/misc/clear_wanted_level.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/globals.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/misc/enter_interior.cpp b/src/backend/commands/player/misc/enter_interior.cpp
index d8040f6b..5326c262 100644
--- a/src/backend/commands/player/misc/enter_interior.cpp
+++ b/src/backend/commands/player/misc/enter_interior.cpp
@@ -1,8 +1,6 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
-#include "util/misc.hpp"
 
 #include <script/globals/GPBD_FM.hpp>
 #include <script/globals/GlobalPlayerBD.hpp>
diff --git a/src/backend/commands/player/misc/give_ammo.cpp b/src/backend/commands/player/misc/give_ammo.cpp
index 30a6bf83..76ba9f85 100644
--- a/src/backend/commands/player/misc/give_ammo.cpp
+++ b/src/backend/commands/player/misc/give_ammo.cpp
@@ -1,8 +1,5 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "services/pickups/pickup_service.hpp"
-#include "util/globals.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/misc/give_armor.cpp b/src/backend/commands/player/misc/give_armor.cpp
index ff0a8e83..c9bb2ffc 100644
--- a/src/backend/commands/player/misc/give_armor.cpp
+++ b/src/backend/commands/player/misc/give_armor.cpp
@@ -1,8 +1,5 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "services/pickups/pickup_service.hpp"
-#include "util/globals.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/misc/give_health.cpp b/src/backend/commands/player/misc/give_health.cpp
index 67da6b1c..01fc3d1f 100644
--- a/src/backend/commands/player/misc/give_health.cpp
+++ b/src/backend/commands/player/misc/give_health.cpp
@@ -1,8 +1,5 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "services/pickups/pickup_service.hpp"
-#include "util/globals.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/misc/join_ceo.cpp b/src/backend/commands/player/misc/join_ceo.cpp
index 46c2f9ff..56e53e74 100644
--- a/src/backend/commands/player/misc/join_ceo.cpp
+++ b/src/backend/commands/player/misc/join_ceo.cpp
@@ -1,7 +1,4 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "script_function.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/misc/steal_identity.cpp b/src/backend/commands/player/misc/steal_identity.cpp
index f3a5ced1..57aa1ef1 100644
--- a/src/backend/commands/player/misc/steal_identity.cpp
+++ b/src/backend/commands/player/misc/steal_identity.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/ped.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/misc/steal_outfit.cpp b/src/backend/commands/player/misc/steal_outfit.cpp
index b4a1d414..ec13af01 100644
--- a/src/backend/commands/player/misc/steal_outfit.cpp
+++ b/src/backend/commands/player/misc/steal_outfit.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/ped.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/break_game.cpp b/src/backend/commands/player/toxic/break_game.cpp
index 63cf0612..e176d83d 100644
--- a/src/backend/commands/player/toxic/break_game.cpp
+++ b/src/backend/commands/player/toxic/break_game.cpp
@@ -1,7 +1,5 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
 #include "packet.hpp"
-#include "pointers.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/toxic/ceo_kick.cpp b/src/backend/commands/player/toxic/ceo_kick.cpp
index 458da0b2..0398967d 100644
--- a/src/backend/commands/player/toxic/ceo_kick.cpp
+++ b/src/backend/commands/player/toxic/ceo_kick.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 #include <script/globals/GPBD_FM_3.hpp>
diff --git a/src/backend/commands/player/toxic/explode_player.cpp b/src/backend/commands/player/toxic/explode_player.cpp
index a96bc419..f0546fa6 100644
--- a/src/backend/commands/player/toxic/explode_player.cpp
+++ b/src/backend/commands/player/toxic/explode_player.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/toxic.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/force_into_mission.cpp b/src/backend/commands/player/toxic/force_into_mission.cpp
index 00e8029b..11277ec8 100644
--- a/src/backend/commands/player/toxic/force_into_mission.cpp
+++ b/src/backend/commands/player/toxic/force_into_mission.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/give_all_weapons.cpp b/src/backend/commands/player/toxic/give_all_weapons.cpp
index e1f444c1..a39d4059 100644
--- a/src/backend/commands/player/toxic/give_all_weapons.cpp
+++ b/src/backend/commands/player/toxic/give_all_weapons.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "script.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 
diff --git a/src/backend/commands/player/toxic/kamikaze.cpp b/src/backend/commands/player/toxic/kamikaze.cpp
index 18faadf1..bcdca206 100644
--- a/src/backend/commands/player/toxic/kamikaze.cpp
+++ b/src/backend/commands/player/toxic/kamikaze.cpp
@@ -2,7 +2,6 @@
 #include "natives.hpp"
 #include "pointers.hpp"
 #include "services/gta_data/gta_data_service.hpp"
-#include "util/pathfind.hpp"
 #include "util/string_operations.hpp"
 #include "util/teleport.hpp"
 #include "util/vehicle.hpp"
diff --git a/src/backend/commands/player/toxic/kick_from_vehicle.cpp b/src/backend/commands/player/toxic/kick_from_vehicle.cpp
index 8258ffb0..da1fee59 100644
--- a/src/backend/commands/player/toxic/kick_from_vehicle.cpp
+++ b/src/backend/commands/player/toxic/kick_from_vehicle.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "gta/net_object_mgr.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/kill_player.cpp b/src/backend/commands/player/toxic/kill_player.cpp
index d1240d16..dd62c924 100644
--- a/src/backend/commands/player/toxic/kill_player.cpp
+++ b/src/backend/commands/player/toxic/kill_player.cpp
@@ -1,5 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/ragdoll_player.cpp b/src/backend/commands/player/toxic/ragdoll_player.cpp
index 7632fd0c..6d6f57b4 100644
--- a/src/backend/commands/player/toxic/ragdoll_player.cpp
+++ b/src/backend/commands/player/toxic/ragdoll_player.cpp
@@ -1,5 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/remove_all_weapons.cpp b/src/backend/commands/player/toxic/remove_all_weapons.cpp
index a0fb49dc..ec2459be 100644
--- a/src/backend/commands/player/toxic/remove_all_weapons.cpp
+++ b/src/backend/commands/player/toxic/remove_all_weapons.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/send_fake_ban_message.cpp b/src/backend/commands/player/toxic/send_fake_ban_message.cpp
index 556eed05..3e1cf178 100644
--- a/src/backend/commands/player/toxic/send_fake_ban_message.cpp
+++ b/src/backend/commands/player/toxic/send_fake_ban_message.cpp
@@ -1,10 +1,6 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
-#include <script/globals/GPBD_FM_3.hpp>
-
 namespace big
 {
 	class send_fake_ban_message : player_command
diff --git a/src/backend/commands/player/toxic/send_sext.cpp b/src/backend/commands/player/toxic/send_sext.cpp
index 9ad75ec9..881d9d50 100644
--- a/src/backend/commands/player/toxic/send_sext.cpp
+++ b/src/backend/commands/player/toxic/send_sext.cpp
@@ -1,10 +1,6 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
-#include <script/globals/GPBD_FM_3.hpp>
-
 namespace big
 {
 	static constexpr auto strippers = std::to_array({"HCH", "INF", "JUL", "NIK", "SAP", "TXI"});
diff --git a/src/backend/commands/player/toxic/send_squad.cpp b/src/backend/commands/player/toxic/send_squad.cpp
index 0a8a1af1..bf9dd0c7 100644
--- a/src/backend/commands/player/toxic/send_squad.cpp
+++ b/src/backend/commands/player/toxic/send_squad.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "services/squad_spawner/squad_spawner.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/send_to_apartment.cpp b/src/backend/commands/player/toxic/send_to_apartment.cpp
index 76ae6617..a30d158d 100644
--- a/src/backend/commands/player/toxic/send_to_apartment.cpp
+++ b/src/backend/commands/player/toxic/send_to_apartment.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/send_to_warehouse.cpp b/src/backend/commands/player/toxic/send_to_warehouse.cpp
index eea0d4c9..92b9abf7 100644
--- a/src/backend/commands/player/toxic/send_to_warehouse.cpp
+++ b/src/backend/commands/player/toxic/send_to_warehouse.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/set_wanted_level.cpp b/src/backend/commands/player/toxic/set_wanted_level.cpp
index 97bf81e4..5345768a 100644
--- a/src/backend/commands/player/toxic/set_wanted_level.cpp
+++ b/src/backend/commands/player/toxic/set_wanted_level.cpp
@@ -1,12 +1,9 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
 #include "script.hpp"
 #include "util/globals.hpp"
 
-#include <script/globals/GlobalPlayerBD.hpp>
-
 namespace big
 {
 	class set_wanted_level : player_command
diff --git a/src/backend/commands/player/toxic/show_transaction_error.cpp b/src/backend/commands/player/toxic/show_transaction_error.cpp
index a8dd6ec0..83e59390 100644
--- a/src/backend/commands/player/toxic/show_transaction_error.cpp
+++ b/src/backend/commands/player/toxic/show_transaction_error.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 #include <script/globals/GPBD_FM_3.hpp>
diff --git a/src/backend/commands/player/toxic/start_script.cpp b/src/backend/commands/player/toxic/start_script.cpp
index ad098c9f..302f6883 100644
--- a/src/backend/commands/player/toxic/start_script.cpp
+++ b/src/backend/commands/player/toxic/start_script.cpp
@@ -1,12 +1,6 @@
 #include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 #include "util/scripts.hpp"
 
-#include <script/globals/GPBD_FM_3.hpp>
-
 namespace big
 {
 	template<rage::joaat_t script_hash>
diff --git a/src/backend/commands/player/toxic/trigger_ceo_raid.cpp b/src/backend/commands/player/toxic/trigger_ceo_raid.cpp
index 39612c4b..75ae97e0 100644
--- a/src/backend/commands/player/toxic/trigger_ceo_raid.cpp
+++ b/src/backend/commands/player/toxic/trigger_ceo_raid.cpp
@@ -1,5 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/toxic/turn_into_beast.cpp b/src/backend/commands/player/toxic/turn_into_beast.cpp
index e44dc8aa..6a8c839b 100644
--- a/src/backend/commands/player/toxic/turn_into_beast.cpp
+++ b/src/backend/commands/player/toxic/turn_into_beast.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "core/scr_globals.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/scripts.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/troll/bring.cpp b/src/backend/commands/player/troll/bring.cpp
index 88ba54af..381c0f3c 100644
--- a/src/backend/commands/player/troll/bring.cpp
+++ b/src/backend/commands/player/troll/bring.cpp
@@ -1,7 +1,5 @@
 #include "backend/player_command.hpp"
 #include "fiber_pool.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/teleport.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/troll/set_bounty.cpp b/src/backend/commands/player/troll/set_bounty.cpp
index 8e0eddb3..a52db270 100644
--- a/src/backend/commands/player/troll/set_bounty.cpp
+++ b/src/backend/commands/player/troll/set_bounty.cpp
@@ -1,7 +1,5 @@
 #include "backend/bool_command.hpp"
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/troll.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/troll/teleport.cpp b/src/backend/commands/player/troll/teleport.cpp
index 85260aa7..5146e92a 100644
--- a/src/backend/commands/player/troll/teleport.cpp
+++ b/src/backend/commands/player/troll/teleport.cpp
@@ -1,8 +1,5 @@
 #include "util/teleport.hpp"
-
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/troll/teleport_into_vehicle.cpp b/src/backend/commands/player/troll/teleport_into_vehicle.cpp
index 0b040063..e5d1853a 100644
--- a/src/backend/commands/player/troll/teleport_into_vehicle.cpp
+++ b/src/backend/commands/player/troll/teleport_into_vehicle.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/teleport.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/vehicle/boost_vehicle.cpp b/src/backend/commands/player/vehicle/boost_vehicle.cpp
index 685a669e..a70fb076 100644
--- a/src/backend/commands/player/vehicle/boost_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/boost_vehicle.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util\entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/break_doors.cpp b/src/backend/commands/player/vehicle/break_doors.cpp
index fc60c821..dd318200 100644
--- a/src/backend/commands/player/vehicle/break_doors.cpp
+++ b/src/backend/commands/player/vehicle/break_doors.cpp
@@ -2,7 +2,6 @@
 #include "gta/net_game_event.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
-#include "util/teleport.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/burst_tyres.cpp b/src/backend/commands/player/vehicle/burst_tyres.cpp
index 828af186..520eedb5 100644
--- a/src/backend/commands/player/vehicle/burst_tyres.cpp
+++ b/src/backend/commands/player/vehicle/burst_tyres.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/close_doors.cpp b/src/backend/commands/player/vehicle/close_doors.cpp
index a793dfa9..62766d21 100644
--- a/src/backend/commands/player/vehicle/close_doors.cpp
+++ b/src/backend/commands/player/vehicle/close_doors.cpp
@@ -1,7 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
+
 namespace big
 {
 	class close_doors : player_command
diff --git a/src/backend/commands/player/vehicle/delete_vehicle.cpp b/src/backend/commands/player/vehicle/delete_vehicle.cpp
index bb2ede32..78e01296 100644
--- a/src/backend/commands/player/vehicle/delete_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/delete_vehicle.cpp
@@ -1,6 +1,4 @@
 #include "backend/player_command.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
 #include "util/entity.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/vehicle/downgrade_vehicle.cpp b/src/backend/commands/player/vehicle/downgrade_vehicle.cpp
index 34711f84..b8c8756e 100644
--- a/src/backend/commands/player/vehicle/downgrade_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/downgrade_vehicle.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/flip_180.cpp b/src/backend/commands/player/vehicle/flip_180.cpp
index 73002ed2..9c2ffdd7 100644
--- a/src/backend/commands/player/vehicle/flip_180.cpp
+++ b/src/backend/commands/player/vehicle/flip_180.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/flying_vehicle.cpp b/src/backend/commands/player/vehicle/flying_vehicle.cpp
index 3e4d0c97..9c407669 100644
--- a/src/backend/commands/player/vehicle/flying_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/flying_vehicle.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/kill_engine.cpp b/src/backend/commands/player/vehicle/kill_engine.cpp
index 97d6b18b..a1ca5cbb 100644
--- a/src/backend/commands/player/vehicle/kill_engine.cpp
+++ b/src/backend/commands/player/vehicle/kill_engine.cpp
@@ -1,7 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
+
 namespace big
 {
 	class kill_engine : player_command
diff --git a/src/backend/commands/player/vehicle/lock_doors.cpp b/src/backend/commands/player/vehicle/lock_doors.cpp
index 2962281e..bd96feba 100644
--- a/src/backend/commands/player/vehicle/lock_doors.cpp
+++ b/src/backend/commands/player/vehicle/lock_doors.cpp
@@ -1,7 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
+#include "gta/enums.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/open_doors.cpp b/src/backend/commands/player/vehicle/open_doors.cpp
index 82cc3b29..ce134701 100644
--- a/src/backend/commands/player/vehicle/open_doors.cpp
+++ b/src/backend/commands/player/vehicle/open_doors.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/remote_control_vehicle.cpp b/src/backend/commands/player/vehicle/remote_control_vehicle.cpp
index aeb027b6..ab689066 100644
--- a/src/backend/commands/player/vehicle/remote_control_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/remote_control_vehicle.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/vehicle.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/vehicle/smash_windows.cpp b/src/backend/commands/player/vehicle/smash_windows.cpp
index 4ab9dbb4..419924e1 100644
--- a/src/backend/commands/player/vehicle/smash_windows.cpp
+++ b/src/backend/commands/player/vehicle/smash_windows.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/special_ability.cpp b/src/backend/commands/player/vehicle/special_ability.cpp
index 0f980903..c5a61f21 100644
--- a/src/backend/commands/player/vehicle/special_ability.cpp
+++ b/src/backend/commands/player/vehicle/special_ability.cpp
@@ -1,7 +1,6 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
-#include "util/teleport.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/stop_vehicle.cpp b/src/backend/commands/player/vehicle/stop_vehicle.cpp
index c74ba66b..392dd2da 100644
--- a/src/backend/commands/player/vehicle/stop_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/stop_vehicle.cpp
@@ -1,7 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
+
 namespace big
 {
 	class stop_vehicle : player_command
diff --git a/src/backend/commands/player/vehicle/unlock_doors.cpp b/src/backend/commands/player/vehicle/unlock_doors.cpp
index 87e12036..9bc1453e 100644
--- a/src/backend/commands/player/vehicle/unlock_doors.cpp
+++ b/src/backend/commands/player/vehicle/unlock_doors.cpp
@@ -1,7 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
+#include "util/entity.hpp"
+#include "gta/enums.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/player/vehicle/upgrade_vehicle.cpp b/src/backend/commands/player/vehicle/upgrade_vehicle.cpp
index 96fc1f23..29c74ca8 100644
--- a/src/backend/commands/player/vehicle/upgrade_vehicle.cpp
+++ b/src/backend/commands/player/vehicle/upgrade_vehicle.cpp
@@ -1,7 +1,5 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
 #include "util/vehicle.hpp"
 
 namespace big
diff --git a/src/backend/commands/player/vehicle/window_tint.cpp b/src/backend/commands/player/vehicle/window_tint.cpp
index 8e22c92d..a6100be7 100644
--- a/src/backend/commands/player/vehicle/window_tint.cpp
+++ b/src/backend/commands/player/vehicle/window_tint.cpp
@@ -1,8 +1,7 @@
 #include "backend/player_command.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "util/teleport.hpp"
-#include "util/vehicle.hpp"
+#include "util/entity.hpp"
+#include "gta/vehicle_values.hpp"
 
 namespace big
 {
diff --git a/src/backend/commands/session/join_player.cpp b/src/backend/commands/session/join_player.cpp
index ca8b192e..ca14474b 100644
--- a/src/backend/commands/session/join_player.cpp
+++ b/src/backend/commands/session/join_player.cpp
@@ -1,7 +1,5 @@
 #include "backend/command.hpp"
-#include "network/CNetworkPlayerMgr.hpp"
 #include "pointers.hpp"
-#include "services/players/player_service.hpp"
 #include "socialclub/FriendRegistry.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "services/api/api_service.hpp"
diff --git a/src/backend/context/command_context.hpp b/src/backend/context/command_context.hpp
index ae55fc58..0624f4f1 100644
--- a/src/backend/context/command_context.hpp
+++ b/src/backend/context/command_context.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "core/enums.hpp"
-#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/src/backend/context/default_command_context.cpp b/src/backend/context/default_command_context.cpp
index c3535ec8..46dc4f5b 100644
--- a/src/backend/context/default_command_context.cpp
+++ b/src/backend/context/default_command_context.cpp
@@ -1,4 +1,5 @@
 #include "default_command_context.hpp"
+#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/src/backend/looped/hud/hud_transition_state.cpp b/src/backend/looped/hud/hud_transition_state.cpp
index 88ba95d5..547b5be9 100644
--- a/src/backend/looped/hud/hud_transition_state.cpp
+++ b/src/backend/looped/hud/hud_transition_state.cpp
@@ -5,7 +5,6 @@
 #include "gta_util.hpp"
 #include "natives.hpp"
 #include "script_global.hpp"
-#include "services/players/player_service.hpp"
 
 // Credits: QuickNET
 namespace big
diff --git a/src/backend/looped/player/remote_control_vehicle.cpp b/src/backend/looped/player/remote_control_vehicle.cpp
index 27dd7b02..cc602d4c 100644
--- a/src/backend/looped/player/remote_control_vehicle.cpp
+++ b/src/backend/looped/player/remote_control_vehicle.cpp
@@ -1,7 +1,6 @@
 #include "backend/looped/looped.hpp"
 #include "fiber_pool.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/entity.hpp"
 
 namespace big
diff --git a/src/backend/looped/player/spectate.cpp b/src/backend/looped/player/spectate.cpp
index b8f75bd2..0fc21256 100644
--- a/src/backend/looped/player/spectate.cpp
+++ b/src/backend/looped/player/spectate.cpp
@@ -3,7 +3,6 @@
 #include "backend/looped/looped.hpp"
 #include "natives.hpp"
 #include "services/players/player_service.hpp"
-#include "util/globals.hpp"
 
 namespace big
 {
diff --git a/src/backend/looped/player/toxic_options.cpp b/src/backend/looped/player/toxic_options.cpp
index c4e01cd8..87d2dd1b 100644
--- a/src/backend/looped/player/toxic_options.cpp
+++ b/src/backend/looped/player/toxic_options.cpp
@@ -1,8 +1,5 @@
 #include "backend/looped/looped.hpp"
-#include "gta/pickup_rewards.hpp"
 #include "services/players/player_service.hpp"
-#include "util/globals.hpp"
-#include "util/misc.hpp"
 #include "util/toxic.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/clean_player.cpp b/src/backend/looped/self/clean_player.cpp
index 6001b32c..4708e4ed 100644
--- a/src/backend/looped/self/clean_player.cpp
+++ b/src/backend/looped/self/clean_player.cpp
@@ -1,5 +1,4 @@
 #include "backend/looped_command.hpp"
-#include "natives.hpp"
 #include "util/entity.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/dance_mode.cpp b/src/backend/looped/self/dance_mode.cpp
index 20e6e9e4..968e5487 100644
--- a/src/backend/looped/self/dance_mode.cpp
+++ b/src/backend/looped/self/dance_mode.cpp
@@ -2,7 +2,6 @@
 #include "natives.hpp"
 #include "script_function.hpp"
 #include "services/script_patcher/script_patcher_service.hpp"
-#include "util/entity.hpp"
 #include "util/scripts.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/fast_respawn.cpp b/src/backend/looped/self/fast_respawn.cpp
index 7dd7b3fb..aab12e9e 100644
--- a/src/backend/looped/self/fast_respawn.cpp
+++ b/src/backend/looped/self/fast_respawn.cpp
@@ -1,4 +1,3 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
 #include "util/misc.hpp"
 #include "core/scr_globals.hpp"
diff --git a/src/backend/looped/self/godmode.cpp b/src/backend/looped/self/godmode.cpp
index 6a37c4ac..4198ab8e 100644
--- a/src/backend/looped/self/godmode.cpp
+++ b/src/backend/looped/self/godmode.cpp
@@ -1,6 +1,4 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "natives.hpp"
 
 namespace big
 {
diff --git a/src/backend/looped/self/health.cpp b/src/backend/looped/self/health.cpp
index 39773bb0..44598351 100644
--- a/src/backend/looped/self/health.cpp
+++ b/src/backend/looped/self/health.cpp
@@ -1,5 +1,4 @@
 #include "backend/looped_command.hpp"
-#include "gta/enums.hpp"
 #include "natives.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/hud.cpp b/src/backend/looped/self/hud.cpp
index 92b2547a..efd1f9dc 100644
--- a/src/backend/looped/self/hud.cpp
+++ b/src/backend/looped/self/hud.cpp
@@ -1,5 +1,4 @@
 #include "backend/looped/looped.hpp"
-#include "core/data/hud_component_names.hpp"
 #include "natives.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/invisibility.cpp b/src/backend/looped/self/invisibility.cpp
index 1a263c6a..611b50d1 100644
--- a/src/backend/looped/self/invisibility.cpp
+++ b/src/backend/looped/self/invisibility.cpp
@@ -1,12 +1,7 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "core/scr_globals.hpp"
-#include "fiber_pool.hpp"
 #include "natives.hpp"
 #include "services/script_patcher/script_patcher_service.hpp"
 
-#include <script/globals/GlobalPlayerBD.hpp>
-
 namespace big
 {
 	class invisibility : looped_command
diff --git a/src/backend/looped/self/no_collision.cpp b/src/backend/looped/self/no_collision.cpp
index b82228d4..e9a7a08e 100644
--- a/src/backend/looped/self/no_collision.cpp
+++ b/src/backend/looped/self/no_collision.cpp
@@ -1,7 +1,4 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "fiber_pool.hpp"
-#include "natives.hpp"
 
 #include <base/phArchetype.hpp>
 #include <base/phBoundComposite.hpp>
diff --git a/src/backend/looped/self/no_ragdoll.cpp b/src/backend/looped/self/no_ragdoll.cpp
index ac847fa5..a68dea9d 100644
--- a/src/backend/looped/self/no_ragdoll.cpp
+++ b/src/backend/looped/self/no_ragdoll.cpp
@@ -1,6 +1,4 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "fiber_pool.hpp"
 #include "natives.hpp"
 
 namespace big
diff --git a/src/backend/looped/self/no_water_collision.cpp b/src/backend/looped/self/no_water_collision.cpp
index fca530d6..bc6164e8 100644
--- a/src/backend/looped/self/no_water_collision.cpp
+++ b/src/backend/looped/self/no_water_collision.cpp
@@ -1,7 +1,4 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "fiber_pool.hpp"
-#include "natives.hpp"
 
 namespace big
 {
diff --git a/src/backend/looped/self/noclip.cpp b/src/backend/looped/self/noclip.cpp
index cdc6ae11..2013eda7 100644
--- a/src/backend/looped/self/noclip.cpp
+++ b/src/backend/looped/self/noclip.cpp
@@ -1,6 +1,4 @@
-#include "backend/looped/looped.hpp"
 #include "backend/looped_command.hpp"
-#include "fiber_pool.hpp"
 #include "gta/enums.hpp"
 #include "natives.hpp"
 #include "services/orbital_drone/orbital_drone.hpp"
diff --git a/src/backend/looped/self/persist_outfit.cpp b/src/backend/looped/self/persist_outfit.cpp
index d9574de5..452f003e 100644
--- a/src/backend/looped/self/persist_outfit.cpp
+++ b/src/backend/looped/self/persist_outfit.cpp
@@ -2,9 +2,7 @@
 #include "core/scr_globals.hpp"
 #include "file_manager.hpp"
 #include "gta/enums.hpp"
-#include "logger/logger.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "services/outfit/outfit_service.hpp"
 #include "services/tunables/tunables_service.hpp"
 
diff --git a/src/backend/looped/self/ptfx.cpp b/src/backend/looped/self/ptfx.cpp
index 6dc614d4..ec112441 100644
--- a/src/backend/looped/self/ptfx.cpp
+++ b/src/backend/looped/self/ptfx.cpp
@@ -1,5 +1,4 @@
 #include "backend/looped_command.hpp"
-#include "core/data/ptfx_effects.hpp"
 #include "gta/enums.hpp"
 #include "natives.hpp"
 
diff --git a/src/backend/looped/self/super_hero_fly.cpp b/src/backend/looped/self/super_hero_fly.cpp
index a9bb419e..2e8cb8dc 100644
--- a/src/backend/looped/self/super_hero_fly.cpp
+++ b/src/backend/looped/self/super_hero_fly.cpp
@@ -5,7 +5,6 @@
 #include "natives.hpp"
 #include "util/entity.hpp"
 #include "util/math.hpp"
-#include "util/notify.hpp"
 #include "util/ped.hpp"
 #include "util/vehicle.hpp"
 
diff --git a/src/backend/looped/self/unlimited_oxygen.cpp b/src/backend/looped/self/unlimited_oxygen.cpp
index c6184f37..050421a8 100644
--- a/src/backend/looped/self/unlimited_oxygen.cpp
+++ b/src/backend/looped/self/unlimited_oxygen.cpp
@@ -1,5 +1,4 @@
 #include "backend/looped_command.hpp"
-#include "natives.hpp"
 
 #include <ped/CPedIntelligence.hpp>
 
diff --git a/src/backend/looped/weapons/aimbot.cpp b/src/backend/looped/weapons/aimbot.cpp
index 0d4ab1a9..06e65f7e 100644
--- a/src/backend/looped/weapons/aimbot.cpp
+++ b/src/backend/looped/weapons/aimbot.cpp
@@ -1,15 +1,10 @@
-#include "backend/int_command.hpp"
 #include "backend/looped_command.hpp"
 #include "gta/enums.hpp"
 #include "hooking/hooking.hpp"
 #include "natives.hpp"
-#include "util/entity.hpp"
 #include "util/math.hpp"
-#include "util/misc.hpp"
 #include "util/pools.hpp"
 
-#include <numbers>
-
 namespace big
 {
 	bool_command g_aimbot_only_on_player("aimonlyatplayer", "BACKEND_LOOPED_WEAPONS_AIM_ONLY_AT_PLAYER", "BACKEND_LOOPED_WEAPONS_AIM_ONLY_AT_PLAYER_DESC",
diff --git a/src/backend/player_command.cpp b/src/backend/player_command.cpp
index 13458ed1..930096b7 100644
--- a/src/backend/player_command.cpp
+++ b/src/backend/player_command.cpp
@@ -1,8 +1,6 @@
 #include "player_command.hpp"
 
 #include "fiber_pool.hpp"
-#include "util/math.hpp"
-#include "util/string_operations.hpp"
 
 namespace big
 {
diff --git a/src/backend/reactions/interloper_reaction.cpp b/src/backend/reactions/interloper_reaction.cpp
index 2461b169..cfcf9852 100644
--- a/src/backend/reactions/interloper_reaction.cpp
+++ b/src/backend/reactions/interloper_reaction.cpp
@@ -1,10 +1,4 @@
 #include "interloper_reaction.hpp"
-
-#include "backend/player_command.hpp"
-#include "fiber_pool.hpp"
-#include "hooking/hooking.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 #include "util/chat.hpp"
 
 namespace big
diff --git a/src/backend/reactions/reaction.cpp b/src/backend/reactions/reaction.cpp
index b10cc226..f53a95ac 100644
--- a/src/backend/reactions/reaction.cpp
+++ b/src/backend/reactions/reaction.cpp
@@ -2,9 +2,6 @@
 
 #include "backend/player_command.hpp"
 #include "fiber_pool.hpp"
-#include "hooking/hooking.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "util/chat.hpp"
 
diff --git a/src/byte_patch_manager.cpp b/src/byte_patch_manager.cpp
index e01673c3..21f6eb40 100644
--- a/src/byte_patch_manager.cpp
+++ b/src/byte_patch_manager.cpp
@@ -1,7 +1,6 @@
 #include "byte_patch_manager.hpp"
 
 #include "gta/net_array.hpp"
-#include "hooking/hooking.hpp"
 #include "memory/byte_patch.hpp"
 #include "pointers.hpp"
 #include "util/explosion_anti_cheat_bypass.hpp"
diff --git a/src/fiber_pool.cpp b/src/fiber_pool.cpp
index bcf2ccb4..2595e0a0 100644
--- a/src/fiber_pool.cpp
+++ b/src/fiber_pool.cpp
@@ -1,6 +1,5 @@
 #include "fiber_pool.hpp"
 
-#include "common.hpp"
 #include "script.hpp"
 #include "script_mgr.hpp"
 #include <script/tlsContext.hpp>
diff --git a/src/fiber_pool.hpp b/src/fiber_pool.hpp
index 2f4b5d8b..456f6951 100644
--- a/src/fiber_pool.hpp
+++ b/src/fiber_pool.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 
 namespace big
 {
diff --git a/src/file_manager/file.cpp b/src/file_manager/file.cpp
index 92507620..65230051 100644
--- a/src/file_manager/file.cpp
+++ b/src/file_manager/file.cpp
@@ -1,6 +1,4 @@
 #include "file.hpp"
-
-#include "common.hpp"
 #include "file_manager.hpp"
 
 namespace big
diff --git a/src/file_manager/folder.cpp b/src/file_manager/folder.cpp
index b4becd9f..aeb34368 100644
--- a/src/file_manager/folder.cpp
+++ b/src/file_manager/folder.cpp
@@ -1,7 +1,5 @@
 #include "folder.hpp"
 
-#include "file_manager.hpp"
-
 namespace big
 {
 	folder::folder(const std::filesystem::path& folder_path) :
diff --git a/src/function_types.hpp b/src/function_types.hpp
index b6682bb8..9882bcfa 100644
--- a/src/function_types.hpp
+++ b/src/function_types.hpp
@@ -69,9 +69,6 @@ namespace big::functions
 
 	using trigger_script_event = void (*)(int event_group, int64_t* args, int arg_count, int player_bits, int event_id);
 
-
-	using increment_stat_event = bool (*)(uint64_t net_event_struct, int64_t sender, int64_t a3);
-
 	using ptr_to_handle = Entity (*)(void*);
 	using handle_to_ptr = rage::CDynamicEntity* (*)(Entity);
 
diff --git a/src/gta/fidevice.cpp b/src/gta/fidevice.cpp
index 478ebeff..bc240c0c 100644
--- a/src/gta/fidevice.cpp
+++ b/src/gta/fidevice.cpp
@@ -1,6 +1,5 @@
 #include "fidevice.hpp"
 
-#include "hooking/hooking.hpp"
 #include "pointers.hpp"
 
 namespace rage
diff --git a/src/gui.cpp b/src/gui.cpp
index 49704672..f3e6df64 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -1,6 +1,5 @@
 #include "gui.hpp"
 
-#include "common.hpp"
 #include "natives.hpp"
 #include "renderer/renderer.hpp"
 #include "script.hpp"
diff --git a/src/gui/components/custom_text.cpp b/src/gui/components/custom_text.cpp
index 2b1a1f23..0445e439 100644
--- a/src/gui/components/custom_text.cpp
+++ b/src/gui/components/custom_text.cpp
@@ -1,4 +1,3 @@
-#include "fonts/fonts.hpp"
 #include "gui/components/components.hpp"
 
 namespace big
diff --git a/src/gui/components/icon.cpp b/src/gui/components/icon.cpp
index 368ac6e0..61beedde 100644
--- a/src/gui/components/icon.cpp
+++ b/src/gui/components/icon.cpp
@@ -1,4 +1,3 @@
-#include "fonts/fonts.hpp"
 #include "gui/components/components.hpp"
 
 namespace big
diff --git a/src/gui/components/input_text.cpp b/src/gui/components/input_text.cpp
index 4367e7c8..d1895221 100644
--- a/src/gui/components/input_text.cpp
+++ b/src/gui/components/input_text.cpp
@@ -1,7 +1,6 @@
 #include "fiber_pool.hpp"
 #include "gui/components/components.hpp"
 #include "misc/cpp/imgui_stdlib.h"
-#include "natives.hpp"
 
 namespace big
 {
diff --git a/src/gui/components/input_text_with_hint.cpp b/src/gui/components/input_text_with_hint.cpp
index 90fffe94..4e7abbbb 100644
--- a/src/gui/components/input_text_with_hint.cpp
+++ b/src/gui/components/input_text_with_hint.cpp
@@ -1,7 +1,6 @@
 #include "fiber_pool.hpp"
 #include "gui/components/components.hpp"
 #include "misc/cpp/imgui_stdlib.h"
-#include "natives.hpp"
 
 namespace big
 {
diff --git a/src/gui/components/small.cpp b/src/gui/components/small.cpp
index 64730524..2d436f35 100644
--- a/src/gui/components/small.cpp
+++ b/src/gui/components/small.cpp
@@ -1,4 +1,3 @@
-#include "fonts/fonts.hpp"
 #include "gui/components/components.hpp"
 
 namespace big
diff --git a/src/gui/components/sub_title.cpp b/src/gui/components/sub_title.cpp
index 9582c714..76e4f03f 100644
--- a/src/gui/components/sub_title.cpp
+++ b/src/gui/components/sub_title.cpp
@@ -1,4 +1,3 @@
-#include "fonts/fonts.hpp"
 #include "gui/components/components.hpp"
 
 namespace big
diff --git a/src/gui/components/title.cpp b/src/gui/components/title.cpp
index 85684b4a..01118210 100644
--- a/src/gui/components/title.cpp
+++ b/src/gui/components/title.cpp
@@ -1,4 +1,3 @@
-#include "fonts/fonts.hpp"
 #include "gui/components/components.hpp"
 
 namespace big
diff --git a/src/gui/handling/modals/save_handling.cpp b/src/gui/handling/modals/save_handling.cpp
index 228d099d..9c6bf3b1 100644
--- a/src/gui/handling/modals/save_handling.cpp
+++ b/src/gui/handling/modals/save_handling.cpp
@@ -1,6 +1,4 @@
 #include "../current_profile/current_profile_tabs.hpp"
-#include "fiber_pool.hpp"
-#include "script.hpp"
 #include "services/vehicle/handling_service.hpp"
 #include "thread_pool.hpp"
 #include "views/view.hpp"
diff --git a/src/hooking/call_hook.cpp b/src/hooking/call_hook.cpp
index abee5d11..d73220c5 100644
--- a/src/hooking/call_hook.cpp
+++ b/src/hooking/call_hook.cpp
@@ -1,4 +1,3 @@
-#include "common.hpp"
 #include "call_hook.hpp"
 
 namespace
diff --git a/src/hooking/hooking.cpp b/src/hooking/hooking.cpp
index 81b81c64..3553ac81 100644
--- a/src/hooking/hooking.cpp
+++ b/src/hooking/hooking.cpp
@@ -2,9 +2,6 @@
 
 #include "pointers.hpp"
 
-#include <player/CNonPhysicalPlayerData.hpp>
-#include <network/CNetGamePlayer.hpp>
-
 namespace big
 {
 	hooking::hooking() :
diff --git a/src/hooking/hooking.hpp b/src/hooking/hooking.hpp
index d16d9677..f75d85b1 100644
--- a/src/hooking/hooking.hpp
+++ b/src/hooking/hooking.hpp
@@ -95,7 +95,6 @@ namespace big
 		static void received_event(rage::netEventMgr* event_manager, CNetGamePlayer* source_player, CNetGamePlayer* target_player, uint16_t event_id, int event_index, int event_handled_bitset, int unk, rage::datBitBuffer* bit_buffer);
 
 		// these two aren't actually hooks, just helper functions for hooks
-		static bool increment_stat_event(CNetworkIncrementStatEvent* net_event_struct, CNetGamePlayer* sender);
 		static bool scripted_game_event(CScriptedGameEvent* scripted_game_event, CNetGamePlayer* player);
 
 		static bool receive_net_message(void* a1, rage::netConnectionManager* mgr, rage::netEvent* event);
diff --git a/src/hooking/vmt_hook.cpp b/src/hooking/vmt_hook.cpp
index b5884531..5a53a9fd 100644
--- a/src/hooking/vmt_hook.cpp
+++ b/src/hooking/vmt_hook.cpp
@@ -1,7 +1,5 @@
 #include "vmt_hook.hpp"
 
-#include "common.hpp"
-
 namespace big
 {
 	vmt_hook::vmt_hook(void* obj, std::size_t num_funcs) :
diff --git a/src/hooks/fuzzer/read_bits_single.cpp b/src/hooks/fuzzer/read_bits_single.cpp
index 0c45ebc5..b65940bc 100644
--- a/src/hooks/fuzzer/read_bits_single.cpp
+++ b/src/hooks/fuzzer/read_bits_single.cpp
@@ -1,5 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "natives.hpp"
 #include "util/fuzzer.hpp"
 
 namespace big
diff --git a/src/hooks/gui/swap_chain_present.cpp b/src/hooks/gui/swap_chain_present.cpp
index ae74ad12..cfd9f210 100644
--- a/src/hooks/gui/swap_chain_present.cpp
+++ b/src/hooks/gui/swap_chain_present.cpp
@@ -1,6 +1,5 @@
 #include "hooking/hooking.hpp"
 #include "renderer/renderer.hpp"
-#include "script.hpp"
 
 namespace big
 {
diff --git a/src/hooks/gui/swap_chain_resizebuffers.cpp b/src/hooks/gui/swap_chain_resizebuffers.cpp
index a68596aa..88d23ffc 100644
--- a/src/hooks/gui/swap_chain_resizebuffers.cpp
+++ b/src/hooks/gui/swap_chain_resizebuffers.cpp
@@ -1,6 +1,5 @@
 #include "hooking/hooking.hpp"
 #include "renderer/renderer.hpp"
-#include "script.hpp"
 
 namespace big
 {
diff --git a/src/hooks/gui/wndproc.cpp b/src/hooks/gui/wndproc.cpp
index 86eb8368..72931b50 100644
--- a/src/hooks/gui/wndproc.cpp
+++ b/src/hooks/gui/wndproc.cpp
@@ -1,6 +1,5 @@
 #include "hooking/hooking.hpp"
 #include "renderer/renderer.hpp"
-#include "script.hpp"
 
 namespace big
 {
diff --git a/src/hooks/info/get_network_event_data.cpp b/src/hooks/info/get_network_event_data.cpp
index 435c468f..3860c93c 100644
--- a/src/hooks/info/get_network_event_data.cpp
+++ b/src/hooks/info/get_network_event_data.cpp
@@ -5,7 +5,6 @@
 #include "util/misc.hpp"
 #include "util/session.hpp"
 
-#include <entities/CDynamicEntity.hpp>
 #include <script/globals/GPBD_FM.hpp>
 #include <script/globals/GlobalPlayerBD.hpp>
 
diff --git a/src/hooks/matchmaking/start_matchmaking_find_sessions.cpp b/src/hooks/matchmaking/start_matchmaking_find_sessions.cpp
index 5cc576d5..bd46463f 100644
--- a/src/hooks/matchmaking/start_matchmaking_find_sessions.cpp
+++ b/src/hooks/matchmaking/start_matchmaking_find_sessions.cpp
@@ -1,5 +1,4 @@
 #include "fiber_pool.hpp"
-#include "function_types.hpp"
 #include "hooking/hooking.hpp"
 #include "services/matchmaking/matchmaking_service.hpp"
 #include "services/player_database/player_database_service.hpp"
diff --git a/src/hooks/misc/add_gamer_to_session.cpp b/src/hooks/misc/add_gamer_to_session.cpp
index f21aa6a2..a78979c1 100644
--- a/src/hooks/misc/add_gamer_to_session.cpp
+++ b/src/hooks/misc/add_gamer_to_session.cpp
@@ -1,9 +1,6 @@
-#include "gta_util.hpp"
 #include "hooking/hooking.hpp"
 #include "services/players/player_service.hpp"
 
-#include <network/CNetGamePlayerDataMsg.hpp>
-#include <network/Network.hpp>
 #include <network/RemoteGamerInfoMsg.hpp>
 
 namespace big
diff --git a/src/hooks/misc/get_model_info.cpp b/src/hooks/misc/get_model_info.cpp
index 4ab442e4..d567151b 100644
--- a/src/hooks/misc/get_model_info.cpp
+++ b/src/hooks/misc/get_model_info.cpp
@@ -1,5 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "util/model_info.hpp"
 
 namespace big
 {
diff --git a/src/hooks/misc/http_start_request.cpp b/src/hooks/misc/http_start_request.cpp
index 12d91dc1..e54c7961 100644
--- a/src/hooks/misc/http_start_request.cpp
+++ b/src/hooks/misc/http_start_request.cpp
@@ -1,7 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "logger/stack_trace.hpp"
-#include "pointers.hpp"
-#include "util/string_conversions.hpp"
 
 namespace big
 {
diff --git a/src/hooks/misc/queue_dependency.cpp b/src/hooks/misc/queue_dependency.cpp
index e7c7c05b..5c07d299 100644
--- a/src/hooks/misc/queue_dependency.cpp
+++ b/src/hooks/misc/queue_dependency.cpp
@@ -1,5 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "pointers.hpp"
 #include "security/ObfVar.hpp"
 #include <Psapi.h>
 
diff --git a/src/hooks/misc/send_chat_message.cpp b/src/hooks/misc/send_chat_message.cpp
index 5d4da01e..8ed8b43f 100644
--- a/src/hooks/misc/send_chat_message.cpp
+++ b/src/hooks/misc/send_chat_message.cpp
@@ -1,9 +1,6 @@
 #include "backend/command.hpp"
 #include "backend/context/chat_command_context.hpp"
-#include "gta/net_game_event.hpp"
-#include "gta_util.hpp"
 #include "hooking/hooking.hpp"
-#include "packet.hpp"
 #include "services/players/player_service.hpp"
 #include "util/chat.hpp"
 
diff --git a/src/hooks/misc/serialize_join_request_message.cpp b/src/hooks/misc/serialize_join_request_message.cpp
index 50acc4f1..7d4efdd0 100644
--- a/src/hooks/misc/serialize_join_request_message.cpp
+++ b/src/hooks/misc/serialize_join_request_message.cpp
@@ -1,9 +1,5 @@
-#include "gta_util.hpp"
 #include "hooking/hooking.hpp"
-#include "services/players/player_service.hpp"
-
 #include <network/CNetGamePlayerDataMsg.hpp>
-#include <network/Network.hpp>
 #include <network/RemoteGamerInfoMsg.hpp>
 #include <network/CMsgJoinRequest.hpp>
 
diff --git a/src/hooks/player_management/assign_physical_index.cpp b/src/hooks/player_management/assign_physical_index.cpp
index 067fc31a..d3e04b2a 100644
--- a/src/hooks/player_management/assign_physical_index.cpp
+++ b/src/hooks/player_management/assign_physical_index.cpp
@@ -1,17 +1,13 @@
 #include "backend/player_command.hpp"
 #include "core/data/admin_rids.hpp"
 #include "fiber_pool.hpp"
-#include "gta_util.hpp"
 #include "hooking/hooking.hpp"
 #include "lua/lua_manager.hpp"
-#include "packet.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "services/players/player_service.hpp"
 #include "util/notify.hpp"
 #include "util/session.hpp"
 
-#include <network/Network.hpp>
-
 
 namespace big
 {
diff --git a/src/hooks/player_management/network_player_mgr.cpp b/src/hooks/player_management/network_player_mgr.cpp
index 7551fda6..34f1d657 100644
--- a/src/hooks/player_management/network_player_mgr.cpp
+++ b/src/hooks/player_management/network_player_mgr.cpp
@@ -1,7 +1,6 @@
 #include "core/data/menu_event.hpp"
 #include "hooking/hooking.hpp"
 #include "lua/lua_manager.hpp"
-#include "pointers.hpp"
 #include "services/players/player_service.hpp"
 
 #include <network/CNetworkPlayerMgr.hpp>
diff --git a/src/hooks/protections/handle_join_request.cpp b/src/hooks/protections/handle_join_request.cpp
index 2910e4b6..5293bef8 100644
--- a/src/hooks/protections/handle_join_request.cpp
+++ b/src/hooks/protections/handle_join_request.cpp
@@ -1,7 +1,6 @@
 #include "hooking/hooking.hpp"
 #include "pointers.hpp"
 #include "services/friends/friends_service.hpp"
-#include "services/notifications/notification.hpp"
 #include "services/player_database/player_database_service.hpp"
 
 #include <network/CJoinRequestContext.hpp>
diff --git a/src/hooks/protections/increment_stat_event.cpp b/src/hooks/protections/increment_stat_event.cpp
deleted file mode 100644
index a95c92eb..00000000
--- a/src/hooks/protections/increment_stat_event.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "gta/net_game_event.hpp"
-#include "hooking/hooking.hpp"
-#include "services/players/player_service.hpp"
-
-#include <network/CNetGamePlayer.hpp>
-
-namespace big
-{
-	bool hooks::increment_stat_event(CNetworkIncrementStatEvent* net_event, CNetGamePlayer* sender)
-	{
-		switch (net_event->m_stat)
-		{
-		case "MPPLY_BAD_CREW_STATUS"_J:
-		case "MPPLY_BAD_CREW_MOTTO"_J:
-		case "MPPLY_BAD_CREW_NAME"_J:
-		case "MPPLY_BAD_CREW_EMBLEM"_J:
-		case "MPPLY_EXPLOITS"_J:
-		case "MPPLY_GAME_EXPLOITS"_J:
-		case "MPPLY_TC_ANNOYINGME"_J:
-		case "MPPLY_TC_HATE"_J:
-		case "MPPLY_VC_ANNOYINGME"_J:
-		case "MPPLY_VC_HATE"_J:
-			g.reactions.report.process(g_player_service->get_by_id(sender->m_player_id));
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/src/hooks/protections/receive_net_message.cpp b/src/hooks/protections/receive_net_message.cpp
index bb986f0a..62c6770f 100644
--- a/src/hooks/protections/receive_net_message.cpp
+++ b/src/hooks/protections/receive_net_message.cpp
@@ -1,6 +1,5 @@
 #include "backend/command.hpp"
 #include "backend/context/chat_command_context.hpp"
-#include "backend/player_command.hpp"
 #include "core/data/packet_types.hpp"
 #include "gta/enums.hpp"
 #include "gta/net_game_event.hpp"
@@ -8,7 +7,6 @@
 #include "hooking/hooking.hpp"
 #include "lua/lua_manager.hpp"
 #include "natives.hpp"
-#include "script/scriptIdBase.hpp"
 #include "services/players/player_service.hpp"
 #include "util/chat.hpp"
 #include "util/session.hpp"
diff --git a/src/hooks/protections/received_array_update.cpp b/src/hooks/protections/received_array_update.cpp
index 6ec7e452..b78b8a3c 100644
--- a/src/hooks/protections/received_array_update.cpp
+++ b/src/hooks/protections/received_array_update.cpp
@@ -6,7 +6,6 @@
 #include "script_local.hpp"
 #include "services/players/player_service.hpp"
 #include "util/misc.hpp"
-#include "util/notify.hpp"
 
 #include <script/globals/GlobalPlayerBD.hpp>
 
diff --git a/src/hooks/protections/received_event.cpp b/src/hooks/protections/received_event.cpp
index f1956cf0..9db335bc 100644
--- a/src/hooks/protections/received_event.cpp
+++ b/src/hooks/protections/received_event.cpp
@@ -3,7 +3,6 @@
 #include "gta/net_game_event.hpp"
 #include "gta/weapon_info_manager.hpp"
 #include "hooking/hooking.hpp"
-#include "script/scriptIdBase.hpp"
 #include "util/math.hpp"
 #include "util/mobile.hpp"
 #include "util/notify.hpp"
@@ -531,19 +530,6 @@ namespace big
 			buffer->Seek(0);
 			break;
 		}
-		case eNetworkEvents::NETWORK_INCREMENT_STAT_EVENT:
-		{
-			const auto increment_stat_event = std::make_unique<CNetworkIncrementStatEvent>();
-			buffer->ReadDword(&increment_stat_event->m_stat, 0x20);
-			buffer->ReadDword(&increment_stat_event->m_amount, 0x20);
-			if (hooks::increment_stat_event(increment_stat_event.get(), source_player))
-			{
-				g_pointers->m_gta.m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
-				return;
-			}
-			buffer->Seek(0);
-			break;
-		}
 		case eNetworkEvents::SCRIPT_ENTITY_STATE_CHANGE_EVENT:
 		{
 			uint16_t entity = buffer->Read<uint16_t>(13);
diff --git a/src/hooks/protections/script_event_handler.cpp b/src/hooks/protections/script_event_handler.cpp
index 703778a8..a1d3c144 100644
--- a/src/hooks/protections/script_event_handler.cpp
+++ b/src/hooks/protections/script_event_handler.cpp
@@ -1,6 +1,4 @@
-#include "backend/player_command.hpp"
 #include "gta/net_game_event.hpp"
-#include "gta/script_handler.hpp"
 #include "gta_util.hpp"
 #include "hooking/hooking.hpp"
 #include "lua/lua_manager.hpp"
@@ -9,9 +7,9 @@
 #include "util/session.hpp"
 
 #include <network/CNetGamePlayer.hpp>
-#include <network/Network.hpp>
 #include <script/globals/GPBD_FM_3.hpp>
 #include <script/globals/GlobalPlayerBD.hpp>
+#include <script/CGameScriptHandlerNetComponent.hpp>
 
 
 namespace big
diff --git a/src/hooks/script/gta_thread_start.cpp b/src/hooks/script/gta_thread_start.cpp
index 60a294b6..96061c6e 100644
--- a/src/hooks/script/gta_thread_start.cpp
+++ b/src/hooks/script/gta_thread_start.cpp
@@ -1,5 +1,5 @@
 #include "hooking/hooking.hpp"
-#include "native_hooks/native_hooks.hpp"
+#include "gta/script_thread.hpp"
 
 namespace big
 {
diff --git a/src/hooks/spoofing/send_player_card_stats.cpp b/src/hooks/spoofing/send_player_card_stats.cpp
index 8b8417ae..d34b4c3e 100644
--- a/src/hooks/spoofing/send_player_card_stats.cpp
+++ b/src/hooks/spoofing/send_player_card_stats.cpp
@@ -1,5 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "network/Network.hpp"
 
 #include <stats/CPlayerCardStats.hpp>
 
diff --git a/src/hooks/spoofing/serialize_stats.cpp b/src/hooks/spoofing/serialize_stats.cpp
index 7061893d..36eb5011 100644
--- a/src/hooks/spoofing/serialize_stats.cpp
+++ b/src/hooks/spoofing/serialize_stats.cpp
@@ -1,5 +1,4 @@
 #include "hooking/hooking.hpp"
-#include "network/Network.hpp"
 
 #include <stats/CStatsSerializationContext.hpp>
 
diff --git a/src/hooks/toxic/write_vehicle_proximity_migration_data_node.cpp b/src/hooks/toxic/write_vehicle_proximity_migration_data_node.cpp
index 9ba359d1..129a022d 100644
--- a/src/hooks/toxic/write_vehicle_proximity_migration_data_node.cpp
+++ b/src/hooks/toxic/write_vehicle_proximity_migration_data_node.cpp
@@ -1,7 +1,4 @@
-#include "gta/net_array.hpp"
 #include "hooking/hooking.hpp"
-#include "script_global.hpp"
-#include "script_local.hpp"
 
 #include <netsync/nodes/vehicle/CVehicleProximityMigrationDataNode.hpp>
 
diff --git a/src/invoker/invoker.hpp b/src/invoker/invoker.hpp
index 16ccaaf1..128aeb43 100644
--- a/src/invoker/invoker.hpp
+++ b/src/invoker/invoker.hpp
@@ -2,7 +2,6 @@
 #include "crossmap.hpp"
 
 #include <script/scrNativeHandler.hpp>
-#include <script/types.hpp>
 
 namespace big
 {
diff --git a/src/logger/exception_handler.cpp b/src/logger/exception_handler.cpp
index c277b59a..d6a111ca 100644
--- a/src/logger/exception_handler.cpp
+++ b/src/logger/exception_handler.cpp
@@ -1,11 +1,11 @@
-#include "exception_handler.hpp"
-
-#include "stack_trace.hpp"
-
-#include <hde64.h>
-
-namespace big
-{
+#include "exception_handler.hpp"
+
+#include "stack_trace.hpp"
+
+#include <hde64.h>
+
+namespace big
+{
 	inline auto hash_stack_trace(std::vector<uint64_t> stack_trace)
 	{
 		auto data = reinterpret_cast<const char*>(stack_trace.data());
@@ -14,28 +14,28 @@ namespace big
 		return std::hash<std::string_view>()({ data, size });
 	}
 
-	exception_handler::exception_handler()
-	{
+	exception_handler::exception_handler()
+	{
 		m_old_error_mode = SetErrorMode(0);
 		m_exception_handler = SetUnhandledExceptionFilter(&vectored_exception_handler);
-	}
-
-	exception_handler::~exception_handler()
-	{
+	}
+
+	exception_handler::~exception_handler()
+	{
 		SetErrorMode(m_old_error_mode);
 		SetUnhandledExceptionFilter(reinterpret_cast<decltype(&vectored_exception_handler)>(m_exception_handler));
-	}
-
-	inline static stack_trace trace;
-	LONG vectored_exception_handler(EXCEPTION_POINTERS* exception_info)
-	{
-		const auto exception_code = exception_info->ExceptionRecord->ExceptionCode;
-		if (exception_code == EXCEPTION_BREAKPOINT || exception_code == DBG_PRINTEXCEPTION_C || exception_code == DBG_PRINTEXCEPTION_WIDE_C)
-			return EXCEPTION_CONTINUE_SEARCH;
-
+	}
+
+	inline static stack_trace trace;
+	LONG vectored_exception_handler(EXCEPTION_POINTERS* exception_info)
+	{
+		const auto exception_code = exception_info->ExceptionRecord->ExceptionCode;
+		if (exception_code == EXCEPTION_BREAKPOINT || exception_code == DBG_PRINTEXCEPTION_C || exception_code == DBG_PRINTEXCEPTION_WIDE_C)
+			return EXCEPTION_CONTINUE_SEARCH;
+
 		static std::set<std::size_t> logged_exceptions;
 
-		trace.new_stack_trace(exception_info);
+		trace.new_stack_trace(exception_info);
 		const auto trace_hash = hash_stack_trace(trace.frame_pointers());
 		if (const auto it = logged_exceptions.find(trace_hash); it == logged_exceptions.end())
 		{
@@ -44,52 +44,52 @@ namespace big
 
 			logged_exceptions.insert(trace_hash);
 		}
-
-	
-		if (IsBadReadPtr(reinterpret_cast<void*>(exception_info->ContextRecord->Rip), 8))
-		{
-			auto return_address_ptr = (uint64_t*)exception_info->ContextRecord->Rsp;
-			if (IsBadReadPtr(reinterpret_cast<void*>(return_address_ptr), 8))
-			{
-				LOG(FATAL) << "Cannot resume execution, crashing";
-				return EXCEPTION_CONTINUE_SEARCH;
-			}
-			else
-			{
-				exception_info->ContextRecord->Rip = *return_address_ptr;
-				exception_info->ContextRecord->Rsp += 8;
-			}
-		}
-		else
-		{
-			hde64s opcode{};
-			hde64_disasm(reinterpret_cast<void*>(exception_info->ContextRecord->Rip), &opcode);
-			if (opcode.flags & F_ERROR)
-			{
-				LOG(FATAL) << "Cannot resume execution, crashing";
-				return EXCEPTION_CONTINUE_SEARCH;
-			}
-
-			if (opcode.opcode == 0xFF && opcode.modrm_reg == 4) // JMP (FF /4)
-			{
-				auto return_address_ptr = (uint64_t*)exception_info->ContextRecord->Rsp;
-				if (IsBadReadPtr(reinterpret_cast<void*>(return_address_ptr), 8))
-				{
-					LOG(FATAL) << "Cannot resume execution, crashing";
-					return EXCEPTION_CONTINUE_SEARCH;
-				}
-				else
-				{
-					exception_info->ContextRecord->Rip = *return_address_ptr;
-					exception_info->ContextRecord->Rsp += 8;
-				}
-			}
-			else
-			{
-				exception_info->ContextRecord->Rip += opcode.len;
-			}
-		}
-
-		return EXCEPTION_CONTINUE_EXECUTION;
-	}
+
+	
+		if (IsBadReadPtr(reinterpret_cast<void*>(exception_info->ContextRecord->Rip), 8))
+		{
+			auto return_address_ptr = (uint64_t*)exception_info->ContextRecord->Rsp;
+			if (IsBadReadPtr(reinterpret_cast<void*>(return_address_ptr), 8))
+			{
+				LOG(FATAL) << "Cannot resume execution, crashing";
+				return EXCEPTION_CONTINUE_SEARCH;
+			}
+			else
+			{
+				exception_info->ContextRecord->Rip = *return_address_ptr;
+				exception_info->ContextRecord->Rsp += 8;
+			}
+		}
+		else
+		{
+			hde64s opcode{};
+			hde64_disasm(reinterpret_cast<void*>(exception_info->ContextRecord->Rip), &opcode);
+			if (opcode.flags & F_ERROR)
+			{
+				LOG(FATAL) << "Cannot resume execution, crashing";
+				return EXCEPTION_CONTINUE_SEARCH;
+			}
+
+			if (opcode.opcode == 0xFF && opcode.modrm_reg == 4) // JMP (FF /4)
+			{
+				auto return_address_ptr = (uint64_t*)exception_info->ContextRecord->Rsp;
+				if (IsBadReadPtr(reinterpret_cast<void*>(return_address_ptr), 8))
+				{
+					LOG(FATAL) << "Cannot resume execution, crashing";
+					return EXCEPTION_CONTINUE_SEARCH;
+				}
+				else
+				{
+					exception_info->ContextRecord->Rip = *return_address_ptr;
+					exception_info->ContextRecord->Rsp += 8;
+				}
+			}
+			else
+			{
+				exception_info->ContextRecord->Rip += opcode.len;
+			}
+		}
+
+		return EXCEPTION_CONTINUE_EXECUTION;
+	}
 }
\ No newline at end of file
diff --git a/src/logger/stack_trace.cpp b/src/logger/stack_trace.cpp
index 40f0833d..b32b5ab5 100644
--- a/src/logger/stack_trace.cpp
+++ b/src/logger/stack_trace.cpp
@@ -1,8 +1,5 @@
 #include "stack_trace.hpp"
 
-#include "gta/script_thread.hpp"
-#include "memory/module.hpp"
-
 #include <DbgHelp.h>
 #include <winternl.h>
 
diff --git a/src/lua/bindings/command.cpp b/src/lua/bindings/command.cpp
index e1e12adc..3608caac 100644
--- a/src/lua/bindings/command.cpp
+++ b/src/lua/bindings/command.cpp
@@ -1,6 +1,4 @@
 #pragma once
-#include "command.hpp"
-
 #include "backend/command.hpp"
 #include "backend/player_command.hpp"
 #include "network.hpp" // for convert_sequence
diff --git a/src/lua/bindings/entities.cpp b/src/lua/bindings/entities.cpp
index 9a686e4b..570d5c3a 100644
--- a/src/lua/bindings/entities.cpp
+++ b/src/lua/bindings/entities.cpp
@@ -1,6 +1,4 @@
 #pragma once
-#include "entities.hpp"
-
 #include "util/entity.hpp"
 #include "util/pools.hpp"
 
diff --git a/src/lua/bindings/event.cpp b/src/lua/bindings/event.cpp
index b134ffc4..acb12300 100644
--- a/src/lua/bindings/event.cpp
+++ b/src/lua/bindings/event.cpp
@@ -1,9 +1,5 @@
 #pragma once
-#include "event.hpp"
-
-#include "fiber_pool.hpp"
 #include "lua/lua_module.hpp"
-#include "script_mgr.hpp"
 
 namespace lua::event
 {
diff --git a/src/lua/bindings/globals.cpp b/src/lua/bindings/globals.cpp
index 6a2fbdd9..2c31fe28 100644
--- a/src/lua/bindings/globals.cpp
+++ b/src/lua/bindings/globals.cpp
@@ -1,8 +1,6 @@
 #pragma once
-#include "globals.hpp"
 #include "memory.hpp"
 #include "script_global.hpp"
-#include "vector.hpp"
 
 namespace lua::globals
 {
diff --git a/src/lua/bindings/locals.cpp b/src/lua/bindings/locals.cpp
index 849d428c..cd33e75d 100644
--- a/src/lua/bindings/locals.cpp
+++ b/src/lua/bindings/locals.cpp
@@ -1,7 +1,6 @@
 #pragma once
 #include "locals.hpp"
 #include "memory.hpp"
-#include "vector.hpp"
 
 namespace lua::locals
 {
diff --git a/src/lua/bindings/log.cpp b/src/lua/bindings/log.cpp
index 26011d92..1691f63f 100644
--- a/src/lua/bindings/log.cpp
+++ b/src/lua/bindings/log.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "log.hpp"
 
 namespace lua::log
 {
diff --git a/src/lua/bindings/network.cpp b/src/lua/bindings/network.cpp
index 3fb81669..00e20541 100644
--- a/src/lua/bindings/network.cpp
+++ b/src/lua/bindings/network.cpp
@@ -3,14 +3,11 @@
 #include "../../script.hpp"
 #include "core/data/language_codes.hpp"
 #include "core/scr_globals.hpp"
-#include "hooking/hooking.hpp"
 #include "pointers.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "util/chat.hpp"
-#include "util/notify.hpp"
 #include "util/scripts.hpp"
 #include "util/session.hpp"
-#include "util/system.hpp"
 #include "util/teleport.hpp"
 
 #include <script/globals/GPBD_FM.hpp>
diff --git a/src/lua/bindings/script.cpp b/src/lua/bindings/script.cpp
index a0a9d0ff..a102b936 100644
--- a/src/lua/bindings/script.cpp
+++ b/src/lua/bindings/script.cpp
@@ -2,7 +2,6 @@
 #include "script.hpp"
 
 #include "lua/lua_manager.hpp"
-#include "script_mgr.hpp"
 #include "gta_util.hpp"
 #include "script_function.hpp"
 #include "lua/bindings/network.hpp"
diff --git a/src/lua/bindings/self.cpp b/src/lua/bindings/self.cpp
index 6580b832..24d9206c 100644
--- a/src/lua/bindings/self.cpp
+++ b/src/lua/bindings/self.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "self.hpp"
 
 namespace lua_self = self;
 
diff --git a/src/lua/bindings/stats.cpp b/src/lua/bindings/stats.cpp
index 09a34372..e4f3b847 100644
--- a/src/lua/bindings/stats.cpp
+++ b/src/lua/bindings/stats.cpp
@@ -1,6 +1,4 @@
 #pragma once
-#include "stats.hpp"
-
 #include "natives.hpp"
 
 namespace lua::stats
diff --git a/src/lua/bindings/vector.cpp b/src/lua/bindings/vector.cpp
index cd9d3e9a..fb6ebf38 100644
--- a/src/lua/bindings/vector.cpp
+++ b/src/lua/bindings/vector.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "vector.hpp"
 
 namespace lua::vector
 {
diff --git a/src/lua/bindings/vehicles.cpp b/src/lua/bindings/vehicles.cpp
index 0b66ce2f..9875774b 100644
--- a/src/lua/bindings/vehicles.cpp
+++ b/src/lua/bindings/vehicles.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "vehicles.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 
 namespace lua::vehicles
diff --git a/src/lua/bindings/weapons.cpp b/src/lua/bindings/weapons.cpp
index 7e8071c8..c267b6fb 100644
--- a/src/lua/bindings/weapons.cpp
+++ b/src/lua/bindings/weapons.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "weapons.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 
 namespace lua::weapons
diff --git a/src/lua/lua_manager.hpp b/src/lua/lua_manager.hpp
index 10a66998..b860893e 100644
--- a/src/lua/lua_manager.hpp
+++ b/src/lua/lua_manager.hpp
@@ -1,6 +1,4 @@
 #pragma once
-#include "bindings/memory.hpp"
-#include "core/enums.hpp"
 #include "lua_module.hpp"
 
 namespace big
diff --git a/src/main.cpp b/src/main.cpp
index 84fb819a..dd4ebe60 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,16 +22,13 @@
 #include "services/mobile/mobile_service.hpp"
 #include "services/model_preview/model_preview_service.hpp"
 #include "services/notifications/notification_service.hpp"
-#include "services/orbital_drone/orbital_drone.hpp"
 #include "services/pickups/pickup_service.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "services/players/player_service.hpp"
 #include "services/script_connection/script_connection_service.hpp"
 #include "services/script_patcher/script_patcher_service.hpp"
-#include "services/squad_spawner/squad_spawner.hpp"
 #include "services/tunables/tunables_service.hpp"
 #include "services/vehicle/handling_service.hpp"
-#include "services/vehicle/vehicle_control_service.hpp"
 #include "services/vehicle/xml_vehicles_service.hpp"
 #include "services/xml_maps/xml_map_service.hpp"
 #include "thread_pool.hpp"
diff --git a/src/native_hooks/native_hooks.cpp b/src/native_hooks/native_hooks.cpp
index dc4aa6bf..9cdda683 100644
--- a/src/native_hooks/native_hooks.cpp
+++ b/src/native_hooks/native_hooks.cpp
@@ -1,20 +1,16 @@
 #include "native_hooks.hpp"
 
-#include "invoker/crossmap.hpp"
-
 #include "all_scripts.hpp"
 #include "am_launcher.hpp"
 #include "carmod_shop.hpp"
 #include "creator.hpp"
 #include "freemode.hpp"
-#include "gta_util.hpp"
 #include "network_session_host.hpp"
 #include "shop_controller.hpp"
 #include "tunables.hpp"
 #include "am_pi_menu.hpp"
 
 #include <script/scrProgram.hpp>
-#include <script/scrProgramTable.hpp>
 
 namespace big
 {
diff --git a/src/packet.cpp b/src/packet.cpp
index 66d169be..ea45a917 100644
--- a/src/packet.cpp
+++ b/src/packet.cpp
@@ -1,8 +1,6 @@
 #include "packet.hpp"
 
-#include "common.hpp"
 #include "gta_util.hpp"
-#include "services/players/player_service.hpp"
 
 #include <network/Network.hpp>
 #include <network/netConnection.hpp>
diff --git a/src/pointers.cpp b/src/pointers.cpp
index 472de1b7..cacfe743 100644
--- a/src/pointers.cpp
+++ b/src/pointers.cpp
@@ -1,7 +1,6 @@
 #include "pointers.hpp"
 
 #include "gta_pointers_layout_info.hpp"
-#include "memory/all.hpp"
 #include "sc_pointers_layout_info.hpp"
 
 namespace big
diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp
index 4a8de57d..7ef82922 100644
--- a/src/renderer/renderer.cpp
+++ b/src/renderer/renderer.cpp
@@ -1,7 +1,6 @@
 #include "renderer.hpp"
 
 #include "file_manager.hpp"
-#include "fonts/fonts.hpp"
 #include "gui.hpp"
 #include "pointers.hpp"
 
diff --git a/src/script.cpp b/src/script.cpp
index 21f4b65f..3b3620fa 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1,8 +1,6 @@
 #pragma once
 #include "script.hpp"
 
-#include "common.hpp"
-
 namespace big
 {
 	script::script(const func_t func, const std::string& name, const bool toggleable, const std::optional<std::size_t> stack_size) :
diff --git a/src/script.hpp b/src/script.hpp
index 5c934a2a..bb50bce9 100644
--- a/src/script.hpp
+++ b/src/script.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 
 namespace big
 {
diff --git a/src/script_function.cpp b/src/script_function.cpp
index 9d6d9ae8..37236ef2 100644
--- a/src/script_function.cpp
+++ b/src/script_function.cpp
@@ -5,7 +5,6 @@
 #include "util/scripts.hpp"
 
 #include <script/scrProgram.hpp>
-#include <script/scrProgramTable.hpp>
 
 namespace big
 {
diff --git a/src/script_global.cpp b/src/script_global.cpp
index a0156391..b4b2c2e0 100644
--- a/src/script_global.cpp
+++ b/src/script_global.cpp
@@ -1,6 +1,4 @@
 #include "script_global.hpp"
-
-#include "common.hpp"
 #include "pointers.hpp"
 
 namespace big
diff --git a/src/script_local.cpp b/src/script_local.cpp
index 2694b169..fbb0383b 100644
--- a/src/script_local.cpp
+++ b/src/script_local.cpp
@@ -1,9 +1,5 @@
 #include "script_local.hpp"
 
-#include "common.hpp"
-#include "gta/script_thread.hpp"
-#include "pointers.hpp"
-
 namespace big
 {
 	script_local::script_local(rage::scrThread* thread, std::size_t index) :
diff --git a/src/script_local.hpp b/src/script_local.hpp
index 28193f22..ac2383a0 100644
--- a/src/script_local.hpp
+++ b/src/script_local.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 
 namespace big
 {
diff --git a/src/script_mgr.hpp b/src/script_mgr.hpp
index b9ea7d38..b2487073 100644
--- a/src/script_mgr.hpp
+++ b/src/script_mgr.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.hpp"
 #include "lua/lua_manager.hpp"
 #include "script.hpp"
 
diff --git a/src/services/api/api_service.cpp b/src/services/api/api_service.cpp
index c1917bc1..60dcb4ad 100644
--- a/src/services/api/api_service.cpp
+++ b/src/services/api/api_service.cpp
@@ -1,7 +1,6 @@
 #include "api_service.hpp"
 
 #include "http_client/http_client.hpp"
-#include "pointers.hpp"
 #include "services/creator_storage/creator_storage_service.hpp"
 
 
diff --git a/src/services/custom_teleport/custom_teleport_service.cpp b/src/services/custom_teleport/custom_teleport_service.cpp
index 11ffaf76..e723799d 100644
--- a/src/services/custom_teleport/custom_teleport_service.cpp
+++ b/src/services/custom_teleport/custom_teleport_service.cpp
@@ -1,7 +1,5 @@
 #include "custom_teleport_service.hpp"
 
-#include "util/notify.hpp"
-
 namespace big
 {
 	std::filesystem::path custom_teleport_service::get_telelocations_file_path()
diff --git a/src/services/custom_text/custom_text_callbacks.cpp b/src/services/custom_text/custom_text_callbacks.cpp
index 22f0761f..155a23e9 100644
--- a/src/services/custom_text/custom_text_callbacks.cpp
+++ b/src/services/custom_text/custom_text_callbacks.cpp
@@ -1,4 +1,3 @@
-#include "custom_text_callbacks.hpp"
 #include "hooking/hooking.hpp"
 #include "pointers.hpp"
 
diff --git a/src/services/gta_data/yim_fipackfile.cpp b/src/services/gta_data/yim_fipackfile.cpp
index 61d18770..9d1207c8 100644
--- a/src/services/gta_data/yim_fipackfile.cpp
+++ b/src/services/gta_data/yim_fipackfile.cpp
@@ -1,8 +1,6 @@
 #include "yim_fipackfile.hpp"
 
 #include "gta/fidevice.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 #include "util/string_conversions.hpp"
 
 namespace big
diff --git a/src/services/hotkey/hotkey_service.cpp b/src/services/hotkey/hotkey_service.cpp
index 0df82d4b..92de8031 100644
--- a/src/services/hotkey/hotkey_service.cpp
+++ b/src/services/hotkey/hotkey_service.cpp
@@ -5,7 +5,6 @@
 #include "network/ChatData.hpp"
 #include "pointers.hpp"
 #include "renderer/renderer.hpp"
-#include "util/teleport.hpp"
 
 #include <script/GtaThread.hpp>
 
diff --git a/src/services/matchmaking/matchmaking_service.cpp b/src/services/matchmaking/matchmaking_service.cpp
index 7bce2dde..29cb2e42 100644
--- a/src/services/matchmaking/matchmaking_service.cpp
+++ b/src/services/matchmaking/matchmaking_service.cpp
@@ -2,7 +2,6 @@
 
 #include "fiber_pool.hpp"
 #include "hooking/hooking.hpp"
-#include "pointers.hpp"
 #include "script.hpp"
 
 #include <network/Network.hpp>
diff --git a/src/services/model_preview/model_preview_service.cpp b/src/services/model_preview/model_preview_service.cpp
index 1092f727..5cdfdfc9 100644
--- a/src/services/model_preview/model_preview_service.cpp
+++ b/src/services/model_preview/model_preview_service.cpp
@@ -2,7 +2,6 @@
 
 #include "fiber_pool.hpp"
 #include "gui.hpp"
-#include "thread_pool.hpp"
 #include "util/ped.hpp"
 #include "util/vehicle.hpp"
 
diff --git a/src/services/players/player_service.cpp b/src/services/players/player_service.cpp
index fa2ffad8..85172949 100644
--- a/src/services/players/player_service.cpp
+++ b/src/services/players/player_service.cpp
@@ -3,8 +3,6 @@
 #include "gta_util.hpp"
 #include "util/math.hpp"
 
-#include <network/CNetworkPlayerMgr.hpp>
-
 
 namespace big
 {
diff --git a/src/services/script_connection/script_connection.cpp b/src/services/script_connection/script_connection.cpp
index b50fd2d8..8fa099de 100644
--- a/src/services/script_connection/script_connection.cpp
+++ b/src/services/script_connection/script_connection.cpp
@@ -6,8 +6,6 @@
 #include "util/scripts.hpp"
 #include "packet.hpp"
 
-#include <script/globals/GPBD_FM_3.hpp>
-
 namespace big
 {
 	bool script_connection::does_remote_script_exist()
diff --git a/src/util/teleport.hpp b/src/util/teleport.hpp
index 647cce11..2838a9b1 100644
--- a/src/util/teleport.hpp
+++ b/src/util/teleport.hpp
@@ -2,7 +2,6 @@
 #include "blip.hpp"
 #include "entity.hpp"
 #include "gta/enums.hpp"
-#include "gta/net_object_mgr.hpp"
 #include "services/players/player_service.hpp"
 #include "vehicle.hpp"
 
diff --git a/src/views/core/view_cmd_executor.cpp b/src/views/core/view_cmd_executor.cpp
index f9a3c4d4..10db0087 100644
--- a/src/views/core/view_cmd_executor.cpp
+++ b/src/views/core/view_cmd_executor.cpp
@@ -1,7 +1,5 @@
 #include "backend/context/default_command_context.hpp"
-#include "gui.hpp"
 #include "pointers.hpp"
-#include "services/hotkey/hotkey_service.hpp"
 #include "util/string_operations.hpp"
 #include "views/view.hpp"
 
diff --git a/src/views/core/view_heading.cpp b/src/views/core/view_heading.cpp
index f371bd2a..19510a17 100644
--- a/src/views/core/view_heading.cpp
+++ b/src/views/core/view_heading.cpp
@@ -1,7 +1,5 @@
-#include "fiber_pool.hpp"
 #include "views/view.hpp"
-#include "script_mgr.hpp"
-#include "pointers.hpp"
+#include "lua/lua_manager.hpp"
 
 namespace big
 {
diff --git a/src/views/debug/view_debug_globals.cpp b/src/views/debug/view_debug_globals.cpp
index ebf95cfe..38693587 100644
--- a/src/views/debug/view_debug_globals.cpp
+++ b/src/views/debug/view_debug_globals.cpp
@@ -1,6 +1,5 @@
 #include "gui/components/components.hpp"
 #include "script_global.hpp"
-#include "thread_pool.hpp"
 #include "view_debug.hpp"
 #include "widgets/imgui_bitfield.hpp"
 
diff --git a/src/views/debug/view_debug_locals.cpp b/src/views/debug/view_debug_locals.cpp
index a9326318..2bf08e83 100644
--- a/src/views/debug/view_debug_locals.cpp
+++ b/src/views/debug/view_debug_locals.cpp
@@ -1,6 +1,5 @@
 #include "gui/components/components.hpp"
 #include "script_local.hpp"
-#include "thread_pool.hpp"
 #include "view_debug.hpp"
 #include "widgets/imgui_bitfield.hpp"
 #include "gta_util.hpp"
diff --git a/src/views/debug/view_debug_misc.cpp b/src/views/debug/view_debug_misc.cpp
index 44ce28ca..7046bc64 100644
--- a/src/views/debug/view_debug_misc.cpp
+++ b/src/views/debug/view_debug_misc.cpp
@@ -1,16 +1,12 @@
 #include "gta/joaat.hpp"
-#include "gta_util.hpp"
 #include "gui/components/components.hpp"
 #include "hooking/hooking.hpp"
 #include "natives.hpp"
-#include "network/Network.hpp"
-#include "script.hpp"
-#include "script_global.hpp"
-#include "util/misc.hpp"
 #include "util/pathfind.hpp"
 #include "util/ped.hpp"
 #include "util/system.hpp"
 #include "view_debug.hpp"
+#include "network/CNetworkPlayerMgr.hpp"
 
 namespace big
 {
diff --git a/src/views/debug/view_debug_threads.cpp b/src/views/debug/view_debug_threads.cpp
index f9639eaa..88153908 100644
--- a/src/views/debug/view_debug_threads.cpp
+++ b/src/views/debug/view_debug_threads.cpp
@@ -1,16 +1,10 @@
 #include "core/data/all_script_names.hpp"
 #include "core/data/stack_sizes.hpp"
 #include "fiber_pool.hpp"
-#include "gta/joaat.hpp"
-#include "gta_util.hpp"
 #include "gui/components/components.hpp"
 #include "natives.hpp"
-#include "network/Network.hpp"
 #include "script.hpp"
-#include "script_global.hpp"
-#include "util/misc.hpp"
 #include "util/scripts.hpp"
-#include "util/system.hpp"
 #include "view_debug.hpp"
 
 static rage::scrThread* selected_thread;
diff --git a/src/views/esp/view_esp.cpp b/src/views/esp/view_esp.cpp
index 2c8a3c6b..73110007 100644
--- a/src/views/esp/view_esp.cpp
+++ b/src/views/esp/view_esp.cpp
@@ -1,11 +1,8 @@
 #include "view_esp.hpp"
 
-#include "gta/enums.hpp"
-#include "gta_util.hpp"
 #include "pointers.hpp"
 #include "services/players/player_service.hpp"
 #include "util/math.hpp"
-#include "util/misc.hpp"
 
 namespace big
 {
diff --git a/src/views/network/view_chat.cpp b/src/views/network/view_chat.cpp
index 2897c770..4bfbc58e 100644
--- a/src/views/network/view_chat.cpp
+++ b/src/views/network/view_chat.cpp
@@ -1,5 +1,3 @@
-#include "core/scr_globals.hpp"
-#include "fiber_pool.hpp"
 #include "gta_util.hpp"
 #include "views/view.hpp"
 #include "util/chat.hpp"
diff --git a/src/views/network/view_controls.cpp b/src/views/network/view_controls.cpp
index cfda1621..ca6e5817 100644
--- a/src/views/network/view_controls.cpp
+++ b/src/views/network/view_controls.cpp
@@ -1,15 +1,8 @@
-#include "core/data/apartment_names.hpp"
-#include "core/data/region_codes.hpp"
-#include "core/data/warehouse_names.hpp"
-#include "fiber_pool.hpp"
+#include "fiber_pool.hpp"
 #include "gta_util.hpp"
-#include "hooking/hooking.hpp"
-#include "util/scripts.hpp"
-#include "util/session.hpp"
 #include "util/troll.hpp"
 #include "util/toxic.hpp"
 #include "views/view.hpp"
-#include "backend/bool_command.hpp"
 
 #include <network/Network.hpp>
 #include <script/globals/GPBD_FM_3.hpp>
diff --git a/src/views/network/view_missions.cpp b/src/views/network/view_missions.cpp
index 529d785e..89991eb2 100644
--- a/src/views/network/view_missions.cpp
+++ b/src/views/network/view_missions.cpp
@@ -1,7 +1,4 @@
-#include "core/scr_globals.hpp"
-#include "fiber_pool.hpp"
 #include "gta_util.hpp"
-#include "script_local.hpp"
 #include "util/scripts.hpp"
 #include "views/network/missions/cp_collection.hpp"
 #include "views/network/missions/criminal_damage.hpp"
diff --git a/src/views/network/view_network.cpp b/src/views/network/view_network.cpp
index 3467d71e..1e5c0185 100644
--- a/src/views/network/view_network.cpp
+++ b/src/views/network/view_network.cpp
@@ -1,19 +1,14 @@
 #include "core/data/apartment_names.hpp"
 #include "core/data/region_codes.hpp"
 #include "core/data/warehouse_names.hpp"
-#include "fiber_pool.hpp"
 #include "gta_util.hpp"
-#include "hooking/hooking.hpp"
-#include "util/scripts.hpp"
 #include "util/session.hpp"
-#include "util/troll.hpp"
 #include "util/toxic.hpp"
 #include "views/view.hpp"
 #include "backend/bool_command.hpp"
 
 #include <network/Network.hpp>
 #include <script/globals/GPBD_FM_3.hpp>
-#include <script/globals/GlobalPlayerBD.hpp>
 
 
 namespace big
diff --git a/src/views/network/view_player_database.cpp b/src/views/network/view_player_database.cpp
index 055ef758..4d6fea7c 100644
--- a/src/views/network/view_player_database.cpp
+++ b/src/views/network/view_player_database.cpp
@@ -1,12 +1,9 @@
 #include "core/data/block_join_reasons.hpp"
 #include "core/data/command_access_levels.hpp"
-#include "core/data/infractions.hpp"
-#include "fiber_pool.hpp"
 #include "gta/enums.hpp"
 #include "pointers.hpp"
 #include "services/api/api_service.hpp"
 #include "services/player_database/player_database_service.hpp"
-#include "services/players/player_service.hpp"
 #include "util/session.hpp"
 #include "views/view.hpp"
 
diff --git a/src/views/network/view_session_browser.cpp b/src/views/network/view_session_browser.cpp
index cc472310..1d836c9e 100644
--- a/src/views/network/view_session_browser.cpp
+++ b/src/views/network/view_session_browser.cpp
@@ -1,15 +1,11 @@
 #include "core/data/language_codes.hpp"
 #include "core/data/region_codes.hpp"
-#include "fiber_pool.hpp"
 #include "pointers.hpp"
-#include "script.hpp"
 #include "services/matchmaking/matchmaking_service.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "util/session.hpp"
 #include "views/view.hpp"
 
-#include <network/Network.hpp>
-
 namespace big
 {
 	static int selected_session_idx = -1;
diff --git a/src/views/network/view_spoofing.cpp b/src/views/network/view_spoofing.cpp
index 080ee600..24f5d8f0 100644
--- a/src/views/network/view_spoofing.cpp
+++ b/src/views/network/view_spoofing.cpp
@@ -1,8 +1,6 @@
 #include "core/data/blip_types.hpp"
 #include "core/data/language_codes.hpp"
 #include "core/data/region_codes.hpp"
-#include "fiber_pool.hpp"
-#include "util/teleport.hpp"
 #include "views/view.hpp"
 
 #include <network/ClanData.hpp>
diff --git a/src/views/players/player/player_info.cpp b/src/views/players/player/player_info.cpp
index 371c4d5a..bd75a4b7 100644
--- a/src/views/players/player/player_info.cpp
+++ b/src/views/players/player/player_info.cpp
@@ -1,7 +1,6 @@
 #include "core/data/command_access_levels.hpp"
 #include "core/data/language_codes.hpp"
 #include "core/scr_globals.hpp"
-#include "natives.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 #include "services/player_database/player_database_service.hpp"
 #include "util/session.hpp"
@@ -10,7 +9,6 @@
 #include <network/netConnection.hpp>
 #include <script/globals/GPBD_FM.hpp>
 #include <script/globals/GPBD_FM_3.hpp>
-#include <script/globals/GlobalPlayerBD.hpp>
 #include <vehicle/CVehicleModelInfo.hpp>
 
 namespace big
diff --git a/src/views/players/player/player_kick.cpp b/src/views/players/player/player_kick.cpp
index f86c6171..dfad6a30 100644
--- a/src/views/players/player/player_kick.cpp
+++ b/src/views/players/player/player_kick.cpp
@@ -1,5 +1,3 @@
-#include "util/teleport.hpp"
-#include "util/toxic.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/players/player/player_misc.cpp b/src/views/players/player/player_misc.cpp
index d5d49430..4d2bad16 100644
--- a/src/views/players/player/player_misc.cpp
+++ b/src/views/players/player/player_misc.cpp
@@ -1,8 +1,6 @@
 #include "views/view.hpp"
 #include "services/players/player_service.hpp"
 #include "util/scripts.hpp"
-#include "services/script_connection/script_connection_service.hpp"
-#include "packet.hpp"
 
 namespace big
 {
diff --git a/src/views/players/player/player_teleport.cpp b/src/views/players/player/player_teleport.cpp
index c4faaa28..aeda153b 100644
--- a/src/views/players/player/player_teleport.cpp
+++ b/src/views/players/player/player_teleport.cpp
@@ -2,7 +2,6 @@
 #include "core/data/warehouse_names.hpp"
 #include "util/teleport.hpp"
 #include "util/toxic.hpp"
-#include "util/vehicle.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/players/player/player_toxic.cpp b/src/views/players/player/player_toxic.cpp
index fd3623ea..55b967b8 100644
--- a/src/views/players/player/player_toxic.cpp
+++ b/src/views/players/player/player_toxic.cpp
@@ -1,6 +1,3 @@
-#include "core/data/apartment_names.hpp"
-#include "core/data/warehouse_names.hpp"
-#include "util/teleport.hpp"
 #include "util/toxic.hpp"
 #include "util/troll.hpp"
 #include "views/view.hpp"
diff --git a/src/views/players/view_players.cpp b/src/views/players/view_players.cpp
index 112e5566..6eae9f2e 100644
--- a/src/views/players/view_players.cpp
+++ b/src/views/players/view_players.cpp
@@ -1,4 +1,3 @@
-#include "fiber_pool.hpp"
 #include "fonts/fonts.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
diff --git a/src/views/self/view_mobile.cpp b/src/views/self/view_mobile.cpp
index 7a6b4de2..801d0dc2 100644
--- a/src/views/self/view_mobile.cpp
+++ b/src/views/self/view_mobile.cpp
@@ -1,5 +1,3 @@
-#include "fiber_pool.hpp"
-#include "services/mobile/mobile_service.hpp"
 #include "util/mobile.hpp"
 #include "views/view.hpp"
 
diff --git a/src/views/self/view_outfit_editor.cpp b/src/views/self/view_outfit_editor.cpp
index 9dd89893..fea11213 100644
--- a/src/views/self/view_outfit_editor.cpp
+++ b/src/views/self/view_outfit_editor.cpp
@@ -1,5 +1,4 @@
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "util/outfit.hpp"
 #include "util/ped.hpp"
 #include "views/view.hpp"
diff --git a/src/views/self/view_self.cpp b/src/views/self/view_self.cpp
index 777c7c63..4053bc11 100644
--- a/src/views/self/view_self.cpp
+++ b/src/views/self/view_self.cpp
@@ -1,10 +1,9 @@
 #include "core/data/hud_component_names.hpp"
 #include "core/data/ptfx_effects.hpp"
 #include "fiber_pool.hpp"
-#include "services/orbital_drone/orbital_drone.hpp"
-#include "util/entity.hpp"
-#include "util/scripts.hpp"
 #include "views/view.hpp"
+#include "core/scr_globals.hpp"
+#include "gta_util.hpp"
 
 #include <script/globals/GPBD_FM_3.hpp>
 
diff --git a/src/views/self/view_teleport.cpp b/src/views/self/view_teleport.cpp
index 7247661d..e39478bb 100644
--- a/src/views/self/view_teleport.cpp
+++ b/src/views/self/view_teleport.cpp
@@ -1,9 +1,5 @@
 #include "core/data/ipls.hpp"
-#include "fiber_pool.hpp"
-#include "util/globals.hpp"
-#include "util/mobile.hpp"
 #include "util/teleport.hpp"
-#include "util/vehicle.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/self/view_weapons.cpp b/src/views/self/view_weapons.cpp
index d15401aa..fd5e0ef0 100644
--- a/src/views/self/view_weapons.cpp
+++ b/src/views/self/view_weapons.cpp
@@ -1,12 +1,9 @@
 #include "core/data/bullet_impact_types.hpp"
 #include "core/data/special_ammo_types.hpp"
-#include "fiber_pool.hpp"
-#include "gta/enums.hpp"
 #include "gta/joaat.hpp"
 #include "gta/weapons.hpp"
 #include "imgui_internal.h"
 #include "natives.hpp"
-#include "pointers.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 #include "services/persist_weapons/persist_weapons.hpp"
 #include "views/view.hpp"
diff --git a/src/views/settings/view_gta_cache.cpp b/src/views/settings/view_gta_cache.cpp
index 0e097cee..e2ff4fea 100644
--- a/src/views/settings/view_gta_cache.cpp
+++ b/src/views/settings/view_gta_cache.cpp
@@ -1,8 +1,4 @@
-#include "natives.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
 #include "services/gta_data/gta_data_service.hpp"
-#include "thread_pool.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/settings/view_gui_settings.cpp b/src/views/settings/view_gui_settings.cpp
index b5b89fc5..b88c8282 100644
--- a/src/views/settings/view_gui_settings.cpp
+++ b/src/views/settings/view_gui_settings.cpp
@@ -1,4 +1,3 @@
-#include "gui.hpp"
 #include "renderer/renderer.hpp"
 #include "views/view.hpp"
 
diff --git a/src/views/settings/view_lua_scripts.cpp b/src/views/settings/view_lua_scripts.cpp
index bae793bf..e7a5d79e 100644
--- a/src/views/settings/view_lua_scripts.cpp
+++ b/src/views/settings/view_lua_scripts.cpp
@@ -1,8 +1,5 @@
 #include "fiber_pool.hpp"
 #include "lua/lua_manager.hpp"
-#include "script.hpp"
-#include "thread_pool.hpp"
-#include "util/scripts.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/vehicle/spawn/view_persist_car.cpp b/src/views/vehicle/spawn/view_persist_car.cpp
index 1ea7dc4d..c0bd6775 100644
--- a/src/views/vehicle/spawn/view_persist_car.cpp
+++ b/src/views/vehicle/spawn/view_persist_car.cpp
@@ -1,9 +1,6 @@
-#include "core/data/speed_units.hpp"
 #include "fiber_pool.hpp"
-#include "script.hpp"
 #include "services/vehicle/persist_car_service.hpp"
 #include "services/model_preview/model_preview_service.hpp"
-#include "util/mobile.hpp"
 #include "util/teleport.hpp"
 #include "views/view.hpp"
 
diff --git a/src/views/vehicle/spawn/view_pv.cpp b/src/views/vehicle/spawn/view_pv.cpp
index fcd6939a..8bf35989 100644
--- a/src/views/vehicle/spawn/view_pv.cpp
+++ b/src/views/vehicle/spawn/view_pv.cpp
@@ -1,4 +1,3 @@
-#include "fiber_pool.hpp"
 #include "natives.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 #include "services/mobile/mobile_service.hpp"
diff --git a/src/views/vehicle/spawn/view_xml_vehicles.cpp b/src/views/vehicle/spawn/view_xml_vehicles.cpp
index 2801762b..f7d78d41 100644
--- a/src/views/vehicle/spawn/view_xml_vehicles.cpp
+++ b/src/views/vehicle/spawn/view_xml_vehicles.cpp
@@ -1,5 +1,4 @@
 #include "pointers.hpp"
-#include "pugixml.hpp"
 #include "services/vehicle/xml_vehicles_service.hpp"
 #include "util/vehicle.hpp"
 #include "views/view.hpp"
diff --git a/src/views/vehicle/view_fun_vehicle.cpp b/src/views/vehicle/view_fun_vehicle.cpp
index 2ed03598..36828125 100644
--- a/src/views/vehicle/view_fun_vehicle.cpp
+++ b/src/views/vehicle/view_fun_vehicle.cpp
@@ -3,15 +3,9 @@
 #include "core/data/speed_units.hpp"
 #include "core/enums.hpp"
 #include "fiber_pool.hpp"
-#include "script.hpp"
-#include "services/gta_data/gta_data_service.hpp"
-#include "services/model_preview/model_preview_service.hpp"
-#include "util/mobile.hpp"
 #include "util/vehicle.hpp"
 #include "views/view.hpp"
 
-#include <imgui_internal.h>
-
 namespace big
 {
 	void view::fun_vehicle()
diff --git a/src/views/vehicle/view_vehicle.cpp b/src/views/vehicle/view_vehicle.cpp
index 98ac5ceb..d8487475 100644
--- a/src/views/vehicle/view_vehicle.cpp
+++ b/src/views/vehicle/view_vehicle.cpp
@@ -1,5 +1,4 @@
 #include "core/data/speed_units.hpp"
-#include "fiber_pool.hpp"
 #include "util/mobile.hpp"
 #include "util/teleport.hpp"
 #include "views/view.hpp"
diff --git a/src/views/view_gta_data.cpp b/src/views/view_gta_data.cpp
index 872a23b3..36eab41e 100644
--- a/src/views/view_gta_data.cpp
+++ b/src/views/view_gta_data.cpp
@@ -1,5 +1,4 @@
 #include "gui.hpp"
-#include "pointers.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 #include "view.hpp"
 
diff --git a/src/views/view_vehicle_control.cpp b/src/views/view_vehicle_control.cpp
index 70dca42f..b74737ba 100644
--- a/src/views/view_vehicle_control.cpp
+++ b/src/views/view_vehicle_control.cpp
@@ -1,8 +1,4 @@
 #include "backend/bool_command.hpp"
-#include "backend/float_command.hpp"
-#include "gta_util.hpp"
-#include "gui.hpp"
-#include "pointers.hpp"
 #include "services/vehicle/vehicle_control_service.hpp"
 #include "util/ped.hpp"
 #include "util/vehicle.hpp"
diff --git a/src/views/world/view_spawn_ped.cpp b/src/views/world/view_spawn_ped.cpp
index e74ecbd2..d86ff2f1 100644
--- a/src/views/world/view_spawn_ped.cpp
+++ b/src/views/world/view_spawn_ped.cpp
@@ -1,8 +1,6 @@
 #include "backend/looped/looped.hpp"
-#include "fiber_pool.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
-#include "script.hpp"
 #include "services/gta_data/gta_data_service.hpp"
 #include "services/model_preview/model_preview_service.hpp"
 #include "services/players/player_service.hpp"
diff --git a/src/views/world/view_squad_spawner.cpp b/src/views/world/view_squad_spawner.cpp
index f9d505af..156a17e8 100644
--- a/src/views/world/view_squad_spawner.cpp
+++ b/src/views/world/view_squad_spawner.cpp
@@ -1,4 +1,3 @@
-#include "misc/cpp/imgui_stdlib.h"
 #include "services/gta_data/gta_data_service.hpp"
 #include "services/orbital_drone/orbital_drone.hpp"
 #include "services/squad_spawner/squad_spawner.hpp"
diff --git a/src/views/world/view_time_and_weather.cpp b/src/views/world/view_time_and_weather.cpp
index ba505d98..6ccfbdbb 100644
--- a/src/views/world/view_time_and_weather.cpp
+++ b/src/views/world/view_time_and_weather.cpp
@@ -1,6 +1,4 @@
 #include "core/data/weathers.hpp"
-#include "fiber_pool.hpp"
-#include "util/session.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/src/views/world/view_train.cpp b/src/views/world/view_train.cpp
index 770e86a6..40bf01db 100644
--- a/src/views/world/view_train.cpp
+++ b/src/views/world/view_train.cpp
@@ -1,9 +1,6 @@
 #include "util/train.hpp"
 #include "views/view.hpp"
 
-#include <imgui_internal.h>
-
-
 namespace big
 {
 	void view::train()
diff --git a/src/views/world/view_world.cpp b/src/views/world/view_world.cpp
index 49e3792b..cb5c9c22 100644
--- a/src/views/world/view_world.cpp
+++ b/src/views/world/view_world.cpp
@@ -1,6 +1,5 @@
 #include "pointers.hpp"
 #include "util/entity.hpp"
-#include "util/notify.hpp"
 #include "util/ped.hpp"
 #include "util/vehicle.hpp"
 #include "views/view.hpp"
diff --git a/src/widgets/imgui_bitfield.hpp b/src/widgets/imgui_bitfield.hpp
index 6a121707..310b8483 100644
--- a/src/widgets/imgui_bitfield.hpp
+++ b/src/widgets/imgui_bitfield.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <imgui.h>
-#include <string.h>
 
 namespace ImGui
 {