Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 21153)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 21508)
@@ -28,4 +28,18 @@
     fprintf (stderr, "ERROR:  photcode %s not found in photcode table\n", NAME); \
     exit (0); }
+
+typedef struct {
+  char *exthead;
+  char *extdata;
+  char *exttype;
+  int extnum_head;
+  int extnum_data;
+} HeaderSet;
+
+typedef struct {
+  Average average;
+  Measure measure;
+  int found;
+} Stars;
 
 typedef struct {
@@ -39,12 +53,4 @@
   char *refcat;
 } DVO_DATA;
-
-typedef struct {
-  char *exthead;
-  char *extdata;
-  char *exttype;
-  int extnum_head;
-  int extnum_data;
-} HeaderSet;
 
 typedef struct sockaddr_in SockAddress;
@@ -92,4 +98,5 @@
 /* these globals modify the behavior of gstars (KEEP) */
 double 	SNLIMIT;
+int     PHOTFLAG_EXCLUDE;
 int    	ACCEPT_ASTROM;  // accept even bad astrometry solutions (NASTRO == 0)
 int    	ACCEPT_MOTION;  // accept reference proper motion measurements
@@ -137,6 +144,8 @@
 /*** addstar prototypes ***/
 
+AddstarClientOptions ConfigInit   PROTO((int *argc, char **argv));
+AddstarClientOptions args         PROTO((int argc, char **argv, AddstarClientOptions options));
+
 void       AddToCalibration       PROTO((Average *average, SecFilt *secfilt, Measure *measure, Measure *new, int *next, int Nstar));
-AddstarClientOptions ConfigInit   PROTO((int *argc, char **argv));
 void       FindCalibration        PROTO((Image *image));
 FILE      *GetDB                  PROTO((int *state));
@@ -145,27 +154,31 @@
 void       SetProtect             PROTO((int mode));
 int        SetSignals             PROTO((void));
-int        Shutdown               PROTO((char *message, ...); ) 
+int        Shutdown               PROTO((char *message, ...));
 void       TrapSignal             PROTO((int sig));
 float      airmass                PROTO((float secz_image, double ra, double dec, double st, double latitude));
+float      azimuth                PROTO((double ha, double dec, double latitude));
 void       SetAirmassQuality      PROTO((int quality));
 SkyTable  *SkyTableFromTychoIndex PROTO((char *filename, int VERBOSE));
-AddstarClientOptions args         PROTO((int argc, char **argv, AddstarClientOptions options));
 void       check_permissions      PROTO((char *basefile));
 int        dump_rawstars          PROTO((Stars *stars, int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
 Image     *fakeimage              PROTO((char *rootname, int *Nimage, int photcode));
+
 int        find_matches           PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
 int        find_matches_closest   PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
 int        find_matches_refstars  PROTO((SkyRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
+
 Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, int Nstars, int *NSTARS));
 int        gcatalog               PROTO((Catalog *catalog));
 Stars     *get2mass               PROTO((SkyRegion *patch, int photcode, int mode, int *NSTARS));
 double     get_subpix             PROTO((double x, double y));
+
+Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, int *nstars));
 Stars     *getgsc                 PROTO((SkyRegion *patch, int *NSTARS));
 Stars     *gettycho               PROTO((SkyRegion *catstats, int photcode, int *Nstars));
 Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, int *Nstars));
 Stars     *getusnob               PROTO((SkyRegion *catstats, int photcode, int *Nstars));
-Image     *gimages                PROTO((FITS_DB *db, Image *image, Coords *mosaic, int *Npimage));
-Stars     *grefcat                PROTO((char *Refcat, SkyRegion *catstats, int photcode, int *nstars));
+
+// load text-based stars (REF only in the sense of REF photcodes)
 Stars     *grefstars              PROTO((char *file, int photcode, int *Nstars));
 
@@ -249,4 +262,9 @@
 Stars     *Convert_PS1_DEV_0	  PROTO((FTable *table, int *nstars));
 Stars     *Convert_PS1_DEV_1	  PROTO((FTable *table, int *nstars));
+Stars     *Convert_PS1_V1	  PROTO((FTable *table, int *nstars));
+
+int        InitStar               PROTO((Stars *star));
+short      ShortPixels            PROTO((float pixels));
+short      ShortDegree            PROTO((float degrees));
 
 int args_skycells (int argc, char **argv);