Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 27435)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 27583)
@@ -46,7 +46,11 @@
 int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
 
-void       usage                  PROTO((void));
-void 	   help 		  PROTO((int argc, char **argv));
-int  	   args 		  PROTO((int *argc, char **argv));
+void       dvomerge_usage         PROTO((void));
+void 	   dvomerge_help          PROTO((int argc, char **argv));
+int  	   dvomerge_args 	  PROTO((int *argc, char **argv));
+
+void       dvoconvert_usage       PROTO((void));
+void 	   dvoconvert_help 	  PROTO((int argc, char **argv));
+int  	   dvoconvert_args	  PROTO((int *argc, char **argv));
 
 int        SkyTablePopulatedRange PROTO((off_t *ns, off_t *ne, SkyTable *sky, off_t Nstart));