diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f935406a6..c8daf315d 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -19,7 +19,6 @@
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/ConstantRateCounter>
-#include <osgParticle/ModularEmitter>
 #include <osgParticle/Shooter>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularProgram>
@@ -37,7 +36,6 @@
 
 #include <components/nif/node.hpp>
 #include <components/nif/effect.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 935442c84..f542cf379 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -5,6 +5,8 @@
 #include <osg/MatrixTransform>
 
 #include <components/nif/controlled.hpp>
+#include <components/nif/nifkey.hpp>
+#include <components/nif/data.hpp>
 
 #include "userdata.hpp"
 
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 1e1714369..6818aa7e0 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -4,19 +4,19 @@
 #include <osgParticle/Particle>
 #include <osgParticle/Shooter>
 #include <osgParticle/Operator>
-#include <osgParticle/ModularEmitter>
+#include <osgParticle/Emitter>
+#include <osgParticle/Placer>
+#include <osgParticle/Counter>
 
 #include <osg/NodeCallback>
 
-#include <components/nif/nifkey.hpp>
-#include <components/nif/data.hpp>
-
 #include "controller.hpp" // ValueInterpolator
 
 namespace Nif
 {
     class NiGravity;
     class NiPlanarCollider;
+    class NiColorData;
 }
 
 namespace NifOsg