diff --git a/golded3/gehdre.cpp b/golded3/gehdre.cpp
index 631693e..7364e9d 100644
--- a/golded3/gehdre.cpp
+++ b/golded3/gehdre.cpp
@@ -61,8 +61,7 @@ bool GMsgHeaderEdit::handle_other_keys(gkey& key) {
   gkey kk;
 
   if(key < KK_Commands) {
-    key = key_tolower(key);
-    kk = SearchKey(key, HeaderKey, HeaderKeys);
+    kk = SearchKey(key_tolower(key), HeaderKey, HeaderKeys);
     if(kk)
       key = kk;
   }
diff --git a/goldlib/gall/gctype.h b/goldlib/gall/gctype.h
index d9bc613..b1e56d4 100644
--- a/goldlib/gall/gctype.h
+++ b/goldlib/gall/gctype.h
@@ -47,10 +47,12 @@
 extern "C" {
 #endif
 extern char tl[256], tu[256];
-inline int tolower(int c) { return tl[c]; }
-inline int toupper(int c) { return tu[c]; }
+inline int _nls_tolower(int c) { return tl[c]; }
+inline int _nls_toupper(int c) { return tu[c]; }
 #ifdef __cplusplus
 }
+#define tolower(a) _nls_tolower((unsigned char)(a))
+#define toupper(a) _nls_toupper((unsigned char)(a))
 #endif
 #endif
 
diff --git a/goldlib/gall/gutldos.cpp b/goldlib/gall/gutldos.cpp
index d10e96f..979854f 100644
--- a/goldlib/gall/gutldos.cpp
+++ b/goldlib/gall/gutldos.cpp
@@ -84,7 +84,7 @@ int g_init_os(int flags) {
     if((cpu.al() == 0xff) and (cpu.ch() > 3))
       winapi = ANSIPLUS;
   }
-  #ifdef __DJGPP__
+  #if 0 // __DJGPP__: get djlocale patch instead
   // reload internal djgpp structures for toupper/tolower
   int segment, selector;