Index: /trunk/psLib/src/astronomy/psCCD.d
===================================================================
--- /trunk/psLib/src/astronomy/psCCD.d	(revision 1336)
+++ /trunk/psLib/src/astronomy/psCCD.d	(revision 1337)
@@ -1,3 +1,3 @@
-psCCD.o psCCD.d : psCCD.c psCCD.h ../collections/psType.h ../image/psImage.h \
+psCCD.o psCCD.d : psCCD.c psCCD.h ../sysUtils/psType.h ../image/psImage.h \
   ../collections/psArray.h ../collections/psCompare.h \
   ../collections/psList.h ../sysUtils/psMemory.h
Index: /trunk/psLib/src/astronomy/psTime.d
===================================================================
--- /trunk/psLib/src/astronomy/psTime.d	(revision 1336)
+++ /trunk/psLib/src/astronomy/psTime.d	(revision 1337)
@@ -1,2 +1,2 @@
-psTime.o psTime.d : psTime.c psTime.h ../collections/psType.h ../sysUtils/psError.h \
+psTime.o psTime.d : psTime.c psTime.h ../sysUtils/psType.h ../sysUtils/psError.h \
   ../sysUtils/psMemory.h
Index: /trunk/psLib/src/collections/psArray.d
===================================================================
--- /trunk/psLib/src/collections/psArray.d	(revision 1336)
+++ /trunk/psLib/src/collections/psArray.d	(revision 1337)
@@ -1,2 +1,2 @@
 psArray.o psArray.d : psArray.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  psArray.h psType.h psCompare.h ../sysUtils/psLogMsg.h
+  psArray.h ../sysUtils/psType.h psCompare.h ../sysUtils/psLogMsg.h
Index: /trunk/psLib/src/collections/psCompare.d
===================================================================
--- /trunk/psLib/src/collections/psCompare.d	(revision 1336)
+++ /trunk/psLib/src/collections/psCompare.d	(revision 1337)
@@ -1,1 +1,1 @@
-psCompare.o psCompare.d : psCompare.c psType.h psCompare.h
+psCompare.o psCompare.d : psCompare.c ../sysUtils/psType.h psCompare.h
Index: /trunk/psLib/src/collections/psList.d
===================================================================
--- /trunk/psLib/src/collections/psList.d	(revision 1336)
+++ /trunk/psLib/src/collections/psList.d	(revision 1337)
@@ -1,3 +1,3 @@
 psList.o psList.d : psList.c ../sysUtils/psError.h ../sysUtils/psAbort.h \
-  ../sysUtils/psMemory.h psList.h psCompare.h psArray.h psType.h \
-  ../sysUtils/psTrace.h ../sysUtils/psLogMsg.h
+  ../sysUtils/psMemory.h psList.h psCompare.h psArray.h \
+  ../sysUtils/psType.h ../sysUtils/psTrace.h ../sysUtils/psLogMsg.h
Index: /trunk/psLib/src/collections/psScalar.d
===================================================================
--- /trunk/psLib/src/collections/psScalar.d	(revision 1336)
+++ /trunk/psLib/src/collections/psScalar.d	(revision 1337)
@@ -1,2 +1,3 @@
 psScalar.o psScalar.d : psScalar.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  psScalar.h psType.h ../sysUtils/psLogMsg.h ../sysUtils/psAbort.h
+  psScalar.h ../sysUtils/psType.h ../sysUtils/psLogMsg.h \
+  ../sysUtils/psAbort.h
Index: /trunk/psLib/src/collections/psVector.d
===================================================================
--- /trunk/psLib/src/collections/psVector.d	(revision 1336)
+++ /trunk/psLib/src/collections/psVector.d	(revision 1337)
@@ -1,2 +1,2 @@
 psVector.o psVector.d : psVector.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  psVector.h psType.h ../sysUtils/psLogMsg.h psCompare.h
+  psVector.h ../sysUtils/psType.h ../sysUtils/psLogMsg.h psCompare.h
Index: /trunk/psLib/src/dataManip/psFFT.d
===================================================================
--- /trunk/psLib/src/dataManip/psFFT.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psFFT.d	(revision 1337)
@@ -1,3 +1,3 @@
-psFFT.o psFFT.d : psFFT.c psFFT.h ../image/psImage.h ../collections/psType.h \
+psFFT.o psFFT.d : psFFT.c psFFT.h ../image/psImage.h ../sysUtils/psType.h \
   ../collections/psVector.h ../sysUtils/psError.h ../sysUtils/psMemory.h \
   ../sysUtils/psLogMsg.h ../image/psImageExtraction.h psStats.h
Index: /trunk/psLib/src/dataManip/psFunctions.d
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psFunctions.d	(revision 1337)
@@ -1,3 +1,3 @@
 psFunctions.o psFunctions.d : psFunctions.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../collections/psType.h ../sysUtils/psTrace.h \
+  ../collections/psVector.h ../sysUtils/psType.h ../sysUtils/psTrace.h \
   ../sysUtils/psError.h ../sysUtils/psAbort.h psFunctions.h
Index: /trunk/psLib/src/dataManip/psMatrix.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psMatrix.d	(revision 1337)
@@ -1,3 +1,3 @@
 psMatrix.o psMatrix.d : psMatrix.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  ../image/psImage.h ../collections/psType.h ../collections/psVector.h \
+  ../image/psImage.h ../sysUtils/psType.h ../collections/psVector.h \
   psMatrix.h
Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d	(revision 1337)
@@ -1,4 +1,4 @@
 psMatrixVectorArithmetic.o psMatrixVectorArithmetic.d : psMatrixVectorArithmetic.c \
   ../sysUtils/psMemory.h ../sysUtils/psError.h ../image/psImage.h \
-  ../collections/psType.h ../collections/psVector.h \
+  ../sysUtils/psType.h ../collections/psVector.h \
   ../collections/psScalar.h
Index: /trunk/psLib/src/dataManip/psMinimize.d
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psMinimize.d	(revision 1337)
@@ -1,4 +1,4 @@
 psMinimize.o psMinimize.d : psMinimize.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../collections/psType.h ../image/psImage.h \
+  ../collections/psVector.h ../sysUtils/psType.h ../image/psImage.h \
   ../sysUtils/psTrace.h ../sysUtils/psError.h ../sysUtils/psAbort.h \
   psFunctions.h psMinimize.h psMatrix.h
Index: /trunk/psLib/src/dataManip/psStats.d
===================================================================
--- /trunk/psLib/src/dataManip/psStats.d	(revision 1336)
+++ /trunk/psLib/src/dataManip/psStats.d	(revision 1337)
@@ -1,4 +1,4 @@
 psStats.o psStats.d : psStats.c ../sysUtils/psMemory.h ../image/psImage.h \
-  ../collections/psType.h ../collections/psVector.h ../sysUtils/psTrace.h \
+  ../sysUtils/psType.h ../collections/psVector.h ../sysUtils/psTrace.h \
   ../sysUtils/psError.h ../sysUtils/psAbort.h psStats.h psMinimize.h \
   psFunctions.h
Index: /trunk/psLib/src/image/psImage.d
===================================================================
--- /trunk/psLib/src/image/psImage.d	(revision 1336)
+++ /trunk/psLib/src/image/psImage.d	(revision 1337)
@@ -1,2 +1,2 @@
 psImage.o psImage.d : psImage.c ../sysUtils/psMemory.h ../sysUtils/psAbort.h \
-  ../sysUtils/psError.h psImage.h ../collections/psType.h
+  ../sysUtils/psError.h psImage.h ../sysUtils/psType.h
Index: /trunk/psLib/src/image/psImageExtraction.d
===================================================================
--- /trunk/psLib/src/image/psImageExtraction.d	(revision 1336)
+++ /trunk/psLib/src/image/psImageExtraction.d	(revision 1337)
@@ -1,3 +1,3 @@
 psImageExtraction.o psImageExtraction.d : psImageExtraction.c ../sysUtils/psMemory.h \
-  psImageExtraction.h psImage.h ../collections/psType.h \
+  psImageExtraction.h psImage.h ../sysUtils/psType.h \
   ../collections/psVector.h ../dataManip/psStats.h ../sysUtils/psError.h
Index: /trunk/psLib/src/image/psImageIO.d
===================================================================
--- /trunk/psLib/src/image/psImageIO.d	(revision 1336)
+++ /trunk/psLib/src/image/psImageIO.d	(revision 1337)
@@ -1,2 +1,2 @@
-psImageIO.o psImageIO.d : psImageIO.c psImageIO.h psImage.h ../collections/psType.h \
+psImageIO.o psImageIO.d : psImageIO.c psImageIO.h psImage.h ../sysUtils/psType.h \
   ../sysUtils/psError.h ../sysUtils/psMemory.h
Index: /trunk/psLib/src/image/psImageManip.d
===================================================================
--- /trunk/psLib/src/image/psImageManip.d	(revision 1336)
+++ /trunk/psLib/src/image/psImageManip.d	(revision 1337)
@@ -1,3 +1,3 @@
 psImageManip.o psImageManip.d : psImageManip.c ../sysUtils/psError.h psImage.h \
-  ../collections/psType.h ../dataManip/psStats.h \
-  ../collections/psVector.h ../sysUtils/psMemory.h psImageExtraction.h
+  ../sysUtils/psType.h ../dataManip/psStats.h ../collections/psVector.h \
+  ../sysUtils/psMemory.h psImageExtraction.h
Index: /trunk/psLib/src/image/psImageStats.d
===================================================================
--- /trunk/psLib/src/image/psImageStats.d	(revision 1336)
+++ /trunk/psLib/src/image/psImageStats.d	(revision 1337)
@@ -1,4 +1,4 @@
 psImageStats.o psImageStats.d : psImageStats.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../collections/psType.h ../sysUtils/psTrace.h \
+  ../collections/psVector.h ../sysUtils/psType.h ../sysUtils/psTrace.h \
   ../sysUtils/psError.h ../sysUtils/psAbort.h ../dataManip/psStats.h \
   psImage.h ../dataManip/psFunctions.h psImageStats.h
Index: /trunk/psLib/src/sysUtils/psHash.d
===================================================================
--- /trunk/psLib/src/sysUtils/psHash.d	(revision 1336)
+++ /trunk/psLib/src/sysUtils/psHash.d	(revision 1337)
@@ -1,3 +1,3 @@
 psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
   ../collections/psCompare.h ../collections/psArray.h \
-  ../collections/psType.h psMemory.h psString.h psTrace.h psAbort.h
+  ../sysUtils/psType.h psMemory.h psString.h psTrace.h psAbort.h