Cleanup 2

TR5Main/Game/Lara/lara_basic.cpp

@@ -7,6 +7,7 @@
 #include "lara_monkey.h"
 #include "input.h"
 #include "level.h"
+#include "setup.h"
 #include "health.h"
 #include "Sound/sound.h"
 #include "animation.h"

TR5Main/Game/animation.cpp

@@ -3,6 +3,7 @@
 #include "Lara.h"
 #include "camera.h"
 #include "level.h"
+#include "setup.h"
 #include "Renderer11.h"
 #include "Sound/sound.h"
 #include "flipeffect.h"

TR5Main/Game/camera.cpp

@@ -10,6 +10,7 @@
 #include "effects\weather.h"
 #include "sphere.h"
 #include "level.h"
+#include "setup.h"
 #include "collide.h"
 #include "Sound\sound.h"
 #include "control\los.h"

TR5Main/Game/control/los.cpp

@@ -10,6 +10,7 @@
 #include "effects/debris.h"
 #include "Lara/lara_one_gun.h"
 #include "items.h"
+#include "setup.h"
 
 int NumberLosRooms;
 short LosRooms[20];

TR5Main/Game/control/trigger.cpp

@@ -1,6 +1,7 @@
 #include "framework.h"
 #include "items.h"
 #include "room.h"
+#include "setup.h"
 #include "floordata.h"
 #include "flipeffect.h"
 #include "objectslist.h"

TR5Main/Game/puzzles_keys.cpp

@@ -2,6 +2,7 @@
 #include "collide.h"
 #include "input.h"
 #include "level.h"
+#include "setup.h"
 #include "lara.h"
 #ifdef NEW_INV
 #include "newinv2.h"

TR5Main/Objects/Generic/Traps/falling_block.cpp

@@ -4,6 +4,7 @@
 #include "camera.h"
 #include "animation.h"
 #include "level.h"
+#include "setup.h"
 #include "room.h"
 #include "Sound/sound.h"
 #include "Specific/prng.h"

TR5Main/Objects/TR3/Trap/train.cpp

@@ -3,6 +3,7 @@
 #include "floordata.h"
 #include "control/control.h"
 #include "level.h"
+#include "setup.h"
 #include "effects/effects.h"
 #include "Sound/sound.h"
 #include "camera.h"

TR5Main/Objects/TR3/Vehicles/upv.cpp

@@ -6,7 +6,7 @@
 #include "effects/effects.h"
 #include "collide.h"
 #include "control/box.h"
-#include "lara_flare.h"c
+#include "lara_flare.h"
 #include "animation.h"
 #include "camera.h"
 #include "setup.h"

TR5Main/Objects/TR5/Entity/tr5_gunship.cpp

@@ -1,6 +1,7 @@
 #include "framework.h"
 #include "tr5_gunship.h"
 #include "level.h"
+#include "setup.h"
 #include "control/los.h"
 #include "Sound/sound.h"
 #include "animation.h"

TR5Main/Objects/TR5/Object/tr5_expandingplatform.cpp

@@ -2,6 +2,7 @@
 #include "tr5_expandingplatform.h"
 #include "items.h"
 #include "level.h"
+#include "setup.h"
 #include "control/control.h"
 #include "control/box.h"
 #include "animation.h"

TR5Main/Objects/TR5/Object/tr5_raisingblock.cpp

@@ -2,6 +2,7 @@
 #include "tr5_raisingblock.h"
 #include "items.h"
 #include "level.h"
+#include "setup.h"
 #include "animation.h"
 #include "control/control.h"
 #include "control/box.h"

TR5Main/Objects/TR5/Trap/tr5_explosion.cpp

@@ -1,6 +1,7 @@
 #include "framework.h"
 #include "tr5_explosion.h"
 #include "level.h"
+#include "setup.h"
 #include "control/control.h"
 #include "Sound/sound.h"
 #include "effects/effects.h"

TR5Main/Renderer/Renderer11Draw2D.cpp

@@ -2,9 +2,9 @@
 #include "Renderer11.h"
 #include "camera.h"
 #include "spotcam.h"
-#include "lara.h"
+#include "setup.h"
 #include "control/control.h"
-#include "effects\weather.h"
+#include "effects/weather.h"
 
 using namespace TEN::Effects::Environment;
 

TR5Main/Sound/sound.cpp

@@ -1,10 +1,11 @@
 #include "framework.h"
-#include "winmain.h"
 #include <filesystem>
+#include "winmain.h"
 #include "Sound/sound.h"
 #include "lara.h"
 #include "camera.h"
 #include "room.h"
+#include "setup.h"
 #include "configuration.h"
 #include "level.h"