Move core/fxcrt/include to core/fxcrt
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2382723003
diff --git a/core/fdrm/crypto/fx_crypt.h b/core/fdrm/crypto/fx_crypt.h
index bb9f4a9..75cab89 100644
--- a/core/fdrm/crypto/fx_crypt.h
+++ b/core/fdrm/crypto/fx_crypt.h
@@ -7,7 +7,7 @@
#ifndef CORE_FDRM_CRYPTO_FX_CRYPT_H_
#define CORE_FDRM_CRYPTO_FX_CRYPT_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fpdfapi/cpdf_modulemgr.h b/core/fpdfapi/cpdf_modulemgr.h
index cd7561a..bc54a9b 100644
--- a/core/fpdfapi/cpdf_modulemgr.h
+++ b/core/fpdfapi/cpdf_modulemgr.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CCodec_FaxModule;
class CCodec_FlateModule;
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
index 59827d7..ca9976d 100644
--- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
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 61d1393..971a5c8 100644
--- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
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 f2d4978..aaa9691 100644
--- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
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 143963f..62f4a6e 100644
--- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
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 5735432..40fea04 100644
--- a/core/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
#define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
struct FXCMAP_CMap {
enum MapType { None, Single, Range, Reverse };
diff --git a/core/fpdfapi/fpdf_edit/cpdf_creator.h b/core/fpdfapi/fpdf_edit/cpdf_creator.h
index ec2536f..f81b043 100644
--- a/core/fpdfapi/fpdf_edit/cpdf_creator.h
+++ b/core/fpdfapi/fpdf_edit/cpdf_creator.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Array;
class CPDF_CryptoHandler;
diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h
index 19b9258..8dfc610 100644
--- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h
+++ b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h
@@ -8,9 +8,9 @@
#define CORE_FPDFAPI_FPDF_EDIT_CPDF_PAGECONTENTGENERATOR_H_
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Object;
class CPDF_Page;
diff --git a/core/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/fpdf_edit/editint.h
index cd04d5d..ac10958 100644
--- a/core/fpdfapi/fpdf_edit/editint.h
+++ b/core/fpdfapi/fpdf_edit/editint.h
@@ -9,9 +9,9 @@
#include <vector>
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_stream.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_stream.h"
+#include "core/fxcrt/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 b039ec5..1eb4286 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -20,7 +20,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "third_party/base/stl_util.h"
#define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024)
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
index c79e97b..2c7df93 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
@@ -10,8 +10,8 @@
#include <memory>
#include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
enum CIDSet {
CIDSET_UNKNOWN,
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp
index e431d3d..fd9a666 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp
@@ -22,7 +22,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
#include "core/fpdfapi/fpdf_parser/cpdf_name.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxge/include/fx_freetype.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/fpdf_font/cpdf_font.h
index f94758c..00fcfd7 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.h
+++ b/core/fpdfapi/fpdf_font/cpdf_font.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_font.h"
#define PDFFONT_FIXEDPITCH 1
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
index da0f262..f8db9e5 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_string.h"
#define PDFFONT_ENCODING_BUILTIN 0
#define PDFFONT_ENCODING_WINANSI 1
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.h b/core/fpdfapi/fpdf_font/cpdf_simplefont.h
index 0d4da46..4706768 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.h
@@ -11,8 +11,8 @@
#include "core/fpdfapi/fpdf_font/cpdf_font.h"
#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_SimpleFont : public CPDF_Font {
public:
diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h b/core/fpdfapi/fpdf_font/cpdf_truetypefont.h
index 1131371..8711b8f 100644
--- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_truetypefont.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_
#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_TrueTypeFont : public CPDF_SimpleFont {
public:
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.h b/core/fpdfapi/fpdf_font/cpdf_type1font.h
index e13238f..3cc59aa 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type1font.h
+++ b/core/fpdfapi/fpdf_font/cpdf_type1font.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_
#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Type1Font : public CPDF_SimpleFont {
public:
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.h b/core/fpdfapi/fpdf_font/cpdf_type3char.h
index 7b101d3..3254906 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3char.h
+++ b/core/fpdfapi/fpdf_font/cpdf_type3char.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CFX_DIBitmap;
class CPDF_Form;
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp b/core/fpdfapi/fpdf_font/cpdf_type3font.cpp
index da30e44..4c81202 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_type3font.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/fpdf_page/pageint.h"
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/stl_util.h"
CPDF_Type3Font::CPDF_Type3Font()
diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.h b/core/fpdfapi/fpdf_font/cpdf_type3font.h
index c66b270..2b840f2 100644
--- a/core/fpdfapi/fpdf_font/cpdf_type3font.h
+++ b/core/fpdfapi/fpdf_font/cpdf_type3font.h
@@ -11,8 +11,8 @@
#include <memory>
#include "core/fpdfapi/fpdf_font/cpdf_simplefont.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
class CPDF_Type3Char;
diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h
index 3a30b54..dce9e0c 100644
--- a/core/fpdfapi/fpdf_font/font_int.h
+++ b/core/fpdfapi/fpdf_font/font_int.h
@@ -11,7 +11,7 @@
#include <memory>
#include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/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 5302ba7..722e74d 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -17,7 +17,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_number.h"
#include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "core/fxge/include/fx_freetype.h"
#include "third_party/base/numerics/safe_conversions.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 dcb8593..891ca7f 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "core/fxge/include/fx_freetype.h"
namespace {
diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h
index 6e69517..759eea4 100644
--- a/core/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/fpdfapi/fpdf_font/ttgsubtable.h
@@ -12,7 +12,7 @@
#include <map>
#include <memory>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "core/fxge/include/fx_font.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.h b/core/fpdfapi/fpdf_page/cpdf_allstates.h
index 21fd6c2..44c5d3e 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/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_clippath.h b/core/fpdfapi/fpdf_page/cpdf_clippath.h
index bff9794..81c8ce6 100644
--- a/core/fpdfapi/fpdf_page/cpdf_clippath.h
+++ b/core/fpdfapi/fpdf_page/cpdf_clippath.h
@@ -12,9 +12,9 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_path.h"
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Path;
class CPDF_TextObject;
diff --git a/core/fpdfapi/fpdf_page/cpdf_color.cpp b/core/fpdfapi/fpdf_page/cpdf_color.cpp
index 913af63..ba46d99 100644
--- a/core/fpdfapi/fpdf_page/cpdf_color.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_color.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_page/pageint.h"
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
CPDF_Color::CPDF_Color() : m_pCS(nullptr), m_pBuffer(nullptr) {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_color.h b/core/fpdfapi/fpdf_page/cpdf_color.h
index f74b5f4..2056ca4 100644
--- a/core/fpdfapi/fpdf_page/cpdf_color.h
+++ b/core/fpdfapi/fpdf_page/cpdf_color.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLOR_H_
#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Pattern;
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/cpdf_colorspace.h
index 951de3e..892ec68 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorspace.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorspace.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#define PDFCS_DEVICEGRAY 1
#define PDFCS_DEVICERGB 2
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
index 3f2d563..9114ad3 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
@@ -8,9 +8,9 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
#include "core/fpdfapi/fpdf_page/cpdf_color.h"
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Color;
class CPDF_ColorSpace;
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
index eff4af9..5f38f04 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
@@ -10,9 +10,9 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/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 d5148af..1cd80a2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_countedobject.h b/core/fpdfapi/fpdf_page/cpdf_countedobject.h
index aff83e1..6aa6577 100644
--- a/core/fpdfapi/fpdf_page/cpdf_countedobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_countedobject.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
template <class T>
class CPDF_CountedObject {
diff --git a/core/fpdfapi/fpdf_page/cpdf_formobject.h b/core/fpdfapi/fpdf_page/cpdf_formobject.h
index f776c91..d3d9257 100644
--- a/core/fpdfapi/fpdf_page/cpdf_formobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_formobject.h
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Form;
diff --git a/core/fpdfapi/fpdf_page/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/cpdf_generalstate.h
index e3b4d68..35562d9 100644
--- a/core/fpdfapi/fpdf_page/cpdf_generalstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_generalstate.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_GENERALSTATE_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_GENERALSTATE_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "core/fxge/include/fx_dib.h"
class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.h b/core/fpdfapi/fpdf_page/cpdf_image.h
index d885570..4254202 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.h
+++ b/core/fpdfapi/fpdf_page/cpdf_image.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGE_H_
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#define PDF_IMAGE_NO_COMPRESS 0x0000
#define PDF_IMAGE_LOSSY_COMPRESS 0x0001
diff --git a/core/fpdfapi/fpdf_page/cpdf_imageobject.h b/core/fpdfapi/fpdf_page/cpdf_imageobject.h
index 98ef8c8..e61dd5a 100644
--- a/core/fpdfapi/fpdf_page/cpdf_imageobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_imageobject.h
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Image;
diff --git a/core/fpdfapi/fpdf_page/cpdf_meshstream.h b/core/fpdfapi/fpdf_page/cpdf_meshstream.h
index 53664b8..5930cf9 100644
--- a/core/fpdfapi/fpdf_page/cpdf_meshstream.h
+++ b/core/fpdfapi/fpdf_page/cpdf_meshstream.h
@@ -12,8 +12,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_system.h"
struct CPDF_MeshVertex {
FX_FLOAT x;
diff --git a/core/fpdfapi/fpdf_page/cpdf_page.h b/core/fpdfapi/fpdf_page/cpdf_page.h
index 814c156..13f5198 100644
--- a/core/fpdfapi/fpdf_page/cpdf_page.h
+++ b/core/fpdfapi/fpdf_page/cpdf_page.h
@@ -10,9 +10,9 @@
#include <memory>
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobject.h b/core/fpdfapi/fpdf_page/cpdf_pageobject.h
index 8bf47f0..359bc2b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobject.h
+++ b/core/fpdfapi/fpdf_page/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/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_TextObject;
class CPDF_PathObject;
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h b/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h
index 36379be..a884555 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTHOLDER_H_
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class IFX_Pause;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_path.h b/core/fpdfapi/fpdf_page/cpdf_path.h
index 304a489..b4450c1 100644
--- a/core/fpdfapi/fpdf_page/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/cpdf_path.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATH_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATH_H_
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/cfx_fxgedevice.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_pathobject.h b/core/fpdfapi/fpdf_page/cpdf_pathobject.h
index 3144ecb..ee40322 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pathobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_pathobject.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
#include "core/fpdfapi/fpdf_page/cpdf_path.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_PathObject : public CPDF_PageObject {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_pattern.h b/core/fpdfapi/fpdf_page/cpdf_pattern.h
index 983c9ea..52be26a 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pattern.h
+++ b/core/fpdfapi/fpdf_page/cpdf_pattern.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Document;
class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_page/cpdf_psengine.h b/core/fpdfapi/fpdf_page/cpdf_psengine.h
index c154eb8..81e3204 100644
--- a/core/fpdfapi/fpdf_page/cpdf_psengine.h
+++ b/core/fpdfapi/fpdf_page/cpdf_psengine.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_PSEngine;
class CPDF_PSOP;
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingobject.h b/core/fpdfapi/fpdf_page/cpdf_shadingobject.h
index 2f1abf7..ff5e3f5 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_shadingobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGOBJECT_H_
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_ShadingPattern;
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
index 7fe2cc6..e2bcef2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
+++ b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
@@ -12,7 +12,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
enum ShadingType {
kInvalidShading = 0,
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.h b/core/fpdfapi/fpdf_page/cpdf_textobject.h
index 51700f5..c09da96 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textobject.h
+++ b/core/fpdfapi/fpdf_page/cpdf_textobject.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTOBJECT_H_
#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
struct CPDF_TextObjectItem {
uint32_t m_CharCode;
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.h b/core/fpdfapi/fpdf_page/cpdf_textstate.h
index a10c81d..0c615b2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Document;
class CPDF_Font;
diff --git a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h b/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h
index abfd434..7ff2068 100644
--- a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h
+++ b/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h
@@ -10,8 +10,8 @@
#include <memory>
#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Document;
class CPDF_Form;
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
index a9836eb..eb48757 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -19,7 +19,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions_impl.h"
class CPDF_PSOP {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index f1aca09..41fefa0 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -33,7 +33,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/include/cfx_graphstatedata.h"
#include "core/fxge/include/cfx_pathdata.h"
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index ddd640e..68c6eca 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -28,8 +28,8 @@
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/include/cfx_fxgedevice.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index 0a99cc1..2fbc629 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -16,8 +16,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/core/fpdfapi/fpdf_parser/cfdf_document.h b/core/fpdfapi/fpdf_parser/cfdf_document.h
index 1894cb3..cd5b5b7 100644
--- a/core/fpdfapi/fpdf_parser/cfdf_document.h
+++ b/core/fpdfapi/fpdf_parser/cfdf_document.h
@@ -9,9 +9,9 @@
#include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_array.h b/core/fpdfapi/fpdf_parser/cpdf_array.h
index b3f480c..2d4909d 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_array.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_array.h
@@ -12,8 +12,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Array : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_boolean.h b/core/fpdfapi/fpdf_parser/cpdf_boolean.h
index d15e5b7..db4a11c 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/cpdf_object.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Boolean : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h b/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h
index 52ad4f2..25ff49b 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_CRYPTO_HANDLER_H_
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_CRYPTO_HANDLER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
class CPDF_SecurityHandler;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
index c6414a6..9afe4e5 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp
@@ -20,8 +20,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/stl_util.h"
CPDF_DataAvail::FileAvail::~FileAvail() {}
diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
index 44e242e..4f8f45b 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Dictionary;
class CPDF_HintTables;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_dictionary.h b/core/fpdfapi/fpdf_parser/cpdf_dictionary.h
index c3cfa3f..07903f5 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_dictionary.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_dictionary.h
@@ -11,10 +11,10 @@
#include <set>
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_IndirectObjectHolder;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.h b/core/fpdfapi/fpdf_parser/cpdf_document.h
index 46b4d78..9ae43f7 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.h
@@ -13,9 +13,9 @@
#include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
#include "core/fpdfdoc/cpdf_linklist.h"
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_basic.h"
class CFX_Font;
class CFX_Matrix;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
index b1529c4..ae602b2 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp
@@ -14,7 +14,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h
index f932950..797cb24 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/cpdf_data_avail.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_stream.h"
class CFX_BitStream;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h
index 414f4ee..8fb9195 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Object;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_number.h b/core/fpdfapi/fpdf_parser/cpdf_number.h
index 5f8a237..068a9c9 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_number.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_number.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_NUMBER_H_
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Number : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object.cpp b/core/fpdfapi/fpdf_parser/cpdf_object.cpp
index 868dc67..ba7490a 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/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/fpdf_parser/cpdf_parser.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#include "third_party/base/stl_util.h"
CPDF_Object::~CPDF_Object() {}
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object.h b/core/fpdfapi/fpdf_parser/cpdf_object.h
index f467415..7077bc1 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_object.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_object.h
@@ -10,8 +10,8 @@
#include <memory>
#include <set>
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Array;
class CPDF_Boolean;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp
index d93ccf7..beeb8f3 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/cpdf_indirect_object_holder.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 9dc35dd..182d386 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/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser.h b/core/fpdfapi/fpdf_parser/cpdf_parser.h
index 0368a45..254b8b0 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_parser.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_parser.h
@@ -11,7 +11,7 @@
#include <memory>
#include <set>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Array;
class CPDF_CryptoHandler;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp
index 8ad2e47..9c1de09 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_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_stream.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_security_handler.h b/core/fpdfapi/fpdf_parser/cpdf_security_handler.h
index 3cf4d2c..33c4c0c 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_security_handler.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_security_handler.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_SECURITY_HANDLER_H_
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_SECURITY_HANDLER_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#define FXCIPHER_NONE 0
#define FXCIPHER_RC4 1
diff --git a/core/fpdfapi/fpdf_parser/cpdf_simple_parser.h b/core/fpdfapi/fpdf_parser/cpdf_simple_parser.h
index fad0e42..d23182d 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_simple_parser.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_simple_parser.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_CPDF_SIMPLE_PARSER_H_
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_SIMPLE_PARSER_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_SimpleParser {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp
index 67a8f5a..50bbb52 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"
diff --git a/core/fpdfapi/fpdf_parser/cpdf_stream.h b/core/fpdfapi/fpdf_parser/cpdf_stream.h
index 9ae6fd6..e3bba96 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_stream.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_stream.h
@@ -12,7 +12,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Stream : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_stream_acc.h b/core/fpdfapi/fpdf_parser/cpdf_stream_acc.h
index 19fa12b..cf2bc8a 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_stream_acc.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_stream_acc.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_StreamAcc {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_string.h b/core/fpdfapi/fpdf_parser/cpdf_string.h
index 72d548c..2ce0d02 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_string.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_string.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PARSER_CPDF_STRING_H_
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_String : public CPDF_Object {
public:
diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp
index 5aa431a..32a75f9 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/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/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 5838fb7..3a9f1b4 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_CryptoHandler;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp
index 7bd1c7a..eb19652 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_parser.h"
#include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/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 62350cd..4f172c0 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -17,7 +17,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.h b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.h
index 0a0aa81..fab148b 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.h
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_DECODE_H_
#define CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_DECODE_H_
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp
index 27d1f0f..ab0dc4e 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 e85f996..304cb4a 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/cpdf_stream_acc.h"
#include "core/fpdfapi/fpdf_parser/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/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 0b27a1f..98bffa7 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/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class IFX_FileRead;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h b/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h
index d68856b..fda448f 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Stream;
class CPDF_ImageCacheEntry;
diff --git a/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h b/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
index cbc98a1..5ba3a55 100644
--- a/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
@@ -11,8 +11,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
#include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_RenderOptions;
class CPDF_RenderStatus;
diff --git a/core/fpdfapi/fpdf_render/cpdf_rendercontext.h b/core/fpdfapi/fpdf_render/cpdf_rendercontext.h
index 900e3a3..5d08457 100644
--- a/core/fpdfapi/fpdf_render/cpdf_rendercontext.h
+++ b/core/fpdfapi/fpdf_render/cpdf_rendercontext.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDERCONTEXT_H_
#define CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDERCONTEXT_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
index dc45423..73383ae 100644
--- a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
+++ b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDEROPTIONS_H_
#define CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDEROPTIONS_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
class CPDF_OCContext;
diff --git a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
index ddc9edc..ca6d91e 100644
--- a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
+++ b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_RENDER_CPDF_TEXTRENDERER_H_
#define CORE_FPDFAPI_FPDF_RENDER_CPDF_TEXTRENDERER_H_
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
class CFX_RenderDevice;
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.h b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
index 50d7147..199bc28 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3cache.h
+++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.h
@@ -10,9 +10,9 @@
#include <map>
#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Type3Glyphs;
diff --git a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.h b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.h
index d021e99..c88d179 100644
--- a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.h
+++ b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.h
@@ -9,7 +9,7 @@
#include <map>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CFX_GlyphBitmap;
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 8867af0..1b7b7db 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -25,7 +25,7 @@
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
#include "core/fpdfdoc/cpdf_occontext.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/include/cfx_fxgedevice.h"
#include "core/fxge/include/cfx_pathdata.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index d464eab..d040871 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -19,7 +19,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
#include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_action.h b/core/fpdfdoc/cpdf_action.h
index 7bef84d..5b985fb 100644
--- a/core/fpdfdoc/cpdf_action.h
+++ b/core/fpdfdoc/cpdf_action.h
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfdoc/cpdf_dest.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Document;
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 17b2d56..ed43e5b 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
#include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
#include "core/fpdfdoc/cpvt_generateap.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxge/include/cfx_graphstatedata.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
index f316625..d4bbca9 100644
--- a/core/fpdfdoc/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -10,9 +10,9 @@
#include <map>
#include <memory>
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CFX_RenderDevice;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_annotlist.h b/core/fpdfdoc/cpdf_annotlist.h
index afe85f3..2488c68 100644
--- a/core/fpdfdoc/cpdf_annotlist.h
+++ b/core/fpdfdoc/cpdf_annotlist.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CFX_RenderDevice;
class CPDF_Annot;
diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h
index 4354ac0..b2ae248 100644
--- a/core/fpdfdoc/cpdf_apsettings.h
+++ b/core/fpdfdoc/cpdf_apsettings.h
@@ -8,8 +8,8 @@
#define CORE_FPDFDOC_CPDF_APSETTINGS_H_
#include "core/fpdfdoc/cpdf_iconfit.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h
index b19ebbb..30a8a51 100644
--- a/core/fpdfdoc/cpdf_bookmark.h
+++ b/core/fpdfdoc/cpdf_bookmark.h
@@ -9,7 +9,7 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_dest.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h
index c09a5aa..70b1bd4 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.h
+++ b/core/fpdfdoc/cpdf_defaultappearance.h
@@ -8,9 +8,9 @@
#define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE };
diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h
index 7a966e2..8f38192 100644
--- a/core/fpdfdoc/cpdf_dest.h
+++ b/core/fpdfdoc/cpdf_dest.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFDOC_CPDF_DEST_H_
#define CORE_FPDFDOC_CPDF_DEST_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Document;
class CPDF_Object;
diff --git a/core/fpdfdoc/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h
index 34b8b7e..8a8d03d 100644
--- a/core/fpdfdoc/cpdf_docjsactions.h
+++ b/core/fpdfdoc/cpdf_docjsactions.h
@@ -8,7 +8,7 @@
#define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
#include "core/fpdfdoc/cpdf_action.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Document;
diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp
index 51b8b35..c361113 100644
--- a/core/fpdfdoc/cpdf_filespec.cpp
+++ b/core/fpdfdoc/cpdf_filespec.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/cpdf_object.h"
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h
index c960a83..6266c37 100644
--- a/core/fpdfdoc/cpdf_filespec.h
+++ b/core/fpdfdoc/cpdf_filespec.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_
#define CORE_FPDFDOC_CPDF_FILESPEC_H_
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Object;
diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h
index 3f6cb53..1ad79ee 100644
--- a/core/fpdfdoc/cpdf_formcontrol.h
+++ b/core/fpdfdoc/cpdf_formcontrol.h
@@ -16,8 +16,8 @@
#include "core/fpdfdoc/cpdf_formfield.h"
#include "core/fpdfdoc/cpdf_iconfit.h"
#include "core/fpdfdoc/ipdf_formnotify.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
#include "core/fxge/include/fx_dib.h"
#define TEXTPOS_CAPTION 0
diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
index 1d83eb0..abdd6f7 100644
--- a/core/fpdfdoc/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -9,9 +9,9 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_formfield.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#define FIELDTYPE_UNKNOWN 0
#define FIELDTYPE_PUSHBUTTON 1
diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp
index 1b800b6..dacd521 100644
--- a/core/fpdfdoc/cpdf_iconfit.cpp
+++ b/core/fpdfdoc/cpdf_iconfit.cpp
@@ -8,7 +8,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
CPDF_IconFit::ScaleMethod CPDF_IconFit::GetScaleMethod() {
if (!m_pDict)
diff --git a/core/fpdfdoc/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h
index 7461614..1ef023a 100644
--- a/core/fpdfdoc/cpdf_iconfit.h
+++ b/core/fpdfdoc/cpdf_iconfit.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_
#define CORE_FPDFDOC_CPDF_ICONFIT_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h
index 4c62a40..71d4517 100644
--- a/core/fpdfdoc/cpdf_interform.h
+++ b/core/fpdfdoc/cpdf_interform.h
@@ -13,8 +13,8 @@
#include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CFieldTree;
class CFDF_Document;
diff --git a/core/fpdfdoc/cpdf_link.h b/core/fpdfdoc/cpdf_link.h
index ce99573..162630d 100644
--- a/core/fpdfdoc/cpdf_link.h
+++ b/core/fpdfdoc/cpdf_link.h
@@ -9,7 +9,7 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_dest.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h
index d5c0432..21d69fd 100644
--- a/core/fpdfdoc/cpdf_linklist.h
+++ b/core/fpdfdoc/cpdf_linklist.h
@@ -11,7 +11,7 @@
#include <vector>
#include "core/fpdfdoc/cpdf_link.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Page;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
index 8186c70..3f90b66 100644
--- a/core/fpdfdoc/cpdf_metadata.cpp
+++ b/core/fpdfdoc/cpdf_metadata.cpp
@@ -9,7 +9,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
-#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxcrt/fx_xml.h"
CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) {
CPDF_Dictionary* pRoot = pDoc->GetRoot();
diff --git a/core/fpdfdoc/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h
index 45308b7..d6763ad 100644
--- a/core/fpdfdoc/cpdf_nametree.h
+++ b/core/fpdfdoc/cpdf_nametree.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPDF_NAMETREE_H_
#define CORE_FPDFDOC_CPDF_NAMETREE_H_
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h
index 5c850b9..49bbd76 100644
--- a/core/fpdfdoc/cpdf_occontext.h
+++ b/core/fpdfdoc/cpdf_occontext.h
@@ -9,7 +9,7 @@
#include <unordered_map>
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpdf_pagelabel.h b/core/fpdfdoc/cpdf_pagelabel.h
index 16acf3b..6a0664b 100644
--- a/core/fpdfdoc/cpdf_pagelabel.h
+++ b/core/fpdfdoc/cpdf_pagelabel.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPDF_PAGELABEL_H_
#define CORE_FPDFDOC_CPDF_PAGELABEL_H_
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Document;
diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h
index cc13b33..e57636e 100644
--- a/core/fpdfdoc/cpdf_variabletext.h
+++ b/core/fpdfdoc/cpdf_variabletext.h
@@ -15,9 +15,9 @@
#include "core/fpdfdoc/cpvt_lineinfo.h"
#include "core/fpdfdoc/cpvt_wordplace.h"
#include "core/fpdfdoc/cpvt_wordrange.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_font.h"
class CSection;
diff --git a/core/fpdfdoc/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h
index 9375e85..f400c37 100644
--- a/core/fpdfdoc/cpdf_viewerpreferences.h
+++ b/core/fpdfdoc/cpdf_viewerpreferences.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
#define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpvt_arraytemplate.h b/core/fpdfdoc/cpvt_arraytemplate.h
index a0f129d..5274bd9 100644
--- a/core/fpdfdoc/cpvt_arraytemplate.h
+++ b/core/fpdfdoc/cpvt_arraytemplate.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFDOC_CPVT_ARRAYTEMPLATE_H_
#define CORE_FPDFDOC_CPVT_ARRAYTEMPLATE_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_system.h"
template <class TYPE>
class CPVT_ArrayTemplate : public CFX_ArrayTemplate<TYPE> {
diff --git a/core/fpdfdoc/cpvt_color.h b/core/fpdfdoc/cpvt_color.h
index 1be6beb..0eec252 100644
--- a/core/fpdfdoc/cpvt_color.h
+++ b/core/fpdfdoc/cpvt_color.h
@@ -8,8 +8,8 @@
#define CORE_FPDFDOC_CPVT_COLOR_H_
#include "core/fpdfapi/fpdf_parser/cpdf_array.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_Color {
enum Type { kTransparent = 0, kGray, kRGB, kCMYK };
diff --git a/core/fpdfdoc/cpvt_floatrect.h b/core/fpdfdoc/cpvt_floatrect.h
index d581610..6fc4b8e 100644
--- a/core/fpdfdoc/cpvt_floatrect.h
+++ b/core/fpdfdoc/cpvt_floatrect.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPVT_FLOATRECT_H_
#define CORE_FPDFDOC_CPVT_FLOATRECT_H_
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
class CPVT_FloatRect : public CFX_FloatRect {
public:
diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h
index d5ec879..98e390f 100644
--- a/core/fpdfdoc/cpvt_fontmap.h
+++ b/core/fpdfdoc/cpvt_fontmap.h
@@ -10,7 +10,7 @@
#include <stdint.h>
#include "core/fpdfdoc/ipvt_fontmap.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Document;
class CPDF_Dictionary;
diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h
index 603d445..5a52d87 100644
--- a/core/fpdfdoc/cpvt_generateap.h
+++ b/core/fpdfdoc/cpvt_generateap.h
@@ -11,9 +11,9 @@
#include "core/fpdfdoc/cpdf_variabletext.h"
#include "core/fpdfdoc/cpvt_color.h"
#include "core/fpdfdoc/cpvt_dash.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_Dictionary;
class CPDF_Document;
diff --git a/core/fpdfdoc/cpvt_line.h b/core/fpdfdoc/cpvt_line.h
index 70e3b7f..25ae34a 100644
--- a/core/fpdfdoc/cpvt_line.h
+++ b/core/fpdfdoc/cpvt_line.h
@@ -8,8 +8,8 @@
#define CORE_FPDFDOC_CPVT_LINE_H_
#include "core/fpdfdoc/cpvt_wordplace.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_Line {
CPVT_Line() : fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f) {}
diff --git a/core/fpdfdoc/cpvt_lineinfo.h b/core/fpdfdoc/cpvt_lineinfo.h
index ab66d8c..2ebc51c 100644
--- a/core/fpdfdoc/cpvt_lineinfo.h
+++ b/core/fpdfdoc/cpvt_lineinfo.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPVT_LINEINFO_H_
#define CORE_FPDFDOC_CPVT_LINEINFO_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_LineInfo {
CPVT_LineInfo()
diff --git a/core/fpdfdoc/cpvt_secprops.h b/core/fpdfdoc/cpvt_secprops.h
index e5c633f..d1c4b58 100644
--- a/core/fpdfdoc/cpvt_secprops.h
+++ b/core/fpdfdoc/cpvt_secprops.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPVT_SECPROPS_H_
#define CORE_FPDFDOC_CPVT_SECPROPS_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_SecProps {
CPVT_SecProps() : fLineLeading(0.0f), fLineIndent(0.0f), nAlignment(0) {}
diff --git a/core/fpdfdoc/cpvt_section.h b/core/fpdfdoc/cpvt_section.h
index ae12290..42b16fd 100644
--- a/core/fpdfdoc/cpvt_section.h
+++ b/core/fpdfdoc/cpvt_section.h
@@ -10,7 +10,7 @@
#include "core/fpdfdoc/cpvt_secprops.h"
#include "core/fpdfdoc/cpvt_wordplace.h"
#include "core/fpdfdoc/cpvt_wordprops.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
struct CPVT_Section {
CPVT_WordPlace secplace;
diff --git a/core/fpdfdoc/cpvt_word.h b/core/fpdfdoc/cpvt_word.h
index 1e3b5aa..92a4ce1 100644
--- a/core/fpdfdoc/cpvt_word.h
+++ b/core/fpdfdoc/cpvt_word.h
@@ -9,7 +9,7 @@
#include "core/fpdfdoc/cpvt_wordplace.h"
#include "core/fpdfdoc/cpvt_wordprops.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_Word {
CPVT_Word();
diff --git a/core/fpdfdoc/cpvt_wordinfo.h b/core/fpdfdoc/cpvt_wordinfo.h
index 3bb452a..861534b 100644
--- a/core/fpdfdoc/cpvt_wordinfo.h
+++ b/core/fpdfdoc/cpvt_wordinfo.h
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fpdfdoc/cpvt_wordprops.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_WordInfo {
CPVT_WordInfo();
diff --git a/core/fpdfdoc/cpvt_wordplace.h b/core/fpdfdoc/cpvt_wordplace.h
index 33ba7c9..00b5215 100644
--- a/core/fpdfdoc/cpvt_wordplace.h
+++ b/core/fpdfdoc/cpvt_wordplace.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPVT_WORDPLACE_H_
#define CORE_FPDFDOC_CPVT_WORDPLACE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_WordPlace {
CPVT_WordPlace() : nSecIndex(-1), nLineIndex(-1), nWordIndex(-1) {}
diff --git a/core/fpdfdoc/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h
index 25d8d76..ca95755 100644
--- a/core/fpdfdoc/cpvt_wordprops.h
+++ b/core/fpdfdoc/cpvt_wordprops.h
@@ -8,7 +8,7 @@
#define CORE_FPDFDOC_CPVT_WORDPROPS_H_
#include "core/fpdfdoc/cpdf_variabletext.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
struct CPVT_WordProps {
diff --git a/core/fpdfdoc/cpvt_wordrange.h b/core/fpdfdoc/cpvt_wordrange.h
index 3cd0ecf..a92613c 100644
--- a/core/fpdfdoc/cpvt_wordrange.h
+++ b/core/fpdfdoc/cpvt_wordrange.h
@@ -8,7 +8,7 @@
#define CORE_FPDFDOC_CPVT_WORDRANGE_H_
#include "core/fpdfdoc/cpvt_wordplace.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CPVT_WordRange {
CPVT_WordRange() {}
diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h
index 8629be7..706f5b6 100644
--- a/core/fpdfdoc/csection.h
+++ b/core/fpdfdoc/csection.h
@@ -10,8 +10,8 @@
#include "core/fpdfdoc/clines.h"
#include "core/fpdfdoc/cpvt_sectioninfo.h"
#include "core/fpdfdoc/ctypeset.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_VariableText;
diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h
index 1ead422..3f6551d 100644
--- a/core/fpdfdoc/ctypeset.h
+++ b/core/fpdfdoc/ctypeset.h
@@ -8,7 +8,7 @@
#define CORE_FPDFDOC_CTYPESET_H_
#include "core/fpdfdoc/cpvt_floatrect.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_VariableText;
class CSection;
diff --git a/core/fpdfdoc/ipdf_formnotify.h b/core/fpdfdoc/ipdf_formnotify.h
index 4937bb1..bf6127d 100644
--- a/core/fpdfdoc/ipdf_formnotify.h
+++ b/core/fpdfdoc/ipdf_formnotify.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
#define CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_FormField;
class CPDF_InterForm;
diff --git a/core/fpdfdoc/ipvt_fontmap.h b/core/fpdfdoc/ipvt_fontmap.h
index 072783b..740cb19 100644
--- a/core/fpdfdoc/ipvt_fontmap.h
+++ b/core/fpdfdoc/ipvt_fontmap.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Font;
diff --git a/core/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h
index 871a01e..14dfaf5 100644
--- a/core/fpdfdoc/tagged_int.h
+++ b/core/fpdfdoc/tagged_int.h
@@ -12,7 +12,7 @@
#include <vector>
#include "core/fpdfdoc/fpdf_tagged.h"
-#include "core/fxcrt/include/cfx_retain_ptr.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
#include "third_party/base/stl_util.h"
class CPDF_StructElementImpl;
diff --git a/core/fpdftext/cpdf_linkextract.cpp b/core/fpdftext/cpdf_linkextract.cpp
index 021cc5e..8546a82 100644
--- a/core/fpdftext/cpdf_linkextract.cpp
+++ b/core/fpdftext/cpdf_linkextract.cpp
@@ -9,9 +9,9 @@
#include <vector>
#include "core/fpdftext/cpdf_textpage.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
CPDF_LinkExtract::CPDF_LinkExtract(const CPDF_TextPage* pTextPage)
: m_pTextPage(pTextPage) {}
diff --git a/core/fpdftext/cpdf_linkextract.h b/core/fpdftext/cpdf_linkextract.h
index 159b330..43306cf 100644
--- a/core/fpdftext/cpdf_linkextract.h
+++ b/core/fpdftext/cpdf_linkextract.h
@@ -9,10 +9,10 @@
#include <vector>
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_TextPage;
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 4fdbc31..8ee5719 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -20,8 +20,8 @@
#include "core/fpdfapi/fpdf_parser/cpdf_string.h"
#include "core/fpdftext/unicodenormalizationdata.h"
#include "core/fxcrt/fx_bidi.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_ucd.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index 46fcafa..bbb92fd 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -11,9 +11,9 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
class CPDF_Font;
class CPDF_FormObject;
diff --git a/core/fpdftext/cpdf_textpagefind.cpp b/core/fpdftext/cpdf_textpagefind.cpp
index 03dd21b..9ccfcea 100644
--- a/core/fpdftext/cpdf_textpagefind.cpp
+++ b/core/fpdftext/cpdf_textpagefind.cpp
@@ -11,8 +11,8 @@
#include <vector>
#include "core/fpdftext/cpdf_textpage.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/stl_util.h"
namespace {
diff --git a/core/fpdftext/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h
index 2cc4c1e..f84ae37 100644
--- a/core/fpdftext/cpdf_textpagefind.h
+++ b/core/fpdftext/cpdf_textpagefind.h
@@ -9,9 +9,9 @@
#include <vector>
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CPDF_TextPage;
diff --git a/core/fpdftext/unicodenormalizationdata.cpp b/core/fpdftext/unicodenormalizationdata.cpp
index e124bf4..7cbc2f7 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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/ccodec_basicmodule.h b/core/fxcodec/codec/ccodec_basicmodule.h
index 641cd00..1c3f4d1 100644
--- a/core/fxcodec/codec/ccodec_basicmodule.h
+++ b/core/fxcodec/codec/ccodec_basicmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_BASICMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_BASICMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_ScanlineDecoder;
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.h b/core/fxcodec/codec/ccodec_bmpmodule.h
index b465edd..f5e5417 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.h
+++ b/core/fxcodec/codec/ccodec_bmpmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_BMPMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_BMPMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct FXBMP_Context;
class CFX_DIBAttribute;
diff --git a/core/fxcodec/codec/ccodec_faxmodule.h b/core/fxcodec/codec/ccodec_faxmodule.h
index 27d4b9a..18b9bb6 100644
--- a/core/fxcodec/codec/ccodec_faxmodule.h
+++ b/core/fxcodec/codec/ccodec_faxmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_FAXMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_FAXMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_ScanlineDecoder;
diff --git a/core/fxcodec/codec/ccodec_flatemodule.h b/core/fxcodec/codec/ccodec_flatemodule.h
index 01797e7..0b91f0a 100644
--- a/core/fxcodec/codec/ccodec_flatemodule.h
+++ b/core/fxcodec/codec/ccodec_flatemodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_FLATEMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_FLATEMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_ScanlineDecoder;
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h
index 4878074..0281e69 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.h
+++ b/core/fxcodec/codec/ccodec_gifmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct FXGIF_Context;
diff --git a/core/fxcodec/codec/ccodec_iccmodule.h b/core/fxcodec/codec/ccodec_iccmodule.h
index f97065b..1f856fa 100644
--- a/core/fxcodec/codec/ccodec_iccmodule.h
+++ b/core/fxcodec/codec/ccodec_iccmodule.h
@@ -8,8 +8,8 @@
#define CORE_FXCODEC_CODEC_CCODEC_ICCMODULE_H_
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_IccModule {
public:
diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h
index d2b97b8..c74ed5f 100644
--- a/core/fxcodec/codec/ccodec_jbig2module.h
+++ b/core/fxcodec/codec/ccodec_jbig2module.h
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CJBig2_Context;
class CJBig2_Image;
diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h
index 52fc4d8..7407134 100644
--- a/core/fxcodec/codec/ccodec_jpegmodule.h
+++ b/core/fxcodec/codec/ccodec_jpegmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_JPEGMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_JPEGMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_ScanlineDecoder;
class CFX_DIBSource;
diff --git a/core/fxcodec/codec/ccodec_jpxmodule.h b/core/fxcodec/codec/ccodec_jpxmodule.h
index 149e8a7..fd919d9 100644
--- a/core/fxcodec/codec/ccodec_jpxmodule.h
+++ b/core/fxcodec/codec/ccodec_jpxmodule.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CJPX_Decoder;
class CPDF_ColorSpace;
diff --git a/core/fxcodec/codec/ccodec_pngmodule.h b/core/fxcodec/codec/ccodec_pngmodule.h
index 23b5d4b..747d346 100644
--- a/core/fxcodec/codec/ccodec_pngmodule.h
+++ b/core/fxcodec/codec/ccodec_pngmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CFX_DIBAttribute;
struct FXPNG_Context;
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h
index 8540493..e51d073 100644
--- a/core/fxcodec/codec/ccodec_progressivedecoder.h
+++ b/core/fxcodec/codec/ccodec_progressivedecoder.h
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_dib.h"
class CCodec_BmpModule;
diff --git a/core/fxcodec/codec/ccodec_scanlinedecoder.h b/core/fxcodec/codec/ccodec_scanlinedecoder.h
index 23ecb95..14eb6b6 100644
--- a/core/fxcodec/codec/ccodec_scanlinedecoder.h
+++ b/core/fxcodec/codec/ccodec_scanlinedecoder.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_SCANLINEDECODER_H_
#define CORE_FXCODEC_CODEC_CCODEC_SCANLINEDECODER_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class IFX_Pause;
diff --git a/core/fxcodec/codec/ccodec_tiffmodule.h b/core/fxcodec/codec/ccodec_tiffmodule.h
index 7b89584..c6525f3 100644
--- a/core/fxcodec/codec/ccodec_tiffmodule.h
+++ b/core/fxcodec/codec/ccodec_tiffmodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCODEC_CODEC_CCODEC_TIFFMODULE_H_
#define CORE_FXCODEC_CODEC_CCODEC_TIFFMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CCodec_TiffContext;
class CFX_DIBAttribute;
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index 60a64a1..dfac86f 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -11,8 +11,8 @@
#include <utility>
#include "core/fxcodec/codec/codec_int.h"
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/logging.h"
CCodec_ModuleMgr::CCodec_ModuleMgr()
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index c34aabb..9b9ad04 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -10,7 +10,7 @@
#include <memory>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "third_party/zlib_v128/zlib.h"
extern "C" {
diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp
index 93e5494..7b8d99a 100644
--- a/core/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/fxcodec/codec/fx_codec_jbig.cpp
@@ -12,7 +12,7 @@
#include "core/fxcodec/JBig2_DocumentContext.h"
#include "core/fxcodec/jbig2/JBig2_Context.h"
#include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
JBig2_DocumentContext::JBig2_DocumentContext() {}
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 29c6f8c..16e43f5 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -8,7 +8,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/include/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 219b1a0..df836c2 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -11,7 +11,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/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/fx_codec.h b/core/fxcodec/fx_codec.h
index 5e00faf..0fb3941 100644
--- a/core/fxcodec/fx_codec.h
+++ b/core/fxcodec/fx_codec.h
@@ -20,8 +20,8 @@
#include "core/fxcodec/codec/ccodec_jpxmodule.h"
#include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
class CFX_DIBSource;
class CJPX_Decoder;
diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithDecoder.cpp
index f6981a1..0d45f57 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
namespace {
diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 140ca38..228e16e 100644
--- a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -8,7 +8,7 @@
#include <vector>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
namespace {
diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.h
index f1eb68d..fd9fa89 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CJBig2_ArithIntDecoder {
public:
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h
index 191438f..24e8faa 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CPDF_StreamAcc;
diff --git a/core/fxcodec/jbig2/JBig2_Define.h b/core/fxcodec/jbig2/JBig2_Define.h
index d12302b..86df248 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 ea9748c..f087aff 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -8,8 +8,8 @@
#define CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
#include "core/fxcodec/fx_codec_def.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/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 17adf19..7329b9f 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 ee6cd36..c5a56b1 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
uint32_t* 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 b3bd022..c440ddb 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 aaa617c..f3391b3 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 b4f55c6..0ff79dc 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 038921e..3b34018 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/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
CJBig2_HuffmanTable::CJBig2_HuffmanTable(const JBig2TableLine* pTable,
uint32_t nLines,
diff --git a/core/fxcodec/jbig2/JBig2_HuffmanTable.h b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
index 9b29847..58a3124 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable.h
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 97d325b..4c2ba99 100644
--- a/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp
+++ b/core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 4fb2d1e..c064f57 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 2071221..7ac7e61 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/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_safe_types.h"
namespace {
diff --git a/core/fxcodec/jbig2/JBig2_Page.h b/core/fxcodec/jbig2/JBig2_Page.h
index e9ffa76..131d6c8 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct JBig2PageInfo {
uint32_t m_dwWidth;
diff --git a/core/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/fxcodec/jbig2/JBig2_PatternDict.cpp
index 9598dc4..cd6a2ad 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/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/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 6bdd186..93b2d35 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 c6adfce..1a7e96d 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 4febc8d..747e9f0 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 0f53abc..610246b 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/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/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 c1f8e5a..d4dfa35 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/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
CJBig2_SymbolDict::CJBig2_SymbolDict() {}
diff --git a/core/fxcodec/jbig2/JBig2_SymbolDict.h b/core/fxcodec/jbig2/JBig2_SymbolDict.h
index b880d6b..4520f76 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/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CJBig2_Image;
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.h b/core/fxcodec/jbig2/JBig2_TrdProc.h
index 83e43ec..2779676 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 5c48378..dfaf285 100644
--- a/core/fxcodec/lbmp/fx_bmp.h
+++ b/core/fxcodec/lbmp/fx_bmp.h
@@ -9,7 +9,7 @@
#include <setjmp.h>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/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 c669e98..2a40995 100644
--- a/core/fxcodec/lgif/fx_gif.h
+++ b/core/fxcodec/lgif/fx_gif.h
@@ -9,7 +9,7 @@
#include <setjmp.h>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#define GIF_SIGNATURE "GIF"
#define GIF_SIG_EXTENSION 0x21
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/cfx_count_ref.h
similarity index 90%
rename from core/fxcrt/include/cfx_count_ref.h
rename to core/fxcrt/cfx_count_ref.h
index a879967..3b9ccff 100644
--- a/core/fxcrt/include/cfx_count_ref.h
+++ b/core/fxcrt/cfx_count_ref.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
-#define CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
+#ifndef CORE_FXCRT_CFX_COUNT_REF_H_
+#define CORE_FXCRT_CFX_COUNT_REF_H_
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_system.h"
// A shared object with Copy on Write semantics that makes it appear as
// if each one were independent.
@@ -78,4 +78,4 @@
CFX_RetainPtr<CountedObj> m_pObject;
};
-#endif // CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
+#endif // CORE_FXCRT_CFX_COUNT_REF_H_
diff --git a/core/fxcrt/cfx_count_ref_unittest.cpp b/core/fxcrt/cfx_count_ref_unittest.cpp
index 6cb9f4a..6ab5632 100644
--- a/core/fxcrt/cfx_count_ref_unittest.cpp
+++ b/core/fxcrt/cfx_count_ref_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/cfx_count_ref.h"
+#include "core/fxcrt/cfx_count_ref.h"
#include <map>
#include <string>
diff --git a/core/fxcrt/include/cfx_observable.h b/core/fxcrt/cfx_observable.h
similarity index 92%
rename from core/fxcrt/include/cfx_observable.h
rename to core/fxcrt/cfx_observable.h
index a5053f3..dc869b1 100644
--- a/core/fxcrt/include/cfx_observable.h
+++ b/core/fxcrt/cfx_observable.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
-#define CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#ifndef CORE_FXCRT_CFX_OBSERVABLE_H_
+#define CORE_FXCRT_CFX_OBSERVABLE_H_
#include <set>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/stl_util.h"
template <class T>
@@ -75,4 +75,4 @@
std::set<ObservedPtr*> m_ObservedPtrs;
};
-#endif // CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#endif // CORE_FXCRT_CFX_OBSERVABLE_H_
diff --git a/core/fxcrt/cfx_observable_unittest.cpp b/core/fxcrt/cfx_observable_unittest.cpp
index eaadd95..15c7649 100644
--- a/core/fxcrt/cfx_observable_unittest.cpp
+++ b/core/fxcrt/cfx_observable_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/cfx_observable.h"
+#include "core/fxcrt/cfx_observable.h"
#include <utility>
diff --git a/core/fxcrt/include/cfx_retain_ptr.h b/core/fxcrt/cfx_retain_ptr.h
similarity index 82%
rename from core/fxcrt/include/cfx_retain_ptr.h
rename to core/fxcrt/cfx_retain_ptr.h
index e40feb6..883494e 100644
--- a/core/fxcrt/include/cfx_retain_ptr.h
+++ b/core/fxcrt/cfx_retain_ptr.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
-#define CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
+#ifndef CORE_FXCRT_CFX_RETAIN_PTR_H_
+#define CORE_FXCRT_CFX_RETAIN_PTR_H_
#include <memory>
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
template <class T>
class CFX_RetainPtr {
@@ -22,8 +22,7 @@
CFX_RetainPtr(CFX_RetainPtr&& that) { Swap(that); }
template <class U>
- CFX_RetainPtr(const CFX_RetainPtr<U>& that)
- : CFX_RetainPtr(that.Get()) {}
+ CFX_RetainPtr(const CFX_RetainPtr<U>& that) : CFX_RetainPtr(that.Get()) {}
void Reset(T* obj = nullptr) {
if (obj)
@@ -54,4 +53,4 @@
std::unique_ptr<T, ReleaseDeleter<T>> m_pObj;
};
-#endif // CORE_FXCRT_INCLUDE_CFX_RETAIN_PTR_H_
+#endif // CORE_FXCRT_CFX_RETAIN_PTR_H_
diff --git a/core/fxcrt/cfx_retain_ptr_unittest.cpp b/core/fxcrt/cfx_retain_ptr_unittest.cpp
index 9da0d5c..aa92e57 100644
--- a/core/fxcrt/cfx_retain_ptr_unittest.cpp
+++ b/core/fxcrt/cfx_retain_ptr_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/cfx_retain_ptr.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
#include <utility>
diff --git a/core/fxcrt/cfx_string_c_template.h b/core/fxcrt/cfx_string_c_template.h
index 70b9fcd..4a3dae7 100644
--- a/core/fxcrt/cfx_string_c_template.h
+++ b/core/fxcrt/cfx_string_c_template.h
@@ -10,7 +10,7 @@
#include <algorithm>
#include <type_traits>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
// An immutable string with caller-provided storage which must outlive the
// string itself. These are not necessarily nul-terminated, so that substring
diff --git a/core/fxcrt/cfx_string_data_template.h b/core/fxcrt/cfx_string_data_template.h
index 5f7bfa1..affd610 100644
--- a/core/fxcrt/cfx_string_data_template.h
+++ b/core/fxcrt/cfx_string_data_template.h
@@ -7,8 +7,8 @@
#ifndef CORE_FXCRT_CFX_STRING_DATA_TEMPLATE_H_
#define CORE_FXCRT_CFX_STRING_DATA_TEMPLATE_H_
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/numerics/safe_math.h"
template <typename CharType>
diff --git a/core/fxcrt/include/cfx_string_pool_template.h b/core/fxcrt/cfx_string_pool_template.h
similarity index 78%
rename from core/fxcrt/include/cfx_string_pool_template.h
rename to core/fxcrt/cfx_string_pool_template.h
index a59d13a..bfc1ce4 100644
--- a/core/fxcrt/include/cfx_string_pool_template.h
+++ b/core/fxcrt/cfx_string_pool_template.h
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
-#define CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
+#ifndef CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
+#define CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
#include <unordered_set>
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
template <typename StringType>
class CFX_StringPoolTemplate {
@@ -27,4 +27,4 @@
extern template class CFX_StringPoolTemplate<CFX_ByteString>;
extern template class CFX_StringPoolTemplate<CFX_WideString>;
-#endif // CORE_FXCRT_INCLUDE_CFX_STRING_POOL_TEMPLATE_H_
+#endif // CORE_FXCRT_CFX_STRING_POOL_TEMPLATE_H_
diff --git a/core/fxcrt/cfx_string_pool_template_unittest.cpp b/core/fxcrt/cfx_string_pool_template_unittest.cpp
index 95a9007..d0f5fbe 100644
--- a/core/fxcrt/cfx_string_pool_template_unittest.cpp
+++ b/core/fxcrt/cfx_string_pool_template_unittest.cpp
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_string.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/include/cfx_weak_ptr.h b/core/fxcrt/cfx_weak_ptr.h
similarity index 90%
rename from core/fxcrt/include/cfx_weak_ptr.h
rename to core/fxcrt/cfx_weak_ptr.h
index 64218cd..61f15e3 100644
--- a/core/fxcrt/include/cfx_weak_ptr.h
+++ b/core/fxcrt/cfx_weak_ptr.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
-#define CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
+#ifndef CORE_FXCRT_CFX_WEAK_PTR_H_
+#define CORE_FXCRT_CFX_WEAK_PTR_H_
#include <memory>
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_system.h"
template <class T, class D = std::default_delete<T>>
class CFX_WeakPtr {
@@ -77,4 +77,4 @@
CFX_RetainPtr<Handle> m_pHandle;
};
-#endif // CORE_FXCRT_INCLUDE_CFX_WEAK_PTR_H_
+#endif // CORE_FXCRT_CFX_WEAK_PTR_H_
diff --git a/core/fxcrt/cfx_weak_ptr_unittest.cpp b/core/fxcrt/cfx_weak_ptr_unittest.cpp
index c4fa514..11dd8bb 100644
--- a/core/fxcrt/cfx_weak_ptr_unittest.cpp
+++ b/core/fxcrt/cfx_weak_ptr_unittest.cpp
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/cfx_weak_ptr.h"
+#include "core/fxcrt/cfx_weak_ptr.h"
#include <memory>
#include <utility>
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/extension.h b/core/fxcrt/extension.h
index d4fd093..6a437db 100644
--- a/core/fxcrt/extension.h
+++ b/core/fxcrt/extension.h
@@ -10,8 +10,8 @@
#include <algorithm>
#include <memory>
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_safe_types.h"
class IFXCRT_FileAccess {
public:
diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index 2c0a1bb..ee04f40 100644
--- a/core/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_arabic.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_arabic.h"
+#include "core/fxcrt/fx_ucd.h"
namespace {
diff --git a/core/fxcrt/include/fx_arabic.h b/core/fxcrt/fx_arabic.h
similarity index 97%
rename from core/fxcrt/include/fx_arabic.h
rename to core/fxcrt/fx_arabic.h
index 2617d189..e20a261 100644
--- a/core/fxcrt/include/fx_arabic.h
+++ b/core/fxcrt/fx_arabic.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_ARABIC_H_
-#define CORE_FXCRT_INCLUDE_FX_ARABIC_H_
+#ifndef CORE_FXCRT_FX_ARABIC_H_
+#define CORE_FXCRT_FX_ARABIC_H_
-#include "core/fxcrt/include/fx_arb.h"
+#include "core/fxcrt/fx_arb.h"
#define FX_BIDIMAXLEVEL 61
#define FX_BidiDirection(a) (FX_IsOdd(a) ? FX_BIDICLASS_R : FX_BIDICLASS_L)
@@ -185,4 +185,4 @@
CFX_WideString& wsText,
const CFX_Int32Array& levels);
-#endif // CORE_FXCRT_INCLUDE_FX_ARABIC_H_
+#endif // CORE_FXCRT_FX_ARABIC_H_
diff --git a/core/fxcrt/include/fx_arb.h b/core/fxcrt/fx_arb.h
similarity index 84%
rename from core/fxcrt/include/fx_arb.h
rename to core/fxcrt/fx_arb.h
index 6928519..6d556fe 100644
--- a/core/fxcrt/include/fx_arb.h
+++ b/core/fxcrt/fx_arb.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_ARB_H_
-#define CORE_FXCRT_INCLUDE_FX_ARB_H_
+#ifndef CORE_FXCRT_FX_ARB_H_
+#define CORE_FXCRT_FX_ARB_H_
-#include "core/fxcrt/include/fx_system.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/fx_ucd.h"
struct FX_ARBFORMTABLE {
uint16_t wIsolated;
@@ -46,4 +46,4 @@
int32_t iCount,
int32_t iBaseLevel = 0);
-#endif // CORE_FXCRT_INCLUDE_FX_ARB_H_
+#endif // CORE_FXCRT_FX_ARB_H_
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/fx_basic.h
similarity index 98%
rename from core/fxcrt/include/fx_basic.h
rename to core/fxcrt/fx_basic.h
index 6a8988d..4cf69f8 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
-#define CORE_FXCRT_INCLUDE_FX_BASIC_H_
+#ifndef CORE_FXCRT_FX_BASIC_H_
+#define CORE_FXCRT_FX_BASIC_H_
#include <algorithm>
#include <memory>
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_stream.h"
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_stream.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
class CFX_BinaryBuf {
public:
@@ -788,7 +788,8 @@
T1 m_Data;
};
typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>,
- FX_FILESIZE> CFX_FileSizeListArray;
+ FX_FILESIZE>
+ CFX_FileSizeListArray;
#ifdef PDF_ENABLE_XFA
class IFX_Retainable {
@@ -856,4 +857,4 @@
uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits);
-#endif // CORE_FXCRT_INCLUDE_FX_BASIC_H_
+#endif // CORE_FXCRT_FX_BASIC_H_
diff --git a/core/fxcrt/fx_basic_array.cpp b/core/fxcrt/fx_basic_array.cpp
index 0a2dc43..2d1a7bd 100644
--- a/core/fxcrt/fx_basic_array.cpp
+++ b/core/fxcrt/fx_basic_array.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "third_party/base/numerics/safe_math.h"
CFX_BasicArray::CFX_BasicArray(int unit_size)
diff --git a/core/fxcrt/fx_basic_bstring.cpp b/core/fxcrt/fx_basic_bstring.cpp
index 63db86e..23f13c1 100644
--- a/core/fxcrt/fx_basic_bstring.cpp
+++ b/core/fxcrt/fx_basic_bstring.cpp
@@ -9,8 +9,8 @@
#include <algorithm>
#include <cctype>
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_basic.h"
#include "third_party/base/numerics/safe_math.h"
template class CFX_StringDataTemplate<FX_CHAR>;
diff --git a/core/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp
index cfdf279..f314c65 100644
--- a/core/fxcrt/fx_basic_bstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_bstring_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/fx_basic_buffer.cpp b/core/fxcrt/fx_basic_buffer.cpp
index 5ee1a65..d441f6c 100644
--- a/core/fxcrt/fx_basic_buffer.cpp
+++ b/core/fxcrt/fx_basic_buffer.cpp
@@ -7,8 +7,8 @@
#include <algorithm>
#include <limits>
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions.h"
CFX_BinaryBuf::CFX_BinaryBuf()
diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index 893a99a..1184370 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -6,8 +6,8 @@
#include <limits.h>
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_ext.h"
void FX_RECT::Normalize() {
if (left > right) {
diff --git a/core/fxcrt/fx_basic_gcc.cpp b/core/fxcrt/fx_basic_gcc.cpp
index 3547e5f..42fb2a1 100644
--- a/core/fxcrt/fx_basic_gcc.cpp
+++ b/core/fxcrt/fx_basic_gcc.cpp
@@ -8,8 +8,8 @@
#include <cwctype>
#include <limits>
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_string.h"
template <typename IntType, typename CharType>
IntType FXSYS_StrToInt(const CharType* str) {
diff --git a/core/fxcrt/fx_basic_gcc_unittest.cpp b/core/fxcrt/fx_basic_gcc_unittest.cpp
index 73e7446..665eede 100644
--- a/core/fxcrt/fx_basic_gcc_unittest.cpp
+++ b/core/fxcrt/fx_basic_gcc_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(fxcrt, FXSYS_atoi) {
diff --git a/core/fxcrt/fx_basic_list.cpp b/core/fxcrt/fx_basic_list.cpp
index 53e0621..09ad08b 100644
--- a/core/fxcrt/fx_basic_list.cpp
+++ b/core/fxcrt/fx_basic_list.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/plex.h"
CFX_PtrList::CFX_PtrList(int nBlockSize)
diff --git a/core/fxcrt/fx_basic_maps.cpp b/core/fxcrt/fx_basic_maps.cpp
index 2424b82..48fb970 100644
--- a/core/fxcrt/fx_basic_maps.cpp
+++ b/core/fxcrt/fx_basic_maps.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/plex.h"
CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize)
diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp
index 94d978c..927b994 100644
--- a/core/fxcrt/fx_basic_memmgr.cpp
+++ b/core/fxcrt/fx_basic_memmgr.cpp
@@ -6,7 +6,7 @@
#include <stdlib.h> // For abort().
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
void* FXMEM_DefaultAlloc(size_t byte_size, int flags) {
return (void*)malloc(byte_size);
diff --git a/core/fxcrt/fx_basic_memmgr_unittest.cpp b/core/fxcrt/fx_basic_memmgr_unittest.cpp
index 3ce5330..fdffd98 100644
--- a/core/fxcrt/fx_basic_memmgr_unittest.cpp
+++ b/core/fxcrt/fx_basic_memmgr_unittest.cpp
@@ -4,7 +4,7 @@
#include <limits>
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/core/fxcrt/fx_basic_plex.cpp b/core/fxcrt/fx_basic_plex.cpp
index 99cc700..cb6fde6 100644
--- a/core/fxcrt/fx_basic_plex.cpp
+++ b/core/fxcrt/fx_basic_plex.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/plex.h"
CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead,
diff --git a/core/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index de219b4..8dbbb28 100644
--- a/core/fxcrt/fx_basic_utf.cpp
+++ b/core/fxcrt/fx_basic_utf.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
void CFX_UTF8Decoder::Clear() {
m_Buffer.Clear();
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index 663ca93..ae3959b 100644
--- a/core/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
#include <dirent.h>
diff --git a/core/fxcrt/fx_basic_util_unittest.cpp b/core/fxcrt/fx_basic_util_unittest.cpp
index 6eae669..471c6de 100644
--- a/core/fxcrt/fx_basic_util_unittest.cpp
+++ b/core/fxcrt/fx_basic_util_unittest.cpp
@@ -4,7 +4,7 @@
#include <limits>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 377f09c..099d0ec 100644
--- a/core/fxcrt/fx_basic_wstring.cpp
+++ b/core/fxcrt/fx_basic_wstring.cpp
@@ -9,9 +9,9 @@
#include <algorithm>
#include <cctype>
-#include "core/fxcrt/include/cfx_string_pool_template.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/cfx_string_pool_template.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
#include "third_party/base/numerics/safe_math.h"
template class CFX_StringDataTemplate<FX_WCHAR>;
diff --git a/core/fxcrt/fx_basic_wstring_unittest.cpp b/core/fxcrt/fx_basic_wstring_unittest.cpp
index efd958d..07b5aaf 100644
--- a/core/fxcrt/fx_basic_wstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_wstring_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp
index f1d162d..e82b3e7 100644
--- a/core/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcrt/fx_bidi.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_ucd.h"
#include <algorithm>
diff --git a/core/fxcrt/fx_bidi.h b/core/fxcrt/fx_bidi.h
index ad5fb27..8d12cc8 100644
--- a/core/fxcrt/fx_bidi.h
+++ b/core/fxcrt/fx_bidi.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
// Processes characters and group them into segments based on text direction.
class CFX_BidiChar {
diff --git a/core/fxcrt/include/fx_coordinates.h b/core/fxcrt/fx_coordinates.h
similarity index 98%
rename from core/fxcrt/include/fx_coordinates.h
rename to core/fxcrt/fx_coordinates.h
index a7c01ca..d10f7b0 100644
--- a/core/fxcrt/include/fx_coordinates.h
+++ b/core/fxcrt/fx_coordinates.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
-#define CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
+#ifndef CORE_FXCRT_FX_COORDINATES_H_
+#define CORE_FXCRT_FX_COORDINATES_H_
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CFX_Matrix;
@@ -668,4 +668,4 @@
FX_FLOAT f;
};
-#endif // CORE_FXCRT_INCLUDE_FX_COORDINATES_H_
+#endif // CORE_FXCRT_FX_COORDINATES_H_
diff --git a/core/fxcrt/include/fx_ext.h b/core/fxcrt/fx_ext.h
similarity index 95%
rename from core/fxcrt/include/fx_ext.h
rename to core/fxcrt/fx_ext.h
index e33d57b..959a26b 100644
--- a/core/fxcrt/include/fx_ext.h
+++ b/core/fxcrt/fx_ext.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_EXT_H_
-#define CORE_FXCRT_INCLUDE_FX_EXT_H_
+#ifndef CORE_FXCRT_FX_EXT_H_
+#define CORE_FXCRT_FX_EXT_H_
#include <cctype>
#include <cwctype>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#define FX_INVALID_OFFSET static_cast<uint32_t>(-1)
@@ -127,4 +127,4 @@
}
};
-#endif // CORE_FXCRT_INCLUDE_FX_EXT_H_
+#endif // CORE_FXCRT_FX_EXT_H_
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index 4c77244..ca6b6d4 100644
--- a/core/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -7,8 +7,8 @@
#include <utility>
#include "core/fxcrt/extension.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ext.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
#include <wincrypt.h>
diff --git a/core/fxcrt/fx_extension_unittest.cpp b/core/fxcrt/fx_extension_unittest.cpp
index 954e095..3739a3d 100644
--- a/core/fxcrt/fx_extension_unittest.cpp
+++ b/core/fxcrt/fx_extension_unittest.cpp
@@ -4,7 +4,7 @@
#include "testing/gtest/include/gtest/gtest.h"
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
TEST(fxcrt, FXSYS_toHexDigit) {
EXPECT_EQ(10, FXSYS_toHexDigit('a'));
diff --git a/core/fxcrt/include/fx_memory.h b/core/fxcrt/fx_memory.h
similarity index 85%
rename from core/fxcrt/include/fx_memory.h
rename to core/fxcrt/fx_memory.h
index a3eba2f..beb194f 100644
--- a/core/fxcrt/include/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_MEMORY_H_
-#define CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#ifndef CORE_FXCRT_FX_MEMORY_H_
+#define CORE_FXCRT_FX_MEMORY_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#ifdef __cplusplus
extern "C" {
@@ -63,15 +63,15 @@
}
// Never returns nullptr.
-#define FX_Alloc(type, size) (type*) FX_AllocOrDie(size, sizeof(type))
-#define FX_Alloc2D(type, w, h) (type*) FX_AllocOrDie2D(w, h, sizeof(type))
+#define FX_Alloc(type, size) (type*)FX_AllocOrDie(size, sizeof(type))
+#define FX_Alloc2D(type, w, h) (type*)FX_AllocOrDie2D(w, h, sizeof(type))
#define FX_Realloc(type, ptr, size) \
- (type*) FX_ReallocOrDie(ptr, size, sizeof(type))
+ (type*)FX_ReallocOrDie(ptr, size, sizeof(type))
// May return nullptr.
-#define FX_TryAlloc(type, size) (type*) calloc(size, sizeof(type))
+#define FX_TryAlloc(type, size) (type*)calloc(size, sizeof(type))
#define FX_TryRealloc(type, ptr, size) \
- (type*) FX_SafeRealloc(ptr, size, sizeof(type))
+ (type*)FX_SafeRealloc(ptr, size, sizeof(type))
#define FX_Free(ptr) free(ptr)
@@ -88,7 +88,7 @@
// Note that the function doesn't need an implementation, as we only
// use its type.
template <typename T, size_t N>
-char(&ArraySizeHelper(T(&array)[N]))[N];
+char (&ArraySizeHelper(T (&array)[N]))[N];
// Used with std::unique_ptr to FX_Free raw memory.
struct FxFreeDeleter {
@@ -109,4 +109,4 @@
#endif // __cplusplus
-#endif // CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#endif // CORE_FXCRT_FX_MEMORY_H_
diff --git a/core/fxcrt/include/fx_safe_types.h b/core/fxcrt/fx_safe_types.h
similarity index 70%
rename from core/fxcrt/include/fx_safe_types.h
rename to core/fxcrt/fx_safe_types.h
index f12e749..66dbc57 100644
--- a/core/fxcrt/include/fx_safe_types.h
+++ b/core/fxcrt/fx_safe_types.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
-#define CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
+#ifndef CORE_FXCRT_FX_SAFE_TYPES_H_
+#define CORE_FXCRT_FX_SAFE_TYPES_H_
#include <stdlib.h> // For size_t.
-#include "core/fxcrt/include/fx_stream.h" // for FX_FILESIZE.
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_stream.h" // for FX_FILESIZE.
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/numerics/safe_math.h"
typedef pdfium::base::CheckedNumeric<uint32_t> FX_SAFE_UINT32;
@@ -17,4 +17,4 @@
typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
typedef pdfium::base::CheckedNumeric<FX_STRSIZE> FX_SAFE_STRSIZE;
-#endif // CORE_FXCRT_INCLUDE_FX_SAFE_TYPES_H_
+#endif // CORE_FXCRT_FX_SAFE_TYPES_H_
diff --git a/core/fxcrt/include/fx_stream.h b/core/fxcrt/fx_stream.h
similarity index 95%
rename from core/fxcrt/include/fx_stream.h
rename to core/fxcrt/fx_stream.h
index a91b59f..5a5a650 100644
--- a/core/fxcrt/include/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_STREAM_H_
-#define CORE_FXCRT_INCLUDE_FX_STREAM_H_
+#ifndef CORE_FXCRT_FX_STREAM_H_
+#define CORE_FXCRT_FX_STREAM_H_
-#include "core/fxcrt/include/fx_string.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/fx_system.h"
void* FX_OpenFolder(const FX_CHAR* path);
void* FX_OpenFolder(const FX_WCHAR* path);
@@ -159,4 +159,4 @@
virtual FX_FILESIZE GetBlockOffset() = 0;
};
-#endif // CORE_FXCRT_INCLUDE_FX_STREAM_H_
+#endif // CORE_FXCRT_FX_STREAM_H_
diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/fx_string.h
similarity index 98%
rename from core/fxcrt/include/fx_string.h
rename to core/fxcrt/fx_string.h
index 6e9af22..0b6d806 100644
--- a/core/fxcrt/include/fx_string.h
+++ b/core/fxcrt/fx_string.h
@@ -4,19 +4,19 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_STRING_H_
-#define CORE_FXCRT_INCLUDE_FX_STRING_H_
+#ifndef CORE_FXCRT_FX_STRING_H_
+#define CORE_FXCRT_FX_STRING_H_
#include <stdint.h> // For intptr_t.
#include <algorithm>
#include <functional>
+#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/cfx_string_c_template.h"
#include "core/fxcrt/cfx_string_data_template.h"
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
class CFX_ByteString;
class CFX_WideString;
@@ -311,7 +311,6 @@
int Compare(const CFX_WideString& str) const;
int CompareNoCase(const FX_WCHAR* str) const;
-
CFX_WideString Mid(FX_STRSIZE first) const;
CFX_WideString Mid(FX_STRSIZE first, FX_STRSIZE count) const;
CFX_WideString Left(FX_STRSIZE count) const;
@@ -462,4 +461,4 @@
extern template struct std::hash<CFX_ByteString>;
extern template struct std::hash<CFX_WideString>;
-#endif // CORE_FXCRT_INCLUDE_FX_STRING_H_
+#endif // CORE_FXCRT_FX_STRING_H_
diff --git a/core/fxcrt/include/fx_system.h b/core/fxcrt/fx_system.h
similarity index 97%
rename from core/fxcrt/include/fx_system.h
rename to core/fxcrt/fx_system.h
index 0542f33..8364db3 100644
--- a/core/fxcrt/include/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
-#define CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
+#ifndef CORE_FXCRT_FX_SYSTEM_H_
+#define CORE_FXCRT_FX_SYSTEM_H_
#include <assert.h>
#include <math.h>
@@ -124,8 +124,8 @@
...);
void FXSYS_vsnprintf(char* str, size_t size, const char* fmt, va_list ap);
#else
-#define FXSYS_snprintf (void) snprintf
-#define FXSYS_vsnprintf (void) vsnprintf
+#define FXSYS_snprintf (void)snprintf
+#define FXSYS_vsnprintf (void)vsnprintf
#endif
#define FXSYS_sprintf DO_NOT_USE_SPRINTF_DIE_DIE_DIE
@@ -339,4 +339,4 @@
#define NEVER_INLINE __attribute__((__noinline__))
#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-#endif // CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
+#endif // CORE_FXCRT_FX_SYSTEM_H_
diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index b0a3249..4ab37c7 100644
--- a/core/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp
@@ -5,7 +5,7 @@
#include <limits>
#include <string>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxcrt/include/fx_ucd.h b/core/fxcrt/fx_ucd.h
similarity index 96%
rename from core/fxcrt/include/fx_ucd.h
rename to core/fxcrt/fx_ucd.h
index eeecd39..23bacca 100644
--- a/core/fxcrt/include/fx_ucd.h
+++ b/core/fxcrt/fx_ucd.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_UCD_H_
-#define CORE_FXCRT_INCLUDE_FX_UCD_H_
+#ifndef CORE_FXCRT_FX_UCD_H_
+#define CORE_FXCRT_FX_UCD_H_
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#define FX_BIDICLASSBITS 6
#define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS)
@@ -199,4 +199,4 @@
typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
#endif // PDF_ENABLE_XFA
-#endif // CORE_FXCRT_INCLUDE_FX_UCD_H_
+#endif // CORE_FXCRT_FX_UCD_H_
diff --git a/core/fxcrt/fx_ucddata.cpp b/core/fxcrt/fx_ucddata.cpp
index 1567d45..b8661b8 100644
--- a/core/fxcrt/fx_ucddata.cpp
+++ b/core/fxcrt/fx_ucddata.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_ucd.h"
const uint32_t kTextLayoutCodeProperties[] = {
0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93, 0xfffe9a93,
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index d042283..cfc24b5 100644
--- a/core/fxcrt/fx_unicode.cpp
+++ b/core/fxcrt/fx_unicode.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_ucd.h"
+#include "core/fxcrt/fx_ucd.h"
uint32_t FX_GetUnicodeProperties(FX_WCHAR wch) {
size_t idx = static_cast<size_t>(wch);
diff --git a/core/fxcrt/include/fx_xml.h b/core/fxcrt/fx_xml.h
similarity index 96%
rename from core/fxcrt/include/fx_xml.h
rename to core/fxcrt/fx_xml.h
index 4db4998..78f1625 100644
--- a/core/fxcrt/include/fx_xml.h
+++ b/core/fxcrt/fx_xml.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCRT_INCLUDE_FX_XML_H_
-#define CORE_FXCRT_INCLUDE_FX_XML_H_
+#ifndef CORE_FXCRT_FX_XML_H_
+#define CORE_FXCRT_FX_XML_H_
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
class CXML_AttrItem {
public:
@@ -170,4 +170,4 @@
friend class CXML_Composer;
};
-#endif // CORE_FXCRT_INCLUDE_FX_XML_H_
+#endif // CORE_FXCRT_FX_XML_H_
diff --git a/core/fxcrt/fx_xml_composer.cpp b/core/fxcrt/fx_xml_composer.cpp
index 1bad069..91118a0 100644
--- a/core/fxcrt/fx_xml_composer.cpp
+++ b/core/fxcrt/fx_xml_composer.cpp
@@ -6,7 +6,7 @@
#include "core/fxcrt/xml_int.h"
-#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxcrt/fx_xml.h"
void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName,
CFX_ByteStringC& bsSpace,
diff --git a/core/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp
index 9261967..a7026e9 100644
--- a/core/fxcrt/fx_xml_parser.cpp
+++ b/core/fxcrt/fx_xml_parser.cpp
@@ -8,8 +8,8 @@
#include <vector>
-#include "core/fxcrt/include/fx_ext.h"
-#include "core/fxcrt/include/fx_xml.h"
+#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_xml.h"
#include "third_party/base/stl_util.h"
CXML_DataBufAcc::CXML_DataBufAcc(const uint8_t* pBuffer, size_t size)
diff --git a/core/fxcrt/fxcrt_posix.cpp b/core/fxcrt/fxcrt_posix.cpp
index 053f89c..b5efdc2 100644
--- a/core/fxcrt/fxcrt_posix.cpp
+++ b/core/fxcrt/fxcrt_posix.cpp
@@ -6,7 +6,7 @@
#include "core/fxcrt/fxcrt_posix.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \
_FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
diff --git a/core/fxcrt/fxcrt_stream.cpp b/core/fxcrt/fxcrt_stream.cpp
index d96369b..a8c96bf 100644
--- a/core/fxcrt/fxcrt_stream.cpp
+++ b/core/fxcrt/fxcrt_stream.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_stream.h"
FX_BOOL IFX_FileWrite::WriteBlock(const void* pData, size_t size) {
return WriteBlock(pData, GetSize(), size);
diff --git a/core/fxcrt/fxcrt_windows.cpp b/core/fxcrt/fxcrt_windows.cpp
index 271cc8f..ec16373 100644
--- a/core/fxcrt/fxcrt_windows.cpp
+++ b/core/fxcrt/fxcrt_windows.cpp
@@ -6,7 +6,7 @@
#include "core/fxcrt/fxcrt_windows.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
diff --git a/core/fxcrt/plex.h b/core/fxcrt/plex.h
index 5391566..8d00ef5 100644
--- a/core/fxcrt/plex.h
+++ b/core/fxcrt/plex.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXCRT_PLEX_H_
#define CORE_FXCRT_PLEX_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
struct CFX_Plex {
CFX_Plex* pNext;
diff --git a/core/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index 121441b..4799706 100644
--- a/core/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -9,7 +9,7 @@
#include <algorithm>
-#include "core/fxcrt/include/fx_stream.h"
+#include "core/fxcrt/fx_stream.h"
class CFX_UTF8Decoder;
class CXML_Element;
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 1c82620..7254810 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
#include "core/fxge/ge/fx_text_int.h"
diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index 2b639fe..b154ec4 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 4e03051..eb5bc44 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 b7400fc..67b58d7 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
@@ -13,7 +13,7 @@
#define FPF_SKIAMATCHWEIGHT_1 16
#define FPF_SKIAMATCHWEIGHT_2 8
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#include "core/fxge/android/fpf_skiafont.h"
#include "core/fxge/android/fpf_skiafontmgr.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h
index 6e8ebb6..a0c9f5b 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 f219f12..e541b24 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fpf_skiamodule.h b/core/fxge/android/fpf_skiamodule.h
index c3d5772..a0fb5e0 100644
--- a/core/fxge/android/fpf_skiamodule.h
+++ b/core/fxge/android/fpf_skiamodule.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
#define CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 58a5ab4..1c17432 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 f980836..e9fbb36 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 ebf98c4..79222b0 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 9443b5d..c7cb243 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/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 239a6e5..8a0c1e0 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/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.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 6a0260b..9089710 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/fx_ext.h"
#ifndef _SKIA_SUPPORT_
#include "core/fxge/agg/fx_agg_driver.h"
#endif
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/fx_text_int.h"
#include "core/fxge/include/cfx_gemodule.h"
diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index 31ccc8d..0a679e2 100644
--- a/core/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -9,7 +9,7 @@
#include <stdint.h>
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "core/fxge/include/fx_dib.h"
class IFX_ScanlineComposer;
diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp
index d35c66e..eed6b52 100644
--- a/core/fxge/dib/fx_dib_engine_unittest.cpp
+++ b/core/fxge/dib/fx_dib_engine_unittest.cpp
@@ -8,7 +8,7 @@
#include "core/fpdfapi/fpdf_parser/cpdf_number.h"
#include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
#include "core/fpdfapi/fpdf_render/render_int.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/include/fx_dib.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxge/ge/cfx_graphstatedata.cpp b/core/fxge/ge/cfx_graphstatedata.cpp
index 0a5b5e3..c03f086 100644
--- a/core/fxge/ge/cfx_graphstatedata.cpp
+++ b/core/fxge/ge/cfx_graphstatedata.cpp
@@ -6,8 +6,8 @@
#include "core/fxge/include/cfx_graphstatedata.h"
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
CFX_GraphStateData::CFX_GraphStateData()
: m_LineCap(LineCapButt),
diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/ge/cfx_pathdata.cpp
index 969bfc4..576e404 100644
--- a/core/fxge/ge/cfx_pathdata.cpp
+++ b/core/fxge/ge/cfx_pathdata.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/include/cfx_pathdata.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "third_party/base/numerics/safe_math.h"
CFX_PathData::CFX_PathData()
diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp
index eadd912..4b479ba 100644
--- a/core/fxge/ge/cfx_renderdevice.cpp
+++ b/core/fxge/ge/cfx_renderdevice.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/include/cfx_renderdevice.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/include/cfx_facecache.h"
#include "core/fxge/include/cfx_fxgedevice.h"
#include "core/fxge/include/cfx_graphstatedata.h"
diff --git a/core/fxge/ge/cttfontdesc.h b/core/fxge/ge/cttfontdesc.h
index 05cafde..329b9e6 100644
--- a/core/fxge/ge/cttfontdesc.h
+++ b/core/fxge/ge/cttfontdesc.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_GE_CTTFONTDESC_H_
#define CORE_FXGE_GE_CTTFONTDESC_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_font.h"
#define FX_FONT_FLAG_SERIF 0x01
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 4612877..747fd83 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -9,7 +9,7 @@
#include <vector>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/ge/fx_text_int.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/ifx_renderdevicedriver.cpp b/core/fxge/ifx_renderdevicedriver.cpp
index 5acfae4..0c1f922 100644
--- a/core/fxge/ifx_renderdevicedriver.cpp
+++ b/core/fxge/ifx_renderdevicedriver.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/include/ifx_renderdevicedriver.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h
index dd9a176..7fe0de4 100644
--- a/core/fxge/include/cfx_fontcache.h
+++ b/core/fxge/include/cfx_fontcache.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/fx_font.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/include/cfx_graphstate.h b/core/fxge/include/cfx_graphstate.h
index 9470303..1faec0d 100644
--- a/core/fxge/include/cfx_graphstate.h
+++ b/core/fxge/include/cfx_graphstate.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
#define CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_
-#include "core/fxcrt/include/cfx_count_ref.h"
+#include "core/fxcrt/cfx_count_ref.h"
#include "core/fxge/include/cfx_graphstatedata.h"
class CPDF_Array;
diff --git a/core/fxge/include/cfx_graphstatedata.h b/core/fxge/include/cfx_graphstatedata.h
index 2e79698..b5f7847 100644
--- a/core/fxge/include/cfx_graphstatedata.h
+++ b/core/fxge/include/cfx_graphstatedata.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
#define CORE_FXGE_INCLUDE_CFX_GRAPHSTATEDATA_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CFX_GraphStateData {
public:
diff --git a/core/fxge/include/cfx_pathdata.h b/core/fxge/include/cfx_pathdata.h
index 6bc627c..56682dd 100644
--- a/core/fxge/include/cfx_pathdata.h
+++ b/core/fxge/include/cfx_pathdata.h
@@ -7,8 +7,8 @@
#ifndef CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
#define CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/cfx_renderdevice.h"
struct FX_PATHPOINT {
diff --git a/core/fxge/include/cfx_substfont.h b/core/fxge/include/cfx_substfont.h
index a712a7a..8cce389 100644
--- a/core/fxge/include/cfx_substfont.h
+++ b/core/fxge/include/cfx_substfont.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
#define CORE_FXGE_INCLUDE_CFX_SUBSTFONT_H_
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#define FXFONT_SUBST_MM 0x01
#define FXFONT_SUBST_GLYPHPATH 0x04
diff --git a/core/fxge/include/cfx_unicodeencodingex.h b/core/fxge/include/cfx_unicodeencodingex.h
index 2ce062f..680b8fb 100644
--- a/core/fxge/include/cfx_unicodeencodingex.h
+++ b/core/fxge/include/cfx_unicodeencodingex.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/cfx_unicodeencoding.h"
#include "core/fxge/include/fx_dib.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/include/fx_dib.h b/core/fxge/include/fx_dib.h
index 011e6f7..2eaa38a 100644
--- a/core/fxge/include/fx_dib.h
+++ b/core/fxge/include/fx_dib.h
@@ -10,9 +10,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/cfx_count_ref.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/cfx_count_ref.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
enum FXDIB_Format {
FXDIB_Invalid = 0,
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index 5a83130..2151bf6 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/include/cfx_substfont.h"
#include "core/fxge/include/fx_dib.h"
#include "core/fxge/include/fx_freetype.h"
diff --git a/core/fxge/include/ifx_renderdevicedriver.h b/core/fxge/include/ifx_renderdevicedriver.h
index e9dbed9..995e82d 100644
--- a/core/fxge/include/ifx_renderdevicedriver.h
+++ b/core/fxge/include/ifx_renderdevicedriver.h
@@ -7,7 +7,7 @@
#ifndef CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
#define CORE_FXGE_INCLUDE_IFX_RENDERDEVICEDRIVER_H_
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
class CFX_DIBitmap;
class CFX_DIBSource;
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index bcbe2d1..be4d57b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -7,7 +7,7 @@
#include <vector>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
#include "core/fpdfapi/fpdf_page/pageint.h"
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index e3d00d9..d2aa5ff 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include <algorithm>
#include <memory>
@@ -14,7 +14,7 @@
#include <crtdbg.h>
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxcrt/fx_memory.h"
#ifndef _SKIA_SUPPORT_
#include "core/fxge/agg/fx_agg_driver.h"
diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp
index 84f8abf..7ab64ca 100644
--- a/core/fxge/win32/fx_win32_dib.cpp
+++ b/core/fxge/win32/fx_win32_dib.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <windows.h>
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp
index fd1dd5c..b4bb9b6 100644
--- a/core/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/fxge/win32/fx_win32_dwrite.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "core/fxge/ge/cfx_cliprgn.h"
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index 99ccbd4..7094da5 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <windows.h>
diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index 2a52a60..5372c19 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
