diff --git a/src/LangBulgarianModel.cpp b/src/LangBulgarianModel.cpp
index 8fb7351..9babfda 100644
--- a/src/LangBulgarianModel.cpp
+++ b/src/LangBulgarianModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/src/LangCyrillicModel.cpp b/src/LangCyrillicModel.cpp
index a828a8f..deceba3 100644
--- a/src/LangCyrillicModel.cpp
+++ b/src/LangCyrillicModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 
 
diff --git a/src/LangGreekModel.cpp b/src/LangGreekModel.cpp
index df514c1..60cea7e 100644
--- a/src/LangGreekModel.cpp
+++ b/src/LangGreekModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/src/LangHebrewModel.cpp b/src/LangHebrewModel.cpp
index 3de5837..8c18641 100644
--- a/src/LangHebrewModel.cpp
+++ b/src/LangHebrewModel.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 
 
diff --git a/src/LangHungarianModel.cpp b/src/LangHungarianModel.cpp
index bf7c450..66e2d5d 100644
--- a/src/LangHungarianModel.cpp
+++ b/src/LangHungarianModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/src/LangThaiModel.cpp b/src/LangThaiModel.cpp
index b0679d5..7d376cc 100644
--- a/src/LangThaiModel.cpp
+++ b/src/LangThaiModel.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsSBCharSetProber.h"
 
 
diff --git a/src/nsBig5Prober.h b/src/nsBig5Prober.h
index 57deca0..5a4ce37 100644
--- a/src/nsBig5Prober.h
+++ b/src/nsBig5Prober.h
@@ -38,7 +38,7 @@
 #ifndef nsBig5Prober_h__
 #define nsBig5Prober_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "CharDistribution.h"
diff --git a/src/nsEUCJPProber.h b/src/nsEUCJPProber.h
index 2ad32c6..e4efa5a 100644
--- a/src/nsEUCJPProber.h
+++ b/src/nsEUCJPProber.h
@@ -43,7 +43,7 @@
 #ifndef nsEUCJPProber_h__
 #define nsEUCJPProber_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "JpCntx.h"
diff --git a/src/nsEUCKRProber.h b/src/nsEUCKRProber.h
index 50cea47..53e9f30 100644
--- a/src/nsEUCKRProber.h
+++ b/src/nsEUCKRProber.h
@@ -38,7 +38,7 @@
 #ifndef nsEUCKRProber_h__
 #define nsEUCKRProber_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "CharDistribution.h"
diff --git a/src/nsEUCTWProber.h b/src/nsEUCTWProber.h
index 68e18df..7df1120 100644
--- a/src/nsEUCTWProber.h
+++ b/src/nsEUCTWProber.h
@@ -38,7 +38,7 @@
 #ifndef nsEUCTWProber_h__
 #define nsEUCTWProber_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "CharDistribution.h"
diff --git a/src/nsEscSM.cpp b/src/nsEscSM.cpp
index d7ee1fc..f3b4a8d 100644
--- a/src/nsEscSM.cpp
+++ b/src/nsEscSM.cpp
@@ -35,7 +35,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCodingStateMachine.h"
 
 static PRUint32 HZ_cls[ 256 / 8 ] = {
diff --git a/src/nsGB2312Prober.h b/src/nsGB2312Prober.h
index caf1de3..18edae5 100644
--- a/src/nsGB2312Prober.h
+++ b/src/nsGB2312Prober.h
@@ -38,7 +38,7 @@
 #ifndef nsGB2312Prober_h__
 #define nsGB2312Prober_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "CharDistribution.h"
diff --git a/src/nsHebrewProber.cpp b/src/nsHebrewProber.cpp
index fde15b9..2168de3 100644
--- a/src/nsHebrewProber.cpp
+++ b/src/nsHebrewProber.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsHebrewProber.h"
 #include <stdio.h>
 
diff --git a/src/nsLatin1Prober.h b/src/nsLatin1Prober.h
index 7613b1d..3953d8e 100644
--- a/src/nsLatin1Prober.h
+++ b/src/nsLatin1Prober.h
@@ -39,7 +39,7 @@
 #ifndef nsLatin1Prober_h__
 #define nsLatin1Prober_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 
 #define FREQ_CAT_NUM    4
diff --git a/src/nsMBCSSM.cpp b/src/nsMBCSSM.cpp
index ecaa726..0231ad6 100644
--- a/src/nsMBCSSM.cpp
+++ b/src/nsMBCSSM.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCodingStateMachine.h"
 
 /*
diff --git a/src/nsSJISProber.h b/src/nsSJISProber.h
index 44daff8..77a7085 100644
--- a/src/nsSJISProber.h
+++ b/src/nsSJISProber.h
@@ -43,7 +43,7 @@
 #ifndef nsSJISProber_h__
 #define nsSJISProber_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 #include "JpCntx.h"
diff --git a/src/nsUTF8Prober.h b/src/nsUTF8Prober.h
index 5216e4e..3bc8874 100644
--- a/src/nsUTF8Prober.h
+++ b/src/nsUTF8Prober.h
@@ -38,7 +38,7 @@
 #ifndef nsUTF8Prober_h__
 #define nsUTF8Prober_h__
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsCharSetProber.h"
 #include "nsCodingStateMachine.h"
 
diff --git a/src/nsUniversalDetector.cpp b/src/nsUniversalDetector.cpp
index a8e6373..1e16002 100644
--- a/src/nsUniversalDetector.cpp
+++ b/src/nsUniversalDetector.cpp
@@ -38,7 +38,7 @@
 
 #include "nscore.h"
 
-#include "uchardet.h"
+#include "uchardetDefine.h"
 #include "nsUniversalDetector.h"
 
 #include "nsMBCSGroupProber.h"
diff --git a/src/uchardet.h b/src/uchardet.h
index e907271..84f7306 100644
--- a/src/uchardet.h
+++ b/src/uchardet.h
@@ -34,8 +34,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#ifndef ___UNIVERSALCHARDET_H___
-#define ___UNIVERSALCHARDET_H___
+#ifndef ___UCHARDET_H___
+#define ___UCHARDET_H___
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,38 +43,6 @@ extern "C" {
 
 #include <stddef.h>
 
-#define CHARDET_ENCODING_ISO_2022_JP    "ISO-2022-JP"
-#define CHARDET_ENCODING_ISO_2022_CN    "ISO-2022-CN"
-#define CHARDET_ENCODING_ISO_2022_KR    "ISO-2022-KR"
-#define CHARDET_ENCODING_ISO_8859_5     "ISO-8859-5"
-#define CHARDET_ENCODING_ISO_8859_7     "ISO-8859-7"
-#define CHARDET_ENCODING_ISO_8859_8     "ISO-8859-8"
-#define CHARDET_ENCODING_BIG5           "BIG5"
-#define CHARDET_ENCODING_GB18030        "GB18030"
-#define CHARDET_ENCODING_EUC_JP         "EUC-JP"
-#define CHARDET_ENCODING_EUC_KR         "EUC-KR"
-#define CHARDET_ENCODING_EUC_TW         "EUC-TW"
-#define CHARDET_ENCODING_SHIFT_JIS      "SHIFT_JIS"
-#define CHARDET_ENCODING_IBM855         "IBM855"
-#define CHARDET_ENCODING_IBM866         "IBM866"
-#define CHARDET_ENCODING_KOI8_R         "KOI8-R"
-#define CHARDET_ENCODING_MACCYRILLIC    "MACCYRILLIC"
-#define CHARDET_ENCODING_WINDOWS_1251   "WINDOWS-1251"
-#define CHARDET_ENCODING_WINDOWS_1252   "WINDOWS-1252"
-#define CHARDET_ENCODING_WINDOWS_1253   "WINDOWS-1253"
-#define CHARDET_ENCODING_WINDOWS_1255   "WINDOWS-1255"
-#define CHARDET_ENCODING_UTF_8          "UTF-8"
-#define CHARDET_ENCODING_UTF_16BE       "UTF-16BE"
-#define CHARDET_ENCODING_UTF_16LE       "UTF-16LE"
-#define CHARDET_ENCODING_UTF_32BE       "UTF-32BE"
-#define CHARDET_ENCODING_UTF_32LE       "UTF-32LE"
-#define CHARDET_ENCODING_HZ_GB_2312     "HZ-GB-2312"
-#define CHARDET_ENCODING_X_ISO_10646_UCS_4_3412 "X-ISO-10646-UCS-4-3412"
-#define CHARDET_ENCODING_X_ISO_10646_UCS_4_2143 "X-ISO-10646-UCS-4-2143"
-#define CHARDET_ENCODING_ISO_8859_2     "ISO-8859-2"
-#define CHARDET_ENCODING_WINDOWS_1250   "WINDOWS-1250"
-#define CHARDET_ENCODING_TIS_620        "TIS-620"
-
 typedef void * uchardet_t;
 
 /**
diff --git a/src/uchardetDefine.h b/src/uchardetDefine.h
new file mode 100644
index 0000000..34b03bd
--- /dev/null
+++ b/src/uchardetDefine.h
@@ -0,0 +1,72 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Universal charset detector code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *          Kohei TAKETA <k-tak@void.in>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef ___UCHARDET_DEFINE_H___
+#define ___UCHARDET_DEFINE_H___
+
+#define CHARDET_ENCODING_ISO_2022_JP    "ISO-2022-JP"
+#define CHARDET_ENCODING_ISO_2022_CN    "ISO-2022-CN"
+#define CHARDET_ENCODING_ISO_2022_KR    "ISO-2022-KR"
+#define CHARDET_ENCODING_ISO_8859_5     "ISO-8859-5"
+#define CHARDET_ENCODING_ISO_8859_7     "ISO-8859-7"
+#define CHARDET_ENCODING_ISO_8859_8     "ISO-8859-8"
+#define CHARDET_ENCODING_BIG5           "BIG5"
+#define CHARDET_ENCODING_GB18030        "GB18030"
+#define CHARDET_ENCODING_EUC_JP         "EUC-JP"
+#define CHARDET_ENCODING_EUC_KR         "EUC-KR"
+#define CHARDET_ENCODING_EUC_TW         "EUC-TW"
+#define CHARDET_ENCODING_SHIFT_JIS      "SHIFT_JIS"
+#define CHARDET_ENCODING_IBM855         "IBM855"
+#define CHARDET_ENCODING_IBM866         "IBM866"
+#define CHARDET_ENCODING_KOI8_R         "KOI8-R"
+#define CHARDET_ENCODING_MACCYRILLIC    "MACCYRILLIC"
+#define CHARDET_ENCODING_WINDOWS_1251   "WINDOWS-1251"
+#define CHARDET_ENCODING_WINDOWS_1252   "WINDOWS-1252"
+#define CHARDET_ENCODING_WINDOWS_1253   "WINDOWS-1253"
+#define CHARDET_ENCODING_WINDOWS_1255   "WINDOWS-1255"
+#define CHARDET_ENCODING_UTF_8          "UTF-8"
+#define CHARDET_ENCODING_UTF_16BE       "UTF-16BE"
+#define CHARDET_ENCODING_UTF_16LE       "UTF-16LE"
+#define CHARDET_ENCODING_UTF_32BE       "UTF-32BE"
+#define CHARDET_ENCODING_UTF_32LE       "UTF-32LE"
+#define CHARDET_ENCODING_HZ_GB_2312     "HZ-GB-2312"
+#define CHARDET_ENCODING_X_ISO_10646_UCS_4_3412 "X-ISO-10646-UCS-4-3412"
+#define CHARDET_ENCODING_X_ISO_10646_UCS_4_2143 "X-ISO-10646-UCS-4-2143"
+#define CHARDET_ENCODING_ISO_8859_2     "ISO-8859-2"
+#define CHARDET_ENCODING_WINDOWS_1250   "WINDOWS-1250"
+#define CHARDET_ENCODING_TIS_620        "TIS-620"
+
+#endif