--- common/string.hpp.orig	2010-06-21 23:19:58.000000000 +0000
+++ common/string.hpp	2010-06-21 23:20:42.000000000 +0000
@@ -492,7 +492,7 @@
 
 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
--- modules/speller/default/affix.hpp.orig	2010-06-21 23:27:41.000000000 +0000
+++ modules/speller/default/affix.hpp	2010-06-21 23:31:08.000000000 +0000
@@ -107,7 +107,7 @@
     {
       return expand(word,aff,buf,0);
     }
-    WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
+    WordAff * expand_suffix(ParmString word, const unsigned char * aff,
                             ObjStack &, int limit = INT_MAX,
                             unsigned char * new_aff = 0, WordAff * * * l = 0,
                             ParmString orig_word = 0) const;
--- common/string_map.hpp.orig	2010-06-22 09:02:01.000000000 +0000
+++ common/string_map.hpp	2010-06-22 09:03:20.000000000 +0000
@@ -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"