Index: /trunk/psLib/src/sys/psConfigure.c
===================================================================
--- /trunk/psLib/src/sys/psConfigure.c	(revision 11616)
+++ /trunk/psLib/src/sys/psConfigure.c	(revision 11617)
@@ -13,6 +13,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 22:14:48 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,4 @@
 #include <stdlib.h>
 #include <string.h>
-#include "psMemory.h"
 #include "psTrace.h"
 #include "psString.h"
@@ -33,4 +32,5 @@
 #include "psError.h"
 #include "psConfigure.h"
+#include "psMemory.h"
 
 static char *memCheckName = NULL;       // Filename to which to write results of mem check
Index: /trunk/psLib/src/sys/psError.c
===================================================================
--- /trunk/psLib/src/sys/psError.c	(revision 11616)
+++ /trunk/psLib/src/sys/psError.c	(revision 11617)
@@ -11,6 +11,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 22:14:48 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27,8 +27,8 @@
 #include "psLogMsg.h"
 #include "psError.h"
-#include "psMemory.h"
 #include "psString.h"
 #include "psTrace.h"
 #include "psAbort.h"
+#include "psMemory.h"
 
 #define MAX_STRING_LENGTH 2048
Index: /trunk/psLib/src/sys/psLine.c
===================================================================
--- /trunk/psLib/src/sys/psLine.c	(revision 11616)
+++ /trunk/psLib/src/sys/psLine.c	(revision 11617)
@@ -6,8 +6,8 @@
 #include <stdarg.h>
 
-#include "psMemory.h"
 #include "psAssert.h"
 #include "psConstants.h"
 #include "psLine.h"
+#include "psMemory.h"
 
 static void lineFree(psLine *line)
Index: /trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.c	(revision 11616)
+++ /trunk/psLib/src/sys/psLogMsg.c	(revision 11617)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,5 +31,4 @@
 #include <fcntl.h>
 
-#include "psMemory.h"
 #include "psLogMsg.h"
 #include "psError.h"
@@ -37,4 +36,5 @@
 #include "psList.h"
 #include "psString.h"
+#include "psMemory.h"
 
 
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 11616)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 11617)
@@ -10,6 +10,6 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-30 04:28:08 $
+*  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-03 05:54:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32,6 +32,6 @@
 #endif
 
+#include "psError.h"    // for psErrorStackPrint() only
 #include "psMemory.h"
-#include "psError.h"    // for psErrorStackPrint() only
 
 #define MUTEX_LOCK(mutexPtr) \
Index: /trunk/psLib/src/sys/psSlurp.c
===================================================================
--- /trunk/psLib/src/sys/psSlurp.c	(revision 11616)
+++ /trunk/psLib/src/sys/psSlurp.c	(revision 11617)
@@ -5,6 +5,6 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-19 04:31:06 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2006 University of Hawaii
@@ -20,6 +20,6 @@
 #include "psType.h"
 #include "psError.h"
+#include "psSlurp.h"
 #include "psMemory.h"
-#include "psSlurp.h"
 
 #define SLURP_SIZE 4096
Index: /trunk/psLib/src/sys/psString.c
===================================================================
--- /trunk/psLib/src/sys/psString.c	(revision 11616)
+++ /trunk/psLib/src/sys/psString.c	(revision 11617)
@@ -13,6 +13,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <limits.h>
+
 #include "psString.h"
-#include "psMemory.h"
 #include "psError.h"
 #include "psAssert.h"
 #include "psAbort.h"
-
+#include "psMemory.h"
 
 
Index: /trunk/psLib/src/sys/psTrace.c
===================================================================
--- /trunk/psLib/src/sys/psTrace.c	(revision 11616)
+++ /trunk/psLib/src/sys/psTrace.c	(revision 11617)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-01 02:44:15 $
+ *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-03 05:54:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -53,5 +53,4 @@
 
 #include "psAssert.h"
-#include "psMemory.h"
 #include "psTrace.h"
 #include "psString.h"
@@ -59,4 +58,5 @@
 #include "psLogMsg.h"
 #include "psMetadata.h"
+#include "psMemory.h"
 
 #define MAX_HOSTNAME_LENGTH 256
Index: /trunk/psLib/src/sys/psType.c
===================================================================
--- /trunk/psLib/src/sys/psType.c	(revision 11616)
+++ /trunk/psLib/src/sys/psType.c	(revision 11617)
@@ -7,6 +7,6 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-11 00:20:31 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-03 05:54:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20,5 +20,4 @@
 
 #include "psType.h"
-
 #include "psBitSet.h"
 #include "psFits.h"
@@ -31,4 +30,5 @@
 #include "psRegion.h"
 #include "psHistogram.h"
+#include "psMemory.h"
 
 bool psMemCheckType(psDataType type,