5 files changed, 5 insertions, 9 deletions
diff --git a/src/objects/CutsceneHead.h b/src/objects/CutsceneHead.h
index 0a70353d..c931eb01 100644
--- a/src/objects/CutsceneHead.h
+++ b/src/objects/CutsceneHead.h
@@ -24,5 +24,5 @@ public:
 	void PlayAnimation(const char *animName);
 };
 #ifndef PED_SKIN
-static_assert(sizeof(CCutsceneHead) == 0x19C, "CCutsceneHead: error");
+VALIDATE_SIZE(CCutsceneHead, 0x19C);
 #endif
diff --git a/src/objects/CutsceneObject.h b/src/objects/CutsceneObject.h
index 9c4036bf..407adcc7 100644
--- a/src/objects/CutsceneObject.h
+++ b/src/objects/CutsceneObject.h
@@ -29,5 +29,5 @@ public:
 	void RemoveLighting(bool reset);
 };
 #ifndef PED_SKIN
-static_assert(sizeof(CCutsceneObject) == 0x198, "CCutsceneObject: error");
+VALIDATE_SIZE(CCutsceneObject, 0x198);
 #endif
diff --git a/src/objects/DummyObject.h b/src/objects/DummyObject.h
index 8a0913c5..d6f88335 100644
--- a/src/objects/DummyObject.h
+++ b/src/objects/DummyObject.h
@@ -11,6 +11,4 @@ public:
 	CDummyObject(CObject *obj);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CDummyObject) == 0x68, "CDummyObject: error");
-#endif
-\ No newline at end of file
+VALIDATE_SIZE(CDummyObject, 0x68);
diff --git a/src/objects/Object.h b/src/objects/Object.h
index ff4c896e..79589dc9 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -98,6 +98,4 @@ public:
 	static void DeleteAllTempObjectsInArea(CVector point, float fRadius);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CObject) == 0x198, "CObject: error");
-#endif
+VALIDATE_SIZE(CObject, 0x198);
diff --git a/src/objects/ObjectData.h b/src/objects/ObjectData.h
index e3a5c1bd..e25c1aeb 100644
--- a/src/objects/ObjectData.h
+++ b/src/objects/ObjectData.h
@@ -16,7 +16,7 @@ public:
 	uint8 m_nSpecialCollisionResponseCases;
 	bool m_bCameraToAvoidThisObject;
 };
-static_assert(sizeof(CObjectInfo) == 0x20, "CObjectInfo: error");
+VALIDATE_SIZE(CObjectInfo, 0x20);
 
 class CObjectData
 {