2 files changed, 18 insertions, 1 deletions
diff --git a/src/pinyin.cpp b/src/pinyin.cpp
index 56d2ed5..5cac776 100644
--- a/src/pinyin.cpp
+++ b/src/pinyin.cpp
@@ -26,6 +26,8 @@
 #include <glib/gstdio.h>
 #include "pinyin_internal.h"
 
+using namespace pinyin;
+
 /* a glue layer for input method integration. */
 
 struct _pinyin_context_t{
diff --git a/src/pinyin.h b/src/pinyin.h
index cab13c0..a28b850 100644
--- a/src/pinyin.h
+++ b/src/pinyin.h
@@ -28,7 +28,22 @@
 #include "pinyin_custom2.h"
 #include "chewing_key.h"
 
-using namespace pinyin;
+using pinyin::pinyin_option_t;
+using pinyin::DoublePinyinScheme;
+using pinyin::ChewingScheme;
+
+using pinyin::phrase_token_t;
+using pinyin::null_token;
+
+using pinyin::ChewingKey;
+using pinyin::ChewingKeyRest;
+
+using pinyin::TokenVector;
+using pinyin::ChewingKeyVector;
+using pinyin::ChewingKeyRestVector;
+using pinyin::CandidateConstraints;
+using pinyin::MatchResults;
+
 
 extern "C" {