merge with master

src/vehicles/Automobile.cpp

@@ -39,6 +39,7 @@
 #include "PathFind.h"
 #include "AnimManager.h"
 #include "RpAnimBlend.h"
+#include "AnimBlendAssociation.h"
 #include "Ped.h"
 #include "PlayerPed.h"
 #include "Object.h"

src/vehicles/Heli.cpp

@@ -19,6 +19,8 @@
 #include "World.h"
 #include "WaterLevel.h"
 #include "PlayerPed.h"
+#include "Wanted.h"
+#include "DMAudio.h"
 #include "Object.h"
 #include "HandlingMgr.h"
 #include "Heli.h"

src/vehicles/Plane.cpp

@@ -7,6 +7,8 @@
 #include "Streaming.h"
 #include "Replay.h"
 #include "Camera.h"
+#include "DMAudio.h"
+#include "Wanted.h"
 #include "Coronas.h"
 #include "Particle.h"
 #include "Explosion.h"

src/vehicles/Train.cpp

@@ -10,6 +10,7 @@
 #include "Coronas.h"
 #include "World.h"
 #include "Ped.h"
+#include "DMAudio.h"
 #include "HandlingMgr.h"
 #include "Train.h"
 

src/vehicles/Vehicle.cpp

@@ -16,6 +16,7 @@
 #include "Renderer.h"
 #include "DMAudio.h"
 #include "Radar.h"
+#include "Fire.h"
 #include "Darkel.h"
 
 bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;