Index: branches/ipp-magic-v0/psModules/src/imcombine/pmPSFEnvelope.c
===================================================================
--- branches/bills_081204/psModules/src/imcombine/pmPSFEnvelope.c	(revision 20890)
+++ branches/ipp-magic-v0/psModules/src/imcombine/pmPSFEnvelope.c	(revision 21062)
@@ -20,4 +20,6 @@
 #include "pmModelClass.h"
 #include "pmModelUtils.h"
+#include "pmSpan.h"
+#include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmSource.h"
@@ -116,5 +118,5 @@
         psf->residuals = NULL;
         if (!pmReadoutFakeFromSources(fakeRO, fakeSize, fakeSize, fakes, xOffset, yOffset, psf,
-                                      NAN, radius, true)) {
+                                      NAN, radius, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
             psFree(envelope);
@@ -146,5 +148,5 @@
             // Get the radius
             pmModel *model = pmModelFromPSFforXY(psf, x, y, PEAK_FLUX); // Model for source
-	    psAssert (model, "failed to generate model: should this be an error or not?");
+            psAssert (model, "failed to generate model: should this be an error or not?");
             float srcRadius = model->modelRadius(model->params, PS_SQR(WEIGHT_VAL)); // Radius for source
             if (srcRadius > maxRadius) {
@@ -297,5 +299,5 @@
         pmModel *fakeModel = pmModelFromPSFforXY(psf, (float)numCols / 2.0, (float)numRows / 2.0,
                                                  1.0); // Fake model, with central intensity of 1.0
-	psAssert (fakeModel, "failed to generate model: should this be an error or not?");
+        psAssert (fakeModel, "failed to generate model: should this be an error or not?");
         float flux0 = fakeModel->modelFlux(fakeModel->params); // Flux for central intensity of 1.0
         for (int i = 0; i < numFakes; i++) {
@@ -306,5 +308,5 @@
         pmReadout *generated = pmReadoutAlloc(NULL); // Generated image
         pmReadoutFakeFromSources(generated, numCols, numRows, fakes, NULL, NULL, psf, NAN, radius,
-                                 false);
+                                 false, true);
         {
             psFits *fits = psFitsOpen("psf_field_model.fits", "w");
Index: branches/ipp-magic-v0/psModules/src/imcombine/pmSubtractionStamps.c
===================================================================
--- branches/bills_081204/psModules/src/imcombine/pmSubtractionStamps.c	(revision 20890)
+++ branches/ipp-magic-v0/psModules/src/imcombine/pmSubtractionStamps.c	(revision 21062)
@@ -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"