Index: trunk/ppImage/src/ppImageDetrendCell.c
===================================================================
--- trunk/ppImage/src/ppImageDetrendCell.c	(revision 6125)
+++ trunk/ppImage/src/ppImageDetrendCell.c	(revision 6260)
@@ -1,8 +1,11 @@
-# include "ppImage.h"
+#include <stdio.h>
+#include "pslib.h"
 #include "pmFPA.h"
+#include "pmFlatField.h"
+#include "ppImageDetrend.h"
 
 // mask, bias, dark, flat are defined per Cell
 
-pmReadout *ppDetrendSelectFirst(pmCell *cell, char *name, bool doThis)
+pmReadout *ppImageDetrendSelectFirst(pmCell *cell, char *name, bool doThis)
 {
     if (!doThis) {
@@ -19,12 +22,12 @@
 }
 
-bool ppDetrendCell(ppDetrend *detrend, ppOptions *options, ppConfig *config)
+bool ppImageDetrendCell(ppImageDetrend *detrend, ppImageOptions *options, ppConfig *config)
 {
     pmCellSetWeights(detrend->input);
 
-    pmReadout *mask = ppDetrendSelectFirst(detrend->mask, "mask", options->doMask);
-    pmReadout *bias = ppDetrendSelectFirst(detrend->bias, "bias", options->doBias);
-    pmReadout *dark = ppDetrendSelectFirst(detrend->dark, "dark", options->doDark);
-    pmReadout *flat = ppDetrendSelectFirst(detrend->flat, "flat", options->doFlat);
+    pmReadout *mask = ppImageDetrendSelectFirst(detrend->mask, "mask", options->doMask);
+    pmReadout *bias = ppImageDetrendSelectFirst(detrend->bias, "bias", options->doBias);
+    pmReadout *dark = ppImageDetrendSelectFirst(detrend->dark, "dark", options->doDark);
+    pmReadout *flat = ppImageDetrendSelectFirst(detrend->flat, "flat", options->doFlat);
 
 #if 0
@@ -39,14 +42,14 @@
         // Mask bad pixels
         if (options->doMask) {
-            ppDetrendMask(detrend->input, input, mask);
+            ppImageDetrendMask(detrend->input, input, mask);
         }
 
         // Non-linearity correction
         if (options->doNonLin) {
-            ppDetrendNonLinear(detrend->input, input, options);
+            ppImageDetrendNonLinear(detrend->input, input, options);
         }
 
         // Bias, dark and overscan subtraction are all merged.
-        ppDetrendBias(input, bias, dark, options);
+        ppImageDetrendBias(input, bias, dark, options);
 
         // Flat-field correction (no options used?)