Index: trunk/psModules/src/detrend/pmBias.c
===================================================================
--- trunk/psModules/src/detrend/pmBias.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmBias.c	(revision 12696)
@@ -8,4 +8,5 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmHDUUtils.h"
Index: trunk/psModules/src/detrend/pmBias.h
===================================================================
--- trunk/psModules/src/detrend/pmBias.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmBias.h	(revision 12696)
@@ -5,6 +5,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004--2006 Institute for Astronomy, University of Hawaii
  */
@@ -15,8 +15,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include <pslib.h>
-
-#include "pmFPA.h"
 
 /// Type of fit to perform
Index: trunk/psModules/src/detrend/pmDetrendDB.c
===================================================================
--- trunk/psModules/src/detrend/pmDetrendDB.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmDetrendDB.c	(revision 12696)
@@ -6,6 +6,8 @@
 #include <string.h>
 #include <pslib.h>
+
 #include "pmConfig.h"
 #include "pmConfigCommand.h"
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmFPALevel.h"
Index: trunk/psModules/src/detrend/pmDetrendDB.h
===================================================================
--- trunk/psModules/src/detrend/pmDetrendDB.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmDetrendDB.h	(revision 12696)
@@ -9,6 +9,6 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-09 02:49:53 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -19,7 +19,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include "pmConfig.h"
-#include "pmFPALevel.h"
 
 typedef enum {
Index: trunk/psModules/src/detrend/pmFlatField.c
===================================================================
--- trunk/psModules/src/detrend/pmFlatField.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmFlatField.c	(revision 12696)
@@ -6,9 +6,9 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmHDUUtils.h"
 #include "pmFPAMaskWeight.h"
 #include "pmFlatField.h"
-
 
 bool pmFlatField(pmReadout *in, const pmReadout *flat)
Index: trunk/psModules/src/detrend/pmFlatField.h
===================================================================
--- trunk/psModules/src/detrend/pmFlatField.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmFlatField.h	(revision 12696)
@@ -5,6 +5,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -15,6 +15,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include "pmFPA.h"
 
 /// Apply flat field calibration to a readout
Index: trunk/psModules/src/detrend/pmFlatNormalize.h
===================================================================
--- trunk/psModules/src/detrend/pmFlatNormalize.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmFlatNormalize.h	(revision 12696)
@@ -4,6 +4,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -14,6 +14,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include <pslib.h>
 
 /// Normalize flat-field measurements
Index: trunk/psModules/src/detrend/pmFringeStats.c
===================================================================
--- trunk/psModules/src/detrend/pmFringeStats.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmFringeStats.c	(revision 12696)
@@ -7,7 +7,8 @@
 #include <string.h>
 #include <pslib.h>
+
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmFringeStats.h"
-
 
 // Future optimisations for speed:
Index: trunk/psModules/src/detrend/pmMaskBadPixels.c
===================================================================
--- trunk/psModules/src/detrend/pmMaskBadPixels.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmMaskBadPixels.c	(revision 12696)
@@ -7,4 +7,5 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmHDUUtils.h"
Index: trunk/psModules/src/detrend/pmMaskBadPixels.h
===================================================================
--- trunk/psModules/src/detrend/pmMaskBadPixels.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmMaskBadPixels.h	(revision 12696)
@@ -5,6 +5,6 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004 Institute for Astronomy, University of Hawaii
  */
@@ -15,7 +15,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include <pslib.h>
-#include "pmFPA.h"
 
 /// Applies the bad pixel mask to the input
Index: trunk/psModules/src/detrend/pmNonLinear.c
===================================================================
--- trunk/psModules/src/detrend/pmNonLinear.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmNonLinear.c	(revision 12696)
@@ -6,4 +6,5 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmNonLinear.h"
Index: trunk/psModules/src/detrend/pmNonLinear.h
===================================================================
--- trunk/psModules/src/detrend/pmNonLinear.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmNonLinear.h	(revision 12696)
@@ -5,6 +5,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004 Institute for Astronomy, University of Hawaii
  */
@@ -15,7 +15,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include <pslib.h>
-#include "pmFPA.h"
 
 /// Correct non-linearity through polynomial
Index: trunk/psModules/src/detrend/pmShifts.c
===================================================================
--- trunk/psModules/src/detrend/pmShifts.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmShifts.c	(revision 12696)
@@ -8,4 +8,6 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
+#include "pmFPA.h"
 #include "pmFPALevel.h"
 #include "pmFPAUtils.h"
Index: trunk/psModules/src/detrend/pmShifts.h
===================================================================
--- trunk/psModules/src/detrend/pmShifts.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmShifts.h	(revision 12696)
@@ -1,7 +1,4 @@
 #ifndef PM_SHIFTS_H
 #define PM_SHIFTS_H
-
-#include <pslib.h>
-#include "pmFPA.h"
 
 #define PM_SHIFTS_TABLE_NAME "SHIFTS.TABLE" ///< Name for table on the analysis metadata
Index: trunk/psModules/src/detrend/pmShutterCorrection.c
===================================================================
--- trunk/psModules/src/detrend/pmShutterCorrection.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmShutterCorrection.c	(revision 12696)
@@ -8,4 +8,5 @@
 #include <pslib.h>
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmHDUUtils.h"
Index: trunk/psModules/src/detrend/pmShutterCorrection.h
===================================================================
--- trunk/psModules/src/detrend/pmShutterCorrection.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmShutterCorrection.h	(revision 12696)
@@ -5,6 +5,6 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -59,6 +59,4 @@
  *  terms of dT(x,y) and f'(x,y)
  */
-
-#include <pslib.h>
 
 /// Shutter correction parameters, applicable for a single pixel
Index: trunk/psModules/src/detrend/pmSkySubtract.c
===================================================================
--- trunk/psModules/src/detrend/pmSkySubtract.c	(revision 12647)
+++ trunk/psModules/src/detrend/pmSkySubtract.c	(revision 12696)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-30 00:52:21 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-30 21:12:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,4 +22,7 @@
 #include <math.h>
 #include <pslib.h>
+
+#include "pmHDU.h"
+#include "pmFPA.h"
 #include "pmSubtractSky.h"
 
Index: trunk/psModules/src/detrend/pmSkySubtract.h
===================================================================
--- trunk/psModules/src/detrend/pmSkySubtract.h	(revision 12647)
+++ trunk/psModules/src/detrend/pmSkySubtract.h	(revision 12696)
@@ -6,6 +6,6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-24 02:54:15 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-30 21:12:56 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -16,9 +16,4 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
-
-#include<stdio.h>
-#include<math.h>
-#include "pslib.h"
-#include "pmFPA.h"
 
 // XXX: this is pmFit in pmSubtractBias.c, named psFit here.