Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 38553)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 38986)
@@ -47,4 +47,5 @@
 
 int    MATCHED_TABLES;
+int    REPAIR_BY_OBJID;
 
 char *SINGLE_CPT;
@@ -202,5 +203,5 @@
 int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
 
-int        replace_match           PROTO((Average *average_out, Measure *measure_out, Average *average_in, Measure *measure_in));
+int        replace_match           PROTO((Average *average_out, Measure *measure_out, off_t *next_meas, Average *average_in, Measure *measure_in));
 
 int        IDmapSave               PROTO((char *filename, IDmapType *IDmap));
@@ -241,3 +242,8 @@
 
 void replace_tycho_init ();
-int  replace_tycho (Average *averageInp, Measure *measureInp, Average *averageOut, Measure *measureOut);
+int  replace_tycho (Average *averageInp, Measure *measureInp, off_t *next_meas, Average *averageOut, Measure *measureOut);
+int repair_catalog_by_objID (Catalog *catalog);
+
+int dvorepair_by_objID (int argc, char **argv);
+int dvorepairFixWarpIDs (int argc, char **argv);
+
Index: trunk/Ohana/src/dvomerge/include/dvoutils.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvoutils.h	(revision 38553)
+++ trunk/Ohana/src/dvomerge/include/dvoutils.h	(revision 38986)
@@ -22,4 +22,10 @@
 } DVOUTILS_OP_TYPE;
 
+typedef struct {
+  int   *externID;
+  short *photcode;
+  int Nimages;
+} ImageData;
+
 int VERBOSE;
 int DVOUTILS_OP;
@@ -30,5 +36,12 @@
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
-int *dvoutils_load_image_index (char *filename, int *nindex);
+
+ImageData *dvoutils_load_image_index (char *filename);
 
 Image *dvoutils_load_image_table (char *filename, int *nimage);
+
+int        SetSignals             PROTO((void));
+void       SetProtect             PROTO((int mode));
+void       TrapSignal             PROTO((int sig));
+int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
+
Index: trunk/Ohana/src/dvomerge/include/dvoverify.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 38553)
+++ trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 38986)
@@ -37,4 +37,6 @@
 int    LIST_MISSING;
 
+int    IGNORE_SORTED_STATE;
+
 SkyRegion UserPatch;
 
@@ -62,2 +64,8 @@
 
 void FreeImageIDs (void);
+
+int        SetSignals             PROTO((void));
+void       SetProtect             PROTO((int mode));
+void       TrapSignal             PROTO((int sig));
+int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
+