7 files changed, 14 insertions, 11 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index 0564ed0c4c..451b561ba0 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -8,6 +8,7 @@
 #define FPDFXFA_DOC_H_
 
 #include "../../../xfa/include/fxfa/fxfa.h"
+#include "public/fpdfview.h"
 
 class CPDFXFA_App;
 class CPDFXFA_Document;
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
index a6f327a201..a64d030de5 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
@@ -4,8 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFXFA_UTIL_H_
-#define _FPDFXFA_UTIL_H_
+#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_
+#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_
+
+#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 
 #define JS_STR_VIEWERTYPE_STANDARD L"Exchange"
 #define JS_STR_LANGUANGE L"ENU"
@@ -30,9 +32,9 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
 
 class CFWL_TimerInfo {
  public:
-  CFWL_TimerInfo() : pTimer(NULL) {}
+  CFWL_TimerInfo() : pTimer(nullptr) {}
   uint32_t uIDEvent;
   IFWL_Timer* pTimer;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index f62234af09..c7ca71c5a7 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -7,22 +7,22 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
+#include "../../core/include/fpdfapi/fpdfapi.h"
 #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/fpdf_render.h"
 #include "../../core/include/fpdfapi/fpdf_serial.h"
-#include "../../core/include/fpdfapi/fpdfapi.h"
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fpdfdoc/fpdf_vt.h"
 #include "../../core/include/fxge/fx_ge.h"
 #include "../../core/include/fxge/fx_ge_win32.h"
-#include "../../public/fpdfview.h"
 #include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 #include "../../xfa/include/fxbarcode/BC_BarCode.h"
 #include "../../xfa/include/fxfa/fxfa.h"
 #include "../../xfa/include/fxgraphics/fx_graphics.h"
 #include "../../xfa/include/fxjse/fxjse.h"
+#include "public/fpdfview.h"
 
 #ifdef _WIN32
 #include <tchar.h>
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 8a67145291..76d7adf129 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -10,8 +10,6 @@
 #include <map>
 
 #include "../../core/include/fpdftext/fpdf_text.h"
-#include "../../public/fpdf_formfill.h"
-#include "../../public/fpdf_fwlevent.h"  // cross platform keycode and events define.
 #include "fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfxfa/fpdfxfa_page.h"
 #include "fsdk_actionhandler.h"
@@ -22,6 +20,8 @@
 #include "fsdk_define.h"
 #include "fx_systemhandler.h"
 #include "javascript/IJavaScript.h"
+#include "public/fpdf_formfill.h"
+#include "public/fpdf_fwlevent.h"  // cross platform keycode and events define.
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CFFL_IFormFiller;
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index 16f8ff88cf..8c007b567f 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 #define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 
-#include "../../public/fpdf_progressive.h"
 #include "fsdk_define.h"
+#include "public/fpdf_progressive.h"
 
 // Everything about rendering is put here: for OOM recovery
 class CRenderContext {
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index 2abb38cd68..1b5e71f168 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -10,8 +10,8 @@
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../public/fpdf_fwlevent.h"
 #include "../fx_systemhandler.h"
 #include "../fxedit/fx_edit.h"
+#include "public/fpdf_fwlevent.h"
 
 #endif  // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index f91d7e823f..c7d4490280 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
 
-#include "../../../public/fpdf_sysfontinfo.h"
 #include "../fxedit/fx_edit.h"
+#include "public/fpdf_sysfontinfo.h"
 
 class CPDF_Document;
 class IFX_SystemHandler;