diff --git a/golded3/gealst.cpp b/golded3/gealst.cpp
index 9bf55a1..7e65a80 100644
--- a/golded3/gealst.cpp
+++ b/golded3/gealst.cpp
@@ -31,6 +31,7 @@
   #pragma warning(disable: 4786)
 #endif
 #include <algorithm>
+#include <limits.h>
 #include <golded.h>
 
 #if defined(__USE_ALLOCA__)
diff --git a/golded3/geline.cpp b/golded3/geline.cpp
index 13f5b2c..804f24e 100644
--- a/golded3/geline.cpp
+++ b/golded3/geline.cpp
@@ -25,6 +25,7 @@
 //  ------------------------------------------------------------------
 
 #include <cstdarg>
+#include <limits.h>
 #include <golded.h>
 #include <gstrmail.h>
 #include <gutlcode.h>
diff --git a/goldlib/gall/gbmh.h b/goldlib/gall/gbmh.h
index 8fb086c..64ad6f3 100644
--- a/goldlib/gall/gbmh.h
+++ b/goldlib/gall/gbmh.h
@@ -31,6 +31,7 @@
 
 //  ------------------------------------------------------------------
 
+#include <limits.h>
 #include <gdefs.h>
 
 
diff --git a/goldlib/gall/gdbgerr.cpp b/goldlib/gall/gdbgerr.cpp
index 4e0eabc..52ba831 100644
--- a/goldlib/gall/gdbgerr.cpp
+++ b/goldlib/gall/gdbgerr.cpp
@@ -25,6 +25,8 @@
 //  Debugging and logging.
 //  ------------------------------------------------------------------
 
+#include <string.h>
+#include <stdio.h>
 #include <gutlmisc.h>
 #include <gfilutil.h>
 #include <gdbgerr.h>
diff --git a/goldlib/gall/gdbgerr.h b/goldlib/gall/gdbgerr.h
index eeae0f4..cb36034 100644
--- a/goldlib/gall/gdbgerr.h
+++ b/goldlib/gall/gdbgerr.h
@@ -33,7 +33,6 @@
 
 
 //  ------------------------------------------------------------------
-
 #include <gdefs.h>
 
 
diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index ceceed4..4e23eaa 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -31,6 +31,10 @@
 #define __gdefs_h
 
 /*  ------------------------------------------------------------------ */
+#include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
+#include <limits.h>
 #include <gcmpall.h>
 
 #ifdef __WIN32__
@@ -44,7 +48,6 @@ typedef char TCHAR;
 #endif
 #ifdef _MSC_VER
 # include <windows.h>
-# include <limits.h>
 #elif defined(__MINGW32__) || defined(__CYGWIN__)
 # include <stdint.h>
 #endif
@@ -53,6 +56,9 @@ typedef char TCHAR;
 #define ARRAYSIZE(A)  sizeof(A)/sizeof((A)[0])
 #endif
 
+#ifndef INT_MAX
+#define INT_MAX 214783647
+#endif
 
 /*  ------------------------------------------------------------------
 // Disable some MS Visual C warnings */
diff --git a/goldlib/gall/gespell.h b/goldlib/gall/gespell.h
index 925747d..7004b3f 100644
--- a/goldlib/gall/gespell.h
+++ b/goldlib/gall/gespell.h
@@ -34,11 +34,17 @@
 
 #if defined (__WIN32__)
 #include <windows.h>
+#else
+#include <sys/param.h>
+#endif
+
+#ifndef _MAX_PATH
+#define _MAX_PATH 256
+#endif
 
 #ifndef PATH_MAX
 #define PATH_MAX _MAX_PATH
 #endif
-#endif
 
 const uint SCHECKET_TYPE_UNKNOWN = 0;
 const uint SCHECKET_TYPE_MSSPELL = 1;
diff --git a/goldlib/gall/gfilutil.h b/goldlib/gall/gfilutil.h
index 8eea3f2..b50e140 100644
--- a/goldlib/gall/gfilutil.h
+++ b/goldlib/gall/gfilutil.h
@@ -31,6 +31,8 @@
 
 //  ------------------------------------------------------------------
 
+#include <string.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -47,6 +49,7 @@
 #if !defined(__UNIX__)
 #include <io.h>
 #endif
+#include <gdefs.h>
 
 
 //  ------------------------------------------------------------------M
diff --git a/goldlib/gall/gftnall.h b/goldlib/gall/gftnall.h
index 8f815ec..c008948 100644
--- a/goldlib/gall/gftnall.h
+++ b/goldlib/gall/gftnall.h
@@ -33,7 +33,7 @@
 
 #include <gdefs.h>
 #include <string>
-
+#include <stdlib.h>
 
 //  ------------------------------------------------------------------
 //  FTN contants
diff --git a/goldlib/gall/gmemall.h b/goldlib/gall/gmemall.h
index 50e0626..89d4c16 100644
--- a/goldlib/gall/gmemall.h
+++ b/goldlib/gall/gmemall.h
@@ -31,6 +31,7 @@
 
 //  ------------------------------------------------------------------
 
+#include <stdlib.h>
 #include <gdefs.h>
 #if defined(__MSDOS__)
 #include <gmemi86.h>
diff --git a/goldlib/gall/gstrall.h b/goldlib/gall/gstrall.h
index 4a0cadc..70a36a1 100644
--- a/goldlib/gall/gstrall.h
+++ b/goldlib/gall/gstrall.h
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+#include <stdlib.h>
 #include <gctype.h>
 #include <cstring>
 #include <gdefs.h>
diff --git a/goldlib/gmb3/gmohuds.h b/goldlib/gmb3/gmohuds.h
index be8f269..ac90d0f 100644
--- a/goldlib/gmb3/gmohuds.h
+++ b/goldlib/gmb3/gmohuds.h
@@ -46,7 +46,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <gdbgerr.h>
-#include <stdlib.h>
+#include <gdefs.h>
 #include <gmemdbg.h>
 #include <gdbgtrk.h>
 #include <gstrall.h>
diff --git a/goldlib/gmb3/gmosqsh.h b/goldlib/gmb3/gmosqsh.h
index a77afb1..99603d7 100644
--- a/goldlib/gmb3/gmosqsh.h
+++ b/goldlib/gmb3/gmosqsh.h
@@ -37,6 +37,7 @@
 
 #include <gmoarea.h>
 #include <limits.h>
+#include <gdefs.h>
 #include <gusrmax.h>
 
 
diff --git a/goldlib/hunspell/csutil.cxx b/goldlib/hunspell/csutil.cxx
index ded9195..1c99181 100644
--- a/goldlib/hunspell/csutil.cxx
+++ b/goldlib/hunspell/csutil.cxx
@@ -4942,7 +4942,7 @@ int get_utf_cs_len() {
 */
 int get_utf_cs_len()
 {
-  return (int)get_utf_cs(false);
+  return (long)get_utf_cs(false);
 }
 
 static struct lang_map *get_lang2enc(bool what = true)
@@ -4980,7 +4980,7 @@ static struct lang_map *get_lang2enc(bool what = true)
 
 const char * get_default_enc(const char * lang)
 {
-  int n = (int)get_lang2enc(false);
+  int n = (long)get_lang2enc(false);
   for (int i = 0; i < n; i++)
   {
     if (strcmp(lang, get_lang2enc()[i].lang) == 0)
@@ -4993,7 +4993,7 @@ const char * get_default_enc(const char * lang)
 
 int get_lang_num(const char * lang)
 {
-  int n = (int)get_lang2enc(false);
+  int n = (long)get_lang2enc(false);
   for (int i = 0; i < n; i++)
   {
     if (strncmp(lang,get_lang2enc()[i].lang,2) == 0)
diff --git a/goldnode/goldnode.cpp b/goldnode/goldnode.cpp
index 67a8c7d..80ec1c6 100644
--- a/goldnode/goldnode.cpp
+++ b/goldnode/goldnode.cpp
@@ -260,7 +260,7 @@ static char* fast_parse_addr(char* str, Addr* addr) {
   point = strchr(str, '.');
   domain = strchr(str, '@');
   if(domain and point)
-    if((uint32_t)point > (uint32_t)domain)
+    if(point > domain)
       point = NULL;
 
   if(space)
@@ -305,7 +305,7 @@ static char* parse_address(char* str, Addr* addr, Addr* mainaka) {
     char* point = strchr(str, '.');
     domain = strchr(str, '@');
     if(domain and point)
-      if((uint32_t)point > (uint32_t)domain)
+      if(point > domain)
         point = NULL;
 
     if(net) {