44 files changed, 132 insertions, 132 deletions
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 4b85333a2a..191f0dec0d 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -29,8 +29,8 @@
 #include "fpdfsdk/formfiller/cba_fontmap.h"
 #include "fpdfsdk/fsdk_actionhandler.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_appstream.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_appstream.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h
index 17b7b4e989..7eb7d4e19c 100644
--- a/fpdfsdk/formfiller/cba_fontmap.h
+++ b/fpdfsdk/formfiller/cba_fontmap.h
@@ -8,7 +8,7 @@
 #define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
 
 class CPDF_Dictionary;
 class CPDFSDK_Annot;
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index 4bab95a54e..1a3ccca547 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -9,7 +9,7 @@
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
 #include "public/fpdf_fwlevent.h"
 
 CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index cbd00bc171..c4554c1173 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -12,7 +12,7 @@
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
 #include "fpdfsdk/fsdk_common.h"
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
 #include "third_party/base/ptr_util.h"
 
 CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index 744d522fbc..17e9407924 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -14,7 +14,7 @@
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
 
 class CFFL_FormFiller;
 class CPDFSDK_FormFillEnvironment;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 4a6264d6dc..ca983d88df 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -12,7 +12,7 @@
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
 #include "fpdfsdk/fsdk_common.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
 #include "third_party/base/ptr_util.h"
 
 #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index d0d51b7b37..2f75f4c16b 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/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
 
 CFFL_PushButton::CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp,
                                  CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index e36e1f7554..6c8d5a3883 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -9,7 +9,7 @@
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
 #include "public/fpdf_fwlevent.h"
 
 CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp
index c424152326..5dca4814d4 100644
--- a/fpdfsdk/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/fpdf_sysfontinfo.cpp
@@ -14,7 +14,7 @@
 #include "core/fxge/fx_font.h"
 #include "core/fxge/ifx_systemfontinfo.h"
 #include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
 #include "third_party/base/ptr_util.h"
 
 static_assert(FXFONT_ANSI_CHARSET == FX_CHARSET_ANSI, "Charset must match");
diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h
index e67d4d5ad5..5d6a65790c 100644
--- a/fpdfsdk/javascript/color.h
+++ b/fpdfsdk/javascript/color.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class color : public CJS_EmbedObj {
  public:
diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp
index 23ebf4f6d5..fe401639da 100644
--- a/fpdfsdk/pdfwindow/cpwl_appstream.cpp
+++ b/fpdfsdk/pwl/cpwl_appstream.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_appstream.h"
+#include "fpdfsdk/pwl/cpwl_appstream.h"
 
 #include <utility>
 
@@ -22,10 +22,10 @@
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
 #include "fpdfsdk/formfiller/cba_fontmap.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_icon.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_icon.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 namespace {
 
diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.h b/fpdfsdk/pwl/cpwl_appstream.h
index 56137864ec..2043c7b0d7 100644
--- a/fpdfsdk/pdfwindow/cpwl_appstream.h
+++ b/fpdfsdk/pwl/cpwl_appstream.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
-#define FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
+#ifndef FPDFSDK_PWL_CPWL_APPSTREAM_H_
+#define FPDFSDK_PWL_CPWL_APPSTREAM_H_
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_string.h"
@@ -40,4 +40,4 @@ class CPWL_AppStream {
   CFX_UnownedPtr<CPDF_Dictionary> dict_;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
+#endif  // FPDFSDK_PWL_CPWL_APPSTREAM_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_button.cpp b/fpdfsdk/pwl/cpwl_button.cpp
index fad3632875..525148a767 100644
--- a/fpdfsdk/pdfwindow/cpwl_button.cpp
+++ b/fpdfsdk/pwl/cpwl_button.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 CPWL_Button::CPWL_Button() : m_bMouseDown(false) {}
 
diff --git a/fpdfsdk/pdfwindow/cpwl_button.h b/fpdfsdk/pwl/cpwl_button.h
index 9f4a47733e..44cc1e2cfd 100644
--- a/fpdfsdk/pdfwindow/cpwl_button.h
+++ b/fpdfsdk/pwl/cpwl_button.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
+#ifndef FPDFSDK_PWL_CPWL_BUTTON_H_
+#define FPDFSDK_PWL_CPWL_BUTTON_H_
 
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_Button : public CPWL_Wnd {
  public:
@@ -24,4 +24,4 @@ class CPWL_Button : public CPWL_Wnd {
   bool m_bMouseDown;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
+#endif  // FPDFSDK_PWL_CPWL_BUTTON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_caret.cpp b/fpdfsdk/pwl/cpwl_caret.cpp
index a9a5b86099..d309d2743b 100644
--- a/fpdfsdk/pdfwindow/cpwl_caret.cpp
+++ b/fpdfsdk/pwl/cpwl_caret.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
 
 #include <sstream>
 
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 #define PWL_CARET_FLASHINTERVAL 500
 
diff --git a/fpdfsdk/pdfwindow/cpwl_caret.h b/fpdfsdk/pwl/cpwl_caret.h
index 6d6dcd557e..a8ae5a3b74 100644
--- a/fpdfsdk/pdfwindow/cpwl_caret.h
+++ b/fpdfsdk/pwl/cpwl_caret.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_CARET_H_
-#define FPDFSDK_PDFWINDOW_CPWL_CARET_H_
+#ifndef FPDFSDK_PWL_CPWL_CARET_H_
+#define FPDFSDK_PWL_CPWL_CARET_H_
 
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_Caret : public CPWL_Wnd {
  public:
@@ -38,4 +38,4 @@ class CPWL_Caret : public CPWL_Wnd {
   CFX_FloatRect m_rcInvalid;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_CARET_H_
+#endif  // FPDFSDK_PWL_CPWL_CARET_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp
index 90c8cc6dc0..9514e55646 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 namespace {
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index 530ff0a07e..a50c4cee37 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
-#define FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
+#ifndef FPDFSDK_PWL_CPWL_COMBO_BOX_H_
+#define FPDFSDK_PWL_CPWL_COMBO_BOX_H_
 
 #include <memory>
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_CBListBox : public CPWL_ListBox {
  public:
@@ -100,4 +100,4 @@ class CPWL_ComboBox : public CPWL_Wnd {
   CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
+#endif  // FPDFSDK_PWL_CPWL_COMBO_BOX_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
index 3224284ee2..afca67fd62 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
@@ -7,8 +7,8 @@
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 8588de73c6..4a19e70eb6 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ -20,12 +20,12 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_font.h"
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "public/fpdf_fwlevent.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index 366d085fdd..2e92ed2ae7 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_H_
+#define FPDFSDK_PWL_CPWL_EDIT_H_
 
 #include <utility>
 
 #include "core/fpdfdoc/cpvt_wordrange.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_basic.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
 
 class IPWL_Filler_Notify {
  public:
@@ -126,4 +126,4 @@ class CPWL_Edit : public CPWL_EditCtrl {
   CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
+#endif  // FPDFSDK_PWL_CPWL_EDIT_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
index a3aac19e20..a852cb6231 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
 
 #include "core/fpdfdoc/cpvt_section.h"
 #include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxge/fx_font.h"
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 CPWL_EditCtrl::CPWL_EditCtrl()
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h b/fpdfsdk/pwl/cpwl_edit_ctrl.h
index 30c2d63419..4fb86fab62 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
+#define FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_EditImpl;
 class CPWL_Caret;
@@ -93,4 +93,4 @@ class CPWL_EditCtrl : public CPWL_Wnd {
   int32_t m_nCharSet;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
+#endif  // FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
index 2b1bbd4445..e41d9b0636 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
@@ -7,7 +7,7 @@
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index 0f5cf05b10..c59a74068d 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
 
 #include <algorithm>
 #include <memory>
@@ -27,9 +27,9 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "fpdfsdk/cfx_systemhandler.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index 53ed8da0c2..697ca84994 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
+#define FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
 
 #include <deque>
 #include <memory>
@@ -512,4 +512,4 @@ class CPWL_EditImpl_Provider : public CPDF_VariableText::Provider {
   IPVT_FontMap* m_pFontMap;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
+#endif  // FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.cpp b/fpdfsdk/pwl/cpwl_font_map.cpp
index f0c74ba0ce..862973541a 100644
--- a/fpdfsdk/pdfwindow/cpwl_font_map.cpp
+++ b/fpdfsdk/pwl/cpwl_font_map.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
 
 #include <utility>
 
@@ -15,7 +15,7 @@
 #include "core/fpdfapi/parser/cpdf_parser.h"
 #include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxcrt/fx_codepage.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h
index e1a3edeb79..9872779c95 100644
--- a/fpdfsdk/pdfwindow/cpwl_font_map.h
+++ b/fpdfsdk/pwl/cpwl_font_map.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
-#define FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
+#ifndef FPDFSDK_PWL_CPWL_FONT_MAP_H_
+#define FPDFSDK_PWL_CPWL_FONT_MAP_H_
 
 #include <memory>
 #include <vector>
@@ -92,4 +92,4 @@ class CPWL_FontMap : public IPVT_FontMap {
   CFX_UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
+#endif  // FPDFSDK_PWL_CPWL_FONT_MAP_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_icon.cpp b/fpdfsdk/pwl/cpwl_icon.cpp
index 4de3e7080d..8a2e31da6a 100644
--- a/fpdfsdk/pdfwindow/cpwl_icon.cpp
+++ b/fpdfsdk/pwl/cpwl_icon.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_icon.h"
+#include "fpdfsdk/pwl/cpwl_icon.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_stream.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 CPWL_Icon::CPWL_Icon() : m_pPDFStream(nullptr), m_pIconFit(nullptr) {}
 
diff --git a/fpdfsdk/pdfwindow/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h
index e97c540bf6..2607e56890 100644
--- a/fpdfsdk/pdfwindow/cpwl_icon.h
+++ b/fpdfsdk/pwl/cpwl_icon.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_ICON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_ICON_H_
+#ifndef FPDFSDK_PWL_CPWL_ICON_H_
+#define FPDFSDK_PWL_CPWL_ICON_H_
 
 #include <utility>
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_Icon : public CPWL_Wnd {
  public:
@@ -41,4 +41,4 @@ class CPWL_Icon : public CPWL_Wnd {
   CFX_UnownedPtr<CPDF_IconFit> m_pIconFit;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_ICON_H_
+#endif  // FPDFSDK_PWL_CPWL_ICON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.cpp b/fpdfsdk/pwl/cpwl_list_box.cpp
index 7e820bfbfa..060b3f6ee3 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_box.cpp
+++ b/fpdfsdk/pwl/cpwl_list_box.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
 
 #include <sstream>
 
 #include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "public/fpdf_fwlevent.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index d76c7a5c5a..8938f243d5 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
-#define FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
+#ifndef FPDFSDK_PWL_CPWL_LIST_BOX_H_
+#define FPDFSDK_PWL_CPWL_LIST_BOX_H_
 
 #include <memory>
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_ListCtrl;
 class CPWL_List_Notify;
@@ -107,4 +107,4 @@ class CPWL_ListBox : public CPWL_Wnd {
   CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
+#endif  // FPDFSDK_PWL_CPWL_LIST_BOX_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_list_impl.cpp b/fpdfsdk/pwl/cpwl_list_impl.cpp
index 66b2e77747..94e0606941 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_impl.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxcrt/fx_extension.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
 #include "third_party/base/stl_util.h"
 
 CPWL_ListCtrl::Item::Item()
diff --git a/fpdfsdk/pdfwindow/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h
index 167def057e..ca159b7e5e 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_impl.h
+++ b/fpdfsdk/pwl/cpwl_list_impl.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
+#ifndef FPDFSDK_PWL_CPWL_LIST_IMPL_H_
+#define FPDFSDK_PWL_CPWL_LIST_IMPL_H_
 
 #include <map>
 #include <memory>
@@ -165,4 +165,4 @@ class CPWL_ListCtrl {
   bool m_bMultiple;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
+#endif  // FPDFSDK_PWL_CPWL_LIST_IMPL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
index c607ee795e..19e4bc8b5f 100644
--- a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
 
 #include <algorithm>
 #include <sstream>
@@ -12,7 +12,7 @@
 
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 namespace {
 
diff --git a/fpdfsdk/pdfwindow/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
index f9887e5610..c78b6e36f8 100644
--- a/fpdfsdk/pdfwindow/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
-#define FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
+#ifndef FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
+#define FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 class CPWL_SBButton;
 class CPWL_ScrollBar;
@@ -181,4 +181,4 @@ class CPWL_ScrollBar : public CPWL_Wnd {
   float m_fOldPosButton;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
+#endif  // FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_special_button.cpp b/fpdfsdk/pwl/cpwl_special_button.cpp
index b911d5eb00..53f7f2c1d0 100644
--- a/fpdfsdk/pdfwindow/cpwl_special_button.cpp
+++ b/fpdfsdk/pwl/cpwl_special_button.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 CPWL_PushButton::CPWL_PushButton() {}
 
diff --git a/fpdfsdk/pdfwindow/cpwl_special_button.h b/fpdfsdk/pwl/cpwl_special_button.h
index ed80d31639..b499542795 100644
--- a/fpdfsdk/pdfwindow/cpwl_special_button.h
+++ b/fpdfsdk/pwl/cpwl_special_button.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
+#ifndef FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
+#define FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
 
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
 
 class CPWL_PushButton : public CPWL_Button {
  public:
@@ -53,4 +53,4 @@ class CPWL_RadioButton : public CPWL_Button {
   bool m_bChecked;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
+#endif  // FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_timer.cpp b/fpdfsdk/pwl/cpwl_timer.cpp
index 03b183821f..34f81fc433 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer.cpp
+++ b/fpdfsdk/pwl/cpwl_timer.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
 
 #include <map>
 
 #include "fpdfsdk/cfx_systemhandler.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
 
 namespace {
 
diff --git a/fpdfsdk/pdfwindow/cpwl_timer.h b/fpdfsdk/pwl/cpwl_timer.h
index 32a68fcbc2..6f76fe7eb0 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer.h
+++ b/fpdfsdk/pwl/cpwl_timer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
-#define FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
+#ifndef FPDFSDK_PWL_CPWL_TIMER_H_
+#define FPDFSDK_PWL_CPWL_TIMER_H_
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_basic.h"
@@ -29,4 +29,4 @@ class CPWL_Timer {
   CFX_UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
+#endif  // FPDFSDK_PWL_CPWL_TIMER_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_timer_handler.cpp b/fpdfsdk/pwl/cpwl_timer_handler.cpp
index 3edaa8d462..33af306deb 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer_handler.cpp
+++ b/fpdfsdk/pwl/cpwl_timer_handler.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
 
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
 #include "third_party/base/ptr_util.h"
 
 CPWL_TimerHandler::CPWL_TimerHandler() {}
diff --git a/fpdfsdk/pdfwindow/cpwl_timer_handler.h b/fpdfsdk/pwl/cpwl_timer_handler.h
index f6ffd44996..b65a5152be 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer_handler.h
+++ b/fpdfsdk/pwl/cpwl_timer_handler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
-#define FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
+#ifndef FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
+#define FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
 
 #include <memory>
 
@@ -29,4 +29,4 @@ class CPWL_TimerHandler {
   std::unique_ptr<CPWL_Timer> m_pTimer;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
+#endif  // FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 58824afdbd..2269162260 100644
--- a/fpdfsdk/pdfwindow/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
 
 #include <map>
 #include <sstream>
 #include <vector>
 
 #include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index d56369cb52..7c93216a58 100644
--- a/fpdfsdk/pdfwindow/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_PDFWINDOW_CPWL_WND_H_
-#define FPDFSDK_PDFWINDOW_CPWL_WND_H_
+#ifndef FPDFSDK_PWL_CPWL_WND_H_
+#define FPDFSDK_PWL_CPWL_WND_H_
 
 #include <memory>
 #include <vector>
@@ -17,8 +17,8 @@
 #include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
 
 class CPWL_Edit;
 class CPWL_MsgControl;
@@ -341,4 +341,4 @@ class CPWL_Wnd : public CPWL_TimerHandler, public CFX_Observable<CPWL_Wnd> {
   bool m_bEnabled;
 };
 
-#endif  // FPDFSDK_PDFWINDOW_CPWL_WND_H_
+#endif  // FPDFSDK_PWL_CPWL_WND_H_