diff --git a/openrw_iwyu.imp b/openrw_iwyu.imp
index 0112693b..d9c402d0 100644
--- a/openrw_iwyu.imp
+++ b/openrw_iwyu.imp
@@ -16,6 +16,13 @@
     { "include": [ "@<boost/range/iterator_range_core\\.hpp>", "private", "<boost/range/iterator_range.hpp>", "public"] },
 # Bullet:
     { "include": [ "@<BulletDynamics/Character/.*>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<BulletDynamics/Dynamics/.*>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<BulletCollision/CollisionShapes/.*>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<BulletCollision/CollisionDispatch/.*>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<LinearMath/btMotionState\\.h>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<LinearMath/btQuaternion\\.h>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<LinearMath/btTransform\\.h>", "public", "<btBulletDynamicsCommon.h>", "public"] },
+    { "include": [ "@<LinearMath/btVector3\\.h>", "public", "<btBulletDynamicsCommon.h>", "public"] },
 # libavcodec / libavutil
     { "include": [ "@<libavcodec/version\\.h>", "public", "<libavcodec/avcodec.h>", "public"] },
     { "include": [ "@<libavutil/version\\.h>", "public", "<libavutil/avutil.h>", "public"] },
diff --git a/rwengine/src/dynamics/CollisionInstance.cpp b/rwengine/src/dynamics/CollisionInstance.cpp
index 66fc135e..a290bdcb 100644
--- a/rwengine/src/dynamics/CollisionInstance.cpp
+++ b/rwengine/src/dynamics/CollisionInstance.cpp
@@ -1,8 +1,18 @@
-#include <dynamics/CollisionInstance.hpp>
+#include "dynamics/CollisionInstance.hpp"
 
-#include <engine/GameData.hpp>
-#include <engine/GameWorld.hpp>
-#include <objects/GameObject.hpp>
+#include <algorithm>
+#include <cstddef>
+#include <limits>
+
+#include <btBulletDynamicsCommon.h>
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include "data/CollisionModel.hpp"
+#include "data/ModelData.hpp"
+#include "engine/GameWorld.hpp"
+#include "objects/GameObject.hpp"
+#include "objects/VehicleInfo.hpp"
 
 class GameObjectMotionState : public btMotionState {
 public:
diff --git a/rwengine/src/dynamics/CollisionInstance.hpp b/rwengine/src/dynamics/CollisionInstance.hpp
index 829535b0..cc0d03bd 100644
--- a/rwengine/src/dynamics/CollisionInstance.hpp
+++ b/rwengine/src/dynamics/CollisionInstance.hpp
@@ -1,10 +1,13 @@
-#ifndef RWENGINE_COLLISIONINSTANCE_HPP
-#define RWENGINE_COLLISIONINSTANCE_HPP
-#include <btBulletDynamicsCommon.h>
-#include <data/CollisionModel.hpp>
-#include <string>
+#ifndef _RWENGINE_COLLISIONINSTANCE_HPP_
+#define _RWENGINE_COLLISIONINSTANCE_HPP_
 #include <vector>
 
+class btCollisionShape;
+class btMotionState;
+class btRigidBody;
+class btTriangleIndexVertexArray;
+struct CollisionModel;
+
 class GameObject;
 struct DynamicObjectData;
 struct VehicleHandlingInfo;
diff --git a/rwengine/src/dynamics/RaycastCallbacks.hpp b/rwengine/src/dynamics/RaycastCallbacks.hpp
index 6180bec0..f79ee37a 100644
--- a/rwengine/src/dynamics/RaycastCallbacks.hpp
+++ b/rwengine/src/dynamics/RaycastCallbacks.hpp
@@ -1,4 +1,6 @@
-#pragma once
+#ifndef _RWENGINE_RAYCASTCALLBACKS_HPP_
+#define _RWENGINE_RAYCASTCALLBACKS_HPP_
+
 #include <btBulletDynamicsCommon.h>
 
 /**
@@ -23,3 +25,5 @@ public:
                                                          normalInWorldSpace);
     }
 };
+
+#endif