diff -r -u cgmlib/applications/graphs/bpgd/BPGDExample.cpp cgmlib-clean/applications/graphs/bpgd/BPGDExample.cpp
--- applications/graphs/bpgd/BPGDExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/bpgd/BPGDExample.cpp	2008-03-07 17:23:37.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -110,7 +110,7 @@
 void writeDataToFile (ObjList<T> &data, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = data.getSize ();
 
diff -r -u cgmlib/applications/graphs/euler/EulerTourer.cpp cgmlib-clean/applications/graphs/euler/EulerTourer.cpp
--- applications/graphs/euler/EulerTourer.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/euler/EulerTourer.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r -u cgmlib/applications/graphs/euler/EulerTourer.cpp.kept cgmlib-clean/applications/graphs/euler/EulerTourer.cpp.kept
--- applications/graphs/euler/EulerTourer.cpp.kept	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/euler/EulerTourer.cpp.kept	2008-03-07 17:23:38.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r -u cgmlib/applications/graphs/euler/EulerTourExample.cpp cgmlib-clean/applications/graphs/euler/EulerTourExample.cpp
--- applications/graphs/euler/EulerTourExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/euler/EulerTourExample.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -110,7 +110,7 @@
 void writeDataToFile (ObjList<T> &data, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = data.getSize ();
 
diff -r -u cgmlib/applications/graphs/general/Edge.cpp cgmlib-clean/applications/graphs/general/Edge.cpp
--- applications/graphs/general/Edge.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/general/Edge.cpp	2008-03-07 17:23:39.000000000 +0100
@@ -1,5 +1,5 @@
 #include <new>
-#include <strstream.h>
+#include <strstream>
 
 #include "Edge.h"
 
@@ -33,7 +33,7 @@
 
 void Edge::sendToOstream (ostream &outstream)
 {
-  ostrstream var;
+  std::ostrstream var;
 
   var << "[" << id << ":(" << firstEndPoint << (directed?"->":"<->") << secondEndPoint << ")]" << ends;
 
diff -r -u cgmlib/applications/graphs/general/Vertex.cpp cgmlib-clean/applications/graphs/general/Vertex.cpp
--- applications/graphs/general/Vertex.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/general/Vertex.cpp	2008-03-07 17:23:39.000000000 +0100
@@ -1,5 +1,5 @@
 #include <new>
-#include <strstream.h>
+#include <strstream>
 
 #include "Vertex.h"
 
@@ -55,7 +55,7 @@
 
 void Vertex::sendToOstream (ostream &outstream)
 {
-  ostrstream var;
+  std::ostrstream var;
 
   var << "<" << id << "(" << componentId << "-" << interpretBipartiteGroup (bipartiteGroup) << ")>" << ends;
 
diff -r -u cgmlib/applications/graphs/spanning/ConnectedComponents.cpp cgmlib-clean/applications/graphs/spanning/ConnectedComponents.cpp
--- applications/graphs/spanning/ConnectedComponents.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/spanning/ConnectedComponents.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fstream.h>
-#include <strstream.h>
+#include <strstream>
 #include <queue>
 
 #include "ConnectedComponents.h"
@@ -899,7 +899,7 @@
 template <class T> static void writeDataToFile (ObjList<T> &data, char *filename, char *suffix, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   var << filename;
 
diff -r -u cgmlib/applications/graphs/spanning/ConnectedComponentsExample.cpp cgmlib-clean/applications/graphs/spanning/ConnectedComponentsExample.cpp
--- applications/graphs/spanning/ConnectedComponentsExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/spanning/ConnectedComponentsExample.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -113,7 +113,7 @@
 void writeDataToFile (ObjList<T> &data, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = data.getSize ();
 
diff -r -u cgmlib/applications/graphs/spanning/SpanningTreeExample.cpp cgmlib-clean/applications/graphs/spanning/SpanningTreeExample.cpp
--- applications/graphs/spanning/SpanningTreeExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/spanning/SpanningTreeExample.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -113,7 +113,7 @@
 void writeDataToFile (ObjList<T> &data, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = data.getSize ();
 
diff -r -u cgmlib/applications/graphs/spanning/verify.cpp cgmlib-clean/applications/graphs/spanning/verify.cpp
--- applications/graphs/spanning/verify.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/graphs/spanning/verify.cpp	2008-03-07 17:23:38.000000000 +0100
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fstream.h>
-#include <strstream.h>
+#include <strstream>
 #include <queue>
 
 #include "ConnectedComponents.h"
diff -r -u cgmlib/applications/listrank/DeterministicListRankingExample.cpp cgmlib-clean/applications/listrank/DeterministicListRankingExample.cpp
--- applications/listrank/DeterministicListRankingExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/listrank/DeterministicListRankingExample.cpp	2008-03-07 17:23:37.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -84,7 +84,7 @@
 void writeDataToFile (ObjList<Node> &nodes, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = nodes.getSize ();
 
diff -r -u cgmlib/applications/listrank/RandomizedListRankingExample.cpp cgmlib-clean/applications/listrank/RandomizedListRankingExample.cpp
--- applications/listrank/RandomizedListRankingExample.cpp	2004-01-16 15:54:46.000000000 +0100
+++ applications/listrank/RandomizedListRankingExample.cpp	2008-03-07 17:23:37.000000000 +0100
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -84,7 +84,7 @@
 void writeDataToFile (ObjList<Node> &nodes, char *filename, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   int n = nodes.getSize ();
 
diff -r -u cgmlib/include/cgm.h cgmlib-clean/include/cgm.h
--- include/cgm.h	2004-01-17 08:52:27.000000000 +0100
+++ include/cgm.h	2008-03-07 17:23:39.000000000 +0100
@@ -5,11 +5,11 @@
 #include "BasicRequest.h"
 #include "BuildinConsolidationOperator.h"
 #include "CGMTimers.h"
-#include "CPUTimer.h"
 #include "Comm.h"
 #include "CommObject.h"
 #include "CommObjectList.h"
 #include "Comparator.h"
+#include "CPUTimer.h"
 #include "Debug.h"
 #include "GeneralUtilities.h"
 #include "HeapSorter.h"
@@ -22,11 +22,11 @@
 #include "ParallelSorter.h"
 #include "Pool.h"
 #include "Random.h"
-#include "Request.h"
 #include "RequestComparator.h"
+#include "Request.h"
 #include "RequestSystem.h"
-#include "Response.h"
 #include "ResponseComparator.h"
+#include "Response.h"
 #include "ReverseComparator.h"
 #include "SimpleCommObject.h"
 #include "SimpleRequest.h"
diff -r -u cgmlib/include/Debug.h cgmlib-clean/include/Debug.h
--- include/Debug.h	2004-01-17 08:52:27.000000000 +0100
+++ include/Debug.h	2008-03-07 17:23:39.000000000 +0100
@@ -30,7 +30,7 @@
          * @param label an optional label to identify the data.
          * @param procId the processor id (optional, default to not printed)
          */
-    static void printArray (CommObjectList &data, char *label=NULL, int procId=-1);
+    static void printArray (CommObjectList &data, const char *label=NULL, int procId=-1);
 
         /**
          * Print the array if and only if the debug facilities are enabled.
@@ -39,7 +39,7 @@
          * @param label an optional label to identify the data.
          * @param procId the processor id (optional, default to not printed)
          */
-    static void printArray (int *data, int n, char *label=NULL, int procId=-1);
+    static void printArray (int *data, int n, const char *label=NULL, int procId=-1);
     //@}
 
   private:
diff -r -u cgmlib/src/comm/Comm.cpp cgmlib-clean/src/comm/Comm.cpp
--- src/comm/Comm.cpp	2004-01-16 15:54:46.000000000 +0100
+++ src/comm/Comm.cpp	2008-03-07 17:39:01.000000000 +0100
@@ -9,11 +9,11 @@
 // 3. change default is desired.
 // 4. add another "else if" case.
 
-char *Comm::MPICOMM = "MPICOMM";
+const char *Comm::MPICOMM = "MPICOMM";
 
-static char *defaultComm = Comm::MPICOMM;
+static const char *defaultComm = Comm::MPICOMM;
 
-Comm *Comm::getComm (int *argc, char ***argv, CGMTimers *timers, char *selector)
+Comm *Comm::getComm (int *argc, char ***argv, CGMTimers *timers, const char *selector)
 {
   if (selector == NULL)
   {
diff -r -u cgmlib/src/comm/Comm.h cgmlib-clean/src/comm/Comm.h
--- src/comm/Comm.h	2004-01-16 15:54:46.000000000 +0100
+++ src/comm/Comm.h	2008-03-07 17:39:01.000000000 +0100
@@ -17,7 +17,7 @@
         /**
          * A character string to identify MPI, this will be initialized to "MPICOMM".
          */
-    static char *MPICOMM;
+    static char const * MPICOMM;
 
         /**
          * An integer to represent that we don't care with processor is involved.
@@ -40,7 +40,7 @@
          * @param selector a character string to represent the desired comm (optional, the default comm will be selected if missing)
          * @return a pointer to the selected comm
          */
-    static Comm *getComm (int *argc, char ***argv, CGMTimers *timers=NULL, char *selector=NULL);
+    static Comm *getComm (int *argc, char ***argv, CGMTimers *timers=NULL, const char *selector=NULL);
 
         /**
          * Get the number of processors in the current comm.
diff -r -u cgmlib/src/comm/CommObject.cpp cgmlib-clean/src/comm/CommObject.cpp
--- src/comm/CommObject.cpp	2004-01-16 15:54:46.000000000 +0100
+++ src/comm/CommObject.cpp	2008-03-07 17:30:15.000000000 +0100
@@ -1,5 +1,5 @@
 #include <iomanip.h>
-#include <strstream.h>
+#include <strstream>
 #ifdef SUNCC
   #include <streambuf>
 #else
@@ -9,12 +9,12 @@
 
 void CommObject::sendToOstream (ostream& outstream)
 {
-  ostrstream var;
+  std::ostrstream var;
 
   var.unsetf (ios::showbase);
   var.setf (ios::hex, ios::basefield);
   var.fill ('0');
-  var << "CommObject@0x" << setw (8) << ((int) this) << ends;
+  var << "CommObject@" << hex << setw (8) << this << ends;
 
   char *result = var.str ();
   outstream << result;
diff -r -u cgmlib/src/utils/general/Debug.cpp cgmlib-clean/src/utils/general/Debug.cpp
--- src/utils/general/Debug.cpp	2004-01-16 15:54:46.000000000 +0100
+++ src/utils/general/Debug.cpp	2008-03-07 17:23:36.000000000 +0100
@@ -13,7 +13,7 @@
   return debugStatus;
 }
 
-void Debug::printArray (CommObjectList &data, char *label, int procId)
+void Debug::printArray (CommObjectList &data, const char *label, int procId)
 {
   int i;
   int n = data.getSize ();
@@ -46,7 +46,7 @@
   cout.flush ();
 }
 
-void Debug::printArray (int *data, int n, char *label, int procId)
+void Debug::printArray (int *data, int n, const char *label, int procId)
 {
   int i;
 
diff -r -u cgmlib/src/utils/general/Debug.h cgmlib-clean/src/utils/general/Debug.h
--- src/utils/general/Debug.h	2004-01-16 15:54:46.000000000 +0100
+++ src/utils/general/Debug.h	2008-03-07 17:23:36.000000000 +0100
@@ -30,7 +30,7 @@
          * @param label an optional label to identify the data.
          * @param procId the processor id (optional, default to not printed)
          */
-    static void printArray (CommObjectList &data, char *label=NULL, int procId=-1);
+    static void printArray (CommObjectList &data, const char *label=NULL, int procId=-1);
 
         /**
          * Print the array if and only if the debug facilities are enabled.
@@ -39,7 +39,7 @@
          * @param label an optional label to identify the data.
          * @param procId the processor id (optional, default to not printed)
          */
-    static void printArray (int *data, int n, char *label=NULL, int procId=-1);
+    static void printArray (int *data, int n, const char *label=NULL, int procId=-1);
     //@}
 
   private:
diff -r -u cgmlib/src/utils/general/GeneralUtilities.cpp cgmlib-clean/src/utils/general/GeneralUtilities.cpp
--- src/utils/general/GeneralUtilities.cpp	2004-01-16 15:54:46.000000000 +0100
+++ src/utils/general/GeneralUtilities.cpp	2008-03-07 17:23:36.000000000 +0100
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fstream.h>
-#include <strstream.h>
+#include <strstream>
 #include "GeneralUtilities.h"
 
 void GeneralUtilities::printTimers (CGMTimers *timers, int id)
@@ -66,7 +66,7 @@
 void GeneralUtilities::writeDataToFile (CommObjectList &data, char *filename, char *suffix, int id)
 {
   ofstream file;
-  ostrstream var;
+  std::ostrstream var;
 
   var << filename;