--- include/uniconfkey.h
+++ include/uniconfkey.h
@@ -9,7 +9,7 @@
 
 #include "wvstring.h"
 #include "wvlinklist.h"
-
+#include <climits>
 
 // The Python headers try to #define ANY as void.  If we're building Python
 // wrappers, get rid of that.
--- include/wvserialize.h
+++ include/wvserialize.h
@@ -349,7 +349,7 @@
  * except as the last character.
  */
 template <>
-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
+WvString _wv_deserialize<WvString>(WvBuf &buf);
 
 
 /** Deserialize a WvBuf. */