Index: trunk/psLib/src/collections/psArray.h
===================================================================
--- trunk/psLib/src/collections/psArray.h	(revision 1440)
+++ trunk/psLib/src/collections/psArray.h	(revision 1441)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,8 +19,8 @@
 
 #ifndef PS_ARRAY_H
-#    define PS_ARRAY_H
+#define PS_ARRAY_H
 
-#    include "psType.h"
-#    include "psCompare.h"
+#include "psType.h"
+#include "psCompare.h"
 
 /// @addtogroup Array
Index: trunk/psLib/src/collections/psBitSet.h
===================================================================
--- trunk/psLib/src/collections/psBitSet.h	(revision 1440)
+++ trunk/psLib/src/collections/psBitSet.h	(revision 1441)
@@ -13,6 +13,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,5 +20,5 @@
 
 #ifndef PSBITSET_H
-#    define PSBITSET_H
+#define PSBITSET_H
 
 /// @addtogroup BitSet
Index: trunk/psLib/src/collections/psCompare.h
===================================================================
--- trunk/psLib/src/collections/psCompare.h	(revision 1440)
+++ trunk/psLib/src/collections/psCompare.h	(revision 1441)
@@ -1,4 +1,4 @@
 #if !defined(PS_COMPARE_H)
-#    define PS_COMPARE_H
+#define PS_COMPARE_H
 
 /** @file psCompare.h
@@ -9,6 +9,6 @@
  *  @ingroup Compare
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-07 00:06:06 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: trunk/psLib/src/collections/psHash.h
===================================================================
--- trunk/psLib/src/collections/psHash.h	(revision 1440)
+++ trunk/psLib/src/collections/psHash.h	(revision 1441)
@@ -11,18 +11,18 @@
  *  @author George Gusciora, MHPCC
  *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 #if !defined(PS_HASH_H)
-#    define PS_HASH_H
+#define PS_HASH_H
 
 /** \addtogroup HashTable
  *  \{
  */
-#    include<stdbool.h>
+#include<stdbool.h>
 
-#    include "psList.h"
+#include "psList.h"
 
 /** A bucket that holds an item of data. */
Index: trunk/psLib/src/collections/psList.h
===================================================================
--- trunk/psLib/src/collections/psList.h	(revision 1440)
+++ trunk/psLib/src/collections/psList.h	(revision 1441)
@@ -1,4 +1,4 @@
 #if !defined(PS_LIST_H)
-#    define PS_LIST_H
+#define PS_LIST_H
 
 /** @file psList.h
@@ -10,15 +10,15 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 
-#    include <pthread.h>                   // we need a mutex to make this stuff thread safe.
-#    include <stdbool.h>                   // we use the bool type.
+#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
+#include <stdbool.h>                   // we use the bool type.
 
-#    include "psCompare.h"
-#    include "psArray.h"
+#include "psCompare.h"
+#include "psArray.h"
 
 /** @addtogroup LinkedList
Index: trunk/psLib/src/collections/psMetadata.h
===================================================================
--- trunk/psLib/src/collections/psMetadata.h	(revision 1440)
+++ trunk/psLib/src/collections/psMetadata.h	(revision 1441)
@@ -11,18 +11,18 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 23:34:57 $
+*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:40:54 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 */
 #ifndef PS_METADATA_H
-#    define PS_METADATA_H
-
-#    include <stdarg.h>
-#    include <stdio.h>
-#    include <fitsio.h>
-
-#    include "psHash.h"
-#    include "psList.h"
+#define PS_METADATA_H
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <fitsio.h>
+
+#include "psHash.h"
+#include "psList.h"
 
 /// @addtogroup Metadata
Index: trunk/psLib/src/collections/psScalar.h
===================================================================
--- trunk/psLib/src/collections/psScalar.h	(revision 1440)
+++ trunk/psLib/src/collections/psScalar.h	(revision 1441)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,7 +18,7 @@
 
 #ifndef PS_SCALAR_H
-#    define PS_SCALAR_H
+#define PS_SCALAR_H
 
-#    include "psType.h"
+#include "psType.h"
 
 /// @addtogroup Scalar
Index: trunk/psLib/src/collections/psVector.h
===================================================================
--- trunk/psLib/src/collections/psVector.h	(revision 1440)
+++ trunk/psLib/src/collections/psVector.h	(revision 1441)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:40:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,7 +19,7 @@
 
 #ifndef PS_VECTOR_H
-#    define PS_VECTOR_H
+#define PS_VECTOR_H
 
-#    include "psType.h"
+#include "psType.h"
 
 /// @addtogroup Vector