diff --git a/Editor/ProjectResourceFactory.cpp b/Editor/ProjectResourceFactory.cpp
index df6b5ddf1..b530ff563 100644
--- a/Editor/ProjectResourceFactory.cpp
+++ b/Editor/ProjectResourceFactory.cpp
@@ -2,6 +2,10 @@
 #include "Runtime/IOStreams.hpp"
 
 #include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/CModel.hpp"
 #include "Runtime/CTexture.hpp"
 
 namespace URDE
diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp
index 418c4e499..67de20b78 100644
--- a/Editor/ViewManager.cpp
+++ b/Editor/ViewManager.cpp
@@ -6,6 +6,10 @@
 #include "locale/locale.hpp"
 #include "ResourceBrowser.hpp"
 #include "icons/icons.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/CModel.hpp"
 #include <cstdio>
 
 using YAMLNode = Athena::io::YAMLNode;
diff --git a/Runtime/Particle/CCollisionResponseData.cpp b/Runtime/Particle/CCollisionResponseData.cpp
index 3cf0a2024..2915d57fd 100644
--- a/Runtime/Particle/CCollisionResponseData.cpp
+++ b/Runtime/Particle/CCollisionResponseData.cpp
@@ -1,6 +1,10 @@
 #include "CCollisionResponseData.hpp"
 #include "CParticleDataFactory.hpp"
 #include "CDecalDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CElectricDescription.hpp"
+#include "CGenDescription.hpp"
+#include "CModel.hpp"
 #include "CSimplePool.hpp"
 #include "CRandom16.hpp"
 
diff --git a/Runtime/Particle/CElementGen.cpp b/Runtime/Particle/CElementGen.cpp
index b59a2d586..d0b9579d4 100644
--- a/Runtime/Particle/CElementGen.cpp
+++ b/Runtime/Particle/CElementGen.cpp
@@ -1,5 +1,7 @@
 #include "CElementGen.hpp"
 #include "CGenDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CElectricDescription.hpp"
 #include "CParticleGlobals.hpp"
 #include "CParticleSwoosh.hpp"
 #include "CParticleElectric.hpp"
diff --git a/Runtime/Particle/CElementGenShadersGLSL.cpp b/Runtime/Particle/CElementGenShadersGLSL.cpp
index 98f0af08a..4096dab1d 100644
--- a/Runtime/Particle/CElementGenShadersGLSL.cpp
+++ b/Runtime/Particle/CElementGenShadersGLSL.cpp
@@ -1,6 +1,9 @@
 #include "CElementGenShaders.hpp"
 #include "CElementGen.hpp"
 #include "CGenDescription.hpp"
+#include "CElectricDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CModel.hpp"
 
 namespace pshag
 {
diff --git a/Runtime/Particle/CElementGenShadersHLSL.cpp b/Runtime/Particle/CElementGenShadersHLSL.cpp
index 7143fa023..fb53efb21 100644
--- a/Runtime/Particle/CElementGenShadersHLSL.cpp
+++ b/Runtime/Particle/CElementGenShadersHLSL.cpp
@@ -1,6 +1,9 @@
 #include "CElementGenShaders.hpp"
 #include "CElementGen.hpp"
 #include "CGenDescription.hpp"
+#include "CElectricDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CModel.hpp"
 
 namespace pshag
 {
diff --git a/Runtime/Particle/CParticleDataFactory.cpp b/Runtime/Particle/CParticleDataFactory.cpp
index fb4ada0f6..948394e3e 100644
--- a/Runtime/Particle/CParticleDataFactory.cpp
+++ b/Runtime/Particle/CParticleDataFactory.cpp
@@ -3,6 +3,9 @@
 #include "CSimplePool.hpp"
 #include "CGenDescription.hpp"
 #include "CRandom16.hpp"
+#include "CModel.hpp"
+#include "CSwooshDescription.hpp"
+#include "CElectricDescription.hpp"
 
 namespace pshag
 {
diff --git a/Runtime/Particle/CParticleElectricDataFactory.cpp b/Runtime/Particle/CParticleElectricDataFactory.cpp
index 9ee82d4f8..27ce95c37 100644
--- a/Runtime/Particle/CParticleElectricDataFactory.cpp
+++ b/Runtime/Particle/CParticleElectricDataFactory.cpp
@@ -1,5 +1,8 @@
 #include "CParticleElectricDataFactory.hpp"
+#include "CSwooshDescription.hpp"
 #include "CElectricDescription.hpp"
+#include "CGenDescription.hpp"
+#include "CModel.hpp"
 #include "CToken.hpp"
 #include "CSimplePool.hpp"
 #include "CRandom16.hpp"
diff --git a/Runtime/Particle/CParticleSwooshDataFactory.cpp b/Runtime/Particle/CParticleSwooshDataFactory.cpp
index 5f50ac784..fff700824 100644
--- a/Runtime/Particle/CParticleSwooshDataFactory.cpp
+++ b/Runtime/Particle/CParticleSwooshDataFactory.cpp
@@ -1,5 +1,8 @@
 #include "CParticleSwooshDataFactory.hpp"
 #include "CSwooshDescription.hpp"
+#include "CElectricDescription.hpp"
+#include "CGenDescription.hpp"
+#include "CModel.hpp"
 #include "CRandom16.hpp"
 #include "CSimplePool.hpp"
 
diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.cpp b/Runtime/Particle/CProjectileWeaponDataFactory.cpp
index 0f5e258be..5b31a4bf7 100644
--- a/Runtime/Particle/CProjectileWeaponDataFactory.cpp
+++ b/Runtime/Particle/CProjectileWeaponDataFactory.cpp
@@ -1,6 +1,10 @@
 #include "CProjectileWeaponDataFactory.hpp"
 #include "CWeaponDescription.hpp"
 #include "CCollisionResponseData.hpp"
+#include "CElectricDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CGenDescription.hpp"
+#include "CModel.hpp"
 #include "CRandom16.hpp"
 #include "CSimplePool.hpp"
 
diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.cpp b/Runtime/Particle/CSpawnSystemKeyframeData.cpp
index a2b96e90e..6513f497c 100644
--- a/Runtime/Particle/CSpawnSystemKeyframeData.cpp
+++ b/Runtime/Particle/CSpawnSystemKeyframeData.cpp
@@ -1,4 +1,8 @@
 #include "CSpawnSystemKeyframeData.hpp"
+#include "CGenDescription.hpp"
+#include "CSwooshDescription.hpp"
+#include "CElectricDescription.hpp"
+#include "CModel.hpp"
 #include "CSimplePool.hpp"
 
 namespace pshag