diff --git a/honoka/plugins/anthyconversion.h b/honoka/plugins/anthyconversion.h
index 61ddd66..65f65e0 100644
--- a/honoka/plugins/anthyconversion.h
+++ b/honoka/plugins/anthyconversion.h
@@ -37,6 +37,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class AnthyPrediction;
 class AnthyConversion : public Convertor {
 public:
@@ -72,5 +74,6 @@
 
 };
 
+}
 
 #endif
diff --git a/honoka/plugins/anthyplugin.h b/honoka/plugins/anthyplugin.h
index 6d6c4c4..6ea527f 100644
--- a/honoka/plugins/anthyplugin.h
+++ b/honoka/plugins/anthyplugin.h
@@ -40,6 +40,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class AnthyPlugin;
 
 class AnthyPlugin : public HonokaMultiplePluginBase {
@@ -55,5 +57,5 @@
     AnthyConversion * convertor;
     Predictor * predictor;
 };
-
+}
 #endif
diff --git a/honoka/plugins/anthyprediction.h b/honoka/plugins/anthyprediction.h
index 975a9a2..98d0522 100644
--- a/honoka/plugins/anthyprediction.h
+++ b/honoka/plugins/anthyprediction.h
@@ -38,6 +38,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class AnthyPrediction : public Predictor {
 public:
     AnthyPrediction(ConfigPointer cfg,AnthyConversion *anthy);
@@ -55,5 +57,5 @@
     AnthyConversion *convertor;
 
 };
-
+}
 #endif
diff --git a/honoka/plugins/cannaconversion.h b/honoka/plugins/cannaconversion.h
index 6982e98..88c91e1 100644
--- a/honoka/plugins/cannaconversion.h
+++ b/honoka/plugins/cannaconversion.h
@@ -38,6 +38,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class CannaConversion : public Convertor {
 public:
     CannaConversion(ConfigPointer cfg);
@@ -74,5 +76,5 @@
 
 };
 
-
+}
 #endif
diff --git a/honoka/plugins/kanainput.cpp b/honoka/plugins/kanainput.cpp
index 077f3b8..dd8f4a7 100644
--- a/honoka/plugins/kanainput.cpp
+++ b/honoka/plugins/kanainput.cpp
@@ -40,12 +40,14 @@
 // �ץ饤�����󲽤Τ��ޤ��ʤ��Ǥ���
 HonokaPluginRegister(KanaInput);
 
-struct KanaInputKey {
+namespace Honoka {
+
+struct HonokaKanaInputKey {
     int code;
     const char kana[6];
 };
 
-const KanaInputKey KanaInputTable[] = {
+const HonokaKanaInputKey HonokaKanaInputTable[] = {
     {SCIM_KEY_kana_fullstop,        "��"},
     {SCIM_KEY_kana_openingbracket,  "��"},
     {SCIM_KEY_kana_closingbracket,  "��"},
@@ -116,6 +118,7 @@
     {0,""}
 };
 
+}
 
 KanaInput::KanaInput(ConfigPointer cfg) : PreEditor(cfg)
 {
@@ -169,10 +172,10 @@
         (key.code == SCIM_KEY_Hyper_L) ||
         (key.code == SCIM_KEY_Hyper_R)) return true;
 
-    for(unsigned int i = 0;KanaInputTable[i].code != 0;++ i) {
-        if (key.code == KanaInputTable[i].code) {
+    for(unsigned int i = 0;HonokaKanaInputTable[i].code != 0;++ i) {
+        if (key.code == HonokaKanaInputTable[i].code) {
             WideString w;
-            iconvert.convert(w,String(KanaInputTable[i].kana));
+            iconvert.convert(w,String(HonokaKanaInputTable[i].kana));
             text = text.substr(0,pos) + w + text.substr(pos);
             pos ++;
             return true;
diff --git a/honoka/plugins/kanainput.h b/honoka/plugins/kanainput.h
index 0c2870d..2c99e63 100644
--- a/honoka/plugins/kanainput.h
+++ b/honoka/plugins/kanainput.h
@@ -34,6 +34,8 @@
 /**
 @author TAM(Teppei Tamra)
 */
+namespace Honoka {
+
 class KanaInput : public PreEditor {
 public:
     KanaInput(ConfigPointer cfg);
@@ -48,4 +50,5 @@
     bool fakeKanaInput;
 };
 
+}
 #endif
diff --git a/honoka/plugins/primeprediction.h b/honoka/plugins/primeprediction.h
index e8b377e..a5ce978 100644
--- a/honoka/plugins/primeprediction.h
+++ b/honoka/plugins/primeprediction.h
@@ -40,6 +40,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class PrimePrediction : public Predictor {
 public:
     PrimePrediction(ConfigPointer cfg);
@@ -62,5 +64,5 @@
 protected:
     ResultEntry parser(const String &str);
 };
-
+}
 #endif
diff --git a/honoka/plugins/romkan.h b/honoka/plugins/romkan.h
index acbfdb7..5e1e8a7 100644
--- a/honoka/plugins/romkan.h
+++ b/honoka/plugins/romkan.h
@@ -33,10 +33,11 @@
 
 using namespace std;
 using namespace scim;
-
 /**
 @author TAM(Teppei Tamra)
 */
+namespace Honoka {
+
 struct RomkanTableEntry {
     String key;
     WideString kana;
@@ -114,4 +115,6 @@
     String postfix;
 };
 
+}
+
 #endif
diff --git a/honoka/plugins/simpleprediction.h b/honoka/plugins/simpleprediction.h
index 6139aac..0819356 100644
--- a/honoka/plugins/simpleprediction.h
+++ b/honoka/plugins/simpleprediction.h
@@ -38,6 +38,7 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
 class SimplePrediction : public Predictor {
 public:
     SimplePrediction(ConfigPointer cfg);
@@ -55,5 +56,5 @@
     multimap<WideString,WideString> data;
     int size;
 };
-
+}
 #endif
diff --git a/honoka/plugins/skkdic.h b/honoka/plugins/skkdic.h
index 65ccfa4..1cfb406 100644
--- a/honoka/plugins/skkdic.h
+++ b/honoka/plugins/skkdic.h
@@ -67,5 +67,4 @@
     void init();
     vector<WideString> parser(const WideString data);
 };
-
 #endif
diff --git a/honoka/plugins/skkdicconversion.h b/honoka/plugins/skkdicconversion.h
index 903aebb..cc7ef2d 100644
--- a/honoka/plugins/skkdicconversion.h
+++ b/honoka/plugins/skkdicconversion.h
@@ -38,6 +38,7 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
 class SKKDicConversion : public Convertor {
 public:
     SKKDicConversion(ConfigPointer cfg);
@@ -67,5 +68,5 @@
     int pos;
 
 };
-
+}
 #endif
diff --git a/honoka/plugins/wnnconversion.h b/honoka/plugins/wnnconversion.h
index 2637041..5b1e357 100644
--- a/honoka/plugins/wnnconversion.h
+++ b/honoka/plugins/wnnconversion.h
@@ -45,6 +45,7 @@
 @author TAM(Teppei Tamra)
 */
 
+namespace Honoka {
 
 
 class WnnConversion : public Convertor {
@@ -101,4 +102,5 @@
 
 };
 
+}
 #endif
diff --git a/honoka/plugins/wnnplugin.h b/honoka/plugins/wnnplugin.h
index c793f2f..7e59cc7 100644
--- a/honoka/plugins/wnnplugin.h
+++ b/honoka/plugins/wnnplugin.h
@@ -39,6 +39,8 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
+
 class WnnPlugin;
 
 class WnnPlugin : public HonokaMultiplePluginBase {
@@ -54,5 +56,5 @@
     WnnConversion * convertor;
     WnnPrediction * predictor;
 };
-
+}
 #endif
diff --git a/honoka/plugins/wnnprediction.h b/honoka/plugins/wnnprediction.h
index 9b17f93..0762cd8 100644
--- a/honoka/plugins/wnnprediction.h
+++ b/honoka/plugins/wnnprediction.h
@@ -37,6 +37,7 @@
 /**
 @author TAM (Teppei Tamra)
 */
+namespace Honoka {
 class WnnPrediction : public Predictor {
 public:
     WnnPrediction(ConfigPointer cfg,WnnConversion *wnn);
@@ -54,5 +55,5 @@
     WnnConversion *convertor;
 
 };
-
+}
 #endif