--- a/cmd/kinput2.c
+++ b/cmd/kinput2.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
--- a/lib/Canna.c
+++ b/lib/Canna.c
@@ -50,6 +50,7 @@
 static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
 #endif
 
+#include <stdlib.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/Atoms.h>
--- a/lib/CcWnn.c
+++ b/lib/CcWnn.c
@@ -2754,6 +2754,7 @@
     wchar wbuf[1024];
     int wlen;
     int len;
+    extern int convJWStoCT();
 
     TRACE(("CcWnn:saveYomiAndKanji()\n"));
 
--- a/lib/ConvCtrl.c
+++ b/lib/ConvCtrl.c
@@ -18,6 +18,7 @@
  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
  */
 
+#include <stdio.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/CharSet.h>
--- a/lib/KIProto.c
+++ b/lib/KIProto.c
@@ -18,6 +18,7 @@
  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
  */
 
+#include <stdio.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xatom.h>
--- a/lib/XimpProto.c
+++ b/lib/XimpProto.c
@@ -18,6 +18,7 @@
  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
  */
 
+#include <stdio.h>
 #include <X11/Xos.h>
 #include <X11/IntrinsicP.h>
 
--- a/lib/cconv.c
+++ b/lib/cconv.c
@@ -604,6 +604,7 @@
 #endif
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<X11/Xlib.h>
 #include	<X11/keysym.h>
 #include	<X11/Xutil.h>
--- a/lib/ctext.c
+++ b/lib/ctext.c
@@ -71,6 +71,8 @@
 static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
 #endif
 
+#include <string.h>
+
 typedef unsigned short	wchar;
 
 #define NULL	0
--- a/lib/ioecall.c
+++ b/lib/ioecall.c
@@ -23,6 +23,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xfuncproto.h>
 #include "IOECall.h"
--- a/lib/wnnlib.c
+++ b/lib/wnnlib.c
@@ -578,6 +578,7 @@
 #ifdef DEBUG_WNNLIB
 #include	<stdio.h>
 #endif
+#include	<stdlib.h>
 #include	"wnnlib.h"
 #include	"WStr.h"
 #include	<string.h>