--- ./source/persistency/ascii/src/G4tgrVolumeMgr.cc_orig	2009-03-16 15:06:02.000000000 +0100
+++ ./source/persistency/ascii/src/G4tgrVolumeMgr.cc	2009-06-10 15:09:00.342361393 +0200
@@ -372,7 +372,7 @@
          << "   copy No " << copyNo << G4endl;
 
   //---------- construct the children of this VOL
-  std::pair<G4mmapspl::const_iterator, G4mmapspl::const_iterator> children
+  std::pair<G4mmapspl::iterator, G4mmapspl::iterator> children
     = GetChildren( vol->GetName() );
   G4mmapspl::const_iterator cite; 
 
--- ./source/persistency/ascii/src/G4tgrFileIn.cc_orig	2009-03-16 15:06:02.000000000 +0100
+++ ./source/persistency/ascii/src/G4tgrFileIn.cc	2009-06-10 15:11:41.357310112 +0200
@@ -38,6 +38,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #include "G4tgrFileIn.hh"
 #include "G4tgrMessenger.hh"
--- ./source/persistency/ascii/include/G4tgrVolumeMgr.hh_orig	2009-03-16 15:06:02.000000000 +0100
+++ ./source/persistency/ascii/include/G4tgrVolumeMgr.hh	2009-06-10 15:09:41.403518852 +0200
@@ -1,3 +1,4 @@
+
 //
 // ********************************************************************
 // * License and Disclaimer                                           *
@@ -52,8 +53,8 @@
 
 #include <map>
 
-typedef std::map< const G4String, const G4tgrSolid* > G4mapssol;
-typedef std::map< const G4String, const G4tgrVolume* > G4mapsvol;
+typedef std::map< G4String, const G4tgrSolid* > G4mapssol;
+typedef std::map< G4String, const G4tgrVolume* > G4mapsvol;
 typedef std::multimap< const G4String, const G4tgrPlace* > G4mmapspl;
 
 //----------------------------------------------------------------------------  
--- ./source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc_orig	2009-03-16 15:06:44.000000000 +0100
+++ ./source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc	2009-06-10 15:07:47.906881401 +0200
@@ -143,7 +143,7 @@
 
 	if (theRWNucleons.size() < 2 ) return; 
 
-	sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
+	std::sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
 
 // now copy sorted nucleons to theNucleons array. TheRWNucleons are pointers in theNucleons
 //  so we need to copy to new, and then swap. 
--- ./source/visualization/management/src/G4ViewParameters.cc_orig	2009-03-16 15:06:57.000000000 +0100
+++ ./source/visualization/management/src/G4ViewParameters.cc	2009-06-10 15:10:29.332830348 +0200
@@ -37,6 +37,8 @@
 #include "G4UnitsTable.hh"
 #include "G4ios.hh"
 
+#include <sstream>
+
 G4ViewParameters::G4ViewParameters ():
   fNoValue(0x0000),
   fXValue(0x0001),