Move core/include/fxcrt to core/fxcrt/include.
This CL moves the fxcrt code into the core/fxcrt directory. The only exception
was fx_bidi.h which was moved into core/fxcrt as it is not used outside of
core/.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1825953002 .
diff --git a/BUILD.gn b/BUILD.gn
index 40165ae..753e5a7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -575,6 +575,7 @@
"core/fxcrt/fx_basic_util.cpp",
"core/fxcrt/fx_basic_wstring.cpp",
"core/fxcrt/fx_bidi.cpp",
+ "core/fxcrt/fx_bidi.h",
"core/fxcrt/fx_extension.cpp",
"core/fxcrt/fx_ucddata.cpp",
"core/fxcrt/fx_unicode.cpp",
@@ -587,26 +588,25 @@
"core/fxcrt/fxcrt_stream.cpp",
"core/fxcrt/fxcrt_windows.cpp",
"core/fxcrt/fxcrt_windows.h",
+ "core/fxcrt/include/fx_basic.h",
+ "core/fxcrt/include/fx_coordinates.h",
+ "core/fxcrt/include/fx_ext.h",
+ "core/fxcrt/include/fx_memory.h",
+ "core/fxcrt/include/fx_safe_types.h",
+ "core/fxcrt/include/fx_stream.h",
+ "core/fxcrt/include/fx_string.h",
+ "core/fxcrt/include/fx_system.h",
+ "core/fxcrt/include/fx_ucd.h",
+ "core/fxcrt/include/fx_xml.h",
"core/fxcrt/plex.h",
"core/fxcrt/xml_int.h",
- "core/include/fxcrt/fx_basic.h",
- "core/include/fxcrt/fx_bidi.h",
- "core/include/fxcrt/fx_coordinates.h",
- "core/include/fxcrt/fx_ext.h",
- "core/include/fxcrt/fx_memory.h",
- "core/include/fxcrt/fx_safe_types.h",
- "core/include/fxcrt/fx_stream.h",
- "core/include/fxcrt/fx_string.h",
- "core/include/fxcrt/fx_system.h",
- "core/include/fxcrt/fx_ucd.h",
- "core/include/fxcrt/fx_xml.h",
]
if (pdf_enable_xfa) {
sources += [
"core/fxcrt/fx_arabic.cpp",
"core/fxcrt/fx_arabic.h",
"core/fxcrt/fx_basic_maps.cpp",
- "core/include/fxcrt/fx_arb.h",
+ "core/fxcrt/include/fx_arb.h",
]
}
configs += [ ":pdfium_config" ]
@@ -1055,6 +1055,28 @@
"xfa/fxbarcode/BC_Utils.cpp",
"xfa/fxbarcode/BC_Writer.cpp",
"xfa/fxbarcode/BC_Writer.h",
+ "xfa/fxbarcode/cbc_codabar.cpp",
+ "xfa/fxbarcode/cbc_codabar.h",
+ "xfa/fxbarcode/cbc_code128.cpp",
+ "xfa/fxbarcode/cbc_code128.h",
+ "xfa/fxbarcode/cbc_code39.cpp",
+ "xfa/fxbarcode/cbc_code39.h",
+ "xfa/fxbarcode/cbc_codebase.cpp",
+ "xfa/fxbarcode/cbc_codebase.h",
+ "xfa/fxbarcode/cbc_datamatrix.cpp",
+ "xfa/fxbarcode/cbc_datamatrix.h",
+ "xfa/fxbarcode/cbc_ean13.cpp",
+ "xfa/fxbarcode/cbc_ean13.h",
+ "xfa/fxbarcode/cbc_ean8.cpp",
+ "xfa/fxbarcode/cbc_ean8.h",
+ "xfa/fxbarcode/cbc_onecode.cpp",
+ "xfa/fxbarcode/cbc_onecode.h",
+ "xfa/fxbarcode/cbc_pdf417i.cpp",
+ "xfa/fxbarcode/cbc_pdf417i.h",
+ "xfa/fxbarcode/cbc_qrcode.cpp",
+ "xfa/fxbarcode/cbc_qrcode.h",
+ "xfa/fxbarcode/cbc_upca.cpp",
+ "xfa/fxbarcode/cbc_upca.h",
"xfa/fxbarcode/common/BC_CommonBitArray.cpp",
"xfa/fxbarcode/common/BC_CommonBitArray.h",
"xfa/fxbarcode/common/BC_CommonBitMatrix.cpp",
@@ -1129,6 +1151,7 @@
"xfa/fxbarcode/datamatrix/BC_TextEncoder.h",
"xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp",
"xfa/fxbarcode/datamatrix/BC_X12Encoder.h",
+ "xfa/fxbarcode/include/BC_Library.h",
"xfa/fxbarcode/oned/BC_OneDReader.cpp",
"xfa/fxbarcode/oned/BC_OneDReader.h",
"xfa/fxbarcode/oned/BC_OneDimReader.cpp",
@@ -1472,29 +1495,6 @@
"xfa/include/fwl/theme/scrollbartp.h",
"xfa/include/fwl/theme/utils.h",
"xfa/include/fwl/theme/widgettp.h",
- "xfa/fxbarcode/include/BC_Library.h",
- "xfa/fxbarcode/cbc_codebase.h",
- "xfa/fxbarcode/cbc_codebase.cpp",
- "xfa/fxbarcode/cbc_onecode.h",
- "xfa/fxbarcode/cbc_onecode.cpp",
- "xfa/fxbarcode/cbc_code39.h",
- "xfa/fxbarcode/cbc_code39.cpp",
- "xfa/fxbarcode/cbc_codabar.h",
- "xfa/fxbarcode/cbc_ean13.h",
- "xfa/fxbarcode/cbc_ean13.cpp",
- "xfa/fxbarcode/cbc_upca.h",
- "xfa/fxbarcode/cbc_upca.cpp",
- "xfa/fxbarcode/cbc_qrcode.h",
- "xfa/fxbarcode/cbc_qrcode.cpp",
- "xfa/fxbarcode/cbc_pdf417i.h",
- "xfa/fxbarcode/cbc_pdf417i.cpp",
- "xfa/fxbarcode/cbc_datamatrix.h",
- "xfa/fxbarcode/cbc_datamatrix.cpp",
- "xfa/fxbarcode/cbc_codabar.cpp",
- "xfa/fxbarcode/cbc_code128.h",
- "xfa/fxbarcode/cbc_code128.cpp",
- "xfa/fxbarcode/cbc_ean8.h",
- "xfa/fxbarcode/cbc_ean8.cpp",
"xfa/include/fxfa/fxfa.h",
"xfa/include/fxfa/fxfa_basic.h",
"xfa/include/fxfa/fxfa_objectacc.h",
diff --git a/core/fdrm/crypto/include/fx_crypt.h b/core/fdrm/crypto/include/fx_crypt.h
index fdba0e7..4563b7f 100644
--- a/core/fdrm/crypto/include/fx_crypt.h
+++ b/core/fdrm/crypto/include/fx_crypt.h
@@ -7,7 +7,7 @@
#ifndef CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
#define CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
index 51c5b1e..086a786 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize().
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().
static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = {
{"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None,
diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
index cf29fe7..95d2315 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize().
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().
static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
{"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
index a214623..8c43d41 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize().
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().
static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
{"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
index d693215..0001aaa 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize().
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().
static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = {
{"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467,
diff --git a/core/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/fpdf_cmaps/cmap_int.h
index 8dea4b4..9b8db21 100644
--- a/core/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
#define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
struct FXCMAP_CMap {
enum MapType { None, Single, Range, Reverse };
diff --git a/core/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/fpdf_edit/editint.h
index 2e4b0cc..8a73f12 100644
--- a/core/fpdfapi/fpdf_edit/editint.h
+++ b/core/fpdfapi/fpdf_edit/editint.h
@@ -9,9 +9,9 @@
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_stream.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Creator;
class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index 41bb99d..f774d01 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -21,7 +21,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
#include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "third_party/base/stl_util.h"
#define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024)
diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
index 2132457..0488266 100644
--- a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
+++ b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_CREATOR_H_
#define CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_CREATOR_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h
index 8aea084..53446c3 100644
--- a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h
+++ b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h
@@ -8,9 +8,9 @@
#define CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_PAGECONTENTGENERATOR_H_
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Object;
class CPDF_Page;
diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h
index bb209d8..74380f1 100644
--- a/core/fpdfapi/fpdf_font/font_int.h
+++ b/core/fpdfapi/fpdf_font/font_int.h
@@ -10,8 +10,8 @@
#include <map>
#include <memory>
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_basic.h"
class CPDF_CID2UnicodeMap;
class CPDF_CMap;
diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
index d079110..8dc9161 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -15,8 +15,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
index b952cda..c73043a 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -12,8 +12,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h
index 47ae5a1..e0bdcc7 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.h
@@ -11,7 +11,7 @@
#include <map>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fxge/fx_font.h"
#include "core/include/fxge/fx_freetype.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.h b/core/fpdfapi/fpdf_page/cpdf_allstates.h
index 700072f..9af917a 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.h
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_
#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
index 77a506e..e7f3e37 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
#include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Color;
class CPDF_ColorSpace;
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
index 304410b..319fea5 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_system.h"
class CPDF_ColorStateData {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
index 35e4a96..056edc2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_
#include "core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_ContentMark : public CFX_CountRef<CPDF_ContentMarkData> {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
index 4cf859f..773fea7 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
index 0a9ca1a..f46592d 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
index cd1bb69..3d091ab 100644
--- a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
+++ b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_ParseOptions {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.h b/core/fpdfapi/fpdf_page/cpdf_textstate.h
index 8530322..cfb4b28 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Font;
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
index 4bf7c06..cea7d6b 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -15,7 +15,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions_impl.h"
namespace {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 87ed097..c0d7c08 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -24,9 +24,9 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_safe_types.h"
CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize) {
m_pBuf = pData;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
index 4631e82..e265cd4 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
@@ -9,9 +9,9 @@
#include "core/fpdfapi/fpdf_page/cpdf_clippathdata.h"
#include "core/fpdfapi/fpdf_page/include/cpdf_path.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_TextObject;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
index 47d40e0..234cd73 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_FORMOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class Form;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
index 3495b6c..ab1e940 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_GeneralState : public CFX_CountRef<CPDF_GeneralStateData> {
public:
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
index f2e5510..df75602 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
class CPDF_TransferFunc;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
index dec60c9..9b983cc 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_IMAGEOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_Image;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_page.h b/core/fpdfapi/fpdf_page/include/cpdf_page.h
index 5e27ba2..3ede3c9 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_page.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_page.h
@@ -8,9 +8,9 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Document;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
index 2f55547..8e7da81 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_TextObject;
class CPDF_PathObject;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
index b0ab376..7ac9f2c 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGEOBJECTHOLDER_H_
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_Pause;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h
index a901154..f13b271 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_ge.h"
class CPDF_Path : public CFX_CountRef<CFX_PathData> {
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
index 30df0c2..296cdf8 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
#include "core/fpdfapi/fpdf_page/include/cpdf_path.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_PathObject : public CPDF_PageObject {
public:
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
index f43a1e3..ae2ee90 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_SHADINGOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_ShadingPattern;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
index 9aaa2f0..bb268c1 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
struct CPDF_TextObjectItem {
FX_DWORD m_CharCode;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
index 1fcc1fe..feed1a0 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Font;
class CPDF_Document;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_boolean.h b/core/fpdfapi/fpdf_parser/cpdf_boolean.h
index 9a35153..c92bf41 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_boolean.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_boolean.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_BOOLEAN_H_
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Boolean : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
index 1f7f70f..c5576ae 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
@@ -16,8 +16,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/base/stl_util.h"
IPDF_DataAvail::IPDF_DataAvail(IPDF_DataAvail::FileAvail* pFileAvail,
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
index c30093d..4c8d371 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
#include "core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Dictionary;
class CPDF_IndirectObjectHolder;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
index 166c68d..0dd8692 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_safe_types.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
index 325f576..3271f5e 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
@@ -10,8 +10,8 @@
#include <vector>
#include "core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_stream.h"
class CFX_BitStream;
class CPDF_DataAvail;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object.cpp b/core/fpdfapi/fpdf_parser/cpdf_object.cpp
index ad00cc1..9a190a7 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_object.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_object.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "third_party/base/stl_util.h"
CPDF_Object::~CPDF_Object() {}
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
index 529b6c4..84ad7cf 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
@@ -17,7 +17,7 @@
#include <vector>
#include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
index 3ee53e6..e9896d8 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp
@@ -19,8 +19,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
index dc4d757..7a08511 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
@@ -7,8 +7,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_stream.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
index cfb0b33..67287df 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
@@ -7,7 +7,7 @@
#include <string>
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
index 7acaabc..8c1629c 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_
#include "core/fpdfapi/fpdf_parser/ipdf_security_handler.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Array;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
index 9e5cb9d..00e2ee6 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
@@ -21,7 +21,7 @@
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
#include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "third_party/base/numerics/safe_math.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
index 842b35f..2e613d5 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Dictionary;
class CPDF_IndirectObjectHolder;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
index 53a01e0..bfb6ead 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
@@ -7,8 +7,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_stream.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
index 75ff11c..e6f531d 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -13,8 +13,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "third_party/base/stl_util.h"
#define _STREAM_MAX_SIZE_ 20 * 1024 * 1024
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 9e8d334..4fd26b9 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
@@ -7,7 +7,7 @@
#include <cstring>
#include <string>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "testing/embedder_test.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
index ffd4388..a4cc85a 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
@@ -14,7 +14,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
// Indexed by 8-bit character code, contains either:
// 'W' - for whitespace: NUL, TAB, CR, LF, FF, SPACE, 0x80, 0xff
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h
index d0410eec..d072fbc 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
#define CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_FileRead;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/include/cfdf_document.h b/core/fpdfapi/fpdf_parser/include/cfdf_document.h
index bd68789..f01039c 100644
--- a/core/fpdfapi/fpdf_parser/include/cfdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cfdf_document.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_array.h b/core/fpdfapi/fpdf_parser/include/cpdf_array.h
index a166454..2ee7760 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_array.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_array.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_Array : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
index 896db62..ebc5cee 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
@@ -10,8 +10,8 @@
#include <map>
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
class CPDF_IndirectObjectHolder;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
index 56e41b4..02a55dd 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CFX_Font;
class CFX_Matrix;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
index 9fa6770..373159d 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
@@ -9,7 +9,7 @@
#include <map>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Object;
class CPDF_Parser;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_number.h b/core/fpdfapi/fpdf_parser/include/cpdf_number.h
index 8958635..7b93a99 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_number.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_number.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_NUMBER_H_
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Number : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_object.h b/core/fpdfapi/fpdf_parser/include/cpdf_object.h
index 9149510..cc461d6 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_object.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_object.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_OBJECT_H_
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_OBJECT_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Array;
class CPDF_Boolean;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
index d5c5216..933ab1c 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h
@@ -11,7 +11,7 @@
#include <memory>
#include <set>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h
index a2a39f1..0bd3b8d 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_SIMPLE_PARSER_H_
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_SIMPLE_PARSER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_SimpleParser {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_stream.h b/core/fpdfapi/fpdf_parser/include/cpdf_stream.h
index 4385383..20045d7 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_stream.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_stream.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_stream.h"
class CPDF_Stream : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h b/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h
index 6920579..8fad265 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_StreamAcc {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_string.h b/core/fpdfapi/fpdf_parser/include/cpdf_string.h
index 088fe6e..77e41ec 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_string.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_string.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_STRING_H_
#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_String : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h b/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h
index 6904099..4a1d66c 100644
--- a/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h
+++ b/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_FPDF_PARSER_DECODE_H_
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_FPDF_PARSER_DECODE_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h b/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h
index 90d137c..d92c06d 100644
--- a/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h
+++ b/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_IPDF_DATA_AVAIL_H_
#define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_IPDF_DATA_AVAIL_H_
-#include "core/include/fxcrt/fx_stream.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Document;
class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h b/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h
index a100076..8e83589 100644
--- a/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h
+++ b/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_CRYPTO_HANDLER_H_
#define CORE_FPDFAPI_FPDF_PARSER_IPDF_CRYPTO_HANDLER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Dictionary;
class IPDF_SecurityHandler;
diff --git a/core/fpdfapi/fpdf_parser/ipdf_occontext.h b/core/fpdfapi/fpdf_parser/ipdf_occontext.h
index 6c41003..0108787 100644
--- a/core/fpdfapi/fpdf_parser/ipdf_occontext.h
+++ b/core/fpdfapi/fpdf_parser/ipdf_occontext.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_OCCONTEXT_H_
#define CORE_FPDFAPI_FPDF_PARSER_IPDF_OCCONTEXT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Dictionary;
class CPDF_PageObject;
diff --git a/core/fpdfapi/fpdf_parser/ipdf_security_handler.h b/core/fpdfapi/fpdf_parser/ipdf_security_handler.h
index c73c4c5..fd70b1f 100644
--- a/core/fpdfapi/fpdf_parser/ipdf_security_handler.h
+++ b/core/fpdfapi/fpdf_parser/ipdf_security_handler.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_SECURITY_HANDLER_H_
#define CORE_FPDFAPI_FPDF_PARSER_IPDF_SECURITY_HANDLER_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Parser;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h b/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h
index 26d71ef..578700c 100644
--- a/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h
+++ b/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h
@@ -9,7 +9,7 @@
#include <map>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Stream;
class CPDF_ImageCacheEntry;
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index e160164..bda2a44 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -21,8 +21,8 @@
#include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
#include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
#include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxge/fx_ge.h"
FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj,
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 193d087..5c4f7f5 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -18,8 +18,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
#include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxge/fx_ge.h"
namespace {
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h b/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h
index e5c0d9d..11ece71 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h
@@ -11,8 +11,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
#include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_RenderOptions;
class CPDF_RenderStatus;
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h b/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h
index 4c55658..b2566ad 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDERCONTEXT_H_
#define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDERCONTEXT_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
index c0911e7..f28fae4 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDEROPTIONS_H_
#define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDEROPTIONS_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
class IPDF_OCContext;
diff --git a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
index 1cf67cd..7c04e4a 100644
--- a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
+++ b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_TEXTRENDERER_H_
#define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_TEXTRENDERER_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
class CFX_RenderDevice;
diff --git a/core/fpdfapi/include/cpdf_modulemgr.h b/core/fpdfapi/include/cpdf_modulemgr.h
index 5449b08..a8be5af 100644
--- a/core/fpdfapi/include/cpdf_modulemgr.h
+++ b/core/fpdfapi/include/cpdf_modulemgr.h
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fpdfapi/ipdf_pagemodule.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CCodec_ModuleMgr;
class ICodec_FaxModule;
diff --git a/core/fpdfdoc/doc_metadata.cpp b/core/fpdfdoc/doc_metadata.cpp
index 5526b8d..c466193 100644
--- a/core/fpdfdoc/doc_metadata.cpp
+++ b/core/fpdfdoc/doc_metadata.cpp
@@ -7,8 +7,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_xml.h"
CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) {
CPDF_Dictionary* pRoot = pDoc->GetRoot();
diff --git a/core/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp
index b6843ba..2e267fd 100644
--- a/core/fpdftext/fpdf_text_int.cpp
+++ b/core/fpdftext/fpdf_text_int.cpp
@@ -22,10 +22,10 @@
#include "core/fpdftext/include/ipdf_textpage.h"
#include "core/fpdftext/include/ipdf_textpagefind.h"
#include "core/fpdftext/unicodenormalization.h"
+#include "core/fxcrt/fx_bidi.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_ucd.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_bidi.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_ucd.h"
#include "third_party/base/stl_util.h"
#define FPDFTEXT_RLTB 1
diff --git a/core/fpdftext/fpdf_text_int.h b/core/fpdftext/fpdf_text_int.h
index be6b0bf..a4274d7 100644
--- a/core/fpdftext/fpdf_text_int.h
+++ b/core/fpdftext/fpdf_text_int.h
@@ -16,7 +16,7 @@
#include "core/fpdftext/include/ipdf_linkextract.h"
#include "core/fpdftext/include/ipdf_textpage.h"
#include "core/fpdftext/include/ipdf_textpagefind.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CFX_BidiChar;
class CPDF_FormObject;
diff --git a/core/fpdftext/include/ipdf_linkextract.h b/core/fpdftext/include/ipdf_linkextract.h
index 2d7fe02..c1a5f2f 100644
--- a/core/fpdftext/include/ipdf_linkextract.h
+++ b/core/fpdftext/include/ipdf_linkextract.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFTEXT_INCLUDE_IPDF_LINKEXTRACT_H_
#define CORE_FPDFTEXT_INCLUDE_IPDF_LINKEXTRACT_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
#include "core/fpdftext/include/ipdf_textpage.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class IPDF_LinkExtract {
public:
diff --git a/core/fpdftext/include/ipdf_textpage.h b/core/fpdftext/include/ipdf_textpage.h
index ad3bea8..3849cd4 100644
--- a/core/fpdftext/include/ipdf_textpage.h
+++ b/core/fpdftext/include/ipdf_textpage.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGE_H_
#define CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGE_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_TextObject;
class CPDF_Page;
diff --git a/core/fpdftext/include/ipdf_textpagefind.h b/core/fpdftext/include/ipdf_textpagefind.h
index 88774b6..b13432b 100644
--- a/core/fpdftext/include/ipdf_textpagefind.h
+++ b/core/fpdftext/include/ipdf_textpagefind.h
@@ -8,8 +8,8 @@
#define CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGEFIND_H_
#include "core/fpdftext/include/ipdf_textpage.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
class IPDF_TextPageFind {
public:
diff --git a/core/fpdftext/unicodenormalization.cpp b/core/fpdftext/unicodenormalization.cpp
index dd563e5..67ab57c 100644
--- a/core/fpdftext/unicodenormalization.cpp
+++ b/core/fpdftext/unicodenormalization.cpp
@@ -7,7 +7,7 @@
#include "core/fpdftext/unicodenormalization.h"
#include "core/fpdftext/unicodenormalizationdata.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
namespace {
diff --git a/core/fpdftext/unicodenormalization.h b/core/fpdftext/unicodenormalization.h
index d9beafb..ee3c8b2 100644
--- a/core/fpdftext/unicodenormalization.h
+++ b/core/fpdftext/unicodenormalization.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFTEXT_UNICODENORMALIZATION_H_
#define CORE_FPDFTEXT_UNICODENORMALIZATION_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
diff --git a/core/fpdftext/unicodenormalizationdata.cpp b/core/fpdftext/unicodenormalizationdata.cpp
index b22625c..e124bf4 100644
--- a/core/fpdftext/unicodenormalizationdata.cpp
+++ b/core/fpdftext/unicodenormalizationdata.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fpdftext/unicodenormalizationdata.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
const uint16_t g_UnicodeData_Normalization[65536] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index f1298f9..92dba69 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -10,8 +10,8 @@
#include <utility>
#include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/base/logging.h"
CCodec_ModuleMgr::CCodec_ModuleMgr()
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index efbeb79..1b0dff7 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -7,8 +7,8 @@
#include <setjmp.h>
#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxge/fx_dib.h"
extern "C" {
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index a57b93d..607f082 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -9,9 +9,9 @@
#include <vector>
#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fpdfapi/fpdf_resource.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_safe_types.h"
#include "third_party/lcms2-2.6/include/lcms2.h"
#include "third_party/libopenjpeg20/openjpeg.h"
diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index c9ee389..e4335cc 100644
--- a/core/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -7,9 +7,9 @@
#ifndef CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
#define CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
+#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_memory.h"
-#include "core/include/fxcrt/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#define FXCODEC_BLOCK_SIZE 4096
diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
index 1673110..f6981a1 100644
--- a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
@@ -7,7 +7,7 @@
#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
#include "core/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace {
diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 6359467..720b96e 100644
--- a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -8,7 +8,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace {
diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
index 9a04504..50327cc 100644
--- a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithIntDecoder {
public:
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h
index 37b18b5..45eb44c 100644
--- a/core/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/fxcodec/jbig2/JBig2_BitStream.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
#define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_StreamAcc;
diff --git a/core/fxcodec/jbig2/JBig2_Define.h b/core/fxcodec/jbig2/JBig2_Define.h
index 5149c19..d12302b 100644
--- a/core/fxcodec/jbig2/JBig2_Define.h
+++ b/core/fxcodec/jbig2/JBig2_Define.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_DEFINE_H_
#define CORE_FXCODEC_JBIG2_JBIG2_DEFINE_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#define JBIG2_memset FXSYS_memset
#define JBIG2_memcmp FXSYS_memcmp
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h
index 9d7f8b0..2a638aa 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -7,9 +7,9 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
#define CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxcodec/fx_codec_def.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_BitStream;
diff --git a/core/fxcodec/jbig2/JBig2_GrrdProc.h b/core/fxcodec/jbig2/JBig2_GrrdProc.h
index 36cfdca..2c6d02d 100644
--- a/core/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
#define CORE_FXCODEC_JBIG2_JBIG2_GRRDPROC_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_Image;
diff --git a/core/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/fxcodec/jbig2/JBig2_GsidProc.cpp
index f1a566a..2ac96fc 100644
--- a/core/fxcodec/jbig2/JBig2_GsidProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GsidProc.cpp
@@ -12,7 +12,7 @@
#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
#include "core/fxcodec/jbig2/JBig2_Image.h"
#include "core/fxcodec/jbig2/JBig2_List.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
JBig2ArithCtx* gbContext,
diff --git a/core/fxcodec/jbig2/JBig2_GsidProc.h b/core/fxcodec/jbig2/JBig2_GsidProc.h
index 50c24ea..8124db5 100644
--- a/core/fxcodec/jbig2/JBig2_GsidProc.h
+++ b/core/fxcodec/jbig2/JBig2_GsidProc.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
#define CORE_FXCODEC_JBIG2_JBIG2_GSIDPROC_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_BitStream;
diff --git a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp
index daee067..a9f1534 100644
--- a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp
@@ -9,7 +9,7 @@
#include <memory>
#include "core/fxcodec/jbig2/JBig2_GsidProc.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
JBig2ArithCtx* gbContext,
diff --git a/core/fxcodec/jbig2/JBig2_HtrdProc.h b/core/fxcodec/jbig2/JBig2_HtrdProc.h
index 7766ce6..62ae57d 100644
--- a/core/fxcodec/jbig2/JBig2_HtrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_HtrdProc.h
@@ -8,7 +8,7 @@
#define CORE_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
#include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_BitStream;
diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp b/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp
index f4a838e..7b18551 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable.cpp
@@ -12,7 +12,7 @@
#include "core/fxcodec/jbig2/JBig2_BitStream.h"
#include "core/fxcodec/jbig2/JBig2_Define.h"
#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
CJBig2_HuffmanTable::CJBig2_HuffmanTable(const JBig2TableLine* pTable,
FX_DWORD nLines,
diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable.h b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
index 892c19e..7a31cf6 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_BitStream;
struct JBig2TableLine;
diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp
index 8187534..97d325b 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_basic.h"
#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
+#include "core/fxcrt/include/fx_basic.h"
const bool HuffmanTable_HTOOB_B1 = false;
const JBig2TableLine HuffmanTable_B1[] = {{1, 4, 0},
diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
index 31b8197..4fb2d1e 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
#define CORE_FXCODEC_JBIG2_JBIG2_HUFFMANTABLE_STANDARD_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
struct JBig2TableLine {
uint8_t PREFLEN;
diff --git a/core/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp
index dddc1d2..bb36740 100644
--- a/core/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/fxcodec/jbig2/JBig2_Image.cpp
@@ -7,8 +7,8 @@
#include <limits.h>
#include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_safe_types.h"
CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
m_nWidth = w;
diff --git a/core/fxcodec/jbig2/JBig2_Page.h b/core/fxcodec/jbig2/JBig2_Page.h
index 81800ba..6a33549 100644
--- a/core/fxcodec/jbig2/JBig2_Page.h
+++ b/core/fxcodec/jbig2/JBig2_Page.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
#define CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
struct JBig2PageInfo {
FX_DWORD m_dwWidth;
diff --git a/core/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/fxcodec/jbig2/JBig2_PatternDict.cpp
index 58157ef..3db672e 100644
--- a/core/fxcodec/jbig2/JBig2_PatternDict.cpp
+++ b/core/fxcodec/jbig2/JBig2_PatternDict.cpp
@@ -6,7 +6,7 @@
#include "core/fxcodec/jbig2/JBig2_PatternDict.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
CJBig2_PatternDict::CJBig2_PatternDict() {
NUMPATS = 0;
diff --git a/core/fxcodec/jbig2/JBig2_PddProc.h b/core/fxcodec/jbig2/JBig2_PddProc.h
index 25f9412..ce0089a 100644
--- a/core/fxcodec/jbig2/JBig2_PddProc.h
+++ b/core/fxcodec/jbig2/JBig2_PddProc.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
#define CORE_FXCODEC_JBIG2_JBIG2_PDDPROC_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_BitStream;
diff --git a/core/fxcodec/jbig2/JBig2_SddProc.cpp b/core/fxcodec/jbig2/JBig2_SddProc.cpp
index cd6471d..54c0bb9 100644
--- a/core/fxcodec/jbig2/JBig2_SddProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_SddProc.cpp
@@ -17,7 +17,7 @@
#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
#include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
#include "core/fxcodec/jbig2/JBig2_TrdProc.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith(
CJBig2_ArithDecoder* pArithDecoder,
diff --git a/core/fxcodec/jbig2/JBig2_SddProc.h b/core/fxcodec/jbig2/JBig2_SddProc.h
index fa1211b..edfc372 100644
--- a/core/fxcodec/jbig2/JBig2_SddProc.h
+++ b/core/fxcodec/jbig2/JBig2_SddProc.h
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_BitStream;
class CJBig2_HuffmanTable;
diff --git a/core/fxcodec/jbig2/JBig2_Segment.cpp b/core/fxcodec/jbig2/JBig2_Segment.cpp
index a6bac36..64df0db 100644
--- a/core/fxcodec/jbig2/JBig2_Segment.cpp
+++ b/core/fxcodec/jbig2/JBig2_Segment.cpp
@@ -6,7 +6,7 @@
#include "core/fxcodec/jbig2/JBig2_Segment.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
CJBig2_Segment::CJBig2_Segment() {
m_dwNumber = 0;
diff --git a/core/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/fxcodec/jbig2/JBig2_SymbolDict.cpp
index 9fe3d54..c1f8e5a 100644
--- a/core/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -7,7 +7,7 @@
#include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
#include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
CJBig2_SymbolDict::CJBig2_SymbolDict() {}
diff --git a/core/fxcodec/jbig2/JBig2_SymbolDict.h b/core/fxcodec/jbig2/JBig2_SymbolDict.h
index 64ab881..b880d6b 100644
--- a/core/fxcodec/jbig2/JBig2_SymbolDict.h
+++ b/core/fxcodec/jbig2/JBig2_SymbolDict.h
@@ -12,7 +12,7 @@
#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
#include "core/fxcodec/jbig2/JBig2_List.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CJBig2_Image;
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.h b/core/fxcodec/jbig2/JBig2_TrdProc.h
index 090e564..d73e012 100644
--- a/core/fxcodec/jbig2/JBig2_TrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_TrdProc.h
@@ -8,7 +8,7 @@
#define CORE_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
#include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CJBig2_ArithDecoder;
class CJBig2_ArithIaidDecoder;
diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h
index 1c269c6..c0baf86 100644
--- a/core/fxcodec/lbmp/fx_bmp.h
+++ b/core/fxcodec/lbmp/fx_bmp.h
@@ -9,7 +9,7 @@
#include <setjmp.h>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define BMP_WIDTHBYTES(width, bitCount) ((width * bitCount) + 31) / 32 * 4
#define BMP_PAL_ENCODE(a, r, g, b) \
diff --git a/core/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h
index ad65d19..5ed9ce1 100644
--- a/core/fxcodec/lgif/fx_gif.h
+++ b/core/fxcodec/lgif/fx_gif.h
@@ -9,7 +9,7 @@
#include <setjmp.h>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define GIF_SIGNATURE "GIF"
#define GIF_SIG_EXTENSION 0x21
diff --git a/core/fxcrt/extension.h b/core/fxcrt/extension.h
index dbbc889..1789de3 100644
--- a/core/fxcrt/extension.h
+++ b/core/fxcrt/extension.h
@@ -9,8 +9,8 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_safe_types.h"
class IFXCRT_FileAccess {
public:
diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index f28b916..10113c9 100644
--- a/core/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcrt/fx_arabic.h"
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_ucd.h"
namespace {
diff --git a/core/fxcrt/fx_arabic.h b/core/fxcrt/fx_arabic.h
index f785e21..694bc51 100644
--- a/core/fxcrt/fx_arabic.h
+++ b/core/fxcrt/fx_arabic.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCRT_FX_ARABIC_H_
#define CORE_FXCRT_FX_ARABIC_H_
-#include "core/include/fxcrt/fx_arb.h"
+#include "core/fxcrt/include/fx_arb.h"
class CFX_ArabicChar : public IFX_ArabicChar {
public:
diff --git a/core/fxcrt/fx_basic_array.cpp b/core/fxcrt/fx_basic_array.cpp
index 18e2bd2..74988f7 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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/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 5d38d57..191694e 100644
--- a/core/fxcrt/fx_basic_bstring.cpp
+++ b/core/fxcrt/fx_basic_bstring.cpp
@@ -8,7 +8,7 @@
#include <cctype>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "third_party/base/numerics/safe_math.h"
static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) {
diff --git a/core/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp
index 337775d..834a6e4 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/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/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 a3039f4..aa899b6 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/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/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 4f723ef..4625bfd 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -6,8 +6,8 @@
#include <limits.h>
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/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 2c9c54c..440f924 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/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/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 eb1e066..1eac9e3 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/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/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 e893773..02afd47 100644
--- a/core/fxcrt/fx_basic_list.cpp
+++ b/core/fxcrt/fx_basic_list.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/plex.h"
-#include "core/include/fxcrt/fx_basic.h"
CFX_PtrList::CFX_PtrList(int nBlockSize)
: m_pNodeHead(NULL),
diff --git a/core/fxcrt/fx_basic_maps.cpp b/core/fxcrt/fx_basic_maps.cpp
index bad1868..935c998 100644
--- a/core/fxcrt/fx_basic_maps.cpp
+++ b/core/fxcrt/fx_basic_maps.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/plex.h"
-#include "core/include/fxcrt/fx_basic.h"
CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize)
: m_pHashTable(NULL),
diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp
index 1cbd293..94d978c 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/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/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 9821ca9..f69b132 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/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/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 1cddbc3..805f059 100644
--- a/core/fxcrt/fx_basic_plex.cpp
+++ b/core/fxcrt/fx_basic_plex.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcrt/include/fx_memory.h"
#include "core/fxcrt/plex.h"
-#include "core/include/fxcrt/fx_memory.h"
CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead,
FX_DWORD nMax,
diff --git a/core/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index 3625feb..08b9ca6 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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/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 2422212..3791862 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/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_ext.h"
#include <cctype>
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 89e3f8b..aa62b5e 100644
--- a/core/fxcrt/fx_basic_wstring.cpp
+++ b/core/fxcrt/fx_basic_wstring.cpp
@@ -9,8 +9,8 @@
#include <algorithm>
#include <cctype>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "third_party/base/numerics/safe_math.h"
namespace {
diff --git a/core/fxcrt/fx_basic_wstring_unittest.cpp b/core/fxcrt/fx_basic_wstring_unittest.cpp
index 64d694c..a64d7a9 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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/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 a7a3ecb..30b1a6d 100644
--- a/core/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_bidi.h"
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/fx_bidi.h"
+#include "core/fxcrt/include/fx_ucd.h"
#include <algorithm>
diff --git a/core/include/fxcrt/fx_bidi.h b/core/fxcrt/fx_bidi.h
similarity index 91%
rename from core/include/fxcrt/fx_bidi.h
rename to core/fxcrt/fx_bidi.h
index 4ea17da..309c6f5 100644
--- a/core/include/fxcrt/fx_bidi.h
+++ b/core/fxcrt/fx_bidi.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_BIDI_H_
-#define CORE_INCLUDE_FXCRT_FX_BIDI_H_
+#ifndef CORE_FXCRT_FX_BIDI_H_
+#define CORE_FXCRT_FX_BIDI_H_
#include <memory>
#include <vector>
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
// Processes characters and group them into segments based on text direction.
class CFX_BidiChar {
@@ -70,4 +70,4 @@
CFX_BidiChar::Direction m_eOverallDirection;
};
-#endif // CORE_INCLUDE_FXCRT_FX_BIDI_H_
+#endif // CORE_FXCRT_FX_BIDI_H_
diff --git a/core/fxcrt/fx_bidi_unittest.cpp b/core/fxcrt/fx_bidi_unittest.cpp
index a3c1487..2c1996b 100644
--- a/core/fxcrt/fx_bidi_unittest.cpp
+++ b/core/fxcrt/fx_bidi_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/include/fxcrt/fx_bidi.h"
+#include "core/fxcrt/fx_bidi.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index ef284a2..9919085 100644
--- a/core/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -5,8 +5,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcrt/extension.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/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 e2ae870..7714999 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/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
TEST(fxcrt, FXSYS_toHexDigit) {
EXPECT_EQ(10, FXSYS_toHexDigit('a'));
diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index f877eb2..b0a3249 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/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/fx_ucddata.cpp b/core/fxcrt/fx_ucddata.cpp
index 60ac01d..783d565 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/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_ucd.h"
const FX_DWORD kTextLayoutCodeProperties[] = {
0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93,
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index 9094c65..296ead8 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/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_ucd.h"
FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) {
size_t idx = static_cast<size_t>(wch);
diff --git a/core/fxcrt/fx_xml_composer.cpp b/core/fxcrt/fx_xml_composer.cpp
index 93aee89..1af6952 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/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/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 d5326d3..43f8c54 100644
--- a/core/fxcrt/fx_xml_parser.cpp
+++ b/core/fxcrt/fx_xml_parser.cpp
@@ -8,8 +8,8 @@
#include <vector>
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "third_party/base/stl_util.h"
CXML_Parser::~CXML_Parser() {
diff --git a/core/fxcrt/fxcrt_platforms.cpp b/core/fxcrt/fxcrt_platforms.cpp
index b4f6ffa..4305c41 100644
--- a/core/fxcrt/fxcrt_platforms.cpp
+++ b/core/fxcrt/fxcrt_platforms.cpp
@@ -6,7 +6,7 @@
#include "core/fxcrt/fxcrt_platforms.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#if (_FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ && \
_FXM_PLATFORM_ != _FXM_PLATFORM_LINUX_ && \
diff --git a/core/fxcrt/fxcrt_posix.cpp b/core/fxcrt/fxcrt_posix.cpp
index 161506d..02556c1 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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/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 2f50153..d96369b 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/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/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 528a3b7..61c0eb6 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/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
IFXCRT_FileAccess* FXCRT_FileAccess_Create() {
diff --git a/core/include/fxcrt/fx_arb.h b/core/fxcrt/include/fx_arb.h
similarity index 89%
rename from core/include/fxcrt/fx_arb.h
rename to core/fxcrt/include/fx_arb.h
index 57391de..6a0af83 100644
--- a/core/include/fxcrt/fx_arb.h
+++ b/core/fxcrt/include/fx_arb.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_ARB_H_
-#define CORE_INCLUDE_FXCRT_FX_ARB_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_ARB_H_
+#define CORE_FXCRT_INCLUDE_FX_ARB_H_
-#include "core/include/fxcrt/fx_system.h"
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/include/fx_ucd.h"
class IFX_ArabicChar;
@@ -63,4 +63,4 @@
int32_t iCount,
int32_t iBaseLevel = 0);
-#endif // CORE_INCLUDE_FXCRT_FX_ARB_H_
+#endif // CORE_FXCRT_INCLUDE_FX_ARB_H_
diff --git a/core/include/fxcrt/fx_basic.h b/core/fxcrt/include/fx_basic.h
similarity index 98%
rename from core/include/fxcrt/fx_basic.h
rename to core/fxcrt/include/fx_basic.h
index 277286c..3da2e03 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/fxcrt/include/fx_basic.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
-#define CORE_INCLUDE_FXCRT_FX_BASIC_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
+#define CORE_FXCRT_INCLUDE_FX_BASIC_H_
#include <algorithm>
#include <memory>
-#include "core/include/fxcrt/fx_memory.h"
-#include "core/include/fxcrt/fx_stream.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#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"
// The FX_ArraySize(arr) macro returns the # of elements in an array arr.
// The expression is a compile-time constant, and therefore can be
@@ -1150,4 +1150,4 @@
FX_FLOAT i;
};
-#endif // CORE_INCLUDE_FXCRT_FX_BASIC_H_
+#endif // CORE_FXCRT_INCLUDE_FX_BASIC_H_
diff --git a/core/include/fxcrt/fx_coordinates.h b/core/fxcrt/include/fx_coordinates.h
similarity index 98%
rename from core/include/fxcrt/fx_coordinates.h
rename to core/fxcrt/include/fx_coordinates.h
index 0422da1..a7f0b8d 100644
--- a/core/include/fxcrt/fx_coordinates.h
+++ b/core/fxcrt/include/fx_coordinates.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
-#define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
+#define CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CFX_Matrix;
@@ -669,4 +669,4 @@
FX_FLOAT f;
};
-#endif // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
+#endif // CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
diff --git a/core/include/fxcrt/fx_ext.h b/core/fxcrt/include/fx_ext.h
similarity index 95%
rename from core/include/fxcrt/fx_ext.h
rename to core/fxcrt/include/fx_ext.h
index 08f735b..2a39530 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/fxcrt/include/fx_ext.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
-#define CORE_INCLUDE_FXCRT_FX_EXT_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_EXT_H_
+#define CORE_FXCRT_INCLUDE_FX_EXT_H_
#include <cctype>
#include <cwctype>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal.
// Come up or wait for something better. This appears in this file rather
@@ -131,4 +131,4 @@
}
};
-#endif // CORE_INCLUDE_FXCRT_FX_EXT_H_
+#endif // CORE_FXCRT_INCLUDE_FX_EXT_H_
diff --git a/core/include/fxcrt/fx_memory.h b/core/fxcrt/include/fx_memory.h
similarity index 93%
rename from core/include/fxcrt/fx_memory.h
rename to core/fxcrt/include/fx_memory.h
index e1cc070..c3dafc8 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/fxcrt/include/fx_memory.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_MEMORY_H_
-#define CORE_INCLUDE_FXCRT_FX_MEMORY_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#define CORE_FXCRT_INCLUDE_FX_MEMORY_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#ifdef __cplusplus
extern "C" {
@@ -81,4 +81,4 @@
#endif // __cplusplus
-#endif // CORE_INCLUDE_FXCRT_FX_MEMORY_H_
+#endif // CORE_FXCRT_INCLUDE_FX_MEMORY_H_
diff --git a/core/include/fxcrt/fx_safe_types.h b/core/fxcrt/include/fx_safe_types.h
similarity index 70%
rename from core/include/fxcrt/fx_safe_types.h
rename to core/fxcrt/include/fx_safe_types.h
index 6ae3ee1..47eb55d 100644
--- a/core/include/fxcrt/fx_safe_types.h
+++ b/core/fxcrt/include/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_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
-#define CORE_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
+#define CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
#include <stdlib.h> // For size_t.
-#include "core/include/fxcrt/fx_stream.h" // for FX_FILESIZE.
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_stream.h" // for FX_FILESIZE.
+#include "core/fxcrt/include/fx_system.h"
#include "third_party/base/numerics/safe_math.h"
typedef pdfium::base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD;
@@ -17,4 +17,4 @@
typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
typedef pdfium::base::CheckedNumeric<FX_STRSIZE> FX_SAFE_STRSIZE;
-#endif // CORE_INCLUDE_FXCRT_FX_SAFE_TYPES_H_
+#endif // CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
diff --git a/core/include/fxcrt/fx_stream.h b/core/fxcrt/include/fx_stream.h
similarity index 95%
rename from core/include/fxcrt/fx_stream.h
rename to core/fxcrt/include/fx_stream.h
index d15d286..4b77796 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/fxcrt/include/fx_stream.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_
-#define CORE_INCLUDE_FXCRT_FX_STREAM_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_STREAM_H_
+#define CORE_FXCRT_INCLUDE_FX_STREAM_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
void* FX_OpenFolder(const FX_CHAR* path);
void* FX_OpenFolder(const FX_WCHAR* path);
@@ -159,4 +159,4 @@
virtual FX_FILESIZE GetBlockOffset() = 0;
};
-#endif // CORE_INCLUDE_FXCRT_FX_STREAM_H_
+#endif // CORE_FXCRT_INCLUDE_FX_STREAM_H_
diff --git a/core/include/fxcrt/fx_string.h b/core/fxcrt/include/fx_string.h
similarity index 98%
rename from core/include/fxcrt/fx_string.h
rename to core/fxcrt/include/fx_string.h
index afaf94b..4bca083 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/fxcrt/include/fx_string.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_
-#define CORE_INCLUDE_FXCRT_FX_STRING_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_STRING_H_
+#define CORE_FXCRT_INCLUDE_FX_STRING_H_
#include <stdint.h> // For intptr_t.
#include <algorithm>
-#include "core/include/fxcrt/fx_memory.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/include/fx_system.h"
class CFX_BinaryBuf;
class CFX_ByteString;
@@ -816,4 +816,4 @@
void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
-#endif // CORE_INCLUDE_FXCRT_FX_STRING_H_
+#endif // CORE_FXCRT_INCLUDE_FX_STRING_H_
diff --git a/core/include/fxcrt/fx_system.h b/core/fxcrt/include/fx_system.h
similarity index 94%
rename from core/include/fxcrt/fx_system.h
rename to core/fxcrt/include/fx_system.h
index 770b1e7..eb863c6 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/fxcrt/include/fx_system.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
-#define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
+#define CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
#include <assert.h>
#include <math.h>
@@ -67,13 +67,13 @@
#ifdef __cplusplus
extern "C" {
#endif
-typedef void* FX_POSITION; // Keep until fxcrt containers gone
-typedef uint32_t FX_DWORD; // Keep - "an efficient type"
-typedef float FX_FLOAT; // Keep, allow upgrade to doubles.
-typedef double FX_DOUBLE; // Keep, allow downgrade to floats.
-typedef int FX_BOOL; // Keep, sadly not always 0 or 1.
-typedef char FX_CHAR; // Keep, questionable signedness.
-typedef wchar_t FX_WCHAR; // Keep, maybe bad platform wchars.
+typedef void* FX_POSITION; // Keep until fxcrt containers gone
+typedef uint32_t FX_DWORD; // Keep - "an efficient type"
+typedef float FX_FLOAT; // Keep, allow upgrade to doubles.
+typedef double FX_DOUBLE; // Keep, allow downgrade to floats.
+typedef int FX_BOOL; // Keep, sadly not always 0 or 1.
+typedef char FX_CHAR; // Keep, questionable signedness.
+typedef wchar_t FX_WCHAR; // Keep, maybe bad platform wchars.
// PDFium string sizes are limited to 2^31-1, and the value is signed to
// allow -1 as a placeholder for "unknown".
@@ -317,4 +317,4 @@
#define NEVER_INLINE __attribute__((__noinline__))
#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-#endif // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
+#endif // CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
diff --git a/core/include/fxcrt/fx_ucd.h b/core/fxcrt/include/fx_ucd.h
similarity index 96%
rename from core/include/fxcrt/fx_ucd.h
rename to core/fxcrt/include/fx_ucd.h
index de7fecc..f2e4215 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/fxcrt/include/fx_ucd.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_
-#define CORE_INCLUDE_FXCRT_FX_UCD_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_UCD_H_
+#define CORE_FXCRT_INCLUDE_FX_UCD_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define FX_BIDICLASSBITS 6
#define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS)
@@ -189,4 +189,4 @@
typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
#endif // PDF_ENABLE_XFA
-#endif // CORE_INCLUDE_FXCRT_FX_UCD_H_
+#endif // CORE_FXCRT_INCLUDE_FX_UCD_H_
diff --git a/core/include/fxcrt/fx_xml.h b/core/fxcrt/include/fx_xml.h
similarity index 96%
rename from core/include/fxcrt/fx_xml.h
rename to core/fxcrt/include/fx_xml.h
index f18392c..66add1b 100644
--- a/core/include/fxcrt/fx_xml.h
+++ b/core/fxcrt/include/fx_xml.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_INCLUDE_FXCRT_FX_XML_H_
-#define CORE_INCLUDE_FXCRT_FX_XML_H_
+#ifndef CORE_FXCRT_INCLUDE_FX_XML_H_
+#define CORE_FXCRT_INCLUDE_FX_XML_H_
#include <memory>
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CXML_AttrItem {
public:
@@ -166,4 +166,4 @@
friend class CXML_Composer;
};
-#endif // CORE_INCLUDE_FXCRT_FX_XML_H_
+#endif // CORE_FXCRT_INCLUDE_FX_XML_H_
diff --git a/core/fxcrt/plex.h b/core/fxcrt/plex.h
index 25fca64..8bb9607 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/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
struct CFX_Plex {
CFX_Plex* pNext;
diff --git a/core/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index 18dbf9b..9a2c28c 100644
--- a/core/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -9,7 +9,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_stream.h"
class CFX_UTF8Decoder;
class CXML_Element;
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index b94ec05..58b937f 100644
--- a/core/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h
index f1ccedb..d077f38 100644
--- a/core/fxge/android/fpf_skiafont.h
+++ b/core/fxge/android/fpf_skiafont.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
#define CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp
index e9249ba..13d030c 100644
--- a/core/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/fxge/android/fpf_skiafontmgr.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
@@ -13,9 +13,9 @@
#define FPF_SKIAMATCHWEIGHT_1 16
#define FPF_SKIAMATCHWEIGHT_2 8
+#include "core/fxcrt/include/fx_ext.h"
#include "core/fxge/android/fpf_skiafont.h"
#include "core/fxge/android/fpf_skiafontmgr.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#ifdef __cplusplus
diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
index 9f5cafb..5ba5b16 100644
--- a/core/fxge/android/fpf_skiafontmgr.h
+++ b/core/fxge/android/fpf_skiafontmgr.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
#define CORE_FXGE_ANDROID_FPF_SKIAFONTMGR_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fpf_skiamodule.cpp b/core/fxge/android/fpf_skiamodule.cpp
index 91f00c7..0454524 100644
--- a/core/fxge/android/fpf_skiamodule.cpp
+++ b/core/fxge/android/fpf_skiamodule.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fx_android_font.cpp b/core/fxge/android/fx_android_font.cpp
index 58d20fa..7218b5e 100644
--- a/core/fxge/android/fx_android_font.cpp
+++ b/core/fxge/android/fx_android_font.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fx_android_font.h b/core/fxge/android/fx_android_font.h
index ef8062d..1ce4694 100644
--- a/core/fxge/android/fx_android_font.h
+++ b/core/fxge/android/fx_android_font.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_
#define CORE_FXGE_ANDROID_FX_ANDROID_FONT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp
index 6d04e4f..3fac370 100644
--- a/core/fxge/android/fx_android_imp.cpp
+++ b/core/fxge/android/fx_android_imp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h
index c2b2714..037eca7 100644
--- a/core/fxge/apple/apple_int.h
+++ b/core/fxge/apple/apple_int.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_APPLE_APPLE_INT_H_
#define CORE_FXGE_APPLE_APPLE_INT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index 8aae334..33dfbbc 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_ge.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index 006f701..dae396f 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcrt/include/fx_ext.h"
#include "core/fxge/agg/fx_agg_driver.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index 85888fe..7022ec9 100644
--- a/core/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "core/include/fxge/fx_dib.h"
class IFX_ScanlineComposer;
diff --git a/core/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp
index de84de2..90793c4 100644
--- a/core/fxge/ge/fx_ge_path.cpp
+++ b/core/fxge/ge/fx_ge_path.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_ge.h"
#include "third_party/base/numerics/safe_math.h"
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 379f53a..f309114 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_font.h"
class CFX_CTTGSUBTable;
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index bce7e49..e209fcf 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h" // For FX_RECT.
#include "core/include/fxcodec/fx_codec_def.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h" // For FX_RECT.
class CFX_DIBSource;
class CJPX_Decoder;
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
index 11e2bf1..6e59678 100644
--- a/core/include/fxge/fpf.h
+++ b/core/include/fxge/fpf.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FXGE_FPF_H_
#define CORE_INCLUDE_FXGE_FPF_H_
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class IFPF_FontMgr;
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index 837e5d5..bc89544 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -7,8 +7,8 @@
#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
#define CORE_INCLUDE_FXGE_FX_DIB_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
enum FXDIB_Format {
FXDIB_Invalid = 0,
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 2902145..900f139 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
typedef struct FT_FaceRec_* FXFT_Face;
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index f04eb7a..1f18877 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -6,6 +6,7 @@
'+core/fpdfapi/fpdf_page/include',
'+core/fpdfapi/fpdf_parser/include',
'+core/fpdfapi/fpdf_render/include',
+ '+core/fxcrt/include',
'+javascript/IJavaScript.h',
'+public',
'+v8',
diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h
index b59f22b..947f425 100644
--- a/fpdfsdk/formfiller/cffl_combobox.h
+++ b/fpdfsdk/formfiller/cffl_combobox.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_
#define FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
class CBA_FontMap;
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index ed08719..810650f 100644
--- a/fpdfsdk/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "fpdfsdk/include/fsdk_define.h"
#ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/fpdfdoc_embeddertest.cpp b/fpdfsdk/fpdfdoc_embeddertest.cpp
index 4788773..bf91038 100644
--- a/fpdfsdk/fpdfdoc_embeddertest.cpp
+++ b/fpdfsdk/fpdfdoc_embeddertest.cpp
@@ -4,7 +4,7 @@
#include <string>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "public/fpdf_doc.h"
#include "public/fpdfview.h"
#include "testing/embedder_test.h"
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 6c02364..98b9143 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -14,7 +14,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_edit.h"
diff --git a/fpdfsdk/fpdfsave_embeddertest.cpp b/fpdfsdk/fpdfsave_embeddertest.cpp
index 1c93f4f..2b138a6 100644
--- a/fpdfsdk/fpdfsave_embeddertest.cpp
+++ b/fpdfsdk/fpdfsave_embeddertest.cpp
@@ -4,7 +4,7 @@
#include <string.h>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "public/fpdf_save.h"
#include "public/fpdfview.h"
#include "testing/embedder_test.h"
diff --git a/fpdfsdk/fpdftext_embeddertest.cpp b/fpdfsdk/fpdftext_embeddertest.cpp
index 3eaa581..ed20882 100644
--- a/fpdfsdk/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/fpdftext_embeddertest.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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "public/fpdf_text.h"
#include "public/fpdfview.h"
#include "testing/embedder_test.h"
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 589a6de..c883f9a 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -13,8 +13,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
#include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_safe_types.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "fpdfsdk/include/fsdk_mgr.h"
#include "fpdfsdk/include/fsdk_rendercontext.h"
diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp
index 1494c39..3979c0f 100644
--- a/fpdfsdk/fsdk_baseannot.cpp
+++ b/fpdfsdk/fsdk_baseannot.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "fpdfsdk/include/fsdk_baseannot.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "fpdfsdk/include/fsdk_mgr.h"
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
index 19d36e4..d686fe9 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDFXFA_Document;
class CPDF_Page;
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index 920ea64..a8022b0 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -10,8 +10,8 @@
#include <memory>
#include <set>
+#include "core/fxcrt/include/fx_string.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_string.h"
#include "fpdfsdk/include/fsdk_baseform.h"
class CPDFSDK_Annot;
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 09f997f..f94d7d0 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -10,8 +10,8 @@
#include <map>
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#ifdef PDF_ENABLE_XFA
#include "xfa/include/fxfa/fxfa.h"
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index afaa3bc..2024c2c 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -13,8 +13,8 @@
#include <ctime>
#endif
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_basic.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "fpdfsdk/include/fx_systemhandler.h"
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index c2d09e8..aa96215 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -10,8 +10,8 @@
#include <map>
#include <vector>
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_basic.h"
#include "core/include/fxge/fx_dib.h"
#include "fpdfsdk/include/fsdk_baseannot.h"
diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h
index ab0bc46..6619f3e 100644
--- a/fpdfsdk/include/fx_systemhandler.h
+++ b/fpdfsdk/include/fx_systemhandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
#define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Document;
class CPDF_Font;
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index d2222a0..905ad39 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fxge/fx_dib.h"
class CFX_RenderDevice;
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 3196348..8aab367 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#ifdef PDF_ENABLE_XFA
#include "xfa/fxjse/include/fxjse.h"
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index dccb261..dad1eaa8 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -19,7 +19,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CFXJS_ObjDefinition;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 0d764c0..1e7dd8c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "fpdfsdk/include/fxedit/fx_edit.h"
#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index f2e1663..b64b576 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "fpdfsdk/include/fxedit/fx_edit.h"
#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 4db62f8..57c4316 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
class CPWL_Image : public CPWL_Wnd {
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index a11a73c..e4fd68a 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 6ad356d..3b324a7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -9,8 +9,8 @@
#include <vector>
+#include "core/fxcrt/include/fx_basic.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_basic.h"
#include "fpdfsdk/include/fx_systemhandler.h"
class CPWL_MsgControl;
diff --git a/fpdfsdk/javascript/JS_Context.h b/fpdfsdk/javascript/JS_Context.h
index cd57187..5aeba27 100644
--- a/fpdfsdk/javascript/JS_Context.h
+++ b/fpdfsdk/javascript/JS_Context.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_JAVASCRIPT_JS_CONTEXT_H_
#define FPDFSDK_JAVASCRIPT_JS_CONTEXT_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
class CJS_EventHandler;
diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h
index 5a81974..41d3705 100644
--- a/fpdfsdk/javascript/JS_EventHandler.h
+++ b/fpdfsdk/javascript/JS_EventHandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
#define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CJS_Context;
class CPDFSDK_Annot;
diff --git a/fpdfsdk/javascript/JS_GlobalData.h b/fpdfsdk/javascript/JS_GlobalData.h
index 28833d8..24c0abf 100644
--- a/fpdfsdk/javascript/JS_GlobalData.h
+++ b/fpdfsdk/javascript/JS_GlobalData.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
#define FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define JS_GLOBALDATA_TYPE_NUMBER 0
#define JS_GLOBALDATA_TYPE_BOOLEAN 1
diff --git a/fpdfsdk/javascript/JS_Runtime.h b/fpdfsdk/javascript/JS_Runtime.h
index 3779164..fa13273 100644
--- a/fpdfsdk/javascript/JS_Runtime.h
+++ b/fpdfsdk/javascript/JS_Runtime.h
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "fpdfsdk/include/jsapi/fxjs_v8.h"
#include "fpdfsdk/javascript/JS_EventHandler.h"
diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h
index 70f76ce..69656ea 100644
--- a/fpdfsdk/javascript/JS_Value.h
+++ b/fpdfsdk/javascript/JS_Value.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "fpdfsdk/include/jsapi/fxjs_v8.h"
class CJS_Array;
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 6097369..b85111b 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "fpdfsdk/javascript/Field.h"
diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
index c22c05d..251e95b 100644
--- a/fpdfsdk/javascript/global.cpp
+++ b/fpdfsdk/javascript/global.cpp
@@ -8,7 +8,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "fpdfsdk/javascript/JS_Context.h"
#include "fpdfsdk/javascript/JS_Define.h"
diff --git a/fpdfsdk/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/public_methods_embeddertest.cpp
index a298cfc..153b3cd 100644
--- a/fpdfsdk/javascript/public_methods_embeddertest.cpp
+++ b/fpdfsdk/javascript/public_methods_embeddertest.cpp
@@ -4,7 +4,7 @@
#include <cmath>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "fpdfsdk/javascript/PublicMethods.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/js_embedder_test.h"
diff --git a/fpdfsdk/javascript/resource.h b/fpdfsdk/javascript/resource.h
index 4f35f27..a6bfaed 100644
--- a/fpdfsdk/javascript/resource.h
+++ b/fpdfsdk/javascript/resource.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_JAVASCRIPT_RESOURCE_H_
#define FPDFSDK_JAVASCRIPT_RESOURCE_H_
-#include "core/include/fxcrt/fx_string.h" // For CFX_WideString.
+#include "core/fxcrt/include/fx_string.h" // For CFX_WideString.
#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT.
class CJS_Context;
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp
index d488cb2..5a7a895 100644
--- a/fpdfsdk/javascript/util.cpp
+++ b/fpdfsdk/javascript/util.cpp
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "fpdfsdk/javascript/JS_Context.h"
#include "fpdfsdk/javascript/JS_Define.h"
diff --git a/fpdfsdk/jsapi/fxjs_v8.cpp b/fpdfsdk/jsapi/fxjs_v8.cpp
index 156f1c9..473b546 100644
--- a/fpdfsdk/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/jsapi/fxjs_v8.cpp
@@ -8,7 +8,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
const wchar_t kFXJSValueNameString[] = L"string";
const wchar_t kFXJSValueNameNumber[] = L"number";
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index 62873e5..cf7e4ff 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -8,9 +8,9 @@
#include <vector>
+#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_safe_types.h"
-#include "core/include/fxcrt/fx_xml.h"
#include "core/include/fxge/fx_ge.h"
#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
diff --git a/pdfium.gyp b/pdfium.gyp
index f43f58d..44aac84 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -566,17 +566,6 @@
'target_name': 'fxcrt',
'type': 'static_library',
'sources': [
- 'core/include/fxcrt/fx_basic.h',
- 'core/include/fxcrt/fx_bidi.h',
- 'core/include/fxcrt/fx_coordinates.h',
- 'core/include/fxcrt/fx_ext.h',
- 'core/include/fxcrt/fx_memory.h',
- 'core/include/fxcrt/fx_safe_types.h',
- 'core/include/fxcrt/fx_stream.h',
- 'core/include/fxcrt/fx_string.h',
- 'core/include/fxcrt/fx_system.h',
- 'core/include/fxcrt/fx_ucd.h',
- 'core/include/fxcrt/fx_xml.h',
'core/fxcrt/extension.h',
'core/fxcrt/fxcrt_platforms.cpp',
'core/fxcrt/fxcrt_platforms.h',
@@ -597,18 +586,29 @@
'core/fxcrt/fx_basic_util.cpp',
'core/fxcrt/fx_basic_wstring.cpp',
'core/fxcrt/fx_bidi.cpp',
+ 'core/fxcrt/fx_bidi.h',
'core/fxcrt/fx_extension.cpp',
'core/fxcrt/fx_ucddata.cpp',
'core/fxcrt/fx_unicode.cpp',
'core/fxcrt/fx_xml_composer.cpp',
'core/fxcrt/fx_xml_parser.cpp',
+ 'core/fxcrt/include/fx_basic.h',
+ 'core/fxcrt/include/fx_coordinates.h',
+ 'core/fxcrt/include/fx_ext.h',
+ 'core/fxcrt/include/fx_memory.h',
+ 'core/fxcrt/include/fx_safe_types.h',
+ 'core/fxcrt/include/fx_stream.h',
+ 'core/fxcrt/include/fx_string.h',
+ 'core/fxcrt/include/fx_system.h',
+ 'core/fxcrt/include/fx_ucd.h',
+ 'core/fxcrt/include/fx_xml.h',
'core/fxcrt/plex.h',
'core/fxcrt/xml_int.h',
],
'conditions': [
['pdf_enable_xfa==1', {
'sources': [
- 'core/include/fxcrt/fx_arb.h',
+ 'core/fxcrt/include/fx_arb.h',
'core/fxcrt/fx_arabic.cpp',
'core/fxcrt/fx_arabic.h',
'core/fxcrt/fx_basic_maps.cpp',
diff --git a/testing/DEPS b/testing/DEPS
index ce8bbe4..99f34dc 100644
--- a/testing/DEPS
+++ b/testing/DEPS
@@ -1,6 +1,7 @@
include_rules = [
'+core/include',
'+core/fxcodec',
+ '+core/fxcrt/include',
'+fpdfsdk/include',
'+public',
'+v8',
diff --git a/testing/fx_string_testhelpers.h b/testing/fx_string_testhelpers.h
index d5a45f8..a472428 100644
--- a/testing/fx_string_testhelpers.h
+++ b/testing/fx_string_testhelpers.h
@@ -7,7 +7,7 @@
#include <ostream>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
// Output stream operator so GTEST macros work with FX strings.
std::ostream& operator<<(std::ostream& out, const CFX_ByteStringC& str);
diff --git a/testing/libfuzzer/pdf_fm2js_fuzzer.cc b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
index acbbf8f..569c129 100644
--- a/testing/libfuzzer/pdf_fm2js_fuzzer.cc
+++ b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
@@ -5,8 +5,8 @@
#include <cstddef>
#include <cstdint>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fxfa/fm2js/xfa_program.h"
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
diff --git a/testing/libfuzzer/pdf_xml_fuzzer.cc b/testing/libfuzzer/pdf_xml_fuzzer.cc
index 50187e6..592bf0f 100644
--- a/testing/libfuzzer/pdf_xml_fuzzer.cc
+++ b/testing/libfuzzer/pdf_xml_fuzzer.cc
@@ -7,8 +7,8 @@
#include <limits>
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxfa/parser/xfa_parser.h"
#include "xfa/fxfa/parser/xfa_parser_imp.h"
diff --git a/testing/utils/path_service.cpp b/testing/utils/path_service.cpp
index c5a4613..9b26574 100644
--- a/testing/utils/path_service.cpp
+++ b/testing/utils/path_service.cpp
@@ -15,7 +15,7 @@
#include <string>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
// static
bool PathService::EndsWithSeparator(const std::string& path) {
diff --git a/third_party/DEPS b/third_party/DEPS
index 0b1a28f..7cc56b3 100644
--- a/third_party/DEPS
+++ b/third_party/DEPS
@@ -1,7 +1,7 @@
include_rules = [
# A lot of third_party code has been modified to use fxcrt.
- '+core/include/fxcrt/fx_basic.h',
- '+core/include/fxcrt/fx_coordinates.h',
- '+core/include/fxcrt/fx_memory.h',
- '+core/include/fxcrt/fx_system.h',
+ '+core/fxcrt/include/fx_basic.h',
+ '+core/fxcrt/include/fx_coordinates.h',
+ '+core/fxcrt/include/fx_memory.h',
+ '+core/fxcrt/include/fx_system.h',
]
diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h
index a22a5c2..3a7fb7c 100644
--- a/third_party/agg23/agg_array.h
+++ b/third_party/agg23/agg_array.h
@@ -17,7 +17,7 @@
#define AGG_ARRAY_INCLUDED
#include "agg_basics.h"
-#include "core/include/fxcrt/fx_memory.h" // For FXSYS_* macros.
+#include "core/fxcrt/include/fx_memory.h" // For FXSYS_* macros.
namespace agg
{
diff --git a/third_party/agg23/agg_basics.h b/third_party/agg23/agg_basics.h
index 752560b..f3dc43c 100644
--- a/third_party/agg23/agg_basics.h
+++ b/third_party/agg23/agg_basics.h
@@ -41,7 +41,7 @@
#endif
#define AGG_INLINE inline
-#include "core/include/fxcrt/fx_system.h" // For FX_FLOAT
+#include "core/fxcrt/include/fx_system.h" // For FX_FLOAT
namespace agg
{
diff --git a/third_party/agg23/agg_curves.cpp b/third_party/agg23/agg_curves.cpp
index 21b959d..619fb6f 100644
--- a/third_party/agg23/agg_curves.cpp
+++ b/third_party/agg23/agg_curves.cpp
@@ -21,7 +21,7 @@
#include "agg_curves.h"
#include "agg_math.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace agg
{
diff --git a/third_party/agg23/agg_path_storage.cpp b/third_party/agg23/agg_path_storage.cpp
index b803a1c..4c44ca7 100644
--- a/third_party/agg23/agg_path_storage.cpp
+++ b/third_party/agg23/agg_path_storage.cpp
@@ -25,7 +25,7 @@
#include "agg_math.h"
#include "agg_path_storage.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace agg
{
diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h
index f02281c..47e8e71 100644
--- a/third_party/agg23/agg_rasterizer_scanline_aa.h
+++ b/third_party/agg23/agg_rasterizer_scanline_aa.h
@@ -35,8 +35,8 @@
#include "agg_clip_liang_barsky.h"
#include "agg_math.h"
#include "agg_render_scanlines.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_memory.h"
namespace agg
{
diff --git a/third_party/agg23/agg_vcgen_dash.cpp b/third_party/agg23/agg_vcgen_dash.cpp
index 5c5bd78..3d05d88 100644
--- a/third_party/agg23/agg_vcgen_dash.cpp
+++ b/third_party/agg23/agg_vcgen_dash.cpp
@@ -20,7 +20,7 @@
#include "agg_shorten_path.h"
#include "agg_vcgen_dash.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace agg
{
diff --git a/third_party/agg23/agg_vcgen_stroke.cpp b/third_party/agg23/agg_vcgen_stroke.cpp
index afc4ee6..7b78ad9 100644
--- a/third_party/agg23/agg_vcgen_stroke.cpp
+++ b/third_party/agg23/agg_vcgen_stroke.cpp
@@ -24,7 +24,7 @@
//----------------------------------------------------------------------------
#include "agg_vcgen_stroke.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace agg
{
diff --git a/third_party/lcms2-2.6/src/cmserr.c b/third_party/lcms2-2.6/src/cmserr.c
index dfad4c9..6954474 100644
--- a/third_party/lcms2-2.6/src/cmserr.c
+++ b/third_party/lcms2-2.6/src/cmserr.c
@@ -63,7 +63,7 @@
//
// This is the interface to low-level memory management routines. By default a simple
// wrapping to malloc/free/realloc is provided, although there is a limit on the max
-// amount of memoy that can be reclaimed. This is mostly as a safety feature to prevent
+// amount of memoy that can be reclaimed. This is mostly as a safety feature to prevent
// bogus or evil code to allocate huge blocks that otherwise lcms would never need.
#define MAX_MEMORY_FOR_ALLOC ((cmsUInt32Number)(1024U*1024U*512U))
@@ -169,7 +169,7 @@
// Pointers to memory manager functions in Context0
-_cmsMemPluginChunkType _cmsMemPluginChunk = { _cmsMallocDefaultFn, _cmsMallocZeroDefaultFn, _cmsFreeDefaultFn,
+_cmsMemPluginChunkType _cmsMemPluginChunk = { _cmsMallocDefaultFn, _cmsMallocZeroDefaultFn, _cmsFreeDefaultFn,
_cmsReallocDefaultFn, _cmsCallocDefaultFn, _cmsDupDefaultFn
};
@@ -179,16 +179,16 @@
{
_cmsAssert(ctx != NULL);
- if (src != NULL) {
+ if (src != NULL) {
// Duplicate
- ctx ->chunks[MemPlugin] = _cmsSubAllocDup(ctx ->MemPool, src ->chunks[MemPlugin], sizeof(_cmsMemPluginChunkType));
+ ctx ->chunks[MemPlugin] = _cmsSubAllocDup(ctx ->MemPool, src ->chunks[MemPlugin], sizeof(_cmsMemPluginChunkType));
}
else {
// To reset it, we use the default allocators, which cannot be overriden
ctx ->chunks[MemPlugin] = &ctx ->DefaultMemoryManager;
- }
+ }
}
// Auxiliar to fill memory management functions from plugin (or context 0 defaults)
@@ -208,11 +208,11 @@
ptr ->MallocZeroPtr= _cmsMallocZeroDefaultFn;
ptr ->CallocPtr = _cmsCallocDefaultFn;
ptr ->DupPtr = _cmsDupDefaultFn;
-
+
if (Plugin ->MallocZeroPtr != NULL) ptr ->MallocZeroPtr = Plugin -> MallocZeroPtr;
if (Plugin ->CallocPtr != NULL) ptr ->CallocPtr = Plugin -> CallocPtr;
if (Plugin ->DupPtr != NULL) ptr ->DupPtr = Plugin -> DupPtr;
-
+
}
}
@@ -220,12 +220,12 @@
// Plug-in replacement entry
cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase *Data)
{
- cmsPluginMemHandler* Plugin = (cmsPluginMemHandler*) Data;
+ cmsPluginMemHandler* Plugin = (cmsPluginMemHandler*) Data;
_cmsMemPluginChunkType* ptr;
- // NULL forces to reset to defaults. In this special case, the defaults are stored in the context structure.
+ // NULL forces to reset to defaults. In this special case, the defaults are stored in the context structure.
// Remaining plug-ins does NOT have any copy in the context structure, but this is somehow special as the
- // context internal data should be malloce'd by using those functions.
+ // context internal data should be malloce'd by using those functions.
if (Data == NULL) {
struct _cmsContext_struct* ctx = ( struct _cmsContext_struct*) ContextID;
@@ -244,15 +244,15 @@
// Set replacement functions
ptr = (_cmsMemPluginChunkType*) _cmsContextGetClientChunk(ContextID, MemPlugin);
- if (ptr == NULL)
+ if (ptr == NULL)
return FALSE;
_cmsInstallAllocFunctions(Plugin, ptr);
return TRUE;
}
#else
-#include "core/include/fxcrt/fx_memory.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/include/fx_system.h"
cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin)
{
@@ -303,7 +303,7 @@
return p;
}
-_cmsMemPluginChunkType _cmsMemPluginChunk = {_cmsMalloc, _cmsMallocZero, _cmsFree,
+_cmsMemPluginChunkType _cmsMemPluginChunk = {_cmsMalloc, _cmsMallocZero, _cmsFree,
_cmsRealloc, _cmsCalloc, _cmsDupMem
};
@@ -311,16 +311,16 @@
{
_cmsAssert(ctx != NULL);
- if (src != NULL) {
+ if (src != NULL) {
// Duplicate
- ctx ->chunks[MemPlugin] = _cmsSubAllocDup(ctx ->MemPool, src ->chunks[MemPlugin], sizeof(_cmsMemPluginChunkType));
+ ctx ->chunks[MemPlugin] = _cmsSubAllocDup(ctx ->MemPool, src ->chunks[MemPlugin], sizeof(_cmsMemPluginChunkType));
}
else {
// To reset it, we use the default allocators, which cannot be overriden
ctx ->chunks[MemPlugin] = &ctx ->DefaultMemoryManager;
- }
+ }
}
void _cmsInstallAllocFunctions(cmsPluginMemHandler* Plugin, _cmsMemPluginChunkType* ptr)
@@ -458,7 +458,7 @@
void* _cmsSubAllocDup(_cmsSubAllocator* s, const void *ptr, cmsUInt32Number size)
{
void *NewPtr;
-
+
// Dup of null pointer is also NULL
if (ptr == NULL)
return NULL;
@@ -500,20 +500,20 @@
// Allocates and inits error logger container for a given context. If src is NULL, only initializes the value
// to the default. Otherwise, it duplicates the value. The interface is standard across all context clients
-void _cmsAllocLogErrorChunk(struct _cmsContext_struct* ctx,
+void _cmsAllocLogErrorChunk(struct _cmsContext_struct* ctx,
const struct _cmsContext_struct* src)
-{
+{
static _cmsLogErrorChunkType LogErrorChunk = { DefaultLogErrorHandlerFunction };
void* from;
-
+
if (src != NULL) {
- from = src ->chunks[Logger];
+ from = src ->chunks[Logger];
}
else {
from = &LogErrorChunk;
}
-
- ctx ->chunks[Logger] = _cmsSubAllocDup(ctx ->MemPool, from, sizeof(_cmsLogErrorChunkType));
+
+ ctx ->chunks[Logger] = _cmsSubAllocDup(ctx ->MemPool, from, sizeof(_cmsLogErrorChunkType));
}
// The default error logger does nothing.
@@ -545,7 +545,7 @@
// Change log error, legacy
void CMSEXPORT cmsSetLogErrorHandler(cmsLogErrorHandlerFunction Fn)
{
- cmsSetLogErrorHandlerTHR(NULL, Fn);
+ cmsSetLogErrorHandlerTHR(NULL, Fn);
}
// Log an error
@@ -565,7 +565,7 @@
lhg = (_cmsLogErrorChunkType*) _cmsContextGetClientChunk(ContextID, Logger);
if (lhg ->LogErrorHandler) {
lhg ->LogErrorHandler(ContextID, ErrorCode, Buffer);
- }
+ }
}
// Utility function to print signatures
@@ -591,13 +591,13 @@
{
_cmsMutex* ptr_mutex = (_cmsMutex*) _cmsMalloc(id, sizeof(_cmsMutex));
_cmsInitMutexPrimitive(ptr_mutex);
- return (void*) ptr_mutex;
+ return (void*) ptr_mutex;
}
static
void defMtxDestroy(cmsContext id, void* mtx)
{
- _cmsDestroyMutexPrimitive((_cmsMutex *) mtx);
+ _cmsDestroyMutexPrimitive((_cmsMutex *) mtx);
_cmsFree(id, mtx);
}
@@ -605,14 +605,14 @@
cmsBool defMtxLock(cmsContext id, void* mtx)
{
cmsUNUSED_PARAMETER(id);
- return _cmsLockPrimitive((_cmsMutex *) mtx) == 0;
+ return _cmsLockPrimitive((_cmsMutex *) mtx) == 0;
}
static
void defMtxUnlock(cmsContext id, void* mtx)
{
cmsUNUSED_PARAMETER(id);
- _cmsUnlockPrimitive((_cmsMutex *) mtx);
+ _cmsUnlockPrimitive((_cmsMutex *) mtx);
}
@@ -621,20 +621,20 @@
_cmsMutexPluginChunkType _cmsMutexPluginChunk = { defMtxCreate, defMtxDestroy, defMtxLock, defMtxUnlock };
// Allocate and init mutex container.
-void _cmsAllocMutexPluginChunk(struct _cmsContext_struct* ctx,
+void _cmsAllocMutexPluginChunk(struct _cmsContext_struct* ctx,
const struct _cmsContext_struct* src)
{
static _cmsMutexPluginChunkType MutexChunk = {defMtxCreate, defMtxDestroy, defMtxLock, defMtxUnlock };
void* from;
-
+
if (src != NULL) {
- from = src ->chunks[MutexPlugin];
+ from = src ->chunks[MutexPlugin];
}
else {
from = &MutexChunk;
}
-
- ctx ->chunks[MutexPlugin] = _cmsSubAllocDup(ctx ->MemPool, from, sizeof(_cmsMutexPluginChunkType));
+
+ ctx ->chunks[MutexPlugin] = _cmsSubAllocDup(ctx ->MemPool, from, sizeof(_cmsMutexPluginChunkType));
}
// Register new ways to transform
@@ -646,15 +646,15 @@
if (Data == NULL) {
// No lock routines
- ctx->CreateMutexPtr = NULL;
- ctx->DestroyMutexPtr = NULL;
+ ctx->CreateMutexPtr = NULL;
+ ctx->DestroyMutexPtr = NULL;
ctx->LockMutexPtr = NULL;
ctx ->UnlockMutexPtr = NULL;
return TRUE;
}
// Factory callback is required
- if (Plugin ->CreateMutexPtr == NULL || Plugin ->DestroyMutexPtr == NULL ||
+ if (Plugin ->CreateMutexPtr == NULL || Plugin ->DestroyMutexPtr == NULL ||
Plugin ->LockMutexPtr == NULL || Plugin ->UnlockMutexPtr == NULL) return FALSE;
diff --git a/third_party/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h
index 157a606..94a09c2 100644
--- a/third_party/libjpeg/jinclude.h
+++ b/third_party/libjpeg/jinclude.h
@@ -20,7 +20,7 @@
#include "jconfig.h" /* auto configuration options */
#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
/*
* We need the NULL macro and size_t typedef.
diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
index ca749da..b80d197 100644
--- a/third_party/libtiff/tiffconf.h
+++ b/third_party/libtiff/tiffconf.h
@@ -7,7 +7,7 @@
#ifndef _TIFFCONF_
#define _TIFFCONF_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
//NOTE: The tiff codec requires an ANSI C compiler environment for building and
// presumes an ANSI C environment for use.
diff --git a/third_party/zlib_v128/zutil.h b/third_party/zlib_v128/zutil.h
index 053dd60..c9d8c16 100644
--- a/third_party/zlib_v128/zutil.h
+++ b/third_party/zlib_v128/zutil.h
@@ -13,7 +13,7 @@
#ifndef ZUTIL_H
#define ZUTIL_H
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#ifdef HAVE_HIDDEN
# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
diff --git a/xfa/DEPS b/xfa/DEPS
index 4f814ac..560dfc9 100644
--- a/xfa/DEPS
+++ b/xfa/DEPS
@@ -1,4 +1,5 @@
include_rules = [
'+core/include',
+ '+core/fxcrt/include',
'+third_party/bigint'
]
diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp
index aba863e..4b7dd4b 100644
--- a/xfa/fde/css/fde_csscache.cpp
+++ b/xfa/fde/css/fde_csscache.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
FDE_CSSCacheItem::FDE_CSSCacheItem(IFDE_CSSStyleSheet* p)
: pStylesheet(p), dwActivity(0) {
diff --git a/xfa/fde/css/fde_cssdatatable.cpp b/xfa/fde/css/fde_cssdatatable.cpp
index 8f448d8..e2dff57 100644
--- a/xfa/fde/css/fde_cssdatatable.cpp
+++ b/xfa/fde/css/fde_cssdatatable.cpp
@@ -6,7 +6,7 @@
#include "xfa/fde/css/fde_cssdatatable.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/crt/fgas_algorithm.h"
#include "xfa/fgas/crt/fgas_codepage.h"
#include "xfa/fgas/crt/fgas_system.h"
diff --git a/xfa/fde/css/fde_cssdatatable.h b/xfa/fde/css/fde_cssdatatable.h
index c96520a..a44c24b 100644
--- a/xfa/fde/css/fde_cssdatatable.h
+++ b/xfa/fde/css/fde_cssdatatable.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_CSS_FDE_CSSDATATABLE_H_
#define XFA_FDE_CSS_FDE_CSSDATATABLE_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fde/css/fde_css.h"
#include "xfa/fgas/crt/fgas_memory.h"
diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp
index decc397..1340dae 100644
--- a/xfa/fde/css/fde_cssdeclaration.cpp
+++ b/xfa/fde/css/fde_cssdeclaration.cpp
@@ -6,7 +6,7 @@
#include "xfa/fde/css/fde_cssdeclaration.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/crt/fgas_system.h"
IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty,
diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h
index 5016e8f..0584a29 100644
--- a/xfa/fde/css/fde_cssstyleselector.h
+++ b/xfa/fde/css/fde_cssstyleselector.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fde/css/fde_css.h"
#include "xfa/fde/css/fde_csscache.h"
#include "xfa/fde/css/fde_cssdeclaration.h"
diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h
index e6f4f29..882f80f 100644
--- a/xfa/fde/css/fde_cssstylesheet.h
+++ b/xfa/fde/css/fde_cssstylesheet.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_CSS_FDE_CSSSTYLESHEET_H_
#define XFA_FDE_CSS_FDE_CSSSTYLESHEET_H_
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fde/css/fde_cssdeclaration.h"
class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target {
diff --git a/xfa/fde/fde_brush.h b/xfa/fde/fde_brush.h
index 898ea01..cfa40a0 100644
--- a/xfa/fde/fde_brush.h
+++ b/xfa/fde/fde_brush.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_FDE_BRUSH_H_
#define XFA_FDE_FDE_BRUSH_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
class IFDE_Image;
diff --git a/xfa/fde/fde_path.h b/xfa/fde/fde_path.h
index 9ffba6c..41d2a66 100644
--- a/xfa/fde/fde_path.h
+++ b/xfa/fde/fde_path.h
@@ -7,8 +7,8 @@
#ifndef XFA_FDE_FDE_PATH_H_
#define XFA_FDE_FDE_PATH_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class IFDE_Path {
public:
diff --git a/xfa/fde/fde_render.h b/xfa/fde/fde_render.h
index 2cf7e5c..2b09ed6 100644
--- a/xfa/fde/fde_render.h
+++ b/xfa/fde/fde_render.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_FDE_RENDER_H_
#define XFA_FDE_FDE_RENDER_H_
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "xfa/fde/fde_visualset.h"
class IFDE_RenderDevice;
diff --git a/xfa/fde/fde_renderdevice.h b/xfa/fde/fde_renderdevice.h
index a9e7190..58da775 100644
--- a/xfa/fde/fde_renderdevice.h
+++ b/xfa/fde/fde_renderdevice.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_FDE_RENDERDEVICE_H_
#define XFA_FDE_FDE_RENDERDEVICE_H_
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "core/include/fxge/fx_font.h"
#include "core/include/fxge/fx_ge.h"
#include "xfa/fde/fde_path.h"
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h
index 5da21fb..593d42d 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/fde_visualset.h
@@ -7,8 +7,8 @@
#ifndef XFA_FDE_FDE_VISUALSET_H_
#define XFA_FDE_FDE_VISUALSET_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "core/include/fxge/fx_ge.h"
#include "xfa/fde/fde_brush.h"
diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp
index 2105cf0..a7b1074 100644
--- a/xfa/fde/tto/fde_textout.cpp
+++ b/xfa/fde/tto/fde_textout.cpp
@@ -8,8 +8,8 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fde/fde_brush.h"
#include "xfa/fde/fde_pen.h"
#include "xfa/fde/fde_renderdevice.h"
diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h
index 79d77d9..f30e12a 100644
--- a/xfa/fde/xml/fde_xml_imp.h
+++ b/xfa/fde/xml/fde_xml_imp.h
@@ -7,7 +7,7 @@
#ifndef XFA_FDE_XML_FDE_XML_IMP_H_
#define XFA_FDE_XML_FDE_XML_IMP_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fde/xml/fde_xml.h"
#include "xfa/fgas/crt/fgas_memory.h"
#include "xfa/fgas/crt/fgas_stream.h"
diff --git a/xfa/fee/fde_txtedtengine.h b/xfa/fee/fde_txtedtengine.h
index 9dc4c4e..170c059 100644
--- a/xfa/fee/fde_txtedtengine.h
+++ b/xfa/fee/fde_txtedtengine.h
@@ -7,7 +7,7 @@
#ifndef XFA_FEE_FDE_TXTEDTENGINE_H_
#define XFA_FEE_FDE_TXTEDTENGINE_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fee/ifde_txtedtbuf.h"
#include "xfa/fee/ifde_txtedtengine.h"
diff --git a/xfa/fee/fde_txtedtpage.h b/xfa/fee/fde_txtedtpage.h
index 66c4c49..c7a3cb5 100644
--- a/xfa/fee/fde_txtedtpage.h
+++ b/xfa/fee/fde_txtedtpage.h
@@ -7,8 +7,8 @@
#ifndef XFA_FEE_FDE_TXTEDTPAGE_H_
#define XFA_FEE_FDE_TXTEDTPAGE_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fde/fde_visualset.h"
#include "xfa/fee/ifde_txtedtpage.h"
#include "xfa/fgas/crt/fgas_utils.h"
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak.h b/xfa/fee/fx_wordbreak/fx_wordbreak.h
index 0288b59..fb35230 100644
--- a/xfa/fee/fx_wordbreak/fx_wordbreak.h
+++ b/xfa/fee/fx_wordbreak/fx_wordbreak.h
@@ -7,8 +7,8 @@
#ifndef XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
#define XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_CharIter;
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h
index e7421ca..16c429b 100644
--- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h
@@ -9,8 +9,8 @@
#include <cstdint>
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fee/fx_wordbreak/fx_wordbreak.h"
#include "xfa/fee/fx_wordbreak/fx_wordbreak_impl.h"
#include "xfa/fee/ifde_txtedtengine.h"
diff --git a/xfa/fee/ifde_txtedtbuf.h b/xfa/fee/ifde_txtedtbuf.h
index 0459af4..db744b1 100644
--- a/xfa/fee/ifde_txtedtbuf.h
+++ b/xfa/fee/ifde_txtedtbuf.h
@@ -7,7 +7,7 @@
#ifndef XFA_FEE_IFDE_TXTEDTBUF_H_
#define XFA_FEE_IFDE_TXTEDTBUF_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define FDE_DEFCHUNKLENGTH (1024)
diff --git a/xfa/fgas/crt/fgas_algorithm.cpp b/xfa/fgas/crt/fgas_algorithm.cpp
index b351292..8f13cb3 100644
--- a/xfa/fgas/crt/fgas_algorithm.cpp
+++ b/xfa/fgas/crt/fgas_algorithm.cpp
@@ -6,7 +6,7 @@
#include "xfa/fgas/crt/fgas_algorithm.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#ifdef __cplusplus
extern "C" {
diff --git a/xfa/fgas/crt/fgas_algorithm.h b/xfa/fgas/crt/fgas_algorithm.h
index 662b1b6..94a0d06 100644
--- a/xfa/fgas/crt/fgas_algorithm.h
+++ b/xfa/fgas/crt/fgas_algorithm.h
@@ -9,7 +9,7 @@
#include <cstdint>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#ifdef __cplusplus
extern "C" {
diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp
index dcf3dfa..57d97db 100644
--- a/xfa/fgas/crt/fgas_codepage.cpp
+++ b/xfa/fgas/crt/fgas_codepage.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/crt/fgas_codepage.h"
#include "xfa/fgas/crt/fgas_language.h"
diff --git a/xfa/fgas/crt/fgas_codepage.h b/xfa/fgas/crt/fgas_codepage.h
index fe69f7c..15bdd74 100644
--- a/xfa/fgas/crt/fgas_codepage.h
+++ b/xfa/fgas/crt/fgas_codepage.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_CRT_FGAS_CODEPAGE_H_
#define XFA_FGAS_CRT_FGAS_CODEPAGE_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define FX_CODEPAGE_DefANSI 0
#define FX_CODEPAGE_DefOEM 1
diff --git a/xfa/fgas/crt/fgas_memory.h b/xfa/fgas/crt/fgas_memory.h
index a9c5cc9..ac27755 100644
--- a/xfa/fgas/crt/fgas_memory.h
+++ b/xfa/fgas/crt/fgas_memory.h
@@ -7,8 +7,8 @@
#ifndef XFA_FGAS_CRT_FGAS_MEMORY_H_
#define XFA_FGAS_CRT_FGAS_MEMORY_H_
-#include "core/include/fxcrt/fx_memory.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_MEMAllocator;
class CFX_Target;
diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h
index 94b7f01..fd977c4 100644
--- a/xfa/fgas/crt/fgas_stream.h
+++ b/xfa/fgas/crt/fgas_stream.h
@@ -7,8 +7,8 @@
#ifndef XFA_FGAS_CRT_FGAS_STREAM_H_
#define XFA_FGAS_CRT_FGAS_STREAM_H_
-#include "core/include/fxcrt/fx_stream.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_Stream;
diff --git a/xfa/fgas/crt/fgas_system.cpp b/xfa/fgas/crt/fgas_system.cpp
index 9d76a60..e6d89a5 100644
--- a/xfa/fgas/crt/fgas_system.cpp
+++ b/xfa/fgas/crt/fgas_system.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
_FX_OS_ == _FX_WIN64_
diff --git a/xfa/fgas/crt/fgas_system.h b/xfa/fgas/crt/fgas_system.h
index 4335c35..d4bebca 100644
--- a/xfa/fgas/crt/fgas_system.h
+++ b/xfa/fgas/crt/fgas_system.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_CRT_FGAS_SYSTEM_H_
#define XFA_FGAS_CRT_FGAS_SYSTEM_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#define FX_RAD2DEG(r) ((r)*180.0f / FX_PI)
#define FX_DEG2RAD(a) ((a)*FX_PI / 180.0f)
diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp
index 7a85fbb..0d020ec 100644
--- a/xfa/fgas/crt/fgas_utils.cpp
+++ b/xfa/fgas/crt/fgas_utils.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class FX_BASEARRAYDATA : public CFX_Target {
public:
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h
index 1138cfd..cb133b0 100644
--- a/xfa/fgas/crt/fgas_utils.h
+++ b/xfa/fgas/crt/fgas_utils.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_CRT_FGAS_UTILS_H_
#define XFA_FGAS_CRT_FGAS_UTILS_H_
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "xfa/fgas/crt/fgas_memory.h"
class FX_BASEARRAYDATA;
diff --git a/xfa/fgas/font/fgas_fontutils.cpp b/xfa/fgas/font/fgas_fontutils.cpp
index e115e0f..a0767d7 100644
--- a/xfa/fgas/font/fgas_fontutils.cpp
+++ b/xfa/fgas/font/fgas_fontutils.cpp
@@ -6,7 +6,7 @@
#include "xfa/fgas/font/fgas_fontutils.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/font/fgas_font.h"
FX_DWORD FGAS_GetFontHashCode(uint16_t wCodePage, FX_DWORD dwFontStyles) {
diff --git a/xfa/fgas/font/fgas_fontutils.h b/xfa/fgas/font/fgas_fontutils.h
index d560806..764aa6b 100644
--- a/xfa/fgas/font/fgas_fontutils.h
+++ b/xfa/fgas/font/fgas_fontutils.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_FONT_FGAS_FONTUTILS_H_
#define XFA_FGAS_FONT_FGAS_FONTUTILS_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
struct FGAS_FONTUSB {
uint16_t wStartUnicode;
diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp
index 331ea86..a2eae83 100644
--- a/xfa/fgas/font/fgas_stdfontmgr.cpp
+++ b/xfa/fgas/font/fgas_stdfontmgr.cpp
@@ -6,7 +6,7 @@
#include "xfa/fgas/font/fgas_stdfontmgr.h"
-#include "core/include/fxcrt/fx_stream.h"
+#include "core/fxcrt/include/fx_stream.h"
#include "xfa/fgas/crt/fgas_codepage.h"
#include "xfa/fgas/font/fgas_fontutils.h"
diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h
index e548cf5..574eefa 100644
--- a/xfa/fgas/font/fgas_stdfontmgr.h
+++ b/xfa/fgas/font/fgas_stdfontmgr.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_FONT_FGAS_STDFONTMGR_H_
#define XFA_FGAS_FONT_FGAS_STDFONTMGR_H_
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "core/include/fxge/fx_freetype.h"
#include "core/include/fxge/fx_ge.h"
#include "third_party/freetype/include/freetype/fttypes.h"
diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/fgas_linebreak.cpp
index 4e5b405..295b5b6 100644
--- a/xfa/fgas/layout/fgas_linebreak.cpp
+++ b/xfa/fgas/layout/fgas_linebreak.cpp
@@ -6,7 +6,7 @@
#include "xfa/fgas/layout/fgas_linebreak.h"
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_ucd.h"
const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = {
{FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB,
diff --git a/xfa/fgas/layout/fgas_linebreak.h b/xfa/fgas/layout/fgas_linebreak.h
index f1ecad7..1333937 100644
--- a/xfa/fgas/layout/fgas_linebreak.h
+++ b/xfa/fgas/layout/fgas_linebreak.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_
#define XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fgas/crt/fgas_utils.h"
enum FX_LINEBREAKTYPE : uint8_t {
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index dd150a3..c856b27 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_arb.h"
+#include "core/fxcrt/include/fx_arb.h"
#include "xfa/fgas/layout/fgas_linebreak.h"
#include "xfa/fgas/layout/fgas_unicode.h"
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index 7e395f6..8549d0c 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
#define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_ucd.h"
#include "core/include/fxge/fx_ge.h"
#include "xfa/fgas/crt/fgas_memory.h"
#include "xfa/fgas/crt/fgas_utils.h"
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index f182a6d..990656b 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -8,8 +8,8 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_arb.h"
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_arb.h"
+#include "core/fxcrt/include/fx_memory.h"
#include "xfa/fgas/layout/fgas_linebreak.h"
#include "xfa/fgas/layout/fgas_unicode.h"
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h
index 28731d4..dd42fdf 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
#define XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
-#include "core/include/fxcrt/fx_ucd.h"
+#include "core/fxcrt/include/fx_ucd.h"
#include "core/include/fxge/fx_ge.h"
#include "xfa/fgas/crt/fgas_utils.h"
#include "xfa/fgas/layout/fgas_unicode.h"
diff --git a/xfa/fgas/localization/fgas_datetime.cpp b/xfa/fgas/localization/fgas_datetime.cpp
index ac5ee4a..456e476d 100644
--- a/xfa/fgas/localization/fgas_datetime.cpp
+++ b/xfa/fgas/localization/fgas_datetime.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fgas/localization/fgas_datetime.h"
#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
diff --git a/xfa/fgas/localization/fgas_datetime.h b/xfa/fgas/localization/fgas_datetime.h
index 0a3d14d..df2989f 100644
--- a/xfa/fgas/localization/fgas_datetime.h
+++ b/xfa/fgas/localization/fgas_datetime.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_LOCALIZATION_FGAS_DATETIME_H_
#define XFA_FGAS_LOCALIZATION_FGAS_DATETIME_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CFX_Unitime;
class CFX_DateTime;
diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp
index db94f76..a0dcf8e 100644
--- a/xfa/fgas/localization/fgas_locale.cpp
+++ b/xfa/fgas/localization/fgas_locale.cpp
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "xfa/fgas/localization/fgas_localeimp.h"
#define FX_LOCALECATEGORY_DateHash 0xbde9abde
diff --git a/xfa/fgas/localization/fgas_locale.h b/xfa/fgas/localization/fgas_locale.h
index 3dd6c79..20b6c12 100644
--- a/xfa/fgas/localization/fgas_locale.h
+++ b/xfa/fgas/localization/fgas_locale.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_
#define XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "xfa/fgas/localization/fgas_datetime.h"
class CFX_Unitime;
diff --git a/xfa/fgas/localization/fgas_localemgr.cpp b/xfa/fgas/localization/fgas_localemgr.cpp
index 02061f7..ba617a0 100644
--- a/xfa/fgas/localization/fgas_localemgr.cpp
+++ b/xfa/fgas/localization/fgas_localemgr.cpp
@@ -6,7 +6,7 @@
#include "xfa/fgas/localization/fgas_localemgr.h"
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_xml.h"
IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath,
uint16_t wDefaultLCID) {
diff --git a/xfa/fgas/xml/fgas_sax.h b/xfa/fgas/xml/fgas_sax.h
index 222b109..de5d914 100644
--- a/xfa/fgas/xml/fgas_sax.h
+++ b/xfa/fgas/xml/fgas_sax.h
@@ -7,7 +7,7 @@
#ifndef XFA_FGAS_XML_FGAS_SAX_H_
#define XFA_FGAS_XML_FGAS_SAX_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#define FX_SAXPARSEMODE_NotConvert_amp 0x0001
#define FX_SAXPARSEMODE_NotConvert_lt 0x0002
diff --git a/xfa/fwl/basewidget/fxmath_barcodeimp.h b/xfa/fwl/basewidget/fxmath_barcodeimp.h
index 077aeea..30fe400 100644
--- a/xfa/fwl/basewidget/fxmath_barcodeimp.h
+++ b/xfa/fwl/basewidget/fxmath_barcodeimp.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_
#define XFA_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/include/BC_Library.h"
#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp
index cadace4..6553454 100644
--- a/xfa/fwl/core/fwl_noteimp.cpp
+++ b/xfa/fwl/core/fwl_noteimp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fwl/core/fwl_noteimp.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fwl/basewidget/fwl_tooltipctrlimp.h"
#include "xfa/fwl/core/fwl_appimp.h"
#include "xfa/fwl/core/fwl_formimp.h"
diff --git a/xfa/fwl/core/fwl_sdadapterimp.cpp b/xfa/fwl/core/fwl_sdadapterimp.cpp
index 88df9bc..550c4cc 100644
--- a/xfa/fwl/core/fwl_sdadapterimp.cpp
+++ b/xfa/fwl/core/fwl_sdadapterimp.cpp
@@ -6,7 +6,7 @@
#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fwl/core/fwl_noteimp.h"
#include "xfa/fwl/core/fwl_targetimp.h"
#include "xfa/fwl/core/fwl_threadimp.h"
diff --git a/xfa/fwl/core/fwl_targetimp.h b/xfa/fwl/core/fwl_targetimp.h
index 8aeca79..616c1ac 100644
--- a/xfa/fwl/core/fwl_targetimp.h
+++ b/xfa/fwl/core/fwl_targetimp.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_CORE_FWL_TARGETIMP_H_
#define XFA_FWL_CORE_FWL_TARGETIMP_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/include/fwl/core/fwl_target.h"
class CFWL_TargetImp {
diff --git a/xfa/fwl/lightwidget/app.cpp b/xfa/fwl/lightwidget/app.cpp
index 31a39c1..ca6462a 100644
--- a/xfa/fwl/lightwidget/app.cpp
+++ b/xfa/fwl/lightwidget/app.cpp
@@ -6,7 +6,7 @@
#include "xfa/include/fwl/lightwidget/app.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/include/fwl/core/fwl_error.h"
#include "xfa/include/fwl/lightwidget/theme.h"
diff --git a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
index e39f4d6..e27dd1d 100644
--- a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
+++ b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
#define XFA_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_string.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/BC_LuminanceSource.h"
diff --git a/xfa/fxbarcode/BC_DecoderResult.h b/xfa/fxbarcode/BC_DecoderResult.h
index c3008c5..81d7856 100644
--- a/xfa/fxbarcode/BC_DecoderResult.h
+++ b/xfa/fxbarcode/BC_DecoderResult.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_DECODERRESULT_H_
#define XFA_FXBARCODE_BC_DECODERRESULT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_DecoderResult {
public:
diff --git a/xfa/fxbarcode/BC_Dimension.h b/xfa/fxbarcode/BC_Dimension.h
index e3253b3..2dd3768 100644
--- a/xfa/fxbarcode/BC_Dimension.h
+++ b/xfa/fxbarcode/BC_Dimension.h
@@ -9,7 +9,7 @@
#include <cstdint>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_Dimension {
public:
diff --git a/xfa/fxbarcode/BC_LuminanceSource.h b/xfa/fxbarcode/BC_LuminanceSource.h
index b4b3ebc..753c469 100644
--- a/xfa/fxbarcode/BC_LuminanceSource.h
+++ b/xfa/fxbarcode/BC_LuminanceSource.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_LUMINANCESOURCE_H_
#define XFA_FXBARCODE_BC_LUMINANCESOURCE_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_LuminanceSource {
public:
diff --git a/xfa/fxbarcode/BC_Reader.h b/xfa/fxbarcode/BC_Reader.h
index 12cfd24..8daea1d 100644
--- a/xfa/fxbarcode/BC_Reader.h
+++ b/xfa/fxbarcode/BC_Reader.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_READER_H_
#define XFA_FXBARCODE_BC_READER_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_BinaryBitmap;
diff --git a/xfa/fxbarcode/BC_ResultPoint.h b/xfa/fxbarcode/BC_ResultPoint.h
index 721adb1..1497b31 100644
--- a/xfa/fxbarcode/BC_ResultPoint.h
+++ b/xfa/fxbarcode/BC_ResultPoint.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_RESULTPOINT_H_
#define XFA_FXBARCODE_BC_RESULTPOINT_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CBC_ResultPoint {
public:
diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.h b/xfa/fxbarcode/BC_UtilCodingConvert.h
index 2d5c9f3..ea36d48 100644
--- a/xfa/fxbarcode/BC_UtilCodingConvert.h
+++ b/xfa/fxbarcode/BC_UtilCodingConvert.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_
#define XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_UtilCodingConvert {
public:
diff --git a/xfa/fxbarcode/BC_UtilRSS.cpp b/xfa/fxbarcode/BC_UtilRSS.cpp
index 0d6133c..19a8f97 100644
--- a/xfa/fxbarcode/BC_UtilRSS.cpp
+++ b/xfa/fxbarcode/BC_UtilRSS.cpp
@@ -24,7 +24,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
CBC_UtilRSS::CBC_UtilRSS() {}
diff --git a/xfa/fxbarcode/BC_UtilRSS.h b/xfa/fxbarcode/BC_UtilRSS.h
index b81804e..f66f527 100644
--- a/xfa/fxbarcode/BC_UtilRSS.h
+++ b/xfa/fxbarcode/BC_UtilRSS.h
@@ -9,7 +9,7 @@
#include <cstdint>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_UtilRSS {
public:
diff --git a/xfa/fxbarcode/BC_Utils.cpp b/xfa/fxbarcode/BC_Utils.cpp
index 0271968..b69b4d2 100644
--- a/xfa/fxbarcode/BC_Utils.cpp
+++ b/xfa/fxbarcode/BC_Utils.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
diff --git a/xfa/fxbarcode/BC_Writer.h b/xfa/fxbarcode/BC_Writer.h
index bff3642..0b7719a 100644
--- a/xfa/fxbarcode/BC_Writer.h
+++ b/xfa/fxbarcode/BC_Writer.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_BC_WRITER_H_
#define XFA_FXBARCODE_BC_WRITER_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/utils.h"
diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h
index 8da2383..bab39a8 100644
--- a/xfa/fxbarcode/cbc_codabar.h
+++ b/xfa/fxbarcode/cbc_codabar.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_CODABAR_H_
#define XFA_FXBARCODE_CBC_CODABAR_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h
index 3f12e1b..33005b1 100644
--- a/xfa/fxbarcode/cbc_code128.h
+++ b/xfa/fxbarcode/cbc_code128.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_CODE128_H_
#define XFA_FXBARCODE_CBC_CODE128_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h
index 9e29665..c93b7d7 100644
--- a/xfa/fxbarcode/cbc_code39.h
+++ b/xfa/fxbarcode/cbc_code39.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_CODE39_H_
#define XFA_FXBARCODE_CBC_CODE39_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h
index 20f25b5..145b929 100644
--- a/xfa/fxbarcode/cbc_codebase.h
+++ b/xfa/fxbarcode/cbc_codebase.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_CBC_CODEBASE_H_
#define XFA_FXBARCODE_CBC_CODEBASE_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/include/BC_Library.h"
diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h
index 903d0b2..ea1e136 100644
--- a/xfa/fxbarcode/cbc_datamatrix.h
+++ b/xfa/fxbarcode/cbc_datamatrix.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_DATAMATRIX_H_
#define XFA_FXBARCODE_CBC_DATAMATRIX_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h
index c9ecc90..eaf95fe 100644
--- a/xfa/fxbarcode/cbc_ean13.h
+++ b/xfa/fxbarcode/cbc_ean13.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_EAN13_H_
#define XFA_FXBARCODE_CBC_EAN13_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h
index 95a61d2..fd582de 100644
--- a/xfa/fxbarcode/cbc_ean8.h
+++ b/xfa/fxbarcode/cbc_ean8.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_EAN8_H_
#define XFA_FXBARCODE_CBC_EAN8_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/cbc_onecode.h b/xfa/fxbarcode/cbc_onecode.h
index ac070a4..7c32cf8 100644
--- a/xfa/fxbarcode/cbc_onecode.h
+++ b/xfa/fxbarcode/cbc_onecode.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_ONECODE_H_
#define XFA_FXBARCODE_CBC_ONECODE_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/cbc_codebase.h"
class CFX_DIBitmap;
diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h
index b8f45fa..9ad387c 100644
--- a/xfa/fxbarcode/cbc_pdf417i.h
+++ b/xfa/fxbarcode/cbc_pdf417i.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_PDF417I_H_
#define XFA_FXBARCODE_CBC_PDF417I_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h
index 1198194..ccf7d13 100644
--- a/xfa/fxbarcode/cbc_qrcode.h
+++ b/xfa/fxbarcode/cbc_qrcode.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_QRCODE_H_
#define XFA_FXBARCODE_CBC_QRCODE_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_codebase.h"
diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h
index ee4c31b..1a94cfa 100644
--- a/xfa/fxbarcode/cbc_upca.h
+++ b/xfa/fxbarcode/cbc_upca.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_CBC_UPCA_H_
#define XFA_FXBARCODE_CBC_UPCA_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/cbc_onecode.h"
diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.h b/xfa/fxbarcode/common/BC_CommonBitArray.h
index 6ddd789..1c89500 100644
--- a/xfa/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/fxbarcode/common/BC_CommonBitArray.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitArray {
public:
diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/fxbarcode/common/BC_CommonBitMatrix.h
index 78b4264..ebf7454 100644
--- a/xfa/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/common/BC_CommonBitSource.h b/xfa/fxbarcode/common/BC_CommonBitSource.h
index 7617a6f..f33e077 100644
--- a/xfa/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/fxbarcode/common/BC_CommonBitSource.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONBITSOURCE_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
class CBC_CommonBitSource {
diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.h b/xfa/fxbarcode/common/BC_CommonByteArray.h
index 69d470b..eaf68d9 100644
--- a/xfa/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/fxbarcode/common/BC_CommonByteArray.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonByteArray {
private:
diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp
index c9ed749..05028bd 100644
--- a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/fxbarcode/common/BC_CommonByteMatrix.h
index 271feef..74e1203 100644
--- a/xfa/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CBC_CommonByteMatrix {
public:
diff --git a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h
index 18a676a..5bd77e4 100644
--- a/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h
+++ b/xfa/fxbarcode/common/BC_CommonCharacterSetECI.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fxbarcode/common/BC_CommonECI.h"
class CBC_CommonCharacterSetECI : public CBC_CommonECI {
diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp
index 0c545c4..d28a88b 100644
--- a/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ b/xfa/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
diff --git a/xfa/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/fxbarcode/common/BC_CommonDecoderResult.h
index dbdb9d3..9dc4b66 100644
--- a/xfa/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/fxbarcode/common/BC_CommonDecoderResult.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONDECODERRESULT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_QRCoderErrorCorrectionLevel;
class CBC_PDF417ResultMetadata;
diff --git a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
index daa6189..d84ed61 100644
--- a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
+++ b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
@@ -24,7 +24,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11,
diff --git a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 36defd8..d701b7e 100644
--- a/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
#define XFA_FXBARCODE_COMMON_BC_COMMONPERSPECTIVETRANSFORM_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonPerspectiveTransform {
public:
diff --git a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h
index da13cac..01ac9a6 100644
--- a/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h
+++ b/xfa/fxbarcode/common/BC_GlobalHistogramBinarizer.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
#define XFA_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/BC_Binarizer.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h
index 3d6c01c..d713d0f 100644
--- a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
#define XFA_FXBARCODE_COMMON_BC_WHITERECTANGLEDETECTOR_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 6f6aef7..0dfa37d 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index ec14344..f44f920 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONDECODER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 099cab5..cd78811 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
class CBC_ReedSolomonGF256Poly;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index 16a1f90..aa549ef 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_ReedSolomonGF256;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index 4c54d61..c8fc334 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXBITMATRIXPARSER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_DataMatrixVersion;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 218bb0b..0392552 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_DataMatrixVersion;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 2f70282..c7af613 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDECODER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_ReedSolomonDecoder;
class CBC_CommonDecoderResult;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 62d1699..589825f 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDETECTOR_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_WhiteRectangleDetector;
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 8a79355..9e8e801 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXVERSION_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_DataMatrixVersion;
diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
index 49008f3..f86cace 100644
--- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_DefaultPlacement {
public:
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
index 8f7ed28..f5d6b8a 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
#define XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
class CBC_Dimension;
diff --git a/xfa/fxbarcode/oned/BC_OneDimReader.h b/xfa/fxbarcode/oned/BC_OneDimReader.h
index cc84ffd..f572d6f 100644
--- a/xfa/fxbarcode/oned/BC_OneDimReader.h
+++ b/xfa/fxbarcode/oned/BC_OneDimReader.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDIMREADER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDIMREADER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/oned/BC_OneDReader.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index 27f2191..5f8a0c2 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -25,7 +25,7 @@
#include <algorithm>
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/BC_Reader.h"
#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
#include "xfa/fxbarcode/oned/BC_OneDReader.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h
index 678795d..8fd2177 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h
+++ b/xfa/fxbarcode/oned/BC_OnedCodaBarReader.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/oned/BC_OneDReader.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 53af246..d136017 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/include/BC_Library.h"
#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
index 5b68d5c..aa6bd90 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
class CBC_OnedCode128Writer : public CBC_OneDimWriter {
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/fxbarcode/oned/BC_OnedCode39Reader.h
index 315ffa6..0d4591f 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDCODE39READER_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDReader.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h b/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h
index 4d01e42..5656540 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h
+++ b/xfa/fxbarcode/oned/BC_OnedEAN13Reader.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
class CBC_CommonBitArray;
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h
index de17ac7..75debc2 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
class CFX_DIBitmap;
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h
index 9110d94..706393e 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/include/BC_Library.h"
#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp
index 95b0f24..50a8fbb 100644
--- a/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedUPCAReader.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/BC_Reader.h"
#include "xfa/fxbarcode/oned/BC_OneDReader.h"
#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAReader.h b/xfa/fxbarcode/oned/BC_OnedUPCAReader.h
index 4d3f479..1f2ba62 100644
--- a/xfa/fxbarcode/oned/BC_OnedUPCAReader.h
+++ b/xfa/fxbarcode/oned/BC_OnedUPCAReader.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDimReader.h"
class CBC_BinaryBitmap;
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h
index 38f3ca5..45d4eac 100644
--- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
#define XFA_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
class CBC_OnedEAN13Writer;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/xfa/fxbarcode/pdf417/BC_PDF417.h
index 1aec33a..2e46f80 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
class CBC_BarcodeRow;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index 21ee44b..793bf0a 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_BarcodeRow;
class CBC_BarcodeMatrix {
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 007876a..80d931b 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_BarcodeRow {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index e99fb84..29f0a83 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEVALUE_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_BarcodeValue {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index 8b95635..3ae0e10 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417BOUNDINGBOX_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CBC_CommonBitMatrix;
class CBC_ResultPoint;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h
index e1ca60f..d397485 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417CODEWORD_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_Codeword {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index e5f8c0b..4c31b31 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_PDF417CodewordDecoder {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/fxbarcode/pdf417/BC_PDF417Common.h
index 7e272b8..5e05b54 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Common.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_PDF417Common {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 747a4ce..e08fb15 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417DECODEDBITSTREAMPARSER_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_CommonDecoderResult;
class CBC_PDF417ResultMetadata;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index 22fd25d..bdcd910 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/BC_ResultPoint.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index 0eea685..558111a 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417DETECTORRESULT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 39a7442..b976386 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_PDF417ErrorCorrection {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index 0ba0126..29c5617 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
class CBC_PDF417HighLevelEncoder {
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index 8e18370..92d1e56 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_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/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h b/xfa/fxbarcode/pdf417/BC_PDF417Reader.h
index f1e0eda..808de29 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Reader.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417READER_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417READER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/BC_Reader.h"
class CBC_BinaryBitmap;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index 8e25bdb..924f25f 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417RESULTMETADATA_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_PDF417ResultMetadata {
public:
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h
index bc646b8..7f71959 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_
#define XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxbarcode/BC_TwoDimWriter.h"
class CBC_PDF417Writer : public CBC_TwoDimWriter {
diff --git a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h
index 0acb106..1091d67 100644
--- a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
#define XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_QRFinderPattern;
diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 0b1a2a7..d227708 100644
--- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/utils.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 6bb1064..66b28d9 100644
--- a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_QRCoderVersion;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h b/xfa/fxbarcode/qrcode/BC_QRCodeReader.h
index 72dd453..c11ccd1 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCodeReader.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fxbarcode/BC_Reader.h"
class CBC_BinaryBitmap;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index a225f61..b928b0a 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "core/include/fxcrt/fx_memory.h"
+#include "core/fxcrt/include/fx_memory.h"
#include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h"
#include "xfa/fxbarcode/utils.h"
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h
index b6c381c..3a588b6 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_ReedSolomonDecoder;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index c1a5b34..5209a5f 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_QRCoderECB;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 8330dc2..bbdec5b 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_QRCoder;
class CBC_QRCoderErrorCorrectionLevel;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 377137a..9b3a256 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_QRCoderErrorCorrectionLevel {
private:
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h
index e36f7a1..91a991f 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
class CBC_QRCoderVersion;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h
index dd2b0c6..0cbace0 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
#define XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_QRCoderECBlocks;
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/fxbarcode/qrcode/BC_QRDataBlock.h
index 8e11ab8..873904f 100644
--- a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
#define XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_QRCoderVersion;
class CBC_QRCoderErrorCorrectionLevel;
diff --git a/xfa/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/fxbarcode/qrcode/BC_QRDataMask.h
index 5893149..88aa114 100644
--- a/xfa/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/fxbarcode/qrcode/BC_QRDataMask.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
#define XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetector.h b/xfa/fxbarcode/qrcode/BC_QRDetector.h
index 4c17184..91eed25 100644
--- a/xfa/fxbarcode/qrcode/BC_QRDetector.h
+++ b/xfa/fxbarcode/qrcode/BC_QRDetector.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
#define XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_ResultPoint;
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h
index c6145ec..1570777 100644
--- a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
#define XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index 5ccbd98..ea08f15 100644
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -24,7 +24,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxbarcode/BC_ResultPoint.h"
#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
#include "xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h"
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 058f65d..ada2247 100644
--- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
class CBC_QRFinderPattern;
diff --git a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/fxbarcode/qrcode/BC_QRGridSampler.h
index 4e10c56..70bfb9e 100644
--- a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h
+++ b/xfa/fxbarcode/qrcode/BC_QRGridSampler.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
#define XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CBC_CommonBitMatrix;
diff --git a/xfa/fxbarcode/utils.h b/xfa/fxbarcode/utils.h
index f6186e6..60d4754 100644
--- a/xfa/fxbarcode/utils.h
+++ b/xfa/fxbarcode/utils.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXBARCODE_UTILS_H_
#define XFA_FXBARCODE_UTILS_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
typedef CFX_MapPtrTemplate<void*, int32_t> CFX_PtrToInt32;
FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst,
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index 2ae7c0f..49e01cb 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/app/xfa_ffbarcode.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/app/xfa_fffield.h"
#include "xfa/fxfa/app/xfa_ffpageview.h"
#include "xfa/fxfa/app/xfa_fftextedit.h"
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp
index 041b41c..b7e1b1f 100644
--- a/xfa/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/fxfa/app/xfa_ffdoc.cpp
@@ -8,8 +8,8 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fxcrt/fx_ext.h"
#include "xfa/fgas/crt/fgas_algorithm.h"
#include "xfa/fxfa/app/xfa_ffapp.h"
#include "xfa/fxfa/app/xfa_ffdocview.h"
diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp
index f5d3fc5..ab1cafe 100644
--- a/xfa/fxfa/app/xfa_ffdocview.cpp
+++ b/xfa/fxfa/app/xfa_ffdocview.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/app/xfa_ffdocview.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/app/xfa_ffapp.h"
#include "xfa/fxfa/app/xfa_ffbarcode.h"
#include "xfa/fxfa/app/xfa_ffcheckbutton.h"
diff --git a/xfa/fxfa/app/xfa_fontmgr.h b/xfa/fxfa/app/xfa_fontmgr.h
index 09d4293..516d7bb 100644
--- a/xfa/fxfa/app/xfa_fontmgr.h
+++ b/xfa/fxfa/app/xfa_fontmgr.h
@@ -9,8 +9,8 @@
#include <map>
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fgas/font/fgas_font.h"
#include "xfa/include/fxfa/fxfa.h"
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp
index 05316f8..6a17122 100644
--- a/xfa/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/fxfa/app/xfa_textlayout.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fde/fde_pen.h"
#include "xfa/fgas/crt/fgas_algorithm.h"
#include "xfa/fgas/crt/fgas_codepage.h"
diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/xfa_error.h
index 1da1e24..b8116ed 100644
--- a/xfa/fxfa/fm2js/xfa_error.h
+++ b/xfa/fxfa/fm2js/xfa_error.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXFA_FM2JS_XFA_ERROR_H_
#define XFA_FXFA_FM2JS_XFA_ERROR_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
enum XFA_FM_ERRMSG {
FMERR_UNSUPPORTED_CHAR,
diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp
index b4b1a1a..a97e777 100644
--- a/xfa/fxfa/fm2js/xfa_expression.cpp
+++ b/xfa/fxfa/fm2js/xfa_expression.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/fm2js/xfa_expression.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
namespace {
diff --git a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
index 3a6bc17..38e5f23 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
#include "xfa/fxfa/fm2js/xfa_program.h"
#include "xfa/fxfa/parser/xfa_document.h"
diff --git a/xfa/fxfa/fm2js/xfa_fm2jsapi.h b/xfa/fxfa/fm2js/xfa_fm2jsapi.h
index 41f5464..a5ef9e0 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jsapi.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jsapi.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXFA_FM2JS_XFA_FM2JSAPI_H_
#define XFA_FXFA_FM2JS_XFA_FM2JSAPI_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxfa/parser/xfa_document.h"
#include "xfa/fxjse/include/fxjse.h"
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index f2576b0..7b3573f 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -8,7 +8,7 @@
#include <time.h>
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/localization/fgas_locale.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_document.h"
diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp
index d470390..7c9682d 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/fm2js/xfa_lexer.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
namespace {
diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h
index b0d6069..40fd8ca 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.h
+++ b/xfa/fxfa/fm2js/xfa_lexer.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/fxfa/fm2js/xfa_error.h"
enum XFA_FM_TOKEN {
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
index 3e66573..ece1cde 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/fm2js/xfa_simpleexpression.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
namespace {
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h
index 9098b39..3b8164e 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.h
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxfa/fm2js/xfa_lexer.h"
#define RUNTIMEFUNCTIONRETURNVALUE \
diff --git a/xfa/fxfa/parser/xfa_basic_imp.cpp b/xfa/fxfa/parser/xfa_basic_imp.cpp
index 61e2ab6..ae5e5e8 100644
--- a/xfa/fxfa/parser/xfa_basic_imp.cpp
+++ b/xfa/fxfa/parser/xfa_basic_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_basic_imp.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/crt/fgas_algorithm.h"
#include "xfa/fgas/crt/fgas_codepage.h"
#include "xfa/fgas/crt/fgas_system.h"
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 0dc087a..317610e 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_document_datamerger_imp.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_basic_imp.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
index ce07c47..3c07c48 100644
--- a/xfa/fxfa/parser/xfa_document_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_imp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_basic_imp.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.h b/xfa/fxfa/parser/xfa_layout_itemlayout.h
index 362e1c1..8e7032e 100644
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.h
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.h
@@ -11,7 +11,7 @@
#include <list>
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
#include "xfa/fxfa/parser/xfa_document_layout_imp.h"
diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp
index eb8c244..c721d7d 100644
--- a/xfa/fxfa/parser/xfa_locale.cpp
+++ b/xfa/fxfa/parser/xfa_locale.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_locale.h"
-#include "core/include/fxcrt/fx_xml.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index 05706d4..dc511ab 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -6,8 +6,8 @@
#include "xfa/fxfa/parser/xfa_localemgr.h"
+#include "core/fxcrt/include/fx_xml.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_xml.h"
#include "core/include/fxge/fx_ge.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 368e919..1010a19 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_object.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fgas/crt/fgas_codepage.h"
#include "xfa/fgas/crt/fgas_system.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
diff --git a/xfa/fxfa/parser/xfa_objectacc_imp.cpp b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
index 1e86e73..d729eef 100644
--- a/xfa/fxfa/parser/xfa_objectacc_imp.cpp
+++ b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxbarcode/include/BC_Library.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index c49bb31..48ae6b4 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_script_imp.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.cpp b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
index ba58430..6d106e9 100644
--- a/xfa/fxfa/parser/xfa_script_nodehelper.cpp
+++ b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_script_nodehelper.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index cb5c039..6573c06 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_script_resolveprocessor.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxfa/parser/xfa_utils_imp.cpp b/xfa/fxfa/parser/xfa_utils_imp.cpp
index c043e7c..af0630f 100644
--- a/xfa/fxfa/parser/xfa_utils_imp.cpp
+++ b/xfa/fxfa/parser/xfa_utils_imp.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/xfa_utils.h"
-#include "core/include/fxcrt/fx_ext.h"
+#include "core/fxcrt/include/fx_ext.h"
#include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
#include "xfa/fxfa/parser/xfa_docdata.h"
#include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/fxgraphics/cfx_path.h b/xfa/fxgraphics/cfx_path.h
index e8e31b3..5b5840fa 100644
--- a/xfa/fxgraphics/cfx_path.h
+++ b/xfa/fxgraphics/cfx_path.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXGRAPHICS_CFX_PATH_H_
#define XFA_FXGRAPHICS_CFX_PATH_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxgraphics/include/cfx_graphics.h"
class CFX_PathData;
diff --git a/xfa/fxgraphics/cfx_pattern.h b/xfa/fxgraphics/cfx_pattern.h
index e4c1b09..e7f47ee 100644
--- a/xfa/fxgraphics/cfx_pattern.h
+++ b/xfa/fxgraphics/cfx_pattern.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXGRAPHICS_CFX_PATTERN_H_
#define XFA_FXGRAPHICS_CFX_PATTERN_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/fxgraphics/include/cfx_graphics.h"
class CFX_DIBitmap;
diff --git a/xfa/fxgraphics/cfx_shading.h b/xfa/fxgraphics/cfx_shading.h
index d568076..8bfd3ca 100644
--- a/xfa/fxgraphics/cfx_shading.h
+++ b/xfa/fxgraphics/cfx_shading.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXGRAPHICS_CFX_SHADING_H_
#define XFA_FXGRAPHICS_CFX_SHADING_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#define FX_SHADING_Steps 256
diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h
index 121ae3a..0bb1e76 100644
--- a/xfa/fxgraphics/include/cfx_graphics.h
+++ b/xfa/fxgraphics/include/cfx_graphics.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
#define XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "core/include/fxge/fx_ge.h"
diff --git a/xfa/fxjse/context.h b/xfa/fxjse/context.h
index 9d37009..75973f2 100644
--- a/xfa/fxjse/context.h
+++ b/xfa/fxjse/context.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXJSE_CONTEXT_H_
#define XFA_FXJSE_CONTEXT_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "v8/include/v8.h"
#include "xfa/fxjse/include/fxjse.h"
diff --git a/xfa/fxjse/include/fxjse.h b/xfa/fxjse/include/fxjse.h
index d957c58..cf6587e 100644
--- a/xfa/fxjse/include/fxjse.h
+++ b/xfa/fxjse/include/fxjse.h
@@ -7,8 +7,8 @@
#ifndef XFA_FXJSE_INCLUDE_FXJSE_H_
#define XFA_FXJSE_INCLUDE_FXJSE_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
struct FXJSE_CLASS;
class CFXJSE_Arguments;
diff --git a/xfa/fxjse/runtime.h b/xfa/fxjse/runtime.h
index 023aaaa..43629e3 100644
--- a/xfa/fxjse/runtime.h
+++ b/xfa/fxjse/runtime.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXJSE_RUNTIME_H_
#define XFA_FXJSE_RUNTIME_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "v8/include/v8.h"
class CFXJSE_RuntimeList;
diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
index 7446853..dbd1d72 100644
--- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/include/fwl/core/fwl_error.h"
#include "xfa/include/fwl/core/fwl_thread.h"
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
index 327c92e..f5d3c05 100644
--- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
@@ -7,8 +7,8 @@
#ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_
#define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/include/fwl/core/fwl_error.h"
class IFWL_Widget;
diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h
index 58ce117..51fd242 100644
--- a/xfa/include/fwl/basewidget/fxmath_barcode.h
+++ b/xfa/include/fwl/basewidget/fxmath_barcode.h
@@ -7,8 +7,8 @@
#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
#define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
#include "xfa/fxbarcode/include/BC_Library.h"
diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index ca77143..7904ee8 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_
#define XFA_INCLUDE_FWL_CORE_FWL_APP_H_
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
#include "xfa/include/fwl/core/fwl_thread.h"
class IFWL_AdapterNative;
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index e41cf1d..170e479 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
#define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
#include "xfa/fxgraphics/include/cfx_graphics.h"
#include "xfa/include/fwl/core/fwl_error.h"
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 6572f8b..9f010e9 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
#define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
#include "xfa/include/fwl/core/fwl_error.h"
// FWL contains three parallel inheritance hierarchies, which reference each
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index 69783c7..7dd443e 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -7,8 +7,8 @@
#ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
#define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/include/fwl/core/fwl_error.h"
class IFWL_Widget;
diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h
index b9b4735..4e8feb0 100644
--- a/xfa/include/fwl/core/fwl_timer.h
+++ b/xfa/include/fwl/core/fwl_timer.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_
#define XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
typedef struct FWL_HTIMER_ { void* pData; } * FWL_HTIMER;
diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h
index dd65496..73e8650 100644
--- a/xfa/include/fwl/theme/utils.h
+++ b/xfa/include/fwl/theme/utils.h
@@ -7,7 +7,7 @@
#ifndef XFA_INCLUDE_FWL_THEME_UTILS_H_
#define XFA_INCLUDE_FWL_THEME_UTILS_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#define THEME_XPSimilar
enum FWLTHEME_EDGE {
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 1585db9..84cf82a 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
#include "xfa/include/fwl/core/fwl_error.h"
#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/include/fwl/core/fwl_widget.h"
