Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 33963)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 34260)
@@ -17,6 +17,4 @@
 # include <glob.h>
 
-# define DVO_MAX_PATH 1024
-
 int    PARALLEL;
 int    PARALLEL_MANUAL;
@@ -25,5 +23,4 @@
 int    HOST_ID;
 char  *HOSTDIR;
-
 
 int    VERBOSE;
Index: trunk/Ohana/src/dvomerge/include/dvoverify.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 34260)
+++ trunk/Ohana/src/dvomerge/include/dvoverify.h	(revision 34260)
@@ -0,0 +1,53 @@
+# include <ohana.h>
+# include <dvo.h>
+# include <signal.h>
+# include <sys/time.h>
+# include <time.h>
+# include <zlib.h>
+
+/* solaris requires both of these instead of ip.h:
+   # include <sys/socket.h>
+   # include <netinet/in.h>
+*/
+
+/* linux is happy with this, not solaris */
+# include <netinet/ip.h>
+# include <netdb.h>
+# include <arpa/inet.h>
+# include <glob.h>
+
+# define DEBUG 0
+
+int    PARALLEL;
+int    PARALLEL_MANUAL;
+int    PARALLEL_SERIAL;
+
+char  *CATDIR;
+
+int    HOST_ID;
+char  *HOSTDIR;
+
+char  *RESULTS;
+
+int    CHECKSORTED;
+int    VERBOSE;
+int    NNotSorted;
+int    CHECK_TOPLEVEL;
+int    LIST_MISSING;
+
+SkyRegion UserPatch;
+
+int dvoverify_args (int *argc, char **argv);
+int dvoverify_client_args (int *argc, char **argv);
+
+int dvoverify_catalogs (SkyList *skylist, int *Nbad);
+int dvoverify_parallel (SkyList *skylist, int *Nbad);
+
+int dvoverify_single (char *filename);
+
+int VerifyTableFile (char *filename);
+int CheckCatalogIndexes (char *filename,  SkyRegion *region);
+
+void InitFailures ();
+void AddFailures (char *filename);
+char **GetFailures (int *N);