Removes PyZy prefix from filename.

BUG=None
TEST=Manual

Review URL: https://codereview.appspot.com/6307059

44 files changed, 156 insertions, 136 deletions

diff --git a/configure.ac b/configure.ac
index 97dbb1f..3e42f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ m4_define([pyzy_released], [1])
 
 m4_define([pyzy_major_version], [0])
 m4_define([pyzy_minor_version], [0])
-m4_define([pyzy_micro_version], [7])
+m4_define([pyzy_micro_version], [8])
 m4_define([pyzy_interface_age], [0])
 m4_define([pyzy_binary_age],
           [m4_eval(100 * pyzy_minor_version + pyzy_micro_version)])
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index 081bbb9..97860a5 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -574,9 +574,9 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/src/PyZyConst.h \
-                         @top_srcdir@/src/PyZyInputContext.h \
-                         @top_srcdir@/src/PyZyVariant.h	
+INPUT                  = @top_srcdir@/src/Const.h \
+                         @top_srcdir@/src/InputContext.h \
+                         @top_srcdir@/src/Variant.h
                          
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/src/PyZyBopomofo.h b/src/Bopomofo.h
index c376796..c376796 100644
--- a/src/PyZyBopomofo.h
+++ b/src/Bopomofo.h
diff --git a/src/PyZyBopomofoContext.cc b/src/BopomofoContext.cc
index d1fa762..0b8ff34 100644
--- a/src/PyZyBopomofoContext.cc
+++ b/src/BopomofoContext.cc
@@ -20,13 +20,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyBopomofoContext.h"
-#include "PyZyConfig.h"
-#include "PyZySimpTradConverter.h"
-#include "PyZyPinyinParser.h"
+#include "BopomofoContext.h"
+
+#include "Config.h"
+#include "PinyinParser.h"
+#include "SimpTradConverter.h"
 
 namespace PyZy {
-#include "PyZyBopomofoKeyboard.h"
+#include "BopomofoKeyboard.h"
 
 const static char * bopomofo_select_keys[] = {
     "1234567890",
diff --git a/src/PyZyBopomofoContext.h b/src/BopomofoContext.h
index e329375..a6c3767 100644
--- a/src/PyZyBopomofoContext.h
+++ b/src/BopomofoContext.h
@@ -23,7 +23,7 @@
 #ifndef __PYZY_BOPOMOFO_CONTEXT_H_
 #define __PYZY_BOPOMOFO_CONTEXT_H_
 
-#include "PyZyPhoneticContext.h"
+#include "PhoneticContext.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyBopomofoKeyboard.h b/src/BopomofoKeyboard.h
index 3384ba6..99e2afd 100644
--- a/src/PyZyBopomofoKeyboard.h
+++ b/src/BopomofoKeyboard.h
@@ -23,7 +23,7 @@
 #ifndef __PYZY_BOPOMOFO_KEYBOARD_H_
 #define __PYZY_BOPOMOFO_KEYBOARD_H_
 
-#include "PyZyBopomofo.h"
+#include "Bopomofo.h"
 
 static const unsigned char
 bopomofo_keyboard[][41][2] = {
diff --git a/src/PyZyConfig.h b/src/Config.h
index faffefc..3738a5c 100644
--- a/src/PyZyConfig.h
+++ b/src/Config.h
@@ -22,7 +22,7 @@
 #ifndef __PYZY_CONFIG_H_
 #define __PYZY_CONFIG_H_
 
-#include "PyZyConst.h"
+#include "Const.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyConst.h b/src/Const.h
index d8fb3cc..d8fb3cc 100644
--- a/src/PyZyConst.h
+++ b/src/Const.h
diff --git a/src/PyZyDatabase.cc b/src/Database.cc
index c9769b2..436ca09 100644
--- a/src/PyZyDatabase.cc
+++ b/src/Database.cc
@@ -19,13 +19,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyDatabase.h"
+#include "Database.h"
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <sqlite3.h>
-#include "PyZyConfig.h"
-#include "PyZyUtil.h"
-#include "PyZyPinyinArray.h"
+
+#include "Config.h"
+#include "PinyinArray.h"
+#include "Util.h"
+
 
 namespace PyZy {
 
diff --git a/src/PyZyDatabase.h b/src/Database.h
index 68984e0..95d7841 100644
--- a/src/PyZyDatabase.h
+++ b/src/Database.h
@@ -22,10 +22,10 @@
 #ifndef __PYZY_DATABASE_H_
 #define __PYZY_DATABASE_H_
 
-#include "PyZyUtil.h"
-#include "PyZyString.h"
-#include "PyZyTypes.h"
-#include "PyZyPhraseArray.h"
+#include "PhraseArray.h"
+#include "String.h"
+#include "Types.h"
+#include "Util.h"
 
 typedef struct sqlite3 sqlite3;
 
diff --git a/src/PyZyDoublePinyinContext.cc b/src/DoublePinyinContext.cc
index 7a7372a..662a5bb 100644
--- a/src/PyZyDoublePinyinContext.cc
+++ b/src/DoublePinyinContext.cc
@@ -19,14 +19,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyDoublePinyinContext.h"
-#include "PyZyConfig.h"
-#include "PyZyPinyinParser.h"
+#include "DoublePinyinContext.h"
+
+#include "Config.h"
+#include "PinyinParser.h"
 
 namespace PyZy {
 
 #define DEFINE_DOUBLE_PINYIN_TABLES
-#include "PyZyDoublePinyinTable.h"
+#include "DoublePinyinTable.h"
 
 /*
  * c in 'a' ... 'z' => id = c - 'a'
diff --git a/src/PyZyDoublePinyinContext.h b/src/DoublePinyinContext.h
index b6871ad..9a8d00b 100644
--- a/src/PyZyDoublePinyinContext.h
+++ b/src/DoublePinyinContext.h
@@ -22,7 +22,7 @@
 #ifndef __PYZY_DOUBLE_PINYIN_CONTEXT_H_
 #define __PYZY_DOUBLE_PINYIN_CONTEXT_H_
 
-#include "PyZyPinyinContext.h"
+#include "PinyinContext.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyDoublePinyinTable.h b/src/DoublePinyinTable.h
index 68081ba..68081ba 100644
--- a/src/PyZyDoublePinyinTable.h
+++ b/src/DoublePinyinTable.h
diff --git a/src/PyZyDynamicSpecialPhrase.cc b/src/DynamicSpecialPhrase.cc
index e4558e8..bced460 100644
--- a/src/PyZyDynamicSpecialPhrase.cc
+++ b/src/DynamicSpecialPhrase.cc
@@ -19,8 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+#include "DynamicSpecialPhrase.h"
+
 #include <glib.h>
-#include "PyZyDynamicSpecialPhrase.h"
 
 namespace PyZy {
 
@@ -205,4 +206,3 @@ DynamicSpecialPhrase::variable (const std::string &name)
 }
 
 };  // namespace PyZy
-
diff --git a/src/PyZyDynamicSpecialPhrase.h b/src/DynamicSpecialPhrase.h
index 2d84218..0b8e06f 100644
--- a/src/PyZyDynamicSpecialPhrase.h
+++ b/src/DynamicSpecialPhrase.h
@@ -24,7 +24,8 @@
 
 #include <ctime>
 #include <string>
-#include "PyZySpecialPhrase.h"
+
+#include "SpecialPhrase.h"
 
 namespace PyZy {
 
@@ -54,4 +55,3 @@ private:
 };  // namespace PyZy
 
 #endif  // __PYZY_DYNAMIC_SPECIAL_PHRASE_H_
-
diff --git a/src/PyZyFullPinyinContext.cc b/src/FullPinyinContext.cc
index 06ddd80..e233cc0 100644
--- a/src/PyZyFullPinyinContext.cc
+++ b/src/FullPinyinContext.cc
@@ -19,10 +19,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+#include "FullPinyinContext.h"
+
 #include <cctype>
-#include "PyZyFullPinyinContext.h"
-#include "PyZyConfig.h"
-#include "PyZyPinyinParser.h"
+
+#include "Config.h"
+#include "PinyinParser.h"
 
 
 namespace PyZy {
diff --git a/src/PyZyFullPinyinContext.h b/src/FullPinyinContext.h
index e2e9649..1abe7d1 100644
--- a/src/PyZyFullPinyinContext.h
+++ b/src/FullPinyinContext.h
@@ -22,7 +22,7 @@
 #ifndef __PYZY_FULL_PINYIN_CONTEXT_H_
 #define __PYZY_FULL_PINYIN_CONTEXT_H_
 
-#include "PyZyPinyinContext.h"
+#include "PinyinContext.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyInputContext.cc b/src/InputContext.cc
index 3da5cb2..d855cb4 100644
--- a/src/PyZyInputContext.cc
+++ b/src/InputContext.cc
@@ -19,15 +19,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyPhoneticContext.h"
+#include "PhoneticContext.h"
 
 #include <glib.h>
 #include <string>
 
-#include "PyZyBopomofoContext.h"
-#include "PyZyDatabase.h"
-#include "PyZyDoublePinyinContext.h"
-#include "PyZyFullPinyinContext.h"
+#include "BopomofoContext.h"
+#include "Database.h"
+#include "DoublePinyinContext.h"
+#include "FullPinyinContext.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyInputContext.h b/src/InputContext.h
index 2043cc4..325c8d6 100644
--- a/src/PyZyInputContext.h
+++ b/src/InputContext.h
@@ -176,7 +176,7 @@ public:
     enum PropertyName {
         /**
          * Conversion option
-         * @see PyZyConst.h
+         * @see Const.h
          *
          * Default value is PINYIN_INCORRECT_PINYIN | PINYIN_CORRECT_ALL |
          * PYZY_FUZZY_ALL
@@ -184,14 +184,14 @@ public:
         PROPERTY_CONVERSION_OPTION,
         /**
          * \brief Double pinyin schema
-         * @see PyZyConst.h
+         * @see Const.h
          *
          * Default value is DOUBLE_PINYIN_KEYBOARD_MSPY.
          */
         PROPERTY_DOUBLE_PINYIN_SCHEMA,
         /**
          * \brief Bopomofo schema
-         * @see PyZyConst.h
+         * @see Const.h
          *
          * Default value is BOPOMOFO_KEYBOARD_STANDARD.
          */
diff --git a/src/Makefile.am b/src/Makefile.am
index 29d5860..23ad8be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,11 +35,11 @@
 
 libpyzy=libpyzy-1.0.la
 
-libpyzyincludedir = $(includedir)/pyzy-@PYZY_API_VERSION@
+libpyzyincludedir = $(includedir)/pyzy-@PYZY_API_VERSION@/PyZy
 libpyzyinclude_HEADERS = \
-	PyZyConst.h \
-	PyZyInputContext.h \
-	PyZyVariant.h \
+	Const.h \
+	InputContext.h \
+	Variant.h \
 	$(NULL)
 
 lib_LTLIBRARIES = $(libpyzy)
@@ -47,51 +47,51 @@ lib_LTLIBRARIES = $(libpyzy)
 libpyzy_built_c_sources = \
 	$(NULL)
 libpyzy_built_h_sources = \
-	PyZyBopomofoKeyboard.h \
-	PyZyPinyinParserTable.h \
-	PyZySimpTradConverterTable.h \
+	BopomofoKeyboard.h \
+	PinyinParserTable.h \
+	SimpTradConverterTable.h \
 	$(NULL)
 libpyzy_c_sources = \
-	PyZyBopomofoContext.cc \
-	PyZyDatabase.cc \
-	PyZyDoublePinyinContext.cc \
-	PyZyDynamicSpecialPhrase.cc \
-	PyZyFullPinyinContext.cc \
-	PyZyInputContext.cc \
-	PyZyPhoneticContext.cc \
-	PyZyPhraseEditor.cc \
-	PyZyPinyinContext.cc \
-	PyZyPinyinParser.cc \
-	PyZySimpTradConverter.cc \
-	PyZySpecialPhraseTable.cc \
-	PyZyVariant.cc \
+	BopomofoContext.cc \
+	Database.cc \
+	DoublePinyinContext.cc \
+	DynamicSpecialPhrase.cc \
+	FullPinyinContext.cc \
+	InputContext.cc \
+	PhoneticContext.cc \
+	PhraseEditor.cc \
+	PinyinContext.cc \
+	PinyinParser.cc \
+	SimpTradConverter.cc \
+	SpecialPhraseTable.cc \
+	Variant.cc \
 	$(NULL)
-#	PyZyTest.cc 
+#	Test.cc 
 libpyzy_h_sources = \
-	PyZyBopomofo.h \
-	PyZyBopomofoContext.h \
-	PyZyConfig.h \
-	PyZyConst.h \
-	PyZyDatabase.h \
-	PyZyDoublePinyinContext.h \
-	PyZyDoublePinyinTable.h \
-	PyZyDynamicSpecialPhrase.h \
-	PyZyFullPinyinContext.h \
-	PyZyInputContext.h \
-	PyZyPhoneticContext.h \
-	PyZyPhrase.h \
-	PyZyPhraseArray.h \
-	PyZyPhraseEditor.h \
-	PyZyPinyinArray.h \
-	PyZyPinyinContext.h \
-	PyZyPinyinParser.h \
-	PyZySimpTradConverter.h \
-	PyZySpecialPhrase.h \
-	PyZySpecialPhraseTable.h \
-	PyZyString.h \
-	PyZyTypes.h \
-	PyZyUtil.h \
-	PyZyVariant.h \
+	Bopomofo.h \
+	BopomofoContext.h \
+	Config.h \
+	Const.h \
+	Database.h \
+	DoublePinyinContext.h \
+	DoublePinyinTable.h \
+	DynamicSpecialPhrase.h \
+	FullPinyinContext.h \
+	InputContext.h \
+	PhoneticContext.h \
+	Phrase.h \
+	PhraseArray.h \
+	PhraseEditor.h \
+	PinyinArray.h \
+	PinyinContext.h \
+	PinyinParser.h \
+	SimpTradConverter.h \
+	SpecialPhrase.h \
+	SpecialPhraseTable.h \
+	String.h \
+	Types.h \
+	Util.h \
+	Variant.h \
 	$(NULL)
 
 libpyzy_1_0_la_SOURCES = \
@@ -152,26 +152,26 @@ CLEANFILES = \
 	ZhConversion.* \
 	$(NULL)
 
-PyZyBopomofoKeyboard.h:
+BopomofoKeyboard.h:
 	$(AM_V_GEN) \
 	$(PYTHON) $(top_srcdir)/scripts/genbopomofokeyboard.py > $@ || \
 		( $(RM) $@; exit 1 )
 
-PyZyPinyinParserTable.h:
+PinyinParserTable.h:
 	$(AM_V_GEN) \
 	$(PYTHON) $(top_srcdir)/scripts/genpytable.py > $@ || \
 		( $(RM) $@; exit 1 )
 
-PyZySimpTradConverterTable.h:
+SimpTradConverterTable.h:
 	$(AM_V_GEN) \
 	$(PYTHON) $(top_srcdir)/scripts/update-simptrad-table.py > $@ || \
 		( $(RM) $@; exit 1 )
 
 update-simptrad-table:
-	$(RM) ZhConversion.php ZhConversion.py PyZySimpTradConverterTable.h
+	$(RM) ZhConversion.php ZhConversion.py SimpTradConverterTable.h
 	$(MAKE) ZhConversion.php
 	$(MAKE) ZhConversion.py
-	$(MAKE) PyZySimpTradConverterTable.h
+	$(MAKE) SimpTradConverterTable.h
 
 ZhConversion.php:
 	$(AM_V_GEN) \
diff --git a/src/PyZyPhoneticContext.cc b/src/PhoneticContext.cc
index a775688..3dfad8b 100644
--- a/src/PyZyPhoneticContext.cc
+++ b/src/PhoneticContext.cc
@@ -19,10 +19,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyPhoneticContext.h"
-#include "PyZySimpTradConverter.h"
-#include "PyZyDatabase.h"
-#include "PyZyPhraseEditor.h"
+#include "PhoneticContext.h"
+
+#include "Database.h"
+#include "PhraseEditor.h"
+#include "SimpTradConverter.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPhoneticContext.h b/src/PhoneticContext.h
index 5d64188..072f819 100644
--- a/src/PyZyPhoneticContext.h
+++ b/src/PhoneticContext.h
@@ -24,13 +24,14 @@
 
 #include <string>
 #include <vector>
-#include "PyZyInputContext.h"
-#include "PyZyConfig.h"
-#include "PyZyConst.h"
-#include "PyZyPinyinArray.h"
-#include "PyZyPhraseEditor.h"
-#include "PyZySpecialPhraseTable.h"
-#include "PyZyVariant.h"
+
+#include "Config.h"
+#include "Const.h"
+#include "InputContext.h"
+#include "PhraseEditor.h"
+#include "PinyinArray.h"
+#include "SpecialPhraseTable.h"
+#include "Variant.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPhrase.h b/src/Phrase.h
index 1df1a50..e2d46ae 100644
--- a/src/PyZyPhrase.h
+++ b/src/Phrase.h
@@ -22,8 +22,10 @@
 #ifndef __PYZY_PHRASE_H_
 #define __PYZY_PHRASE_H_
 
+#include <glib.h>
 #include <cstring>
-#include "PyZyTypes.h"
+
+#include "Types.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPhraseArray.h b/src/PhraseArray.h
index 3c98179..cab0b86 100644
--- a/src/PyZyPhraseArray.h
+++ b/src/PhraseArray.h
@@ -23,7 +23,8 @@
 #define __PYZY_PHRASE_ARRAY_H_
 
 #include <vector>
-#include "PyZyPhrase.h"
+
+#include "Phrase.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPhraseEditor.cc b/src/PhraseEditor.cc
index 2222441..912c92a 100644
--- a/src/PyZyPhraseEditor.cc
+++ b/src/PhraseEditor.cc
@@ -19,10 +19,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyPhraseEditor.h"
-#include "PyZyConfig.h"
-#include "PyZyDatabase.h"
-#include "PyZySimpTradConverter.h"
+#include "PhraseEditor.h"
+
+#include "Config.h"
+#include "Database.h"
+#include "SimpTradConverter.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPhraseEditor.h b/src/PhraseEditor.h
index 10cc8ea..6731314 100644
--- a/src/PyZyPhraseEditor.h
+++ b/src/PhraseEditor.h
@@ -22,10 +22,10 @@
 #ifndef __PYZY_PHRASE_EDITOR_H_
 #define __PYZY_PHRASE_EDITOR_H_
 
-#include "PyZyUtil.h"
-#include "PyZyString.h"
-#include "PyZyPhraseArray.h"
-#include "PyZyPinyinArray.h"
+#include "PhraseArray.h"
+#include "PinyinArray.h"
+#include "String.h"
+#include "Util.h"
 
 #define FILL_GRAN (12)
 
diff --git a/src/PyZyPinyinArray.h b/src/PinyinArray.h
index 1350de4..8d55da1 100644
--- a/src/PyZyPinyinArray.h
+++ b/src/PinyinArray.h
@@ -23,7 +23,8 @@
 #define __PYZY_PINYIN_ARRAY_H_
 
 #include <vector>
-#include "PyZyTypes.h"
+
+#include "Types.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPinyinContext.cc b/src/PinyinContext.cc
index a2b6a51..f2a494b 100644
--- a/src/PyZyPinyinContext.cc
+++ b/src/PinyinContext.cc
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyPinyinContext.h"
-#include "PyZySimpTradConverter.h"
+#include "PinyinContext.h"
+#include "SimpTradConverter.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPinyinContext.h b/src/PinyinContext.h
index 7b4a16e..560a2f1 100644
--- a/src/PyZyPinyinContext.h
+++ b/src/PinyinContext.h
@@ -22,7 +22,7 @@
 #ifndef __PYZY_PINYIN_CONTEXT_H_
 #define __PYZY_PINYIN_CONTEXT_H_
 
-#include "PyZyPhoneticContext.h"
+#include "PhoneticContext.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPinyinParser.cc b/src/PinyinParser.cc
index ef8d635..b825408 100644
--- a/src/PyZyPinyinParser.cc
+++ b/src/PinyinParser.cc
@@ -19,16 +19,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+#include "PinyinParser.h"
 
-#include <cstring>
 #include <cstdlib>
-#include "PyZyConfig.h"
-#include "PyZyPinyinParser.h"
+#include <cstring>
+
+#include "Config.h"
 
 namespace PyZy {
 
-#include "PyZyBopomofo.h"
-#include "PyZyPinyinParserTable.h"
+#include "Bopomofo.h"
+#include "PinyinParserTable.h"
 
 static bool
 check_flags (const Pinyin *pinyin, unsigned int option)
diff --git a/src/PyZyPinyinParser.h b/src/PinyinParser.h
index 18bc961..5c33d7c 100644
--- a/src/PyZyPinyinParser.h
+++ b/src/PinyinParser.h
@@ -22,8 +22,8 @@
 #ifndef __PYZY_PINYIN_PARSER_H_
 #define __PYZY_PINYIN_PARSER_H_
 
-#include "PyZyString.h"
-#include "PyZyPinyinArray.h"
+#include "PinyinArray.h"
+#include "String.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyPinyinParserTable.h b/src/PinyinParserTable.h
index b72c70a..b72c70a 100644
--- a/src/PyZyPinyinParserTable.h
+++ b/src/PinyinParserTable.h
diff --git a/src/PyZySimpTradConverter.cc b/src/SimpTradConverter.cc
index 153b138..4a2b492 100644
--- a/src/PyZySimpTradConverter.cc
+++ b/src/SimpTradConverter.cc
@@ -20,12 +20,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+#include "SimpTradConverter.h"
+
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
-#include "PyZySimpTradConverter.h"
-
 #ifdef HAVE_OPENCC
 #  include <opencc.h>
 #else
@@ -33,7 +33,7 @@
 #  include <cstdlib>
 #endif
 
-#include "PyZyString.h"
+#include "String.h"
 
 namespace PyZy {
 
@@ -119,7 +119,7 @@ static int _cmp (const void * p1, const void * p2)
     return _xcmp (pp[0], pp[1], s2[0]);
 }
 
-#include "PyZySimpTradConverterTable.h"
+#include "SimpTradConverterTable.h"
 
 void
 SimpTradConverter::simpToTrad (const char *in, String &out)
diff --git a/src/PyZySimpTradConverter.h b/src/SimpTradConverter.h
index 3c777e3..3c777e3 100644
--- a/src/PyZySimpTradConverter.h
+++ b/src/SimpTradConverter.h
diff --git a/src/PyZySimpTradConverterTable.h b/src/SimpTradConverterTable.h
index 202c9bd..202c9bd 100644
--- a/src/PyZySimpTradConverterTable.h
+++ b/src/SimpTradConverterTable.h
diff --git a/src/PyZySpecialPhrase.cc b/src/SpecialPhrase.cc
index 59f9376..ec58216 100644
--- a/src/PyZySpecialPhrase.cc
+++ b/src/SpecialPhrase.cc
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZySpecialPhrase.h"
+#include "SpecialPhrase.h"
 
 namespace PY {
 
@@ -28,4 +28,3 @@ SpecialPhrase::~SpecialPhrase (void)
 }
 
 };
-
diff --git a/src/PyZySpecialPhrase.h b/src/SpecialPhrase.h
index d113cee..d113cee 100644
--- a/src/PyZySpecialPhrase.h
+++ b/src/SpecialPhrase.h
diff --git a/src/PyZySpecialPhraseTable.cc b/src/SpecialPhraseTable.cc
index fd37079..7653949 100644
--- a/src/PyZySpecialPhraseTable.cc
+++ b/src/SpecialPhraseTable.cc
@@ -19,10 +19,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZySpecialPhraseTable.h"
+#include "SpecialPhraseTable.h"
+
 #include <fstream>
-#include "PyZyDynamicSpecialPhrase.h"
-#include "PyZySpecialPhrase.h"
+
+#include "DynamicSpecialPhrase.h"
+#include "SpecialPhrase.h"
 
 namespace PyZy {
 
diff --git a/src/PyZySpecialPhraseTable.h b/src/SpecialPhraseTable.h
index 5a1dd5d..c8d3289 100644
--- a/src/PyZySpecialPhraseTable.h
+++ b/src/SpecialPhraseTable.h
@@ -22,11 +22,12 @@
 #ifndef __PYZY_SPECIAL_PHRASE_TABLE_H_
 #define __PYZY_SPECIAL_PHRASE_TABLE_H_
 
+#include <glib.h>
 #include <map>
 #include <string>
 #include <vector>
-#include <glib.h>
-#include "PyZyUtil.h"
+
+#include "Util.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyString.h b/src/String.h
index 5209dc9..e3daa1d 100644
--- a/src/PyZyString.h
+++ b/src/String.h
@@ -25,7 +25,8 @@
 #include <glib.h>
 #include <stdarg.h>
 #include <string>
-#include "PyZyUtil.h"
+
+#include "Util.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyTypes.h b/src/Types.h
index 559fc9d..31ddeb3 100644
--- a/src/PyZyTypes.h
+++ b/src/Types.h
@@ -22,6 +22,8 @@
 #ifndef __PYZY_TYPES_H_
 #define __PYZY_TYPES_H_
 
+#include <cstddef>
+
 namespace PyZy {
 
 #define PINYIN_ID_VOID  (-1)
diff --git a/src/PyZyUtil.h b/src/Util.h
index 1bd4f4a..1bd4f4a 100644
--- a/src/PyZyUtil.h
+++ b/src/Util.h
diff --git a/src/PyZyVariant.cc b/src/Variant.cc
index e3fdcf9..171d129 100644
--- a/src/PyZyVariant.cc
+++ b/src/Variant.cc
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "PyZyVariant.h"
+#include "Variant.h"
 
 namespace PyZy {
 
diff --git a/src/PyZyVariant.h b/src/Variant.h
index c48b05e..c48b05e 100644
--- a/src/PyZyVariant.h
+++ b/src/Variant.h