summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-29 15:03:18 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-29 15:03:18 -0500
commitb36430115717af4ecfa573476714cecc73f3d1c3 (patch)
tree4d8f0e8c1d6c526036b635e7d220faaac0bba01c /xfa/src/fxfa
parentbf85bd7234e5fc0120315007dec085d741dcfb7a (diff)
downloadpdfium-b36430115717af4ecfa573476714cecc73f3d1c3.tar.xz
Remove foxitlib.h and foxitxfa.h and IWYU.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1746053003 .
Diffstat (limited to 'xfa/src/fxfa')
-rw-r--r--xfa/src/fxfa/src/app/xfa_checksum.cpp2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffapp.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffbarcode.cpp2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdoc.cpp3
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdochandler.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdochandler.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdocview.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdraw.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fffield.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffimage.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffimage.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffimageedit.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffnotify.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffnotify.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpageview.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpath.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpath.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffsignature.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffsignature.h4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffsubform.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftext.cpp2
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftextedit.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidget.cpp7
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgethandler.h1
-rw-r--r--xfa/src/fxfa/src/app/xfa_fontmgr.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_fontmgr.h5
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwladapter.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwladapter.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwltheme.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_rendercontext.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_rendercontext.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_textlayout.cpp3
-rw-r--r--xfa/src/fxfa/src/common/xfa_fm2jsapi.h3
-rw-r--r--xfa/src/fxfa/src/common/xfa_script.h6
-rw-r--r--xfa/src/fxfa/src/common/xfa_utils.h1
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fm2js.h1
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp1
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_lexer.cpp1
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_basic_data.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_basic_imp.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_imp.cpp3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_layout_imp.h3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_document_serialize.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_appadapter.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_locale.cpp13
-rw-r--r--xfa/src/fxfa/src/parser/xfa_locale.h3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_localemgr.cpp6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_localevalue.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_object_imp.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_parser_imp.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_datawindow.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h3
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_imp.cpp6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_imp.h8
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h4
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_nodehelper.h5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp6
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp5
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_utils_imp.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp1
86 files changed, 190 insertions, 97 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp
index 22fe715450..3d6f1a7175 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.cpp
+++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp
@@ -6,8 +6,8 @@
#include "xfa/src/fxfa/src/app/xfa_checksum.h"
+#include "core/include/fdrm/fx_crypt.h"
#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/foxitlib.h"
CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext)
: m_pContext(pContext) {
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
index ed16cb8629..49478e0d23 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
@@ -9,7 +9,6 @@
#include <algorithm>
#include "xfa/include/fwl/core/fwl_widgetmgr.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
index c12852e4e4..3a228de203 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
@@ -6,9 +6,9 @@
#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/include/fwl/lightwidget/barcode.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
index d0e36aa88d..33e9abf496 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
@@ -8,7 +8,6 @@
#include "xfa/include/fwl/core/fwl_widgetmgr.h"
#include "xfa/include/fwl/lightwidget/checkbox.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
index 2d68887d0e..d61b6df79c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
@@ -10,7 +10,6 @@
#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/include/fwl/lightwidget/combobox.h"
#include "xfa/include/fwl/lightwidget/listbox.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index f2dc104bee..1f04d7e560 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -6,9 +6,10 @@
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+#include "core/include/fpdfdoc/fpdf_doc.h"
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/include/fwl/core/fwl_note.h"
#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
index 20eb44677b..2f636b63ef 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
+
+#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
CXFA_FFDocHandler::CXFA_FFDocHandler() {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
index 36fb149cca..216df72b6f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
+#include "xfa/include/fxfa/fxfa.h"
+
class CXFA_FFDocHandler : public IXFA_DocHandler {
public:
CXFA_FFDocHandler();
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
index 05b78ecca4..1bb504ed3c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
@@ -4,13 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
index 8a5379258d..4f575cb991 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
index 171cf573bb..ba2bb8028c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp
index 7616dcbdb3..106256d91f 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp
@@ -10,7 +10,6 @@
#include "xfa/include/fwl/core/fwl_widgetmgr.h"
#include "xfa/include/fwl/lightwidget/edit.h"
#include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp
index 9fd17a7622..263167600c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.h b/xfa/src/fxfa/src/app/xfa_ffimage.h
index 8bece23818..64e0f98a26 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.h
+++ b/xfa/src/fxfa/src/app/xfa_ffimage.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
+#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+
class CXFA_FFImage : public CXFA_FFDraw {
public:
CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
index 8f3a838f4e..5348849975 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
@@ -8,7 +8,6 @@
#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
index b9078b309e..19ce6320b6 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
@@ -16,7 +17,6 @@
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h
index 311d99b95d..3a6093be7c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.h
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+
class CXFA_FFNotify : public IXFA_Notify {
public:
CXFA_FFNotify(CXFA_FFDoc* pDoc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
index 45ef2b25c3..2a88e50343 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
@@ -7,7 +7,6 @@
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fdp/include/fde_rdr.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp
index 7c3239fb50..1fdcb83051 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp
@@ -4,12 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
+
+#include "xfa/include/fxgraphics/fx_graphics.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.h b/xfa/src/fxfa/src/app/xfa_ffpath.h
index b970c989c4..05a67bd16f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpath.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
+#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+
class CXFA_FFLine : public CXFA_FFDraw {
public:
CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
index e6efa13b86..9c3c5f5b17 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
@@ -8,7 +8,6 @@
#include "xfa/include/fwl/core/fwl_widgetmgr.h"
#include "xfa/include/fwl/lightwidget/pushbutton.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
index 907e3024c2..a53d7c26a3 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView,
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/src/app/xfa_ffsignature.h
index 79cc0ad407..d873614ed8 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.h
+++ b/xfa/src/fxfa/src/app/xfa_ffsignature.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
+#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+
class CXFA_FFSignature final : public CXFA_FFField {
public:
CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -36,8 +38,6 @@ class CXFA_FFSignature final : public CXFA_FFField {
virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags);
virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy);
-
- protected:
};
#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
index 6da604d6cf..0e932b22a2 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView,
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp
index dffcfdf361..d1774e67a2 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp
@@ -7,7 +7,7 @@
#include "xfa/src/fxfa/src/app/xfa_fftext.h"
#include "xfa/include/fwl/core/fwl_widgetdef.h"
-#include "xfa/src/foxitlib.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index 361f70573c..c1982ce24f 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -10,7 +10,6 @@
#include "xfa/include/fwl/basewidget/fwl_edit.h"
#include "xfa/include/fwl/lightwidget/datetimepicker.h"
#include "xfa/include/fwl/lightwidget/edit.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
index 8cc281ccff..30569ef4a3 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
@@ -4,14 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+
#include <algorithm>
-#include "xfa/src/foxitlib.h"
+#include "core/include/fpdfapi/fpdf_page.h"
+#include "core/include/fxcodec/fx_codec.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView,
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index 7d646ca297..dbdc02a871 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -9,7 +9,6 @@
#include <algorithm>
#include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
index bb8db6a9f4..d5f286668c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
#include "xfa/src/fxfa/src/common/xfa_parser.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
index 2f3453d84f..645a9e7bb1 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
@@ -10,6 +10,7 @@
#include <vector>
#include "xfa/include/fxfa/fxfa.h"
+#include "xfa/src/fxfa/src/common/xfa_document.h"
class CXFA_FFDocView;
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index c5d175abec..f1cc37f244 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -4,12 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
+
#include <algorithm>
-#include "xfa/src/foxitlib.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
static const XFA_FONTINFO g_XFAFontsMap[] = {
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h
index e3fb99e824..86c08d0fa5 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h
@@ -9,6 +9,11 @@
#include <map>
+#include "core/include/fxcrt/fx_ext.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/include/fxfa/fxfa.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
struct XFA_FONTINFO {
FX_DWORD dwFontNameHash;
const FX_WCHAR* pPsName;
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
index c97b4fe871..174e31d8ca 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
+
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {}
FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget,
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/src/app/xfa_fwladapter.h
index 91210717c1..88a7fa930b 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.h
+++ b/xfa/src/fxfa/src/app/xfa_fwladapter.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
+
class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr {
public:
virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
index 851f9d6102..1b768e8489 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
@@ -19,7 +19,6 @@
#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/src/fdp/include/fde_tto.h"
#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
index 27fb91a1e4..def0c78d22 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
@@ -4,10 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_rendercontext.h"
+#include "xfa/include/fxgraphics/fx_graphics.h"
+#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+
#define XFA_RENDERCONTEXT_MaxCount 30
IXFA_RenderContext* XFA_RenderContext_Create() {
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h
index 9f91d23e56..67ec9cbb0b 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.h
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
+#include "xfa/include/fxfa/fxfa.h"
+
class CXFA_RenderContext : public IXFA_RenderContext {
public:
CXFA_RenderContext();
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp
index 8ce97e28ae..7d03cddeb9 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp
@@ -8,9 +8,10 @@
#include <algorithm>
+#include "core/include/fxcrt/fx_ext.h"
+#include "xfa/src/fdp/include/fde_pen.h"
#include "xfa/src/fgas/include/fx_alg.h"
#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
index 67f3b7e193..80a723aae2 100644
--- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
+++ b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/include/fxjse/fxjse.h"
+
#define FOXIT_XFA_FM2JS_FORMCALC_RUNTIME "foxit_xfa_formcalc_runtime"
#ifdef __cplusplus
diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h
index 4b8495125d..ebd3a0f00e 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_
+#include "xfa/include/fxfa/fxfa.h"
+#include "xfa/include/fxfa/fxfa_objectacc.h"
+
#define XFA_RESOLVENODE_Children 0x0001
#define XFA_RESOLVENODE_Attributes 0x0004
#define XFA_RESOLVENODE_Properties 0x0008
@@ -17,11 +20,13 @@
#define XFA_RESOLVENODE_CreateNode 0x0400
#define XFA_RESOLVENODE_Bind 0x0800
#define XFA_RESOLVENODE_BindNew 0x1000
+
enum XFA_SCRIPTLANGTYPE {
XFA_SCRIPTLANGTYPE_Formcalc = XFA_SCRIPTTYPE_Formcalc,
XFA_SCRIPTLANGTYPE_Javascript = XFA_SCRIPTTYPE_Javascript,
XFA_SCRIPTLANGTYPE_Unkown = XFA_SCRIPTTYPE_Unkown,
};
+
enum XFA_RESOVENODE_RSTYPE {
XFA_RESOVENODE_RSTYPE_Nodes,
XFA_RESOVENODE_RSTYPE_Attribute,
@@ -30,6 +35,7 @@ enum XFA_RESOVENODE_RSTYPE {
XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll,
XFA_RESOVENODE_RSTYPE_ExistNodes,
};
+
class CXFA_HVALUEArray : public CFX_ArrayTemplate<FXJSE_HVALUE> {
public:
CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime){};
diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h
index 77eebc66ed..010a1aadde 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/src/common/xfa_utils.h
@@ -8,6 +8,7 @@
#define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
#include "xfa/include/fxfa/fxfa_basic.h"
+#include "xfa/src/fdp/include/fde_xml.h"
class CXFA_LocaleValue;
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
index e0356d119a..10ff415141 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h
@@ -7,7 +7,6 @@
#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_
#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
index 69fbbfb2de..10f9e8aab4 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
@@ -6,6 +6,7 @@
#include <time.h>
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h"
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp
index b4af01f0c0..caaeb49474 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp
@@ -4,6 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h"
namespace {
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
index 68faa7ae0c..e1da83747d 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
@@ -4,6 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h"
namespace {
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
index d73557db2c..891eaf6a96 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
@@ -6,7 +6,6 @@
#include "xfa/src/fxfa/src/parser/xfa_basic_data.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
index f724ed654c..8ec881ed6c 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
@@ -4,10 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fgas/include/fx_alg.h"
#include "xfa/src/fgas/include/fx_cpg.h"
#include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -18,7 +20,6 @@
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_basic_data.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) {
int32_t iLength = wsName.GetLength();
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
index 2a6146ba21..27cc8f0c9c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
@@ -4,7 +4,6 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +13,9 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
+
#define XFA_HASHCODE_Group 0xf7f75fcd
+
class CXFA_TraverseStrategy_DDGroup {
public:
static inline CXFA_Node* GetFirstChild(CXFA_Node* pDDGroupNode) {
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
index c2a53ac70e..da6b57f3d1 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
@@ -4,7 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -16,8 +18,8 @@
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+
static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode,
int32_t& iMin,
int32_t& iMax,
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
index 72c40dcf63..48a08f856c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(
CXFA_Document* pDocument,
CXFA_Node* pFormParent,
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
index 6cf8f06301..28cf381e7f 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -22,6 +22,7 @@
#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
+
CXFA_Document::CXFA_Document(IXFA_DocParser* pParser)
: m_pParser(pParser),
m_pScriptContext(nullptr),
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
index f0835df253..6cb47085fa 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -16,10 +17,10 @@
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+
CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() {
if (!m_pLayoutProcessor) {
m_pLayoutProcessor = new CXFA_LayoutProcessor(this);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
index 28854937c4..7411a9b13c 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
@@ -7,9 +7,12 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+
class CXFA_ItemLayoutProcessor;
class CXFA_LayoutPageMgr;
class CXFA_ContainerLayoutItem;
+
class CXFA_LayoutProcessor : public IXFA_DocLayout {
public:
CXFA_LayoutProcessor(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
index fc05d7de6e..9e54e453fa 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
@@ -7,7 +7,6 @@
#include "xfa/src/fxfa/src/parser/xfa_document_serialize.h"
#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
index 7653410c14..d5eebd0e0a 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -15,9 +16,9 @@
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+
FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) {
FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
CFX_WideStringC wsRelevant;
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
index 6ae4706343..4221f7f355 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
+#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+
class CXFA_TraverseStrategy_PageAreaContainerLayoutItem {
public:
static inline CXFA_ContainerLayoutItem* GetFirstChild(
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
index 05fd16fb23..381dc92ff8 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
@@ -10,7 +10,6 @@
#include <memory>
#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
index 6634962fb0..84de094d4e 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -18,7 +19,7 @@
#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+
CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
: m_pLayoutProcessor(pLayoutProcessor),
m_pTemplatePageSetRoot(nullptr),
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
index 35f1827790..5dd83b9556 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
+
class CXFA_ContainerRecord {
public:
CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = NULL,
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp
index f75853a418..e3e63d7951 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/parser/xfa_locale.h"
+
#include "core/include/fxcrt/fx_xml.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -15,12 +16,12 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_locale.h"
-static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%";
-static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99";
-static const FX_WCHAR* g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
-static const FX_WCHAR* g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz";
+static const FX_WCHAR g_FX_Percent[] = L"z,zzz,zzz,zzz,zzz,zzz%";
+static const FX_WCHAR g_FX_Currency[] = L"$z,zzz,zzz,zzz,zzz,zz9.99";
+static const FX_WCHAR g_FX_Decimal[] = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
+static const FX_WCHAR g_FX_Integer[] = L"z,zzz,zzz,zzz,zzz,zzz";
+
CXFA_XMLLocale::CXFA_XMLLocale(CXML_Element* pLocaleData) {
m_pLocaleData = pLocaleData;
}
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h
index 60336f6e88..a8391a0c5e 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.h
+++ b/xfa/src/fxfa/src/parser/xfa_locale.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
+#include "xfa/src/fgas/include/fx_locale.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
class CXFA_XMLLocale : public IFX_Locale {
public:
CXFA_XMLLocale(CXML_Element* pLocaleData);
diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
index 4db32db56f..8d0c8d27f4 100644
--- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
@@ -4,13 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
+
+#include "core/include/fxcodec/fx_codec.h"
#include "core/include/fxcrt/fx_xml.h"
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxge/fx_ge.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
#include "xfa/src/fxfa/src/common/xfa_object.h"
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
index 838634d1e9..ba00c2e639 100644
--- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
index 65992c4201..1c5bd758a8 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fgas/include/fx_cpg.h"
#include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
index 9c3b5383dc..c8e00e82da 100644
--- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxcrt/fx_ext.h"
+#include "xfa/include/fxbarcode/BC_BarCode.h"
#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
index 35dca5d076..c2f15a18a6 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
@@ -7,7 +7,6 @@
#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h"
#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
index 26b3616a3e..fa7d2560c6 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h"
+
CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) {
m_uScriptHash = XFA_HASHCODE_DataWindow;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
index 8be21a762f..8274d05d25 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
class CScript_DataWindow : public CXFA_OrdinaryObject {
public:
CScript_DataWindow(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
index 99fe7c255e..26ae836fc8 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h"
+
CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) {
m_uScriptHash = XFA_HASHCODE_Event;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
index 31646cc8d6..b6bfeab574 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
#define XFA_EVENT_CHANGE 0
#define XFA_EVENT_COMMITKEY 1
#define XFA_EVENT_FULLTEXT 2
@@ -24,9 +26,10 @@
#define XFA_EVENT_SOAPFAULTSTRING 14
#define XFA_EVENT_TARGET 15
#define XFA_EVENT_CANCELACTION 16
+
class CScript_EventPseudoModel : public CXFA_OrdinaryObject {
public:
- CScript_EventPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_EventPseudoModel(CXFA_Document* pDocument);
virtual ~CScript_EventPseudoModel();
void Script_EventPseudoModel_CancelAction(FXJSE_HVALUE hValue,
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
index b495a774bc..69d6c41ab3 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h"
+
CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) {
m_uScriptHash = XFA_HASHCODE_Host;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
index f17a85dc06..0b9e80e149 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
public:
CScript_HostPseudoModel(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
index dc48c7e4b2..2b99e24306 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
@@ -4,7 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,9 +16,9 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h"
+
CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
: m_pDocument(pDocument),
m_hJsContext(nullptr),
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h
index a0610fae9f..15dc09d726 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h
@@ -9,13 +9,19 @@
#include <map>
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
#define XFA_RESOLVENODE_TagName 0x0002
class CXFA_ResolveProcessor;
+
class CXFA_ScriptContext : public IXFA_ScriptContext {
public:
- CXFA_ScriptContext(CXFA_Document* pDocument);
+ explicit CXFA_ScriptContext(CXFA_Document* pDocument);
~CXFA_ScriptContext();
+
virtual void Release();
virtual void Initialize(FXJSE_HRUNTIME hRuntime);
virtual void SetEventParam(CXFA_EventParam param) { m_eventParam = param; }
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
index 5cf43af336..6f032d2c45 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -16,7 +17,7 @@
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
+
CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) {
m_uScriptHash = XFA_HASHCODE_Layout;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
index f0420e71fd..ff43bd7bd8 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
@@ -7,15 +7,19 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
enum XFA_LAYOUTMODEL_HWXY {
XFA_LAYOUTMODEL_H,
XFA_LAYOUTMODEL_W,
XFA_LAYOUTMODEL_X,
XFA_LAYOUTMODEL_Y
};
+
class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject {
public:
- CScript_LayoutPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_LayoutPseudoModel(CXFA_Document* pDocument);
~CScript_LayoutPseudoModel();
void Script_LayoutPseudoModel_Ready(FXJSE_HVALUE hValue,
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
index be69240508..dd51a62d44 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
+
CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) {
m_uScriptHash = XFA_HASHCODE_Log;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
index 60be763b47..65bfbb112f 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
@@ -7,9 +7,11 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
public:
- CScript_LogPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_LogPseudoModel(CXFA_Document* pDocument);
virtual ~CScript_LogPseudoModel();
void Script_LogPseudoModel_Message(CFXJSE_Arguments* pArguments);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
index 1759de01c0..9176bcc34e 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
@@ -4,7 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -15,7 +17,7 @@
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
+
CXFA_NodeHelper::CXFA_NodeHelper(void)
: m_eLastCreateType(XFA_ELEMENT_DataValue),
m_pCreateParent(NULL),
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
index 37a369170a..b3dc86abc0 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
@@ -7,11 +7,16 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
class CXFA_ScriptContext;
+
enum XFA_LOGIC_TYPE {
XFA_LOGIC_NoTransparent,
XFA_LOGIC_Transparent,
};
+
class CXFA_NodeHelper {
public:
CXFA_NodeHelper(void);
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
index fcbf08b5a7..2d4349b6f3 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
@@ -4,7 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h"
+
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -16,7 +18,7 @@
#include "xfa/src/fxfa/src/common/xfa_utils.h"
#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h"
+
CXFA_ResolveProcessor::CXFA_ResolveProcessor(void)
: m_pNodeHelper(NULL), m_iCurStart(0) {
m_pNodeHelper = new CXFA_NodeHelper;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
index 29ba96476b..e2dbaf99b2 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
@@ -7,8 +7,13 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+#include "xfa/include/fxfa/fxfa_objectacc.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
class CXFA_NodeHelper;
class CXFA_ScriptContext;
+
class CXFA_ResolveNodesData {
public:
CXFA_ResolveNodesData(CXFA_ScriptContext* pSC = NULL)
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
index 0b22dc3b61..74bcaf8a7f 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
@@ -4,7 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
+
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,7 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
+
CScript_SignaturePseudoModel::CScript_SignaturePseudoModel(
CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_SignaturePseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
index 56ef052110..6a956836b3 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
+++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
public:
CScript_SignaturePseudoModel(CXFA_Document* pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
index 4dbf3e0a60..0686401573 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
+#include "core/include/fxcrt/fx_ext.h"
#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
index 81fdc4e322..29f90ed44b 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "testing/gtest/include/gtest/gtest.h"
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
TEST(XfaUtilsImp, XFA_MapRotation) {