--- nicolatter-1.7.9/nicolatter/imext.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/imext.cc	2009-04-21 14:39:10.000000000 +0900
@@ -22,6 +22,9 @@
 #include "conv.h"
 #include "start.h"
 
+Connection* find_client_x_self(Window self);
+Connection* find_client_x_client(Window client);
+
 ///////////////////////////////////////////////////////////////////////
 
 static InputContext* findIC(Window focus)
--- nicolatter-1.7.9/addword/callbacks.c.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/addword/callbacks.c	2009-04-21 14:51:15.000000000 +0900
@@ -17,6 +17,7 @@
 #include "support.h"
 #include <misc.h>
 #include "../qWnn.h"
+#include <assert.h>
 
 ////////////////////////////////////////////////////////////////////////
 // Hinsi
--- nicolatter-1.7.9/keymap.cc.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/keymap.cc	2009-08-28 17:14:46.000000000 +0900
@@ -7,6 +7,7 @@
 
 #include "keymap.h"
 #include "URI.h"
+#include <string.h>
 
 //////////////////////////////////////////////////////////////////////
 
--- nicolatter-1.7.9/nicolatter/syncshift.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/syncshift.cc	2009-08-28 17:16:07.000000000 +0900
@@ -16,6 +16,7 @@
 #include "conv.h"
 #include "client.h"
 #include "../global.h"
+#include <string.h>
 
 //////////////////////////////////////////////////////////////////////
 
--- nicolatter-1.7.9/libs/misc.h.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/misc.h	2009-08-28 17:18:33.000000000 +0900
@@ -13,6 +13,7 @@
 #include <cctype>
 #include <map>          // for CFont
 #include <X11/Xlib.h>
+#include <string.h>
 
 #ifdef DEBUG
 extern void q_trace(const char* format, ...);
--- nicolatter-1.7.9/nicolatter/start.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/start.cc	2009-08-28 17:20:30.000000000 +0900
@@ -38,6 +38,7 @@
 #include "LevelSelector.h"
 #include "syncshift.h"
 #include "imext.h"
+#include <stdlib.h>
 
 ///////////////////////////////////////////////////////////////////////
 
--- nicolatter-1.7.9/nicolatter/LevelSelector.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/LevelSelector.cc	2009-08-28 17:21:50.000000000 +0900
@@ -13,6 +13,7 @@
 #include "LevelSelector.h"
 #include "client.h"
 #include "start.h"
+#include <stdlib.h>
 
 using namespace std;
 
--- nicolatter-1.7.9/nicolatter/ximtrans.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/ximtrans.cc	2009-08-28 17:23:10.000000000 +0900
@@ -22,6 +22,7 @@
 #include "start.h"
 
 #include <misc.h>
+#include <stdlib.h>
 
 using namespace std;
 
--- nicolatter-1.7.9/nicolatter/iiimtrans.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicolatter/iiimtrans.cc	2009-08-28 17:23:55.000000000 +0900
@@ -23,6 +23,7 @@
 
 #include <EncString.h>
 #include <misc.h>
+#include <stdlib.h>
 
 using namespace std;
 
--- nicolatter-1.7.9/libs/URI.cpp.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/URI.cpp	2009-08-28 17:25:49.000000000 +0900
@@ -15,6 +15,8 @@
 #include <cstdio>
 #include <cctype>
 #include "URI.h"
+#include <stdlib.h>
+#include <string.h>
 using namespace std;
 
 #ifndef WIN32
--- nicolatter-1.7.9/libs/misc.cc.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/misc.cc	2009-08-28 17:27:01.000000000 +0900
@@ -14,6 +14,7 @@
 #include <X11/Xlib.h>
 
 #include "misc.h"
+#include <stdlib.h>
 using namespace std;
 
 //////////////////////////////////////////////////////////////////////
--- nicolatter-1.7.9/libs/EncString.cc.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/EncString.cc	2009-08-28 17:29:03.000000000 +0900
@@ -11,6 +11,7 @@
 #include <iconv.h>
 #include <stdlib.h>
 #include "EncString.h"
+#include <string.h>
 
 ////////////////////////////////////////////////////////////////////////
 // EncString
--- nicolatter-1.7.9/qWnn.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/qWnn.cc	2009-08-28 17:30:22.000000000 +0900
@@ -9,6 +9,7 @@
 #include <cassert>
 #include "qWnn.h"
 #include "misc.h"
+#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////
 
--- nicolatter-1.7.9/libs/misc-gtk.cc.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/misc-gtk.cc	2009-08-28 17:37:21.000000000 +0900
@@ -12,6 +12,7 @@
 
 #include "misc-gtk.h"
 #include "misc.h"
+#include <stdlib.h>
 
 using namespace std;
 
--- nicolatter-1.7.9/keyconf/main.c.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/keyconf/main.c	2009-08-28 17:38:31.000000000 +0900
@@ -11,6 +11,7 @@
 #include <URI.h>
 #include <gdk/gdkx.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 GtkWidget *map_window;
 GtkWidget *funcs_window;
--- nicolatter-1.7.9/nicoconf/main.c.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/nicoconf/main.c	2009-08-28 17:39:19.000000000 +0900
@@ -13,6 +13,7 @@
 
 #include "../keymap.h"
 #include "../global.h"
+#include <stdlib.h>
 
 GtkWindow* main_window;
 
--- nicolatter-1.7.9/libs/FontDialog.cc.orig	2005-11-26 14:20:53.000000000 +0900
+++ nicolatter-1.7.9/libs/FontDialog.cc	2009-08-28 17:40:12.000000000 +0900
@@ -17,6 +17,7 @@
 #include <misc.h>
 
 #include "FontDialog.h"
+#include <stdlib.h>
 
 using namespace std;
 
--- nicolatter-1.7.9/palette/main.c.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/palette/main.c	2009-08-28 17:40:54.000000000 +0900
@@ -12,6 +12,7 @@
 #include "support.h"
 #include "callbacks.h"
 #include <misc.h>
+#include <stdlib.h>
 
 extern PaletteWindow paletteWindow;
 
--- nicolatter-1.7.9/ximtest/ximtest.cc.orig	2005-11-26 14:20:52.000000000 +0900
+++ nicolatter-1.7.9/ximtest/ximtest.cc	2009-08-28 17:41:56.000000000 +0900
@@ -15,6 +15,7 @@
 #include <misc.h>
 
 #include "ximtest.h"
+#include <stdlib.h>
 
 using namespace std;