Index: trunk/ippTools/src/pxtools.h
===================================================================
--- trunk/ippTools/src/pxtools.h	(revision 13583)
+++ trunk/ippTools/src/pxtools.h	(revision 14018)
@@ -21,30 +21,23 @@
 #define PXTOOLS_H 1
 
-# include <stdio.h>
-# include <strings.h>  // for strcasecmp
-# include <unistd.h>   // for unlink
-# include <pslib.h>
-# include <psmodules.h>
-# include <ippdb.h>
+#include <stdio.h>
+#include <strings.h>  // for strcasecmp
+#include <unistd.h>   // for unlink
+#include <pslib.h>
+#include <psmodules.h>
+#include <ippdb.h>
 
-# include "pxtoolsErrorCodes.h"
-# include "pxio.h"
-# include "pxdata.h"
+#include "pxtoolsErrorCodes.h"
+#include "pxio.h"
+#include "pxdata.h"
+#include "pxtag.h"
+#include "pxregister.h"
+#include "pxchip.h"
+#include "pxcam.h"
+#include "pxconfig.h"
 
 # define MAX_ROWS 10e9
 # define PXTOOL_MODE_NONE 0x0
 
-typedef struct {
-    char *modeName;
-    int mode;
-    pmConfig *modules;
-    psDB *dbh;
-    psMetadata *args;
-    psMetadata *where;
-    int argc;
-    char **argv;
-} pxConfig;
-
-pxConfig *pxConfigAlloc(void);
 bool pxCreateTables (pxConfig *config);
 bool pxDeleteTables (pxConfig *config);