diff --git a/code/client/src/sdk/entities/c_actor.h b/code/client/src/sdk/entities/c_actor.h
index e56ec671..29869acf 100644
--- a/code/client/src/sdk/entities/c_actor.h
+++ b/code/client/src/sdk/entities/c_actor.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include "../ue/sys/core/c_frame.h"
 #include "../ue/sys/math/c_matrix.h"
 #include "../ue/sys/math/c_quat.h"
-#include "../ue/sys/core/c_frame.h"
-#include "c_entity.h"
+#include "c_entity_pos.h"
 
 #include <cstdint>
 
 namespace SDK {
-    class C_Actor: public C_Entity {
+    class C_Actor: public C_EntityPos {
       public:
         virtual void SetPos(ue::sys::math::C_Vector const &)                                                                              = 0;
         virtual void SetDir(ue::sys::math::C_Vector const &)                                                                              = 0;
diff --git a/code/client/src/sdk/entities/c_actor_deform.h b/code/client/src/sdk/entities/c_actor_deform.h
index 89fc4c43..392c30ac 100644
--- a/code/client/src/sdk/entities/c_actor_deform.h
+++ b/code/client/src/sdk/entities/c_actor_deform.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include "c_entity_pos.h"
+#include "c_actor.h"
 
 namespace SDK {
-    class C_ActorDeform : public C_EntityPos {
-
-    };
-}
+    class C_ActorDeform: public C_Actor {};
+} // namespace SDK
diff --git a/code/client/src/sdk/entities/c_car.h b/code/client/src/sdk/entities/c_car.h
index 53338818..ec7c805a 100644
--- a/code/client/src/sdk/entities/c_car.h
+++ b/code/client/src/sdk/entities/c_car.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "c_actor.h"
+#include "c_actor_vehicle.h"
+#include "c_vehicle.h"
 
 namespace SDK {
-    class C_Vehicle;
     class I_Human2;
 
     struct S_BaseSeat {
@@ -13,7 +13,7 @@ namespace SDK {
         };
     };
 
-    class C_Car: public C_Actor {
+    class C_Car: public C_ActorVehicle {
       public:
         void Lock();
         void Unlock();
diff --git a/code/client/src/sdk/entities/c_crash_obj.h b/code/client/src/sdk/entities/c_crash_obj.h
index 8b361628..a0b5a937 100644
--- a/code/client/src/sdk/entities/c_crash_obj.h
+++ b/code/client/src/sdk/entities/c_crash_obj.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include "c_actor.h"
+#include "c_actor_deform.h"
 
 namespace SDK {
-    class C_CrashObj : public C_Actor {
-
-    };
-}
+    class C_CrashObj: public C_ActorDeform {};
+} // namespace SDK
diff --git a/code/client/src/sdk/entities/c_entity_pos.h b/code/client/src/sdk/entities/c_entity_pos.h
index 6cac5ea5..7d7468e9 100644
--- a/code/client/src/sdk/entities/c_entity_pos.h
+++ b/code/client/src/sdk/entities/c_entity_pos.h
@@ -3,7 +3,5 @@
 #include "c_entity.h"
 
 namespace SDK {
-    class C_EntityPos : public C_Entity {
-
-    };
-}
+    class C_EntityPos: public C_Entity {};
+} // namespace SDK