Index: trunk/psModules/src/imcombine/pmPSFEnvelope.c
===================================================================
--- trunk/psModules/src/imcombine/pmPSFEnvelope.c	(revision 20838)
+++ 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 20838)
+++ 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"