Index: trunk/Ohana/src/imclean/include/imclean.h
===================================================================
--- trunk/Ohana/src/imclean/include/imclean.h	(revision 3466)
+++ trunk/Ohana/src/imclean/include/imclean.h	(revision 3519)
@@ -31,50 +31,20 @@
 char **KEYWORD, **KEYVALU, **KEYFMT;
 
-typedef struct {
-  double X;
-  double Y;
-  double M, dM;
-  char   dophot;
-  double sky;
-  double fx, fy, df;
-  double Mgal, Map;
-} StarsOld;
-
-typedef struct {
-  float X;
-  float Y;
-  float M;
-  float dM;
-  float Mgal;
-  float Map;
-  float sky;
-  float fx;
-  float fy;
-  float df;
-  char  dophot;
-  char  dummy[3];
-} Stars;
-
-Stars *LoadStars ();
-Stars *LoadStarsChad ();
-Stars *LoadStarsSex ();
-
-Stars *LoadStarsDophot (char *filename, int *nstars, Header *header);
-Stars *LoadStarsChad (char *filename, int *nstars, Header *header);
-Stars *LoadStarsSex (char *filename, int *nstars, Header *header);
+SMPData *LoadStarsDophot (char *filename, int *nstars, Header *header);
+SMPData *LoadStarsChad (char *filename, int *nstars, Header *header);
+SMPData *LoadStarsSex (char *filename, int *nstars, Header *header);
 
 void ConfigInit (int *argc, char **argv);
 void AdjustHeader (Header *header);
-void sort_stars (Stars *X, int N);
-void find_trails (Stars *stars, int Nstars);
-int find_group (Stars *stars, char *mark, int Npts, int i, double *ANGLE);
-void wstars (char *filename, Stars *stars, int Nstars, Header *header);
+void sort_stars (SMPData *X, int N);
+void find_trails (SMPData *stars, int Nstars);
+int find_group (SMPData *stars, char *mark, int Npts, int i, double *ANGLE);
+void wstars (char *filename, SMPData *stars, int Nstars, Header *header);
 
-void fix_total (Stars *stars, int Nstars, Header *header);
-int find_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, double Angle);
-void find_better_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, int axis);
+void fix_total (SMPData *stars, int Nstars, Header *header);
+int find_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, double Angle);
+void find_better_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, int axis);
 
 void help ();
 void args (int argc, char **argv);
-int ConvertStars (Stars *data, int size, int nitems);
-void wfits (char *filename, Stars *stars, int Nstars, Header *header);
+void wfits (char *filename, SMPData *stars, int Nstars, Header *header);