Index: trunk/Ohana/src/opihi/include/dvoshell.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvoshell.h	(revision 31160)
+++ trunk/Ohana/src/opihi/include/dvoshell.h	(revision 31635)
@@ -2,8 +2,10 @@
 # include "basic.h"
 # include "astro.h"
+# include "dvo.h"
 
 # ifndef DVOSHELL_H
 # define DVOSHELL_H
 
+#ifdef NOT_MOVED_TO_LIBDVO
 typedef enum {
   DB_STACK_NONE  = 0,
@@ -232,5 +234,4 @@
 };
 
-
 enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
 enum {DVO_DB_CMDLINE_ERROR, DVO_DB_CMDLINE_IS_END, DVO_DB_CMDLINE_IS_WHERE, DVO_DB_CMDLINE_IS_MATCH}; 
@@ -268,4 +269,6 @@
   opihi_int Int;
 } dbValue;
+
+#endif // notdef MOVED_TO_LIBDVO
 
 typedef struct {
@@ -313,7 +316,9 @@
 void          FreeDVO               PROTO((void));
 int           InitPhotcodes         PROTO((void));
+#ifdef NOT_MOVED_TO_DVO
 Image        *LoadImages            PROTO((off_t *Nimage));
 void          FreeImages            PROTO((Image *images));
 Image        *MatchImage            PROTO((unsigned int time, short int source, unsigned int imageID));
+#endif
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
 int           Quality               PROTO((Measure *measure, int IsDophot));
@@ -347,5 +352,7 @@
 CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
 int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
-
+int wordhash (char *word);
+
+#ifdef NOT_MOVED_TO_LIBDVO
 // dvo DB field functions
 dbField     *dbCmdlineFields        PROTO((int argc, char **argv, int table, int *last, int *nfields));
@@ -361,4 +368,5 @@
 dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, dbValue *fields));
 dbStack     *dbUnary                PROTO((dbStack *V1, char *op, dbValue *fields));
+#endif
 
 int          GetMagMode             PROTO((char *string));
@@ -368,19 +376,20 @@
 int          ParseImageField        PROTO((dbField *field, char *fieldName));
 
-dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
+#ifdef NOT_MOVED_TO_LIBDVO
+dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 
 void 	     dbInitField            PROTO((dbField *field));
 void 	     dbFreeFields           PROTO((dbField *fields, int Nfields));
 int          dbAstroRegionLimits    PROTO((dbStack **stack, int *nstack, SkyRegionSelection *selection, int table));
-char        *strfloat               PROTO((float value));
-
 int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
 int set_skyregion (double Rs, double Re, double Ds, double De);
 void FreeImageSelection (void);
+char        *strfloat               PROTO((float value));
+
 
 void FreeSkyRegionSelection (SkyRegionSelection *selection);
-int wordhash (char *word);
+
 
 int dbExtractMeasuresInitTransform (CoordTransformSystem target);
@@ -395,4 +404,5 @@
 int dbExtractImagesInit (void);
 int dbExtractImagesReset (void);
+#endif // NOT_MOVED_TO_LIBDVO
 
 # endif