summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fdrm/fx_crypt.h2
-rw-r--r--core/include/fpdfapi/fpdf_module.h3
-rw-r--r--core/include/fpdfapi/fpdf_objects.h3
-rw-r--r--core/include/fpdfapi/fpdf_parser.h2
-rw-r--r--core/include/fpdfapi/fpdfapi.h1
-rw-r--r--core/include/fpdfdoc/fpdf_ap.h1
-rw-r--r--core/include/fpdfdoc/fpdf_vt.h1
-rw-r--r--core/include/fpdftext/fpdf_text.h4
-rw-r--r--core/include/fxcodec/fx_codec.h2
-rw-r--r--core/include/fxcodec/fx_codec_provider.h2
-rw-r--r--core/include/fxcrt/fx_ext.h6
-rw-r--r--core/include/fxcrt/fx_stream.h1
-rw-r--r--core/include/fxge/fpf.h2
-rw-r--r--core/include/fxge/fx_dib.h3
-rw-r--r--core/include/fxge/fx_font.h2
15 files changed, 17 insertions, 18 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index af72fcf470..f820999b28 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FDRM_FX_CRYPT_H_
#define CORE_INCLUDE_FDRM_FX_CRYPT_H_
-#include "../fxcrt/fx_basic.h"
+#include "../fxcrt/fx_system.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 31bdb45231..65e4117a54 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -7,7 +7,8 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_coordinates.h"
+#include "../fxcrt/fx_system.h"
class CCodec_ModuleMgr;
class CFX_AffineMatrix;
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index f2ace0bf50..570dc410c2 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -7,7 +7,8 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_coordinates.h"
+#include "../fxcrt/fx_system.h"
class CPDF_Array;
class CPDF_Boolean;
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index a5020ebd2c..a856433a08 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_system.h"
#include "fpdf_objects.h"
class CPDF_Document;
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index 00a0bb9952..c2938a5dc4 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -7,7 +7,6 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
#define CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
-#include "../fxcrt/fx_basic.h"
#include "../fxge/fx_ge.h"
#include "fpdf_module.h"
#include "fpdf_pageobj.h"
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 3385e58b81..7cfaed4685 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -7,7 +7,6 @@
#ifndef CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
#define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
-#include "../fxcrt/fx_basic.h"
#include "../fpdfapi/fpdf_parser.h"
#include "fpdf_vt.h"
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 3f14a46c98..4baba41348 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -8,7 +8,6 @@
#define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
#include "../fpdfapi/fpdf_parser.h"
-#include "../fxcrt/fx_basic.h"
#include "../fxge/fx_dib.h"
class IPDF_VariableText;
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index e0b5eb8929..ad5888eb78 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -7,11 +7,11 @@
#ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
#define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
-#include "../fpdfapi/fpdf_page.h"
-#include "../fpdfapi/fpdf_pageobj.h"
#include "../fpdfapi/fpdf_parser.h"
+class CPDF_Page;
class CPDF_PageObjects;
+class CPDF_TextObject;
class IPDF_LinkExtract;
class IPDF_ReflowedPage;
class IPDF_TextPage;
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index 43ac6966cf..e8faf3f78f 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_
#define CORE_INCLUDE_FXCODEC_FX_CODEC_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_basic.h"
#include "fx_codec_def.h"
#include "fx_codec_provider.h"
diff --git a/core/include/fxcodec/fx_codec_provider.h b/core/include/fxcodec/fx_codec_provider.h
index 8eb3712e08..0b238b780e 100644
--- a/core/include/fxcodec/fx_codec_provider.h
+++ b/core/include/fxcodec/fx_codec_provider.h
@@ -7,6 +7,8 @@
#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
#define CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
+#include "../fxcrt/fx_system.h"
+
class IFX_JpegProvider
{
public:
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 03a9d0d820..f24f4549a3 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -7,11 +7,7 @@
#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
#define CORE_INCLUDE_FXCRT_FX_EXT_H_
-#include "fx_arb.h"
-#include "fx_basic.h"
-#include "fx_coordinates.h"
-#include "fx_ucd.h"
-#include "fx_xml.h"
+#include "fx_system.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h
index 4099befcfc..fdd7b11fee 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/include/fxcrt/fx_stream.h
@@ -7,7 +7,6 @@
#ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_
#define CORE_INCLUDE_FXCRT_FX_STREAM_H_
-#include "fx_memory.h"
#include "fx_string.h"
void* FX_OpenFolder(const FX_CHAR* path);
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
index 9ff294ebcb..fb9bf4d111 100644
--- a/core/include/fxge/fpf.h
+++ b/core/include/fxge/fpf.h
@@ -7,6 +7,8 @@
#ifndef CORE_INCLUDE_FXGE_FPF_H_
#define CORE_INCLUDE_FXGE_FPF_H_
+#include "../fxcrt/fx_coordinates.h"
+
class IFPF_DeviceModule;
class IFPF_FontMgr;
class IFPF_Font;
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index 290c30a678..5b8ee44369 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -7,7 +7,8 @@
#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
#define CORE_INCLUDE_FXGE_FX_DIB_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_basic.h"
+#include "../fxcrt/fx_coordinates.h"
enum FXDIB_Format {
FXDIB_Invalid = 0,
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 365d57c707..49b8f9a974 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -7,7 +7,7 @@
#ifndef CORE_INCLUDE_FXGE_FX_FONT_H_
#define CORE_INCLUDE_FXGE_FX_FONT_H_
-#include "../fxcrt/fx_ext.h"
+#include "../fxcrt/fx_system.h"
#include "fx_dib.h"
typedef struct FT_FaceRec_* FXFT_Face;