Move core/fxcrt/include to core/fxcrt

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2382723003

57 files changed, 144 insertions, 145 deletions

diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/cfx_count_ref.h
index a879967b28..3b9ccff8fe 100644
--- a/core/fxcrt/include/cfx_count_ref.h
+++ b/core/fxcrt/cfx_count_ref.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
-#define CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
+#ifndef CORE_FXCRT_CFX_COUNT_REF_H_
+#define CORE_FXCRT_CFX_COUNT_REF_H_
 
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_system.h"
 
 // A shared object with Copy on Write semantics that makes it appear as
 // if each one were independent.
@@ -78,4 +78,4 @@ class CFX_CountRef {
   CFX_RetainPtr<CountedObj> m_pObject;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
+#endif  // CORE_FXCRT_CFX_COUNT_REF_H_
diff --git a/core/fxcrt/cfx_count_ref_unittest.cpp b/core/fxcrt/cfx_count_ref_unittest.cpp
index 6cb9f4a2fe..6ab56327d3 100644
--- a/core/fxcrt/cfx_count_ref_unittest.cpp
+++ b/core/fxcrt/cfx_count_ref_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/cfx_count_ref.h"
+#include "core/fxcrt/cfx_count_ref.h"
 
 #include <map>
 #include <string>
diff --git a/core/fxcrt/include/cfx_observable.h b/core/fxcrt/cfx_observable.h
index a5053f3952..dc869b1766 100644
--- a/core/fxcrt/include/cfx_observable.h
+++ b/core/fxcrt/cfx_observable.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
-#define CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#ifndef CORE_FXCRT_CFX_OBSERVABLE_H_
+#define CORE_FXCRT_CFX_OBSERVABLE_H_
 
 #include <set>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "third_party/base/stl_util.h"
 
 template <class T>
@@ -75,4 +75,4 @@ class CFX_Observable {
   std::set<ObservedPtr*> m_ObservedPtrs;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#endif  // CORE_FXCRT_CFX_OBSERVABLE_H_
diff --git a/core/fxcrt/cfx_observable_unittest.cpp b/core/fxcrt/cfx_observable_unittest.cpp
index eaadd95bb6..15c76495cf 100644
--- a/core/fxcrt/cfx_observable_unittest.cpp
+++ b/core/fxcrt/cfx_observable_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/cfx_observable.h"
+#include "core/fxcrt/cfx_observable.h"
 
 #include <utility>
 
diff --git a/core/fxcrt/include/cfx_retain_ptr.h b/core/fxcrt/cfx_retain_ptr.h
index e40feb6b31..883494e7ec 100644
--- a/core/fxcrt/include/cfx_retain_ptr.h
+++ b/core/fxcrt/cfx_retain_ptr.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
-#define CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
+#ifndef CORE_FXCRT_CFX_RETAIN_PTR_H_
+#define CORE_FXCRT_CFX_RETAIN_PTR_H_
 
 #include <memory>
 
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
 
 template <class T>
 class CFX_RetainPtr {
@@ -22,8 +22,7 @@ class CFX_RetainPtr {
   CFX_RetainPtr(CFX_RetainPtr&& that) { Swap(that); }
 
   template <class U>
-  CFX_RetainPtr(const CFX_RetainPtr<U>& that)
-      : CFX_RetainPtr(that.Get()) {}
+  CFX_RetainPtr(const CFX_RetainPtr<U>& that) : CFX_RetainPtr(that.Get()) {}
 
   void Reset(T* obj = nullptr) {
     if (obj)
@@ -54,4 +53,4 @@ class CFX_RetainPtr {
   std::unique_ptr<T, ReleaseDeleter<T>> m_pObj;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
+#endif  // CORE_FXCRT_CFX_RETAIN_PTR_H_
diff --git a/core/fxcrt/cfx_retain_ptr_unittest.cpp b/core/fxcrt/cfx_retain_ptr_unittest.cpp
index 9da0d5ccf8..aa92e57f32 100644
--- a/core/fxcrt/cfx_retain_ptr_unittest.cpp
+++ b/core/fxcrt/cfx_retain_ptr_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/cfx_retain_ptr.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
 
 #include <utility>
 
diff --git a/core/fxcrt/cfx_string_c_template.h b/core/fxcrt/cfx_string_c_template.h
index 70b9fcd609..4a3dae7e7e 100644
--- a/core/fxcrt/cfx_string_c_template.h
+++ b/core/fxcrt/cfx_string_c_template.h
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <type_traits>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 
 // An immutable string with caller-provided storage which must outlive the
 // string itself. These are not necessarily nul-terminated, so that substring
diff --git a/core/fxcrt/cfx_string_data_template.h b/core/fxcrt/cfx_string_data_template.h
index 5f7bfa1f83..affd610011 100644
--- a/core/fxcrt/cfx_string_data_template.h
+++ b/core/fxcrt/cfx_string_data_template.h
@@ -7,8 +7,8 @@
 #ifndef CORE_FXCRT_CFX_STRING_DATA_TEMPLATE_H_
 #define CORE_FXCRT_CFX_STRING_DATA_TEMPLATE_H_
 
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
 #include "third_party/base/numerics/safe_math.h"
 
 template <typename CharType>
diff --git a/core/fxcrt/include/cfx_string_pool_template.h b/core/fxcrt/cfx_string_pool_template.h
index a59d13a61d..bfc1ce4bfb 100644
--- a/core/fxcrt/include/cfx_string_pool_template.h
+++ b/core/fxcrt/cfx_string_pool_template.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
-#define CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
+#ifndef CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
+#define CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
 
 #include <unordered_set>
 
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
 
 template <typename StringType>
 class CFX_StringPoolTemplate {
@@ -27,4 +27,4 @@ using CFX_WideStringPool = CFX_StringPoolTemplate<CFX_WideString>;
 extern template class CFX_StringPoolTemplate<CFX_ByteString>;
 extern template class CFX_StringPoolTemplate<CFX_WideString>;
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
+#endif  // CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
diff --git a/core/fxcrt/cfx_string_pool_template_unittest.cpp b/core/fxcrt/cfx_string_pool_template_unittest.cpp
index 95a9007b92..d0f5fbe96d 100644
--- a/core/fxcrt/cfx_string_pool_template_unittest.cpp
+++ b/core/fxcrt/cfx_string_pool_template_unittest.cpp
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_string.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/include/cfx_weak_ptr.h b/core/fxcrt/cfx_weak_ptr.h
index 64218cd679..61f15e3dda 100644
--- a/core/fxcrt/include/cfx_weak_ptr.h
+++ b/core/fxcrt/cfx_weak_ptr.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
-#define CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
+#ifndef CORE_FXCRT_CFX_WEAK_PTR_H_
+#define CORE_FXCRT_CFX_WEAK_PTR_H_
 
 #include <memory>
 
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_system.h"
 
 template <class T, class D = std::default_delete<T>>
 class CFX_WeakPtr {
@@ -77,4 +77,4 @@ class CFX_WeakPtr {
   CFX_RetainPtr<Handle> m_pHandle;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
+#endif  // CORE_FXCRT_CFX_WEAK_PTR_H_
diff --git a/core/fxcrt/cfx_weak_ptr_unittest.cpp b/core/fxcrt/cfx_weak_ptr_unittest.cpp
index c4fa514bef..11dd8bb3c0 100644
--- a/core/fxcrt/cfx_weak_ptr_unittest.cpp
+++ b/core/fxcrt/cfx_weak_ptr_unittest.cpp
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/cfx_weak_ptr.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
 
 #include <memory>
 #include <utility>
 
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/extension.h b/core/fxcrt/extension.h
index d4fd0931f4..6a437db574 100644
--- a/core/fxcrt/extension.h
+++ b/core/fxcrt/extension.h
@@ -10,8 +10,8 @@
 #include <algorithm>
 #include <memory>
 
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_safe_types.h"
 
 class IFXCRT_FileAccess {
  public:
diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index 2c0a1bbad7..ee04f40ac8 100644
--- a/core/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_arabic.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_arabic.h"
+#include "core/fxcrt/fx_ucd.h"
 
 namespace {
 
diff --git a/core/fxcrt/include/fx_arabic.h b/core/fxcrt/fx_arabic.h
index 2617d1897f..e20a261b00 100644
--- a/core/fxcrt/include/fx_arabic.h
+++ b/core/fxcrt/fx_arabic.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_ARABIC_H_
-#define CORE_FXCRT_INCLUDE_FX_ARABIC_H_
+#ifndef CORE_FXCRT_FX_ARABIC_H_
+#define CORE_FXCRT_FX_ARABIC_H_
 
-#include "core/fxcrt/include/fx_arb.h"
+#include "core/fxcrt/fx_arb.h"
 
 #define FX_BIDIMAXLEVEL 61
 #define FX_BidiDirection(a) (FX_IsOdd(a) ? FX_BIDICLASS_R : FX_BIDICLASS_L)
@@ -185,4 +185,4 @@ void FX_BidiReorder(int32_t iBaseLevel,
                     CFX_WideString& wsText,
                     const CFX_Int32Array& levels);
 
-#endif  // CORE_FXCRT_INCLUDE_FX_ARABIC_H_
+#endif  // CORE_FXCRT_FX_ARABIC_H_
diff --git a/core/fxcrt/include/fx_arb.h b/core/fxcrt/fx_arb.h
index 6928519a80..6d556fe9f9 100644
--- a/core/fxcrt/include/fx_arb.h
+++ b/core/fxcrt/fx_arb.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_ARB_H_
-#define CORE_FXCRT_INCLUDE_FX_ARB_H_
+#ifndef CORE_FXCRT_FX_ARB_H_
+#define CORE_FXCRT_FX_ARB_H_
 
-#include "core/fxcrt/include/fx_system.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/fx_ucd.h"
 
 struct FX_ARBFORMTABLE {
   uint16_t wIsolated;
@@ -46,4 +46,4 @@ void FX_BidiLine(CFX_RTFCharArray& chars,
                  int32_t iCount,
                  int32_t iBaseLevel = 0);
 
-#endif  // CORE_FXCRT_INCLUDE_FX_ARB_H_
+#endif  // CORE_FXCRT_FX_ARB_H_
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/fx_basic.h
index 6a8988d5dc..4cf69f896b 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
-#define CORE_FXCRT_INCLUDE_FX_BASIC_H_
+#ifndef CORE_FXCRT_FX_BASIC_H_
+#define CORE_FXCRT_FX_BASIC_H_
 
 #include <algorithm>
 #include <memory>
 
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_stream.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_stream.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
 
 class CFX_BinaryBuf {
  public:
@@ -788,7 +788,8 @@ class CFX_ListArrayTemplate {
   T1 m_Data;
 };
 typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>,
-                              FX_FILESIZE> CFX_FileSizeListArray;
+                              FX_FILESIZE>
+    CFX_FileSizeListArray;
 
 #ifdef PDF_ENABLE_XFA
 class IFX_Retainable {
@@ -856,4 +857,4 @@ class CFX_Matrix_3by3 {
 
 uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits);
 
-#endif  // CORE_FXCRT_INCLUDE_FX_BASIC_H_
+#endif  // CORE_FXCRT_FX_BASIC_H_
diff --git a/core/fxcrt/fx_basic_array.cpp b/core/fxcrt/fx_basic_array.cpp
index 0a2dc43fc5..2d1a7bdf31 100644
--- a/core/fxcrt/fx_basic_array.cpp
+++ b/core/fxcrt/fx_basic_array.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 #include "third_party/base/numerics/safe_math.h"
 
 CFX_BasicArray::CFX_BasicArray(int unit_size)
diff --git a/core/fxcrt/fx_basic_bstring.cpp b/core/fxcrt/fx_basic_bstring.cpp
index 63db86e0c8..23f13c1207 100644
--- a/core/fxcrt/fx_basic_bstring.cpp
+++ b/core/fxcrt/fx_basic_bstring.cpp
@@ -9,8 +9,8 @@
 #include <algorithm>
 #include <cctype>
 
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_basic.h"
 #include "third_party/base/numerics/safe_math.h"
 
 template class CFX_StringDataTemplate<FX_CHAR>;
diff --git a/core/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp
index cfdf2794b4..f314c652ba 100644
--- a/core/fxcrt/fx_basic_bstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_bstring_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/fx_basic_buffer.cpp b/core/fxcrt/fx_basic_buffer.cpp
index 5ee1a659e5..d441f6c0e9 100644
--- a/core/fxcrt/fx_basic_buffer.cpp
+++ b/core/fxcrt/fx_basic_buffer.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <limits>
 
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/numerics/safe_conversions.h"
 
 CFX_BinaryBuf::CFX_BinaryBuf()
diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index 893a99ac42..1184370fa7 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -6,8 +6,8 @@
 
 #include <limits.h>
 
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_ext.h"
 
 void FX_RECT::Normalize() {
   if (left > right) {
diff --git a/core/fxcrt/fx_basic_gcc.cpp b/core/fxcrt/fx_basic_gcc.cpp
index 3547e5fbf0..42fb2a17f7 100644
--- a/core/fxcrt/fx_basic_gcc.cpp
+++ b/core/fxcrt/fx_basic_gcc.cpp
@@ -8,8 +8,8 @@
 #include <cwctype>
 #include <limits>
 
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_string.h"
 
 template <typename IntType, typename CharType>
 IntType FXSYS_StrToInt(const CharType* str) {
diff --git a/core/fxcrt/fx_basic_gcc_unittest.cpp b/core/fxcrt/fx_basic_gcc_unittest.cpp
index 73e7446de0..665eede9ff 100644
--- a/core/fxcrt/fx_basic_gcc_unittest.cpp
+++ b/core/fxcrt/fx_basic_gcc_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcrt, FXSYS_atoi) {
diff --git a/core/fxcrt/fx_basic_list.cpp b/core/fxcrt/fx_basic_list.cpp
index 53e0621a6e..09ad08b281 100644
--- a/core/fxcrt/fx_basic_list.cpp
+++ b/core/fxcrt/fx_basic_list.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/plex.h"
 
 CFX_PtrList::CFX_PtrList(int nBlockSize)
diff --git a/core/fxcrt/fx_basic_maps.cpp b/core/fxcrt/fx_basic_maps.cpp
index 2424b82714..48fb97082d 100644
--- a/core/fxcrt/fx_basic_maps.cpp
+++ b/core/fxcrt/fx_basic_maps.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/plex.h"
 
 CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize)
diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp
index 94d978c879..927b994b5f 100644
--- a/core/fxcrt/fx_basic_memmgr.cpp
+++ b/core/fxcrt/fx_basic_memmgr.cpp
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>  // For abort().
 
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
 
 void* FXMEM_DefaultAlloc(size_t byte_size, int flags) {
   return (void*)malloc(byte_size);
diff --git a/core/fxcrt/fx_basic_memmgr_unittest.cpp b/core/fxcrt/fx_basic_memmgr_unittest.cpp
index 3ce533012f..fdffd98f19 100644
--- a/core/fxcrt/fx_basic_memmgr_unittest.cpp
+++ b/core/fxcrt/fx_basic_memmgr_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include <limits>
 
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/core/fxcrt/fx_basic_plex.cpp b/core/fxcrt/fx_basic_plex.cpp
index 99cc700dbf..cb6fde6ca0 100644
--- a/core/fxcrt/fx_basic_plex.cpp
+++ b/core/fxcrt/fx_basic_plex.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/plex.h"
 
 CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead,
diff --git a/core/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index de219b40fd..8dbbb28877 100644
--- a/core/fxcrt/fx_basic_utf.cpp
+++ b/core/fxcrt/fx_basic_utf.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 void CFX_UTF8Decoder::Clear() {
   m_Buffer.Clear();
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index 663ca93e9c..ae3959bdb9 100644
--- a/core/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
 
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 #include <dirent.h>
diff --git a/core/fxcrt/fx_basic_util_unittest.cpp b/core/fxcrt/fx_basic_util_unittest.cpp
index 6eae6696ad..471c6deeb3 100644
--- a/core/fxcrt/fx_basic_util_unittest.cpp
+++ b/core/fxcrt/fx_basic_util_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include <limits>
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 377f09c913..099d0ecd43 100644
--- a/core/fxcrt/fx_basic_wstring.cpp
+++ b/core/fxcrt/fx_basic_wstring.cpp
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <cctype>
 
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
 #include "third_party/base/numerics/safe_math.h"
 
 template class CFX_StringDataTemplate<FX_WCHAR>;
diff --git a/core/fxcrt/fx_basic_wstring_unittest.cpp b/core/fxcrt/fx_basic_wstring_unittest.cpp
index efd958d8a6..07b5aaf13c 100644
--- a/core/fxcrt/fx_basic_wstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_wstring_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp
index f1d162dee9..e82b3e7284 100644
--- a/core/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcrt/fx_bidi.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_ucd.h"
 
 #include <algorithm>
 
diff --git a/core/fxcrt/fx_bidi.h b/core/fxcrt/fx_bidi.h
index ad5fb27054..8d12cc8997 100644
--- a/core/fxcrt/fx_bidi.h
+++ b/core/fxcrt/fx_bidi.h
@@ -10,8 +10,8 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
 
 // Processes characters and group them into segments based on text direction.
 class CFX_BidiChar {
diff --git a/core/fxcrt/include/fx_coordinates.h b/core/fxcrt/fx_coordinates.h
index a7c01cadb7..d10f7b0c57 100644
--- a/core/fxcrt/include/fx_coordinates.h
+++ b/core/fxcrt/fx_coordinates.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
-#define CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
+#ifndef CORE_FXCRT_FX_COORDINATES_H_
+#define CORE_FXCRT_FX_COORDINATES_H_
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 class CFX_Matrix;
 
@@ -668,4 +668,4 @@ class CFX_Matrix {
   FX_FLOAT f;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
+#endif  // CORE_FXCRT_FX_COORDINATES_H_
diff --git a/core/fxcrt/include/fx_ext.h b/core/fxcrt/fx_ext.h
index e33d57bdb7..959a26bf44 100644
--- a/core/fxcrt/include/fx_ext.h
+++ b/core/fxcrt/fx_ext.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_EXT_H_
-#define CORE_FXCRT_INCLUDE_FX_EXT_H_
+#ifndef CORE_FXCRT_FX_EXT_H_
+#define CORE_FXCRT_FX_EXT_H_
 
 #include <cctype>
 #include <cwctype>
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 #define FX_INVALID_OFFSET static_cast<uint32_t>(-1)
 
@@ -127,4 +127,4 @@ class CFX_SSortTemplate {
   }
 };
 
-#endif  // CORE_FXCRT_INCLUDE_FX_EXT_H_
+#endif  // CORE_FXCRT_FX_EXT_H_
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index 4c77244b3d..ca6b6d4066 100644
--- a/core/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "core/fxcrt/extension.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #include <wincrypt.h>
diff --git a/core/fxcrt/fx_extension_unittest.cpp b/core/fxcrt/fx_extension_unittest.cpp
index 954e0956ed..3739a3db8c 100644
--- a/core/fxcrt/fx_extension_unittest.cpp
+++ b/core/fxcrt/fx_extension_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
 
 TEST(fxcrt, FXSYS_toHexDigit) {
   EXPECT_EQ(10, FXSYS_toHexDigit('a'));
diff --git a/core/fxcrt/include/fx_memory.h b/core/fxcrt/fx_memory.h
index a3eba2fd79..beb194fbda 100644
--- a/core/fxcrt/include/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_MEMORY_H_
-#define CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#ifndef CORE_FXCRT_FX_MEMORY_H_
+#define CORE_FXCRT_FX_MEMORY_H_
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -63,15 +63,15 @@ inline void* FX_ReallocOrDie(void* ptr,
 }
 
 // Never returns nullptr.
-#define FX_Alloc(type, size) (type*) FX_AllocOrDie(size, sizeof(type))
-#define FX_Alloc2D(type, w, h) (type*) FX_AllocOrDie2D(w, h, sizeof(type))
+#define FX_Alloc(type, size) (type*)FX_AllocOrDie(size, sizeof(type))
+#define FX_Alloc2D(type, w, h) (type*)FX_AllocOrDie2D(w, h, sizeof(type))
 #define FX_Realloc(type, ptr, size) \
-  (type*) FX_ReallocOrDie(ptr, size, sizeof(type))
+  (type*)FX_ReallocOrDie(ptr, size, sizeof(type))
 
 // May return nullptr.
-#define FX_TryAlloc(type, size) (type*) calloc(size, sizeof(type))
+#define FX_TryAlloc(type, size) (type*)calloc(size, sizeof(type))
 #define FX_TryRealloc(type, ptr, size) \
-  (type*) FX_SafeRealloc(ptr, size, sizeof(type))
+  (type*)FX_SafeRealloc(ptr, size, sizeof(type))
 
 #define FX_Free(ptr) free(ptr)
 
@@ -88,7 +88,7 @@ inline void* FX_ReallocOrDie(void* ptr,
 // Note that the function doesn't need an implementation, as we only
 // use its type.
 template <typename T, size_t N>
-char(&ArraySizeHelper(T(&array)[N]))[N];
+char (&ArraySizeHelper(T (&array)[N]))[N];
 
 // Used with std::unique_ptr to FX_Free raw memory.
 struct FxFreeDeleter {
@@ -109,4 +109,4 @@ std::unique_ptr<T> WrapUnique(T* ptr) {
 
 #endif  // __cplusplus
 
-#endif  // CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#endif  // CORE_FXCRT_FX_MEMORY_H_
diff --git a/core/fxcrt/include/fx_safe_types.h b/core/fxcrt/fx_safe_types.h
index f12e74906b..66dbc57681 100644
--- a/core/fxcrt/include/fx_safe_types.h
+++ b/core/fxcrt/fx_safe_types.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
-#define CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
+#ifndef CORE_FXCRT_FX_SAFE_TYPES_H_
+#define CORE_FXCRT_FX_SAFE_TYPES_H_
 
 #include <stdlib.h>  // For size_t.
 
-#include "core/fxcrt/include/fx_stream.h"  // for FX_FILESIZE.
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_stream.h"  // for FX_FILESIZE.
+#include "core/fxcrt/fx_system.h"
 #include "third_party/base/numerics/safe_math.h"
 
 typedef pdfium::base::CheckedNumeric<uint32_t> FX_SAFE_UINT32;
@@ -17,4 +17,4 @@ typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T;
 typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
 typedef pdfium::base::CheckedNumeric<FX_STRSIZE> FX_SAFE_STRSIZE;
 
-#endif  // CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
+#endif  // CORE_FXCRT_FX_SAFE_TYPES_H_
diff --git a/core/fxcrt/include/fx_stream.h b/core/fxcrt/fx_stream.h
index a91b59f285..5a5a650650 100644
--- a/core/fxcrt/include/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_STREAM_H_
-#define CORE_FXCRT_INCLUDE_FX_STREAM_H_
+#ifndef CORE_FXCRT_FX_STREAM_H_
+#define CORE_FXCRT_FX_STREAM_H_
 
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
 
 void* FX_OpenFolder(const FX_CHAR* path);
 void* FX_OpenFolder(const FX_WCHAR* path);
@@ -159,4 +159,4 @@ class IFX_BufferRead : public IFX_StreamRead {
   virtual FX_FILESIZE GetBlockOffset() = 0;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_FX_STREAM_H_
+#endif  // CORE_FXCRT_FX_STREAM_H_
diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/fx_string.h
index 6e9af221ca..0b6d8064d4 100644
--- a/core/fxcrt/include/fx_string.h
+++ b/core/fxcrt/fx_string.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_STRING_H_
-#define CORE_FXCRT_INCLUDE_FX_STRING_H_
+#ifndef CORE_FXCRT_FX_STRING_H_
+#define CORE_FXCRT_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
 
 #include <algorithm>
 #include <functional>
 
+#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/cfx_string_c_template.h"
 #include "core/fxcrt/cfx_string_data_template.h"
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
 
 class CFX_ByteString;
 class CFX_WideString;
@@ -311,7 +311,6 @@ class CFX_WideString {
   int Compare(const CFX_WideString& str) const;
   int CompareNoCase(const FX_WCHAR* str) const;
 
-
   CFX_WideString Mid(FX_STRSIZE first) const;
   CFX_WideString Mid(FX_STRSIZE first, FX_STRSIZE count) const;
   CFX_WideString Left(FX_STRSIZE count) const;
@@ -462,4 +461,4 @@ struct hash<CFX_WideString> {
 extern template struct std::hash<CFX_ByteString>;
 extern template struct std::hash<CFX_WideString>;
 
-#endif  // CORE_FXCRT_INCLUDE_FX_STRING_H_
+#endif  // CORE_FXCRT_FX_STRING_H_
diff --git a/core/fxcrt/include/fx_system.h b/core/fxcrt/fx_system.h
index 0542f33047..8364db3a4e 100644
--- a/core/fxcrt/include/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
-#define CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
+#ifndef CORE_FXCRT_FX_SYSTEM_H_
+#define CORE_FXCRT_FX_SYSTEM_H_
 
 #include <assert.h>
 #include <math.h>
@@ -124,8 +124,8 @@ void FXSYS_snprintf(char* str,
                     ...);
 void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap);
 #else
-#define FXSYS_snprintf (void) snprintf
-#define FXSYS_vsnprintf (void) vsnprintf
+#define FXSYS_snprintf (void)snprintf
+#define FXSYS_vsnprintf (void)vsnprintf
 #endif
 
 #define FXSYS_sprintf DO_NOT_USE_SPRINTF_DIE_DIE_DIE
@@ -339,4 +339,4 @@ int FXSYS_round(FX_FLOAT f);
 #define NEVER_INLINE __attribute__((__noinline__))
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
-#endif  // CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
+#endif  // CORE_FXCRT_FX_SYSTEM_H_
diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index b0a3249465..4ab37c7bdb 100644
--- a/core/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp
@@ -5,7 +5,7 @@
 #include <limits>
 #include <string>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/fxcrt/include/fx_ucd.h b/core/fxcrt/fx_ucd.h
index eeecd39cbf..23bacca0f6 100644
--- a/core/fxcrt/include/fx_ucd.h
+++ b/core/fxcrt/fx_ucd.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_UCD_H_
-#define CORE_FXCRT_INCLUDE_FX_UCD_H_
+#ifndef CORE_FXCRT_FX_UCD_H_
+#define CORE_FXCRT_FX_UCD_H_
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 #define FX_BIDICLASSBITS 6
 #define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS)
@@ -199,4 +199,4 @@ inline CFX_RTFChar::CFX_RTFChar(const CFX_RTFChar& other) = default;
 typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
 #endif  // PDF_ENABLE_XFA
 
-#endif  // CORE_FXCRT_INCLUDE_FX_UCD_H_
+#endif  // CORE_FXCRT_FX_UCD_H_
diff --git a/core/fxcrt/fx_ucddata.cpp b/core/fxcrt/fx_ucddata.cpp
index 1567d454f8..b8661b87cb 100644
--- a/core/fxcrt/fx_ucddata.cpp
+++ b/core/fxcrt/fx_ucddata.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ucd.h"
 
 const uint32_t kTextLayoutCodeProperties[] = {
     0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93,
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index d042283a32..cfc24b5a0e 100644
--- a/core/fxcrt/fx_unicode.cpp
+++ b/core/fxcrt/fx_unicode.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_ucd.h"
 
 uint32_t FX_GetUnicodeProperties(FX_WCHAR wch) {
   size_t idx = static_cast<size_t>(wch);
diff --git a/core/fxcrt/include/fx_xml.h b/core/fxcrt/fx_xml.h
index 4db4998c32..78f162597f 100644
--- a/core/fxcrt/include/fx_xml.h
+++ b/core/fxcrt/fx_xml.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_INCLUDE_FX_XML_H_
-#define CORE_FXCRT_INCLUDE_FX_XML_H_
+#ifndef CORE_FXCRT_FX_XML_H_
+#define CORE_FXCRT_FX_XML_H_
 
 #include <memory>
 #include <vector>
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 class CXML_AttrItem {
  public:
@@ -170,4 +170,4 @@ class CXML_Element {
   friend class CXML_Composer;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_FX_XML_H_
+#endif  // CORE_FXCRT_FX_XML_H_
diff --git a/core/fxcrt/fx_xml_composer.cpp b/core/fxcrt/fx_xml_composer.cpp
index 1bad069c34..91118a0a65 100644
--- a/core/fxcrt/fx_xml_composer.cpp
+++ b/core/fxcrt/fx_xml_composer.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxcrt/xml_int.h"
 
-#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxcrt/fx_xml.h"
 
 void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName,
                                CFX_ByteStringC& bsSpace,
diff --git a/core/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp
index 926196786a..a7026e9bb1 100644
--- a/core/fxcrt/fx_xml_parser.cpp
+++ b/core/fxcrt/fx_xml_parser.cpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_xml.h"
 #include "third_party/base/stl_util.h"
 
 CXML_DataBufAcc::CXML_DataBufAcc(const uint8_t* pBuffer, size_t size)
diff --git a/core/fxcrt/fxcrt_posix.cpp b/core/fxcrt/fxcrt_posix.cpp
index 053f89c2c9..b5efdc28f4 100644
--- a/core/fxcrt/fxcrt_posix.cpp
+++ b/core/fxcrt/fxcrt_posix.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxcrt/fxcrt_posix.h"
 
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
diff --git a/core/fxcrt/fxcrt_stream.cpp b/core/fxcrt/fxcrt_stream.cpp
index d96369b81c..a8c96bf02c 100644
--- a/core/fxcrt/fxcrt_stream.cpp
+++ b/core/fxcrt/fxcrt_stream.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_stream.h"
 
 FX_BOOL IFX_FileWrite::WriteBlock(const void* pData, size_t size) {
   return WriteBlock(pData, GetSize(), size);
diff --git a/core/fxcrt/fxcrt_windows.cpp b/core/fxcrt/fxcrt_windows.cpp
index 271cc8fda8..ec16373f02 100644
--- a/core/fxcrt/fxcrt_windows.cpp
+++ b/core/fxcrt/fxcrt_windows.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxcrt/fxcrt_windows.h"
 
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
diff --git a/core/fxcrt/plex.h b/core/fxcrt/plex.h
index 5391566d7b..8d00ef569e 100644
--- a/core/fxcrt/plex.h
+++ b/core/fxcrt/plex.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FXCRT_PLEX_H_
 #define CORE_FXCRT_PLEX_H_
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 
 struct CFX_Plex {
   CFX_Plex* pNext;
diff --git a/core/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index 121441b0c4..47997062cc 100644
--- a/core/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -9,7 +9,7 @@
 
 #include <algorithm>
 
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_stream.h"
 
 class CFX_UTF8Decoder;
 class CXML_Element;