7 files changed, 5 insertions, 14 deletions
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index 8c583799..2a71a8d5 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -90,6 +90,4 @@ public:
 	}
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(C2dEffect) == 0x34, "C2dEffect: error");
-#endif
-\ No newline at end of file
+VALIDATE_SIZE(C2dEffect, 0x34);
diff --git a/src/render/Coronas.h b/src/render/Coronas.h
index d2e79079..46eb4315 100644
--- a/src/render/Coronas.h
+++ b/src/render/Coronas.h
@@ -39,9 +39,7 @@ struct CRegisteredCorona
 	void Update(void);
 };
 
-#ifdef CHECK_STRUCT_SIZES 
-static_assert(sizeof(CRegisteredCorona) == 0x80, "CRegisteredCorona: error");
-#endif
+VALIDATE_SIZE(CRegisteredCorona, 0x80);
 
 class CCoronas
 {
diff --git a/src/render/Glass.h b/src/render/Glass.h
index 0c715c27..51c5aae9 100644
--- a/src/render/Glass.h
+++ b/src/render/Glass.h
@@ -21,9 +21,7 @@ public:
 	void Render(void);
 };
 
-#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(CFallingGlassPane, 0x70);
-#endif
 
 enum
 {
diff --git a/src/render/Particle.h b/src/render/Particle.h
index ed1528d2..7f02e318 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -91,6 +91,4 @@ public:
 	static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
 };
 
-#ifdef CHECK_STRUCT_SIZES
 VALIDATE_SIZE(CParticle, 0x68);
-#endif
-\ No newline at end of file
diff --git a/src/render/PointLights.h b/src/render/PointLights.h
index 56b84f71..9e94328f 100644
--- a/src/render/PointLights.h
+++ b/src/render/PointLights.h
@@ -13,7 +13,7 @@ public:
 	int8 fogType;
 	bool castExtraShadows;
 };
-static_assert(sizeof(CRegisteredPointLight) == 0x2C, "CRegisteredPointLight: error");
+VALIDATE_SIZE(CRegisteredPointLight, 0x2C);
 
 class CPointLights
 {
diff --git a/src/render/Shadows.h b/src/render/Shadows.h
index 8e89024d..ef56d336 100644
--- a/src/render/Shadows.h
+++ b/src/render/Shadows.h
@@ -124,9 +124,8 @@ public:
 	CPermanentShadow()
 	{  }
 };
-#ifdef CHECK_STRUCT_SIZES
+
 VALIDATE_SIZE(CPermanentShadow, 0x38);
-#endif
 
 class CPtrList;
 class CAutomobile;
diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h
index d2d20863..a37bdd12 100644
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -25,7 +25,7 @@ public:
 	void PushPeds(void);
 };
 
-static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error");
+VALIDATE_SIZE(CWaterCannon, 412);
 
 class CWaterCannons
 {