9 files changed, 16 insertions, 29 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index de9afafb56..fe025eca4b 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -8,17 +8,16 @@
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../../core/include/fxcrt/fx_memory.h"
-
-#define FFL_BASE_USERUNIT			(1.0f / 72.0f)
 
 class CFFL_Utils
 {
 public:
-	static CPDF_Rect				MaxRect(const CPDF_Rect & rect1,const CPDF_Rect & rect2);
-	static CPDF_Rect				InflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
-	static CPDF_Rect				DeflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
-	static FX_BOOL					TraceObject(CPDF_Object* pObj);
+    static CPDF_Rect MaxRect(const CPDF_Rect& rect1,const CPDF_Rect& rect2);
+    static CPDF_Rect InflateRect(const CPDF_Rect& crRect,
+                                 const FX_FLOAT& fSize);
+    static CPDF_Rect DeflateRect(const CPDF_Rect& crRect,
+                                 const FX_FLOAT& fSize);
+    static FX_BOOL TraceObject(CPDF_Object* pObj);
 };
 
 #endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index fdca1ff940..90351f5527 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -10,7 +10,6 @@
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
 #include "../fsdk_mgr.h"
 #include "../fxedit/fx_edit.h"
 #include "../pdfwindow/IPDFWindow.h"
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index cc871badb2..f8d691ebfa 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -7,6 +7,8 @@
 #ifndef FPDFXFA_DOC_H_
 #define FPDFXFA_DOC_H_
 
+#include "../../../xfa/include/fxfa/fxfa.h"
+
 class CPDFXFA_App;
 class CPDFXFA_Document;
 class CPDFXFA_Page;
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 5c0e88a44a..bbf75e5690 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -12,30 +12,19 @@
 #include <math.h>
 #endif
 
+#include "../../core/include/fpdfapi/fpdf_module.h"
+#include "../../core/include/fpdfapi/fpdf_pageobj.h"
 #include "../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../core/include/fpdfapi/fpdfapi.h"
 #include "../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../core/include/fpdfapi/fpdf_module.h"
 #include "../../core/include/fpdfapi/fpdf_render.h"
-#include "../../core/include/fpdfapi/fpdf_pageobj.h"
 #include "../../core/include/fpdfapi/fpdf_serial.h"
-
-#include "../../core/include/fpdftext/fpdf_text.h"
-
-#include "../../core/include/fxge/fx_ge_win32.h"
-#include "../../core/include/fxge/fx_ge.h"
-
-#include "../../core/include/fxcodec/fx_codec.h"
-
+#include "../../core/include/fpdfapi/fpdfapi.h"
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fpdfdoc/fpdf_vt.h"
-
-#include "../../core/include/fxcrt/fx_xml.h"
 #include "../../xfa/include/fxbarcode/BC_BarCode.h"
 #include "../../xfa/include/fxjse/fxjse.h"
 #include "../../xfa/include/fxgraphics/fx_graphics.h"
 #include "../../xfa/include/fxfa/fxfa.h"
-
 #include "../../xfa/include/fwl/core/fwl_error.h"
 #include "../../xfa/include/fwl/core/fwl_timer.h"
 #include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 4d7b80012d..c3fb88edfc 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -7,6 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_MGR_H_
 #define FPDFSDK_INCLUDE_FSDK_MGR_H_
 
+#include "../../core/include/fpdftext/fpdf_text.h"
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define.
 #include "fsdk_common.h"
@@ -18,6 +19,7 @@
 #include "fsdk_baseform.h"
 #include "fsdk_annothandler.h"
 #include "fsdk_actionhandler.h"
+#include "javascript/IJavaScript.h"
 
 class CPDFSDK_Document;
 class CPDFSDK_PageView;
@@ -28,8 +30,6 @@ class IFX_SystemHandler;
 class CPDFSDK_ActionHandler;
 class CJS_RuntimeFactory;
 
-#include "javascript/IJavaScript.h"
-
 class CPDFDoc_Environment final
 {
 public:
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index a8bdd65468..1d9396fb79 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -7,7 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 
-#include "../../../core/include/fxcrt/fx_basic.h"
+#include "../../../core/include/fxcrt/fx_string.h"
+#include "../../../core/include/fxcrt/fx_system.h"
 #include "../../../xfa/include/fxjse/fxjse.h"
 
 class CPDF_Bookmark;
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index d96c6cac42..28239efc6a 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -10,13 +10,11 @@
 #include <string>
 #include <vector>
 
-#include "../../../core/include/fdrm/fx_crypt.h"
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfapi/fpdf_pageobj.h"
 #include "../../../core/include/fpdfapi/fpdf_serial.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
 #include "../fsdk_mgr.h"
 #include "../fx_systemhandler.h"
 #include "../fxedit/fx_edit.h"
diff --git a/fpdfsdk/include/javascript/resource.h b/fpdfsdk/include/javascript/resource.h
index 88011f2bb0..433785984d 100644
--- a/fpdfsdk/include/javascript/resource.h
+++ b/fpdfsdk/include/javascript/resource.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_RESOURCE_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_RESOURCE_H_
 
-#include "../../../core/include/fxcrt/fx_basic.h"  // For CFX_WideString.
+#include "../../../core/include/fxcrt/fx_string.h"  // For CFX_WideString.
 #include "../fsdk_define.h"  // For FX_UINT.
 
 class CJS_Context;
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index 3cd1e02878..2abb38cd68 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -10,7 +10,6 @@
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
 #include "../../../public/fpdf_fwlevent.h"
 #include "../fx_systemhandler.h"
 #include "../fxedit/fx_edit.h"