Expand all paths to be based off pdfium/ directory

This CL runs a script over the source and updates the include files to be
a full path from the pdfium/ directory.

BUG=pdfium:65
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1707923002 .

58 files changed, 184 insertions, 184 deletions

diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h
index 27af16be5a..4ffb143734 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CFFL_CheckBox : public CFFL_Button {
  public:
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index 5c36779df7..590a646d1d 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "core/include/fxcrt/fx_string.h"
 
 class CBA_FontMap;
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 227f062e46..fe7fed1020 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -9,7 +9,7 @@
 
 #include <set>
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CBA_FontMap;
 
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h
index 13d60855b9..a4d0236321 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/include/formfiller/FFL_PushButton.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CFFL_PushButton : public CFFL_Button {
  public:
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h
index 3a8280336a..a4e7928e31 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CFFL_RadioButton : public CFFL_Button {
  public:
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 12ac15abb8..f810d8ff64 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
 
-#include "FFL_FormFiller.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 #define BF_ALIGN_LEFT 0
 #define BF_ALIGN_MIDDLE 1
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index b5672d178d..920ea64e08 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -12,7 +12,7 @@
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fxcrt/fx_string.h"
-#include "fsdk_baseform.h"
+#include "fpdfsdk/include/fsdk_baseform.h"
 
 class CPDFSDK_Annot;
 class CPDFSDK_Document;
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 5fdf645306..b6944ec80b 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "core/include/fpdftext/fpdf_text.h"
-#include "fsdk_actionhandler.h"
-#include "fsdk_annothandler.h"
-#include "fsdk_baseannot.h"
-#include "fsdk_baseform.h"
-#include "fsdk_common.h"
-#include "fsdk_define.h"
-#include "fx_systemhandler.h"
+#include "fpdfsdk/include/fsdk_actionhandler.h"
+#include "fpdfsdk/include/fsdk_annothandler.h"
+#include "fpdfsdk/include/fsdk_baseannot.h"
+#include "fpdfsdk/include/fsdk_baseform.h"
+#include "fpdfsdk/include/fsdk_common.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fx_systemhandler.h"
 #include "javascript/IJavaScript.h"
 #include "public/fpdf_formfill.h"
 #include "public/fpdf_fwlevent.h"  // cross platform keycode and events define.
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index 8c007b567f..4a542902f9 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 #define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 
-#include "fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
 #include "public/fpdf_progressive.h"
 
 // Everything about rendering is put here: for OOM recovery
diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h
index 2700b92cf0..a2f9524b2e 100644
--- a/fpdfsdk/include/fxedit/fxet_list.h
+++ b/fpdfsdk/include/fxedit/fxet_list.h
@@ -8,7 +8,7 @@
 #define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
 
 #include "core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
-#include "fx_edit.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
 
 class IFX_Edit;
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h
index 28a026c3bf..5c65c78160 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Button.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
 
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Button : public CPWL_Wnd {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h
index c2a2caf979..a1a5022b25 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
 
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 struct PWL_CARET_INFO {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index b174f022b8..a6f6a7b591 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -7,9 +7,9 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
 
-#include "PWL_Edit.h"
-#include "PWL_ListBox.h"
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_CBEdit : public CPWL_Edit {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index 0d5c931148..9bb40a7de1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -7,9 +7,9 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
 
-#include "PWL_Wnd.h"
 #include "core/include/fxcrt/fx_string.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Caret;
 class CPWL_Edit;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 0d2596f83b..4db62f81be 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
 
-#include "PWL_Wnd.h"
 #include "core/include/fxcrt/fx_string.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Image : public CPWL_Wnd {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index 0a21bbe8b9..e4c18a8c03 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -7,9 +7,9 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
 
-#include "PWL_ListCtrl.h"
-#include "PWL_Wnd.h"
 #include "core/include/fxcrt/fx_string.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class IPWL_IconList_Notify;
 class CPWL_IconList_Item;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index aba84fbf79..bed519fe6d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
 
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class IFX_Edit;
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index 807f11ef30..1f42d43fc6 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
 
-#include "PWL_Wnd.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPDF_ListCtrl;
 class CPWL_List_Notify;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
index 4c96d436c8..7b04a0cdb5 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
 
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_ListCtrl : public CPWL_Wnd {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index 9946f4473d..2d5b564a7f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -7,11 +7,11 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
 
-#include "PWL_Button.h"
-#include "PWL_Edit.h"
-#include "PWL_ListCtrl.h"
-#include "PWL_ScrollBar.h"
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Label;
 class CPWL_Note;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index 891079e39e..439bb65ed2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CPWL_SBButton;
 class CPWL_ScrollBar;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index 0dbd906f20..1f2fa733b2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
 
-#include "PWL_Icon.h"
-#include "PWL_Wnd.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CFX_DIBSource;
 class CPWL_Label;
diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
index a62d18d257..5d372e826f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
 
-#include "PWL_Button.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
 
 class CPWL_PushButton : public CPWL_Button {
  public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 3cc7e0177e..cd033d7bc7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -7,10 +7,10 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
 
-#include "PWL_Wnd.h"
 #include "core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
 #include "core/include/fpdfdoc/fpdf_vt.h"      // For CPVT_WordRange.
 #include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 class CFX_PathData;
 struct CPWL_Color;
diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c
index fdf83bec6d..52bbd11b00 100644
--- a/fpdfsdk/src/fpdfview_c_api_test.c
+++ b/fpdfsdk/src/fpdfview_c_api_test.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "fpdfview_c_api_test.h"
+#include "fpdfsdk/src/fpdfview_c_api_test.h"
 
 #include "public/fpdf_dataavail.h"
 #include "public/fpdf_doc.h"
diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp
index 7f6b8f8c6a..261f8257a8 100644
--- a/fpdfsdk/src/javascript/Consts.cpp
+++ b/fpdfsdk/src/javascript/Consts.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "Consts.h"
+#include "fpdfsdk/src/javascript/Consts.h"
 
-#include "JS_Define.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* ------------------------------ border ------------------------------ */
 
diff --git a/fpdfsdk/src/javascript/Consts.h b/fpdfsdk/src/javascript/Consts.h
index 57c843e660..6cd1d1d809 100644
--- a/fpdfsdk/src/javascript/Consts.h
+++ b/fpdfsdk/src/javascript/Consts.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_
 #define FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 /* ------------------------------ border ------------------------------ */
 
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index e869e72310..c2638d012d 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "Document.h"
-
-#include "Field.h"
-#include "Icon.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
-#include "app.h"
+#include "fpdfsdk/src/javascript/Document.h"
+
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "resource.h"
+#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/src/javascript/Icon.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/app.h"
+#include "fpdfsdk/src/javascript/resource.h"
 #include "third_party/base/numerics/safe_math.h"
 
 static v8::Isolate* GetIsolate(IJS_Context* cc) {
diff --git a/fpdfsdk/src/javascript/Document.h b/fpdfsdk/src/javascript/Document.h
index 2295fd7328..c36893fd87 100644
--- a/fpdfsdk/src/javascript/Document.h
+++ b/fpdfsdk/src/javascript/Document.h
@@ -10,7 +10,7 @@
 #include <list>
 #include <memory>
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class PrintParamsObj : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
index 24acd6029c..82187c2453 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/src/javascript/Field.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "Field.h"
+#include "fpdfsdk/src/javascript/Field.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
-#include "Document.h"
-#include "Icon.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
-#include "PublicMethods.h"
-#include "color.h"
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/src/javascript/Icon.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/PublicMethods.h"
+#include "fpdfsdk/src/javascript/color.h"
 
 BEGIN_JS_STATIC_CONST(CJS_Field)
 END_JS_STATIC_CONST()
diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h
index cd817956d4..21552c4ec7 100644
--- a/fpdfsdk/src/javascript/Field.h
+++ b/fpdfsdk/src/javascript/Field.h
@@ -9,8 +9,8 @@
 
 #include <string>  // For std::wstring.
 
-#include "JS_Define.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"  // For CPWL_Color.
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class CPDFSDK_Widget;
 class Document;
diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp
index bce66c0d99..0bad2c5656 100644
--- a/fpdfsdk/src/javascript/Icon.cpp
+++ b/fpdfsdk/src/javascript/Icon.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "Icon.h"
+#include "fpdfsdk/src/javascript/Icon.h"
 
-#include "JS_Define.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* ---------------------- Icon ---------------------- */
 
diff --git a/fpdfsdk/src/javascript/Icon.h b/fpdfsdk/src/javascript/Icon.h
index 6ea3153974..512002dce1 100644
--- a/fpdfsdk/src/javascript/Icon.h
+++ b/fpdfsdk/src/javascript/Icon.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_ICON_H_
 #define FPDFSDK_SRC_JAVASCRIPT_ICON_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class Icon : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index 9dbf5ed50a..304abfaae2 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
 
-#include "JS_EventHandler.h"
-#include "JS_Runtime.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "resource.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/resource.h"
 
 /* -------------------------- CJS_Context -------------------------- */
 
diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h
index 02b36f9322..3b45ea20a1 100644
--- a/fpdfsdk/src/javascript/JS_Define.h
+++ b/fpdfsdk/src/javascript/JS_Define.h
@@ -7,10 +7,10 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
 #define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
 
-#include "JS_Object.h"
-#include "JS_Value.h"
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
-#include "resource.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/resource.h"
 
 struct JSConstSpec {
   const wchar_t* pName;
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp
index e413166328..e11cfa39ae 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.cpp
+++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_EventHandler.h"
-
-#include "Document.h"
-#include "Field.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* ---------------------------- CJS_EventHandler ---------------------------- */
 
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp
index 4d6edc898d..1491d018e7 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_GlobalData.h"
+#include "fpdfsdk/src/javascript/JS_GlobalData.h"
 
 #include "core/include/fdrm/fx_crypt.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index 058ec02925..ca9bd00774 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
 
-#include "JS_Context.h"
-#include "JS_Define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 
 namespace {
diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h
index fe9e5ec5d2..deae2d2a8f 100644
--- a/fpdfsdk/src/javascript/JS_Object.h
+++ b/fpdfsdk/src/javascript/JS_Object.h
@@ -10,9 +10,9 @@
 #include <map>
 #include <memory>
 
-#include "JS_Runtime.h"
 #include "fpdfsdk/include/fsdk_define.h"  // For FX_UINT
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
 
 class CJS_Context;
 class CJS_Object;
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 95f392487a..76221db3f2 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -4,28 +4,28 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_Runtime.h"
-
-#include "Consts.h"
-#include "Document.h"
-#include "Field.h"
-#include "Icon.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_GlobalData.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
-#include "PublicMethods.h"
-#include "app.h"
-#include "color.h"
-#include "console.h"
-#include "event.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "global.h"
-#include "report.h"
-#include "util.h"
+#include "fpdfsdk/src/javascript/Consts.h"
+#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/src/javascript/Icon.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_GlobalData.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/PublicMethods.h"
+#include "fpdfsdk/src/javascript/app.h"
+#include "fpdfsdk/src/javascript/color.h"
+#include "fpdfsdk/src/javascript/console.h"
+#include "fpdfsdk/src/javascript/event.h"
+#include "fpdfsdk/src/javascript/global.h"
+#include "fpdfsdk/src/javascript/report.h"
+#include "fpdfsdk/src/javascript/util.h"
 #include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h
index decc553974..6fc3894f44 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.h
+++ b/fpdfsdk/src/javascript/JS_Runtime.h
@@ -11,10 +11,10 @@
 #include <utility>
 #include <vector>
 
-#include "JS_EventHandler.h"
 #include "core/include/fxcrt/fx_basic.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "fpdfsdk/include/jsapi/fxjs_v8.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
 
 class CJS_Context;
 
diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp
index c63963a110..17b0d8738d 100644
--- a/fpdfsdk/src/javascript/JS_Value.cpp
+++ b/fpdfsdk/src/javascript/JS_Value.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 #include <time.h>
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
-#include "Document.h"
-#include "JS_Define.h"
-#include "JS_Object.h"
+#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
 
 static const FX_DWORD g_nan[2] = {0, 0x7FF80000};
 static double GetNan() {
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 1a5c83cc46..f510d51d64 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -4,23 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "PublicMethods.h"
+#include "fpdfsdk/src/javascript/PublicMethods.h"
 
 #include <algorithm>
 
-#include "Field.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
-#include "color.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "resource.h"
-#include "util.h"
+#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/color.h"
+#include "fpdfsdk/src/javascript/resource.h"
+#include "fpdfsdk/src/javascript/util.h"
 
 #define DOUBLE_CORRECT 0.000000000000001
 
diff --git a/fpdfsdk/src/javascript/PublicMethods.h b/fpdfsdk/src/javascript/PublicMethods.h
index 26640bc40b..aa9be94ec7 100644
--- a/fpdfsdk/src/javascript/PublicMethods.h
+++ b/fpdfsdk/src/javascript/PublicMethods.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_
 #define FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class CJS_PublicMethods : public CJS_Object {
  public:
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index 3a971cf146..a9227a7bdb 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "app.h"
+#include "fpdfsdk/src/javascript/app.h"
 
 #include <memory>
 
-#include "Document.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "resource.h"
+#include "fpdfsdk/src/javascript/Document.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/resource.h"
 
 BEGIN_JS_STATIC_CONST(CJS_TimerObj)
 END_JS_STATIC_CONST()
diff --git a/fpdfsdk/src/javascript/app.h b/fpdfsdk/src/javascript/app.h
index 1eef13e7bb..0b3e50e63d 100644
--- a/fpdfsdk/src/javascript/app.h
+++ b/fpdfsdk/src/javascript/app.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_APP_H_
 #define FPDFSDK_SRC_JAVASCRIPT_APP_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class CJS_Runtime;
 
diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp
index b9c4804727..5c02ca28da 100644
--- a/fpdfsdk/src/javascript/color.cpp
+++ b/fpdfsdk/src/javascript/color.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "color.h"
-
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Runtime.h"
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/color.h"
+
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Runtime.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* -------------------------- color -------------------------- */
 
diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h
index 0cc3f3c289..20f5244a58 100644
--- a/fpdfsdk/src/javascript/color.h
+++ b/fpdfsdk/src/javascript/color.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
 #define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
 
-#include "JS_Define.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"  // For CPWL_Color.
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class color : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp
index 072e5b7f0d..5666bec255 100644
--- a/fpdfsdk/src/javascript/console.cpp
+++ b/fpdfsdk/src/javascript/console.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "console.h"
+#include "fpdfsdk/src/javascript/console.h"
 
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 
 /* ------------------------ console ------------------------ */
diff --git a/fpdfsdk/src/javascript/console.h b/fpdfsdk/src/javascript/console.h
index f4901045e4..a810184b41 100644
--- a/fpdfsdk/src/javascript/console.h
+++ b/fpdfsdk/src/javascript/console.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_
 #define FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class console : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp
index 2362c01287..f0f52f77cc 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/src/javascript/event.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "event.h"
-
-#include "Field.h"
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/event.h"
+
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/Field.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* -------------------------- event -------------------------- */
 
diff --git a/fpdfsdk/src/javascript/event.h b/fpdfsdk/src/javascript/event.h
index 7ebe571f86..cf37bf6b08 100644
--- a/fpdfsdk/src/javascript/event.h
+++ b/fpdfsdk/src/javascript/event.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_EVENT_H_
 #define FPDFSDK_SRC_JAVASCRIPT_EVENT_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class event : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 7a43b677e9..32995ffbb1 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "global.h"
-
-#include "JS_Context.h"
-#include "JS_Define.h"
-#include "JS_EventHandler.h"
-#include "JS_GlobalData.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
+#include "fpdfsdk/src/javascript/global.h"
+
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "resource.h"
+#include "fpdfsdk/src/javascript/JS_Context.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_EventHandler.h"
+#include "fpdfsdk/src/javascript/JS_GlobalData.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
+#include "fpdfsdk/src/javascript/resource.h"
 
 /* ---------------------------- global ---------------------------- */
 
diff --git a/fpdfsdk/src/javascript/global.h b/fpdfsdk/src/javascript/global.h
index 6d2f632645..c2fb076b8c 100644
--- a/fpdfsdk/src/javascript/global.h
+++ b/fpdfsdk/src/javascript/global.h
@@ -9,7 +9,7 @@
 
 #include <map>
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class CJS_GlobalData;
 class CJS_GlobalVariableArray;
diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp
index 2ec07fb1e4..952ed21a20 100644
--- a/fpdfsdk/src/javascript/report.cpp
+++ b/fpdfsdk/src/javascript/report.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "report.h"
+#include "fpdfsdk/src/javascript/report.h"
 
-#include "JS_Define.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Object.h"
+#include "fpdfsdk/src/javascript/JS_Value.h"
 
 /* ---------------------- report ---------------------- */
 
diff --git a/fpdfsdk/src/javascript/report.h b/fpdfsdk/src/javascript/report.h
index 36d1f686f1..dc43912cb1 100644
--- a/fpdfsdk/src/javascript/report.h
+++ b/fpdfsdk/src/javascript/report.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_SRC_JAVASCRIPT_REPORT_H_
 #define FPDFSDK_SRC_JAVASCRIPT_REPORT_H_
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class Report : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/src/javascript/resource.cpp b/fpdfsdk/src/javascript/resource.cpp
index d99e7ce95a..7031da34d1 100644
--- a/fpdfsdk/src/javascript/resource.cpp
+++ b/fpdfsdk/src/javascript/resource.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "resource.h"
+#include "fpdfsdk/src/javascript/resource.h"
 
 CFX_WideString JSGetStringFromID(CJS_Context* pContext, FX_UINT id) {
   switch (id) {
diff --git a/fpdfsdk/src/javascript/util.h b/fpdfsdk/src/javascript/util.h
index 7b9a18c878..22a8358150 100644
--- a/fpdfsdk/src/javascript/util.h
+++ b/fpdfsdk/src/javascript/util.h
@@ -9,7 +9,7 @@
 
 #include <string>  // For std::wstring.
 
-#include "JS_Define.h"
+#include "fpdfsdk/src/javascript/JS_Define.h"
 
 class util : public CJS_EmbedObj {
  public: