Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 38468)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 38553)
@@ -30,17 +30,17 @@
 int    VERIFY_CATALOG_ONLY;
 int    IMAGES_ONLY;
-char   CATDIR[256];
-char   GSCFILE[256];
-char   CATMODE[16];    /* raw, mef, split, mysql */
-char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
-char   ImageCat[256];
+char   CATDIR[DVO_MAX_PATH];
+char   GSCFILE[DVO_MAX_PATH];
+char   ImageCat[DVO_MAX_PATH];
+char   CATMODE[256];    /* raw, mef, split, mysql */
+char   CATFORMAT[256];  /* internal, elixir, loneos, panstarrs */
 float  RADIUS;
 int    SKY_DEPTH;
 int    NTHREADS;
-char  *ALTERNATE_PHOTCODE_FILE;
 int    REPLACE_BY_PHOTCODE;
 int    REPLACE_TYCHO;
 int    FORCE_MERGE;
 int    MAX_CLIENTS;
+char  *ALTERNATE_PHOTCODE_FILE;
 char  *UPDATE_CATFORMAT;
 char  *UPDATE_CATCOMPRESS;
@@ -116,4 +116,5 @@
 void 	   dvomerge_help          PROTO((int argc, char **argv));
 int  	   dvomerge_args 	  PROTO((int *argc, char **argv));
+void       dvomerge_args_free     PROTO((void));
 
 void       dvomerge_client_usage  PROTO((void));
@@ -174,4 +175,6 @@
 off_t 	   dvo_map_image_ID       PROTO((IDmapType *IDmap, off_t oldID));
 int   	   dvo_update_image_IDs   PROTO((IDmapType *IDmap, Catalog *catalog));
+void       dvo_image_map_free     PROTO((IDmapType *IDmap));
+void       dvo_image_map_init     PROTO((IDmapType *IDmap));
 
 // dvorepair prototypes
@@ -212,4 +215,6 @@
 int dmhObjectCheck (dmhObject *history, dmhObjectStats *inStats);
 dmhObject *dmhObjectRead (char *filename);
+dmhObject *dmhObjectAlloc (void);
+void dmhObjectFree (dmhObject *history);
 
 void dmhObjectStatsFree (dmhObjectStats *stats);
@@ -217,6 +222,7 @@
 
 int dmhImageAdd (FITS_DB *db, dmhImage *history, char *dbID);
-dmhImage *dmhImageRead (FITS_DB *db) ;
+dmhImage *dmhImageRead (FITS_DB *db);
 int dmhImageCheck (dmhImage *history, char *dbID);
+void dmhImageFree(dmhImage *history);
 
 char *dmhImageReadID (FITS_DB *db);
Index: trunk/Ohana/src/dvomerge/include/dvoverify.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 38468)
+++ trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 38553)
@@ -53,4 +53,5 @@
 void AddFailures (char *filename);
 char **GetFailures (int *N);
+void FreeFailures (void);
 
 int LoadImageIDs (char *catdir);
@@ -59,2 +60,4 @@
 int SaveImageIDsSmall(char *filename);
 int LoadImageIDsSmall (char *filename);
+
+void FreeImageIDs (void);