8 files changed, 30 insertions, 15 deletions
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index ffc3729af4..3006ebce2b 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -21,7 +21,7 @@
 #include "core/fpdftext/unicodenormalizationdata.h"
 #include "core/fxcrt/fx_bidi.h"
 #include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_unicode.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/fxcrt/cfx_char.h b/core/fxcrt/cfx_char.h
index 009e87b388..74f0a4f9cd 100644
--- a/core/fxcrt/cfx_char.h
+++ b/core/fxcrt/cfx_char.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "core/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_unicode.h"
 
 enum class CFX_BreakType { None = 0, Piece, Line, Paragraph, Page };
 
diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index d9804ba4a9..0d6f0395a6 100644
--- a/core/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_memory.h"
-#include "core/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_unicode.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp
index 5b5b1982cc..b7c7cacad8 100644
--- a/core/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "core/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_unicode.h"
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/core/fxcrt/fx_ucddata.cpp b/core/fxcrt/fx_ucddata.cpp
index 1f28bfbd37..527eacfdbd 100644
--- a/core/fxcrt/fx_ucddata.cpp
+++ b/core/fxcrt/fx_ucddata.cpp
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcrt/fx_ucddata.h"
+
 #include "core/fxcrt/fx_memory.h"
-#include "core/fxcrt/fx_ucd.h"
 
 const uint32_t kTextLayoutCodeProperties[] = {
     0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93,
diff --git a/core/fxcrt/fx_ucddata.h b/core/fxcrt/fx_ucddata.h
new file mode 100644
index 0000000000..78a6b970cc
--- /dev/null
+++ b/core/fxcrt/fx_ucddata.h
@@ -0,0 +1,18 @@
+// Copyright 2017 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FXCRT_FX_UCDDATA_H_
+#define CORE_FXCRT_FX_UCDDATA_H_
+
+#include "core/fxcrt/fx_system.h"
+
+extern const uint32_t kTextLayoutCodeProperties[];
+extern const size_t kTextLayoutCodePropertiesSize;
+
+extern const uint16_t kFXTextLayoutBidiMirror[];
+extern const size_t kFXTextLayoutBidiMirrorSize;
+
+#endif  // CORE_FXCRT_FX_UCDDATA_H_
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index f23200491a..aafdba15ee 100644
--- a/core/fxcrt/fx_unicode.cpp
+++ b/core/fxcrt/fx_unicode.cpp
@@ -4,7 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_unicode.h"
+
+#include "core/fxcrt/fx_ucddata.h"
 
 namespace {
 
diff --git a/core/fxcrt/fx_ucd.h b/core/fxcrt/fx_unicode.h
index bca830fc0f..a4a237ae6d 100644
--- a/core/fxcrt/fx_ucd.h
+++ b/core/fxcrt/fx_unicode.h
@@ -4,17 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_FX_UCD_H_
-#define CORE_FXCRT_FX_UCD_H_
+#ifndef CORE_FXCRT_FX_UNICODE_H_
+#define CORE_FXCRT_FX_UNICODE_H_
 
 #include "core/fxcrt/cfx_retain_ptr.h"
 
-extern const uint32_t kTextLayoutCodeProperties[];
-extern const size_t kTextLayoutCodePropertiesSize;
-
-extern const uint16_t kFXTextLayoutBidiMirror[];
-extern const size_t kFXTextLayoutBidiMirrorSize;
-
 uint32_t FX_GetUnicodeProperties(wchar_t wch);
 wchar_t FX_GetMirrorChar(wchar_t wch);
 
@@ -51,4 +45,4 @@ wchar_t FX_GetMirrorChar(wchar_t wch, uint32_t dwProps);
 
 #endif  // PDF_ENABLE_XFA
 
-#endif  // CORE_FXCRT_FX_UCD_H_
+#endif  // CORE_FXCRT_FX_UNICODE_H_