13 files changed, 31 insertions, 17 deletions

diff --git a/src/control/Bridge.h b/src/control/Bridge.h
index 377c8bf8..63f41578 100644
--- a/src/control/Bridge.h
+++ b/src/control/Bridge.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Entity.h"
+
+class CEntity;
 
 enum bridgeStates {
     STATE_BRIDGE_LOCKED,
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index c5d62c48..e47e3d5e 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -9,6 +9,9 @@
 #include "HandlingMgr.h"
 #include "ModelIndices.h"
 #include "PlayerPed.h"
+#include "Wanted.h"
+#include "DMAudio.h"
+#include "Fire.h"
 #include "Pools.h"
 #include "Timer.h"
 #include "TrafficLights.h"
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index de8c799e..07ba2e3c 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -19,6 +19,7 @@
 #include "Ped.h"
 #include "PlayerInfo.h"
 #include "PlayerPed.h"
+#include "Wanted.h"
 #include "Pools.h"
 #include "Renderer.h"
 #include "RoadBlocks.h"
@@ -27,7 +28,7 @@
 #include "Streaming.h"
 #include "VisibilityPlugins.h"
 #include "Vehicle.h"
-#include "Wanted.h"
+#include "Fire.h"
 #include "World.h"
 #include "Zones.h"
 
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index b7ae0726..ec1b887e 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -3,6 +3,7 @@
 #include "main.h"
 #include "Darkel.h"
 #include "PlayerPed.h"
+#include "Wanted.h"
 #include "Timer.h"
 #include "DMAudio.h"
 #include "Population.h"
diff --git a/src/control/Darkel.h b/src/control/Darkel.h
index f17d7581..12ce4451 100644
--- a/src/control/Darkel.h
+++ b/src/control/Darkel.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Weapon.h"
 #include "ModelIndices.h"
 
 class CVehicle;
 class CPed;
+enum eWeaponType;
 
 enum
 {
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index 1e5b72c3..1493cec0 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -9,6 +9,7 @@
 #include "CutsceneMgr.h"

 #include "World.h"

 #include "PlayerPed.h"

+#include "Wanted.h"

 #include "Camera.h"

 #include "Messages.h"

 #include "CarCtrl.h"

diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp
index f9cb4698..340fe0f6 100644
--- a/src/control/Gangs.cpp
+++ b/src/control/Gangs.cpp
@@ -1,7 +1,8 @@
 #include "common.h"
 #include "patcher.h"
 #include "ModelIndices.h"
-#include "Gangs.h"
+#include "Gangs.h"

+#include "Weapon.h"
 
 //CGangInfo(&CGangs::Gang)[NUM_GANGS] = *(CGangInfo(*)[NUM_GANGS])*(uintptr*)0x6EDF78;
 CGangInfo CGangs::Gang[NUM_GANGS];
@@ -38,8 +39,8 @@ void CGangs::SetGangVehicleModel(int16 gang, int32 model)
 void CGangs::SetGangWeapons(int16 gang, int32 weapon1, int32 weapon2)
 {
 	CGangInfo *gi = GetGangInfo(gang);
-	gi->m_Weapon1 = (eWeaponType)weapon1;
-	gi->m_Weapon2 = (eWeaponType)weapon2;
+	gi->m_Weapon1 = weapon1;
+	gi->m_Weapon2 = weapon2;
 }
 
 void CGangs::SetGangPedModelOverride(int16 gang, int8 ovrd)
diff --git a/src/control/Gangs.h b/src/control/Gangs.h
index a348f259..cf22cc73 100644
--- a/src/control/Gangs.h
+++ b/src/control/Gangs.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include "Weapon.h"
-
 struct CGangInfo
 {
 	int32 m_nVehicleMI;
 	int8 m_nPedModelOverride;
-	eWeaponType m_Weapon1;
-	eWeaponType m_Weapon2;
+	int32 m_Weapon1;
+	int32 m_Weapon2;
 
 	CGangInfo();
 };
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index f3b3a8db..276f02b9 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -11,6 +11,7 @@
 #include "General.h"
 #include "AudioScriptObject.h"
 #include "RpAnimBlend.h"
+#include "AnimBlendAssociation.h"
 
 CPhoneInfo &gPhoneInfo = *(CPhoneInfo*)0x732A20;
 
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 53da89f4..b1832f0e 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -15,6 +15,9 @@
 #include "Pad.h"

 #include "Pickups.h"

 #include "PlayerPed.h"

+#include "Wanted.h"

+#include "DMAudio.h"

+#include "Fire.h"

 #include "PointLights.h"

 #include "Pools.h"

 #include "Script.h"

diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index a68dd5e7..3c0393aa 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -5,6 +5,7 @@
 #include "SpecialFX.h"
 #include "CarCtrl.h"
 #include "CivilianPed.h"
+#include "Wanted.h"
 #include "Clock.h"
 #include "DMAudio.h"
 #include "Draw.h"
@@ -22,6 +23,8 @@
 #include "Pools.h"
 #include "Population.h"
 #include "Replay.h"
+#include "References.h"
+#include "Pools.h"
 #include "RpAnimBlend.h"
 #include "RwHelper.h"
 #include "CutsceneMgr.h"
@@ -33,6 +36,8 @@
 #include "Zones.h"
 #include "Font.h"
 #include "Text.h"
+#include "Camera.h"
+#include "Radar.h"
 
 uint8 &CReplay::Mode = *(uint8*)0x95CD5B;
 CAddressInReplayBuffer &CReplay::Record = *(CAddressInReplayBuffer*)0x942F7C;
diff --git a/src/control/Replay.h b/src/control/Replay.h
index cc652a11..56de52a3 100644
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -1,14 +1,7 @@
 #pragma once
 
-#include "Camera.h"
-#include "Ped.h"
 #include "Pools.h"
-#include "Radar.h"
-#include "References.h"
-#include "Vehicle.h"
-#include "Wanted.h"
 #include "World.h"
-#include "common.h"
 
 #ifdef FIX_BUGS
 #ifndef DONT_FIX_REPLAY_BUGS
@@ -16,6 +9,9 @@
 #endif
 #endif
 
+class CVehicle;
+struct CReference;
+
 struct CAddressInReplayBuffer
 {
 	uint32 m_nOffset;
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 2cfd2a9b..14f55734 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -53,6 +53,8 @@
 #include "Restart.h"
 #include "Replay.h"
 #include "RpAnimBlend.h"
+#include "AnimBlendAssociation.h"
+#include "Fire.h"
 #include "Rubbish.h"
 #include "Shadows.h"
 #include "SpecialFX.h"
@@ -65,6 +67,7 @@
 #include "Weather.h"
 #include "World.h"
 #include "Zones.h"
+#include "Radar.h"
 
 #define PICKUP_PLACEMENT_OFFSET 0.5f
 #define PED_FIND_Z_OFFSET 5.0f