diff --git a/src/control/ctrlmisc.c b/src/control/ctrlmisc.c
index e0fe2e30..3656824e 100644
--- a/src/control/ctrlmisc.c
+++ b/src/control/ctrlmisc.c
@@ -14,6 +14,7 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 
diff --git a/src/gui/arabickeymap.c b/src/gui/arabickeymap.c
index b832bad6..5de009db 100644
--- a/src/gui/arabickeymap.c
+++ b/src/gui/arabickeymap.c
@@ -2,9 +2,10 @@
 /* Do not edit this file! It was automatically generated by   */
 /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 
-//?
 #include "minigui.h"
 #include "gdi.h"
 #include "window.h"
@@ -15,7 +16,6 @@
 
 #include "keyboard.h"
 
-
 #ifdef _MGKBDLAYOUT_ARABICPC
 
 static u_short arabic_compose_map[NR_KEYS] = {
diff --git a/src/gui/defkeymap.c b/src/gui/defkeymap.c
index 296b4b20..f18de6f0 100644
--- a/src/gui/defkeymap.c
+++ b/src/gui/defkeymap.c
@@ -2,9 +2,10 @@
 /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 
-//?
 #include "minigui.h"
 #include "gdi.h"
 #include "window.h"
diff --git a/src/gui/hebrewkeymap.c b/src/gui/hebrewkeymap.c
index 2880d920..5c45e9cf 100644
--- a/src/gui/hebrewkeymap.c
+++ b/src/gui/hebrewkeymap.c
@@ -2,6 +2,8 @@
 /* Do not edit this file! It was automatically generated by   */
 /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 
 //?
diff --git a/src/gui/keyboard.c b/src/gui/keyboard.c
index c782cad5..7ae04a1e 100644
--- a/src/gui/keyboard.c
+++ b/src/gui/keyboard.c
@@ -655,6 +655,8 @@ BOOL GUIAPI TranslateKeyMsgToChar (int message, WPARAM wParam, LPARAM lParam, WO
     return FALSE; 
 }
 
+#ifdef _MGCHARSET_UNICODE
+
 static UChar32 utf8_to_wc (const unsigned char* mstr, int* utf8_len)
 {
     UChar32 wc = *((unsigned char *)(mstr++));
@@ -761,3 +763,4 @@ int GUIAPI ToAscii (UINT keycode, const BYTE* kbd_state,
     return 0;
 }
 
+#endif
diff --git a/src/newgdi/attr.c b/src/newgdi/attr.c
index 60810269..2150947a 100644
--- a/src/newgdi/attr.c
+++ b/src/newgdi/attr.c
@@ -10,6 +10,9 @@
 ** Create date: 2000/06/12, derived from original gdi.c
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 #include "minigui.h"
 #include "gdi.h"
diff --git a/src/newgdi/clip.c b/src/newgdi/clip.c
index eda93af0..2fa8f3ac 100644
--- a/src/newgdi/clip.c
+++ b/src/newgdi/clip.c
@@ -11,6 +11,9 @@
 ** Create date: 2000/06/12, derived from original gdi.c
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 #include "minigui.h"
 #include "gdi.h"
diff --git a/src/newgdi/coor.c b/src/newgdi/coor.c
index 0712c5bd..5d444455 100644
--- a/src/newgdi/coor.c
+++ b/src/newgdi/coor.c
@@ -11,6 +11,9 @@
 ** Create date: 2000/06/12, derived from original gdi.c
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 #include "minigui.h"
 #include "gdi.h"
diff --git a/src/newgdi/map.c b/src/newgdi/map.c
index 5336dc39..c3256f68 100644
--- a/src/newgdi/map.c
+++ b/src/newgdi/map.c
@@ -11,6 +11,9 @@
 ** Create date: 2000/06/12, derived from original gdi.c
 */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "common.h"
 #include "minigui.h"
 #include "gdi.h"