Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_01.o: tst_psMetadata_01.c ../../include/pslib.h \
+builddir/tst_psMetadata_01.o: tst_psMetadata_01.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_02.o: tst_psMetadata_02.c ../../include/pslib.h \
+builddir/tst_psMetadata_02.o: tst_psMetadata_02.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_03.o: tst_psMetadata_03.c ../../include/pslib.h \
+builddir/tst_psMetadata_03.o: tst_psMetadata_03.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_04.o: tst_psMetadata_04.c ../../include/pslib.h \
+builddir/tst_psMetadata_04.o: tst_psMetadata_04.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_05.o: tst_psMetadata_05.c ../../include/pslib.h \
+builddir/tst_psMetadata_05.o: tst_psMetadata_05.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psMetadata_06.o: tst_psMetadata_06.c ../../include/pslib.h \
+builddir/tst_psMetadata_06.o: tst_psMetadata_06.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psTime_01.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psTime_01.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psTime_01.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psTime_01.o: tst_psTime_01.c ../../include/pslib.h \
+builddir/tst_psTime_01.o: tst_psTime_01.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/builddir/tst_psTime_02.d
===================================================================
--- trunk/psLib/test/astronomy/builddir/tst_psTime_02.d	(revision 3662)
+++ trunk/psLib/test/astronomy/builddir/tst_psTime_02.d	(revision 3682)
@@ -1,3 +1,3 @@
-builddir/tst_psTime_02.o: tst_psTime_02.c ../../include/pslib.h \
+builddir/tst_psTime_02.o: tst_psTime_02.c ../../include/pslib_strict.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/astronomy/tst_psAstrometry.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 3682)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-28 23:34:10 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,5 +17,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 static psS32 testExposureAlloc(void);
@@ -40,5 +40,5 @@
     psLogSetLevel(PS_LOG_INFO);
 
-    return ! runTestSuite(stderr,"psImage",tests,argc,argv);
+    return ! runTestSuite(stderr,"psAstrometry",tests,argc,argv);
 }
 
Index: trunk/psLib/test/astronomy/tst_psAstrometry01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 3682)
@@ -5,6 +5,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-01 22:22:17 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 * XXX: Must test
@@ -23,5 +23,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 static psS32 test1( void );
Index: trunk/psLib/test/astronomy/tst_psCoord.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psCoord.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psCoord.c	(revision 3682)
@@ -6,6 +6,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-22 01:36:47 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -13,5 +13,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 static psS32 testSphereTransformAlloc(void);
 static psS32 testPlaneTransformAlloc(void);
Index: trunk/psLib/test/astronomy/tst_psCoord01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psCoord01.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psCoord01.c	(revision 3682)
@@ -6,11 +6,11 @@
 *    @author Eric Van Alst, MHPCC
 *
-*    @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*    @date  $Date: 2005-03-22 01:37:31 $
+*    @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*    @date  $Date: 2005-04-07 20:27:41 $
 *
 *    Copyright 2005 Maui High Performance Computing Center, Univ. of Hawaii
 */
 
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psDB.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psDB.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psDB.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 23:01:46 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,5 +25,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 #define STR_1 "hello world!"
Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3682)
@@ -14,6 +14,6 @@
  *  @author  Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-03-11 20:38:56 $
+ *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,5 +22,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3682)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.24 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3682)
@@ -15,6 +15,6 @@
  *  @author  Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-03-11 20:38:56 $
+ *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23,5 +23,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3682)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3682)
@@ -23,6 +23,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,5 +31,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3682)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-17 19:44:44 $
+*  @version $Revision: 1.24 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3682)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_07.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_07.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psMetadata_07.c	(revision 3682)
@@ -9,6 +9,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-28 23:34:10 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 */
 #include "config.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psTime_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 3682)
@@ -23,6 +23,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,5 +31,5 @@
 
 #include <string.h>
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psTime_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_02.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psTime_02.c	(revision 3682)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,5 +17,5 @@
  */
 
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psTime_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 3682)
@@ -19,6 +19,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,5 @@
  */
 
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/tst_psTime_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_04.c	(revision 3662)
+++ trunk/psLib/test/astronomy/tst_psTime_04.c	(revision 3682)
@@ -14,6 +14,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,5 +22,5 @@
 #include "config.h"
 
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr	(revision 3662)
+++ trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr	(revision 3682)
@@ -1,54 +1,54 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psExposureAlloc}                                   *
+*            TestPoint: psAstrometry{psExposureAlloc}                              *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psExposureAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psExposureAlloc} | tst_psAstrometry.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psObservatoryAlloc}                                *
+*            TestPoint: psAstrometry{psObservatoryAlloc}                           *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psObservatoryAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psObservatoryAlloc} | tst_psAstrometry.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psFPAAlloc}                                        *
+*            TestPoint: psAstrometry{psFPAAlloc}                                   *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psFPAAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psFPAAlloc} | tst_psAstrometry.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psChipAlloc}                                       *
+*            TestPoint: psAstrometry{psChipAlloc}                                  *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psChipAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psChipAlloc} | tst_psAstrometry.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psCellAlloc}                                       *
+*            TestPoint: psAstrometry{psCellAlloc}                                  *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psCellAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psCellAlloc} | tst_psAstrometry.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psAstrometry.c                                         *
-*            TestPoint: psImage{psReadoutAlloc}                                    *
+*            TestPoint: psAstrometry{psReadoutAlloc}                               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psImage{psReadoutAlloc} | tst_psAstrometry.c)
+---> TESTPOINT PASSED (psAstrometry{psReadoutAlloc} | tst_psAstrometry.c)
 
