Index: /trunk/archive/pslib/include/psAstrom.h
===================================================================
--- /trunk/archive/pslib/include/psAstrom.h	(revision 395)
+++ /trunk/archive/pslib/include/psAstrom.h	(revision 396)
@@ -77,5 +77,5 @@
     int nChips;                         ///< Number of Cells assigned
     int nAlloc;                         ///< Number of Cells available
-    psChip *chips;			///< Chips in the Focal Plane Array
+    struct psChip *chips;		///< Chips in the Focal Plane Array
 
     psMetaDataSet *md;			///< FPA-level metadata 
@@ -94,5 +94,5 @@
 typedef struct {
     int nCells;                         ///< Number of Cells assigned
-    psCell *cells;			///< Cells in the Chip
+    struct psCell *cells;		///< Cells in the Chip
 
     psMetaDataSet *md;			///< Chip-level metadata
@@ -108,5 +108,5 @@
     int nReadouts;			///< number of readouts in this cell realization; each may have its
 					///< own image, objects and overscan.
-    psReadout *readouts;		///< Readouts from the cell
+    struct psReadout *readouts;		///< Readouts from the cell
     psMetaDataSet *md;			///< Cell-level metadata
 
@@ -115,5 +115,5 @@
     psCoordXform *cellToSky;		///< Quick and Dirty transformations from cell coordinates to sky
 
-    psChip  *parentChip;		///< chip which contains this cell
+    struct psChip  *parentChip;		///< chip which contains this cell
 } psCell;
 
Index: /trunk/archive/pslib/include/psDateTime.h
===================================================================
--- /trunk/archive/pslib/include/psDateTime.h	(revision 395)
+++ /trunk/archive/pslib/include/psDateTime.h	(revision 396)
@@ -14,4 +14,13 @@
  *  \{
  */
+
+/** psTime is the time structure we will use throughout.  This needs to be revised.  If we end up wrapping
+    libTAI, then we'll probably just use their time struct.  But until then, we need this temporary
+    definition. */
+typedef struct {
+    long numSeconds;			///< Number of seconds from some defined epoch
+    double fracSeconds;			///< Fraction of seconds
+} psTime;
+
 
 /** Get current MJD, for a timestamp \ingroup AstroGroup */
Index: /trunk/archive/pslib/include/psFFT.h
===================================================================
--- /trunk/archive/pslib/include/psFFT.h	(revision 395)
+++ /trunk/archive/pslib/include/psFFT.h	(revision 396)
@@ -71,5 +71,5 @@
  */
 psFFT *
-psFFTCrossCorrelate(psFFT *out		///< Output FFT (or NULL)
+psFFTCrossCorrelate(psFFT *out,		///< Output FFT (or NULL)
 		    const psFFT *fft1, const psFFT *fft2 ///< FFTs to use in cross-correlation
 		    );
Index: /trunk/archive/pslib/include/psImage.h
===================================================================
--- /trunk/archive/pslib/include/psImage.h	(revision 395)
+++ /trunk/archive/pslib/include/psImage.h	(revision 396)
@@ -24,7 +24,7 @@
 	psComplex **rows_complex;	///< pointers to psComplex data
     } rows;
-    psImage *parent;			///< parent, if a subimage 
+    struct psImage *parent;		///< parent, if a subimage 
     int Nchildren;			///< number of subimages 
-    psImage *children;			///< children of this region; array of Nchildren pointers
+    struct psImage *children;		///< children of this region; array of Nchildren pointers
 } psImage;
 
Index: /trunk/archive/pslib/include/psLib.h
===================================================================
--- /trunk/archive/pslib/include/psLib.h	(revision 395)
+++ /trunk/archive/pslib/include/psLib.h	(revision 396)
@@ -23,4 +23,12 @@
 # include <psDlist.h>
 
+/* These are here to ensure things compile --- ordering is important.  ): */
+/** @ingroup MathGroup */
+# include <psStats.h>
+# include <psFunctions.h>
+/** @ingroup AstroGroup */
+# include <psMetaData.h>
+# include <psImage.h>
+
 /** @defgroup MathGroup Math Utilities */
 # include <psBitMask.h>
Index: /trunk/archive/pslib/include/psMemory.h
===================================================================
--- /trunk/archive/pslib/include/psMemory.h	(revision 395)
+++ /trunk/archive/pslib/include/psMemory.h	(revision 396)
@@ -92,9 +92,9 @@
 
 /// Set call back for when a particular memory block is allocated 
-psMemCB psMemAllocateCBSet(psMemAllocateCB func) ///< Function to run
+psMemAllocateCB psMemAllocateCBSet(psMemAllocateCB func) ///< Function to run
 ;
 
 /// Set call back for when a particular memory block is freed 
-psMemCB psMemFreeCBSet(psMemFreeCB func) ///< Function to run
+psMemFreeCB psMemFreeCBSet(psMemFreeCB func) ///< Function to run
 ;
 
Index: /trunk/archive/pslib/include/psMetaData.h
===================================================================
--- /trunk/archive/pslib/include/psMetaData.h	(revision 395)
+++ /trunk/archive/pslib/include/psMetaData.h	(revision 396)
@@ -49,4 +49,7 @@
     psHash *restrict table;		///< hash table of the same metadata
 } psMetaDataSet;
+
+/** Metadata is actually a "set of metadata" */
+typedef psMetaDataSet psMetadata;
 
 /** Functions **************************************************************/
Index: /trunk/archive/pslib/include/psPosition.h
===================================================================
--- /trunk/archive/pslib/include/psPosition.h	(revision 395)
+++ /trunk/archive/pslib/include/psPosition.h	(revision 396)
@@ -55,5 +55,5 @@
 /** apply the optical distortion to the given coordinate, magnitude, color */
 psCoord *psDistortionApply (psCoord *out, ///< Output coordinates, or NULL
-			    const psdistortion *pattern, ///< optical distortion pattern
+			    const psDistortion *pattern, ///< optical distortion pattern
 			    const psCoord *coords, ///< input coordinate
 			    float mag,	///< magnitude of object
Index: /trunk/archive/pslib/include/psStdArrays.h
===================================================================
--- /trunk/archive/pslib/include/psStdArrays.h	(revision 395)
+++ /trunk/archive/pslib/include/psStdArrays.h	(revision 396)
@@ -189,5 +189,5 @@
 
 /** Reallocator \ingroup DataGroup */
-psVectorArray *psVectorArrayRealloc(psVectorArray *myArray ///< Array to reallocate
+psVectorArray *psVectorArrayRealloc(psVectorArray *myArray, ///< Array to reallocate
 				    int nalloc)	///< Total number of elements to make available
 ;