--- VisionWorkbench-2.0_beta4.ori/src/vw/GPU/TexAlloc.cc	2009-10-23 03:50:50.000000000 +0200
+++ VisionWorkbench-2.0_beta4.ori/src/vw/GPU/TexAlloc.cc	2009-12-10 22:11:58.000000000 +0100
@@ -14,11 +14,11 @@ 
   //############################################################
 
   bool TexAlloc::isInit = false;
-  list<TexObj*> TexAlloc::texRecycleList;
+  std::list<TexObj*> TexAlloc::texRecycleList;
   int TexAlloc::allocatedCount = 0;
   int TexAlloc::allocatedSize = 0;
   bool TexAlloc::recylingEnabled = false;
-  std::map<pair<Tex_Format, Tex_Type>, pair<Tex_Format, Tex_Type> > TexAlloc::textureSubstitutesMap;
+  std::map<std::pair<Tex_Format, Tex_Type>, std::pair<Tex_Format, Tex_Type> > TexAlloc::textureSubstitutesMap;
 
   //#############################################################
   //                  TexAlloc: Class Functions
@@ -138,7 +138,7 @@ 
 	else if(type == GPU_FLOAT32) sprintf(buffer2, "GPU_FLOAT32");
 	if(verbose)
 	  printf("Checking Texture Support for:  format = %s, type = %s\n", buffer1, buffer2);
-	auto_ptr<TexObj> texRef(new TexObj(100, 100, format, type));
+	std::auto_ptr<TexObj> texRef(new TexObj(100, 100, format, type));
 	if(!texRef->width()) {
 	  failed = true;
 	  if(verbose)
@@ -172,7 +172,7 @@ 
 	      found = true;
 	      outFormat = textureFormats[j_format];
 	      outType =  textureTypes[j_type];
-	      textureSubstitutesMap[pair<Tex_Format, Tex_Type>(inFormat, inType)] = pair<Tex_Format, Tex_Type>(outFormat, outType);
+	      textureSubstitutesMap[std::pair<Tex_Format, Tex_Type>(inFormat, inType)] = std::pair<Tex_Format, Tex_Type>(outFormat, outType);
 	      if(verbose) {
 		printf("[%s, %s] implemented as: ", TexFormatToString(inFormat), TexTypeToString(inType));
 		printf("[%s, %s]\n", TexFormatToString(outFormat), TexTypeToString(outType));
@@ -197,8 +197,8 @@ 
   }
 
   bool TexAlloc::get_texture_substitution(Tex_Format inFormat, Tex_Type inType, Tex_Format& outFormat, Tex_Type& outType) {
-    map<pair<Tex_Format, Tex_Type>, pair<Tex_Format, Tex_Type> >::iterator iter;
-    iter = textureSubstitutesMap.find(pair<Tex_Format, Tex_Type>(inFormat, inType));
+    std::map<std::pair<Tex_Format, Tex_Type>, std::pair<Tex_Format, Tex_Type> >::iterator iter;
+    iter = textureSubstitutesMap.find(std::pair<Tex_Format, Tex_Type>(inFormat, inType));
     if(iter != textureSubstitutesMap.end()) {
       outFormat = (*iter).second.first;
       outType = (*iter).second.second;