Index: trunk/ippTools/src/pxtools.h
===================================================================
--- trunk/ippTools/src/pxtools.h	(revision 6978)
+++ trunk/ippTools/src/pxtools.h	(revision 7027)
@@ -6,8 +6,5 @@
 # include <unistd.h>   // for unlink
 # include <pslib.h>
-# include <pmObjects.h>
-# include <pmPSF.h>
-# include <pmPSFtry.h>
-# include <pmModelGroup.h>
+# include <psmodules.h>
 # include <metadatadb.h>
 
@@ -40,5 +37,5 @@
     psSphere r1;
     psSphere r2;
-    psMetadata *camera;
+    pmConfig *modules;
     char *camera_name;
     char *telescope;
@@ -46,6 +43,4 @@
     char *filter;
     psDB *dbh;
-    psMetadata *site;
-    psMetadata *recipe;
     char *exp_id;
     char *class;
@@ -149,5 +144,5 @@
 rawScienceFrame *newToRawScienceFrame(newFrame *newFrame);
 bool rawScienceFrameInsert(pxConfig *config, rawScienceFrame *frame);
-rawDetrendFrame *newToRawDetrendFrame(newFrame *newFrame); 
+rawDetrendFrame *newToRawDetrendFrame(newFrame *newFrame);
 bool rawDetrendFrameInsert(pxConfig *config, rawDetrendFrame *frame);