Index: trunk/ppImage/src/ppImageDetrendNonLinear.c
===================================================================
--- trunk/ppImage/src/ppImageDetrendNonLinear.c	(revision 5976)
+++ trunk/ppImage/src/ppImageDetrendNonLinear.c	(revision 6260)
@@ -1,5 +1,9 @@
-# include "ppImage.h"
+#include <stdio.h>
+#include "pslib.h"
+#include "pmFPA.h"
+#include "pmNonLinear.h"
+#include "ppImageDetrend.h"
 
-bool ppDetrendNonLinearPolynomial (pmReadout *input, psMetadataItem *dataItem) {
+bool ppImageDetrendNonLinearPolynomial(pmReadout *input, psMetadataItem *dataItem) {
 
     // These are the polynomial coefficients
@@ -19,5 +23,5 @@
 }
 
-bool ppDetrendNonLinearLookup (pmReadout *input, psMetadataItem *dataItem) {
+bool ppImageDetrendNonLinearLookup(pmReadout *input, psMetadataItem *dataItem) {
 
     // This is a filename: lookup table
@@ -40,5 +44,5 @@
 }
 
-bool ppDetrendNonLinear (pmCell *cell, pmReadout *input, ppOptions *options) {
+bool ppImageDetrendNonLinear(pmCell *cell, pmReadout *input, ppImageOptions *options) {
 
     psMetadataItem *concept;
@@ -46,9 +50,9 @@
     switch (options->nonLinearType) {
       case PS_DATA_VECTOR:
-        ppDetrendNonLinearPolynomial (input, options->nonLinearData);
+        ppImageDetrendNonLinearPolynomial (input, options->nonLinearData);
         return true;
 
       case PS_DATA_STRING:
-        ppDetrendNonLinearLookup (input, options->nonLinearData);
+        ppImageDetrendNonLinearLookup (input, options->nonLinearData);
         return true;
 
@@ -91,8 +95,8 @@
         switch (optionItem->type) {
           case PS_DATA_VECTOR:
-            ppDetrendNonLinearPolynomial (input, optionItem);
+            ppImageDetrendNonLinearPolynomial (input, optionItem);
             return true;
           case PS_DATA_STRING:
-            ppDetrendNonLinearLookup (input, optionItem);
+            ppImageDetrendNonLinearLookup (input, optionItem);
             return true;
           default: