diff --git a/rwengine/src/engine/GameState.hpp b/rwengine/src/engine/GameState.hpp
index 3cd4ee6e..84382431 100644
--- a/rwengine/src/engine/GameState.hpp
+++ b/rwengine/src/engine/GameState.hpp
@@ -243,8 +243,9 @@ struct GarageInfo
  * Gameplay state object that holds persistent state, and references runtime
  * world state.
  */
-struct GameState
+class GameState
 {
+public:
 	/**
 	  Basic Game State
 	 */
diff --git a/rwengine/src/objects/VehicleObject.hpp b/rwengine/src/objects/VehicleObject.hpp
index 54be577d..7c2b6ae4 100644
--- a/rwengine/src/objects/VehicleObject.hpp
+++ b/rwengine/src/objects/VehicleObject.hpp
@@ -6,7 +6,7 @@
 #include <objects/VehicleInfo.hpp>
 
 class CollisionInstance;
-class btVehicleRaycaster;
+struct btVehicleRaycaster;
 class btRaycastVehicle;
 class btRigidBody;
 class btHingeConstraint;
diff --git a/rwengine/src/render/GameRenderer.hpp b/rwengine/src/render/GameRenderer.hpp
index 54d15254..374d71bb 100644
--- a/rwengine/src/render/GameRenderer.hpp
+++ b/rwengine/src/render/GameRenderer.hpp
@@ -21,7 +21,7 @@ class ModelFrame;
 class GameWorld;
 class GameObject;
 
-class AreaIndicatorInfo;
+struct AreaIndicatorInfo;
 
 /// @todo migrate to some other way of rendering each object type.
 class CharacterObject;