diff --git a/honoka/libhonoka/Makefile.am b/honoka/libhonoka/Makefile.am
index 9bf35cf..2d2e62d 100644
--- a/honoka/libhonoka/Makefile.am
+++ b/honoka/libhonoka/Makefile.am
@@ -25,7 +25,7 @@
 			  -DHONOKA_ICON_FILE=\"@SCIM_ICONDIR@/honoka.png\" \
 			  -DHONOKA_PLUGINDIR=\"@SCIM_MODULEDIR@/honoka\"
 
-noinst_HEADERS = honokatimer.h honokasetupcore.h
+noinst_HEADERS = 
 
 moduledir		= @SCIM_MODULEDIR@/IMEngine
 
diff --git a/honoka/libhonoka/honokapluginbase.h b/honoka/libhonoka/honokapluginbase.h
index 6c2f56b..60e3d40 100644
--- a/honoka/libhonoka/honokapluginbase.h
+++ b/honoka/libhonoka/honokapluginbase.h
@@ -27,13 +27,20 @@
 #include <scim.h>
 #define Uses_SCIM_CONFIG_BASE
 
-#define HONOKA_PLUGIN_VERSION 5
+#define HONOKA_PLUGIN_VERSION 6
 
 using namespace std;
 using namespace scim;
 
 #include <honokasetupcore.h>
 
+#define HONOKA_CONFIG_PLUGINLOADER_PREFIX           "/IMEngine/Honoka/PluginLoader"
+#define HONOKA_CONFIG_KEY_CONVERTOR_PREFIX         "/IMEngine/Honoka/Key/Convertor"
+#define HONOKA_CONFIG_KEY_PREEDITOR_PREFIX         "/IMEngine/Honoka/Key/PreEditor"
+#define HONOKA_CONFIG_KEY_PREDICTOR_PREFIX         "/IMEngine/Honoka/Key/Predictor"
+
+
+
 /**
 @author TAM (Teppei Tamra)
 */
diff --git a/honoka/m4/Makefile b/honoka/m4/Makefile
index 60560a1..bb6ada6 100644
--- a/honoka/m4/Makefile
+++ b/honoka/m4/Makefile
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # m4/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/honoka/m4/Makefile.in b/honoka/m4/Makefile.in
index 5be5390..7645a8f 100644
--- a/honoka/m4/Makefile.in
+++ b/honoka/m4/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/honoka/plugins/anthyplugin.h b/honoka/plugins/anthyplugin.h
index 9720742..b65368f 100644
--- a/honoka/plugins/anthyplugin.h
+++ b/honoka/plugins/anthyplugin.h
@@ -32,7 +32,6 @@
 #include <anthyconversion.h>
 #include <predictor.h>
 #include <anthyprediction.h>
-#include <honoka_plugin_def.h>
 
 using namespace std;
 using namespace scim;
diff --git a/honoka/plugins/cannaconversion.cpp b/honoka/plugins/cannaconversion.cpp
index 8a8c111..48e3df8 100644
--- a/honoka/plugins/cannaconversion.cpp
+++ b/honoka/plugins/cannaconversion.cpp
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "cannaconversion.h"
-#include <honoka_plugin_def.h>
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/cannaconversion.h b/honoka/plugins/cannaconversion.h
index 23bad89..63e8475 100644
--- a/honoka/plugins/cannaconversion.h
+++ b/honoka/plugins/cannaconversion.h
@@ -33,6 +33,13 @@
 #include <convertor.h>
 #include <honokasetupcore.h>
 
+
+#define HONOKA_CONFIG_CANNA_DICHOMEDIRPATH         "/IMEngine/Honoka/Canna/DicHomeDirPath"
+#define HONOKA_DEFAULT_CANNA_DICHOMEDIRPATH        ""
+#define HONOKA_CONFIG_CANNA_SERVER                 "/IMEngine/Honoka/Canna/Server"
+#define HONOKA_DEFAULT_CANNA_SERVER                "localhost"
+
+
 using namespace std;
 using namespace scim;
 
diff --git a/honoka/plugins/honoka_plugin_def.h b/honoka/plugins/honoka_plugin_def.h
index 6ad75e0..1ca2d72 100644
--- a/honoka/plugins/honoka_plugin_def.h
+++ b/honoka/plugins/honoka_plugin_def.h
@@ -20,62 +20,8 @@
 #ifndef HONOKA_PLUGIN_DEF_H
 #define HONOKA_PLUGIN_DEF_H
 
-#include "../src/honoka_def.h"
-// Wnn
-
-#define HONOKA_CONFIG_JSERVERTYPE                  "/IMEngine/Honoka/Wnn/JServerType"
-#ifdef HAVE_LIBWNN7
-  #define HONOKA_DEFAULT_JSERVERTYPE                  "Wnn7"
-#else
-  #define HONOKA_DEFAULT_JSERVERTYPE                  "Wnn4"
-#endif
-
-#define HONOKA_CONFIG_JSERVER                      "/IMEngine/Honoka/Wnn/JServer"
-#define HONOKA_DEFAULT_JSERVER                     "localhost"
-#define HONOKA_CONFIG_WNNENVRC                     "/IMEngine/Honoka/Wnn/Wnnenvrc"
-#define HONOKA_DEFAULT_WNNENVRC                    "/usr/lib/wnn7/ja_JP/wnnenvrc"
-
-#define HONOKA_CONFIG_WNNYOSOKU                     "/IMEngine/Honoka/Wnn/Yosoku"
-#ifdef HAVE_LIBWNN7
-  #define HONOKA_DEFAULT_WNNYOSOKU                   true
-#else
-  #define HONOKA_DEFAULT_WNNYOSOKU                   false
-#endif
-
-
-// Romkan
-
-#define HONOKA_CONFIG_ROMKAN_TABLE_FILE            "/IMEngine/Honoka/Romkan/TableFile"
-#define HONOKA_DEFAULT_ROMKAN_TABLE_FILE           "honoka-def.rkt"
-
-// KanaInput
-#define HONOKA_CONFIG_KANAINPUT_FAKEKANA           "/IMEngine/Honoka/KanaInput/FakeKanaKey"
-#define HONOKA_DEFAULT_KANAINPUT_FAKEKANA          true
-
-// NicolaInput
-#define HONOKA_CONFIG_NICOLAINPUT_LSHIFT           "/IMEngine/Honoka/NicolaInput/LeftShift"
-#define HONOKA_DEFAULT_NICOLAINPUT_LSHIFT          "Muhenkan"
-#define HONOKA_CONFIG_NICOLAINPUT_RSHIFT           "/IMEngine/Honoka/NicolaInput/RightShift"
-#define HONOKA_DEFAULT_NICOLAINPUT_RSHIFT          "Henkan"
-
-// SimplePrediction
-#define HONOKA_CONFIG_SIMPLEPREDICTION_SIZE        "/IMEngine/Honoka/SimplePrediction/Size"
-#define HONOKA_DEFAULT_SIMPLEPREDICTION_SIZE       200
-
-// Canna
-
-#define HONOKA_CONFIG_CANNA_DICHOMEDIRPATH         "/IMEngine/Honoka/Canna/DicHomeDirPath"
-#define HONOKA_DEFAULT_CANNA_DICHOMEDIRPATH        ""
-#define HONOKA_CONFIG_CANNA_SERVER                 "/IMEngine/Honoka/Canna/Server"
-#define HONOKA_DEFAULT_CANNA_SERVER                "localhost"
-
-// SKKDic
-#define HONOKA_CONFIG_SKKDIC_DICFILE    "/IMEngine/Honoka/SKKDic/File"
-#define HONOKA_DEFAULT_SKKDIC_DICFILE    ""
-
-// Prime
-#define HONOKA_CONFIG_PRIME_PREDICTION_LM           "/IMEngine/Honoka/Prime/LookupMethod"
-#define HONOKA_DEFAULT_PRIME_PREDICTION_LM         "lookup_hybrid"
-
+/*
+    �����ˤ��ä��ץ饰��������ϡ������ץ饰����Υإå��˰�ư���ޤ����衩��
+*/
 
 #endif
diff --git a/honoka/plugins/kanainput.cpp b/honoka/plugins/kanainput.cpp
index e4e8d8c..3e16c29 100644
--- a/honoka/plugins/kanainput.cpp
+++ b/honoka/plugins/kanainput.cpp
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "kanainput.h"
-#include "honoka_plugin_def.h"
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/kanainput.h b/honoka/plugins/kanainput.h
index 06b0b16..4682f4a 100644
--- a/honoka/plugins/kanainput.h
+++ b/honoka/plugins/kanainput.h
@@ -29,6 +29,10 @@
 #include "preeditor.h"
 #include <honokasetupcore.h>
 
+#define HONOKA_CONFIG_KANAINPUT_FAKEKANA           "/IMEngine/Honoka/KanaInput/FakeKanaKey"
+#define HONOKA_DEFAULT_KANAINPUT_FAKEKANA          true
+
+
 using namespace std;
 using namespace scim;
 
diff --git a/honoka/plugins/nicolainput.cpp b/honoka/plugins/nicolainput.cpp
index 915b3ac..e9766fb 100644
--- a/honoka/plugins/nicolainput.cpp
+++ b/honoka/plugins/nicolainput.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "nicolainput.h"
-#include "honoka_plugin_def.h"
+
 #include <sys/time.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/honoka/plugins/nicolainput.h b/honoka/plugins/nicolainput.h
index 57987e8..5d94cbf 100644
--- a/honoka/plugins/nicolainput.h
+++ b/honoka/plugins/nicolainput.h
@@ -29,6 +29,12 @@
 #include "preeditor.h"
 #include <honokasetupcore.h>
 
+#define HONOKA_CONFIG_NICOLAINPUT_LSHIFT           "/IMEngine/Honoka/NicolaInput/LeftShift"
+#define HONOKA_DEFAULT_NICOLAINPUT_LSHIFT          "Muhenkan"
+#define HONOKA_CONFIG_NICOLAINPUT_RSHIFT           "/IMEngine/Honoka/NicolaInput/RightShift"
+#define HONOKA_DEFAULT_NICOLAINPUT_RSHIFT          "Henkan"
+
+
 using namespace std;
 using namespace scim;
 
diff --git a/honoka/plugins/primeprediction.cpp b/honoka/plugins/primeprediction.cpp
index 583453e..b5a9ef6 100644
--- a/honoka/plugins/primeprediction.cpp
+++ b/honoka/plugins/primeprediction.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "primeprediction.h"
-#include <honoka_plugin_def.h>
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/primeprediction.h b/honoka/plugins/primeprediction.h
index cfca41c..b61f508 100644
--- a/honoka/plugins/primeprediction.h
+++ b/honoka/plugins/primeprediction.h
@@ -40,6 +40,10 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 
+#define HONOKA_CONFIG_PRIME_PREDICTION_LM           "/IMEngine/Honoka/Prime/LookupMethod"
+#define HONOKA_DEFAULT_PRIME_PREDICTION_LM         "lookup_hybrid"
+
+
 /**
 @author TAM (Teppei Tamra)
 */
diff --git a/honoka/plugins/romkan.cpp b/honoka/plugins/romkan.cpp
index be1831b..a95304e 100644
--- a/honoka/plugins/romkan.cpp
+++ b/honoka/plugins/romkan.cpp
@@ -18,7 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "romkan.h"
-#include "honoka_plugin_def.h"
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/romkan.h b/honoka/plugins/romkan.h
index 2ccacf6..056081e 100644
--- a/honoka/plugins/romkan.h
+++ b/honoka/plugins/romkan.h
@@ -32,6 +32,11 @@
 #include <preeditor.h>
 #include <honokasetupcore.h>
 
+
+#define HONOKA_CONFIG_ROMKAN_TABLE_FILE            "/IMEngine/Honoka/Romkan/TableFile"
+#define HONOKA_DEFAULT_ROMKAN_TABLE_FILE           "honoka-def.rkt"
+
+
 using namespace std;
 using namespace scim;
 /**
diff --git a/honoka/plugins/simpleprediction.cpp b/honoka/plugins/simpleprediction.cpp
index e9b3397..096385d 100644
--- a/honoka/plugins/simpleprediction.cpp
+++ b/honoka/plugins/simpleprediction.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "simpleprediction.h"
-#include <honoka_plugin_def.h>
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/simpleprediction.h b/honoka/plugins/simpleprediction.h
index bb77434..01ee071 100644
--- a/honoka/plugins/simpleprediction.h
+++ b/honoka/plugins/simpleprediction.h
@@ -36,6 +36,10 @@
 #include <scim_iconv.h>
 #include <scim_attribute.h>
 
+#define HONOKA_CONFIG_SIMPLEPREDICTION_SIZE        "/IMEngine/Honoka/SimplePrediction/Size"
+#define HONOKA_DEFAULT_SIMPLEPREDICTION_SIZE       200
+
+
 /**
 @author TAM (Teppei Tamra)
 */
diff --git a/honoka/plugins/skkdicconversion.cpp b/honoka/plugins/skkdicconversion.cpp
index ed4744b..fe58827 100644
--- a/honoka/plugins/skkdicconversion.cpp
+++ b/honoka/plugins/skkdicconversion.cpp
@@ -20,7 +20,6 @@
 
 #include "skkdicconversion.h"
 
-#include <honoka_plugin_def.h>
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
diff --git a/honoka/plugins/skkdicconversion.h b/honoka/plugins/skkdicconversion.h
index a0c8bf2..1614bf8 100644
--- a/honoka/plugins/skkdicconversion.h
+++ b/honoka/plugins/skkdicconversion.h
@@ -33,6 +33,10 @@
 #include <honokasetupcore.h>
 #include <skkdic.h>
 
+#define HONOKA_CONFIG_SKKDIC_DICFILE    "/IMEngine/Honoka/SKKDic/File"
+#define HONOKA_DEFAULT_SKKDIC_DICFILE    ""
+
+
 using namespace std;
 using namespace scim;
 
diff --git a/honoka/plugins/wnnconversion.cpp b/honoka/plugins/wnnconversion.cpp
index 048a4e7..3b4c13f 100644
--- a/honoka/plugins/wnnconversion.cpp
+++ b/honoka/plugins/wnnconversion.cpp
@@ -19,9 +19,6 @@
  ***************************************************************************/
 #include "wnnconversion.h"
 
-
-#include <honoka_plugin_def.h>
-
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
diff --git a/honoka/plugins/wnnconversion.h b/honoka/plugins/wnnconversion.h
index 5b1e357..f1488f1 100644
--- a/honoka/plugins/wnnconversion.h
+++ b/honoka/plugins/wnnconversion.h
@@ -36,6 +36,26 @@
 
 
 
+#define HONOKA_CONFIG_JSERVERTYPE                  "/IMEngine/Honoka/Wnn/JServerType"
+#ifdef HAVE_LIBWNN7
+  #define HONOKA_DEFAULT_JSERVERTYPE                  "Wnn7"
+#else
+  #define HONOKA_DEFAULT_JSERVERTYPE                  "Wnn4"
+#endif
+
+#define HONOKA_CONFIG_JSERVER                      "/IMEngine/Honoka/Wnn/JServer"
+#define HONOKA_DEFAULT_JSERVER                     "localhost"
+#define HONOKA_CONFIG_WNNENVRC                     "/IMEngine/Honoka/Wnn/Wnnenvrc"
+#define HONOKA_DEFAULT_WNNENVRC                    "/usr/lib/wnn7/ja_JP/wnnenvrc"
+
+#define HONOKA_CONFIG_WNNYOSOKU                     "/IMEngine/Honoka/Wnn/Yosoku"
+#ifdef HAVE_LIBWNN7
+  #define HONOKA_DEFAULT_WNNYOSOKU                   true
+#else
+  #define HONOKA_DEFAULT_WNNYOSOKU                   false
+#endif
+
+
 
 using namespace scim;
 using namespace std;
diff --git a/honoka/plugins/wnnplugin.h b/honoka/plugins/wnnplugin.h
index 1948d36..25d2a3e 100644
--- a/honoka/plugins/wnnplugin.h
+++ b/honoka/plugins/wnnplugin.h
@@ -31,7 +31,6 @@
 #include <honokasetupcore.h>
 #include <wnnconversion.h>
 #include <wnnprediction.h>
-#include <honoka_plugin_def.h>
 
 
 using namespace std;
diff --git a/honoka/src/honoka_def.h b/honoka/src/honoka_def.h
index c81b210..db739a3 100644
--- a/honoka/src/honoka_def.h
+++ b/honoka/src/honoka_def.h
@@ -88,10 +88,6 @@
 #define HONOKA_CONFIG_KEY_RESULTTOPREEDIT          "/IMEngine/Honoka/Key/SetResultToPreEditor"
 #define HONOKA_DEFAULT_KEY_RESULTTOPREEDIT         "Control+Return"
 
-#define HONOKA_CONFIG_KEY_CONVERTOR_PREFIX         "/IMEngine/Honoka/Key/Convertor"
-#define HONOKA_CONFIG_KEY_PREEDITOR_PREFIX         "/IMEngine/Honoka/Key/PreEditor"
-#define HONOKA_CONFIG_KEY_PREDICTOR_PREFIX         "/IMEngine/Honoka/Key/Predictor"
-
 
 #define HONOKA_CONFIG_ALP                          "/IMEngine/Honoka/AutoLookupPopup"
 #define HONOKA_DEFAULT_ALP                         3
@@ -109,8 +105,6 @@
 #define HONOKA_CONFIG_ACPREDICTOR_MULTI            "/IMEngine/Honoka/ACPredictor/Multiple"
 #define HONOKA_DEFAULT_ACPREDICTOR_MULTI           true
 
-#define HONOKA_CONFIG_PLUGINLOADER_PREFIX           "/IMEngine/Honoka/PluginLoader"
-
 #define HONOKA_CONFIG_MINISTATUS                   "/IMEngine/Honoka/MiniStatus"
 #define HONOKA_DEFAULT_MINISTATUS                  false
 
diff --git a/honoka/src/honoka_imengine_setup.cpp b/honoka/src/honoka_imengine_setup.cpp
index acf8826..84b54b5 100644
--- a/honoka/src/honoka_imengine_setup.cpp
+++ b/honoka/src/honoka_imengine_setup.cpp
@@ -38,7 +38,6 @@
 #include <scim.h>
 #include <gtk/scimkeyselection.h>
 #include "honoka_def.h"
-#include "../plugins/honoka_plugin_def.h"
 
 #ifdef HAVE_GETTEXT
   #include <libintl.h>
@@ -396,6 +395,7 @@
                 dlclose(plugin);
             }
         }
+        closedir(dir);
     }
     ////
     
diff --git a/honoka/src/honokasetupgtk.cpp b/honoka/src/honokasetupgtk.cpp
index 5dcb187..df9c4ba 100644
--- a/honoka/src/honokasetupgtk.cpp
+++ b/honoka/src/honokasetupgtk.cpp
@@ -26,8 +26,6 @@
 
 #include <scim.h>
 #include <gtk/scimkeyselection.h>
-#include "honoka_def.h"
-#include "../plugins/honoka_plugin_def.h"
 
 #ifdef HAVE_GETTEXT
   #include <libintl.h>