diff --git a/panda/src/parametrics/config_parametrics.cxx b/panda/src/parametrics/config_parametrics.cxx
index f4b6e8f1ea..1512a761ee 100644
--- a/panda/src/parametrics/config_parametrics.cxx
+++ b/panda/src/parametrics/config_parametrics.cxx
@@ -4,15 +4,11 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "config_parametrics.h"
-#include "luse.h"
-#include "typedWriteableReferenceCount.h"
-#include "namable.h"
 #include "curve.h"
 #include "curveDrawer.h"
 #include "nurbsCurve.h"
 #include "nurbsCurveDrawer.h"
 
-#include <dconfig.h>
 #include <get_config_path.h>
 
 Configure(config_parametrics);
diff --git a/panda/src/parametrics/curve.cxx b/panda/src/parametrics/curve.cxx
index 73d9403ab4..a91a1ed0ff 100644
--- a/panda/src/parametrics/curve.cxx
+++ b/panda/src/parametrics/curve.cxx
@@ -17,17 +17,10 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "curve.h"
-#include "parametrics.h"
-#include "typedWriteableReferenceCount.h"
-#include "namable.h"
+#include "config_parametrics.h"
 #include "hermiteCurve.h"
 #include "nurbsCurve.h"
 #include "curveDrawer.h"
-
-#include <DConfig.h>
-
-#include <math.h>
-#include <fstream>
 
 
 ////////////////////////////////////////////////////////////////////
@@ -521,9 +514,8 @@ r_calc_length(double t1, double t2, const LVector3f &p1, const LVector3f &p2,
       return seglength;
     } else {
       // Yes.  Keep going.
-      return
-	r_calc_length(t1, tmid, p1, pmid, left) +
-	r_calc_length(tmid, t2, pmid, p2, right);
+      return r_calc_length(t1, tmid, p1, pmid, left) +
+             r_calc_length(tmid, t2, pmid, p2, right);
     }
   }
 }
diff --git a/panda/src/parametrics/curveDrawer.cxx b/panda/src/parametrics/curveDrawer.cxx
index a1ff872500..2ebf3bd34d 100644
--- a/panda/src/parametrics/curveDrawer.cxx
+++ b/panda/src/parametrics/curveDrawer.cxx
@@ -17,13 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "curveDrawer.h"
-
-#include <math.h>
-
-#include "luse.h"
-#include "parametrics.h"
-#include "typedWriteableReferenceCount.h"
-#include "namable.h"
+#include "config_parametrics.h"
 
 
 TypeHandle ParametricCurveDrawer::_type_handle;
diff --git a/panda/src/parametrics/nurbsCurve.cxx b/panda/src/parametrics/nurbsCurve.cxx
index 008ba2ce3c..eabf564c33 100644
--- a/panda/src/parametrics/nurbsCurve.cxx
+++ b/panda/src/parametrics/nurbsCurve.cxx
@@ -13,13 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "nurbsCurve.h"
-#include "luse.h"
-#include "parametrics.h"
-////#include <initReg.h>
-////#include <linMathOutput.h>
-#include <fstream>
-////#include <alloca.h>
-using namespace std;
 
 ////////////////////////////////////////////////////////////////////
 // Statics
diff --git a/panda/src/parametrics/nurbsCurveDrawer.cxx b/panda/src/parametrics/nurbsCurveDrawer.cxx
index ae096ba4cd..dfde069f42 100644
--- a/panda/src/parametrics/nurbsCurveDrawer.cxx
+++ b/panda/src/parametrics/nurbsCurveDrawer.cxx
@@ -17,12 +17,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "nurbsCurveDrawer.h"
-#include "luse.h"
-#include "parametrics.h"
-#include "typedWriteableReferenceCount.h"
-#include "namable.h"
-
-#include <math.h>
 
 
 TypeHandle NurbsCurveDrawer::_type_handle;