diff --git a/panda/src/particlesystem/baseParticle.cxx b/panda/src/particlesystem/baseParticle.cxx
index 3fd3629029..c5a240203b 100644
--- a/panda/src/particlesystem/baseParticle.cxx
+++ b/panda/src/particlesystem/baseParticle.cxx
@@ -1,6 +1,6 @@
-// Filename: baseParticle.C
+// Filename: baseParticle.cxx
 // Created by:  charles (14Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "baseParticle.h"
diff --git a/panda/src/particlesystem/baseParticleEmitter.cxx b/panda/src/particlesystem/baseParticleEmitter.cxx
index 4abdcfae5f..e6b363ccbf 100644
--- a/panda/src/particlesystem/baseParticleEmitter.cxx
+++ b/panda/src/particlesystem/baseParticleEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: baseParticleEmitter.C
+// Filename: baseParticleEmitter.cxx
 // Created by:  charles (14Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "baseParticleEmitter.h"
diff --git a/panda/src/particlesystem/baseParticleFactory.cxx b/panda/src/particlesystem/baseParticleFactory.cxx
index 002d5f7f68..29d0d029c4 100644
--- a/panda/src/particlesystem/baseParticleFactory.cxx
+++ b/panda/src/particlesystem/baseParticleFactory.cxx
@@ -1,6 +1,6 @@
-// Filename: baseParticleFactory.C
+// Filename: baseParticleFactory.cxx
 // Created by:  charles (05Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "baseParticleFactory.h"
@@ -14,7 +14,7 @@ BaseParticleFactory::
 BaseParticleFactory(void) {
   _mass_base = 1.0f;
   _mass_spread = 0.0f;
-  
+
   _terminal_velocity_base = PhysicsObject::_default_terminal_velocity;
   _terminal_velocity_spread = 0.0f;
 
diff --git a/panda/src/particlesystem/baseParticleRenderer.cxx b/panda/src/particlesystem/baseParticleRenderer.cxx
index b65e764bbf..d99b5bce35 100644
--- a/panda/src/particlesystem/baseParticleRenderer.cxx
+++ b/panda/src/particlesystem/baseParticleRenderer.cxx
@@ -1,4 +1,4 @@
-// Filename: baseParticleRenderer.C
+// Filename: baseParticleRenderer.cxx
 // Created by:  charles (20Jun00)
 //
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/boxEmitter.cxx b/panda/src/particlesystem/boxEmitter.cxx
index cb58749005..08ba3718c2 100644
--- a/panda/src/particlesystem/boxEmitter.cxx
+++ b/panda/src/particlesystem/boxEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: boxEmitter.C
+// Filename: boxEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "boxEmitter.h"
diff --git a/panda/src/particlesystem/config_particlesystem.cxx b/panda/src/particlesystem/config_particlesystem.cxx
index ada402ca4d..7297a181e2 100644
--- a/panda/src/particlesystem/config_particlesystem.cxx
+++ b/panda/src/particlesystem/config_particlesystem.cxx
@@ -1,12 +1,11 @@
-// Filename: config_particlesystem.C
+// Filename: config_particlesystem.cxx
 // Created by:  charles (05Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "config_particlesystem.h"
 #include "particleSystem.h"
 #include "geomParticleRenderer.h"
-#include <config.h>
 
 ConfigureDef(config_particlesystem);
 NotifyCategoryDef(particlesystem, "");
diff --git a/panda/src/particlesystem/config_particlesystem.h b/panda/src/particlesystem/config_particlesystem.h
index 2fc2a50732..63acae7cc7 100644
--- a/panda/src/particlesystem/config_particlesystem.h
+++ b/panda/src/particlesystem/config_particlesystem.h
@@ -8,7 +8,7 @@
 
 #include <pandabase.h>
 #include <notifyCategoryProxy.h>
-#include <config.h>
+#include <dconfig.h>
 
 ConfigureDecl(config_particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS);
 NotifyCategoryDecl(particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS);
diff --git a/panda/src/particlesystem/discEmitter.cxx b/panda/src/particlesystem/discEmitter.cxx
index 12d4d796f4..14ed186431 100644
--- a/panda/src/particlesystem/discEmitter.cxx
+++ b/panda/src/particlesystem/discEmitter.cxx
@@ -1,13 +1,13 @@
-// Filename: discEmitter.C
+// Filename: discEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "discEmitter.h"
 
 ////////////////////////////////////////////////////////////////////
 //    Function : DiscEmitter::DiscEmitter
-//      Access : Public 
+//      Access : Public
 // Description : constructor
 ////////////////////////////////////////////////////////////////////
 DiscEmitter::
@@ -20,7 +20,7 @@ DiscEmitter(void) {
 
 ////////////////////////////////////////////////////////////////////
 //    Function : DiscEmitter::DiscEmitter
-//      Access : Public 
+//      Access : Public
 // Description : copy constructor
 ////////////////////////////////////////////////////////////////////
 DiscEmitter::
@@ -40,7 +40,7 @@ DiscEmitter(const DiscEmitter &copy) :
 
 ////////////////////////////////////////////////////////////////////
 //    Function : DiscEmitter::~DiscEmitter
-//      Access : Public 
+//      Access : Public
 // Description : destructor
 ////////////////////////////////////////////////////////////////////
 DiscEmitter::
@@ -49,7 +49,7 @@ DiscEmitter::
 
 ////////////////////////////////////////////////////////////////////
 //    Function : make_copy
-//      Access : Public 
+//      Access : Public
 // Description : copier
 ////////////////////////////////////////////////////////////////////
 BaseParticleEmitter *DiscEmitter::
diff --git a/panda/src/particlesystem/geomParticleRenderer.cxx b/panda/src/particlesystem/geomParticleRenderer.cxx
index 1829c4680e..93ccb71810 100644
--- a/panda/src/particlesystem/geomParticleRenderer.cxx
+++ b/panda/src/particlesystem/geomParticleRenderer.cxx
@@ -1,6 +1,6 @@
-// Filename: geomParticleRenderer.C
+// Filename: geomParticleRenderer.cxx
 // Created by:  charles (05Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "geomParticleRenderer.h"
diff --git a/panda/src/particlesystem/lineEmitter.cxx b/panda/src/particlesystem/lineEmitter.cxx
index 239bebb42a..5463031fc9 100644
--- a/panda/src/particlesystem/lineEmitter.cxx
+++ b/panda/src/particlesystem/lineEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: lineEmitter.C
+// Filename: lineEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "lineEmitter.h"
diff --git a/panda/src/particlesystem/orientedParticle.cxx b/panda/src/particlesystem/orientedParticle.cxx
index 0c3a14c25a..b78ef801ef 100644
--- a/panda/src/particlesystem/orientedParticle.cxx
+++ b/panda/src/particlesystem/orientedParticle.cxx
@@ -1,6 +1,6 @@
-// Filename: orientedParticle.C
+// Filename: orientedParticle.cxx
 // Created by:  charles (19Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "orientedParticle.h"
@@ -66,7 +66,7 @@ die(void) {
 ////////////////////////////////////////////////////////////////////
 //    Function : update
 //      Access : public
-// Description : particle update routine.  
+// Description : particle update routine.
 //               This NEEDS to be filled in with quaternion slerp
 //               stuff, or oriented particles will not rotate.
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/orientedParticleFactory.cxx b/panda/src/particlesystem/orientedParticleFactory.cxx
index 17bdf6b7a2..fbc74620fe 100644
--- a/panda/src/particlesystem/orientedParticleFactory.cxx
+++ b/panda/src/particlesystem/orientedParticleFactory.cxx
@@ -1,6 +1,6 @@
-// Filename: orientedParticleFactory.C
+// Filename: orientedParticleFactory.cxx
 // Created by:  charles (05Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "orientedParticleFactory.h"
diff --git a/panda/src/particlesystem/particleSystem.cxx b/panda/src/particlesystem/particleSystem.cxx
index 90f7d7b782..9e7d538408 100644
--- a/panda/src/particlesystem/particleSystem.cxx
+++ b/panda/src/particlesystem/particleSystem.cxx
@@ -1,6 +1,6 @@
-// Filename: particleSystem.C
+// Filename: particleSystem.cxx
 // Created by:  charles (14Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
@@ -28,7 +28,7 @@
 // Description : Default Constructor.
 ////////////////////////////////////////////////////////////////////
 ParticleSystem::
-ParticleSystem(int pool_size) : 
+ParticleSystem(int pool_size) :
   _particle_pool_size(pool_size), Physical(pool_size, false)
 {
   _birth_rate = 0.0f;
@@ -46,7 +46,7 @@ ParticleSystem(int pool_size) :
   // just in case someone tries to do something that requires the
   // use of an emitter, renderer, or factory before they've actually
   // assigned one.  This is ok, because assigning them (set_renderer(),
-  // set_emitter(), etc...) forces them to set themselves up for the 
+  // set_emitter(), etc...) forces them to set themselves up for the
   // system, keeping the pool sizes consistent.
 
   _render_arc.clear();
@@ -219,7 +219,7 @@ spawn_child_system(BaseParticle *bp) {
     return;
   }
 
-  NodeRelation *parent_relation = 
+  NodeRelation *parent_relation =
     this_pn->get_parent(RenderRelation::get_class_type(), 0);
 
   Node *parent = parent_relation->get_parent();
@@ -249,7 +249,7 @@ spawn_child_system(BaseParticle *bp) {
   LMatrix4f old_system_to_parent_xform;
   get_rel_mat(get_physical_node(), parent, old_system_to_parent_xform);
 
-  LMatrix4f child_space_xform = old_system_to_parent_xform * 
+  LMatrix4f child_space_xform = old_system_to_parent_xform *
     bp->get_lcs();
 
   rr->set_transition(new TransformTransition(child_space_xform));
diff --git a/panda/src/particlesystem/particleSystemManager.cxx b/panda/src/particlesystem/particleSystemManager.cxx
index b4f349be22..5c02d3457d 100644
--- a/panda/src/particlesystem/particleSystemManager.cxx
+++ b/panda/src/particlesystem/particleSystemManager.cxx
@@ -1,4 +1,4 @@
-// Filename: particleSystemManager.C
+// Filename: particleSystemManager.cxx
 // Created by:  charles (28Jun00)
 //
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/pointEmitter.cxx b/panda/src/particlesystem/pointEmitter.cxx
index 2bf618afee..52ba63aa90 100644
--- a/panda/src/particlesystem/pointEmitter.cxx
+++ b/panda/src/particlesystem/pointEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: pointEmitter.C
+// Filename: pointEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "pointEmitter.h"
@@ -11,7 +11,7 @@
 // Description : constructor
 ////////////////////////////////////////////////////////////////////
 PointEmitter::
-PointEmitter(void) : 
+PointEmitter(void) :
   BaseParticleEmitter() {
   _location.set(0.0f, 0.0f, 0.0f);
 }
diff --git a/panda/src/particlesystem/pointParticle.cxx b/panda/src/particlesystem/pointParticle.cxx
index 7e4c92095a..694e6bc52d 100644
--- a/panda/src/particlesystem/pointParticle.cxx
+++ b/panda/src/particlesystem/pointParticle.cxx
@@ -1,6 +1,6 @@
-// Filename: pointParticle.C
+// Filename: pointParticle.cxx
 // Created by:  charles (19Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "pointParticle.h"
diff --git a/panda/src/particlesystem/pointParticleFactory.cxx b/panda/src/particlesystem/pointParticleFactory.cxx
index bed3773694..184f976e93 100644
--- a/panda/src/particlesystem/pointParticleFactory.cxx
+++ b/panda/src/particlesystem/pointParticleFactory.cxx
@@ -1,6 +1,6 @@
-// Filename: pointParticleFactory.C
+// Filename: pointParticleFactory.cxx
 // Created by:  charles (05Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "pointParticleFactory.h"
diff --git a/panda/src/particlesystem/pointParticleRenderer.cxx b/panda/src/particlesystem/pointParticleRenderer.cxx
index 96255c8fd6..6b3907ba8b 100644
--- a/panda/src/particlesystem/pointParticleRenderer.cxx
+++ b/panda/src/particlesystem/pointParticleRenderer.cxx
@@ -1,6 +1,6 @@
-// Filename: pointParticleRenderer.C
+// Filename: pointParticleRenderer.cxx
 // Created by:  charles (20Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include <boundingSphere.h>
diff --git a/panda/src/particlesystem/rectangleEmitter.cxx b/panda/src/particlesystem/rectangleEmitter.cxx
index ca6138862f..a58aab439f 100644
--- a/panda/src/particlesystem/rectangleEmitter.cxx
+++ b/panda/src/particlesystem/rectangleEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: rectangleEmitter.C
+// Filename: rectangleEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "rectangleEmitter.h"
diff --git a/panda/src/particlesystem/ringEmitter.cxx b/panda/src/particlesystem/ringEmitter.cxx
index 82e10280e9..dc1a53b508 100644
--- a/panda/src/particlesystem/ringEmitter.cxx
+++ b/panda/src/particlesystem/ringEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: ringEmitter.C
+// Filename: ringEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "ringEmitter.h"
@@ -25,7 +25,7 @@ RingEmitter(const RingEmitter &copy) :
   BaseParticleEmitter(copy) {
   _radius = copy._radius;
   _aoe = copy._aoe;
-  
+
   _sin_theta = copy._sin_theta;
   _cos_theta = copy._cos_theta;
 }
diff --git a/panda/src/particlesystem/sparkleParticleRenderer.cxx b/panda/src/particlesystem/sparkleParticleRenderer.cxx
index 0f8681e37c..d06394f38d 100644
--- a/panda/src/particlesystem/sparkleParticleRenderer.cxx
+++ b/panda/src/particlesystem/sparkleParticleRenderer.cxx
@@ -1,6 +1,6 @@
-// Filename: sparkleParticleRenderer.C
+// Filename: sparkleParticleRenderer.cxx
 // Created by:  charles (27Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "sparkleParticleRenderer.h"
@@ -35,7 +35,7 @@ SparkleParticleRenderer(const Colorf& center, const Colorf& edge,
 			SparkleParticleLifeScale life_scale,
 			ParticleRendererAlphaMode alpha_mode) :
   _center_color(center), _edge_color(edge), _birth_radius(birth_radius),
-  _death_radius(death_radius), _life_scale(life_scale), 
+  _death_radius(death_radius), _life_scale(life_scale),
   BaseParticleRenderer(alpha_mode) {
   _line_primitive = new GeomLine;
   init_geoms();
diff --git a/panda/src/particlesystem/sphereSurfaceEmitter.cxx b/panda/src/particlesystem/sphereSurfaceEmitter.cxx
index 84ff57658f..c9b47ae1ed 100644
--- a/panda/src/particlesystem/sphereSurfaceEmitter.cxx
+++ b/panda/src/particlesystem/sphereSurfaceEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: sphereSurfaceEmitter.C
+// Filename: sphereSurfaceEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "sphereSurfaceEmitter.h"
diff --git a/panda/src/particlesystem/sphereVolumeEmitter.cxx b/panda/src/particlesystem/sphereVolumeEmitter.cxx
index 6758ebb23f..414bc7e4bf 100644
--- a/panda/src/particlesystem/sphereVolumeEmitter.cxx
+++ b/panda/src/particlesystem/sphereVolumeEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: sphereVolumeEmitter.C
+// Filename: sphereVolumeEmitter.cxx
 // Created by:  charles (22Jun00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "sphereVolumeEmitter.h"
diff --git a/panda/src/particlesystem/spriteParticleRenderer.cxx b/panda/src/particlesystem/spriteParticleRenderer.cxx
index b8abe4d57b..aa241e1759 100644
--- a/panda/src/particlesystem/spriteParticleRenderer.cxx
+++ b/panda/src/particlesystem/spriteParticleRenderer.cxx
@@ -1,4 +1,4 @@
-// Filename: spriteParticleRenderer.C
+// Filename: spriteParticleRenderer.cxx
 // Created by:  charles (13Jul00)
 //
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/tangentRingEmitter.cxx b/panda/src/particlesystem/tangentRingEmitter.cxx
index b4463567d2..c2fd57f297 100644
--- a/panda/src/particlesystem/tangentRingEmitter.cxx
+++ b/panda/src/particlesystem/tangentRingEmitter.cxx
@@ -1,6 +1,6 @@
-// Filename: tangentRingEmitter.C
+// Filename: tangentRingEmitter.cxx
 // Created by:  charles (25Jul00)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "tangentRingEmitter.h"
diff --git a/panda/src/particlesystem/zSpinParticle.cxx b/panda/src/particlesystem/zSpinParticle.cxx
index 4385963fdd..79dfdcc1a4 100644
--- a/panda/src/particlesystem/zSpinParticle.cxx
+++ b/panda/src/particlesystem/zSpinParticle.cxx
@@ -1,4 +1,4 @@
-// Filename: zSpinParticle.C
+// Filename: zSpinParticle.cxx
 // Created by:  charles (16Aug00)
 //
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/particlesystem/zSpinParticleFactory.cxx b/panda/src/particlesystem/zSpinParticleFactory.cxx
index 9f66de62dd..ea05af68a1 100644
--- a/panda/src/particlesystem/zSpinParticleFactory.cxx
+++ b/panda/src/particlesystem/zSpinParticleFactory.cxx
@@ -1,4 +1,4 @@
-// Filename: zSpinParticleFactory.C
+// Filename: zSpinParticleFactory.cxx
 // Created by:  charles (16Aug00)
 //
 ////////////////////////////////////////////////////////////////////