diff --git a/BUILD.gn b/BUILD.gn
index cc25e5c..b97d4e5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -741,40 +741,40 @@
 
 static_library("pdfwindow") {
   sources = [
-    "fpdfsdk/include/pdfwindow/PWL_Button.h",
-    "fpdfsdk/include/pdfwindow/PWL_Caret.h",
-    "fpdfsdk/include/pdfwindow/PWL_ComboBox.h",
-    "fpdfsdk/include/pdfwindow/PWL_Edit.h",
-    "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h",
-    "fpdfsdk/include/pdfwindow/PWL_FontMap.h",
-    "fpdfsdk/include/pdfwindow/PWL_Icon.h",
-    "fpdfsdk/include/pdfwindow/PWL_IconList.h",
-    "fpdfsdk/include/pdfwindow/PWL_Label.h",
-    "fpdfsdk/include/pdfwindow/PWL_ListBox.h",
-    "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h",
-    "fpdfsdk/include/pdfwindow/PWL_Note.h",
-    "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h",
-    "fpdfsdk/include/pdfwindow/PWL_Signature.h",
-    "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h",
-    "fpdfsdk/include/pdfwindow/PWL_Utils.h",
-    "fpdfsdk/include/pdfwindow/PWL_Wnd.h",
     "fpdfsdk/pdfwindow/PWL_Button.cpp",
+    "fpdfsdk/pdfwindow/PWL_Button.h",
     "fpdfsdk/pdfwindow/PWL_Caret.cpp",
+    "fpdfsdk/pdfwindow/PWL_Caret.h",
     "fpdfsdk/pdfwindow/PWL_ComboBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_ComboBox.h",
     "fpdfsdk/pdfwindow/PWL_Edit.cpp",
+    "fpdfsdk/pdfwindow/PWL_Edit.h",
     "fpdfsdk/pdfwindow/PWL_EditCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_EditCtrl.h",
     "fpdfsdk/pdfwindow/PWL_FontMap.cpp",
+    "fpdfsdk/pdfwindow/PWL_FontMap.h",
     "fpdfsdk/pdfwindow/PWL_Icon.cpp",
+    "fpdfsdk/pdfwindow/PWL_Icon.h",
     "fpdfsdk/pdfwindow/PWL_IconList.cpp",
+    "fpdfsdk/pdfwindow/PWL_IconList.h",
     "fpdfsdk/pdfwindow/PWL_Label.cpp",
+    "fpdfsdk/pdfwindow/PWL_Label.h",
     "fpdfsdk/pdfwindow/PWL_ListBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListBox.h",
     "fpdfsdk/pdfwindow/PWL_ListCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListCtrl.h",
     "fpdfsdk/pdfwindow/PWL_Note.cpp",
+    "fpdfsdk/pdfwindow/PWL_Note.h",
     "fpdfsdk/pdfwindow/PWL_ScrollBar.cpp",
+    "fpdfsdk/pdfwindow/PWL_ScrollBar.h",
     "fpdfsdk/pdfwindow/PWL_Signature.cpp",
+    "fpdfsdk/pdfwindow/PWL_Signature.h",
     "fpdfsdk/pdfwindow/PWL_SpecialButton.cpp",
+    "fpdfsdk/pdfwindow/PWL_SpecialButton.h",
     "fpdfsdk/pdfwindow/PWL_Utils.cpp",
+    "fpdfsdk/pdfwindow/PWL_Utils.h",
     "fpdfsdk/pdfwindow/PWL_Wnd.cpp",
+    "fpdfsdk/pdfwindow/PWL_Wnd.h",
   ]
   configs += [ ":pdfium_config" ]
 }
diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h
index b576d01..ac5f2ce 100644
--- a/fpdfsdk/formfiller/cba_fontmap.h
+++ b/fpdfsdk/formfiller/cba_fontmap.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
 #define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/pdfwindow/PWL_FontMap.h"
 
 class CPDF_Dictionary;
 class CPDFSDK_Annot;
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index c0e3008..3d8f3f5 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -8,7 +8,7 @@
 
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
+#include "fpdfsdk/pdfwindow/PWL_SpecialButton.h"
 #include "public/fpdf_fwlevent.h"
 
 CFFL_CheckBox::CFFL_CheckBox(CPDFDoc_Environment* pApp, CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 6a24df0..8b2da62 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -11,7 +11,7 @@
 #include "fpdfsdk/formfiller/cffl_iformfiller.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h"
+#include "fpdfsdk/pdfwindow/PWL_ComboBox.h"
 
 CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot)
     : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(NULL) {
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index ff7bf86..3333f7a 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -10,7 +10,7 @@
 #include "fpdfsdk/formfiller/cba_fontmap.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #define GetRed(rgb) ((uint8_t)(rgb))
 #define GetGreen(rgb) ((uint8_t)(((uint16_t)(rgb)) >> 8))
diff --git a/fpdfsdk/formfiller/cffl_iformfiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp
index 09d1099..20dd5bb 100644
--- a/fpdfsdk/formfiller/cffl_iformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp
@@ -16,7 +16,7 @@
 #include "fpdfsdk/formfiller/cffl_radiobutton.h"
 #include "fpdfsdk/formfiller/cffl_textfield.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #define FFL_MAXLISTBOXHEIGHT 140.0f
 
diff --git a/fpdfsdk/formfiller/cffl_iformfiller.h b/fpdfsdk/formfiller/cffl_iformfiller.h
index a966158..d405b33 100644
--- a/fpdfsdk/formfiller/cffl_iformfiller.h
+++ b/fpdfsdk/formfiller/cffl_iformfiller.h
@@ -10,7 +10,7 @@
 #include <map>
 
 #include "fpdfsdk/include/fsdk_define.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
 
 class CFFL_FormFiller;
 class CPDFDoc_Environment;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index f5c7777..85398e3 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -11,7 +11,7 @@
 #include "fpdfsdk/formfiller/cffl_iformfiller.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/pdfwindow/PWL_ListBox.h"
 
 #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f
 
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index 9a90f0a..7a32cbd 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -7,7 +7,7 @@
 #include "fpdfsdk/formfiller/cffl_pushbutton.h"
 
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
+#include "fpdfsdk/pdfwindow/PWL_SpecialButton.h"
 
 CFFL_PushButton::CFFL_PushButton(CPDFDoc_Environment* pApp,
                                  CPDFSDK_Annot* pAnnot)
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index 0826360..1e48849 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -8,7 +8,7 @@
 
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
+#include "fpdfsdk/pdfwindow/PWL_SpecialButton.h"
 
 CFFL_RadioButton::CFFL_RadioButton(CPDFDoc_Environment* pApp,
                                    CPDFSDK_Annot* pWidget)
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp
index 655c4a2..6394ef9 100644
--- a/fpdfsdk/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/fpdf_sysfontinfo.cpp
@@ -7,7 +7,7 @@
 #include "public/fpdf_sysfontinfo.h"
 
 #include "fpdfsdk/include/fsdk_define.h"
-#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/pdfwindow/PWL_FontMap.h"
 
 class CFX_ExternalFontInfo final : public IFX_SystemFontInfo {
  public:
diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index 4124ebf..c34ea49 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -21,7 +21,7 @@
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h
index 171b081..5e80f72 100644
--- a/fpdfsdk/javascript/Field.h
+++ b/fpdfsdk/javascript/Field.h
@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"  // For CPWL_Color.
 #include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"  // For CPWL_Color.
 
 class CPDFSDK_Widget;
 class Document;
diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h
index cb5e59d..2beddb5 100644
--- a/fpdfsdk/javascript/color.h
+++ b/fpdfsdk/javascript/color.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 #include "fpdfsdk/javascript/JS_Define.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class color : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/pdfwindow/PWL_Button.cpp b/fpdfsdk/pdfwindow/PWL_Button.cpp
index 1a57784..851b554 100644
--- a/fpdfsdk/pdfwindow/PWL_Button.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Button.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_Button::CPWL_Button() : m_bMouseDown(FALSE) {}
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/pdfwindow/PWL_Button.h
similarity index 76%
rename from fpdfsdk/include/pdfwindow/PWL_Button.h
rename to fpdfsdk/pdfwindow/PWL_Button.h
index 603dc52..1fffa36 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/pdfwindow/PWL_Button.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_BUTTON_H_
+#define FPDFSDK_PDFWINDOW_PWL_BUTTON_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Button : public CPWL_Wnd {
  public:
@@ -24,4 +24,4 @@
   FX_BOOL m_bMouseDown;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_BUTTON_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp
index 94a9c7e..aa6f018 100644
--- a/fpdfsdk/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/pdfwindow/PWL_Caret.h"
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 #define PWL_CARET_FLASHINTERVAL 500
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/pdfwindow/PWL_Caret.h
similarity index 88%
rename from fpdfsdk/include/pdfwindow/PWL_Caret.h
rename to fpdfsdk/pdfwindow/PWL_Caret.h
index 2459195..a7cf1d4 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/pdfwindow/PWL_Caret.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_CARET_H_
+#define FPDFSDK_PDFWINDOW_PWL_CARET_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 struct PWL_CARET_INFO {
  public:
@@ -50,4 +50,4 @@
   CFX_FloatRect m_rcInvalid;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_CARET_H_
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index cf9ce0a..1428e6b 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h"
+#include "fpdfsdk/pdfwindow/PWL_ComboBox.h"
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 #define PWLCB_DEFAULTFONTSIZE 12.0f
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/pdfwindow/PWL_ComboBox.h
similarity index 90%
rename from fpdfsdk/include/pdfwindow/PWL_ComboBox.h
rename to fpdfsdk/pdfwindow/PWL_ComboBox.h
index 88b7213..6d376e1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_COMBOBOX_H_
+#define FPDFSDK_PDFWINDOW_PWL_COMBOBOX_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_CBEdit : public CPWL_Edit {
  public:
@@ -103,4 +103,4 @@
   void* m_pFormFiller;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_COMBOBOX_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index affb1be..b75c72f 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
 
 #include <vector>
 
@@ -12,12 +12,12 @@
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxcrt/include/fx_xml.h"
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h
similarity index 96%
rename from fpdfsdk/include/pdfwindow/PWL_Edit.h
rename to fpdfsdk/pdfwindow/PWL_Edit.h
index 1e7dd8c..025cf2b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/pdfwindow/PWL_Edit.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_EDIT_H_
+#define FPDFSDK_PDFWINDOW_PWL_EDIT_H_
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class IPWL_SpellCheck;
 
@@ -169,4 +169,4 @@
   void* m_pFormFiller;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_EDIT_H_
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index 3109052..865495a 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 
-#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
-#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
similarity index 96%
rename from fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
rename to fpdfsdk/pdfwindow/PWL_EditCtrl.h
index b64b576..a617056 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_
+#define FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_
 
 #include "core/fxcrt/include/fx_string.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Caret;
 class CPWL_Edit;
@@ -178,4 +178,4 @@
   int32_t m_nCodePage;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 298b744..0a5eef6 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/pdfwindow/PWL_FontMap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 namespace {
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h
similarity index 96%
rename from fpdfsdk/include/pdfwindow/PWL_FontMap.h
rename to fpdfsdk/pdfwindow/PWL_FontMap.h
index a913571..b344e4f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_
+#define FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_
 
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "public/fpdf_sysfontinfo.h"
@@ -134,4 +134,4 @@
   CPDF_Document* m_pAttachedDoc;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp
index 3e5911e..fb75665 100644
--- a/fpdfsdk/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/pdfwindow/PWL_Icon.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/pdfwindow/PWL_Icon.h
similarity index 88%
rename from fpdfsdk/include/pdfwindow/PWL_Icon.h
rename to fpdfsdk/pdfwindow/PWL_Icon.h
index 57c4316..5abf9c2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/pdfwindow/PWL_Icon.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_ICON_H_
+#define FPDFSDK_PDFWINDOW_PWL_ICON_H_
 
 #include "core/fxcrt/include/fx_string.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Image : public CPWL_Wnd {
  public:
@@ -55,4 +55,4 @@
   CPDF_IconFit* m_pIconFit;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_ICON_H_
diff --git a/fpdfsdk/pdfwindow/PWL_IconList.cpp b/fpdfsdk/pdfwindow/PWL_IconList.cpp
index d2418c8..a61bded 100644
--- a/fpdfsdk/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/pdfwindow/PWL_IconList.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_IconList.h"
+#include "fpdfsdk/pdfwindow/PWL_IconList.h"
 
-#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 #define PWL_IconList_ITEM_ICON_LEFTMARGIN 10.0f
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/pdfwindow/PWL_IconList.h
similarity index 93%
rename from fpdfsdk/include/pdfwindow/PWL_IconList.h
rename to fpdfsdk/pdfwindow/PWL_IconList.h
index e4fd68a..b9fb2e5 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/pdfwindow/PWL_IconList.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_ICONLIST_H_
+#define FPDFSDK_PDFWINDOW_PWL_ICONLIST_H_
 
 #include "core/fxcrt/include/fx_string.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class IPWL_IconList_Notify;
 class CPWL_IconList_Item;
@@ -126,4 +126,4 @@
   int32_t m_nListCount;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_ICONLIST_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Label.cpp b/fpdfsdk/pdfwindow/PWL_Label.cpp
index 5f8d2d8..cfbeb43 100644
--- a/fpdfsdk/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Label.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_Label::CPWL_Label() : m_pEdit(NULL) {
   m_pEdit = IFX_Edit::NewEdit();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/pdfwindow/PWL_Label.h
similarity index 85%
rename from fpdfsdk/include/pdfwindow/PWL_Label.h
rename to fpdfsdk/pdfwindow/PWL_Label.h
index 5c3fa01..7b5a3e5 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/pdfwindow/PWL_Label.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_LABEL_H_
+#define FPDFSDK_PDFWINDOW_PWL_LABEL_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class IFX_Edit;
 
@@ -42,4 +42,4 @@
   IFX_Edit* m_pEdit;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_LABEL_H_
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
index a673455..244796b 100644
--- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/pdfwindow/PWL_ListBox.h"
 
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h
similarity index 94%
rename from fpdfsdk/include/pdfwindow/PWL_ListBox.h
rename to fpdfsdk/pdfwindow/PWL_ListBox.h
index d0d98b9..067aa2f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_LISTBOX_H_
+#define FPDFSDK_PDFWINDOW_PWL_LISTBOX_H_
 
 #include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_List_Notify;
 class CPWL_ListBox;
@@ -119,4 +119,4 @@
   void* m_pFormFiller;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_LISTBOX_H_
diff --git a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
index f948287..60bd40a 100644
--- a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_ListCtrl::CPWL_ListCtrl()
     : m_rcContent(0, 0, 0, 0),
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/pdfwindow/PWL_ListCtrl.h
similarity index 86%
rename from fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
rename to fpdfsdk/pdfwindow/PWL_ListCtrl.h
index 0345d02..8448019 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
+++ b/fpdfsdk/pdfwindow/PWL_ListCtrl.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_LISTCTRL_H_
+#define FPDFSDK_PDFWINDOW_PWL_LISTCTRL_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_ListCtrl : public CPWL_Wnd {
  public:
@@ -45,4 +45,4 @@
   FX_FLOAT m_fBottomSpace;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_LISTCTRL_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Note.cpp b/fpdfsdk/pdfwindow/PWL_Note.cpp
index ec7c1c9..a2ff7c4 100644
--- a/fpdfsdk/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Note.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Note.h"
+#include "fpdfsdk/pdfwindow/PWL_Note.h"
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 #define POPUP_ITEM_HEAD_BOTTOM 3.0f
 #define POPUP_ITEM_BOTTOMWIDTH 1.0f
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/pdfwindow/PWL_Note.h
similarity index 96%
rename from fpdfsdk/include/pdfwindow/PWL_Note.h
rename to fpdfsdk/pdfwindow/PWL_Note.h
index cb04aae..e8fdbb8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/pdfwindow/PWL_Note.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_NOTE_H_
+#define FPDFSDK_PDFWINDOW_PWL_NOTE_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"
+#include "fpdfsdk/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_Label;
 class CPWL_Note;
@@ -348,4 +348,4 @@
   CFX_WideString m_sReplyString;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_NOTE_H_
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
index 8b7cfd5..d87f6b5 100644
--- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/pdfwindow/PWL_ScrollBar.h
similarity index 95%
rename from fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
rename to fpdfsdk/pdfwindow/PWL_ScrollBar.h
index a43ac91..1603469 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_SCROLLBAR_H_
+#define FPDFSDK_PDFWINDOW_PWL_SCROLLBAR_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CPWL_SBButton;
 class CPWL_ScrollBar;
@@ -154,4 +154,4 @@
   FX_FLOAT m_fOldPosButton;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_SCROLLBAR_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Signature.cpp b/fpdfsdk/pdfwindow/PWL_Signature.cpp
index a928e4e..72b6ebe 100644
--- a/fpdfsdk/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Signature.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Signature.h"
+#include "fpdfsdk/pdfwindow/PWL_Signature.h"
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_Signature_Image::CPWL_Signature_Image() : m_pImage(NULL) {}
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/pdfwindow/PWL_Signature.h
similarity index 86%
rename from fpdfsdk/include/pdfwindow/PWL_Signature.h
rename to fpdfsdk/pdfwindow/PWL_Signature.h
index 209782a..47d0bb0 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/pdfwindow/PWL_Signature.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_SIGNATURE_H_
+#define FPDFSDK_PDFWINDOW_PWL_SIGNATURE_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CFX_DIBSource;
 class CPWL_Label;
@@ -64,4 +64,4 @@
   FX_BOOL m_bFlagExist;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_SIGNATURE_H_
diff --git a/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
index 78ded5e..e79865e 100644
--- a/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
+++ b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
-#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/pdfwindow/PWL_SpecialButton.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 CPWL_PushButton::CPWL_PushButton() {}
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/pdfwindow/PWL_SpecialButton.h
similarity index 85%
rename from fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
rename to fpdfsdk/pdfwindow/PWL_SpecialButton.h
index 35b2c3f..5aaf19b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/pdfwindow/PWL_SpecialButton.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_SPECIALBUTTON_H_
+#define FPDFSDK_PDFWINDOW_PWL_SPECIALBUTTON_H_
 
-#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/pdfwindow/PWL_Button.h"
 
 class CPWL_PushButton : public CPWL_Button {
  public:
@@ -53,4 +53,4 @@
   bool m_bChecked;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_SPECIALBUTTON_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index 9ad12ab..3622a84 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #include <algorithm>
 
 #include "core/include/fxge/fx_ge.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h
similarity index 98%
rename from fpdfsdk/include/pdfwindow/PWL_Utils.h
rename to fpdfsdk/pdfwindow/PWL_Utils.h
index be51f18..fed1528 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/pdfwindow/PWL_Utils.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_UTILS_H_
+#define FPDFSDK_PDFWINDOW_PWL_UTILS_H_
 
-#include "core/include/fpdfdoc/fpdf_vt.h"      // For CPVT_WordRange.
+#include "core/include/fpdfdoc/fpdf_vt.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CFX_PathData;
 struct CPWL_Color;
@@ -409,4 +409,4 @@
                                 const PWL_PATH_TYPE type);
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_UTILS_H_
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index cb5311f..66ad631 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -6,9 +6,9 @@
 
 #include <map>
 
-#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
+#include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 static std::map<int32_t, CPWL_Timer*>& GetPWLTimeMap() {
   // Leak the object at shutdown.
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
similarity index 98%
rename from fpdfsdk/include/pdfwindow/PWL_Wnd.h
rename to fpdfsdk/pdfwindow/PWL_Wnd.h
index 3b324a7..394e82d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
+#ifndef FPDFSDK_PDFWINDOW_PWL_WND_H_
+#define FPDFSDK_PDFWINDOW_PWL_WND_H_
 
 #include <vector>
 
@@ -469,4 +469,4 @@
   FX_BOOL m_bEnabled;
 };
 
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
+#endif  // FPDFSDK_PDFWINDOW_PWL_WND_H_
diff --git a/pdfium.gyp b/pdfium.gyp
index cb2cc98..4ef27b5 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -755,40 +755,40 @@
       'target_name': 'pdfwindow',
       'type': 'static_library',
       'sources': [
-        'fpdfsdk/include/pdfwindow/PWL_Button.h',
-        'fpdfsdk/include/pdfwindow/PWL_Caret.h',
-        'fpdfsdk/include/pdfwindow/PWL_ComboBox.h',
-        'fpdfsdk/include/pdfwindow/PWL_Edit.h',
-        'fpdfsdk/include/pdfwindow/PWL_EditCtrl.h',
-        'fpdfsdk/include/pdfwindow/PWL_FontMap.h',
-        'fpdfsdk/include/pdfwindow/PWL_Icon.h',
-        'fpdfsdk/include/pdfwindow/PWL_IconList.h',
-        'fpdfsdk/include/pdfwindow/PWL_Label.h',
-        'fpdfsdk/include/pdfwindow/PWL_ListBox.h',
-        'fpdfsdk/include/pdfwindow/PWL_ListCtrl.h',
-        'fpdfsdk/include/pdfwindow/PWL_Note.h',
-        'fpdfsdk/include/pdfwindow/PWL_ScrollBar.h',
-        'fpdfsdk/include/pdfwindow/PWL_Signature.h',
-        'fpdfsdk/include/pdfwindow/PWL_SpecialButton.h',
-        'fpdfsdk/include/pdfwindow/PWL_Utils.h',
-        'fpdfsdk/include/pdfwindow/PWL_Wnd.h',
         'fpdfsdk/pdfwindow/PWL_Button.cpp',
+        'fpdfsdk/pdfwindow/PWL_Button.h',
         'fpdfsdk/pdfwindow/PWL_Caret.cpp',
+        'fpdfsdk/pdfwindow/PWL_Caret.h',
         'fpdfsdk/pdfwindow/PWL_ComboBox.cpp',
+        'fpdfsdk/pdfwindow/PWL_ComboBox.h',
         'fpdfsdk/pdfwindow/PWL_Edit.cpp',
+        'fpdfsdk/pdfwindow/PWL_Edit.h',
         'fpdfsdk/pdfwindow/PWL_EditCtrl.cpp',
+        'fpdfsdk/pdfwindow/PWL_EditCtrl.h',
         'fpdfsdk/pdfwindow/PWL_FontMap.cpp',
+        'fpdfsdk/pdfwindow/PWL_FontMap.h',
         'fpdfsdk/pdfwindow/PWL_Icon.cpp',
+        'fpdfsdk/pdfwindow/PWL_Icon.h',
         'fpdfsdk/pdfwindow/PWL_IconList.cpp',
+        'fpdfsdk/pdfwindow/PWL_IconList.h',
         'fpdfsdk/pdfwindow/PWL_Label.cpp',
+        'fpdfsdk/pdfwindow/PWL_Label.h',
         'fpdfsdk/pdfwindow/PWL_ListBox.cpp',
+        'fpdfsdk/pdfwindow/PWL_ListBox.h',
         'fpdfsdk/pdfwindow/PWL_ListCtrl.cpp',
+        'fpdfsdk/pdfwindow/PWL_ListCtrl.h',
         'fpdfsdk/pdfwindow/PWL_Note.cpp',
+        'fpdfsdk/pdfwindow/PWL_Note.h',
         'fpdfsdk/pdfwindow/PWL_ScrollBar.cpp',
+        'fpdfsdk/pdfwindow/PWL_ScrollBar.h',
         'fpdfsdk/pdfwindow/PWL_Signature.cpp',
+        'fpdfsdk/pdfwindow/PWL_Signature.h',
         'fpdfsdk/pdfwindow/PWL_SpecialButton.cpp',
+        'fpdfsdk/pdfwindow/PWL_SpecialButton.h',
         'fpdfsdk/pdfwindow/PWL_Utils.cpp',
+        'fpdfsdk/pdfwindow/PWL_Utils.h',
         'fpdfsdk/pdfwindow/PWL_Wnd.cpp',
+        'fpdfsdk/pdfwindow/PWL_Wnd.h',
       ],
     },
     {