Add PY prefix of all file names to avoid name conflict on some file

system than is case insensitive.

67 files changed, 197 insertions, 196 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9490ee0..d1666fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,73 +42,73 @@ ibus_engine_pinyin_built_h_sources = \
 	SimpTradConverterTable.h \
 	$(NULL)
 ibus_engine_pinyin_c_sources = \
-	BopomofoEditor.cc \
-	BopomofoEngine.cc \
-	Config.cc \
-	Database.cc \
-	DoublePinyinEditor.cc \
-	Editor.cc \
-	Engine.cc \
-	FallbackEditor.cc \
-	FullPinyinEditor.cc \
-	HalfFullConverter.cc \
-	Main.cc \
-	PhoneticEditor.cc \
-	PhraseEditor.cc \
-	PinyinEditor.cc \
-	PinyinEngine.cc \
-	PinyinParser.cc \
-	PinyinProperties.cc \
-	PunctEditor.cc \
-	SimpTradConverter.cc \
-	DynamicSpecialPhrase.cc \
-	SpecialPhrase.cc \
-	SpecialPhraseTable.cc \
+	PYBopomofoEditor.cc \
+	PYBopomofoEngine.cc \
+	PYConfig.cc \
+	PYDatabase.cc \
+	PYDoublePinyinEditor.cc \
+	PYEditor.cc \
+	PYEngine.cc \
+	PYFallbackEditor.cc \
+	PYFullPinyinEditor.cc \
+	PYHalfFullConverter.cc \
+	PYMain.cc \
+	PYPhoneticEditor.cc \
+	PYPhraseEditor.cc \
+	PYPinyinEditor.cc \
+	PYPinyinEngine.cc \
+	PYPinyinParser.cc \
+	PYPinyinProperties.cc \
+	PYPunctEditor.cc \
+	PYSimpTradConverter.cc \
+	PYDynamicSpecialPhrase.cc \
+	PYSpecialPhrase.cc \
+	PYSpecialPhraseTable.cc \
 	$(NULL)
 ibus_engine_pinyin_h_sources = \
-	Bopomofo.h \
-	BopomofoEditor.h \
-	BopomofoEngine.h \
-	Bus.h \
-	Config.h \
-	Database.h \
-	DoublePinyinEditor.h \
-	DoublePinyinTable.h \
-	Editor.h \
-	Engine.h \
-	ExtEditor.h \
-	FallbackEditor.h \
-	FullPinyinEditor.h \
-	HalfFullConverter.h \
-	LookupTable.h \
-	Object.h \
-	PhoneticEditor.h \
-	Phrase.h \
-	PhraseArray.h \
-	PhraseEditor.h \
-	PinyinArray.h \
-	PinyinEditor.h \
-	PinyinEngine.h \
-	PinyinParser.h \
-	PinyinProperties.h \
-	Pointer.h \
-	Property.h \
-	PunctEditor.h \
-	RawEditor.h \
-	Regex.h \
-	Signal.h \
-	SimpTradConverter.h \
-	SpecialPhrase.h \
-	DynamicSpecialPhrase.h \
-	SpecialPhraseTable.h \
-	String.h \
-	Text.h \
-	Types.h \
-	Util.h \
+	PYBopomofo.h \
+	PYBopomofoEditor.h \
+	PYBopomofoEngine.h \
+	PYBus.h \
+	PYConfig.h \
+	PYDatabase.h \
+	PYDoublePinyinEditor.h \
+	PYDoublePinyinTable.h \
+	PYEditor.h \
+	PYEngine.h \
+	PYExtEditor.h \
+	PYFallbackEditor.h \
+	PYFullPinyinEditor.h \
+	PYHalfFullConverter.h \
+	PYLookupTable.h \
+	PYObject.h \
+	PYPhoneticEditor.h \
+	PYPhrase.h \
+	PYPhraseArray.h \
+	PYPhraseEditor.h \
+	PYPinyinArray.h \
+	PYPinyinEditor.h \
+	PYPinyinEngine.h \
+	PYPinyinParser.h \
+	PYPinyinProperties.h \
+	PYPointer.h \
+	PYProperty.h \
+	PYPunctEditor.h \
+	PYRawEditor.h \
+	PYRegex.h \
+	PYSignal.h \
+	PYSimpTradConverter.h \
+	PYSpecialPhrase.h \
+	PYDynamicSpecialPhrase.h \
+	PYSpecialPhraseTable.h \
+	PYString.h \
+	PYText.h \
+	PYTypes.h \
+	PYUtil.h \
 	$(NULL)
 
 if IBUS_BUILD_LUA_EXTENSION
-ibus_engine_pinyin_c_sources += ExtEditor.cc
+ibus_engine_pinyin_c_sources += PYExtEditor.cc
 endif
 
 ibus_engine_pinyin_SOURCES = \
diff --git a/src/Bopomofo.h b/src/PYBopomofo.h
index abd9813..abd9813 100644
--- a/src/Bopomofo.h
+++ b/src/PYBopomofo.h
diff --git a/src/BopomofoEditor.cc b/src/PYBopomofoEditor.cc
index 80441b9..d83086b 100644
--- a/src/BopomofoEditor.cc
+++ b/src/PYBopomofoEditor.cc
@@ -19,13 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "BopomofoEditor.h"
-#include "Config.h"
-#include "PinyinProperties.h"
-#include "SimpTradConverter.h"
+#include "PYBopomofoEditor.h"
+#include "PYConfig.h"
+#include "PYPinyinProperties.h"
+#include "PYSimpTradConverter.h"
 
 namespace PY {
-#include "BopomofoKeyboard.h"
+#include "PYBopomofoKeyboard.h"
 
 const static gchar * bopomofo_select_keys[] = {
     "1234567890",
diff --git a/src/BopomofoEditor.h b/src/PYBopomofoEditor.h
index 0ace665..8ad9784 100644
--- a/src/BopomofoEditor.h
+++ b/src/PYBopomofoEditor.h
@@ -22,7 +22,7 @@
 #ifndef __PY_BOPOMOFO_EDITOR_H_
 #define __PY_BOPOMOFO_EDITOR_H_
 
-#include "PhoneticEditor.h"
+#include "PYPhoneticEditor.h"
 
 namespace PY {
 
diff --git a/src/BopomofoEngine.cc b/src/PYBopomofoEngine.cc
index 71acd13..2e7411e 100644
--- a/src/BopomofoEngine.cc
+++ b/src/PYBopomofoEngine.cc
@@ -19,16 +19,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "BopomofoEngine.h"
+#include "PYBopomofoEngine.h"
 #include <string>
-#include "RawEditor.h"
-#include "PunctEditor.h"
+#include "PYRawEditor.h"
+#include "PYPunctEditor.h"
 #ifdef IBUS_BUILD_LUA_EXTENSION
-#include "ExtEditor.h"
+#include "PYExtEditor.h"
 #endif
-#include "BopomofoEditor.h"
-#include "FallbackEditor.h"
-#include "Config.h"
+#include "PYBopomofoEditor.h"
+#include "PYFallbackEditor.h"
+#include "PYConfig.h"
 
 namespace PY {
 
diff --git a/src/BopomofoEngine.h b/src/PYBopomofoEngine.h
index 06297b8..a99dc83 100644
--- a/src/BopomofoEngine.h
+++ b/src/PYBopomofoEngine.h
@@ -22,8 +22,8 @@
 #ifndef __PY_BOPOMOFO_ENGINE_H_
 #define __PY_BOPOMOFO_ENGINE_H_
 
-#include "Engine.h"
-#include "PinyinProperties.h"
+#include "PYEngine.h"
+#include "PYPinyinProperties.h"
 
 namespace PY {
 
diff --git a/src/BopomofoKeyboard.h b/src/PYBopomofoKeyboard.h
index 148bd3b..f23d6a2 100644
--- a/src/BopomofoKeyboard.h
+++ b/src/PYBopomofoKeyboard.h
@@ -22,7 +22,7 @@
 #ifndef __PY_BOPOMOFO_KEYBOARD_H_
 #define __PY_BOPOMOFO_KEYBOARD_H_
 
-#include "Bopomofo.h"
+#include "PYBopomofo.h"
 
 static const guint8
 bopomofo_keyboard[][41][2] = {
diff --git a/src/Bus.h b/src/PYBus.h
index 4ed9932..1172d25 100644
--- a/src/Bus.h
+++ b/src/PYBus.h
@@ -22,7 +22,7 @@
 #define __PY_BUS_H_
 
 #include <ibus.h>
-#include "Object.h"
+#include "PYObject.h"
 
 namespace PY {
 
diff --git a/src/Config.cc b/src/PYConfig.cc
index 36bc019..09bb44f 100644
--- a/src/Config.cc
+++ b/src/PYConfig.cc
@@ -18,11 +18,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "Config.h"
+#include "PYConfig.h"
 
-#include "Types.h"
-#include "Bus.h"
-#include "DoublePinyinTable.h"
+#include "PYTypes.h"
+#include "PYBus.h"
+#include "PYDoublePinyinTable.h"
 
 namespace PY {
 
diff --git a/src/Config.h b/src/PYConfig.h
index 0d2c4ed..9bbb503 100644
--- a/src/Config.h
+++ b/src/PYConfig.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <boost/scoped_ptr.hpp>
 #include <ibus.h>
-#include "Object.h"
+#include "PYObject.h"
 
 namespace PY {
 
diff --git a/src/Database.cc b/src/PYDatabase.cc
index 7661634..1fd3b86 100644
--- a/src/Database.cc
+++ b/src/PYDatabase.cc
@@ -18,10 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "Database.h"
+#include "PYDatabase.h"
 #include <sqlite3.h>
-#include "Util.h"
-#include "PinyinArray.h"
+#include "PYUtil.h"
+#include "PYPinyinArray.h"
 
 namespace PY {
 
diff --git a/src/Database.h b/src/PYDatabase.h
index d414da2..ab90fcf 100644
--- a/src/Database.h
+++ b/src/PYDatabase.h
@@ -23,9 +23,9 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "String.h"
-#include "Types.h"
-#include "PhraseArray.h"
+#include "PYString.h"
+#include "PYTypes.h"
+#include "PYPhraseArray.h"
 
 typedef struct sqlite3 sqlite3;
 
diff --git a/src/DoublePinyinEditor.cc b/src/PYDoublePinyinEditor.cc
index 3386680..fb775d9 100644
--- a/src/DoublePinyinEditor.cc
+++ b/src/PYDoublePinyinEditor.cc
@@ -18,13 +18,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "DoublePinyinEditor.h"
-#include "Config.h"
+#include "PYDoublePinyinEditor.h"
+#include "PYConfig.h"
 
 namespace PY {
 
 #define DEFINE_DOUBLE_PINYIN_TABLES
-#include "DoublePinyinTable.h"
+#include "PYDoublePinyinTable.h"
 
 /*
  * c in 'a' ... 'z' => id = c - 'a'
diff --git a/src/DoublePinyinEditor.h b/src/PYDoublePinyinEditor.h
index 993ec90..e9ef1e9 100644
--- a/src/DoublePinyinEditor.h
+++ b/src/PYDoublePinyinEditor.h
@@ -21,7 +21,7 @@
 #ifndef __PY_DOUBLE_PINYIN_EDITOR_H_
 #define __PY_DOUBLE_PINYIN_EDITOR_H_
 
-#include "PinyinEditor.h"
+#include "PYPinyinEditor.h"
 
 namespace PY {
 
diff --git a/src/DoublePinyinTable.h b/src/PYDoublePinyinTable.h
index ee4a404..ee4a404 100644
--- a/src/DoublePinyinTable.h
+++ b/src/PYDoublePinyinTable.h
diff --git a/src/DynamicSpecialPhrase.cc b/src/PYDynamicSpecialPhrase.cc
index 02c2fcb..2b65258 100644
--- a/src/DynamicSpecialPhrase.cc
+++ b/src/PYDynamicSpecialPhrase.cc
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "DynamicSpecialPhrase.h"
+#include "PYDynamicSpecialPhrase.h"
 
 namespace PY {
 
diff --git a/src/DynamicSpecialPhrase.h b/src/PYDynamicSpecialPhrase.h
index dbe97fd..f259a97 100644
--- a/src/DynamicSpecialPhrase.h
+++ b/src/PYDynamicSpecialPhrase.h
@@ -24,7 +24,7 @@
 #include <ctime>
 #include <string>
 #include <glib.h>
-#include "SpecialPhrase.h"
+#include "PYSpecialPhrase.h"
 
 namespace PY {
 
diff --git a/src/Editor.cc b/src/PYEditor.cc
index 957e603..47c3a6e 100644
--- a/src/Editor.cc
+++ b/src/PYEditor.cc
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "Text.h"
-#include "Editor.h"
+#include "PYText.h"
+#include "PYEditor.h"
 
 namespace PY {
 
diff --git a/src/Editor.h b/src/PYEditor.h
index d0db6b5..e520d51 100644
--- a/src/Editor.h
+++ b/src/PYEditor.h
@@ -23,9 +23,9 @@
 
 #include <glib.h>
 #include <boost/shared_ptr.hpp>
-#include "Signal.h"
-#include "String.h"
-#include "Util.h"
+#include "PYSignal.h"
+#include "PYString.h"
+#include "PYUtil.h"
 
 namespace PY {
 
diff --git a/src/Engine.cc b/src/PYEngine.cc
index 2dd1d17..1797e24 100644
--- a/src/Engine.cc
+++ b/src/PYEngine.cc
@@ -19,9 +19,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Engine.h"
-#include "PinyinEngine.h"
-#include "BopomofoEngine.h"
+#include "PYEngine.h"
+#include "PYPinyinEngine.h"
+#include "PYBopomofoEngine.h"
 
 namespace PY {
 /* code of engine class of GObject */
diff --git a/src/Engine.h b/src/PYEngine.h
index 297acaf..50113e6 100644
--- a/src/Engine.h
+++ b/src/PYEngine.h
@@ -23,10 +23,10 @@
 
 #include <ibus.h>
 
-#include "Pointer.h"
-#include "LookupTable.h"
-#include "Property.h"
-#include "Editor.h"
+#include "PYPointer.h"
+#include "PYLookupTable.h"
+#include "PYProperty.h"
+#include "PYEditor.h"
 
 namespace PY {
 
diff --git a/src/ExtEditor.cc b/src/PYExtEditor.cc
index 826fdf7..d81d9b8 100644
--- a/src/ExtEditor.cc
+++ b/src/PYExtEditor.cc
@@ -25,14 +25,14 @@ extern "C" {
 #include "lua-plugin.h"
 }
 
-#include "Config.h"
-#include "Pointer.h"
-#include "LookupTable.h"
+#include "PYConfig.h"
+#include "PYPointer.h"
+#include "PYLookupTable.h"
 
-#include "DynamicSpecialPhrase.h"
+#include "PYDynamicSpecialPhrase.h"
 
-#include "Editor.h"
-#include "ExtEditor.h"
+#include "PYEditor.h"
+#include "PYExtEditor.h"
 
 namespace PY {
 
diff --git a/src/ExtEditor.h b/src/PYExtEditor.h
index 1b8ee07..1b8ee07 100644
--- a/src/ExtEditor.h
+++ b/src/PYExtEditor.h
diff --git a/src/FallbackEditor.cc b/src/PYFallbackEditor.cc
index 0d85780..dea4ea9 100644
--- a/src/FallbackEditor.cc
+++ b/src/PYFallbackEditor.cc
@@ -18,9 +18,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "FallbackEditor.h"
-#include "HalfFullConverter.h"
-#include "PinyinProperties.h"
+#include "PYFallbackEditor.h"
+#include "PYHalfFullConverter.h"
+#include "PYPinyinProperties.h"
 
 namespace PY {
 
diff --git a/src/FallbackEditor.h b/src/PYFallbackEditor.h
index 74452ba..db8077e 100644
--- a/src/FallbackEditor.h
+++ b/src/PYFallbackEditor.h
@@ -21,8 +21,8 @@
 #ifndef __PY_FALLBACK_EDITOR_
 #define __PY_FALLBACK_EDITOR_
 
-#include "Text.h"
-#include "Editor.h"
+#include "PYText.h"
+#include "PYEditor.h"
 
 namespace PY {
 
diff --git a/src/FullPinyinEditor.cc b/src/PYFullPinyinEditor.cc
index 1d7e29e..4530395 100644
--- a/src/FullPinyinEditor.cc
+++ b/src/PYFullPinyinEditor.cc
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "FullPinyinEditor.h"
-#include "Config.h"
+#include "PYFullPinyinEditor.h"
+#include "PYConfig.h"
 
 namespace PY {
 
diff --git a/src/FullPinyinEditor.h b/src/PYFullPinyinEditor.h
index f415a9f..aba2077 100644
--- a/src/FullPinyinEditor.h
+++ b/src/PYFullPinyinEditor.h
@@ -21,7 +21,7 @@
 #ifndef __PY_FULL_PINYIN_EDITOR_H_
 #define __PY_FULL_PINYIN_EDITOR_H_
 
-#include "PinyinEditor.h"
+#include "PYPinyinEditor.h"
 
 namespace PY {
 
diff --git a/src/HalfFullConverter.cc b/src/PYHalfFullConverter.cc
index 6b33ca0..3513d94 100644
--- a/src/HalfFullConverter.cc
+++ b/src/PYHalfFullConverter.cc
@@ -19,7 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "HalfFullConverter.h"
+#include "PYHalfFullConverter.h"
 
 namespace PY {
 
diff --git a/src/HalfFullConverter.h b/src/PYHalfFullConverter.h
index 4ec0ee7..4ec0ee7 100644
--- a/src/HalfFullConverter.h
+++ b/src/PYHalfFullConverter.h
diff --git a/src/LookupTable.h b/src/PYLookupTable.h
index d62b978..d3db85f 100644
--- a/src/LookupTable.h
+++ b/src/PYLookupTable.h
@@ -22,8 +22,8 @@
 #define __PY_LOOKUP_TABLE_H_
 
 #include <ibus.h>
-#include "Object.h"
-#include "Text.h"
+#include "PYObject.h"
+#include "PYText.h"
 
 namespace PY {
 
diff --git a/src/Main.cc b/src/PYMain.cc
index e431cfc..463ec2f 100644
--- a/src/Main.cc
+++ b/src/PYMain.cc
@@ -25,11 +25,11 @@
 #include <ibus.h>
 #include <stdlib.h>
 #include <locale.h>
-#include "Engine.h"
-#include "Pointer.h"
-#include "Bus.h"
-#include "Config.h"
-#include "Database.h"
+#include "PYEngine.h"
+#include "PYPointer.h"
+#include "PYBus.h"
+#include "PYConfig.h"
+#include "PYDatabase.h"
 
 using namespace PY;
 
diff --git a/src/Object.h b/src/PYObject.h
index a30ac9c..5703f8e 100644
--- a/src/Object.h
+++ b/src/PYObject.h
@@ -22,7 +22,7 @@
 #define __PY_OBJECT_H_
 
 #include <glib-object.h>
-#include "Pointer.h"
+#include "PYPointer.h"
 
 namespace PY {
 
diff --git a/src/PhoneticEditor.cc b/src/PYPhoneticEditor.cc
index f38ea76..44e0004 100644
--- a/src/PhoneticEditor.cc
+++ b/src/PYPhoneticEditor.cc
@@ -18,10 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "PhoneticEditor.h"
-#include "Config.h"
-#include "PinyinProperties.h"
-#include "SimpTradConverter.h"
+#include "PYPhoneticEditor.h"
+#include "PYConfig.h"
+#include "PYPinyinProperties.h"
+#include "PYSimpTradConverter.h"
 
 namespace PY {
 
diff --git a/src/PhoneticEditor.h b/src/PYPhoneticEditor.h
index 9589cfa..7ff07d9 100644
--- a/src/PhoneticEditor.h
+++ b/src/PYPhoneticEditor.h
@@ -21,11 +21,11 @@
 #ifndef __PY_PHONETIC_EDITOR_H_
 #define __PY_PHONETIC_EDITOR_H_
 
-#include "LookupTable.h"
-#include "Editor.h"
-#include "PinyinParser.h"
-#include "PhraseEditor.h"
-#include "SpecialPhraseTable.h"
+#include "PYLookupTable.h"
+#include "PYEditor.h"
+#include "PYPinyinParser.h"
+#include "PYPhraseEditor.h"
+#include "PYSpecialPhraseTable.h"
 
 namespace PY {
 
diff --git a/src/Phrase.h b/src/PYPhrase.h
index 45a43e1..d97aa68 100644
--- a/src/Phrase.h
+++ b/src/PYPhrase.h
@@ -22,7 +22,7 @@
 #define __PY_PHRASE_H_
 
 #include <cstring>
-#include "Types.h"
+#include "PYTypes.h"
 
 namespace PY {
 
diff --git a/src/PhraseArray.h b/src/PYPhraseArray.h
index a7111f1..b01d2d3 100644
--- a/src/PhraseArray.h
+++ b/src/PYPhraseArray.h
@@ -22,7 +22,7 @@
 #define __PY_PHRASE_ARRAY_H_
 
 #include <vector>
-#include "Phrase.h"
+#include "PYPhrase.h"
 
 namespace PY {
 
diff --git a/src/PhraseEditor.cc b/src/PYPhraseEditor.cc
index 472a83c..45da5e4 100644
--- a/src/PhraseEditor.cc
+++ b/src/PYPhraseEditor.cc
@@ -18,11 +18,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "PhraseEditor.h"
-#include "Config.h"
-#include "Database.h"
-#include "PinyinProperties.h"
-#include "SimpTradConverter.h"
+#include "PYPhraseEditor.h"
+#include "PYConfig.h"
+#include "PYDatabase.h"
+#include "PYPinyinProperties.h"
+#include "PYSimpTradConverter.h"
 
 namespace PY {
 
diff --git a/src/PhraseEditor.h b/src/PYPhraseEditor.h
index ed2ddfe..87758c0 100644
--- a/src/PhraseEditor.h
+++ b/src/PYPhraseEditor.h
@@ -22,9 +22,9 @@
 #define __PY_PHRASE_EDITOR_H_
 
 #include <boost/shared_ptr.hpp>
-#include "String.h"
-#include "PhraseArray.h"
-#include "PinyinArray.h"
+#include "PYString.h"
+#include "PYPhraseArray.h"
+#include "PYPinyinArray.h"
 
 #define FILL_GRAN (12)
 
diff --git a/src/PinyinArray.h b/src/PYPinyinArray.h
index 2377ae6..e48f17c 100644
--- a/src/PinyinArray.h
+++ b/src/PYPinyinArray.h
@@ -22,7 +22,7 @@
 #define __PY_PINYIN_ARRAY_H_
 
 #include <vector>
-#include "Types.h"
+#include "PYTypes.h"
 
 namespace PY {
 
diff --git a/src/PinyinEditor.cc b/src/PYPinyinEditor.cc
index 1fe0498..5200113 100644
--- a/src/PinyinEditor.cc
+++ b/src/PYPinyinEditor.cc
@@ -18,11 +18,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "PinyinEditor.h"
-#include "Config.h"
-#include "PinyinProperties.h"
-#include "SimpTradConverter.h"
-#include "HalfFullConverter.h"
+#include "PYPinyinEditor.h"
+#include "PYConfig.h"
+#include "PYPinyinProperties.h"
+#include "PYSimpTradConverter.h"
+#include "PYHalfFullConverter.h"
 
 namespace PY {
 
diff --git a/src/PinyinEditor.h b/src/PYPinyinEditor.h
index cf62ae4..9e83228 100644
--- a/src/PinyinEditor.h
+++ b/src/PYPinyinEditor.h
@@ -21,7 +21,7 @@
 #ifndef __PY_PINYIN_EDITOR_H_
 #define __PY_PINYIN_EDITOR_H_
 
-#include "PhoneticEditor.h"
+#include "PYPhoneticEditor.h"
 
 namespace PY {
 
diff --git a/src/PinyinEngine.cc b/src/PYPinyinEngine.cc
index 17199b9..1625bc5 100644
--- a/src/PinyinEngine.cc
+++ b/src/PYPinyinEngine.cc
@@ -18,17 +18,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "PinyinEngine.h"
+#include "PYPinyinEngine.h"
 #include <string>
-#include "Config.h"
-#include "PunctEditor.h"
-#include "RawEditor.h"
+#include "PYConfig.h"
+#include "PYPunctEditor.h"
+#include "PYRawEditor.h"
 #ifdef IBUS_BUILD_LUA_EXTENSION
-#include "ExtEditor.h"
+#include "PYExtEditor.h"
 #endif
-#include "FullPinyinEditor.h"
-#include "DoublePinyinEditor.h"
-#include "FallbackEditor.h"
+#include "PYFullPinyinEditor.h"
+#include "PYDoublePinyinEditor.h"
+#include "PYFallbackEditor.h"
 
 namespace PY {
 
diff --git a/src/PinyinEngine.h b/src/PYPinyinEngine.h
index 96bf731..4e98256 100644
--- a/src/PinyinEngine.h
+++ b/src/PYPinyinEngine.h
@@ -21,8 +21,8 @@
 #ifndef __PY_PINYIN_ENGINE_H_
 #define __PY_PINYIN_ENGINE_H_
 
-#include "Engine.h"
-#include "PinyinProperties.h"
+#include "PYEngine.h"
+#include "PYPinyinProperties.h"
 
 namespace PY {
 
diff --git a/src/PinyinParser.cc b/src/PYPinyinParser.cc
index 2c16ec0..5114606 100644
--- a/src/PinyinParser.cc
+++ b/src/PYPinyinParser.cc
@@ -21,12 +21,12 @@
 
 #include <cstring>
 #include <cstdlib>
-#include "PinyinParser.h"
+#include "PYPinyinParser.h"
 
 namespace PY {
 
-#include "Bopomofo.h"
-#include "PinyinParserTable.h"
+#include "PYBopomofo.h"
+#include "PYPinyinParserTable.h"
 
 static gboolean
 check_flags (const Pinyin *pinyin, guint option)
diff --git a/src/PinyinParser.h b/src/PYPinyinParser.h
index b948197..702d87a 100644
--- a/src/PinyinParser.h
+++ b/src/PYPinyinParser.h
@@ -22,8 +22,8 @@
 #define __PY_PARSER_H_
 
 #include <glib.h>
-#include "String.h"
-#include "PinyinArray.h"
+#include "PYString.h"
+#include "PYPinyinArray.h"
 
 namespace PY {
 
diff --git a/src/PinyinParserTable.h b/src/PYPinyinParserTable.h
index 89487d1..89487d1 100644
--- a/src/PinyinParserTable.h
+++ b/src/PYPinyinParserTable.h
diff --git a/src/PinyinProperties.cc b/src/PYPinyinProperties.cc
index f4e4b0e..3461c35 100644
--- a/src/PinyinProperties.cc
+++ b/src/PYPinyinProperties.cc
@@ -18,10 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "PinyinProperties.h"
+#include "PYPinyinProperties.h"
 #include <libintl.h>
-#include "Text.h"
-#include "Config.h"
+#include "PYText.h"
+#include "PYConfig.h"
 
 namespace PY {
 
diff --git a/src/PinyinProperties.h b/src/PYPinyinProperties.h
index 68fcd6b..b21fcb5 100644
--- a/src/PinyinProperties.h
+++ b/src/PYPinyinProperties.h
@@ -21,8 +21,8 @@
 #ifndef __PY_PINYIN_PROPERTIES_H_
 #define __PY_PINYIN_PROPERTIES_H_
 
-#include "Signal.h"
-#include "Property.h"
+#include "PYSignal.h"
+#include "PYProperty.h"
 
 namespace PY {
 
diff --git a/src/Pointer.h b/src/PYPointer.h
index 1a48b97..1a48b97 100644
--- a/src/Pointer.h
+++ b/src/PYPointer.h
diff --git a/src/Property.h b/src/PYProperty.h
index 09429c4..801e856 100644
--- a/src/Property.h
+++ b/src/PYProperty.h
@@ -22,8 +22,8 @@
 #define __PY_PROPERTY_H_
 
 #include <ibus.h>
-#include "Object.h"
-#include "Text.h"
+#include "PYObject.h"
+#include "PYText.h"
 
 namespace PY {
 
diff --git a/src/PunctEditor.cc b/src/PYPunctEditor.cc
index f4b6a2e..091d639 100644
--- a/src/PunctEditor.cc
+++ b/src/PYPunctEditor.cc
@@ -19,12 +19,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "Config.h"
-#include "PunctEditor.h"
+#include "PYConfig.h"
+#include "PYPunctEditor.h"
 
 namespace PY {
 
-#include "PunctTable.h"
+#include "PYPunctTable.h"
 
 PunctEditor::PunctEditor (PinyinProperties & props, Config & config)
     : Editor (props, config),
diff --git a/src/PunctEditor.h b/src/PYPunctEditor.h
index 80b9ad8..0035813 100644
--- a/src/PunctEditor.h
+++ b/src/PYPunctEditor.h
@@ -22,8 +22,8 @@
 #ifndef __PY_PUNCT_EDITOR_
 #define __PY_PUNCT_EDITOR_
 
-#include "LookupTable.h"
-#include "Editor.h"
+#include "PYLookupTable.h"
+#include "PYEditor.h"
 
 namespace PY {
 
diff --git a/src/PunctTable.h b/src/PYPunctTable.h
index d620224..d620224 100644
--- a/src/PunctTable.h
+++ b/src/PYPunctTable.h
diff --git a/src/RawEditor.h b/src/PYRawEditor.h
index 2b55cbe..0257142 100644
--- a/src/RawEditor.h
+++ b/src/PYRawEditor.h
@@ -21,7 +21,7 @@
 #ifndef __PY_RAW_EDITOR_
 #define __PY_RAW_EDITOR_
 
-#include "Editor.h"
+#include "PYEditor.h"
 
 namespace PY {
 
diff --git a/src/Regex.h b/src/PYRegex.h
index fab6fa0..fab6fa0 100644
--- a/src/Regex.h
+++ b/src/PYRegex.h
diff --git a/src/Signal.h b/src/PYSignal.h
index 7454039..6721493 100644
--- a/src/Signal.h
+++ b/src/PYSignal.h
@@ -21,8 +21,9 @@
 #ifndef __PY_SIGNAL_H_
 #define __PY_SIGNAL_H_
 
+
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #ifdef HAVE_BOOST_SIGNALS2_HPP
diff --git a/src/SimpTradConverter.cc b/src/PYSimpTradConverter.cc
index e2dc1b3..4ea6c0a 100644
--- a/src/SimpTradConverter.cc
+++ b/src/PYSimpTradConverter.cc
@@ -23,7 +23,7 @@
 #  include "config.h"
 #endif
 
-#include "SimpTradConverter.h"
+#include "PYSimpTradConverter.h"
 
 #ifdef HAVE_OPENCC
 #  include <opencc.h>
@@ -32,8 +32,8 @@
 #  include <cstdlib>
 #endif
 
-#include "Types.h"
-#include "String.h"
+#include "PYTypes.h"
+#include "PYString.h"
 
 namespace PY {
 
@@ -119,7 +119,7 @@ static gint _cmp (gconstpointer p1, gconstpointer p2)
     return _xcmp (pp[0], pp[1], s2[0]);
 }
 
-#include "SimpTradConverterTable.h"
+#include "PYSimpTradConverterTable.h"
 
 void
 SimpTradConverter::simpToTrad (const gchar *in, String &out)
diff --git a/src/SimpTradConverter.h b/src/PYSimpTradConverter.h
index 43b113f..43b113f 100644
--- a/src/SimpTradConverter.h
+++ b/src/PYSimpTradConverter.h
diff --git a/src/SimpTradConverterTable.h b/src/PYSimpTradConverterTable.h
index 63d88ff..63d88ff 100644
--- a/src/SimpTradConverterTable.h
+++ b/src/PYSimpTradConverterTable.h
diff --git a/src/SpecialPhrase.cc b/src/PYSpecialPhrase.cc
index 65f65b6..879964a 100644
--- a/src/SpecialPhrase.cc
+++ b/src/PYSpecialPhrase.cc
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "SpecialPhrase.h"
+#include "PYSpecialPhrase.h"
 
 namespace PY {
 
diff --git a/src/SpecialPhrase.h b/src/PYSpecialPhrase.h
index a5463f5..a5463f5 100644
--- a/src/SpecialPhrase.h
+++ b/src/PYSpecialPhrase.h
diff --git a/src/SpecialPhraseTable.cc b/src/PYSpecialPhraseTable.cc
index 7e6b6e4..7790798 100644
--- a/src/SpecialPhraseTable.cc
+++ b/src/PYSpecialPhraseTable.cc
@@ -18,10 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include "SpecialPhraseTable.h"
+#include "PYSpecialPhraseTable.h"
 #include <fstream>
-#include "DynamicSpecialPhrase.h"
-#include "SpecialPhrase.h"
+#include "PYDynamicSpecialPhrase.h"
+#include "PYSpecialPhrase.h"
 
 namespace PY {
 
diff --git a/src/SpecialPhraseTable.h b/src/PYSpecialPhraseTable.h
index ff920b7..ff920b7 100644
--- a/src/SpecialPhraseTable.h
+++ b/src/PYSpecialPhraseTable.h
diff --git a/src/String.h b/src/PYString.h
index 2e140bb..2e140bb 100644
--- a/src/String.h
+++ b/src/PYString.h
diff --git a/src/Text.h b/src/PYText.h
index f286eb1..5042c31 100644
--- a/src/Text.h
+++ b/src/PYText.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <ibus.h>
-#include "Object.h"
+#include "PYObject.h"
 
 namespace PY {
 
diff --git a/src/Types.h b/src/PYTypes.h
index c8919ad..c8919ad 100644
--- a/src/Types.h
+++ b/src/PYTypes.h
diff --git a/src/Util.h b/src/PYUtil.h
index bb3a712..1e22089 100644
--- a/src/Util.h
+++ b/src/PYUtil.h
@@ -22,7 +22,7 @@
 #define __PY_UTIL_H_
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #if defined(HAVE_UUID_CREATE)