diff --git a/scim-wnn/m4/Makefile b/scim-wnn/m4/Makefile
index 87e6ca4..64103c5 100644
--- a/scim-wnn/m4/Makefile
+++ b/scim-wnn/m4/Makefile
@@ -148,8 +148,8 @@
 SCIM_CFLAGS = -I/usr/include/scim-1.0  
 SCIM_DATADIR = /usr/share/scim
 SCIM_DEBUG_FLAGS = 
-SCIM_GTKUTILS_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/include/scim-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-SCIM_GTKUTILS_LIBS = -Wl,--export-dynamic -lscim-gtkutils-1.0 -lgtk-x11-2.0 -lscim-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+SCIM_GTKUTILS_CFLAGS = -I/usr/include/scim-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+SCIM_GTKUTILS_LIBS = -lscim-gtkutils-1.0 -lgtk-x11-2.0 -lscim-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 SCIM_ICONDIR = /usr/share/scim/icons
 SCIM_LIBS = -lscim-1.0  
 SCIM_MODULEDIR = /usr/lib/scim-1.0
diff --git a/scim-wnn/src/convertor.h b/scim-wnn/src/convertor.h
index 11ba9a7..2938e5e 100644
--- a/scim-wnn/src/convertor.h
+++ b/scim-wnn/src/convertor.h
@@ -36,6 +36,7 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace ScimWnn {
 class ResultList{
 public:
     WideString Yomi;
@@ -74,5 +75,6 @@
 
 };
 
-
+}
+using namespace ScimWnn;
 #endif
diff --git a/scim-wnn/src/kanainput.cpp b/scim-wnn/src/kanainput.cpp
index 25d6b9e..ff3b245 100644
--- a/scim-wnn/src/kanainput.cpp
+++ b/scim-wnn/src/kanainput.cpp
@@ -37,12 +37,7 @@
   #define bind_textdomain_codeset(domain,codeset)
 #endif
 
-
-struct KanaInputKey {
-    int code;
-    const char kana[6];
-};
-
+namespace ScimWnn {
 const KanaInputKey KanaInputTable[] = {
     {SCIM_KEY_kana_fullstop,        "��"},
     {SCIM_KEY_kana_openingbracket,  "��"},
@@ -113,7 +108,7 @@
 
     {0,""}
 };
-
+}
 
 KanaInput::KanaInput(ConfigPointer cfg) : PreEditor(cfg)
 {
diff --git a/scim-wnn/src/kanainput.h b/scim-wnn/src/kanainput.h
index 0809832..5b06843 100644
--- a/scim-wnn/src/kanainput.h
+++ b/scim-wnn/src/kanainput.h
@@ -34,6 +34,14 @@
 /**
 @author TAM(Teppei Tamra)
 */
+namespace ScimWnn {
+
+struct KanaInputKey {
+    int code;
+    const char kana[6];
+};
+
+
 class KanaInput : public PreEditor {
 public:
     KanaInput(ConfigPointer cfg);
@@ -47,5 +55,6 @@
 protected:
     bool fakeKanaInput;
 };
+}
 
 #endif
diff --git a/scim-wnn/src/preeditor.h b/scim-wnn/src/preeditor.h
index 3762877..18bf82a 100644
--- a/scim-wnn/src/preeditor.h
+++ b/scim-wnn/src/preeditor.h
@@ -51,6 +51,7 @@
 /**
 @author TAM(Teppei Tamra)
 */
+namespace ScimWnn {
 class PreEditorKeyEventList : public KeyEventList
 {
     // �ꥹ�Ȥ˥������٥�Ȥ��ɲä��ơ�comp(KeyEvent)��Ƚ�̡�
@@ -100,5 +101,7 @@
     static map<ucs4_t,WideString> hKanaChars;
 
 };
+}
 
+using namespace ScimWnn;
 #endif
diff --git a/scim-wnn/src/romkan.h b/scim-wnn/src/romkan.h
index e27279d..8ba7e76 100644
--- a/scim-wnn/src/romkan.h
+++ b/scim-wnn/src/romkan.h
@@ -36,6 +36,7 @@
 /**
 @author TAM(Teppei Tamra)
 */
+namespace ScimWnn {
 struct RomkanTableEntry {
     String key;
     WideString kana;
@@ -94,5 +95,5 @@
     String hookp;
     vector<RomkanKeyEventList> hookKey;
 };
-
+}
 #endif
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index 3c6b22f..02ade7c 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -116,7 +116,7 @@
 
 WideString WnnFactory::get_authors () const
 {
-    return utf8_mbstowcs (String (_("(C) 2004 TAM(Teppei Tamra) <tam-t@par.odn.ne.jp>")));
+    return utf8_mbstowcs (String (_("(C)2004-2006 TAM(Teppei Tamra) <tam-t@par.odn.ne.jp>")));
 }
 
 WideString WnnFactory::get_credits () const
diff --git a/scim-wnn/src/wnnconversion.h b/scim-wnn/src/wnnconversion.h
index cd12211..ee40fd7 100644
--- a/scim-wnn/src/wnnconversion.h
+++ b/scim-wnn/src/wnnconversion.h
@@ -44,6 +44,7 @@
 /**
 @author TAM(Teppei Tamra)
 */
+namespace ScimWnn {
 enum JServerType { Wnn4, Wnn6, Wnn7, Wnn8 };
 
 #define DEFAULT 0
@@ -103,5 +104,5 @@
     ResultList convList;
 
 };
-
+}
 #endif