From fb58dfb082fb84d69b2da05e16f424aad4bc2aba Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <anonymous.maarten@gmail.com>
Date: Tue, 31 Oct 2017 04:05:12 +0100
Subject: [PATCH] rwengine: iwyu: reduce warnings in engine subdirectory

---
 rwengine/src/ai/CharacterController.cpp  |  1 +
 rwengine/src/data/ModelData.hpp          |  6 +--
 rwengine/src/engine/Animator.cpp         | 14 ++++--
 rwengine/src/engine/Animator.hpp         | 14 +++---
 rwengine/src/engine/GameData.cpp         | 47 +++++++++++--------
 rwengine/src/engine/GameData.hpp         | 31 ++++++++-----
 rwengine/src/engine/GameState.cpp        |  2 +-
 rwengine/src/engine/GameState.hpp        | 20 ++++----
 rwengine/src/engine/GameWorld.cpp        | 45 ++++++++++--------
 rwengine/src/engine/GameWorld.hpp        | 59 ++++++++++++++----------
 rwengine/src/engine/SaveGame.cpp         | 49 +++++++++++++-------
 rwengine/src/engine/SaveGame.hpp         | 12 ++---
 rwengine/src/engine/ScreenText.cpp       |  4 +-
 rwengine/src/engine/ScreenText.hpp       | 13 ++++--
 rwengine/src/objects/CharacterObject.cpp |  4 ++
 rwengine/src/objects/ObjectTypes.hpp     |  7 ++-
 rwengine/src/objects/PickupObject.cpp    |  5 +-
 rwengine/src/objects/VehicleObject.cpp   |  6 ++-
 rwgame/GameBase.cpp                      |  2 +
 rwgame/RWGame.cpp                        |  3 ++
 rwgame/states/IngameState.cpp            |  1 +
 tests/test_Animation.cpp                 |  1 +
 tests/test_Globals.hpp                   |  1 +
 tests/test_ObjectData.cpp                |  1 +
 24 files changed, 212 insertions(+), 136 deletions(-)

diff --git a/rwengine/src/ai/CharacterController.cpp b/rwengine/src/ai/CharacterController.cpp
index f913be9e..1749fe93 100644
--- a/rwengine/src/ai/CharacterController.cpp
+++ b/rwengine/src/ai/CharacterController.cpp
@@ -4,6 +4,7 @@
 #include <limits>
 #include <utility>
 
+#include <btBulletDynamicsCommon.h>
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/quaternion.hpp>
 
diff --git a/rwengine/src/data/ModelData.hpp b/rwengine/src/data/ModelData.hpp
index 2f29d049..4bb0b09d 100644
--- a/rwengine/src/data/ModelData.hpp
+++ b/rwengine/src/data/ModelData.hpp
@@ -9,12 +9,12 @@
 #include <utility>
 #include <vector>
 
+#include <data/Clump.hpp>
 #include <rw/defines.hpp>
 #include <rw/forward.hpp>
 
-#include "data/CollisionModel.hpp"
-#include "data/Clump.hpp"
-#include "data/PathData.hpp"
+#include <data/CollisionModel.hpp>
+#include <data/PathData.hpp>
 #ifdef RW_WINDOWS
 #include <rw_mingw.hpp>
 #endif
diff --git a/rwengine/src/engine/Animator.cpp b/rwengine/src/engine/Animator.cpp
index 4a7e8901..65aaea31 100644
--- a/rwengine/src/engine/Animator.cpp
+++ b/rwengine/src/engine/Animator.cpp
@@ -1,8 +1,14 @@
+#include "engine/Animator.hpp"
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
 #include <data/Clump.hpp>
-#include <engine/Animator.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <loaders/LoaderDFF.hpp>
-#include <queue>
+
+#include "loaders/LoaderIFP.hpp"
+
+#include <algorithm>
+#include <cmath>
 
 Animator::Animator(ClumpPtr model) : model(model) {
 }
diff --git a/rwengine/src/engine/Animator.hpp b/rwengine/src/engine/Animator.hpp
index 52eebbac..f41c1645 100644
--- a/rwengine/src/engine/Animator.hpp
+++ b/rwengine/src/engine/Animator.hpp
@@ -1,14 +1,12 @@
-#pragma once
-#ifndef _ANIMATOR_HPP_
-#define _ANIMATOR_HPP_
-#include <cstdint>
-#include <glm/glm.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <loaders/LoaderIFP.hpp>
+#ifndef _RWENGINE_ANIMATOR_HPP_
+#define _RWENGINE_ANIMATOR_HPP_
 #include <map>
-#include <rw/defines.hpp>
+#include <vector>
 
+#include <rw/defines.hpp>
 #include <rw/forward.hpp>
+
+struct AnimationBone;
 class ModelFrame;
 
 /**
diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp
index 0187ae57..5d13b07d 100644
--- a/rwengine/src/engine/GameData.cpp
+++ b/rwengine/src/engine/GameData.cpp
@@ -1,24 +1,35 @@
-#include <data/Clump.hpp>
-#include <data/ModelData.hpp>
-#include <data/WeaponData.hpp>
-#include <engine/GameData.hpp>
-#include <engine/GameState.hpp>
-#include <engine/GameWorld.hpp>
-#include <loaders/LoaderCOL.hpp>
-#include <loaders/LoaderIDE.hpp>
-#include <loaders/LoaderIPL.hpp>
-#include <platform/FileHandle.hpp>
-#include <script/SCMFile.hpp>
-#include <core/Logger.hpp>
-#include <loaders/GenericDATLoader.hpp>
-#include <loaders/LoaderGXT.hpp>
-#include <platform/FileIndex.hpp>
+#include "engine/GameData.hpp"
 
 #include <algorithm>
-#include <boost/algorithm/string/predicate.hpp>
+#include <cctype>
+#include <cmath>
+#include <cstdlib>
 #include <fstream>
-#include <iostream>
-#include <sstream>
+#include <iterator>
+#include <stdexcept>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <data/Clump.hpp>
+#include <rw/defines.hpp>
+#include <rw/types.hpp>
+
+#include "core/Logger.hpp"
+//#include "data/WeaponData.hpp"
+#include "engine/GameState.hpp"
+#include "engine/GameWorld.hpp"
+#include "loaders/LoaderCOL.hpp"
+#include "loaders/LoaderDFF.hpp"
+#include "loaders/LoaderIDE.hpp"
+#include "loaders/LoaderIFP.hpp"
+#include "loaders/LoaderIMG.hpp"
+#include "loaders/LoaderIPL.hpp"
+#include "loaders/LoaderTXD.hpp"
+#include "platform/FileHandle.hpp"
+#include "script/SCMFile.hpp"
+#include "loaders/GenericDATLoader.hpp"
+#include "loaders/LoaderGXT.hpp"
+#include "platform/FileIndex.hpp"
 
 GameData::GameData(Logger* log, const rwfs::path& path)
     : datpath(path), logger(log), engine(nullptr) {
diff --git a/rwengine/src/engine/GameData.hpp b/rwengine/src/engine/GameData.hpp
index f68bdd18..2bd11daf 100644
--- a/rwengine/src/engine/GameData.hpp
+++ b/rwengine/src/engine/GameData.hpp
@@ -1,28 +1,35 @@
-#pragma once
-#ifndef _GAMEDATA_HPP_
-#define _GAMEDATA_HPP_
+#ifndef _RWENGINE_GAMEDATA_HPP_
+#define _RWENGINE_GAMEDATA_HPP_
 
-class Logger;
+#include <array>
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <glm/glm.hpp>
+
+#include <platform/FileIndex.hpp>
+#include <rw/defines.hpp>
+#include <rw/forward.hpp>
 
 #include <data/GameTexts.hpp>
+#include <data/ModelData.hpp>
 #include <data/PedData.hpp>
 #include <data/ZoneData.hpp>
 #include <data/AnimGroup.hpp>
 #include <loaders/LoaderDFF.hpp>
-#include <loaders/LoaderIDE.hpp>
-#include <loaders/LoaderIFP.hpp>
 #include <loaders/LoaderIMG.hpp>
 #include <loaders/LoaderTXD.hpp>
 #include <loaders/WeatherLoader.hpp>
 #include <objects/VehicleInfo.hpp>
-#include <rw/types.hpp>
-
 #include <gl/TextureData.hpp>
-#include <platform/FileIndex.hpp>
 
-#include <memory>
-
-struct DynamicObjectData;
+class Logger;
 struct WeaponData;
 class GameWorld;
 class TextureAtlas;
diff --git a/rwengine/src/engine/GameState.cpp b/rwengine/src/engine/GameState.cpp
index 5a258ced..ae30a168 100644
--- a/rwengine/src/engine/GameState.cpp
+++ b/rwengine/src/engine/GameState.cpp
@@ -1,4 +1,4 @@
-#include <engine/GameState.hpp>
+#include "engine/GameState.hpp"
 
 BasicState::BasicState()
     : saveName{0}
diff --git a/rwengine/src/engine/GameState.hpp b/rwengine/src/engine/GameState.hpp
index 0fde7b81..909e6eb6 100644
--- a/rwengine/src/engine/GameState.hpp
+++ b/rwengine/src/engine/GameState.hpp
@@ -1,21 +1,23 @@
-#pragma once
-#ifndef _GAMESTATE_HPP_
-#define _GAMESTATE_HPP_
+#ifndef _RWENGINE_GAMESTATE_HPP_
+#define _RWENGINE_GAMESTATE_HPP_
 #include <bitset>
+#include <cstdint>
+#include <string>
+#include <map>
+#include <vector>
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include <data/GameTexts.hpp>
 #include <data/VehicleGenerator.hpp>
 #include <engine/GameInputState.hpp>
 #include <engine/ScreenText.hpp>
-#include <glm/glm.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <map>
 #include <objects/ObjectTypes.hpp>
-#include <string>
-#include <vector>
 
 class GameWorld;
 class GameObject;
 class ScriptMachine;
-class PlayerController;
 struct CutsceneData;
 
 struct SystemTime {
diff --git a/rwengine/src/engine/GameWorld.cpp b/rwengine/src/engine/GameWorld.cpp
index a3ea54f8..4207d548 100644
--- a/rwengine/src/engine/GameWorld.cpp
+++ b/rwengine/src/engine/GameWorld.cpp
@@ -1,33 +1,40 @@
 #include "engine/GameWorld.hpp"
 
+//#include <LinearMath/btScalar.h>
+//#include <BulletCollision/CollisionDispatch/btGhostObject.h>
+#include <btBulletDynamicsCommon.h>
+
+#include <glm/gtx/norm.hpp>
+
 #include <data/Clump.hpp>
 
-#include <engine/GameData.hpp>
-#include <engine/GameState.hpp>
+#include "core/Logger.hpp"
 
-#include <core/Logger.hpp>
+#include "engine/GameData.hpp"
+#include "engine/GameState.hpp"
 
-#include <BulletCollision/CollisionDispatch/btGhostObject.h>
-#include <ai/DefaultAIController.hpp>
-#include <ai/TrafficDirector.hpp>
-#include <data/WeaponData.hpp>
-#include <loaders/LoaderIDE.hpp>
-#include <loaders/LoaderIPL.hpp>
+#include "ai/DefaultAIController.hpp"
+#include "ai/PlayerController.hpp"
+#include "ai/TrafficDirector.hpp"
 
-// 3 isn't enough to cause a factory.
-#include <objects/CharacterObject.hpp>
-#include <objects/CutsceneObject.hpp>
-#include <objects/InstanceObject.hpp>
-#include <objects/ItemPickup.hpp>
-#include <objects/VehicleObject.hpp>
+#include "data/CutsceneData.hpp"
+#include "data/WeaponData.hpp"
+
+#include "loaders/LoaderCutsceneDAT.hpp"
+#include "loaders/LoaderIPL.hpp"
+
+#include "objects/CharacterObject.hpp"
+#include "objects/CutsceneObject.hpp"
+#include "objects/InstanceObject.hpp"
+#include "objects/ItemPickup.hpp"
+#include "objects/VehicleObject.hpp"
+
+#include "render/ViewCamera.hpp"
 
-#include <data/CutsceneData.hpp>
-#include <loaders/LoaderCutsceneDAT.hpp>
 #ifdef RW_WINDOWS
 #include <rw_mingw.hpp>
 #endif
 
-#include <render/ViewCamera.hpp>
 
 // Behaviour Tuning
 constexpr float kMaxTrafficSpawnRadius = 100.f;
@@ -210,8 +217,6 @@ void GameWorld::cleanupTraffic(const ViewCamera& focus) {
     destroyQueuedObjects();
 }
 
-#include <ai/PlayerController.hpp>
-#include <core/Logger.hpp>
 CutsceneObject* GameWorld::createCutsceneObject(const uint16_t id,
                                                 const glm::vec3& pos,
                                                 const glm::quat& rot) {
diff --git a/rwengine/src/engine/GameWorld.hpp b/rwengine/src/engine/GameWorld.hpp
index 592ffe03..634008c3 100644
--- a/rwengine/src/engine/GameWorld.hpp
+++ b/rwengine/src/engine/GameWorld.hpp
@@ -1,18 +1,43 @@
-#ifndef _GAMEWORLD_HPP_
-#define _GAMEWORLD_HPP_
+#ifndef _RWENGINE_GAMEWORLD_HPP_
+#define _RWENGINE_GAMEWORLD_HPP_
+
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <random>
+#include <set>
+#include <string>
+#include <vector>
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <LinearMath/btScalar.h>
+
+#include <ai/AIGraph.hpp>
+#include <ai/AIGraphNode.hpp>
+#include <audio/SoundManager.hpp>
+
+#include <objects/ObjectTypes.hpp>
+#include <render/VisualFX.hpp>
+
+#include <data/Chase.hpp>
+
+class btCollisionDispatcher;
+class btDefaultCollisionConfiguration;
+class btDiscreteDynamicsWorld;
+class btDynamicsWorld;
+class btManifoldPoint;
+class btOverlappingPairCallback;
+class btSequentialImpulseConstraintSolver;
+struct btDbvtBroadphase;
+
+class GameState;
 
 class PlayerController;
 class Logger;
 
 class GameData;
-
-#include <ai/AIGraph.hpp>
-#include <ai/AIGraphNode.hpp>
-#include <audio/SoundManager.hpp>
-#include <engine/GameState.hpp>
-
 class CutsceneObject;
-#include <objects/ObjectTypes.hpp>
 
 class GameObject;
 class CharacterObject;
@@ -21,27 +46,11 @@ class VehicleObject;
 class PickupObject;
 
 class ViewCamera;
-#include <data/ModelData.hpp>
-#include <render/VisualFX.hpp>
 
 struct BlipData;
 struct WeaponScan;
 struct VehicleGenerator;
 
-#include <data/Chase.hpp>
-#include <glm/glm.hpp>
-
-
-#include <data/Clump.hpp>
-
-#include <btBulletCollisionCommon.h>
-#include <btBulletDynamicsCommon.h>
-
-#include <array>
-#include <random>
-#include <set>
-#include <vector>
-
 /**
  * Information about "Goal" locations so they can be rendered
  * (this doesn't really belong here).
diff --git a/rwengine/src/engine/SaveGame.cpp b/rwengine/src/engine/SaveGame.cpp
index f2ab4995..d285703e 100644
--- a/rwengine/src/engine/SaveGame.cpp
+++ b/rwengine/src/engine/SaveGame.cpp
@@ -1,18 +1,33 @@
-#include <ai/PlayerController.hpp>
+#include "engine/SaveGame.hpp"
+
+#include <cstdint>
+#include <cstdlib>
 #include <cstring>
-#include <engine/GameData.hpp>
-#include <engine/GameState.hpp>
-#include <engine/GameWorld.hpp>
-#include <engine/SaveGame.hpp>
-#include <objects/CharacterObject.hpp>
-#include <objects/GameObject.hpp>
-#include <objects/InstanceObject.hpp>
-#include <objects/VehicleObject.hpp>
-#include <script/SCMFile.hpp>
-#include <script/ScriptMachine.hpp>
+#include <cstdio>
+
+#if RW_DEBUG
+#include <iostream>
+#endif
 
 #include <rw/filesystem.hpp>
 
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include <rw/defines.hpp>
+
+#include "data/ZoneData.hpp"
+#include "engine/GameData.hpp"
+#include "engine/GameState.hpp"
+#include "engine/GameWorld.hpp"
+#include "objects/CharacterObject.hpp"
+#include "objects/GameObject.hpp"
+#include "objects/InstanceObject.hpp"
+#include "objects/VehicleObject.hpp"
+#include "script/SCMFile.hpp"
+#include "script/ScriptMachine.hpp"
+#include "script/ScriptTypes.hpp"
+
 // Original save game file data structures
 typedef uint16_t BlockWord;
 typedef uint32_t BlockDword;
@@ -484,23 +499,23 @@ bool readBlock(std::FILE* str, T& out) {
 
 #define READ_VALUE(var)                                                   \
     if (!readBlock(loadFile, var)) {                                      \
-        std::cerr << file << ": Failed to load block " #var << std::endl; \
+        RW_ERROR(file << ": Failed to load block " #var);                 \
         return false;                                                     \
     }
 #define READ_SIZE(var)                                                   \
     if (!readBlock(loadFile, var)) {                                     \
-        std::cerr << file << ": Failed to load size " #var << std::endl; \
+        RW_ERROR(file << ": Failed to load size " #var);                 \
         return false;                                                    \
     }
 #define CHECK_SIG(expected)                                               \
     {                                                                     \
         char signature[4];                                                \
         if (fread(signature, sizeof(char), 4, loadFile) != 4) {           \
-            std::cerr << "Failed to read signature" << std::endl;         \
+            RW_ERROR("Failed to read signature");                         \
             return false;                                                 \
         }                                                                 \
         if (strncmp(signature, expected, 3) != 0) {                       \
-            std::cerr << "Signature " expected " incorrect" << std::endl; \
+            RW_ERROR("Signature " expected " incorrect");                 \
             return false;                                                 \
         }                                                                 \
     }
@@ -512,7 +527,7 @@ bool readBlock(std::FILE* str, T& out) {
 bool SaveGame::loadGame(GameState& state, const std::string& file) {
     std::FILE* loadFile = std::fopen(file.c_str(), "rb");
     if (loadFile == nullptr) {
-        std::cerr << "Failed to open save file" << std::endl;
+        RW_ERROR("Failed to open save file");
         return false;
     }
 
@@ -538,7 +553,7 @@ bool SaveGame::loadGame(GameState& state, const std::string& file) {
 
     if (fread(state.script->getGlobals(), sizeof(SCMByte), scriptVarCount,
               loadFile) != scriptVarCount) {
-        std::cerr << "Failed to read script memory" << std::endl;
+        RW_ERROR("Failed to read script memory");
         return false;
     }
 
diff --git a/rwengine/src/engine/SaveGame.hpp b/rwengine/src/engine/SaveGame.hpp
index c0b99bb5..14aef5fc 100644
--- a/rwengine/src/engine/SaveGame.hpp
+++ b/rwengine/src/engine/SaveGame.hpp
@@ -1,16 +1,10 @@
-#pragma once
-#ifndef _SAVEGAME_HPP_
-#define _SAVEGAME_HPP_
-
-#include <rw/types.hpp>
-
-#include <engine/GameState.hpp>
+#ifndef _RWENGINE_SAVEGAME_HPP_
+#define _RWENGINE_SAVEGAME_HPP_
 
 #include <string>
 #include <vector>
 
-class GameWorld;
-class ScriptMachine;
+#include <engine/GameState.hpp>
 
 struct SaveGameInfo {
     std::string savePath;
diff --git a/rwengine/src/engine/ScreenText.cpp b/rwengine/src/engine/ScreenText.cpp
index b5a7fa45..ecd6f599 100644
--- a/rwengine/src/engine/ScreenText.cpp
+++ b/rwengine/src/engine/ScreenText.cpp
@@ -1,4 +1,6 @@
-#include <engine/ScreenText.hpp>
+#include "engine/ScreenText.hpp"
+
+#include <rw/defines.hpp>
 
 void ScreenText::tick(float dt) {
     int millis = dt * 1000;
diff --git a/rwengine/src/engine/ScreenText.hpp b/rwengine/src/engine/ScreenText.hpp
index bd608dfa..9d321bc0 100644
--- a/rwengine/src/engine/ScreenText.hpp
+++ b/rwengine/src/engine/ScreenText.hpp
@@ -1,12 +1,15 @@
-#ifndef RWENGINE_SCREENTEXT_HPP
-#define RWENGINE_SCREENTEXT_HPP
+#ifndef _RWENGINE_SCREENTEXT_HPP_
+#define _RWENGINE_SCREENTEXT_HPP_
 #include <algorithm>
 #include <array>
-#include <data/GameTexts.hpp>
-#include <rw/types.hpp>
-#include <utility>
+#include <cstddef>
+#include <string>
 #include <vector>
 
+#include <glm/glm.hpp>
+
+#include <data/GameTexts.hpp>
+
 enum class ScreenTextType {
     /// Big text will be rendered according to the proscribed style.
     /// Adding a 2nd big text will cause the first to terminate.
diff --git a/rwengine/src/objects/CharacterObject.cpp b/rwengine/src/objects/CharacterObject.cpp
index 1b8d98a3..411a6918 100644
--- a/rwengine/src/objects/CharacterObject.cpp
+++ b/rwengine/src/objects/CharacterObject.cpp
@@ -1,13 +1,17 @@
 #include <ai/CharacterController.hpp>
 #include <engine/Animator.hpp>
 #include <engine/GameData.hpp>
+#include <engine/GameState.hpp>
 #include <engine/GameWorld.hpp>
 #include <objects/CharacterObject.hpp>
 #include <objects/VehicleObject.hpp>
 #include <rw/defines.hpp>
 
+#include "loaders/LoaderIFP.hpp"
+
 #include <algorithm>
 
+#include <btBulletDynamicsCommon.h>
 // Required for BT_BULLET_VERSION
 #include "LinearMath/btScalar.h"
 #ifndef BT_BULLET_VERSION
diff --git a/rwengine/src/objects/ObjectTypes.hpp b/rwengine/src/objects/ObjectTypes.hpp
index 56a3d057..48b3eee0 100644
--- a/rwengine/src/objects/ObjectTypes.hpp
+++ b/rwengine/src/objects/ObjectTypes.hpp
@@ -1,8 +1,11 @@
-#pragma once
+#ifndef _RWENGINE_OBJECTTYPES_
+#define _RWENGINE_OBJECTTYPES_
 
 #include <cstdint>
 
 /**
  * all wordly GameObjects are associated with a 32-bit identifier
  */
-typedef uint32_t GameObjectID;
\ No newline at end of file
+typedef uint32_t GameObjectID;
+
+#endif
diff --git a/rwengine/src/objects/PickupObject.cpp b/rwengine/src/objects/PickupObject.cpp
index 8cd92bc4..ebbe8ce5 100644
--- a/rwengine/src/objects/PickupObject.cpp
+++ b/rwengine/src/objects/PickupObject.cpp
@@ -1,7 +1,10 @@
+#include "objects/PickupObject.hpp"
+
+#include <btBulletDynamicsCommon.h>
+
 #include <engine/GameData.hpp>
 #include <engine/GameWorld.hpp>
 #include <objects/CharacterObject.hpp>
-#include <objects/PickupObject.hpp>
 
 uint32_t colours[14] = {
     0xff0000, // bat, detonator, adrenaline
diff --git a/rwengine/src/objects/VehicleObject.cpp b/rwengine/src/objects/VehicleObject.cpp
index 62778a8a..e1be2627 100644
--- a/rwengine/src/objects/VehicleObject.cpp
+++ b/rwengine/src/objects/VehicleObject.cpp
@@ -1,3 +1,8 @@
+#include "objects/VehicleObject.hpp"
+
+#include <btBulletDynamicsCommon.h>
+#include <glm/gtx/quaternion.hpp>
+
 #include <BulletDynamics/Vehicle/btRaycastVehicle.h>
 #include <data/Clump.hpp>
 #include <data/CollisionModel.hpp>
@@ -7,7 +12,6 @@
 #include <engine/GameData.hpp>
 #include <engine/GameWorld.hpp>
 #include <objects/CharacterObject.hpp>
-#include <objects/VehicleObject.hpp>
 
 #define PART_CLOSE_VELOCITY 0.25f
 constexpr float kVehicleMaxExitVelocity = 0.15f;
diff --git a/rwgame/GameBase.cpp b/rwgame/GameBase.cpp
index 60bcebde..86836abd 100644
--- a/rwgame/GameBase.cpp
+++ b/rwgame/GameBase.cpp
@@ -7,6 +7,8 @@
 
 #include "SDL.h"
 
+#include <iostream>
+
 // Use first 8 chars of git hash as the build string
 const std::string kBuildStr(kGitSHA1Hash, 8);
 const std::string kWindowTitle = "RWGame";
diff --git a/rwgame/RWGame.cpp b/rwgame/RWGame.cpp
index c1be395e..22060f24 100644
--- a/rwgame/RWGame.cpp
+++ b/rwgame/RWGame.cpp
@@ -1,4 +1,7 @@
 #include "RWGame.hpp"
+
+#include <glm/gtx/norm.hpp>
+
 #include "DrawUI.hpp"
 #include "GameInput.hpp"
 #include "State.hpp"
diff --git a/rwgame/states/IngameState.cpp b/rwgame/states/IngameState.cpp
index 287aea79..42c0a8b5 100644
--- a/rwgame/states/IngameState.cpp
+++ b/rwgame/states/IngameState.cpp
@@ -18,6 +18,7 @@
 #include <script/ScriptMachine.hpp>
 
 #include <glm/gtc/constants.hpp>
+#include <glm/gtx/norm.hpp>
 #include <glm/gtx/matrix_major_storage.hpp>
 
 constexpr float kAutoLookTime = 2.f;
diff --git a/tests/test_Animation.cpp b/tests/test_Animation.cpp
index 3a51d710..d061ec5b 100644
--- a/tests/test_Animation.cpp
+++ b/tests/test_Animation.cpp
@@ -1,6 +1,7 @@
 #include <boost/test/unit_test.hpp>
 #include <data/Clump.hpp>
 #include <engine/Animator.hpp>
+#include <loaders/LoaderIFP.hpp>
 #include <glm/gtx/string_cast.hpp>
 #include "test_Globals.hpp"
 
diff --git a/tests/test_Globals.hpp b/tests/test_Globals.hpp
index c0f8bfdc..2a1f04cf 100644
--- a/tests/test_Globals.hpp
+++ b/tests/test_Globals.hpp
@@ -1,6 +1,7 @@
 #ifndef _TESTGLOBALS_HPP_
 #define _TESTGLOBALS_HPP_
 
+#include <btBulletDynamicsCommon.h>
 #include <SDL2/SDL.h>
 #include <GameWindow.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/tests/test_ObjectData.cpp b/tests/test_ObjectData.cpp
index e11cebff..ff47216c 100644
--- a/tests/test_ObjectData.cpp
+++ b/tests/test_ObjectData.cpp
@@ -1,5 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <data/ModelData.hpp>
+#include <loaders/LoaderIDE.hpp>
 #include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ObjectDataTests)