Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 38636)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 38986)
@@ -49,24 +49,4 @@
   int extnum_xrad;
 } HeaderSet;
-
-# if (0)
-typedef struct {
-  Average  average;
-  Measure  measure;
-  Lensing *lensing; // optionally carry out the lensing measurements
-  int found;
-} Stars;
-
-typedef struct {
-  unsigned int Nstars;
-  Stars *stars;
-  off_t Nimages;
-  Image *images;
-  Coords *mosaic;
-  SkyRegion *patch;
-  AddstarClientOptions *options;
-  char *refcat;
-} DVO_DATA;
-# endif
 
 # define IDTYPE int
@@ -222,26 +202,20 @@
 int        find_matches        	  PROTO((SkyRegion *region, Catalog *newcat, Catalog *catalog, AddstarClientOptions options));
 
-# if (0)
-int        find_matches_refstars  	 PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
-int        find_matches_closest_refstars PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
-
-int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
-
-Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, unsigned int Nstars, unsigned int *NSTARS));
+int        find_matches_refstars  	 PROTO((SkyRegion *region, Catalog *srccat, Catalog *tgtcat, AddstarClientOptions options));
+int        find_matches_closest_refstars PROTO((SkyRegion *region, Catalog *srccat, Catalog *tgtcat, AddstarClientOptions options));
+
+Catalog   *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode));
+
 int        gcatalog               PROTO((Catalog *catalog));
-Stars     *get2mass               PROTO((SkyRegion *patch, int photcode, int mode, unsigned int *NSTARS));
-
-Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
-Stars     *getgsc                 PROTO((SkyRegion *patch, unsigned int *NSTARS));
-Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
-Stars     *getusnob               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
+Catalog   *getgsc                 PROTO((SkyRegion *patch));
+Catalog   *getusno                PROTO((SkyRegion *catstats));
+Catalog   *getusnob               PROTO((SkyRegion *catstats));
 
 // load text-based stars (REF only in the sense of REF photcodes)
-Stars     *grefstars              PROTO((char *file, int photcode, unsigned int *Nstars));
-
-Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
-
-int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
-# endif
+Catalog   *grefstars              PROTO((char *file, int photcode));
+
+Catalog   *rd_gsc                 PROTO((char *filename));
+
+int        replace_match          PROTO((Average *average, Measure *measure, Measure *newmeas, off_t *found));
 
 Catalog   *LoadStars              PROTO((char *file, Image **images, off_t *Nimages, AddstarClientOptions *options));
@@ -297,4 +271,5 @@
 
 SkyList   *SkyListExistingSubset  PROTO((SkyList *input, char *path));
+SkyList   *SkyListForStars	  PROTO((SkyTable *table, int depth, Catalog *catalog));
 
 // these are all for the addstar client/server which has not been maintained
@@ -311,5 +286,4 @@
 int 	   UpdateDatabase_Reflist PROTO((AddstarClientOptions *options, Stars *stars, unsigned int Nstars));
 int 	   UpdateDatabase_Refcat  PROTO((AddstarClientOptions *options, SkyRegion *UserPatch, char *refcat));
-SkyList   *SkyListForStars	  PROTO((SkyTable *table, int depth, Stars *stars, unsigned int Nstars));
 int        SkyListSetPath	  PROTO((SkyList *list, char *path));
 int 	   InitDataset		  PROTO((void));