diff --git a/golded3/gclang.cpp b/golded3/gclang.cpp
index 1f40d85..5991715 100644
--- a/golded3/gclang.cpp
+++ b/golded3/gclang.cpp
@@ -541,7 +541,7 @@ static bool SwitchLanguage(word crc, char* str) {
     }
     return 0;
   } else
-    return -1;
+    return bool(-1);
 }
 
 
@@ -577,7 +577,7 @@ void LangInit() {
 
   LNG = (LangGed*)throw_calloc(1, sizeof(LangGed));
   LNG->Outofmem = throw_strdup("Out of memory!");
-  
+
   // Init LangCrc pointers to LNG
   char** lptr = (char**)LNG;
   for(LangCrc* lngptr = LangCrcs; lngptr->crc != CRC_LAST_CRC; lngptr++, lptr++)
@@ -698,7 +698,7 @@ bool ReadLangCfg(int force) {
   char buf[1024];
   LangCrc* lngptr;
   int line = 0;
-  
+
   // Read the GOLDLANG.CFG if there is one
   const char* cfgname = AddPath(CFG->goldpath, CFG->langcfg);
   fpi = fsopen(cfgname, "rt", CFG->sharemode);
@@ -748,7 +748,7 @@ bool ReadLangCfg(int force) {
   }
 
   AssignDateNames();
-  
+
   return true;
 }
 
diff --git a/golded3/gealst.cpp b/golded3/gealst.cpp
index 602dd3d..08f0c21 100644
--- a/golded3/gealst.cpp
+++ b/golded3/gealst.cpp
@@ -27,6 +27,13 @@
 #if defined(__MINGW32__) || defined(_MSC_VER)
 #include <malloc.h>
 #endif
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+    /* C4786: 'identifier' : identifier was truncated to 'number'
+          characters in the debug information
+    */
+  #pragma warning(disable: 4786)
+#endif
 #include <algorithm>
 #include <golded.h>
 
diff --git a/golded3/getpls.cpp b/golded3/getpls.cpp
index f382a69..59bb562 100644
--- a/golded3/getpls.cpp
+++ b/golded3/getpls.cpp
@@ -24,6 +24,12 @@
 //  Template handling.
 //  ------------------------------------------------------------------
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+    /* C4786: 'identifier' : identifier was truncated to 'number'
+          characters in the debug information
+    */
+  #pragma warning(disable: 4786)
+#endif
 #include <algorithm>
 #include <golded.h>
 
diff --git a/goldlib/gall/gcmpall.h b/goldlib/gall/gcmpall.h
index 2874a3c..e7276b4 100644
--- a/goldlib/gall/gcmpall.h
+++ b/goldlib/gall/gcmpall.h
@@ -90,6 +90,12 @@
 #define __inline__ __inline
 #define __extension__
 #define __MSVCRT__
+  #ifdef _DEBUG
+    /* C4786: 'identifier' : identifier was truncated to 'number'
+          characters in the debug information
+    */
+    #pragma warning(disable: 4786)
+  #endif
 #endif
 
 /*  --------------------------------------------------------------- */
diff --git a/goldlib/gall/gvidall.h b/goldlib/gall/gvidall.h
index 5051611..4094f69 100644
--- a/goldlib/gall/gvidall.h
+++ b/goldlib/gall/gvidall.h
@@ -31,9 +31,6 @@
 
 
 //  ------------------------------------------------------------------
-#if defined(_MSC_VER)
-#pragma warning(disable: 4200)
-#endif
 #include <gdefs.h>
 #if defined(__USE_NCURSES__)
 #include <gcurses.h>
@@ -41,6 +38,9 @@
 #if defined(__WIN32__)
 #include <windows.h>
 #endif
+#if defined(_MSC_VER)
+#pragma warning(disable: 4200)
+#endif
 
 
 //  ------------------------------------------------------------------