diff -up aspell-0.60.5/modules/speller/default/readonly_ws.cpp.pom aspell-0.60.5/modules/speller/default/readonly_ws.cpp
--- aspell-0.60.5/modules/speller/default/readonly_ws.cpp.pom	2006-11-18 10:17:19.000000000 +0100
+++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp	2008-01-22 13:11:19.000000000 +0100
@@ -726,7 +726,7 @@ namespace {
   struct WordLookupParms {
     const char * block_begin;
     WordLookupParms() {}
-    typedef Vector<u32int>      Vector;
+    typedef acommon::Vector<u32int>      Vector;
     typedef u32int              Value;
     typedef const char *        Key;
     static const bool is_multi = false;
diff -up aspell-0.60.5/modules/speller/default/affix.hpp.pom aspell-0.60.5/modules/speller/default/affix.hpp
--- aspell-0.60.5/modules/speller/default/affix.hpp.pom	2004-11-29 18:50:06.000000000 +0100
+++ aspell-0.60.5/modules/speller/default/affix.hpp	2008-01-22 13:11:19.000000000 +0100
@@ -109,7 +109,7 @@ namespace aspeller {
     }
     WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
                             ObjStack &, int limit = INT_MAX,
-                            unsigned char * new_aff = 0, WordAff * * * l = 0,
+                            unsigned char * new_aff_2 = 0, WordAff * * * l = 0,
                             ParmString orig_word = 0) const;
     
   private:
diff -up aspell-0.60.5/modules/speller/default/affix.cpp.pom aspell-0.60.5/modules/speller/default/affix.cpp
--- aspell-0.60.5/modules/speller/default/affix.cpp.pom	2006-01-21 15:27:54.000000000 +0100
+++ aspell-0.60.5/modules/speller/default/affix.cpp	2008-01-22 13:11:19.000000000 +0100
@@ -193,7 +193,7 @@ struct CondsLookupParms {
   typedef const Conds * Value;
   typedef const char * Key;
   static const bool is_multi = false;
-  hash<const char *> hfun;
+  ::hash<const char *> hfun;
   size_t hash(const char * s) {return hfun(s);}
   bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
   const char * key(const Conds * c) {return c->str;}
diff -up aspell-0.60.5/prog/aspell.cpp.pom aspell-0.60.5/prog/aspell.cpp
--- aspell-0.60.5/prog/aspell.cpp.pom	2006-12-19 11:51:08.000000000 +0100
+++ aspell-0.60.5/prog/aspell.cpp	2008-01-22 13:11:19.000000000 +0100
@@ -1882,7 +1882,7 @@ struct SML_Parms {
   typedef SML_WordEntry Value;
   typedef const char * Key;
   static const bool is_multi = false;
-  hash<const char *> hash;
+  ::hash<const char *> hash;
   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
   Key key(const Value & v) {return v.word;}
 };
@@ -2033,7 +2033,7 @@ struct CML_Parms {
   typedef CML_Entry Value;
   typedef const char * Key;
   static const bool is_multi = true;
-  hash<const char *> hash;
+  ::hash<const char *> hash;
   bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
   Key key(const Value & v) {return v.word;}
 };
diff -up aspell-0.60.5/common/string.hpp.pom aspell-0.60.5/common/string.hpp
--- aspell-0.60.5/common/string.hpp.pom	2004-11-29 18:50:05.000000000 +0100
+++ aspell-0.60.5/common/string.hpp	2008-01-22 13:11:19.000000000 +0100
@@ -492,7 +492,7 @@ namespace acommon {
 
 namespace std
 {
-  template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
+  template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
 }
 
 #endif
diff -up aspell-0.60.5/common/string_map.hpp.pom aspell-0.60.5/common/string_map.hpp
--- aspell-0.60.5/common/string_map.hpp.pom	2004-06-17 14:41:47.000000000 +0200
+++ aspell-0.60.5/common/string_map.hpp	2008-01-22 14:00:24.000000000 +0100
@@ -11,7 +11,7 @@
 #include "parm_string.hpp"
 #include "posib_err.hpp"
 #include "string_pair.hpp"
-#include "hash.hpp"
+#include "hash-t.hpp"
 #include "objstack.hpp"