diff --git a/rwengine/CMakeLists.txt b/rwengine/CMakeLists.txt
index fc81eea4..33ce8985 100644
--- a/rwengine/CMakeLists.txt
+++ b/rwengine/CMakeLists.txt
@@ -31,7 +31,6 @@ set(RWENGINE_SOURCES
     src/core/Profiler.cpp
     src/core/Profiler.hpp
 
-    src/data/forward.hpp
     src/data/AnimGroup.cpp
     src/data/AnimGroup.hpp
     src/data/Chase.cpp
diff --git a/rwengine/src/data/forward.hpp b/rwengine/src/data/forward.hpp
deleted file mode 100644
index efc26769..00000000
--- a/rwengine/src/data/forward.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _RWENGINE_DATA_FORWARD_HPP_
-#define _RWENGINE_DATA_FORWARD_HPP_
-
-struct CutsceneTracks;
-class GameTexts;
-
-#endif
diff --git a/rwengine/src/engine/GameWorld.cpp b/rwengine/src/engine/GameWorld.cpp
index 4207d548..bfaaadd2 100644
--- a/rwengine/src/engine/GameWorld.cpp
+++ b/rwengine/src/engine/GameWorld.cpp
@@ -18,6 +18,7 @@
 #include "ai/TrafficDirector.hpp"
 
 #include "data/CutsceneData.hpp"
+#include "data/InstanceData.hpp"
 #include "data/WeaponData.hpp"
 
 #include "loaders/LoaderCutsceneDAT.hpp"
diff --git a/rwengine/src/loaders/DataLoader.cpp b/rwengine/src/loaders/DataLoader.cpp
deleted file mode 100644
index ba19a0ee..00000000
--- a/rwengine/src/loaders/DataLoader.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <loaders/DataLoader.hpp>
diff --git a/rwengine/src/loaders/GenericDATLoader.cpp b/rwengine/src/loaders/GenericDATLoader.cpp
index 7e1837b8..42f90215 100644
--- a/rwengine/src/loaders/GenericDATLoader.cpp
+++ b/rwengine/src/loaders/GenericDATLoader.cpp
@@ -1,9 +1,13 @@
 #include <loaders/GenericDATLoader.hpp>
 
 #include <algorithm>
+#include <cctype>
 #include <fstream>
+#include <iterator>
 #include <sstream>
 
+#include <rw/defines.hpp>
+
 #include <data/ModelData.hpp>
 #include <data/WeaponData.hpp>
 #include <objects/VehicleInfo.hpp>
diff --git a/rwengine/src/loaders/GenericDATLoader.hpp b/rwengine/src/loaders/GenericDATLoader.hpp
index 4b48187b..6724e382 100644
--- a/rwengine/src/loaders/GenericDATLoader.hpp
+++ b/rwengine/src/loaders/GenericDATLoader.hpp
@@ -1,8 +1,9 @@
-#ifndef _GENERICDATLOADER_HPP_
-#define _GENERICDATLOADER_HPP_
+#ifndef _RWENGINE_GENERICDATLOADER_HPP_
+#define _RWENGINE_GENERICDATLOADER_HPP_
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 struct DynamicObjectData;
diff --git a/rwengine/src/loaders/LoaderCOL.cpp b/rwengine/src/loaders/LoaderCOL.cpp
index 503a917d..6f7f7b77 100644
--- a/rwengine/src/loaders/LoaderCOL.cpp
+++ b/rwengine/src/loaders/LoaderCOL.cpp
@@ -1,9 +1,15 @@
 #include "loaders/LoaderCOL.hpp"
 #include <algorithm>
+#include <cstdint>
 #include <cstring>
 #include <fstream>
+#include <stdexcept>
 #include <string>
 
+#include <glm/glm.hpp>
+
+#include "data/CollisionModel.hpp"
+
 constexpr uint32_t kCollMagic = 0x4C4C4F43;
 
 struct ColHeader {
diff --git a/rwengine/src/loaders/LoaderCOL.hpp b/rwengine/src/loaders/LoaderCOL.hpp
index fb96589b..77102b39 100644
--- a/rwengine/src/loaders/LoaderCOL.hpp
+++ b/rwengine/src/loaders/LoaderCOL.hpp
@@ -1,7 +1,6 @@
-#ifndef RWENGINE_LOADERCOL_HPP
-#define RWENGINE_LOADERCOL_HPP
+#ifndef _RWENGINE_LOADERCOL_HPP_
+#define _RWENGINE_LOADERCOL_HPP_
 #include <data/CollisionModel.hpp>
-#include <glm/glm.hpp>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/rwengine/src/loaders/LoaderCutsceneDAT.cpp b/rwengine/src/loaders/LoaderCutsceneDAT.cpp
index a1071bb2..d257483b 100644
--- a/rwengine/src/loaders/LoaderCutsceneDAT.cpp
+++ b/rwengine/src/loaders/LoaderCutsceneDAT.cpp
@@ -1,14 +1,17 @@
 #include "loaders/LoaderCutsceneDAT.hpp"
 
 #include <algorithm>
+#include <limits>
 #include <sstream>
+#include <string>
 
 #include <glm/glm.hpp>
 
-#include <data/CutsceneData.hpp>
-#include <platform/FileHandle.hpp>
 #include <rw/defines.hpp>
 
+#include "data/CutsceneData.hpp"
+#include "platform/FileHandle.hpp"
+
 void LoaderCutsceneDAT::load(CutsceneTracks &tracks, FileHandle file) {
     std::string dataStr(file->data, file->length);
     std::stringstream ss(dataStr);
diff --git a/rwengine/src/loaders/LoaderCutsceneDAT.hpp b/rwengine/src/loaders/LoaderCutsceneDAT.hpp
index fde37e41..2804832c 100644
--- a/rwengine/src/loaders/LoaderCutsceneDAT.hpp
+++ b/rwengine/src/loaders/LoaderCutsceneDAT.hpp
@@ -1,10 +1,10 @@
-#pragma once
-#ifndef _LOADERCUTSCENEDAT_HPP_
-#define _LOADERCUTSCENEDAT_HPP_
+#ifndef _RWENGINE_LOADERCUTSCENEDAT_HPP_
+#define _RWENGINE_LOADERCUTSCENEDAT_HPP_
 
-#include <data/forward.hpp>
 #include <rw/forward.hpp>
 
+struct CutsceneTracks;
+
 class LoaderCutsceneDAT {
 public:
     void load(CutsceneTracks& tracks, FileHandle file);
diff --git a/rwengine/src/loaders/LoaderGXT.cpp b/rwengine/src/loaders/LoaderGXT.cpp
index 297939e1..4e71b759 100644
--- a/rwengine/src/loaders/LoaderGXT.cpp
+++ b/rwengine/src/loaders/LoaderGXT.cpp
@@ -1,7 +1,13 @@
 #include "loaders/LoaderGXT.hpp"
 
-#include <data/GameTexts.hpp>
-#include "platform/FileHandle.hpp"
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <utility>
+
+#include <platform/FileHandle.hpp>
+
+#include "data/GameTexts.hpp"
 
 void LoaderGXT::load(GameTexts &texts, FileHandle &file) {
     auto data = file->data;
diff --git a/rwengine/src/loaders/LoaderGXT.hpp b/rwengine/src/loaders/LoaderGXT.hpp
index d80cc028..6f6d5e24 100644
--- a/rwengine/src/loaders/LoaderGXT.hpp
+++ b/rwengine/src/loaders/LoaderGXT.hpp
@@ -1,9 +1,9 @@
-#pragma once
-#ifndef _LOADERGXT_HPP_
-#define _LOADERGXT_HPP_
-#include <data/forward.hpp>
+#ifndef _RWENGINE_LOADERGXT_HPP_
+#define _RWENGINE_LOADERGXT_HPP_
 #include <rw/forward.hpp>
 
+class GameTexts;
+
 class LoaderGXT {
 public:
     void load(GameTexts& texts, FileHandle& file);
diff --git a/rwengine/src/loaders/LoaderIDE.cpp b/rwengine/src/loaders/LoaderIDE.cpp
index 1a357780..80f1bd8f 100644
--- a/rwengine/src/loaders/LoaderIDE.cpp
+++ b/rwengine/src/loaders/LoaderIDE.cpp
@@ -1,13 +1,16 @@
-#include <loaders/LoaderIDE.hpp>
+#include "loaders/LoaderIDE.hpp"
 
 #include <algorithm>
 #include <cctype>
+#include <cstdlib>
 #include <fstream>
 #include <functional>
 #include <map>
 #include <sstream>
 #include <string>
 
+#include "data/PathData.hpp"
+
 bool LoaderIDE::load(const std::string &filename, const PedStatsList &stats) {
     std::ifstream str(filename);
 
diff --git a/rwengine/src/loaders/LoaderIDE.hpp b/rwengine/src/loaders/LoaderIDE.hpp
index 8caa6ece..e34ce47d 100644
--- a/rwengine/src/loaders/LoaderIDE.hpp
+++ b/rwengine/src/loaders/LoaderIDE.hpp
@@ -1,13 +1,12 @@
-#ifndef RWENGINE_LOADERIDE_HPP
-#define RWENGINE_LOADERIDE_HPP
+#ifndef _RWENGINE_LOADERIDE_HPP_
+#define _RWENGINE_LOADERIDE_HPP_
 
-#include <data/ModelData.hpp>
-#include <data/PathData.hpp>
-#include <data/PedData.hpp>
-#include <glm/glm.hpp>
-#include <iostream>
 #include <map>
-#include <objects/VehicleInfo.hpp>
+#include <memory>
+#include <string>
+
+#include <data/PedData.hpp>
+#include <data/ModelData.hpp>
 
 class LoaderIDE {
 public:
diff --git a/rwengine/src/loaders/LoaderIFP.cpp b/rwengine/src/loaders/LoaderIFP.cpp
index 1663ddab..7981c2c4 100644
--- a/rwengine/src/loaders/LoaderIFP.cpp
+++ b/rwengine/src/loaders/LoaderIFP.cpp
@@ -1,6 +1,8 @@
+#include "loaders/LoaderIFP.hpp"
+
 #include <algorithm>
-#include <iostream>
-#include <loaders/LoaderIFP.hpp>
+#include <cctype>
+#include <memory>
 
 bool findKeyframes(float t, AnimationBone* bone, AnimationKeyframe& f1,
                    AnimationKeyframe& f2, float& alpha) {
diff --git a/rwengine/src/loaders/LoaderIFP.hpp b/rwengine/src/loaders/LoaderIFP.hpp
index 9f604eef..bb44f59d 100644
--- a/rwengine/src/loaders/LoaderIFP.hpp
+++ b/rwengine/src/loaders/LoaderIFP.hpp
@@ -1,14 +1,16 @@
-#pragma once
-#ifndef _LOADERDFF_IFP_
-#define _LOADERDFF_IFP_
+#ifndef _RWENGINE_LOADERIFP_HPP_
+#define _RWENGINE_LOADERIFP_HPP_
 
-#include <glm/glm.hpp>
-#include <glm/gtx/quaternion.hpp>
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "rw/forward.hpp"
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include <rw/forward.hpp>
 
 struct AnimationKeyframe {
     glm::quat rotation;
diff --git a/rwengine/src/loaders/LoaderIPL.cpp b/rwengine/src/loaders/LoaderIPL.cpp
index 897e8861..6db0f4c9 100644
--- a/rwengine/src/loaders/LoaderIPL.cpp
+++ b/rwengine/src/loaders/LoaderIPL.cpp
@@ -2,11 +2,18 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstdlib>
 #include <fstream>
 #include <functional>
 #include <sstream>
 #include <string>
 
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include "data/InstanceData.hpp"
+#include "data/ZoneData.hpp"
+
 enum SectionTypes { INST, PICK, CULL, ZONE, NONE };
 
 /// Load the IPL data into memory
diff --git a/rwengine/src/loaders/LoaderIPL.hpp b/rwengine/src/loaders/LoaderIPL.hpp
index 702286ff..5b636f36 100644
--- a/rwengine/src/loaders/LoaderIPL.hpp
+++ b/rwengine/src/loaders/LoaderIPL.hpp
@@ -1,11 +1,13 @@
-#ifndef _LOADERIPL_HPP_
-#define _LOADERIPL_HPP_
-#include <data/InstanceData.hpp>
+#ifndef _RWENGINE_LOADERIPL_HPP_
+#define _RWENGINE_LOADERIPL_HPP_
+
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <data/ZoneData.hpp>
 
-#include <iostream>
-#include <memory>
-#include <vector>
+struct InstanceData;
 
 /**
     \class LoaderIPL
diff --git a/rwengine/src/loaders/WeatherLoader.cpp b/rwengine/src/loaders/WeatherLoader.cpp
index ff01817f..17b9c8e8 100644
--- a/rwengine/src/loaders/WeatherLoader.cpp
+++ b/rwengine/src/loaders/WeatherLoader.cpp
@@ -2,10 +2,13 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cmath>
+#include <cstdlib>
 #include <fstream>
-#include <iostream>
 #include <sstream>
 
+#include <glm/glm.hpp>
+
 bool WeatherLoader::load(const std::string& filename) {
     std::ifstream fstream(filename.c_str());
 
diff --git a/rwengine/src/loaders/WeatherLoader.hpp b/rwengine/src/loaders/WeatherLoader.hpp
index 726ebbfc..f9b1f859 100644
--- a/rwengine/src/loaders/WeatherLoader.hpp
+++ b/rwengine/src/loaders/WeatherLoader.hpp
@@ -1,13 +1,13 @@
-#pragma once
-#ifndef _WEATHERLOADER_HPP_
-#define _WEATHERLOADER_HPP_
-
-#include <rw/types.hpp>
+#ifndef _RWENGINE_WEATHERLOADER_HPP_
+#define _RWENGINE_WEATHERLOADER_HPP_
 
+#include <cstdint>
 #include <sstream>
 #include <string>
 #include <vector>
 
+#include <rw/types.hpp>
+
 class WeatherLoader {
 public:
     struct WeatherData {