Index: branches/rel10_ifa/psModules/src/psmodules.h
===================================================================
--- branches/rel10_ifa/psModules/src/psmodules.h	(revision 6663)
+++ branches/rel10_ifa/psModules/src/psmodules.h	(revision 6713)
@@ -2,53 +2,73 @@
 #define PS_MODULES_H
 
-#include "pslib.h"
+// XXX should this be included explicitly?
+#include <pslib.h>
 
-#include "psImageJpeg.h"
-#include "psLine.h"
-#include "psPolynomialUtils.h"
-#include "psSparse.h"
-#include "psEllipse.h"
-//#include "pmChipMosaic.h"
-#include "pmConcepts.h"
-#include "pmConceptsRead.h"
-#include "pmConceptsStandard.h"
-#include "pmConceptsWrite.h"
-#include "pmHDU.h"
-#include "pmFPA.h"
-//#include "pmFPAAstrometry.h"
-#include "pmFPAConstruct.h"
-#include "pmFPARead.h"
-#include "pmFPAWrite.h"
-#include "pmReadout.h"
-#include "pmFPAfile.h"
-#include "pmFPAview.h"
-#include "pmConfig.h"
-#include "pmFlatField.h"
-#include "pmFlatFieldErrors.h"
-#include "pmMaskBadPixels.h"
-#include "pmMaskBadPixelsErrors.h"
-#include "pmNonLinear.h"
-#include "pmImageCombine.h"
-//#include "pmReadoutCombine.h"
-#include "pmImageSubtract.h"
-#include "pmSubtractBias.h"
-//#include "pmSubtractSky.h"
+// the following headers are from psModule:pslib
+#include <psImageJpeg.h>
+#include <psLine.h>
+#include <psPolynomialUtils.h>
+#include <psSparse.h>
+#include <psEllipse.h>
+#include <psAdditionals.h>
+#include <psRegionIsBad.h>
+#include <psMetadataItemParse.h>
 
-// #include "pmGrowthCurve.h"
-// #include "pmObjects.h"
-// #include "pmObjectsIO.h"
-// #include "pmModel.h"
-// #include "pmPSF.h"
-// #include "pmPSFtry.h"
-// #include "pmMoments.h"
-// #include "pmPeaks.h"
-// #include "pmSource.h"
-// #include "pmSourceContour.h"
-// #include "pmSourceFitModel.h"
-// #include "pmSourceFitSet.h"
-// #include "pmSourcePhotometry.h"
-// #include "pmSourceSky.h"
-// #include "pmSourceIO.h"
-// #include "pmModelGroup.h"
+// the following headers are from psModule:config
+#include <pmConfig.h>
+
+// the following headers are from psModule:astrom
+#include <pmConcepts.h>
+#include <pmConceptsRead.h>
+#include <pmConceptsStandard.h>
+#include <pmConceptsWrite.h>
+#include <pmHDU.h>
+#include <pmHDUUtils.h>
+#include <pmFPA.h>
+#include <pmFPAview.h>
+#include <pmFPAfile.h>
+#include <pmFPARead.h>
+#include <pmFPAConstruct.h>
+#include <pmFPAConstruct.h>
+#include <pmFPARead.h>
+#include <pmFPAWrite.h>
+#include <pmReadout.h>
+#include <pmFPAfile.h>
+#include <pmFPAview.h>
+// #include <pmChipMosaic.h>
+// #include <pmFPAAstrometry.h>
+
+// the following headers are from psModule:detrend
+#include <pmFlatField.h>
+#include <pmFlatFieldErrors.h>
+#include <pmMaskBadPixels.h>
+#include <pmMaskBadPixelsErrors.h>
+#include <pmNonLinear.h>
+
+// the following headers are from psModule:imcombine
+#include <pmImageCombine.h>
+// #include <pmReadoutCombine.h>
+
+// the following headers are from psModule:detrend
+#include <pmSubtractBias.h>
+#include <pmImageSubtract.h>
+// #include <pmSubtractSky.h>
+
+// the following headers are from psModule:objects
+# include <pmPeaks.h>
+# include <pmMoments.h>
+# include <pmModel.h>
+# include <pmSource.h>
+# include <pmSourceIO.h>
+# include <pmSourceSky.h>
+# include <pmSourceFitModel.h>
+# include <pmSourceFitSet.h>
+# include <pmSourceContour.h>
+# include <pmGrowthCurve.h>
+# include <pmPSF.h>
+# include <pmPSFtry.h>
+# include <pmModelGroup.h>
+# include <pmSourcePhotometry.h>
+# include <pmFPAviewObjectsIO.h>
 
 #endif