35 files changed, 95 insertions, 76 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;
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp
index 0a90f49d8b..4d96a7ca26 100644
--- a/fpdfsdk/src/fpdf_dataavail.cpp
+++ b/fpdfsdk/src/fpdf_dataavail.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_dataavail.h"
-#include "../../public/fpdf_formfill.h"
+#include "public/fpdf_dataavail.h"
+
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_app.h"
+#include "public/fpdf_formfill.h"
 
 class CFPDF_FileAvailWrap : public IFX_FileAvail {
  public:
diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp
index 730a793d63..ee4c3e6104 100644
--- a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp
+++ b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "../../public/fpdf_doc.h"
-#include "../../public/fpdfview.h"
 #include "../../testing/embedder_test.h"
+#include "public/fpdf_doc.h"
+#include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FPDFDataAvailEmbeddertest : public EmbedderTest {};
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index aead361c9a..74ff88022f 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/src/fpdf_ext.cpp
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "public/fpdf_ext.h"
+
 #include "../../core/include/fxcrt/fx_xml.h"
-#include "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp
index 75db8f806d..a816750912 100644
--- a/fpdfsdk/src/fpdf_flatten.cpp
+++ b/fpdfsdk/src/fpdf_flatten.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_flatten.h"
+#include "public/fpdf_flatten.h"
+
 #include "../include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp
index b125b1cffe..0628c6268e 100644
--- a/fpdfsdk/src/fpdf_progressive.cpp
+++ b/fpdfsdk/src/fpdf_progressive.cpp
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_progressive.h"
-#include "../../public/fpdfview.h"
+#include "public/fpdf_progressive.h"
+
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_rendercontext.h"
+#include "public/fpdfview.h"
 
 // These checks are here because core/ and public/ cannot depend on each other.
 static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER,
diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp
index 9747316305..2e0cb568fa 100644
--- a/fpdfsdk/src/fpdf_searchex.cpp
+++ b/fpdfsdk/src/fpdf_searchex.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_searchex.h"
+#include "public/fpdf_searchex.h"
 
 #include "../../core/include/fpdftext/fpdf_text.h"
 
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index a004e86ba1..9c388292a8 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_sysfontinfo.h"
+#include "public/fpdf_sysfontinfo.h"
+
 #include "../include/fsdk_define.h"
 #include "../include/pdfwindow/PWL_FontMap.h"
 
diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp
index 8a835fb220..134117dcd3 100644
--- a/fpdfsdk/src/fpdf_transformpage.cpp
+++ b/fpdfsdk/src/fpdf_transformpage.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_transformpage.h"
+#include "public/fpdf_transformpage.h"
+
 #include "../include/fsdk_define.h"
 
 namespace {
diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp
index 8a4d619292..72231eb1cc 100644
--- a/fpdfsdk/src/fpdfdoc.cpp
+++ b/fpdfsdk/src/fpdfdoc.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_doc.h"
+#include "public/fpdf_doc.h"
+
 #include "../include/fsdk_define.h"
 
 namespace {
diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp
index c83b2eb958..ca5cbebf01 100644
--- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "../../core/include/fxcrt/fx_string.h"
-#include "../../public/fpdf_doc.h"
-#include "../../public/fpdfview.h"
 #include "../../testing/embedder_test.h"
 #include "../../testing/fx_string_testhelpers.h"
+#include "public/fpdf_doc.h"
+#include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FPDFDocEmbeddertest : public EmbedderTest {};
diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp
index 73fc251195..c4fa2d654e 100644
--- a/fpdfsdk/src/fpdfeditimg.cpp
+++ b/fpdfsdk/src/fpdfeditimg.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_edit.h"
+#include "public/fpdf_edit.h"
+
 #include "../include/fsdk_define.h"
 
 DLLEXPORT FPDF_PAGEOBJECT STDCALL
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp
index b3a52991d2..bb87c4caeb 100644
--- a/fpdfsdk/src/fpdfeditpage.cpp
+++ b/fpdfsdk/src/fpdfeditpage.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_edit.h"
-#include "../../public/fpdf_formfill.h"
+#include "public/fpdf_edit.h"
+
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
+#include "public/fpdf_formfill.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp
index d7fb2e4cef..9dab5fdb5d 100644
--- a/fpdfsdk/src/fpdfformfill.cpp
+++ b/fpdfsdk/src/fpdfformfill.cpp
@@ -4,13 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_formfill.h"
-#include "../../public/fpdfview.h"
+#include "public/fpdf_formfill.h"
+
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
+#include "public/fpdfview.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 namespace {
diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp
index 53cdcbd041..f6d444abed 100644
--- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "../../public/fpdf_formfill.h"
 #include "../../testing/embedder_test.h"
 #include "../../testing/embedder_test_mock_delegate.h"
 #include "../../testing/embedder_test_timer_handling_delegate.h"
+#include "public/fpdf_formfill.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index 0623e7ee85..87c7bcdb6a 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -4,7 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_ppo.h"
+#include "public/fpdf_ppo.h"
+
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fsdk_define.h"
 
diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp
index 3a85ba750c..a9e285ad84 100644
--- a/fpdfsdk/src/fpdfsave.cpp
+++ b/fpdfsdk/src/fpdfsave.cpp
@@ -4,13 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../public/fpdf_edit.h"
-#include "../../public/fpdf_formfill.h"
-#include "../../public/fpdf_save.h"
-#include "../include/fsdk_define.h"
-#include "../include/fpdfxfa/fpdfxfa_doc.h"
+#include "public/fpdf_save.h"
+
 #include "../include/fpdfxfa/fpdfxfa_app.h"
+#include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
+#include "../include/fsdk_define.h"
+#include "public/fpdf_edit.h"
+#include "public/fpdf_formfill.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp
index 99f282a2b5..333ef3b9a1 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/src/fpdftext.cpp
@@ -4,9 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "public/fpdf_text.h"
+
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fpdftext/fpdf_text.h"
-#include "../../public/fpdf_text.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 
diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp
index b3fe9e4c1e..52cec7028a 100644
--- a/fpdfsdk/src/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/src/fpdftext_embeddertest.cpp
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "../../public/fpdf_text.h"
-#include "../../public/fpdfview.h"
 #include "../../testing/embedder_test.h"
+#include "public/fpdf_text.h"
+#include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 04908658f0..31d94770fa 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -4,13 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "public/fpdfview.h"
+
 #include "../../core/include/fpdfapi/fpdf_module.h"
 #include "../../core/include/fxcodec/fx_codec.h"
 #include "../../core/include/fxcrt/fx_safe_types.h"
-#include "../../public/fpdf_ext.h"
-#include "../../public/fpdf_formfill.h"
-#include "../../public/fpdf_progressive.h"
-#include "../../public/fpdfview.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_rendercontext.h"
@@ -19,6 +17,9 @@
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/javascript/IJavaScript.h"
+#include "public/fpdf_ext.h"
+#include "public/fpdf_formfill.h"
+#include "public/fpdf_progressive.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 #include "third_party/base/numerics/safe_conversions_impl.h"
 
diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c
index 4205ca119e..344b029eba 100644
--- a/fpdfsdk/src/fpdfview_c_api_test.c
+++ b/fpdfsdk/src/fpdfview_c_api_test.c
@@ -9,21 +9,21 @@
 
 #include "fpdfview_c_api_test.h"
 
-#include "../../public/fpdf_dataavail.h"
-#include "../../public/fpdf_doc.h"
-#include "../../public/fpdf_edit.h"
-#include "../../public/fpdf_ext.h"
-#include "../../public/fpdf_flatten.h"
-#include "../../public/fpdf_formfill.h"
-#include "../../public/fpdf_fwlevent.h"
-#include "../../public/fpdf_ppo.h"
-#include "../../public/fpdf_progressive.h"
-#include "../../public/fpdf_save.h"
-#include "../../public/fpdf_searchex.h"
-#include "../../public/fpdf_sysfontinfo.h"
-#include "../../public/fpdf_text.h"
-#include "../../public/fpdf_transformpage.h"
-#include "../../public/fpdfview.h"
+#include "public/fpdf_dataavail.h"
+#include "public/fpdf_doc.h"
+#include "public/fpdf_edit.h"
+#include "public/fpdf_ext.h"
+#include "public/fpdf_flatten.h"
+#include "public/fpdf_formfill.h"
+#include "public/fpdf_fwlevent.h"
+#include "public/fpdf_ppo.h"
+#include "public/fpdf_progressive.h"
+#include "public/fpdf_save.h"
+#include "public/fpdf_searchex.h"
+#include "public/fpdf_sysfontinfo.h"
+#include "public/fpdf_text.h"
+#include "public/fpdf_transformpage.h"
+#include "public/fpdfview.h"
 
 // Scheme for avoiding LTO out of existence, warnings, etc.
 typedef void (*fnptr)(void);  // Legal generic function type for casts.
diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp
index 36e79d777a..2a00193a5e 100644
--- a/fpdfsdk/src/fpdfview_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfview_embeddertest.cpp
@@ -5,9 +5,9 @@
 #include <limits>
 #include <string>
 
-#include "../../public/fpdfview.h"
 #include "../../testing/embedder_test.h"
 #include "fpdfview_c_api_test.h"
+#include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf, CApiTest) {
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
index bc19903bad..0ff2ac7728 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
@@ -4,13 +4,13 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#include "../../../public/fpdf_formfill.h"

 #include "../../include/fsdk_define.h"

 #include "../../include/fsdk_mgr.h"

 #include "../../include/fpdfxfa/fpdfxfa_doc.h"

 #include "../../include/fpdfxfa/fpdfxfa_util.h"

 #include "../../include/javascript/IJavaScript.h"

 #include "../../include/fpdfxfa/fpdfxfa_app.h"

+#include "public/fpdf_formfill.h"

 

 CPDFXFA_App* CPDFXFA_App::g_pApp = NULL;

 

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index 3763003dca..b188035ccc 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -4,7 +4,6 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#include "../../../public/fpdf_formfill.h"

 #include "../../include/fsdk_define.h"

 #include "../../include/fpdfxfa/fpdfxfa_doc.h"

 #include "../../include/fsdk_mgr.h"

@@ -12,6 +11,7 @@
 #include "../../include/fpdfxfa/fpdfxfa_util.h"

 #include "../../include/fpdfxfa/fpdfxfa_page.h"

 #include "../../include/javascript/IJavaScript.h"

+#include "public/fpdf_formfill.h"

 

 #define IDS_XFA_Validate_Input                                          \

   "At least one required field was empty. Please fill in the required " \

diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 9db5f913c5..9bbf7aae3f 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -6,11 +6,12 @@
 
 #include <algorithm>
 
-#include "../../public/fpdf_ext.h"
+#include "../include/fsdk_mgr.h"
+
 #include "../include/formfiller/FFL_FormFiller.h"
 #include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
 #include "../include/javascript/IJavaScript.h"
+#include "public/fpdf_ext.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 #include "../include/fpdfxfa/fpdfxfa_app.h"
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index 190286a34e..66b84dac60 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -14,13 +14,13 @@
 #include <utility>
 #include <vector>
 
-#include "../public/fpdf_dataavail.h"
-#include "../public/fpdf_ext.h"
-#include "../public/fpdf_formfill.h"
-#include "../public/fpdf_text.h"
-#include "../public/fpdfview.h"
 #include "../testing/test_support.h"
 #include "image_diff_png.h"
+#include "public/fpdf_dataavail.h"
+#include "public/fpdf_ext.h"
+#include "public/fpdf_formfill.h"
+#include "public/fpdf_text.h"
+#include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/libplatform/libplatform.h"
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index 8a102d1225..ebd8c64b32 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -11,8 +11,9 @@
 #include <utility>
 #include <vector>
 
-#include "../public/fpdf_text.h"
-#include "../public/fpdfview.h"
+#include "public/fpdf_dataavail.h"
+#include "public/fpdf_text.h"
+#include "public/fpdfview.h"
 #include "test_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/testing/embedder_test.h b/testing/embedder_test.h
index 49f8bbac9c..660acc386f 100644
--- a/testing/embedder_test.h
+++ b/testing/embedder_test.h
@@ -8,10 +8,10 @@
 #include <map>
 #include <string>
 
-#include "../public/fpdf_dataavail.h"
-#include "../public/fpdf_ext.h"
-#include "../public/fpdf_formfill.h"
-#include "../public/fpdfview.h"
+#include "public/fpdf_dataavail.h"
+#include "public/fpdf_ext.h"
+#include "public/fpdf_formfill.h"
+#include "public/fpdfview.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
diff --git a/testing/test_support.h b/testing/test_support.h
index afa3bafc96..a2241144a4 100644
--- a/testing/test_support.h
+++ b/testing/test_support.h
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string>
 
-#include "../public/fpdfview.h"
+#include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/v8.h"