Index: /trunk/archive/pslib/include/psAstrom.h
===================================================================
--- /trunk/archive/pslib/include/psAstrom.h	(revision 225)
+++ /trunk/archive/pslib/include/psAstrom.h	(revision 226)
@@ -88,5 +88,5 @@
 /** Array of cell descriptions */
 typedef struct {
-    enum psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				//!< Total number of elements available
     int n;				//!< Number of elements in use
@@ -116,5 +116,5 @@
     double rotation;			//!< Rotation of OTA on the focal plane.  Specified from +x through +y
     psCellDescriptionArray *restrict cells; //!< Cell descriptions
-    psOTAAstrom *astrom;		//!< OTA astrometry
+    struct psOTAAstrom *astrom;		//!< OTA astrometry
     psExposure *exp;			//!< Exposure data
 } psOTADescription;
@@ -158,5 +158,5 @@
     psDoubleArray *restrict tp;		//!< Data needed to convert from the sky to the tangent plane and back;
 					//!< produced by and used by SLALib (a.k.a. "Wallace's Grommit")
-    enum psColorrRef colorRef;		//!< Colour reference
+    psColourRef colorRef;		//!< Colour reference
     /* Characterisation of the solution */
     float rmsX, rmsY;		        //!< Dispersion in astrometric solution
Index: /trunk/archive/pslib/include/psFunctions.h
===================================================================
--- /trunk/archive/pslib/include/psFunctions.h	(revision 225)
+++ /trunk/archive/pslib/include/psFunctions.h	(revision 226)
@@ -1,3 +1,3 @@
-\#if !defined(PS_FUNCTIONS_H)
+#if !defined(PS_FUNCTIONS_H)
 #define PS_FUNCTIONS_H
 
Index: /trunk/archive/pslib/include/psImages.h
===================================================================
--- /trunk/archive/pslib/include/psImages.h	(revision 225)
+++ /trunk/archive/pslib/include/psImages.h	(revision 226)
@@ -31,4 +31,6 @@
 /*** Image structure manipulation ***/
 /// Create an image of the specified size and type.
+typedef int PS_IMAGE_DEPTH;		// RHL Added this to make the psImage compile XXX
+
 psImage *
 psImageAlloc (int nx,			///< image width 
@@ -99,5 +101,5 @@
 
 /// Extract a 2-d contour from an image at the given threshold.
-psFloatArrayArray *
+psFloatArray *
 psImageContour (psImage *input, 	///< create contour for this image
 		float threshold,	///< contour image at this threshold
Index: /trunk/archive/pslib/include/psObjects.h
===================================================================
--- /trunk/archive/pslib/include/psObjects.h	(revision 225)
+++ /trunk/archive/pslib/include/psObjects.h	(revision 226)
@@ -46,9 +46,9 @@
 /** An assembly of objects */
 typedef struct {
-    enum psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				//!< Total number of elements available
     int n;				//!< Number of elements in use
     psObject *arr;			//!< The array data
-} psVectorArray;
+} psObjectArray;
 
 /** Constructor */
Index: /trunk/archive/pslib/include/psPosition.h
===================================================================
--- /trunk/archive/pslib/include/psPosition.h	(revision 225)
+++ /trunk/archive/pslib/include/psPosition.h	(revision 226)
@@ -68,5 +68,5 @@
 /** An array of detector positions */
 typedef struct {
-    enum psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				//!< Total number of elements available
     int n;				//!< Number of elements in use
@@ -112,5 +112,5 @@
 /** An array of sky positions */
 typedef struct {
-    enum psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			//!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				//!< Total number of elements available
     int n;				//!< Number of elements in use
Index: /trunk/archive/pslib/include/psStats.h
===================================================================
--- /trunk/archive/pslib/include/psStats.h	(revision 225)
+++ /trunk/archive/pslib/include/psStats.h	(revision 226)
@@ -33,15 +33,15 @@
 /** generic statistics structure */
 typedef struct {
-    double sampleMean			//<! formal mean of sample
+    double sampleMean;			//<! formal mean of sample
     double sampleMeanError;		//<! error on formal mean
-    double sampleMedian			//<! formal median of sample
+    double sampleMedian;		//<! formal median of sample
     double sampleMedianError;		//<! error on formal median
     double sampleStdev;			//<! standard deviation of sample
     double sampleUQ;			//<! upper quartile of sample
     double sampleLQ;			//<! lower quartile of sample
-    double robustMean			//<! robust mean of array
+    double robustMean;			//<! robust mean of array
     double robustMeanError;		//<! error on robust mean
     int    robustMeanNvalues;		//<! number of measurements used for robust mean
-    double robustMedian			//<! robust median of array
+    double robustMedian;		//<! robust median of array
     double robustMedianError;		//<! error on robust median
     int    robustMedianNvalues;		//<! number of measurements used for robust median
@@ -49,5 +49,5 @@
     double robustUQ;			//<! robust upper quartile
     double robustLQ;			//<! robust lower quartile
-    double clippedMean			//<! Nsigma clipped mean
+    double clippedMean;			//<! Nsigma clipped mean
     double clippedMeanError;		//<! error on clipped mean
     int    clippedMeanNvalues;		//<! number of data points used for clipped mean
Index: /trunk/archive/pslib/include/psStdArrays.h
===================================================================
--- /trunk/archive/pslib/include/psStdArrays.h	(revision 225)
+++ /trunk/archive/pslib/include/psStdArrays.h	(revision 226)
@@ -3,9 +3,10 @@
 
 #include <complex.h>
+#include <stdint.h>
 #include "psArray.h"
 
 
 /** Types of the elements of vectors, matrices, etc. */
-enum {
+typedef enum {
     PS_TYPE_CHAR,			///< Character
     PS_TYPE_SHORT,			///< Short integer
@@ -18,10 +19,10 @@
     PS_TYPE_FLOAT,			///< Floating point
     PS_TYPE_DOUBLE,			///< Double-precision floating point
-    PS_TYPE_COMPLEX			///< Complex numbers consisting of floating point
-    PS_TYPE_OTHER			///< Something else that's not supported for arithmetic
+    PS_TYPE_COMPLEX,			///< Complex numbers consisting of floating point
+    PS_TYPE_OTHER,			///< Something else that's not supported for arithmetic
 } psElemType;
 
 /** Dimensions of a data type */
-enum {
+typedef enum {
     PS_DIMEN_SCALAR,			///< Scalar
     PS_DIMEN_VECTOR,			///< A vector
@@ -33,6 +34,6 @@
 /** The type of a data type */
 typedef struct {
-    enum psElemType type;		///< The type
-    enum psDimen dimen;			///< The dimensionality
+    psElemType type;			///< The type
+    psDimen dimen;			///< The dimensionality
 } psType;
 
@@ -72,5 +73,5 @@
 /** An array of real numbers */
 typedef struct {
-    enum psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				///< Total number of elements available
     int n;				///< Number of elements in use
@@ -102,5 +103,5 @@
 /** An array of complex numbers */
 typedef struct {
-    enum psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				///< Total number of elements available
     int n;				///< Number of elements in use
@@ -124,5 +125,5 @@
 /** An array of integers */
 typedef struct {
-    enum psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				///< Total number of elements available
     int n;				///< Number of elements in use
@@ -146,5 +147,5 @@
 /** An array of double-precision real numbers */
 typedef struct {
-    enum psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				///< Total number of elements available
     int n;				///< Number of elements in use
@@ -168,5 +169,5 @@
 /** An array of real vectors */
 typedef struct {
-    enum psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
+    psType type;			///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     int size;				///< Total number of elements available
     int n;				///< Number of elements in use