Index: /trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- /trunk/psModules/src/camera/pmFPAfileIO.c	(revision 20936)
+++ /trunk/psModules/src/camera/pmFPAfileIO.c	(revision 20937)
@@ -24,4 +24,6 @@
 #include "pmFPAfileIO.h"
 #include "pmFPAfileFitsIO.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/camera/pmReadoutFake.c
===================================================================
--- /trunk/psModules/src/camera/pmReadoutFake.c	(revision 20936)
+++ /trunk/psModules/src/camera/pmReadoutFake.c	(revision 20937)
@@ -17,4 +17,6 @@
 #include "pmModel.h"
 #include "pmModelClass.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmSource.h"
Index: /trunk/psModules/src/imcombine/pmPSFEnvelope.c
===================================================================
--- /trunk/psModules/src/imcombine/pmPSFEnvelope.c	(revision 20936)
+++ /trunk/psModules/src/imcombine/pmPSFEnvelope.c	(revision 20937)
@@ -20,4 +20,6 @@
 #include "pmModelClass.h"
 #include "pmModelUtils.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmSource.h"
Index: /trunk/psModules/src/imcombine/pmSubtractionStamps.c
===================================================================
--- /trunk/psModules/src/imcombine/pmSubtractionStamps.c	(revision 20936)
+++ /trunk/psModules/src/imcombine/pmSubtractionStamps.c	(revision 20937)
@@ -9,4 +9,6 @@
 // All these includes required to get stamps out of an array of pmSources
 #include "pmMoments.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmResiduals.h"
Index: /trunk/psModules/src/objects/pmFootprint.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprint.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprint.c	(revision 20937)
@@ -4,6 +4,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-01 00:00:17 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -18,7 +18,7 @@
 #include <strings.h>
 #include <pslib.h>
-#include "pmPeaks.h"
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 static void footprintFree(pmFootprint *tmp)
Index: /trunk/psModules/src/objects/pmFootprintArrayGrow.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintArrayGrow.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintArrayGrow.c	(revision 20937)
@@ -3,6 +3,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-29 02:45:44 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -19,4 +19,5 @@
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 # define USE_FFTS_TO_CONVOLVE 1
Index: /trunk/psModules/src/objects/pmFootprintArraysMerge.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintArraysMerge.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintArraysMerge.c	(revision 20937)
@@ -3,6 +3,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-01 00:00:17 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -19,4 +19,5 @@
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 /*
Index: /trunk/psModules/src/objects/pmFootprintAssignPeaks.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintAssignPeaks.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintAssignPeaks.c	(revision 20937)
@@ -3,6 +3,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-01 00:00:17 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -17,7 +17,7 @@
 #include <strings.h>
 #include <pslib.h>
-#include "pmPeaks.h"
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 /*
@@ -71,5 +71,5 @@
 	pmFootprint *fp = footprints->data[id - 1];
 	psArrayAdd(fp->peaks, 5, peak);
-	peak->footprint = (struct pmFootprint *) fp; // reference to containing footprint
+	peak->footprint = fp; // reference to containing footprint
     }
     
Index: /trunk/psModules/src/objects/pmFootprintFind.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintFind.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintFind.c	(revision 20937)
@@ -4,6 +4,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-03 03:21:22 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -20,4 +20,5 @@
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 // XXX EAM : why use WSPAN in here rather than pmSpan?
Index: /trunk/psModules/src/objects/pmFootprintFindAtPoint.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintFindAtPoint.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintFindAtPoint.c	(revision 20937)
@@ -4,6 +4,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-01 00:00:17 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -18,7 +18,7 @@
 #include <strings.h>
 #include <pslib.h>
-#include "pmPeaks.h"
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 /*
Index: /trunk/psModules/src/objects/pmFootprintIDs.c
===================================================================
--- /trunk/psModules/src/objects/pmFootprintIDs.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmFootprintIDs.c	(revision 20937)
@@ -4,6 +4,6 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-01 00:00:17 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -20,4 +20,5 @@
 #include "pmSpan.h"
 #include "pmFootprint.h"
+#include "pmPeaks.h"
 
 /*
Index: /trunk/psModules/src/objects/pmGrowthCurve.c
===================================================================
--- /trunk/psModules/src/objects/pmGrowthCurve.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmGrowthCurve.c	(revision 20937)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-17 22:58:23 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,4 +20,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmGrowthCurveGenerate.c
===================================================================
--- /trunk/psModules/src/objects/pmGrowthCurveGenerate.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmGrowthCurveGenerate.c	(revision 20937)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-29 00:00:37 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -24,4 +24,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmModelClass.c
===================================================================
--- /trunk/psModules/src/objects/pmModelClass.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmModelClass.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-06 12:57:58 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,4 +23,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmModelGroup.c
===================================================================
--- /trunk/psModules/src/objects/pmModelGroup.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmModelGroup.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,4 +23,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmPSF.c
===================================================================
--- /trunk/psModules/src/objects/pmPSF.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmPSF.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-13 01:56:42 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,4 +25,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmPSF_IO.c
===================================================================
--- /trunk/psModules/src/objects/pmPSF_IO.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmPSF_IO.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-06 13:05:13 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37,4 +37,6 @@
 #include "pmFPAfileFitsIO.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmPSFtry.c
===================================================================
--- /trunk/psModules/src/objects/pmPSFtry.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmPSFtry.c	(revision 20937)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-08 01:52:34 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,4 +20,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmPeaks.c
===================================================================
--- /trunk/psModules/src/objects/pmPeaks.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmPeaks.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-22 22:19:42 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,6 @@
 #include <string.h>
 #include <pslib.h>
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 
Index: /trunk/psModules/src/objects/pmPeaks.h
===================================================================
--- /trunk/psModules/src/objects/pmPeaks.h	(revision 20936)
+++ /trunk/psModules/src/objects/pmPeaks.h	(revision 20937)
@@ -10,6 +10,6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-08 19:41:56 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-08 02:51:14 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -60,5 +60,5 @@
     bool assigned;                      ///< is peak assigned to a source?
     pmPeakType type;			///< Description of peak.
-    struct pmFootprint *footprint;	///< reference to containing footprint
+    pmFootprint *footprint;	///< reference to containing footprint
 }
 pmPeak;
Index: /trunk/psModules/src/objects/pmSource.c
===================================================================
--- /trunk/psModules/src/objects/pmSource.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSource.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-04 02:41:33 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,4 +25,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceContour.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceContour.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceContour.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:39:04 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,4 +23,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceExtendedPars.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceExtendedPars.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceExtendedPars.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-12-22 00:31:41 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,4 +24,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceFitModel.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceFitModel.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceFitModel.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-28 00:38:56 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,4 +23,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceFitSet.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceFitSet.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceFitSet.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:39:04 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,4 +23,6 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-25 01:27:52 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31,4 +31,6 @@
 #include "pmConcepts.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_CMP.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_CMP.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-01 18:33:01 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_OBJ.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_OBJ.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-01 01:05:39 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-14 02:11:45 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:39:04 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-08 02:33:56 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_RAW.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_RAW.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_RAW.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-03 20:59:16 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_SMPDATA.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_SMPDATA.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceIO_SX.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceIO_SX.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-01 18:33:14 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAfile.h"
 
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceMoments.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceMoments.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceMoments.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-07 20:06:42 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,4 +25,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- /trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 20937)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-22 02:11:08 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,4 +22,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourcePlotApResid.c
===================================================================
--- /trunk/psModules/src/objects/pmSourcePlotApResid.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourcePlotApResid.c	(revision 20937)
@@ -4,6 +4,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-12-04 00:07:25 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *  Copyright 2006 IfA, University of Hawaii
  */
@@ -25,4 +25,6 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourcePlotMoments.c
===================================================================
--- /trunk/psModules/src/objects/pmSourcePlotMoments.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourcePlotMoments.c	(revision 20937)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-03 20:59:16 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourcePlotPSFModel.c
===================================================================
--- /trunk/psModules/src/objects/pmSourcePlotPSFModel.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourcePlotPSFModel.c	(revision 20937)
@@ -5,6 +5,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-03 20:59:16 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -28,4 +28,6 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceSky.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceSky.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceSky.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-15 20:25:00 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,4 +24,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/objects/pmSourceUtils.c
===================================================================
--- /trunk/psModules/src/objects/pmSourceUtils.c	(revision 20936)
+++ /trunk/psModules/src/objects/pmSourceUtils.c	(revision 20937)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-08 02:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,4 +24,6 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
Index: /trunk/psModules/src/psmodules.h
===================================================================
--- /trunk/psModules/src/psmodules.h	(revision 20936)
+++ /trunk/psModules/src/psmodules.h	(revision 20937)
@@ -100,7 +100,7 @@
 
 // the following headers are from psModule:objects
-#include <pmPeaks.h>
 #include <pmSpan.h>
 #include <pmFootprint.h>
+#include <pmPeaks.h>
 #include <pmDetections.h>
 #include <pmMoments.h>