139 files changed, 1039 insertions, 1038 deletions

diff --git a/BUILD.gn b/BUILD.gn
index c6d90365b5..2a680c0b80 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1197,103 +1197,103 @@ if (pdf_enable_xfa) {
       "xfa/fgas/localization/fgas_locale.cpp",
       "xfa/fgas/localization/fgas_locale.h",
       "xfa/fgas/localization/fgas_localeimp.h",
-      "xfa/fwl/core/cfwl_app.cpp",
-      "xfa/fwl/core/cfwl_app.h",
-      "xfa/fwl/core/cfwl_barcode.cpp",
-      "xfa/fwl/core/cfwl_barcode.h",
-      "xfa/fwl/core/cfwl_caret.cpp",
-      "xfa/fwl/core/cfwl_caret.h",
-      "xfa/fwl/core/cfwl_checkbox.cpp",
-      "xfa/fwl/core/cfwl_checkbox.h",
-      "xfa/fwl/core/cfwl_combobox.cpp",
-      "xfa/fwl/core/cfwl_combobox.h",
-      "xfa/fwl/core/cfwl_comboboxproxy.cpp",
-      "xfa/fwl/core/cfwl_comboboxproxy.h",
-      "xfa/fwl/core/cfwl_comboedit.cpp",
-      "xfa/fwl/core/cfwl_comboedit.h",
-      "xfa/fwl/core/cfwl_combolist.cpp",
-      "xfa/fwl/core/cfwl_combolist.h",
-      "xfa/fwl/core/cfwl_datetimeedit.cpp",
-      "xfa/fwl/core/cfwl_datetimeedit.h",
-      "xfa/fwl/core/cfwl_datetimepicker.cpp",
-      "xfa/fwl/core/cfwl_datetimepicker.h",
-      "xfa/fwl/core/cfwl_edit.cpp",
-      "xfa/fwl/core/cfwl_edit.h",
-      "xfa/fwl/core/cfwl_event.cpp",
-      "xfa/fwl/core/cfwl_event.h",
-      "xfa/fwl/core/cfwl_eventtarget.cpp",
-      "xfa/fwl/core/cfwl_eventtarget.h",
-      "xfa/fwl/core/cfwl_evtcheckword.cpp",
-      "xfa/fwl/core/cfwl_evtcheckword.h",
-      "xfa/fwl/core/cfwl_evtmouse.cpp",
-      "xfa/fwl/core/cfwl_evtmouse.h",
-      "xfa/fwl/core/cfwl_evtscroll.cpp",
-      "xfa/fwl/core/cfwl_evtscroll.h",
-      "xfa/fwl/core/cfwl_evtselectchanged.cpp",
-      "xfa/fwl/core/cfwl_evtselectchanged.h",
-      "xfa/fwl/core/cfwl_evttextchanged.cpp",
-      "xfa/fwl/core/cfwl_evttextchanged.h",
-      "xfa/fwl/core/cfwl_evtvalidate.cpp",
-      "xfa/fwl/core/cfwl_evtvalidate.h",
-      "xfa/fwl/core/cfwl_form.cpp",
-      "xfa/fwl/core/cfwl_form.h",
-      "xfa/fwl/core/cfwl_formproxy.cpp",
-      "xfa/fwl/core/cfwl_formproxy.h",
-      "xfa/fwl/core/cfwl_listbox.cpp",
-      "xfa/fwl/core/cfwl_listbox.h",
-      "xfa/fwl/core/cfwl_listitem.cpp",
-      "xfa/fwl/core/cfwl_listitem.h",
-      "xfa/fwl/core/cfwl_message.cpp",
-      "xfa/fwl/core/cfwl_message.h",
-      "xfa/fwl/core/cfwl_monthcalendar.cpp",
-      "xfa/fwl/core/cfwl_monthcalendar.h",
-      "xfa/fwl/core/cfwl_msgkey.cpp",
-      "xfa/fwl/core/cfwl_msgkey.h",
-      "xfa/fwl/core/cfwl_msgkillfocus.cpp",
-      "xfa/fwl/core/cfwl_msgkillfocus.h",
-      "xfa/fwl/core/cfwl_msgmouse.cpp",
-      "xfa/fwl/core/cfwl_msgmouse.h",
-      "xfa/fwl/core/cfwl_msgmousewheel.cpp",
-      "xfa/fwl/core/cfwl_msgmousewheel.h",
-      "xfa/fwl/core/cfwl_msgsetfocus.cpp",
-      "xfa/fwl/core/cfwl_msgsetfocus.h",
-      "xfa/fwl/core/cfwl_notedriver.cpp",
-      "xfa/fwl/core/cfwl_notedriver.h",
-      "xfa/fwl/core/cfwl_noteloop.cpp",
-      "xfa/fwl/core/cfwl_noteloop.h",
-      "xfa/fwl/core/cfwl_picturebox.cpp",
-      "xfa/fwl/core/cfwl_picturebox.h",
-      "xfa/fwl/core/cfwl_pushbutton.cpp",
-      "xfa/fwl/core/cfwl_pushbutton.h",
-      "xfa/fwl/core/cfwl_scrollbar.cpp",
-      "xfa/fwl/core/cfwl_scrollbar.h",
-      "xfa/fwl/core/cfwl_spinbutton.cpp",
-      "xfa/fwl/core/cfwl_spinbutton.h",
-      "xfa/fwl/core/cfwl_sysbtn.cpp",
-      "xfa/fwl/core/cfwl_sysbtn.h",
-      "xfa/fwl/core/cfwl_themebackground.h",
-      "xfa/fwl/core/cfwl_themepart.cpp",
-      "xfa/fwl/core/cfwl_themepart.h",
-      "xfa/fwl/core/cfwl_themetext.h",
-      "xfa/fwl/core/cfwl_timer.cpp",
-      "xfa/fwl/core/cfwl_timer.h",
-      "xfa/fwl/core/cfwl_timerinfo.cpp",
-      "xfa/fwl/core/cfwl_timerinfo.h",
-      "xfa/fwl/core/cfwl_widget.cpp",
-      "xfa/fwl/core/cfwl_widget.h",
-      "xfa/fwl/core/cfwl_widgetmgr.cpp",
-      "xfa/fwl/core/cfwl_widgetmgr.h",
-      "xfa/fwl/core/cfwl_widgetproperties.cpp",
-      "xfa/fwl/core/cfwl_widgetproperties.h",
-      "xfa/fwl/core/cfx_barcode.cpp",
-      "xfa/fwl/core/cfx_barcode.h",
-      "xfa/fwl/core/fwl_error.h",
-      "xfa/fwl/core/fwl_widgetdef.h",
-      "xfa/fwl/core/fwl_widgethit.h",
-      "xfa/fwl/core/ifwl_adaptertimermgr.h",
-      "xfa/fwl/core/ifwl_themeprovider.h",
-      "xfa/fwl/core/ifwl_widgetdelegate.h",
-      "xfa/fwl/core/ifwl_widgetmgrdelegate.h",
+      "xfa/fwl/cfwl_app.cpp",
+      "xfa/fwl/cfwl_app.h",
+      "xfa/fwl/cfwl_barcode.cpp",
+      "xfa/fwl/cfwl_barcode.h",
+      "xfa/fwl/cfwl_caret.cpp",
+      "xfa/fwl/cfwl_caret.h",
+      "xfa/fwl/cfwl_checkbox.cpp",
+      "xfa/fwl/cfwl_checkbox.h",
+      "xfa/fwl/cfwl_combobox.cpp",
+      "xfa/fwl/cfwl_combobox.h",
+      "xfa/fwl/cfwl_comboboxproxy.cpp",
+      "xfa/fwl/cfwl_comboboxproxy.h",
+      "xfa/fwl/cfwl_comboedit.cpp",
+      "xfa/fwl/cfwl_comboedit.h",
+      "xfa/fwl/cfwl_combolist.cpp",
+      "xfa/fwl/cfwl_combolist.h",
+      "xfa/fwl/cfwl_datetimeedit.cpp",
+      "xfa/fwl/cfwl_datetimeedit.h",
+      "xfa/fwl/cfwl_datetimepicker.cpp",
+      "xfa/fwl/cfwl_datetimepicker.h",
+      "xfa/fwl/cfwl_edit.cpp",
+      "xfa/fwl/cfwl_edit.h",
+      "xfa/fwl/cfwl_event.cpp",
+      "xfa/fwl/cfwl_event.h",
+      "xfa/fwl/cfwl_eventcheckword.cpp",
+      "xfa/fwl/cfwl_eventcheckword.h",
+      "xfa/fwl/cfwl_eventmouse.cpp",
+      "xfa/fwl/cfwl_eventmouse.h",
+      "xfa/fwl/cfwl_eventscroll.cpp",
+      "xfa/fwl/cfwl_eventscroll.h",
+      "xfa/fwl/cfwl_eventselectchanged.cpp",
+      "xfa/fwl/cfwl_eventselectchanged.h",
+      "xfa/fwl/cfwl_eventtarget.cpp",
+      "xfa/fwl/cfwl_eventtarget.h",
+      "xfa/fwl/cfwl_eventtextchanged.cpp",
+      "xfa/fwl/cfwl_eventtextchanged.h",
+      "xfa/fwl/cfwl_eventvalidate.cpp",
+      "xfa/fwl/cfwl_eventvalidate.h",
+      "xfa/fwl/cfwl_form.cpp",
+      "xfa/fwl/cfwl_form.h",
+      "xfa/fwl/cfwl_formproxy.cpp",
+      "xfa/fwl/cfwl_formproxy.h",
+      "xfa/fwl/cfwl_listbox.cpp",
+      "xfa/fwl/cfwl_listbox.h",
+      "xfa/fwl/cfwl_listitem.cpp",
+      "xfa/fwl/cfwl_listitem.h",
+      "xfa/fwl/cfwl_message.cpp",
+      "xfa/fwl/cfwl_message.h",
+      "xfa/fwl/cfwl_messagekey.cpp",
+      "xfa/fwl/cfwl_messagekey.h",
+      "xfa/fwl/cfwl_messagekillfocus.cpp",
+      "xfa/fwl/cfwl_messagekillfocus.h",
+      "xfa/fwl/cfwl_messagemouse.cpp",
+      "xfa/fwl/cfwl_messagemouse.h",
+      "xfa/fwl/cfwl_messagemousewheel.cpp",
+      "xfa/fwl/cfwl_messagemousewheel.h",
+      "xfa/fwl/cfwl_messagesetfocus.cpp",
+      "xfa/fwl/cfwl_messagesetfocus.h",
+      "xfa/fwl/cfwl_monthcalendar.cpp",
+      "xfa/fwl/cfwl_monthcalendar.h",
+      "xfa/fwl/cfwl_notedriver.cpp",
+      "xfa/fwl/cfwl_notedriver.h",
+      "xfa/fwl/cfwl_noteloop.cpp",
+      "xfa/fwl/cfwl_noteloop.h",
+      "xfa/fwl/cfwl_picturebox.cpp",
+      "xfa/fwl/cfwl_picturebox.h",
+      "xfa/fwl/cfwl_pushbutton.cpp",
+      "xfa/fwl/cfwl_pushbutton.h",
+      "xfa/fwl/cfwl_scrollbar.cpp",
+      "xfa/fwl/cfwl_scrollbar.h",
+      "xfa/fwl/cfwl_spinbutton.cpp",
+      "xfa/fwl/cfwl_spinbutton.h",
+      "xfa/fwl/cfwl_sysbtn.cpp",
+      "xfa/fwl/cfwl_sysbtn.h",
+      "xfa/fwl/cfwl_themebackground.h",
+      "xfa/fwl/cfwl_themepart.cpp",
+      "xfa/fwl/cfwl_themepart.h",
+      "xfa/fwl/cfwl_themetext.h",
+      "xfa/fwl/cfwl_timer.cpp",
+      "xfa/fwl/cfwl_timer.h",
+      "xfa/fwl/cfwl_timerinfo.cpp",
+      "xfa/fwl/cfwl_timerinfo.h",
+      "xfa/fwl/cfwl_widget.cpp",
+      "xfa/fwl/cfwl_widget.h",
+      "xfa/fwl/cfwl_widgetmgr.cpp",
+      "xfa/fwl/cfwl_widgetmgr.h",
+      "xfa/fwl/cfwl_widgetproperties.cpp",
+      "xfa/fwl/cfwl_widgetproperties.h",
+      "xfa/fwl/cfx_barcode.cpp",
+      "xfa/fwl/cfx_barcode.h",
+      "xfa/fwl/fwl_error.h",
+      "xfa/fwl/fwl_widgetdef.h",
+      "xfa/fwl/fwl_widgethit.h",
+      "xfa/fwl/ifwl_adaptertimermgr.h",
+      "xfa/fwl/ifwl_themeprovider.h",
+      "xfa/fwl/ifwl_widgetdelegate.h",
+      "xfa/fwl/ifwl_widgetmgrdelegate.h",
       "xfa/fwl/theme/cfwl_arrowdata.cpp",
       "xfa/fwl/theme/cfwl_arrowdata.h",
       "xfa/fwl/theme/cfwl_barcodetp.cpp",
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index ce037d902e..e077225b17 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   '+core',
   '+public',
   '+v8',
-  '+xfa/fwl/core',
+  '+xfa/fwl',
   '+xfa/fxbarcode',
   '+xfa/fxfa',
   '+xfa/fxgraphics',
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
index 11c560b53f..eff351b55d 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
@@ -13,8 +13,8 @@
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_xfawidget.h"
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/fwl_widgethit.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/fwl_widgethit.h"
 #include "xfa/fxfa/fxfa_basic.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 3904ba5300..fdb5635ff0 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/ifwl_adaptertimermgr.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/ifwl_adaptertimermgr.h"
 
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
diff --git a/xfa/fde/cfde_txtedtdorecord_deleterange.cpp b/xfa/fde/cfde_txtedtdorecord_deleterange.cpp
index d1682ddccd..df6387e084 100644
--- a/xfa/fde/cfde_txtedtdorecord_deleterange.cpp
+++ b/xfa/fde/cfde_txtedtdorecord_deleterange.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fde/cfde_txtedtdorecord_deleterange.h"
 
 #include "xfa/fde/cfde_txtedtengine.h"
-#include "xfa/fwl/core/cfwl_edit.h"
+#include "xfa/fwl/cfwl_edit.h"
 
 CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange(
     CFDE_TxtEdtEngine* pEngine,
diff --git a/xfa/fde/cfde_txtedtdorecord_insert.cpp b/xfa/fde/cfde_txtedtdorecord_insert.cpp
index e659f020ca..b80b15dff6 100644
--- a/xfa/fde/cfde_txtedtdorecord_insert.cpp
+++ b/xfa/fde/cfde_txtedtdorecord_insert.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fde/cfde_txtedtdorecord_insert.h"
 
 #include "xfa/fde/cfde_txtedtengine.h"
-#include "xfa/fwl/core/cfwl_edit.h"
+#include "xfa/fwl/cfwl_edit.h"
 
 CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(
     CFDE_TxtEdtEngine* pEngine,
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp
index 6e113e1738..ced5bdca52 100644
--- a/xfa/fde/cfde_txtedtengine.cpp
+++ b/xfa/fde/cfde_txtedtengine.cpp
@@ -18,7 +18,7 @@
 #include "xfa/fde/ifx_chariter.h"
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fgas/layout/fgas_textbreak.h"
-#include "xfa/fwl/core/cfwl_edit.h"
+#include "xfa/fwl/cfwl_edit.h"
 
 namespace {
 
diff --git a/xfa/fwl/core/cfwl_app.cpp b/xfa/fwl/cfwl_app.cpp
index fd4bb0816b..febc8a0fdf 100644
--- a/xfa/fwl/core/cfwl_app.cpp
+++ b/xfa/fwl/cfwl_app.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_app.h"
+#include "xfa/fwl/cfwl_app.h"
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 
 CFWL_App::CFWL_App(CXFA_FFApp* pAdapter)
diff --git a/xfa/fwl/core/cfwl_app.h b/xfa/fwl/cfwl_app.h
index 26b514aca7..c2779e8a25 100644
--- a/xfa/fwl/core/cfwl_app.h
+++ b/xfa/fwl/cfwl_app.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_APP_H_
-#define XFA_FWL_CORE_CFWL_APP_H_
+#ifndef XFA_FWL_CFWL_APP_H_
+#define XFA_FWL_CFWL_APP_H_
 
 #include <memory>
 
@@ -42,4 +42,4 @@ class CFWL_App {
   std::unique_ptr<CFWL_NoteDriver> m_pNoteDriver;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_APP_H_
+#endif  // XFA_FWL_CFWL_APP_H_
diff --git a/xfa/fwl/core/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp
index 8f5b08113c..83ab74a608 100644
--- a/xfa/fwl/core/cfwl_barcode.cpp
+++ b/xfa/fwl/cfwl_barcode.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_barcode.h"
+#include "xfa/fwl/cfwl_barcode.h"
 
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfx_barcode.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfx_barcode.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 CFWL_Barcode::CFWL_Barcode(const CFWL_App* app)
     : CFWL_Edit(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
diff --git a/xfa/fwl/core/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h
index 66b47ce3f0..2e9799172b 100644
--- a/xfa/fwl/core/cfwl_barcode.h
+++ b/xfa/fwl/cfwl_barcode.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_BARCODE_H_
-#define XFA_FWL_CORE_CFWL_BARCODE_H_
+#ifndef XFA_FWL_CFWL_BARCODE_H_
+#define XFA_FWL_CFWL_BARCODE_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_scrollbar.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxbarcode/BC_Library.h"
 
 class CFWL_WidgetProperties;
@@ -90,4 +90,4 @@ class CFWL_Barcode : public CFWL_Edit {
   uint32_t m_dwAttributeMask;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_BARCODE_H_
+#endif  // XFA_FWL_CFWL_BARCODE_H_
diff --git a/xfa/fwl/core/cfwl_caret.cpp b/xfa/fwl/cfwl_caret.cpp
index f9e26a7e9f..fdac8ec040 100644
--- a/xfa/fwl/core/cfwl_caret.cpp
+++ b/xfa/fwl/cfwl_caret.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_caret.h"
+#include "xfa/fwl/cfwl_caret.h"
 
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
diff --git a/xfa/fwl/core/cfwl_caret.h b/xfa/fwl/cfwl_caret.h
index aa718b7af3..e0c07d301a 100644
--- a/xfa/fwl/core/cfwl_caret.h
+++ b/xfa/fwl/cfwl_caret.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_CARET_H_
-#define XFA_FWL_CORE_CFWL_CARET_H_
+#ifndef XFA_FWL_CFWL_CARET_H_
+#define XFA_FWL_CFWL_CARET_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 
 class CFWL_WidgetProperties;
@@ -54,4 +54,4 @@ class CFWL_Caret : public CFWL_Widget {
   CFWL_TimerInfo* m_pTimerInfo;  // not owned.
 };
 
-#endif  // XFA_FWL_CORE_CFWL_CARET_H_
+#endif  // XFA_FWL_CFWL_CARET_H_
diff --git a/xfa/fwl/core/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
index 8d99d7acf5..2e37548954 100644
--- a/xfa/fwl/core/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_checkbox.h"
+#include "xfa/fwl/cfwl_checkbox.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,15 +12,15 @@
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
@@ -331,7 +331,7 @@ void CFWL_CheckBox::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown();
@@ -351,7 +351,7 @@ void CFWL_CheckBox::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
@@ -389,7 +389,7 @@ void CFWL_CheckBox::OnLButtonDown() {
   Repaint(&m_rtClient);
 }
 
-void CFWL_CheckBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_CheckBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (!m_bBtnDown)
     return;
 
@@ -402,7 +402,7 @@ void CFWL_CheckBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   NextStates();
 }
 
-void CFWL_CheckBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_CheckBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
@@ -448,7 +448,7 @@ void CFWL_CheckBox::OnMouseLeave() {
   Repaint(&m_rtBox);
 }
 
-void CFWL_CheckBox::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_CheckBox::OnKeyDown(CFWL_MessageKey* pMsg) {
   if (pMsg->m_dwKeyCode == FWL_VKEY_Tab)
     return;
   if (pMsg->m_dwKeyCode == FWL_VKEY_Return ||
diff --git a/xfa/fwl/core/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h
index f699aa0059..d228eee057 100644
--- a/xfa/fwl/core/cfwl_checkbox.h
+++ b/xfa/fwl/cfwl_checkbox.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_CHECKBOX_H_
-#define XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#ifndef XFA_FWL_CFWL_CHECKBOX_H_
+#define XFA_FWL_CFWL_CHECKBOX_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_CKB_Left (0L << 0)
 #define FWL_STYLEEXT_CKB_Center (1L << 0)
@@ -44,7 +44,7 @@
 #define FWL_STATE_CKB_Neutral (2 << (FWL_WGTSTATE_MAX + 2))
 #define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2))
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 class CFWL_Widget;
 
@@ -72,10 +72,10 @@ class CFWL_CheckBox : public CFWL_Widget {
   void NextStates();
   void OnFocusChanged(bool bSet);
   void OnLButtonDown();
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
   void OnMouseLeave();
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtBox;
@@ -87,4 +87,4 @@ class CFWL_CheckBox : public CFWL_Widget {
   FX_FLOAT m_fBoxHeight;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#endif  // XFA_FWL_CFWL_CHECKBOX_H_
diff --git a/xfa/fwl/core/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
index bfc3f32f46..90366979f4 100644
--- a/xfa/fwl/core/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_combobox.h"
 
 #include <algorithm>
 #include <memory>
@@ -13,22 +13,22 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 CFWL_ComboBox::CFWL_ComboBox(const CFWL_App* app)
     : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
@@ -527,7 +527,7 @@ void CFWL_ComboBox::ProcessSelChanged(bool bLButtonUp) {
     m_pEdit->SetSelected();
   }
 
-  CFWL_EvtSelectChanged ev(this);
+  CFWL_EventSelectChanged ev(this);
   ev.bLButtonUp = bLButtonUp;
   DispatchEvent(&ev);
 }
@@ -772,7 +772,7 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -792,7 +792,7 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key:
-      OnKey(static_cast<CFWL_MsgKey*>(pMessage));
+      OnKey(static_cast<CFWL_MessageKey*>(pMessage));
       break;
     default:
       break;
@@ -804,8 +804,8 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
 void CFWL_ComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   CFWL_Event::Type type = pEvent->GetType();
   if (type == CFWL_Event::Type::Scroll) {
-    CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
-    CFWL_EvtScroll pScrollEv(this);
+    CFWL_EventScroll* pScrollEvent = static_cast<CFWL_EventScroll*>(pEvent);
+    CFWL_EventScroll pScrollEv(this);
     pScrollEv.m_iScrollCode = pScrollEvent->m_iScrollCode;
     pScrollEv.m_fPos = pScrollEvent->m_fPos;
     DispatchEvent(&pScrollEv);
@@ -846,7 +846,7 @@ void CFWL_ComboBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   m_pEdit->ClearSelected();
 }
 
-void CFWL_ComboBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
@@ -866,7 +866,7 @@ void CFWL_ComboBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_ComboBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Hovered;
@@ -876,7 +876,7 @@ void CFWL_ComboBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtBtn);
 }
 
-void CFWL_ComboBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   int32_t iOldState = m_iBtnState;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iBtnState =
@@ -891,7 +891,7 @@ void CFWL_ComboBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboBox::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!IsDropListVisible() &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
@@ -900,7 +900,7 @@ void CFWL_ComboBox::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboBox::OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   if (dwKeyCode == FWL_VKEY_Tab)
     return;
@@ -908,7 +908,7 @@ void CFWL_ComboBox::OnKey(CFWL_MsgKey* pMsg) {
     DoSubCtrlKey(pMsg);
 }
 
-void CFWL_ComboBox::DoSubCtrlKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DoSubCtrlKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
@@ -969,7 +969,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     }
     case CFWL_Message::Type::Mouse: {
       backDefault = false;
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           DisForm_OnLButtonDown(pMsg);
@@ -984,7 +984,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     }
     case CFWL_Message::Type::Key: {
       backDefault = false;
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyUp)
         break;
       if (DisForm_IsDropListVisible() &&
@@ -1008,7 +1008,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     CFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg) {
   bool bDropDown = DisForm_IsDropListVisible();
   CFX_RectF& rtBtn = bDropDown ? m_rtBtn : m_rtClient;
   if (!rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
@@ -1027,18 +1027,18 @@ void CFWL_ComboBox::DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
     if ((m_pEdit->GetStates() & FWL_WGTSTATE_Focused) == 0) {
-      CFWL_MsgSetFocus msg(nullptr, m_pEdit.get());
+      CFWL_MessageSetFocus msg(nullptr, m_pEdit.get());
       m_pEdit->GetDelegate()->OnProcessMessage(&msg);
     }
   } else {
     m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
     DisForm_ShowDropList(false);
-    CFWL_MsgKillFocus msg(m_pEdit.get());
+    CFWL_MessageKillFocus msg(m_pEdit.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 }
 
-void CFWL_ComboBox::DisForm_OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DisForm_OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
diff --git a/xfa/fwl/core/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h
index 26c54b5377..9927b65c04 100644
--- a/xfa/fwl/core/cfwl_combobox.h
+++ b/xfa/fwl/cfwl_combobox.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOBOX_H_
-#define XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#ifndef XFA_FWL_CFWL_COMBOBOX_H_
+#define XFA_FWL_CFWL_COMBOBOX_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_comboboxproxy.h"
-#include "xfa/fwl/core/cfwl_comboedit.h"
-#include "xfa/fwl/core/cfwl_combolist.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_comboboxproxy.h"
+#include "xfa/fwl/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_combolist.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_listbox.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
 class CFWL_WidgetProperties;
@@ -127,12 +127,12 @@ class CFWL_ComboBox : public CFWL_Widget {
   void ResetListItemAlignment();
   void InitProxyForm();
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnKey(CFWL_MsgKey* pMsg);
-  void DoSubCtrlKey(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKey(CFWL_MessageKey* pMsg);
+  void DoSubCtrlKey(CFWL_MessageKey* pMsg);
 
   void DisForm_InitComboList();
   void DisForm_InitComboEdit();
@@ -148,9 +148,9 @@ class CFWL_ComboBox : public CFWL_Widget {
   CFX_RectF DisForm_GetBBox() const;
   void DisForm_Layout();
   void DisForm_OnProcessMessage(CFWL_Message* pMessage);
-  void DisForm_OnLButtonDown(CFWL_MsgMouse* pMsg);
+  void DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg);
   void DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void DisForm_OnKey(CFWL_MsgKey* pMsg);
+  void DisForm_OnKey(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtContent;
@@ -169,4 +169,4 @@ class CFWL_ComboBox : public CFWL_Widget {
   FX_FLOAT m_fItemHeight;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#endif  // XFA_FWL_CFWL_COMBOBOX_H_
diff --git a/xfa/fwl/core/cfwl_comboboxproxy.cpp b/xfa/fwl/cfwl_comboboxproxy.cpp
index b7c56378cf..7bf311d198 100644
--- a/xfa/fwl/core/cfwl_comboboxproxy.cpp
+++ b/xfa/fwl/cfwl_comboboxproxy.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_comboboxproxy.h"
+#include "xfa/fwl/cfwl_comboboxproxy.h"
 
 #include <memory>
 #include <utility>
 
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 
 CFWL_ComboBoxProxy::CFWL_ComboBoxProxy(
     CFWL_ComboBox* pComboBox,
@@ -33,7 +33,7 @@ void CFWL_ComboBoxProxy::OnProcessMessage(CFWL_Message* pMessage) {
 
   switch (pMessage->GetType()) {
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -73,7 +73,7 @@ void CFWL_ComboBoxProxy::OnLButtonDown(CFWL_Message* pMessage) {
   CFX_RectF rtWidget = GetWidgetRect();
   rtWidget.left = rtWidget.top = 0;
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (rtWidget.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_bLButtonDown = true;
     pDriver->SetGrab(this, true);
@@ -98,7 +98,7 @@ void CFWL_ComboBoxProxy::OnLButtonUp(CFWL_Message* pMessage) {
     return;
   }
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   CFX_RectF rect = GetWidgetRect();
   rect.left = rect.top = 0;
   if (!rect.Contains(pMsg->m_fx, pMsg->m_fy) &&
@@ -111,7 +111,7 @@ void CFWL_ComboBoxProxy::OnFocusChanged(CFWL_Message* pMessage, bool bSet) {
   if (bSet)
     return;
 
-  CFWL_MsgKillFocus* pMsg = static_cast<CFWL_MsgKillFocus*>(pMessage);
+  CFWL_MessageKillFocus* pMsg = static_cast<CFWL_MessageKillFocus*>(pMessage);
   if (!pMsg->m_pSetFocus)
     m_pComboBox->ShowDropList(false);
 }
diff --git a/xfa/fwl/core/cfwl_comboboxproxy.h b/xfa/fwl/cfwl_comboboxproxy.h
index 11fb364cdc..4be14b9e65 100644
--- a/xfa/fwl/core/cfwl_comboboxproxy.h
+++ b/xfa/fwl/cfwl_comboboxproxy.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
-#define XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
+#ifndef XFA_FWL_CFWL_COMBOBOXPROXY_H_
+#define XFA_FWL_CFWL_COMBOBOXPROXY_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_formproxy.h"
 
 class CFWL_ComboBox;
 
@@ -38,4 +38,4 @@ class CFWL_ComboBoxProxy : public CFWL_FormProxy {
   CFWL_ComboBox* m_pComboBox;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOBOXPROXY_H_
+#endif  // XFA_FWL_CFWL_COMBOBOXPROXY_H_
diff --git a/xfa/fwl/core/cfwl_comboedit.cpp b/xfa/fwl/cfwl_comboedit.cpp
index 8ee9da6f14..5981fd79b4 100644
--- a/xfa/fwl/core/cfwl_comboedit.cpp
+++ b/xfa/fwl/cfwl_comboedit.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_comboedit.h"
 
 #include <memory>
 #include <utility>
 
 #include "xfa/fde/cfde_txtedtengine.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
 
 CFWL_ComboEdit::CFWL_ComboEdit(
     const CFWL_App* app,
@@ -59,7 +59,7 @@ void CFWL_ComboEdit::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
           ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
         SetSelected();
diff --git a/xfa/fwl/core/cfwl_comboedit.h b/xfa/fwl/cfwl_comboedit.h
index 5ac6082a50..efdabd3669 100644
--- a/xfa/fwl/core/cfwl_comboedit.h
+++ b/xfa/fwl/cfwl_comboedit.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOEDIT_H_
-#define XFA_FWL_CORE_CFWL_COMBOEDIT_H_
+#ifndef XFA_FWL_CFWL_COMBOEDIT_H_
+#define XFA_FWL_CFWL_COMBOEDIT_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 class CFWL_ComboBox;
 
@@ -32,4 +32,4 @@ class CFWL_ComboEdit : public CFWL_Edit {
   CFWL_ComboBox* m_pOuter;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOEDIT_H_
+#endif  // XFA_FWL_CFWL_COMBOEDIT_H_
diff --git a/xfa/fwl/core/cfwl_combolist.cpp b/xfa/fwl/cfwl_combolist.cpp
index ff7bd2722c..4ec3abe072 100644
--- a/xfa/fwl/core/cfwl_combolist.cpp
+++ b/xfa/fwl/cfwl_combolist.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_combolist.h"
+#include "xfa/fwl/cfwl_combolist.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_comboedit.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
 
 CFWL_ComboList::CFWL_ComboList(
     const CFWL_App* app,
@@ -83,7 +83,7 @@ void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
       type == CFWL_Message::Type::KillFocus) {
     OnDropListFocusChanged(pMessage, type == CFWL_Message::Type::SetFocus);
   } else if (type == CFWL_Message::Type::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+    CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
     CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect = vertSB->GetWidgetRect();
@@ -114,7 +114,7 @@ void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
         break;
     }
   } else if (type == CFWL_Message::Type::Key) {
-    backDefault = !OnDropListKey(static_cast<CFWL_MsgKey*>(pMessage));
+    backDefault = !OnDropListKey(static_cast<CFWL_MessageKey*>(pMessage));
   }
   if (backDefault)
     CFWL_ListBox::OnProcessMessage(pMessage);
@@ -124,7 +124,7 @@ void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet)
     return;
 
-  CFWL_MsgKillFocus* pKill = static_cast<CFWL_MsgKillFocus*>(pMsg);
+  CFWL_MessageKillFocus* pKill = static_cast<CFWL_MessageKillFocus*>(pMsg);
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (pKill->m_pSetFocus == m_pOuter ||
       pKill->m_pSetFocus == pOuter->GetComboEdit()) {
@@ -132,7 +132,7 @@ void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   }
 }
 
-void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListMouseMove(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
     if (m_bNotifyOwner)
       m_bNotifyOwner = false;
@@ -156,7 +156,7 @@ void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonDown(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
@@ -164,7 +164,7 @@ void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
   pOuter->ShowDropList(false);
 }
 
-void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonUp(CFWL_MessageMouse* pMsg) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
@@ -185,7 +185,7 @@ void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
     pOuter->ProcessSelChanged(true);
 }
 
-bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
+bool CFWL_ComboList::OnDropListKey(CFWL_MessageKey* pKey) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   bool bPropagate = false;
   if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
@@ -218,7 +218,7 @@ bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
   return false;
 }
 
-void CFWL_ComboList::OnDropListKeyDown(CFWL_MsgKey* pKey) {
+void CFWL_ComboList::OnDropListKeyDown(CFWL_MessageKey* pKey) {
   uint32_t dwKeyCode = pKey->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Up:
diff --git a/xfa/fwl/core/cfwl_combolist.h b/xfa/fwl/cfwl_combolist.h
index 0c1cd579b0..e1d5fd9b24 100644
--- a/xfa/fwl/core/cfwl_combolist.h
+++ b/xfa/fwl/cfwl_combolist.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOLIST_H_
-#define XFA_FWL_CORE_CFWL_COMBOLIST_H_
+#ifndef XFA_FWL_CFWL_COMBOLIST_H_
+#define XFA_FWL_CFWL_COMBOLIST_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 class CFWL_ComboList : public CFWL_ListBox {
  public:
@@ -31,13 +31,13 @@ class CFWL_ComboList : public CFWL_ListBox {
  private:
   void ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy);
   void OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnDropListMouseMove(CFWL_MsgMouse* pMsg);
-  void OnDropListLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnDropListLButtonUp(CFWL_MsgMouse* pMsg);
-  bool OnDropListKey(CFWL_MsgKey* pKey);
-  void OnDropListKeyDown(CFWL_MsgKey* pKey);
+  void OnDropListMouseMove(CFWL_MessageMouse* pMsg);
+  void OnDropListLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnDropListLButtonUp(CFWL_MessageMouse* pMsg);
+  bool OnDropListKey(CFWL_MessageKey* pKey);
+  void OnDropListKeyDown(CFWL_MessageKey* pKey);
 
   bool m_bNotifyOwner;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOLIST_H_
+#endif  // XFA_FWL_CFWL_COMBOLIST_H_
diff --git a/xfa/fwl/core/cfwl_datetimeedit.cpp b/xfa/fwl/cfwl_datetimeedit.cpp
index 37d79b6024..869f08ad33 100644
--- a/xfa/fwl/core/cfwl_datetimeedit.cpp
+++ b/xfa/fwl/cfwl_datetimeedit.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_datetimeedit.h"
+#include "xfa/fwl/cfwl_datetimeedit.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 
 CFWL_DateTimeEdit::CFWL_DateTimeEdit(
     const CFWL_App* app,
@@ -41,7 +41,7 @@ void CFWL_DateTimeEdit::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     return;
   }
 
-  CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
   if (pMouse->m_dwCmd == FWL_MouseCommand::LeftButtonDown ||
       pMouse->m_dwCmd == FWL_MouseCommand::RightButtonDown) {
     if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
diff --git a/xfa/fwl/core/cfwl_datetimeedit.h b/xfa/fwl/cfwl_datetimeedit.h
index 15fea74286..bde14ddf49 100644
--- a/xfa/fwl/core/cfwl_datetimeedit.h
+++ b/xfa/fwl/cfwl_datetimeedit.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
-#define XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
+#ifndef XFA_FWL_CFWL_DATETIMEEDIT_H_
+#define XFA_FWL_CFWL_DATETIMEEDIT_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
+#include "xfa/fwl/fwl_error.h"
 
 class CFWL_DateTimeEdit : public CFWL_Edit {
  public:
@@ -27,4 +27,4 @@ class CFWL_DateTimeEdit : public CFWL_Edit {
   void DisForm_OnProcessMessage(CFWL_Message* pMessage);
 };
 
-#endif  // XFA_FWL_CORE_CFWL_DATETIMEEDIT_H_
+#endif  // XFA_FWL_CFWL_DATETIMEEDIT_H_
diff --git a/xfa/fwl/core/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index 63f8955a0e..8bc17f3c57 100644
--- a/xfa/fwl/core/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_spinbutton.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_spinbutton.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
@@ -329,7 +329,7 @@ void CFWL_DateTimePicker::ProcessSelChanged(int32_t iYear,
   m_pEdit->Update();
   Repaint(&m_rtClient);
 
-  CFWL_EvtSelectChanged ev(this);
+  CFWL_EventSelectChanged ev(this);
   ev.iYear = m_iYear;
   ev.iMonth = m_iMonth;
   ev.iDay = m_iDay;
@@ -382,7 +382,7 @@ void CFWL_DateTimePicker::DisForm_ShowMonthCalendar(bool bActivate) {
     m_pMonthCal->SetStates(FWL_WGTSTATE_Invisible);
 
   if (bActivate) {
-    CFWL_MsgSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
+    CFWL_MessageSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 
@@ -497,7 +497,7 @@ void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMouse->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMouse);
@@ -554,7 +554,7 @@ void CFWL_DateTimePicker::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_DateTimePicker::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
@@ -573,7 +573,7 @@ void CFWL_DateTimePicker::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_DateTimePicker::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
 
@@ -585,13 +585,13 @@ void CFWL_DateTimePicker::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtBtn);
 }
 
-void CFWL_DateTimePicker::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (!m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Normal;
   Repaint(&m_rtBtn);
 }
 
-void CFWL_DateTimePicker::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   m_iBtnState = CFWL_PartState_Normal;
diff --git a/xfa/fwl/core/cfwl_datetimepicker.h b/xfa/fwl/cfwl_datetimepicker.h
index e88cdc2f96..7ddb4c248d 100644
--- a/xfa/fwl/core/cfwl_datetimepicker.h
+++ b/xfa/fwl/cfwl_datetimepicker.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
-#define XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
+#ifndef XFA_FWL_CFWL_DATETIMEPICKER_H_
+#define XFA_FWL_CFWL_DATETIMEPICKER_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_datetimeedit.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_monthcalendar.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_datetimeedit.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_monthcalendar.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0)
 #define FWL_STYLEEXT_DTP_LongDateFormat (0L << 1)
@@ -82,10 +82,10 @@ class CFWL_DateTimePicker : public CFWL_Widget {
   void ResetEditAlignment();
   void InitProxyForm();
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
 
   bool DisForm_IsMonthCalendarVisible() const;
   void DisForm_ShowMonthCalendar(bool bActivate);
@@ -109,4 +109,4 @@ class CFWL_DateTimePicker : public CFWL_Widget {
   FX_FLOAT m_fBtn;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
+#endif  // XFA_FWL_CFWL_DATETIMEPICKER_H_
diff --git a/xfa/fwl/core/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index c6c0ce29ba..321303942e 100644
--- a/xfa/fwl/core/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_edit.h"
+#include "xfa/fwl/cfwl_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ -18,18 +18,18 @@
 #include "xfa/fde/fde_render.h"
 #include "xfa/fde/ifde_txtedtpage.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_caret.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtcheckword.h"
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
-#include "xfa/fwl/core/cfwl_evtvalidate.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_caret.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventcheckword.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
+#include "xfa/fwl/cfwl_eventvalidate.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxfa/xfa_ffdoc.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 #include "xfa/fxgraphics/cfx_path.h"
@@ -194,7 +194,7 @@ void CFWL_Edit::DrawSpellCheck(CFX_Graphics* pGraphics,
     pGraphics->ConcatMatrix(const_cast<CFX_Matrix*>(pMatrix));
 
   CFX_Color crLine(0xFFFF0000);
-  CFWL_EvtCheckWord checkWordEvent(this);
+  CFWL_EventCheckWord checkWordEvent(this);
 
   CFX_ByteString sLatinWord;
   CFX_Path pathSpell;
@@ -440,7 +440,7 @@ void CFWL_Edit::OnTextChanged(const FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo) {
   CFX_RectF rtTemp;
   GetClientRect(rtTemp);
 
-  CFWL_EvtTextChanged event(this);
+  CFWL_EventTextChanged event(this);
   event.wsPrevText = ChangeInfo.wsPrevText;
   DispatchEvent(&event);
 
@@ -481,7 +481,7 @@ bool CFWL_Edit::OnValidate(const CFX_WideString& wsText) {
   if (!pDst)
     pDst = this;
 
-  CFWL_EvtValidate event(this);
+  CFWL_EventValidate event(this);
   event.wsInsert = wsText;
   event.bValidate = true;
   DispatchEvent(&event);
@@ -1286,7 +1286,7 @@ void CFWL_Edit::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -1309,7 +1309,7 @@ void CFWL_Edit::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       else if (pKey->m_dwCmd == FWL_KeyCommand::Char)
@@ -1331,7 +1331,7 @@ void CFWL_Edit::OnProcessEvent(CFWL_Event* pEvent) {
   CFWL_Widget* pSrcTarget = pEvent->m_pSrcTarget;
   if ((pSrcTarget == m_pVertScrollBar.get() && m_pVertScrollBar) ||
       (pSrcTarget == m_pHorzScrollBar.get() && m_pHorzScrollBar)) {
-    CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
+    CFWL_EventScroll* pScrollEvent = static_cast<CFWL_EventScroll*>(pEvent);
     OnScroll(static_cast<CFWL_ScrollBar*>(pSrcTarget),
              pScrollEvent->m_iScrollCode, pScrollEvent->m_fPos);
   }
@@ -1342,7 +1342,7 @@ void CFWL_Edit::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_Edit::DoButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_Edit::DoButtonDown(CFWL_MessageMouse* pMsg) {
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
     SetFocus(true);
 
@@ -1394,7 +1394,7 @@ void CFWL_Edit::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&rtInvalidate);
 }
 
-void CFWL_Edit::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_Edit::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
@@ -1420,12 +1420,12 @@ void CFWL_Edit::OnLButtonDown(CFWL_MsgMouse* pMsg) {
     Repaint(&m_rtEngine);
 }
 
-void CFWL_Edit::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_Edit::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   SetGrab(false);
 }
 
-void CFWL_Edit::OnButtonDblClk(CFWL_MsgMouse* pMsg) {
+void CFWL_Edit::OnButtonDblClk(CFWL_MessageMouse* pMsg) {
   IFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(0);
   if (!pPage)
     return;
@@ -1442,7 +1442,7 @@ void CFWL_Edit::OnButtonDblClk(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtEngine);
 }
 
-void CFWL_Edit::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_Edit::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_nSelStart == -1 || !m_bLButtonDown)
     return;
 
@@ -1469,7 +1469,7 @@ void CFWL_Edit::OnMouseMove(CFWL_MsgMouse* pMsg) {
                           FXSYS_abs(nIndex - m_nSelStart));
 }
 
-void CFWL_Edit::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_Edit::OnKeyDown(CFWL_MessageKey* pMsg) {
   FDE_TXTEDTMOVECARET MoveCaret = MC_MoveNone;
   bool bShift = !!(pMsg->m_dwFlags & FWL_KEYFLAG_Shift);
   bool bCtrl = !!(pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl);
@@ -1523,7 +1523,7 @@ void CFWL_Edit::OnKeyDown(CFWL_MsgKey* pMsg) {
     m_EdtEngine.MoveCaretPos(MoveCaret, bShift, bCtrl);
 }
 
-void CFWL_Edit::OnChar(CFWL_MsgKey* pMsg) {
+void CFWL_Edit::OnChar(CFWL_MessageKey* pMsg) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly) ||
       (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)) {
     return;
@@ -1578,54 +1578,54 @@ void CFWL_Edit::OnChar(CFWL_MsgKey* pMsg) {
 }
 
 bool CFWL_Edit::OnScroll(CFWL_ScrollBar* pScrollBar,
-                         CFWL_EvtScroll::Code dwCode,
+                         CFWL_EventScroll::Code dwCode,
                          FX_FLOAT fPos) {
   CFX_SizeF fs;
   pScrollBar->GetRange(&fs.x, &fs.y);
   FX_FLOAT iCurPos = pScrollBar->GetPos();
   FX_FLOAT fStep = pScrollBar->GetStepSize();
   switch (dwCode) {
-    case CFWL_EvtScroll::Code::Min: {
+    case CFWL_EventScroll::Code::Min: {
       fPos = fs.x;
       break;
     }
-    case CFWL_EvtScroll::Code::Max: {
+    case CFWL_EventScroll::Code::Max: {
       fPos = fs.y;
       break;
     }
-    case CFWL_EvtScroll::Code::StepBackward: {
+    case CFWL_EventScroll::Code::StepBackward: {
       fPos -= fStep;
       if (fPos < fs.x + fStep / 2) {
         fPos = fs.x;
       }
       break;
     }
-    case CFWL_EvtScroll::Code::StepForward: {
+    case CFWL_EventScroll::Code::StepForward: {
       fPos += fStep;
       if (fPos > fs.y - fStep / 2) {
         fPos = fs.y;
       }
       break;
     }
-    case CFWL_EvtScroll::Code::PageBackward: {
+    case CFWL_EventScroll::Code::PageBackward: {
       fPos -= pScrollBar->GetPageSize();
       if (fPos < fs.x) {
         fPos = fs.x;
       }
       break;
     }
-    case CFWL_EvtScroll::Code::PageForward: {
+    case CFWL_EventScroll::Code::PageForward: {
       fPos += pScrollBar->GetPageSize();
       if (fPos > fs.y) {
         fPos = fs.y;
       }
       break;
     }
-    case CFWL_EvtScroll::Code::Pos:
-    case CFWL_EvtScroll::Code::TrackPos:
-    case CFWL_EvtScroll::Code::None:
+    case CFWL_EventScroll::Code::Pos:
+    case CFWL_EventScroll::Code::TrackPos:
+    case CFWL_EventScroll::Code::None:
       break;
-    case CFWL_EvtScroll::Code::EndScroll:
+    case CFWL_EventScroll::Code::EndScroll:
       return false;
   }
   if (iCurPos == fPos)
diff --git a/xfa/fwl/core/cfwl_edit.h b/xfa/fwl/cfwl_edit.h
index d31f148cd0..f975bb2ba4 100644
--- a/xfa/fwl/core/cfwl_edit.h
+++ b/xfa/fwl/cfwl_edit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EDIT_H_
-#define XFA_FWL_CORE_CFWL_EDIT_H_
+#ifndef XFA_FWL_CFWL_EDIT_H_
+#define XFA_FWL_CFWL_EDIT_H_
 
 #include <deque>
 #include <memory>
@@ -13,9 +13,9 @@
 
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/ifde_txtedtdorecord.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_scrollbar.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
 #define FWL_STYLEEXT_EDT_ReadOnly (1L << 0)
@@ -52,7 +52,7 @@
 
 class IFDE_TxtEdtDoRecord;
 class CFWL_Edit;
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 class CFWL_Caret;
 
@@ -153,16 +153,16 @@ class CFWL_Edit : public CFWL_Widget {
                         FX_FLOAT fOffSetX,
                         FX_FLOAT fOffSetY);
 
-  void DoButtonDown(CFWL_MsgMouse* pMsg);
+  void DoButtonDown(CFWL_MessageMouse* pMsg);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnButtonDblClk(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
-  void OnChar(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnButtonDblClk(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
+  void OnChar(CFWL_MessageKey* pMsg);
   bool OnScroll(CFWL_ScrollBar* pScrollBar,
-                CFWL_EvtScroll::Code dwCode,
+                CFWL_EventScroll::Code dwCode,
                 FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
@@ -188,4 +188,4 @@ class CFWL_Edit : public CFWL_Widget {
   int32_t m_iMaxRecord;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EDIT_H_
+#endif  // XFA_FWL_CFWL_EDIT_H_
diff --git a/xfa/fwl/core/cfwl_event.cpp b/xfa/fwl/cfwl_event.cpp
index d598f6974a..827ecccc10 100644
--- a/xfa/fwl/core/cfwl_event.cpp
+++ b/xfa/fwl/cfwl_event.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
 CFWL_Event::CFWL_Event(CFWL_Event::Type type)
     : CFWL_Event(type, nullptr, nullptr) {}
diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/cfwl_event.h
index aa435e54b2..9a9f30ab47 100644
--- a/xfa/fwl/core/cfwl_event.h
+++ b/xfa/fwl/cfwl_event.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVENT_H_
-#define XFA_FWL_CORE_CFWL_EVENT_H_
+#ifndef XFA_FWL_CFWL_EVENT_H_
+#define XFA_FWL_CFWL_EVENT_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/fwl_error.h"
 
 class CFX_Graphics;
 class CFWL_Widget;
@@ -49,4 +49,4 @@ class CFWL_Event {
   Type m_type;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVENT_H_
+#endif  // XFA_FWL_CFWL_EVENT_H_
diff --git a/xfa/fwl/core/cfwl_evtcheckword.cpp b/xfa/fwl/cfwl_eventcheckword.cpp
index 88bdcf6760..fb0ce6e77e 100644
--- a/xfa/fwl/core/cfwl_evtcheckword.cpp
+++ b/xfa/fwl/cfwl_eventcheckword.cpp
@@ -4,10 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evtcheckword.h"
+#include "xfa/fwl/cfwl_eventcheckword.h"
 
-CFWL_EvtCheckWord::CFWL_EvtCheckWord(CFWL_Widget* pSrcTarget)
+CFWL_EventCheckWord::CFWL_EventCheckWord(CFWL_Widget* pSrcTarget)
     : CFWL_Event(CFWL_Event::Type::CheckWord, pSrcTarget) {}
 
-CFWL_EvtCheckWord::~CFWL_EvtCheckWord() {}
-
+CFWL_EventCheckWord::~CFWL_EventCheckWord() {}
diff --git a/xfa/fwl/core/cfwl_evtcheckword.h b/xfa/fwl/cfwl_eventcheckword.h
index aa853c6a8f..3de1e75c24 100644
--- a/xfa/fwl/core/cfwl_evtcheckword.h
+++ b/xfa/fwl/cfwl_eventcheckword.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVTCHECKWORD_H_
-#define XFA_FWL_CORE_CFWL_EVTCHECKWORD_H_
+#ifndef XFA_FWL_CFWL_EVENTCHECKWORD_H_
+#define XFA_FWL_CFWL_EVENTCHECKWORD_H_
 
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
-class CFWL_EvtCheckWord : public CFWL_Event {
+class CFWL_EventCheckWord : public CFWL_Event {
  public:
-  explicit CFWL_EvtCheckWord(CFWL_Widget* pSrcTarget);
-  ~CFWL_EvtCheckWord() override;
+  explicit CFWL_EventCheckWord(CFWL_Widget* pSrcTarget);
+  ~CFWL_EventCheckWord() override;
 
   CFX_ByteString bsWord;
   bool bCheckWord;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVTCHECKWORD_H_
+#endif  // XFA_FWL_CFWL_EVENTCHECKWORD_H_
diff --git a/xfa/fwl/core/cfwl_evtmouse.cpp b/xfa/fwl/cfwl_eventmouse.cpp
index 8bfce8a9c5..3f8c7734c4 100644
--- a/xfa/fwl/core/cfwl_evtmouse.cpp
+++ b/xfa/fwl/cfwl_eventmouse.cpp
@@ -4,12 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evtmouse.h"
+#include "xfa/fwl/cfwl_eventmouse.h"
 
-CFWL_EvtMouse::CFWL_EvtMouse(CFWL_Widget* pSrcTarget)
-    : CFWL_EvtMouse(pSrcTarget, nullptr) {}
+CFWL_EventMouse::CFWL_EventMouse(CFWL_Widget* pSrcTarget)
+    : CFWL_EventMouse(pSrcTarget, nullptr) {}
 
-CFWL_EvtMouse::CFWL_EvtMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget)
+CFWL_EventMouse::CFWL_EventMouse(CFWL_Widget* pSrcTarget,
+                                 CFWL_Widget* pDstTarget)
     : CFWL_Event(CFWL_Event::Type::Mouse, pSrcTarget, pDstTarget) {}
 
-CFWL_EvtMouse::~CFWL_EvtMouse() {}
+CFWL_EventMouse::~CFWL_EventMouse() {}
diff --git a/xfa/fwl/cfwl_eventmouse.h b/xfa/fwl/cfwl_eventmouse.h
new file mode 100644
index 0000000000..a5caa93959
--- /dev/null
+++ b/xfa/fwl/cfwl_eventmouse.h
@@ -0,0 +1,21 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FWL_CFWL_EVENTMOUSE_H_
+#define XFA_FWL_CFWL_EVENTMOUSE_H_
+
+#include "xfa/fwl/cfwl_event.h"
+
+class CFWL_EventMouse : public CFWL_Event {
+ public:
+  explicit CFWL_EventMouse(CFWL_Widget* pSrcTarget);
+  CFWL_EventMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_EventMouse() override;
+
+  FWL_MouseCommand m_dwCmd;
+};
+
+#endif  // XFA_FWL_CFWL_EVENTMOUSE_H_
diff --git a/xfa/fwl/core/cfwl_evtscroll.cpp b/xfa/fwl/cfwl_eventscroll.cpp
index 00ca57eb84..0e9e26c1cb 100644
--- a/xfa/fwl/core/cfwl_evtscroll.cpp
+++ b/xfa/fwl/cfwl_eventscroll.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evtscroll.h"
+#include "xfa/fwl/cfwl_eventscroll.h"
 
-CFWL_EvtScroll::CFWL_EvtScroll(CFWL_Widget* pSrcTarget)
+CFWL_EventScroll::CFWL_EventScroll(CFWL_Widget* pSrcTarget)
     : CFWL_Event(CFWL_Event::Type::Scroll, pSrcTarget) {}
 
-CFWL_EvtScroll::~CFWL_EvtScroll() {}
+CFWL_EventScroll::~CFWL_EventScroll() {}
diff --git a/xfa/fwl/core/cfwl_evtscroll.h b/xfa/fwl/cfwl_eventscroll.h
index 64ee7815f6..2fdef9e7b1 100644
--- a/xfa/fwl/core/cfwl_evtscroll.h
+++ b/xfa/fwl/cfwl_eventscroll.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVTSCROLL_H_
-#define XFA_FWL_CORE_CFWL_EVTSCROLL_H_
+#ifndef XFA_FWL_CFWL_EVENTSCROLL_H_
+#define XFA_FWL_CFWL_EVENTSCROLL_H_
 
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
-class CFWL_EvtScroll : public CFWL_Event {
+class CFWL_EventScroll : public CFWL_Event {
  public:
   enum class Code {
     None = 1,
@@ -24,11 +24,11 @@ class CFWL_EvtScroll : public CFWL_Event {
     EndScroll,
   };
 
-  explicit CFWL_EvtScroll(CFWL_Widget* pSrcTarget);
-  ~CFWL_EvtScroll() override;
+  explicit CFWL_EventScroll(CFWL_Widget* pSrcTarget);
+  ~CFWL_EventScroll() override;
 
   Code m_iScrollCode;
   FX_FLOAT m_fPos;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVTSCROLL_H_
+#endif  // XFA_FWL_CFWL_EVENTSCROLL_H_
diff --git a/xfa/fwl/core/cfwl_evtselectchanged.cpp b/xfa/fwl/cfwl_eventselectchanged.cpp
index 811fc9490f..bc6859590b 100644
--- a/xfa/fwl/core/cfwl_evtselectchanged.cpp
+++ b/xfa/fwl/cfwl_eventselectchanged.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
 
-CFWL_EvtSelectChanged::CFWL_EvtSelectChanged(CFWL_Widget* pSrcTarget)
+CFWL_EventSelectChanged::CFWL_EventSelectChanged(CFWL_Widget* pSrcTarget)
     : CFWL_Event(CFWL_Event::Type::SelectChanged, pSrcTarget) {}
 
-CFWL_EvtSelectChanged::~CFWL_EvtSelectChanged() {}
+CFWL_EventSelectChanged::~CFWL_EventSelectChanged() {}
diff --git a/xfa/fwl/core/cfwl_evtselectchanged.h b/xfa/fwl/cfwl_eventselectchanged.h
index 94381c7063..30f1e2d5c7 100644
--- a/xfa/fwl/core/cfwl_evtselectchanged.h
+++ b/xfa/fwl/cfwl_eventselectchanged.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVTSELECTCHANGED_H_
-#define XFA_FWL_CORE_CFWL_EVTSELECTCHANGED_H_
+#ifndef XFA_FWL_CFWL_EVENTSELECTCHANGED_H_
+#define XFA_FWL_CFWL_EVENTSELECTCHANGED_H_
 
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
-class CFWL_EvtSelectChanged : public CFWL_Event {
+class CFWL_EventSelectChanged : public CFWL_Event {
  public:
-  explicit CFWL_EvtSelectChanged(CFWL_Widget* pSrcTarget);
-  ~CFWL_EvtSelectChanged() override;
+  explicit CFWL_EventSelectChanged(CFWL_Widget* pSrcTarget);
+  ~CFWL_EventSelectChanged() override;
 
   // Used by ComboBox.
   bool bLButtonUp;
@@ -23,4 +23,4 @@ class CFWL_EvtSelectChanged : public CFWL_Event {
   int32_t iDay;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVTSELECTCHANGED_H_
+#endif  // XFA_FWL_CFWL_EVENTSELECTCHANGED_H_
diff --git a/xfa/fwl/core/cfwl_eventtarget.cpp b/xfa/fwl/cfwl_eventtarget.cpp
index 34377c2d73..55f8e1fc78 100644
--- a/xfa/fwl/core/cfwl_eventtarget.cpp
+++ b/xfa/fwl/cfwl_eventtarget.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_eventtarget.h"
+#include "xfa/fwl/cfwl_eventtarget.h"
 
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_widgetdelegate.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_widgetdelegate.h"
 
 CFWL_EventTarget::CFWL_EventTarget(CFWL_Widget* pListener)
     : m_pListener(pListener), m_bInvalid(false) {}
diff --git a/xfa/fwl/core/cfwl_eventtarget.h b/xfa/fwl/cfwl_eventtarget.h
index 5f0ee35b9b..1bca97232c 100644
--- a/xfa/fwl/core/cfwl_eventtarget.h
+++ b/xfa/fwl/cfwl_eventtarget.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVENTTARGET_H_
-#define XFA_FWL_CORE_CFWL_EVENTTARGET_H_
+#ifndef XFA_FWL_CFWL_EVENTTARGET_H_
+#define XFA_FWL_CFWL_EVENTTARGET_H_
 
 #include <set>
 
 #include "core/fxcrt/fx_basic.h"
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
 class CFWL_Event;
 class CFWL_Widget;
@@ -32,4 +32,4 @@ class CFWL_EventTarget {
   bool m_bInvalid;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVENTTARGET_H_
+#endif  // XFA_FWL_CFWL_EVENTTARGET_H_
diff --git a/xfa/fwl/core/cfwl_evttextchanged.cpp b/xfa/fwl/cfwl_eventtextchanged.cpp
index d21dd037c1..439d99d927 100644
--- a/xfa/fwl/core/cfwl_evttextchanged.cpp
+++ b/xfa/fwl/cfwl_eventtextchanged.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
 
-CFWL_EvtTextChanged::CFWL_EvtTextChanged(CFWL_Widget* pSrcTarget)
+CFWL_EventTextChanged::CFWL_EventTextChanged(CFWL_Widget* pSrcTarget)
     : CFWL_Event(CFWL_Event::Type::TextChanged, pSrcTarget) {}
 
-CFWL_EvtTextChanged::~CFWL_EvtTextChanged() {}
+CFWL_EventTextChanged::~CFWL_EventTextChanged() {}
diff --git a/xfa/fwl/cfwl_eventtextchanged.h b/xfa/fwl/cfwl_eventtextchanged.h
new file mode 100644
index 0000000000..8ae27627b5
--- /dev/null
+++ b/xfa/fwl/cfwl_eventtextchanged.h
@@ -0,0 +1,20 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FWL_CFWL_EVENTTEXTCHANGED_H_
+#define XFA_FWL_CFWL_EVENTTEXTCHANGED_H_
+
+#include "xfa/fwl/cfwl_event.h"
+
+class CFWL_EventTextChanged : public CFWL_Event {
+ public:
+  explicit CFWL_EventTextChanged(CFWL_Widget* pSrcTarget);
+  ~CFWL_EventTextChanged() override;
+
+  CFX_WideString wsPrevText;
+};
+
+#endif  // XFA_FWL_CFWL_EVENTTEXTCHANGED_H_
diff --git a/xfa/fwl/core/cfwl_evtvalidate.cpp b/xfa/fwl/cfwl_eventvalidate.cpp
index 1f2b6977fa..c54d491528 100644
--- a/xfa/fwl/core/cfwl_evtvalidate.cpp
+++ b/xfa/fwl/cfwl_eventvalidate.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_evtvalidate.h"
+#include "xfa/fwl/cfwl_eventvalidate.h"
 
-CFWL_EvtValidate::CFWL_EvtValidate(CFWL_Widget* pSrcTarget)
+CFWL_EventValidate::CFWL_EventValidate(CFWL_Widget* pSrcTarget)
     : CFWL_Event(CFWL_Event::Type::Validate, pSrcTarget) {}
 
-CFWL_EvtValidate::~CFWL_EvtValidate() {}
+CFWL_EventValidate::~CFWL_EventValidate() {}
diff --git a/xfa/fwl/core/cfwl_evtvalidate.h b/xfa/fwl/cfwl_eventvalidate.h
index dbd5413aa4..512161212a 100644
--- a/xfa/fwl/core/cfwl_evtvalidate.h
+++ b/xfa/fwl/cfwl_eventvalidate.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EVTVALIDATE_H_
-#define XFA_FWL_CORE_CFWL_EVTVALIDATE_H_
+#ifndef XFA_FWL_CFWL_EVENTVALIDATE_H_
+#define XFA_FWL_CFWL_EVENTVALIDATE_H_
 
-#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/cfwl_event.h"
 
-class CFWL_EvtValidate : public CFWL_Event {
+class CFWL_EventValidate : public CFWL_Event {
  public:
-  explicit CFWL_EvtValidate(CFWL_Widget* pSrcTarget);
-  ~CFWL_EvtValidate() override;
+  explicit CFWL_EventValidate(CFWL_Widget* pSrcTarget);
+  ~CFWL_EventValidate() override;
 
   CFX_WideString wsInsert;
   bool bValidate;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EVTVALIDATE_H_
+#endif  // XFA_FWL_CFWL_EVENTVALIDATE_H_
diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp
index 5b494fe1e2..624957163f 100644
--- a/xfa/fwl/core/cfwl_form.cpp
+++ b/xfa/fwl/cfwl_form.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_form.h"
+#include "xfa/fwl/cfwl_form.h"
 
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_noteloop.h"
-#include "xfa/fwl/core/cfwl_sysbtn.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_noteloop.h"
+#include "xfa/fwl/cfwl_sysbtn.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 namespace {
@@ -475,7 +475,7 @@ void CFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
 
   switch (pMessage->GetType()) {
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -508,7 +508,7 @@ void CFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   SetGrab(true);
   m_bLButtonDown = true;
 
@@ -522,7 +522,7 @@ void CFWL_Form::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&pPressBtn->m_rtBtn);
 }
 
-void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   SetGrab(false);
   m_bLButtonDown = false;
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ -547,7 +547,7 @@ void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_bLButtonDown)
     return;
 
@@ -601,7 +601,7 @@ void CFWL_Form::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   CFWL_SysBtn* pHover = GetSysBtnByState(FWL_SYSBUTTONSTATE_Hover);
   if (!pHover)
     return;
@@ -610,7 +610,7 @@ void CFWL_Form::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&pHover->m_rtBtn);
 }
 
-void CFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
+void CFWL_Form::OnLButtonDblClk(CFWL_MessageMouse* pMsg) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_Resize) &&
       HitTest(pMsg->m_fx, pMsg->m_fy) == FWL_WidgetHit::Titlebar) {
     if (m_bMaximized)
diff --git a/xfa/fwl/core/cfwl_form.h b/xfa/fwl/cfwl_form.h
index 847256a57c..725e82b46e 100644
--- a/xfa/fwl/core/cfwl_form.h
+++ b/xfa/fwl/cfwl_form.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_FORM_H_
-#define XFA_FWL_CORE_CFWL_FORM_H_
+#ifndef XFA_FWL_CFWL_FORM_H_
+#define XFA_FWL_CFWL_FORM_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_CLASS_Form L"FWL_FORM"
 #define FWL_CLASS_FormProxy L"FWL_FORMPROXY"
@@ -27,7 +27,7 @@
 #define FWL_UseMacSystemBorder
 #endif
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_NoteLoop;
 class CFWL_Widget;
 class IFWL_ThemeProvider;
@@ -70,11 +70,11 @@ class CFWL_Form : public CFWL_Widget {
   void ResetSysBtn();
   void RegisterForm();
   void UnRegisterForm();
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnLButtonDblClk(CFWL_MsgMouse* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnLButtonDblClk(CFWL_MessageMouse* pMsg);
 
 #if (_FX_OS_ == _FX_MACOSX_)
   bool m_bMouseIn;
@@ -96,4 +96,4 @@ class CFWL_Form : public CFWL_Widget {
   bool m_bDoModalFlag;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_FORM_H_
+#endif  // XFA_FWL_CFWL_FORM_H_
diff --git a/xfa/fwl/core/cfwl_formproxy.cpp b/xfa/fwl/cfwl_formproxy.cpp
index c6d667f40e..776ba0ac61 100644
--- a/xfa/fwl/core/cfwl_formproxy.cpp
+++ b/xfa/fwl/cfwl_formproxy.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_formproxy.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 
 CFWL_FormProxy::CFWL_FormProxy(
     const CFWL_App* app,
diff --git a/xfa/fwl/core/cfwl_formproxy.h b/xfa/fwl/cfwl_formproxy.h
index 9c12597c09..4ad70bf15c 100644
--- a/xfa/fwl/core/cfwl_formproxy.h
+++ b/xfa/fwl/cfwl_formproxy.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_FORMPROXY_H_
-#define XFA_FWL_CORE_CFWL_FORMPROXY_H_
+#ifndef XFA_FWL_CFWL_FORMPROXY_H_
+#define XFA_FWL_CFWL_FORMPROXY_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_form.h"
+#include "xfa/fwl/cfwl_form.h"
 
 class CFWL_WidgetProperties;
 
@@ -28,4 +28,4 @@ class CFWL_FormProxy : public CFWL_Form {
   void OnProcessMessage(CFWL_Message* pMessage) override;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_FORMPROXY_H_
+#endif  // XFA_FWL_CFWL_FORMPROXY_H_
diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index 45898b1ed7..30c160a248 100644
--- a/xfa/fwl/core/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_listbox.h"
 
 #include <algorithm>
 #include <memory>
@@ -13,14 +13,14 @@
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
@@ -773,7 +773,7 @@ void CFWL_ListBox::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -787,10 +787,10 @@ void CFWL_ListBox::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::MouseWheel:
-      OnMouseWheel(static_cast<CFWL_MsgMouseWheel*>(pMessage));
+      OnMouseWheel(static_cast<CFWL_MessageMouseWheel*>(pMessage));
       break;
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pMsg = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pMsg = static_cast<CFWL_MessageKey*>(pMessage);
       if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pMsg);
       break;
@@ -810,7 +810,7 @@ void CFWL_ListBox::OnProcessEvent(CFWL_Event* pEvent) {
   CFWL_Widget* pSrcTarget = pEvent->m_pSrcTarget;
   if ((pSrcTarget == m_pVertScrollBar.get() && m_pVertScrollBar) ||
       (pSrcTarget == m_pHorzScrollBar.get() && m_pHorzScrollBar)) {
-    CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
+    CFWL_EventScroll* pScrollEvent = static_cast<CFWL_EventScroll*>(pEvent);
     OnScroll(static_cast<CFWL_ScrollBar*>(pSrcTarget),
              pScrollEvent->m_iScrollCode, pScrollEvent->m_fPos);
   }
@@ -844,7 +844,7 @@ void CFWL_ListBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_ListBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ListBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = true;
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
     SetFocus(true);
@@ -886,7 +886,7 @@ void CFWL_ListBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_ListBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ListBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (!m_bLButtonDown)
     return;
 
@@ -894,12 +894,12 @@ void CFWL_ListBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   SetGrab(false);
 }
 
-void CFWL_ListBox::OnMouseWheel(CFWL_MsgMouseWheel* pMsg) {
+void CFWL_ListBox::OnMouseWheel(CFWL_MessageMouseWheel* pMsg) {
   if (IsShowScrollBar(true))
     m_pVertScrollBar->GetDelegate()->OnProcessMessage(pMsg);
 }
 
-void CFWL_ListBox::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_ListBox::OnKeyDown(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Tab:
@@ -949,50 +949,50 @@ void CFWL_ListBox::OnVK(CFWL_ListItem* pItem, bool bShift, bool bCtrl) {
 }
 
 bool CFWL_ListBox::OnScroll(CFWL_ScrollBar* pScrollBar,
-                            CFWL_EvtScroll::Code dwCode,
+                            CFWL_EventScroll::Code dwCode,
                             FX_FLOAT fPos) {
   CFX_SizeF fs;
   pScrollBar->GetRange(&fs.x, &fs.y);
   FX_FLOAT iCurPos = pScrollBar->GetPos();
   FX_FLOAT fStep = pScrollBar->GetStepSize();
   switch (dwCode) {
-    case CFWL_EvtScroll::Code::Min: {
+    case CFWL_EventScroll::Code::Min: {
       fPos = fs.x;
       break;
     }
-    case CFWL_EvtScroll::Code::Max: {
+    case CFWL_EventScroll::Code::Max: {
       fPos = fs.y;
       break;
     }
-    case CFWL_EvtScroll::Code::StepBackward: {
+    case CFWL_EventScroll::Code::StepBackward: {
       fPos -= fStep;
       if (fPos < fs.x + fStep / 2)
         fPos = fs.x;
       break;
     }
-    case CFWL_EvtScroll::Code::StepForward: {
+    case CFWL_EventScroll::Code::StepForward: {
       fPos += fStep;
       if (fPos > fs.y - fStep / 2)
         fPos = fs.y;
       break;
     }
-    case CFWL_EvtScroll::Code::PageBackward: {
+    case CFWL_EventScroll::Code::PageBackward: {
       fPos -= pScrollBar->GetPageSize();
       if (fPos < fs.x)
         fPos = fs.x;
       break;
     }
-    case CFWL_EvtScroll::Code::PageForward: {
+    case CFWL_EventScroll::Code::PageForward: {
       fPos += pScrollBar->GetPageSize();
       if (fPos > fs.y)
         fPos = fs.y;
       break;
     }
-    case CFWL_EvtScroll::Code::Pos:
-    case CFWL_EvtScroll::Code::TrackPos:
-    case CFWL_EvtScroll::Code::None:
+    case CFWL_EventScroll::Code::Pos:
+    case CFWL_EventScroll::Code::TrackPos:
+    case CFWL_EventScroll::Code::None:
       break;
-    case CFWL_EvtScroll::Code::EndScroll:
+    case CFWL_EventScroll::Code::EndScroll:
       return false;
   }
   if (iCurPos != fPos) {
@@ -1128,4 +1128,3 @@ uint32_t CFWL_ListBox::GetItemStates(CFWL_ListItem* pItem) {
     return 0;
   return pItem->m_dwStates | pItem->m_dwCheckState;
 }
-
diff --git a/xfa/fwl/core/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h
index 905a040326..cdc3ef8933 100644
--- a/xfa/fwl/core/cfwl_listbox.h
+++ b/xfa/fwl/cfwl_listbox.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_LISTBOX_H_
-#define XFA_FWL_CORE_CFWL_LISTBOX_H_
+#ifndef XFA_FWL_CFWL_LISTBOX_H_
+#define XFA_FWL_CFWL_LISTBOX_H_
 
 #include <memory>
 #include <vector>
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_listitem.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_listitem.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0)
 #define FWL_STYLEEXT_LTB_ShowScrollBarAlaways (1L << 2)
@@ -33,9 +33,9 @@
 #define FWL_ITEMSTATE_LTB_Focused (1L << 1)
 #define FWL_ITEMSTATE_LTB_Checked (1L << 2)
 
-class CFWL_MsgKillFocus;
-class CFWL_MsgMouse;
-class CFWL_MsgMouseWheel;
+class CFWL_MessageKillFocus;
+class CFWL_MessageMouse;
+class CFWL_MessageMouseWheel;
 class CFX_DIBitmap;
 
 class CFWL_ListBox : public CFWL_Widget {
@@ -142,13 +142,13 @@ class CFWL_ListBox : public CFWL_Widget {
   FX_FLOAT GetScrollWidth();
 
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseWheel(CFWL_MsgMouseWheel* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseWheel(CFWL_MessageMouseWheel* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
   void OnVK(CFWL_ListItem* hItem, bool bShift, bool bCtrl);
   bool OnScroll(CFWL_ScrollBar* pScrollBar,
-                CFWL_EvtScroll::Code dwCode,
+                CFWL_EventScroll::Code dwCode,
                 FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
@@ -166,4 +166,4 @@ class CFWL_ListBox : public CFWL_Widget {
   std::vector<std::unique_ptr<CFWL_ListItem>> m_ItemArray;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_LISTBOX_H_
+#endif  // XFA_FWL_CFWL_LISTBOX_H_
diff --git a/xfa/fwl/core/cfwl_listitem.cpp b/xfa/fwl/cfwl_listitem.cpp
index 4419839024..c46b8a06a1 100644
--- a/xfa/fwl/core/cfwl_listitem.cpp
+++ b/xfa/fwl/cfwl_listitem.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_listitem.h"
+#include "xfa/fwl/cfwl_listitem.h"
 
 CFWL_ListItem::CFWL_ListItem()
     : m_dwStates(0),
diff --git a/xfa/fwl/core/cfwl_listitem.h b/xfa/fwl/cfwl_listitem.h
index 0a5f0a3088..d4f5d6d62d 100644
--- a/xfa/fwl/core/cfwl_listitem.h
+++ b/xfa/fwl/cfwl_listitem.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_LISTITEM_H_
-#define XFA_FWL_CORE_CFWL_LISTITEM_H_
+#ifndef XFA_FWL_CFWL_LISTITEM_H_
+#define XFA_FWL_CFWL_LISTITEM_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
@@ -27,4 +27,4 @@ class CFWL_ListItem {
   CFX_RectF m_rtCheckBox;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_LISTITEM_H_
+#endif  // XFA_FWL_CFWL_LISTITEM_H_
diff --git a/xfa/fwl/core/cfwl_message.cpp b/xfa/fwl/cfwl_message.cpp
index a8d13fc740..258fe62060 100644
--- a/xfa/fwl/core/cfwl_message.cpp
+++ b/xfa/fwl/cfwl_message.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/cfwl_message.h"
 
 CFWL_Message::CFWL_Message(CFWL_Message::Type type)
     : CFWL_Message(type, nullptr, nullptr) {}
@@ -15,9 +15,7 @@ CFWL_Message::CFWL_Message(Type type, CFWL_Widget* pSrcTarget)
 CFWL_Message::CFWL_Message(Type type,
                            CFWL_Widget* pSrcTarget,
                            CFWL_Widget* pDstTarget)
-    : m_pSrcTarget(pSrcTarget),
-      m_pDstTarget(pDstTarget),
-      m_type(type) {}
+    : m_pSrcTarget(pSrcTarget), m_pDstTarget(pDstTarget), m_type(type) {}
 
 CFWL_Message::~CFWL_Message() {}
 
diff --git a/xfa/fwl/core/cfwl_message.h b/xfa/fwl/cfwl_message.h
index 0c980066cc..67e1f05cd3 100644
--- a/xfa/fwl/core/cfwl_message.h
+++ b/xfa/fwl/cfwl_message.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MESSAGE_H_
-#define XFA_FWL_CORE_CFWL_MESSAGE_H_
+#ifndef XFA_FWL_CFWL_MESSAGE_H_
+#define XFA_FWL_CFWL_MESSAGE_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/fwl_error.h"
 
 class CFWL_Widget;
 
@@ -35,5 +35,4 @@ class CFWL_Message {
   Type m_type;
 };
 
-
-#endif  // XFA_FWL_CORE_CFWL_MESSAGE_H_
+#endif  // XFA_FWL_CFWL_MESSAGE_H_
diff --git a/xfa/fwl/core/cfwl_msgkey.cpp b/xfa/fwl/cfwl_messagekey.cpp
index 3eda29ab49..38d4ea0580 100644
--- a/xfa/fwl/core/cfwl_msgkey.cpp
+++ b/xfa/fwl/cfwl_messagekey.cpp
@@ -4,17 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_msgkey.h"
+#include "xfa/fwl/cfwl_messagekey.h"
 
 #include <memory>
 
 #include "third_party/base/ptr_util.h"
 
-CFWL_MsgKey::CFWL_MsgKey(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget)
+CFWL_MessageKey::CFWL_MessageKey(CFWL_Widget* pSrcTarget,
+                                 CFWL_Widget* pDstTarget)
     : CFWL_Message(CFWL_Message::Type::Key, pSrcTarget, pDstTarget) {}
 
-CFWL_MsgKey::~CFWL_MsgKey() {}
+CFWL_MessageKey::~CFWL_MessageKey() {}
 
-std::unique_ptr<CFWL_Message> CFWL_MsgKey::Clone() {
-  return pdfium::MakeUnique<CFWL_MsgKey>(*this);
+std::unique_ptr<CFWL_Message> CFWL_MessageKey::Clone() {
+  return pdfium::MakeUnique<CFWL_MessageKey>(*this);
 }
diff --git a/xfa/fwl/core/cfwl_msgkey.h b/xfa/fwl/cfwl_messagekey.h
index 36089ea43e..bf430d3ba5 100644
--- a/xfa/fwl/core/cfwl_msgkey.h
+++ b/xfa/fwl/cfwl_messagekey.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MSGKEY_H_
-#define XFA_FWL_CORE_CFWL_MSGKEY_H_
+#ifndef XFA_FWL_CFWL_MESSAGEKEY_H_
+#define XFA_FWL_CFWL_MESSAGEKEY_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/cfwl_message.h"
 
 enum class FWL_KeyCommand { KeyDown, KeyUp, Char };
 
-class CFWL_MsgKey : public CFWL_Message {
+class CFWL_MessageKey : public CFWL_Message {
  public:
-  CFWL_MsgKey(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_MsgKey() override;
+  CFWL_MessageKey(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_MessageKey() override;
 
   // CFWL_Message
   std::unique_ptr<CFWL_Message> Clone() override;
@@ -26,4 +26,4 @@ class CFWL_MsgKey : public CFWL_Message {
   FWL_KeyCommand m_dwCmd;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_MSGKEY_H_
+#endif  // XFA_FWL_CFWL_MESSAGEKEY_H_
diff --git a/xfa/fwl/cfwl_messagekillfocus.cpp b/xfa/fwl/cfwl_messagekillfocus.cpp
new file mode 100644
index 0000000000..55247d1f2e
--- /dev/null
+++ b/xfa/fwl/cfwl_messagekillfocus.cpp
@@ -0,0 +1,24 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+
+#include <memory>
+
+#include "third_party/base/ptr_util.h"
+
+CFWL_MessageKillFocus::CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget)
+    : CFWL_MessageKillFocus(pSrcTarget, nullptr) {}
+
+CFWL_MessageKillFocus::CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget,
+                                             CFWL_Widget* pDstTarget)
+    : CFWL_Message(CFWL_Message::Type::KillFocus, pSrcTarget, pDstTarget) {}
+
+CFWL_MessageKillFocus::~CFWL_MessageKillFocus() {}
+
+std::unique_ptr<CFWL_Message> CFWL_MessageKillFocus::Clone() {
+  return pdfium::MakeUnique<CFWL_MessageKillFocus>(*this);
+}
diff --git a/xfa/fwl/cfwl_messagekillfocus.h b/xfa/fwl/cfwl_messagekillfocus.h
new file mode 100644
index 0000000000..d6ca799efb
--- /dev/null
+++ b/xfa/fwl/cfwl_messagekillfocus.h
@@ -0,0 +1,26 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FWL_CFWL_MESSAGEKILLFOCUS_H_
+#define XFA_FWL_CFWL_MESSAGEKILLFOCUS_H_
+
+#include <memory>
+
+#include "xfa/fwl/cfwl_message.h"
+
+class CFWL_MessageKillFocus : public CFWL_Message {
+ public:
+  explicit CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget);
+  CFWL_MessageKillFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_MessageKillFocus() override;
+
+  // CFWL_Message
+  std::unique_ptr<CFWL_Message> Clone() override;
+
+  CFWL_Widget* m_pSetFocus;
+};
+
+#endif  // XFA_FWL_CFWL_MESSAGEKILLFOCUS_H_
diff --git a/xfa/fwl/core/cfwl_msgmouse.cpp b/xfa/fwl/cfwl_messagemouse.cpp
index f8a4e64608..110292a1de 100644
--- a/xfa/fwl/core/cfwl_msgmouse.cpp
+++ b/xfa/fwl/cfwl_messagemouse.cpp
@@ -4,17 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
 
 #include <memory>
 
 #include "third_party/base/ptr_util.h"
 
-CFWL_MsgMouse::CFWL_MsgMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget)
+CFWL_MessageMouse::CFWL_MessageMouse(CFWL_Widget* pSrcTarget,
+                                     CFWL_Widget* pDstTarget)
     : CFWL_Message(CFWL_Message::Type::Mouse, pSrcTarget, pDstTarget) {}
 
-CFWL_MsgMouse::~CFWL_MsgMouse() {}
+CFWL_MessageMouse::~CFWL_MessageMouse() {}
 
-std::unique_ptr<CFWL_Message> CFWL_MsgMouse::Clone() {
-  return pdfium::MakeUnique<CFWL_MsgMouse>(*this);
+std::unique_ptr<CFWL_Message> CFWL_MessageMouse::Clone() {
+  return pdfium::MakeUnique<CFWL_MessageMouse>(*this);
 }
diff --git a/xfa/fwl/core/cfwl_msgmouse.h b/xfa/fwl/cfwl_messagemouse.h
index 0765cbc500..ac45745df1 100644
--- a/xfa/fwl/core/cfwl_msgmouse.h
+++ b/xfa/fwl/cfwl_messagemouse.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MSGMOUSE_H_
-#define XFA_FWL_CORE_CFWL_MSGMOUSE_H_
+#ifndef XFA_FWL_CFWL_MESSAGEMOUSE_H_
+#define XFA_FWL_CFWL_MESSAGEMOUSE_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/cfwl_message.h"
 
 enum class FWL_MouseCommand {
   LeftButtonDown,
@@ -24,10 +24,10 @@ enum class FWL_MouseCommand {
   Hover
 };
 
-class CFWL_MsgMouse : public CFWL_Message {
+class CFWL_MessageMouse : public CFWL_Message {
  public:
-  CFWL_MsgMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_MsgMouse() override;
+  CFWL_MessageMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_MessageMouse() override;
 
   // CFWL_Message
   std::unique_ptr<CFWL_Message> Clone() override;
@@ -38,4 +38,4 @@ class CFWL_MsgMouse : public CFWL_Message {
   FWL_MouseCommand m_dwCmd;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_MSGMOUSE_H_
+#endif  // XFA_FWL_CFWL_MESSAGEMOUSE_H_
diff --git a/xfa/fwl/core/cfwl_msgmousewheel.cpp b/xfa/fwl/cfwl_messagemousewheel.cpp
index 02629ec909..3646b6c30d 100644
--- a/xfa/fwl/core/cfwl_msgmousewheel.cpp
+++ b/xfa/fwl/cfwl_messagemousewheel.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
 
 #include <memory>
 
 #include "third_party/base/ptr_util.h"
 
-CFWL_MsgMouseWheel::CFWL_MsgMouseWheel(CFWL_Widget* pSrcTarget,
-                                       CFWL_Widget* pDstTarget)
+CFWL_MessageMouseWheel::CFWL_MessageMouseWheel(CFWL_Widget* pSrcTarget,
+                                               CFWL_Widget* pDstTarget)
     : CFWL_Message(CFWL_Message::Type::MouseWheel, pSrcTarget, pDstTarget) {}
 
-CFWL_MsgMouseWheel::~CFWL_MsgMouseWheel() {}
+CFWL_MessageMouseWheel::~CFWL_MessageMouseWheel() {}
 
-std::unique_ptr<CFWL_Message> CFWL_MsgMouseWheel::Clone() {
-  return pdfium::MakeUnique<CFWL_MsgMouseWheel>(*this);
+std::unique_ptr<CFWL_Message> CFWL_MessageMouseWheel::Clone() {
+  return pdfium::MakeUnique<CFWL_MessageMouseWheel>(*this);
 }
diff --git a/xfa/fwl/core/cfwl_msgmousewheel.h b/xfa/fwl/cfwl_messagemousewheel.h
index 503bcdebe8..4d568c8e45 100644
--- a/xfa/fwl/core/cfwl_msgmousewheel.h
+++ b/xfa/fwl/cfwl_messagemousewheel.h
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MSGMOUSEWHEEL_H_
-#define XFA_FWL_CORE_CFWL_MSGMOUSEWHEEL_H_
+#ifndef XFA_FWL_CFWL_MESSAGEMOUSEWHEEL_H_
+#define XFA_FWL_CFWL_MESSAGEMOUSEWHEEL_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/cfwl_message.h"
 
-class CFWL_MsgMouseWheel : public CFWL_Message {
+class CFWL_MessageMouseWheel : public CFWL_Message {
  public:
-  CFWL_MsgMouseWheel(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_MsgMouseWheel() override;
+  CFWL_MessageMouseWheel(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_MessageMouseWheel() override;
 
   // CFWL_Message
   std::unique_ptr<CFWL_Message> Clone() override;
@@ -26,4 +26,4 @@ class CFWL_MsgMouseWheel : public CFWL_Message {
   uint32_t m_dwFlags;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_MSGMOUSEWHEEL_H_
+#endif  // XFA_FWL_CFWL_MESSAGEMOUSEWHEEL_H_
diff --git a/xfa/fwl/core/cfwl_msgsetfocus.cpp b/xfa/fwl/cfwl_messagesetfocus.cpp
index 82e9610b15..f7653c9ef2 100644
--- a/xfa/fwl/core/cfwl_msgsetfocus.cpp
+++ b/xfa/fwl/cfwl_messagesetfocus.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
 
 #include <memory>
 
 #include "third_party/base/ptr_util.h"
 
-CFWL_MsgSetFocus::CFWL_MsgSetFocus(CFWL_Widget* pSrcTarget,
-                                   CFWL_Widget* pDstTarget)
+CFWL_MessageSetFocus::CFWL_MessageSetFocus(CFWL_Widget* pSrcTarget,
+                                           CFWL_Widget* pDstTarget)
     : CFWL_Message(CFWL_Message::Type::SetFocus, pSrcTarget, pDstTarget) {}
 
-CFWL_MsgSetFocus::~CFWL_MsgSetFocus() {}
+CFWL_MessageSetFocus::~CFWL_MessageSetFocus() {}
 
-std::unique_ptr<CFWL_Message> CFWL_MsgSetFocus::Clone() {
-  return pdfium::MakeUnique<CFWL_MsgSetFocus>(*this);
+std::unique_ptr<CFWL_Message> CFWL_MessageSetFocus::Clone() {
+  return pdfium::MakeUnique<CFWL_MessageSetFocus>(*this);
 }
diff --git a/xfa/fwl/core/cfwl_msgsetfocus.h b/xfa/fwl/cfwl_messagesetfocus.h
index 628f7a6d66..05616fbe2e 100644
--- a/xfa/fwl/core/cfwl_msgsetfocus.h
+++ b/xfa/fwl/cfwl_messagesetfocus.h
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MSGSETFOCUS_H_
-#define XFA_FWL_CORE_CFWL_MSGSETFOCUS_H_
+#ifndef XFA_FWL_CFWL_MESSAGESETFOCUS_H_
+#define XFA_FWL_CFWL_MESSAGESETFOCUS_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/cfwl_message.h"
 
-class CFWL_MsgSetFocus : public CFWL_Message {
+class CFWL_MessageSetFocus : public CFWL_Message {
  public:
-  CFWL_MsgSetFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_MsgSetFocus() override;
+  CFWL_MessageSetFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
+  ~CFWL_MessageSetFocus() override;
 
   // CFWL_Message
   std::unique_ptr<CFWL_Message> Clone() override;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_MSGSETFOCUS_H_
+#endif  // XFA_FWL_CFWL_MESSAGESETFOCUS_H_
diff --git a/xfa/fwl/core/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 8a284aae52..94d198599d 100644
--- a/xfa/fwl/core/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_monthcalendar.h"
+#include "xfa/fwl/cfwl_monthcalendar.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,13 +12,13 @@
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_formproxy.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 #define MONTHCAL_HSEP_HEIGHT 1
 #define MONTHCAL_VSEP_WIDTH 1
@@ -900,7 +900,7 @@ void CFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
     case CFWL_Message::Type::Key:
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMouse->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMouse);
@@ -930,7 +930,7 @@ void CFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = CFWL_PartState_Pressed;
     PrevMonth();
@@ -951,7 +951,7 @@ void CFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_OnLButtonUp(pMsg);
 
@@ -995,7 +995,7 @@ void CFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   m_bFlag = 0;
 }
 
-void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = 0;
     Repaint(&(m_rtLBtn));
@@ -1029,7 +1029,7 @@ void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect)
     return;
 
@@ -1063,7 +1063,7 @@ void CFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_MonthCalendar::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (m_iHovered <= 0)
     return;
 
diff --git a/xfa/fwl/core/cfwl_monthcalendar.h b/xfa/fwl/cfwl_monthcalendar.h
index 7586a586f6..0d5ce648b9 100644
--- a/xfa/fwl/core/cfwl_monthcalendar.h
+++ b/xfa/fwl/cfwl_monthcalendar.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
-#define XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
+#ifndef XFA_FWL_CFWL_MONTHCALENDAR_H_
+#define XFA_FWL_CFWL_MONTHCALENDAR_H_
 
 #include <memory>
 
 #include "xfa/fgas/localization/fgas_datetime.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0)
 #define FWL_STYLEEXT_MCD_NoToday (1L << 1)
@@ -23,7 +23,7 @@
 #define FWL_ITEMSTATE_MCD_Selected (1L << 1)
 #define FWL_ITEMSTATE_MCD_Focused (1L << 2)
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_Widget;
 
 class CFWL_MonthCalendar : public CFWL_Widget {
@@ -158,11 +158,11 @@ class CFWL_MonthCalendar : public CFWL_Widget {
                     CFX_WideString& wsToday);
   int32_t GetDayAtPoint(FX_FLOAT x, FX_FLOAT y);
   void GetDayRect(int32_t iDay, CFX_RectF& rtDay);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void DisForm_OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
 
   bool m_bInitialized;
   CFX_RectF m_rtHead;
@@ -224,4 +224,4 @@ class CFWL_MonthCalendar : public CFWL_Widget {
   bool m_bFlag;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_MONTHCALENDAR_H_
+#endif  // XFA_FWL_CFWL_MONTHCALENDAR_H_
diff --git a/xfa/fwl/core/cfwl_notedriver.cpp b/xfa/fwl/cfwl_notedriver.cpp
index 8402b2b90c..09663f8bcf 100644
--- a/xfa/fwl/core/cfwl_notedriver.cpp
+++ b/xfa/fwl/cfwl_notedriver.cpp
@@ -4,23 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 
 #include <utility>
 
 #include "core/fxcrt/fx_ext.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_eventtarget.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_noteloop.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_eventtarget.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_noteloop.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 
 CFWL_NoteDriver::CFWL_NoteDriver()
     : m_pHover(nullptr),
@@ -92,7 +92,7 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) {
   m_pFocus = pFocus;
   if (pPrev) {
     if (IFWL_WidgetDelegate* pDelegate = pPrev->GetDelegate()) {
-      CFWL_MsgKillFocus ms(pPrev, pPrev);
+      CFWL_MessageKillFocus ms(pPrev, pPrev);
       pDelegate->OnProcessMessage(&ms);
     }
   }
@@ -104,7 +104,7 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) {
       pForm->SetSubFocus(pFocus);
 
     if (IFWL_WidgetDelegate* pDelegate = pFocus->GetDelegate()) {
-      CFWL_MsgSetFocus ms(nullptr, pFocus);
+      CFWL_MessageSetFocus ms(nullptr, pFocus);
       pDelegate->OnProcessMessage(&ms);
     }
   }
@@ -306,7 +306,7 @@ bool CFWL_NoteDriver::DoKillFocus(CFWL_Message* pMessage,
 }
 
 bool CFWL_NoteDriver::DoKey(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) {
-  CFWL_MsgKey* pMsg = static_cast<CFWL_MsgKey*>(pMessage);
+  CFWL_MessageKey* pMsg = static_cast<CFWL_MessageKey*>(pMessage);
 #if (_FX_OS_ != _FX_MACOSX_)
   if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
       pMsg->m_dwKeyCode == FWL_VKEY_Tab) {
@@ -348,7 +348,7 @@ bool CFWL_NoteDriver::DoKey(CFWL_Message* pMessage, CFWL_Widget* pMessageForm) {
 
 bool CFWL_NoteDriver::DoMouse(CFWL_Message* pMessage,
                               CFWL_Widget* pMessageForm) {
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (pMsg->m_dwCmd == FWL_MouseCommand::Leave ||
       pMsg->m_dwCmd == FWL_MouseCommand::Hover ||
       pMsg->m_dwCmd == FWL_MouseCommand::Enter) {
@@ -367,7 +367,7 @@ bool CFWL_NoteDriver::DoWheel(CFWL_Message* pMessage,
   if (!pWidgetMgr)
     return false;
 
-  CFWL_MsgMouseWheel* pMsg = static_cast<CFWL_MsgMouseWheel*>(pMessage);
+  CFWL_MessageMouseWheel* pMsg = static_cast<CFWL_MessageMouseWheel*>(pMessage);
   CFWL_Widget* pDst =
       pWidgetMgr->GetWidgetAtPoint(pMessageForm, pMsg->m_fx, pMsg->m_fy);
   if (!pDst)
@@ -387,7 +387,7 @@ bool CFWL_NoteDriver::DoMouseEx(CFWL_Message* pMessage,
   if (m_pGrab)
     pTarget = m_pGrab;
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (!pTarget) {
     pTarget =
         pWidgetMgr->GetWidgetAtPoint(pMessageForm, pMsg->m_fx, pMsg->m_fy);
@@ -408,9 +408,9 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_Message* pMessage) {
   if (pTarget == m_pHover)
     return;
 
-  CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+  CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
   if (m_pHover) {
-    CFWL_MsgMouse msLeave(nullptr, m_pHover);
+    CFWL_MessageMouse msLeave(nullptr, m_pHover);
     msLeave.m_fx = pMsg->m_fx;
     msLeave.m_fy = pMsg->m_fy;
     pTarget->TransformTo(m_pHover, msLeave.m_fx, msLeave.m_fy);
@@ -425,7 +425,7 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_Message* pMessage) {
   }
   m_pHover = pTarget;
 
-  CFWL_MsgMouse msHover(nullptr, pTarget);
+  CFWL_MessageMouse msHover(nullptr, pTarget);
   msHover.m_fx = pMsg->m_fx;
   msHover.m_fy = pMsg->m_fy;
   msHover.m_dwFlags = 0;
diff --git a/xfa/fwl/core/cfwl_notedriver.h b/xfa/fwl/cfwl_notedriver.h
index 47f11daec3..f2ef87aabe 100644
--- a/xfa/fwl/core/cfwl_notedriver.h
+++ b/xfa/fwl/cfwl_notedriver.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_NOTEDRIVER_H_
-#define XFA_FWL_CORE_CFWL_NOTEDRIVER_H_
+#ifndef XFA_FWL_CFWL_NOTEDRIVER_H_
+#define XFA_FWL_CFWL_NOTEDRIVER_H_
 
 #include <deque>
 #include <memory>
 #include <unordered_map>
 
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
 class CFWL_EventTarget;
@@ -75,4 +75,4 @@ class CFWL_NoteDriver {
   std::unique_ptr<CFWL_NoteLoop> m_pNoteLoop;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_NOTEDRIVER_H_
+#endif  // XFA_FWL_CFWL_NOTEDRIVER_H_
diff --git a/xfa/fwl/core/cfwl_noteloop.cpp b/xfa/fwl/cfwl_noteloop.cpp
index 4b2b6105ed..ff35a1af2c 100644
--- a/xfa/fwl/core/cfwl_noteloop.cpp
+++ b/xfa/fwl/cfwl_noteloop.cpp
@@ -4,6 +4,6 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_noteloop.h"
+#include "xfa/fwl/cfwl_noteloop.h"
 
 CFWL_NoteLoop::CFWL_NoteLoop() : m_bContinueModal(true) {}
diff --git a/xfa/fwl/core/cfwl_noteloop.h b/xfa/fwl/cfwl_noteloop.h
index 20bc03f560..57e1a140c2 100644
--- a/xfa/fwl/core/cfwl_noteloop.h
+++ b/xfa/fwl/cfwl_noteloop.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_NOTELOOP_H_
-#define XFA_FWL_CORE_CFWL_NOTELOOP_H_
+#ifndef XFA_FWL_CFWL_NOTELOOP_H_
+#define XFA_FWL_CFWL_NOTELOOP_H_
 
 class CFWL_Widget;
 
@@ -24,4 +24,4 @@ class CFWL_NoteLoop {
   bool m_bContinueModal;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_NOTELOOP_H_
+#endif  // XFA_FWL_CFWL_NOTELOOP_H_
diff --git a/xfa/fwl/core/cfwl_picturebox.cpp b/xfa/fwl/cfwl_picturebox.cpp
index 96a52c9638..b62aac942e 100644
--- a/xfa/fwl/core/cfwl_picturebox.cpp
+++ b/xfa/fwl/cfwl_picturebox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_picturebox.h"
+#include "xfa/fwl/cfwl_picturebox.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/core/cfwl_picturebox.h b/xfa/fwl/cfwl_picturebox.h
index f4ece5bb2d..81ff3911f6 100644
--- a/xfa/fwl/core/cfwl_picturebox.h
+++ b/xfa/fwl/cfwl_picturebox.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_PICTUREBOX_H_
-#define XFA_FWL_CORE_CFWL_PICTUREBOX_H_
+#ifndef XFA_FWL_CFWL_PICTUREBOX_H_
+#define XFA_FWL_CFWL_PICTUREBOX_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_PTB_Left 0L << 0
 #define FWL_STYLEEXT_PTB_Center 1L << 0
@@ -48,4 +48,4 @@ class CFWL_PictureBox : public CFWL_Widget {
   CFX_Matrix m_matrix;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_PICTUREBOX_H_
+#endif  // XFA_FWL_CFWL_PICTUREBOX_H_
diff --git a/xfa/fwl/core/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp
index d3bf7e6552..4e5ab8baf6 100644
--- a/xfa/fwl/core/cfwl_pushbutton.cpp
+++ b/xfa/fwl/cfwl_pushbutton.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_pushbutton.h"
+#include "xfa/fwl/cfwl_pushbutton.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtmouse.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventmouse.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 CFWL_PushButton::CFWL_PushButton(const CFWL_App* app)
     : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
@@ -166,7 +166,7 @@ void CFWL_PushButton::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -186,7 +186,7 @@ void CFWL_PushButton::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
@@ -211,7 +211,7 @@ void CFWL_PushButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_PushButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_PushButton::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
     SetFocus(true);
 
@@ -221,7 +221,7 @@ void CFWL_PushButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_PushButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_PushButton::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bBtnDown = false;
   if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_pProperties->m_dwStates &= ~FWL_STATE_PSB_Pressed;
@@ -237,7 +237,7 @@ void CFWL_PushButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_PushButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_PushButton::OnMouseMove(CFWL_MessageMouse* pMsg) {
   bool bRepaint = false;
   if (m_bBtnDown) {
     if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy)) {
@@ -271,18 +271,18 @@ void CFWL_PushButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&m_rtClient);
 }
 
-void CFWL_PushButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_PushButton::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   m_bBtnDown = false;
   m_pProperties->m_dwStates &= ~FWL_STATE_PSB_Hovered;
   m_pProperties->m_dwStates &= ~FWL_STATE_PSB_Pressed;
   Repaint(&m_rtClient);
 }
 
-void CFWL_PushButton::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_PushButton::OnKeyDown(CFWL_MessageKey* pMsg) {
   if (pMsg->m_dwKeyCode != FWL_VKEY_Return)
     return;
 
-  CFWL_EvtMouse wmMouse(this);
+  CFWL_EventMouse wmMouse(this);
   wmMouse.m_dwCmd = FWL_MouseCommand::LeftButtonUp;
   DispatchEvent(&wmMouse);
 
diff --git a/xfa/fwl/core/cfwl_pushbutton.h b/xfa/fwl/cfwl_pushbutton.h
index e5bd295a8c..4f6939a953 100644
--- a/xfa/fwl/core/cfwl_pushbutton.h
+++ b/xfa/fwl/cfwl_pushbutton.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
-#define XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#ifndef XFA_FWL_CFWL_PUSHBUTTON_H_
+#define XFA_FWL_CFWL_PUSHBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_PSB_Left (0L << 0)
 #define FWL_STYLEEXT_PSB_Center (1L << 0)
@@ -28,7 +28,7 @@
 #define FWL_STATE_PSB_Pressed (1 << (FWL_WGTSTATE_MAX + 1))
 #define FWL_STATE_PSB_Default (1 << (FWL_WGTSTATE_MAX + 2))
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFX_DIBitmap;
 class CFWL_Widget;
 
@@ -53,11 +53,11 @@ class CFWL_PushButton : public CFWL_Widget {
   uint32_t GetPartStates();
   void UpdateTextOutStyles();
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtCaption;
@@ -66,4 +66,4 @@ class CFWL_PushButton : public CFWL_Widget {
   int32_t m_iTTOAlign;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#endif  // XFA_FWL_CFWL_PUSHBUTTON_H_
diff --git a/xfa/fwl/core/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index 6c2ad99601..d6124c6515 100644
--- a/xfa/fwl/core/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 #define FWL_SCROLLBAR_Elapse 500
 #define FWL_SCROLLBAR_MinThumb 5
@@ -97,8 +97,8 @@ void CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
   CalcMaxTrackRect(m_rtMaxTrack);
 }
 
-bool CFWL_ScrollBar::DoScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos) {
-  if (dwCode == CFWL_EvtScroll::Code::None)
+bool CFWL_ScrollBar::DoScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos) {
+  if (dwCode == CFWL_EventScroll::Code::None)
     return false;
   return OnScroll(dwCode, fPos);
 }
@@ -293,32 +293,32 @@ FX_FLOAT CFWL_ScrollBar::GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy) {
 
 bool CFWL_ScrollBar::SendEvent() {
   if (m_iMinButtonState == CFWL_PartState_Pressed) {
-    DoScroll(CFWL_EvtScroll::Code::StepBackward, m_fTrackPos);
+    DoScroll(CFWL_EventScroll::Code::StepBackward, m_fTrackPos);
     return false;
   }
   if (m_iMaxButtonState == CFWL_PartState_Pressed) {
-    DoScroll(CFWL_EvtScroll::Code::StepForward, m_fTrackPos);
+    DoScroll(CFWL_EventScroll::Code::StepForward, m_fTrackPos);
     return false;
   }
   if (m_iMinTrackState == CFWL_PartState_Pressed) {
-    DoScroll(CFWL_EvtScroll::Code::PageBackward, m_fTrackPos);
+    DoScroll(CFWL_EventScroll::Code::PageBackward, m_fTrackPos);
     return m_rtThumb.Contains(m_cpTrackPointX, m_cpTrackPointY);
   }
   if (m_iMaxTrackState == CFWL_PartState_Pressed) {
-    DoScroll(CFWL_EvtScroll::Code::PageForward, m_fTrackPos);
+    DoScroll(CFWL_EventScroll::Code::PageForward, m_fTrackPos);
     return m_rtThumb.Contains(m_cpTrackPointX, m_cpTrackPointY);
   }
   if (m_iMouseWheel) {
-    CFWL_EvtScroll::Code dwCode = m_iMouseWheel < 0
-                                      ? CFWL_EvtScroll::Code::StepForward
-                                      : CFWL_EvtScroll::Code::StepBackward;
+    CFWL_EventScroll::Code dwCode = m_iMouseWheel < 0
+                                        ? CFWL_EventScroll::Code::StepForward
+                                        : CFWL_EventScroll::Code::StepBackward;
     DoScroll(dwCode, m_fTrackPos);
   }
   return true;
 }
 
-bool CFWL_ScrollBar::OnScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos) {
-  CFWL_EvtScroll ev(this);
+bool CFWL_ScrollBar::OnScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos) {
+  CFWL_EventScroll ev(this);
   ev.m_iScrollCode = dwCode;
   ev.m_fPos = fPos;
   DispatchEvent(&ev);
@@ -331,7 +331,7 @@ void CFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
 
   CFWL_Message::Type type = pMessage->GetType();
   if (type == CFWL_Message::Type::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+    CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
     switch (pMsg->m_dwCmd) {
       case FWL_MouseCommand::LeftButtonDown:
         OnLButtonDown(pMsg->m_dwFlags, pMsg->m_fx, pMsg->m_fy);
@@ -349,7 +349,8 @@ void CFWL_ScrollBar::OnProcessMessage(CFWL_Message* pMessage) {
         break;
     }
   } else if (type == CFWL_Message::Type::MouseWheel) {
-    CFWL_MsgMouseWheel* pMsg = static_cast<CFWL_MsgMouseWheel*>(pMessage);
+    CFWL_MessageMouseWheel* pMsg =
+        static_cast<CFWL_MessageMouseWheel*>(pMessage);
     OnMouseWheel(pMsg->m_fx, pMsg->m_fy, pMsg->m_dwFlags, pMsg->m_fDeltaX,
                  pMsg->m_fDeltaY);
   }
@@ -447,7 +448,7 @@ void CFWL_ScrollBar::DoMouseUp(int32_t iItem,
 
   iState = iNewState;
   Repaint(&rtItem);
-  OnScroll(CFWL_EvtScroll::Code::EndScroll, m_fTrackPos);
+  OnScroll(CFWL_EventScroll::Code::EndScroll, m_fTrackPos);
 }
 
 void CFWL_ScrollBar::DoMouseMove(int32_t iItem,
@@ -466,7 +467,7 @@ void CFWL_ScrollBar::DoMouseMove(int32_t iItem,
   } else if ((2 == iItem) && (m_iThumbButtonState == CFWL_PartState_Pressed)) {
     FX_FLOAT fPos = GetTrackPointPos(fx, fy);
     m_fTrackPos = fPos;
-    OnScroll(CFWL_EvtScroll::Code::TrackPos, fPos);
+    OnScroll(CFWL_EventScroll::Code::TrackPos, fPos);
   }
 }
 
diff --git a/xfa/fwl/core/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h
index f1eb35b327..808975ed81 100644
--- a/xfa/fwl/core/cfwl_scrollbar.h
+++ b/xfa/fwl/cfwl_scrollbar.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SCROLLBAR_H_
-#define XFA_FWL_CORE_CFWL_SCROLLBAR_H_
+#ifndef XFA_FWL_CFWL_SCROLLBAR_H_
+#define XFA_FWL_CFWL_SCROLLBAR_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_evtscroll.h"
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_eventscroll.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 class CFWL_Widget;
 
@@ -87,7 +87,7 @@ class CFWL_ScrollBar : public CFWL_Widget {
   FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy);
 
   bool SendEvent();
-  bool OnScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos);
+  bool OnScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos);
   void OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
@@ -97,7 +97,7 @@ class CFWL_ScrollBar : public CFWL_Widget {
                     uint32_t dwFlags,
                     FX_FLOAT fDeltaX,
                     FX_FLOAT fDeltaY);
-  bool DoScroll(CFWL_EvtScroll::Code dwCode, FX_FLOAT fPos);
+  bool DoScroll(CFWL_EventScroll::Code dwCode, FX_FLOAT fPos);
   void DoMouseDown(int32_t iItem,
                    const CFX_RectF& rtItem,
                    int32_t& iState,
@@ -145,4 +145,4 @@ class CFWL_ScrollBar : public CFWL_Widget {
   CFWL_ScrollBar::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SCROLLBAR_H_
+#endif  // XFA_FWL_CFWL_SCROLLBAR_H_
diff --git a/xfa/fwl/core/cfwl_spinbutton.cpp b/xfa/fwl/cfwl_spinbutton.cpp
index 68844f9900..1c6662e702 100644
--- a/xfa/fwl/core/cfwl_spinbutton.cpp
+++ b/xfa/fwl/cfwl_spinbutton.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_spinbutton.h"
+#include "xfa/fwl/cfwl_spinbutton.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 const int kElapseTime = 200;
@@ -157,7 +157,7 @@ void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -177,7 +177,7 @@ void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
@@ -202,7 +202,7 @@ void CFWL_SpinButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   m_bLButtonDwn = true;
   SetGrab(true);
   SetFocus(true);
@@ -229,7 +229,7 @@ void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_pTimerInfo = m_Timer.StartTimer(kElapseTime, true);
 }
 
-void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & CFWL_PartState_Disabled)
     return;
 
@@ -255,7 +255,7 @@ void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_bLButtonDwn)
     return;
 
@@ -319,7 +319,7 @@ void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvlidate);
 }
 
-void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   if (m_dwUpState != CFWL_PartState_Normal && IsUpButtonEnabled())
@@ -330,7 +330,7 @@ void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_SpinButton::OnKeyDown(CFWL_MessageKey* pMsg) {
   bool bUp =
       pMsg->m_dwKeyCode == FWL_VKEY_Up || pMsg->m_dwKeyCode == FWL_VKEY_Left;
   bool bDown =
diff --git a/xfa/fwl/core/cfwl_spinbutton.h b/xfa/fwl/cfwl_spinbutton.h
index dc480071ec..4794461fb2 100644
--- a/xfa/fwl/core/cfwl_spinbutton.h
+++ b/xfa/fwl/cfwl_spinbutton.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SPINBUTTON_H_
-#define XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#ifndef XFA_FWL_CFWL_SPINBUTTON_H_
+#define XFA_FWL_CFWL_SPINBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 
 #define FWL_STYLEEXE_SPB_Vert (1L << 0)
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 
 class CFWL_SpinButton : public CFWL_Widget {
@@ -53,11 +53,11 @@ class CFWL_SpinButton : public CFWL_Widget {
                       IFWL_ThemeProvider* pTheme,
                       const CFX_Matrix* pMatrix);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtUpButton;
@@ -70,4 +70,4 @@ class CFWL_SpinButton : public CFWL_Widget {
   CFWL_SpinButton::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#endif  // XFA_FWL_CFWL_SPINBUTTON_H_
diff --git a/xfa/fwl/core/cfwl_sysbtn.cpp b/xfa/fwl/cfwl_sysbtn.cpp
index 0ccc4c4b1d..6f78d0245d 100644
--- a/xfa/fwl/core/cfwl_sysbtn.cpp
+++ b/xfa/fwl/cfwl_sysbtn.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_sysbtn.h"
+#include "xfa/fwl/cfwl_sysbtn.h"
 
-#include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themepart.h"
 
 CFWL_SysBtn::CFWL_SysBtn() {
   m_rtBtn.Set(0, 0, 0, 0);
diff --git a/xfa/fwl/core/cfwl_sysbtn.h b/xfa/fwl/cfwl_sysbtn.h
index b973b92ff8..e79b438f6a 100644
--- a/xfa/fwl/core/cfwl_sysbtn.h
+++ b/xfa/fwl/cfwl_sysbtn.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SYSBTN_H_
-#define XFA_FWL_CORE_CFWL_SYSBTN_H_
+#ifndef XFA_FWL_CFWL_SYSBTN_H_
+#define XFA_FWL_CFWL_SYSBTN_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 
@@ -30,4 +30,4 @@ class CFWL_SysBtn {
   uint32_t m_dwState;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SYSBTN_H_
+#endif  // XFA_FWL_CFWL_SYSBTN_H_
diff --git a/xfa/fwl/core/cfwl_themebackground.h b/xfa/fwl/cfwl_themebackground.h
index 54d58b38f6..3f20488830 100644
--- a/xfa/fwl/core/cfwl_themebackground.h
+++ b/xfa/fwl/cfwl_themebackground.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_
-#define XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_
+#ifndef XFA_FWL_CFWL_THEMEBACKGROUND_H_
+#define XFA_FWL_CFWL_THEMEBACKGROUND_H_
 
 #include "core/fxge/fx_dib.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themepart.h"
 
 class CFX_DIBitmpa;
 class CFX_Graphics;
@@ -24,4 +24,4 @@ class CFWL_ThemeBackground : public CFWL_ThemePart {
   CFX_Path* m_pPath;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_
+#endif  // XFA_FWL_CFWL_THEMEBACKGROUND_H_
diff --git a/xfa/fwl/core/cfwl_themepart.cpp b/xfa/fwl/cfwl_themepart.cpp
index 6b48a1e03e..25592f3c9e 100644
--- a/xfa/fwl/core/cfwl_themepart.cpp
+++ b/xfa/fwl/cfwl_themepart.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themepart.h"
 
 CFWL_ThemePart::CFWL_ThemePart()
     : m_pWidget(nullptr),
diff --git a/xfa/fwl/core/cfwl_themepart.h b/xfa/fwl/cfwl_themepart.h
index f80bb8e07a..677d07b9c0 100644
--- a/xfa/fwl/core/cfwl_themepart.h
+++ b/xfa/fwl/cfwl_themepart.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_THEMEPART_H_
-#define XFA_FWL_CORE_CFWL_THEMEPART_H_
+#ifndef XFA_FWL_CFWL_THEMEPART_H_
+#define XFA_FWL_CFWL_THEMEPART_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
@@ -93,4 +93,4 @@ class CFWL_ThemePart {
   void* m_pData;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_THEMEPART_H_
+#endif  // XFA_FWL_CFWL_THEMEPART_H_
diff --git a/xfa/fwl/core/cfwl_themetext.h b/xfa/fwl/cfwl_themetext.h
index 9662414069..6cbc465bf3 100644
--- a/xfa/fwl/core/cfwl_themetext.h
+++ b/xfa/fwl/cfwl_themetext.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_THEMETEXT_H_
-#define XFA_FWL_CORE_CFWL_THEMETEXT_H_
+#ifndef XFA_FWL_CFWL_THEMETEXT_H_
+#define XFA_FWL_CFWL_THEMETEXT_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themepart.h"
 
 class CFWL_ThemeText : public CFWL_ThemePart {
  public:
@@ -21,4 +21,4 @@ class CFWL_ThemeText : public CFWL_ThemePart {
   CFX_Graphics* m_pGraphics;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_THEMETEXT_H_
+#endif  // XFA_FWL_CFWL_THEMETEXT_H_
diff --git a/xfa/fwl/core/cfwl_timer.cpp b/xfa/fwl/cfwl_timer.cpp
index c909afcc49..c7214a4f72 100644
--- a/xfa/fwl/core/cfwl_timer.cpp
+++ b/xfa/fwl/cfwl_timer.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_timer.h"
+#include "xfa/fwl/cfwl_timer.h"
 
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_adaptertimermgr.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_adaptertimermgr.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
 CFWL_TimerInfo* CFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
diff --git a/xfa/fwl/core/cfwl_timer.h b/xfa/fwl/cfwl_timer.h
index 7b36c3eb49..6c9079acfe 100644
--- a/xfa/fwl/core/cfwl_timer.h
+++ b/xfa/fwl/cfwl_timer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_TIMER_H_
-#define XFA_FWL_CORE_CFWL_TIMER_H_
+#ifndef XFA_FWL_CFWL_TIMER_H_
+#define XFA_FWL_CFWL_TIMER_H_
 
 #include "core/fxcrt/fx_system.h"
 
@@ -24,4 +24,4 @@ class CFWL_Timer {
   CFWL_Widget* m_pWidget;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_CFWL_TIMER_H_
+#endif  // XFA_FWL_CFWL_TIMER_H_
diff --git a/xfa/fwl/core/cfwl_timerinfo.cpp b/xfa/fwl/cfwl_timerinfo.cpp
index 8322a1d6aa..8c7aaebbbb 100644
--- a/xfa/fwl/core/cfwl_timerinfo.cpp
+++ b/xfa/fwl/cfwl_timerinfo.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_timerinfo.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
 
-#include "xfa/fwl/core/ifwl_adaptertimermgr.h"
+#include "xfa/fwl/ifwl_adaptertimermgr.h"
 
 void CFWL_TimerInfo::StopTimer() {
   m_pMgr->Stop(this);
diff --git a/xfa/fwl/core/cfwl_timerinfo.h b/xfa/fwl/cfwl_timerinfo.h
index 5365d38305..a47fede60f 100644
--- a/xfa/fwl/core/cfwl_timerinfo.h
+++ b/xfa/fwl/cfwl_timerinfo.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_TIMERINFO_H_
-#define XFA_FWL_CORE_CFWL_TIMERINFO_H_
+#ifndef XFA_FWL_CFWL_TIMERINFO_H_
+#define XFA_FWL_CFWL_TIMERINFO_H_
 
 #include "core/fxcrt/fx_system.h"
 
@@ -24,4 +24,4 @@ class CFWL_TimerInfo {
   IFWL_AdapterTimerMgr* m_pMgr;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_CFWL_TIMERINFO_H_
+#endif  // XFA_FWL_CFWL_TIMERINFO_H_
diff --git a/xfa/fwl/core/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp
index 225721be43..4da576423a 100644
--- a/xfa/fwl/core/cfwl_widget.cpp
+++ b/xfa/fwl/cfwl_widget.cpp
@@ -4,28 +4,28 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widget.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtmouse.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventmouse.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
 #define FWL_STYLEEXT_MNU_Vert (1L << 0)
@@ -711,9 +711,9 @@ void CFWL_Widget::OnProcessMessage(CFWL_Message* pMessage) {
   CFWL_Widget* pWidget = pMessage->m_pDstTarget;
   switch (pMessage->GetType()) {
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsgMouse = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsgMouse = static_cast<CFWL_MessageMouse*>(pMessage);
 
-      CFWL_EvtMouse evt(pWidget, pWidget);
+      CFWL_EventMouse evt(pWidget, pWidget);
       evt.m_dwCmd = pMsgMouse->m_dwCmd;
       pWidget->DispatchEvent(&evt);
       break;
diff --git a/xfa/fwl/core/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index 15acbf53c0..53839a761b 100644
--- a/xfa/fwl/core/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_WIDGET_H_
-#define XFA_FWL_CORE_CFWL_WIDGET_H_
+#ifndef XFA_FWL_CFWL_WIDGET_H_
+#define XFA_FWL_CFWL_WIDGET_H_
 #include <memory>
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/fwl_widgethit.h"
-#include "xfa/fwl/core/ifwl_widgetdelegate.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/fwl_widgethit.h"
+#include "xfa/fwl/ifwl_widgetdelegate.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 enum class FWL_Type {
@@ -39,7 +39,7 @@ enum class FWL_Type {
 
 class CFWL_App;
 class CFWL_AppImp;
-class CFWL_MsgKey;
+class CFWL_MessageKey;
 class CFWL_Widget;
 class CFWL_WidgetMgr;
 class CFWL_WidgetProperties;
@@ -193,4 +193,4 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
   IFWL_WidgetDelegate* m_pDelegate;  // Not owned.
 };
 
-#endif  // XFA_FWL_CORE_CFWL_WIDGET_H_
+#endif  // XFA_FWL_CFWL_WIDGET_H_
diff --git a/xfa/fwl/core/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index 5bcef7b7df..825de0e14e 100644
--- a/xfa/fwl/core/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
diff --git a/xfa/fwl/core/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h
index 5b72d44577..10825b941d 100644
--- a/xfa/fwl/core/cfwl_widgetmgr.h
+++ b/xfa/fwl/cfwl_widgetmgr.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_WIDGETMGR_H_
-#define XFA_FWL_CORE_CFWL_WIDGETMGR_H_
+#ifndef XFA_FWL_CFWL_WIDGETMGR_H_
+#define XFA_FWL_CFWL_WIDGETMGR_H_
 
 #include <map>
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/fwl_error.h"
-#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h"
+#include "xfa/fwl/fwl_error.h"
+#include "xfa/fwl/ifwl_widgetmgrdelegate.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
 #define FWL_WGTMGR_DisableForm 0x00000002
@@ -130,4 +130,4 @@ class CFWL_WidgetMgr : public CFWL_WidgetMgrDelegate {
 #endif
 };
 
-#endif  // XFA_FWL_CORE_CFWL_WIDGETMGR_H_
+#endif  // XFA_FWL_CFWL_WIDGETMGR_H_
diff --git a/xfa/fwl/core/cfwl_widgetproperties.cpp b/xfa/fwl/cfwl_widgetproperties.cpp
index 6e0330012c..1b41105ef3 100644
--- a/xfa/fwl/core/cfwl_widgetproperties.cpp
+++ b/xfa/fwl/cfwl_widgetproperties.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 CFWL_WidgetProperties::CFWL_WidgetProperties()
     : m_dwStyles(FWL_WGTSTYLE_Child),
diff --git a/xfa/fwl/core/cfwl_widgetproperties.h b/xfa/fwl/cfwl_widgetproperties.h
index d7bf72e9f9..065acad30f 100644
--- a/xfa/fwl/core/cfwl_widgetproperties.h
+++ b/xfa/fwl/cfwl_widgetproperties.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
-#define XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
+#ifndef XFA_FWL_CFWL_WIDGETPROPERTIES_H_
+#define XFA_FWL_CFWL_WIDGETPROPERTIES_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/fwl_widgetdef.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/fwl_widgetdef.h"
 
 class IFWL_ThemeProvider;
 class CFWL_Widget;
@@ -29,4 +29,4 @@ class CFWL_WidgetProperties {
   CFWL_Widget* m_pOwner;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
+#endif  // XFA_FWL_CFWL_WIDGETPROPERTIES_H_
diff --git a/xfa/fwl/core/cfx_barcode.cpp b/xfa/fwl/cfx_barcode.cpp
index 12c0cb0929..7af3aa1888 100644
--- a/xfa/fwl/core/cfx_barcode.cpp
+++ b/xfa/fwl/cfx_barcode.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfx_barcode.h"
+#include "xfa/fwl/cfx_barcode.h"
 
 #include "xfa/fxbarcode/cbc_codabar.h"
 #include "xfa/fxbarcode/cbc_code128.h"
diff --git a/xfa/fwl/core/cfx_barcode.h b/xfa/fwl/cfx_barcode.h
index 21fb7451d4..f639977cfc 100644
--- a/xfa/fwl/core/cfx_barcode.h
+++ b/xfa/fwl/cfx_barcode.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFX_BARCODE_H_
-#define XFA_FWL_CORE_CFX_BARCODE_H_
+#ifndef XFA_FWL_CFX_BARCODE_H_
+#define XFA_FWL_CFX_BARCODE_H_
 
 #include <memory>
 
@@ -62,4 +62,4 @@ class CFX_Barcode {
   std::unique_ptr<CBC_CodeBase> m_pBCEngine;
 };
 
-#endif  // XFA_FWL_CORE_CFX_BARCODE_H_
+#endif  // XFA_FWL_CFX_BARCODE_H_
diff --git a/xfa/fwl/core/cfwl_evtmouse.h b/xfa/fwl/core/cfwl_evtmouse.h
deleted file mode 100644
index e8b1fd541b..0000000000
--- a/xfa/fwl/core/cfwl_evtmouse.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FWL_CORE_CFWL_EVTMOUSE_H_
-#define XFA_FWL_CORE_CFWL_EVTMOUSE_H_
-
-#include "xfa/fwl/core/cfwl_event.h"
-
-class CFWL_EvtMouse : public CFWL_Event {
- public:
-  explicit CFWL_EvtMouse(CFWL_Widget* pSrcTarget);
-  CFWL_EvtMouse(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_EvtMouse() override;
-
-  FWL_MouseCommand m_dwCmd;
-};
-
-#endif  // XFA_FWL_CORE_CFWL_EVTMOUSE_H_
diff --git a/xfa/fwl/core/cfwl_evttextchanged.h b/xfa/fwl/core/cfwl_evttextchanged.h
deleted file mode 100644
index a2d0761f80..0000000000
--- a/xfa/fwl/core/cfwl_evttextchanged.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FWL_CORE_CFWL_EVTTEXTCHANGED_H_
-#define XFA_FWL_CORE_CFWL_EVTTEXTCHANGED_H_
-
-#include "xfa/fwl/core/cfwl_event.h"
-
-class CFWL_EvtTextChanged : public CFWL_Event {
- public:
-  explicit CFWL_EvtTextChanged(CFWL_Widget* pSrcTarget);
-  ~CFWL_EvtTextChanged() override;
-
-  CFX_WideString wsPrevText;
-};
-
-#endif  // XFA_FWL_CORE_CFWL_EVTTEXTCHANGED_H_
diff --git a/xfa/fwl/core/cfwl_msgkillfocus.cpp b/xfa/fwl/core/cfwl_msgkillfocus.cpp
deleted file mode 100644
index c7164850d1..0000000000
--- a/xfa/fwl/core/cfwl_msgkillfocus.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-
-#include <memory>
-
-#include "third_party/base/ptr_util.h"
-
-CFWL_MsgKillFocus::CFWL_MsgKillFocus(CFWL_Widget* pSrcTarget)
-    : CFWL_MsgKillFocus(pSrcTarget, nullptr) {}
-
-CFWL_MsgKillFocus::CFWL_MsgKillFocus(CFWL_Widget* pSrcTarget,
-                                     CFWL_Widget* pDstTarget)
-    : CFWL_Message(CFWL_Message::Type::KillFocus, pSrcTarget, pDstTarget) {}
-
-CFWL_MsgKillFocus::~CFWL_MsgKillFocus() {}
-
-std::unique_ptr<CFWL_Message> CFWL_MsgKillFocus::Clone() {
-  return pdfium::MakeUnique<CFWL_MsgKillFocus>(*this);
-}
diff --git a/xfa/fwl/core/cfwl_msgkillfocus.h b/xfa/fwl/core/cfwl_msgkillfocus.h
deleted file mode 100644
index 1c176b122a..0000000000
--- a/xfa/fwl/core/cfwl_msgkillfocus.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FWL_CORE_CFWL_MSGKILLFOCUS_H_
-#define XFA_FWL_CORE_CFWL_MSGKILLFOCUS_H_
-
-#include <memory>
-
-#include "xfa/fwl/core/cfwl_message.h"
-
-class CFWL_MsgKillFocus : public CFWL_Message {
- public:
-  explicit CFWL_MsgKillFocus(CFWL_Widget* pSrcTarget);
-  CFWL_MsgKillFocus(CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
-  ~CFWL_MsgKillFocus() override;
-
-  // CFWL_Message
-  std::unique_ptr<CFWL_Message> Clone() override;
-
-  CFWL_Widget* m_pSetFocus;
-};
-
-#endif  // XFA_FWL_CORE_CFWL_MSGKILLFOCUS_H_
diff --git a/xfa/fwl/core/fwl_error.h b/xfa/fwl/fwl_error.h
index 1332fbbb31..8ef56d9691 100644
--- a/xfa/fwl/core/fwl_error.h
+++ b/xfa/fwl/fwl_error.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_FWL_ERROR_H_
-#define XFA_FWL_CORE_FWL_ERROR_H_
+#ifndef XFA_FWL_FWL_ERROR_H_
+#define XFA_FWL_FWL_ERROR_H_
 
 enum class FWL_Error {
   Succeeded = 0,
@@ -16,4 +16,4 @@ enum class FWL_Error {
   MethodNotSupported
 };
 
-#endif  // XFA_FWL_CORE_FWL_ERROR_H_
+#endif  // XFA_FWL_FWL_ERROR_H_
diff --git a/xfa/fwl/core/fwl_widgetdef.h b/xfa/fwl/fwl_widgetdef.h
index 8644d99474..20013b0e4c 100644
--- a/xfa/fwl/core/fwl_widgetdef.h
+++ b/xfa/fwl/fwl_widgetdef.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_FWL_WIDGETDEF_H_
-#define XFA_FWL_CORE_FWL_WIDGETDEF_H_
+#ifndef XFA_FWL_FWL_WIDGETDEF_H_
+#define XFA_FWL_FWL_WIDGETDEF_H_
 
 #define FWL_WGTSTYLE_OverLapper (0L << 0)
 #define FWL_WGTSTYLE_Popup (1L << 0)
@@ -221,4 +221,4 @@
 #define FWL_VKEY_OEM_Clear 0xFE
 #define FWL_VKEY_Unknown 0
 
-#endif  // XFA_FWL_CORE_FWL_WIDGETDEF_H_
+#endif  // XFA_FWL_FWL_WIDGETDEF_H_
diff --git a/xfa/fwl/core/fwl_widgethit.h b/xfa/fwl/fwl_widgethit.h
index 3adecfe49e..ff5a80670a 100644
--- a/xfa/fwl/core/fwl_widgethit.h
+++ b/xfa/fwl/fwl_widgethit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_FWL_WIDGETHIT_H_
-#define XFA_FWL_CORE_FWL_WIDGETHIT_H_
+#ifndef XFA_FWL_FWL_WIDGETHIT_H_
+#define XFA_FWL_FWL_WIDGETHIT_H_
 
 enum class FWL_WidgetHit {
   Unknown = 0,
@@ -32,4 +32,4 @@ enum class FWL_WidgetHit {
   DownButton
 };
 
-#endif  // XFA_FWL_CORE_FWL_WIDGETHIT_H_
+#endif  // XFA_FWL_FWL_WIDGETHIT_H_
diff --git a/xfa/fwl/core/ifwl_adaptertimermgr.h b/xfa/fwl/ifwl_adaptertimermgr.h
index 0e07052e65..1f655892ea 100644
--- a/xfa/fwl/core/ifwl_adaptertimermgr.h
+++ b/xfa/fwl/ifwl_adaptertimermgr.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
-#define XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
+#ifndef XFA_FWL_IFWL_ADAPTERTIMERMGR_H_
+#define XFA_FWL_IFWL_ADAPTERTIMERMGR_H_
 
-#include "xfa/fwl/core/cfwl_timer.h"
+#include "xfa/fwl/cfwl_timer.h"
 
 class IFWL_AdapterTimerMgr {
  public:
@@ -18,4 +18,4 @@ class IFWL_AdapterTimerMgr {
   virtual void Stop(CFWL_TimerInfo* pTimerInfo) = 0;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_
+#endif  // XFA_FWL_IFWL_ADAPTERTIMERMGR_H_
diff --git a/xfa/fwl/core/ifwl_themeprovider.h b/xfa/fwl/ifwl_themeprovider.h
index e376cb1eea..69932e7fc9 100644
--- a/xfa/fwl/core/ifwl_themeprovider.h
+++ b/xfa/fwl/ifwl_themeprovider.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_
-#define XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_
+#ifndef XFA_FWL_IFWL_THEMEPROVIDER_H_
+#define XFA_FWL_IFWL_THEMEPROVIDER_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
@@ -26,4 +26,4 @@ class IFWL_ThemeProvider {
   virtual void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) = 0;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_
+#endif  // XFA_FWL_IFWL_THEMEPROVIDER_H_
diff --git a/xfa/fwl/core/ifwl_widgetdelegate.h b/xfa/fwl/ifwl_widgetdelegate.h
index 042679359c..a96f00dc9e 100644
--- a/xfa/fwl/core/ifwl_widgetdelegate.h
+++ b/xfa/fwl/ifwl_widgetdelegate.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_WIDGETDELEGATE_H_
-#define XFA_FWL_CORE_IFWL_WIDGETDELEGATE_H_
+#ifndef XFA_FWL_IFWL_WIDGETDELEGATE_H_
+#define XFA_FWL_IFWL_WIDGETDELEGATE_H_
 
 #include <stdint.h>
 
@@ -24,4 +24,4 @@ class IFWL_WidgetDelegate {
                             const CFX_Matrix* pMatrix) = 0;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_WIDGETDELEGATE_H_
+#endif  // XFA_FWL_IFWL_WIDGETDELEGATE_H_
diff --git a/xfa/fwl/core/ifwl_widgetmgrdelegate.h b/xfa/fwl/ifwl_widgetmgrdelegate.h
index 67f73d3315..9f0b5708b3 100644
--- a/xfa/fwl/core/ifwl_widgetmgrdelegate.h
+++ b/xfa/fwl/ifwl_widgetmgrdelegate.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_IFWL_WIDGETMGRDELEGATE_H_
-#define XFA_FWL_CORE_IFWL_WIDGETMGRDELEGATE_H_
+#ifndef XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_
+#define XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_
 
 class CFWL_Message;
 class CFX_Graphics;
@@ -21,4 +21,4 @@ class CFWL_WidgetMgrDelegate {
                             const CFX_Matrix* pMatrix) = 0;
 };
 
-#endif  // XFA_FWL_CORE_IFWL_WIDGETMGRDELEGATE_H_
+#endif  // XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_
diff --git a/xfa/fwl/theme/cfwl_barcodetp.cpp b/xfa/fwl/theme/cfwl_barcodetp.cpp
index 96112e209b..f123857e51 100644
--- a/xfa/fwl/theme/cfwl_barcodetp.cpp
+++ b/xfa/fwl/theme/cfwl_barcodetp.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fwl/theme/cfwl_barcodetp.h"
 
-#include "xfa/fwl/core/cfwl_barcode.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_barcode.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
 
 CFWL_BarcodeTP::CFWL_BarcodeTP() {}
 
diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp
index ff8c036ecb..63d6270f77 100644
--- a/xfa/fwl/theme/cfwl_carettp.cpp
+++ b/xfa/fwl/theme/cfwl_carettp.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fwl/theme/cfwl_carettp.h"
 
-#include "xfa/fwl/core/cfwl_caret.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_caret.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp
index 5ea849e089..4ff2ccd2a6 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -8,10 +8,10 @@
 
 #include "core/fxge/cfx_pathdata.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_checkbox.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_checkbox.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp
index 8b4041b729..3e06e665ae 100644
--- a/xfa/fwl/theme/cfwl_comboboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fwl/theme/cfwl_comboboxtp.h"
 
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.cpp b/xfa/fwl/theme/cfwl_datetimepickertp.cpp
index 3b5befb65c..ef8d0c869b 100644
--- a/xfa/fwl/theme/cfwl_datetimepickertp.cpp
+++ b/xfa/fwl/theme/cfwl_datetimepickertp.cpp
@@ -6,8 +6,8 @@
 
 #include "xfa/fwl/theme/cfwl_datetimepickertp.h"
 
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_themebackground.h"
 
 CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {}
 
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp
index bd12939fc0..f2fc5cb7a3 100644
--- a/xfa/fwl/theme/cfwl_edittp.cpp
+++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fwl/theme/cfwl_edittp.h"
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxfa/app/xfa_fwltheme.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 #include "xfa/fxgraphics/cfx_color.h"
diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp
index 8356820606..6f082a8729 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_listboxtp.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fwl/theme/cfwl_listboxtp.h"
 
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
index d090e70c9d..3684e77c66 100644
--- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
@@ -7,11 +7,11 @@
 #include "xfa/fwl/theme/cfwl_monthcalendartp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_monthcalendar.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_monthcalendar.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_pictureboxtp.cpp b/xfa/fwl/theme/cfwl_pictureboxtp.cpp
index 600de0e355..75c60387b4 100644
--- a/xfa/fwl/theme/cfwl_pictureboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_pictureboxtp.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fwl/theme/cfwl_pictureboxtp.h"
 
-#include "xfa/fwl/core/cfwl_picturebox.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_picturebox.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
 
 CFWL_PictureBoxTP::CFWL_PictureBoxTP() {}
 
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
index 3b37b613aa..31f6b7ade1 100644
--- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fwl/theme/cfwl_pushbuttontp.h"
 
-#include "xfa/fwl/core/cfwl_pushbutton.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_pushbutton.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp
index 19022cad26..0129f353ad 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fwl/theme/cfwl_scrollbartp.h"
 
-#include "xfa/fwl/core/cfwl_scrollbar.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index d578435d8a..efc1e96335 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -12,12 +12,12 @@
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_arrowdata.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index 998d3c76e8..761cc89415 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -12,7 +12,7 @@
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/fwl_error.h"
 #include "xfa/fwl/theme/cfwl_utils.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp
index a0674b6522..4de5f70a6d 100644
--- a/xfa/fxfa/app/xfa_ffapp.cpp
+++ b/xfa/fxfa/app/xfa_ffapp.cpp
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "xfa/fgas/font/cfgas_fontmgr.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/app/xfa_fwltheme.h"
 #include "xfa/fxfa/xfa_ffdoc.h"
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index 6f83173b71..de0638fb13 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -7,9 +7,9 @@
 #include "xfa/fxfa/app/xfa_ffbarcode.h"
 
 #include "core/fxcrt/fx_ext.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_barcode.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_barcode.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fftextedit.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
index 47b628cdec..30ea09ff4d 100644
--- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fxfa/app/xfa_ffcheckbutton.h"
 
-#include "xfa/fwl/core/cfwl_checkbox.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_checkbox.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 #include "xfa/fxfa/app/xfa_ffexclgroup.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/xfa_ffapp.h"
@@ -246,7 +246,7 @@ bool CXFA_FFCheckButton::OnLButtonUp(uint32_t dwFlags,
     return false;
 
   SetButtonDown(false);
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonUp;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
index e8c364a613..72284d6ef7 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
+++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
@@ -7,13 +7,13 @@
 #include "xfa/fxfa/app/xfa_ffchoicelist.h"
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
@@ -508,8 +508,8 @@ void CXFA_FFComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
   switch (pEvent->GetType()) {
     case CFWL_Event::Type::SelectChanged: {
-      CFWL_EvtSelectChanged* postEvent =
-          static_cast<CFWL_EvtSelectChanged*>(pEvent);
+      CFWL_EventSelectChanged* postEvent =
+          static_cast<CFWL_EventSelectChanged*>(pEvent);
       OnSelectChanged(m_pNormalWidget, postEvent->bLButtonUp);
       break;
     }
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp
index 917c853991..516f3d7fa0 100644
--- a/xfa/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/fxfa/app/xfa_ffdoc.cpp
@@ -17,7 +17,7 @@
 #include "core/fxcrt/fx_ext.h"
 #include "core/fxcrt/fx_memory.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_dataexporter.h"
 #include "xfa/fxfa/parser/cxfa_dataimporter.h"
diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp
index 9b5504708f..68db2ba765 100644
--- a/xfa/fxfa/app/xfa_fffield.cpp
+++ b/xfa/fxfa/app/xfa_fffield.cpp
@@ -6,15 +6,15 @@
 
 #include "xfa/fxfa/app/xfa_fffield.h"
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_evtmouse.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgmousewheel.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_picturebox.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_eventmouse.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagemousewheel.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_picturebox.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 #include "xfa/fxfa/app/xfa_fwltheme.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
 #include "xfa/fxfa/xfa_ffapp.h"
@@ -349,7 +349,7 @@ bool CXFA_FFField::OnMouseEnter() {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::Enter;
   TranslateFWLMessage(&ms);
   return true;
@@ -358,7 +358,7 @@ bool CXFA_FFField::OnMouseExit() {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::Leave;
   TranslateFWLMessage(&ms);
   return true;
@@ -385,7 +385,7 @@ bool CXFA_FFField::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
     return false;
   }
   SetButtonDown(true);
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonDown;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -402,7 +402,7 @@ bool CXFA_FFField::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
     return false;
   }
   SetButtonDown(false);
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonUp;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -415,7 +415,7 @@ bool CXFA_FFField::OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonDblClk;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -428,7 +428,7 @@ bool CXFA_FFField::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::Move;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -444,7 +444,7 @@ bool CXFA_FFField::OnMouseWheel(uint32_t dwFlags,
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouseWheel ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouseWheel ms(nullptr, m_pNormalWidget);
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
   ms.m_fy = fy;
@@ -467,7 +467,7 @@ bool CXFA_FFField::OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   }
   SetButtonDown(true);
 
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::RightButtonDown;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -484,7 +484,7 @@ bool CXFA_FFField::OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
     return false;
   }
   SetButtonDown(false);
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::RightButtonUp;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -497,7 +497,7 @@ bool CXFA_FFField::OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::RightButtonDblClk;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -512,7 +512,7 @@ bool CXFA_FFField::OnSetFocus(CXFA_FFWidget* pOldWidget) {
   if (!m_pNormalWidget) {
     return false;
   }
-  CFWL_MsgSetFocus ms(nullptr, m_pNormalWidget);
+  CFWL_MessageSetFocus ms(nullptr, m_pNormalWidget);
   TranslateFWLMessage(&ms);
   m_dwStatus |= XFA_WidgetStatus_Focused;
   AddInvalidateRect();
@@ -522,7 +522,7 @@ bool CXFA_FFField::OnKillFocus(CXFA_FFWidget* pNewWidget) {
   if (!m_pNormalWidget) {
     return CXFA_FFWidget::OnKillFocus(pNewWidget);
   }
-  CFWL_MsgKillFocus ms(nullptr, m_pNormalWidget);
+  CFWL_MessageKillFocus ms(nullptr, m_pNormalWidget);
   TranslateFWLMessage(&ms);
   m_dwStatus &= ~XFA_WidgetStatus_Focused;
   AddInvalidateRect();
@@ -533,7 +533,7 @@ bool CXFA_FFField::OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) {
   if (!m_pNormalWidget || !m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return false;
   }
-  CFWL_MsgKey ms(nullptr, m_pNormalWidget);
+  CFWL_MessageKey ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_KeyCommand::KeyDown;
   ms.m_dwFlags = dwFlags;
   ms.m_dwKeyCode = dwKeyCode;
@@ -544,7 +544,7 @@ bool CXFA_FFField::OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) {
   if (!m_pNormalWidget || !m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return false;
   }
-  CFWL_MsgKey ms(nullptr, m_pNormalWidget);
+  CFWL_MessageKey ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_KeyCommand::KeyUp;
   ms.m_dwFlags = dwFlags;
   ms.m_dwKeyCode = dwKeyCode;
@@ -564,7 +564,7 @@ bool CXFA_FFField::OnChar(uint32_t dwChar, uint32_t dwFlags) {
   if (m_pDataAcc->GetAccess() != XFA_ATTRIBUTEENUM_Open) {
     return false;
   }
-  CFWL_MsgKey ms(nullptr, m_pNormalWidget);
+  CFWL_MessageKey ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_KeyCommand::Char;
   ms.m_dwFlags = dwFlags;
   ms.m_dwKeyCode = dwChar;
@@ -757,7 +757,7 @@ void CXFA_FFField::OnProcessMessage(CFWL_Message* pMessage) {}
 void CXFA_FFField::OnProcessEvent(CFWL_Event* pEvent) {
   switch (pEvent->GetType()) {
     case CFWL_Event::Type::Mouse: {
-      CFWL_EvtMouse* event = (CFWL_EvtMouse*)pEvent;
+      CFWL_EventMouse* event = (CFWL_EventMouse*)pEvent;
       if (event->m_dwCmd == FWL_MouseCommand::Enter) {
         CXFA_EventParam eParam;
         eParam.m_eType = XFA_EVENT_MouseEnter;
diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h
index 17d33da754..6b4c92ae1d 100644
--- a/xfa/fxfa/app/xfa_fffield.h
+++ b/xfa/fxfa/app/xfa_fffield.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FXFA_APP_XFA_FFFIELD_H_
 #define XFA_FXFA_APP_XFA_FFFIELD_H_
 
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_widgetdelegate.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/ifwl_widgetdelegate.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp
index 8ee6510b2d..04ad313a27 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/xfa_ffimageedit.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fxfa/app/xfa_ffimageedit.h"
 
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_picturebox.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_picturebox.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/xfa_ffdoc.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
@@ -93,7 +93,7 @@ bool CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags,
 
   SetButtonDown(true);
 
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonDown;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp
index a2b11e89ae..c12aa48d1a 100644
--- a/xfa/fxfa/app/xfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fxfa/app/xfa_ffpushbutton.h"
 
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_pushbutton.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_pushbutton.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_ffwidgetacc.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
diff --git a/xfa/fxfa/app/xfa_fftext.cpp b/xfa/fxfa/app/xfa_fftext.cpp
index c7e4f04d3c..cc7b65cabc 100644
--- a/xfa/fxfa/app/xfa_fftext.cpp
+++ b/xfa/fxfa/app/xfa_fftext.cpp
@@ -6,8 +6,8 @@
 
 #include "xfa/fxfa/app/xfa_fftext.h"
 
-#include "xfa/fwl/core/fwl_widgetdef.h"
-#include "xfa/fwl/core/fwl_widgethit.h"
+#include "xfa/fwl/fwl_widgetdef.h"
+#include "xfa/fwl/fwl_widgethit.h"
 #include "xfa/fxfa/app/xfa_ffdraw.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
 #include "xfa/fxfa/xfa_ffapp.h"
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index a678a20f6c..50b087315d 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -8,16 +8,16 @@
 
 #include <vector>
 
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_evtcheckword.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
-#include "xfa/fwl/core/cfwl_evtvalidate.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_eventcheckword.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
+#include "xfa/fwl/cfwl_eventvalidate.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
@@ -117,7 +117,7 @@ bool CXFA_FFTextEdit::OnLButtonDown(uint32_t dwFlags,
     AddInvalidateRect();
   }
   SetButtonDown(true);
-  CFWL_MsgMouse ms(nullptr, m_pNormalWidget);
+  CFWL_MessageMouse ms(nullptr, m_pNormalWidget);
   ms.m_dwCmd = FWL_MouseCommand::LeftButtonDown;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -141,7 +141,7 @@ bool CXFA_FFTextEdit::OnRButtonDown(uint32_t dwFlags,
     AddInvalidateRect();
   }
   SetButtonDown(true);
-  CFWL_MsgMouse ms(nullptr, nullptr);
+  CFWL_MessageMouse ms(nullptr, nullptr);
   ms.m_dwCmd = FWL_MouseCommand::RightButtonDown;
   ms.m_dwFlags = dwFlags;
   ms.m_fx = fx;
@@ -165,12 +165,12 @@ bool CXFA_FFTextEdit::OnSetFocus(CXFA_FFWidget* pOldWidget) {
     AddInvalidateRect();
   }
   CXFA_FFWidget::OnSetFocus(pOldWidget);
-  CFWL_MsgSetFocus ms(nullptr, m_pNormalWidget);
+  CFWL_MessageSetFocus ms(nullptr, m_pNormalWidget);
   TranslateFWLMessage(&ms);
   return true;
 }
 bool CXFA_FFTextEdit::OnKillFocus(CXFA_FFWidget* pNewWidget) {
-  CFWL_MsgKillFocus ms(nullptr, m_pNormalWidget);
+  CFWL_MessageKillFocus ms(nullptr, m_pNormalWidget);
   TranslateFWLMessage(&ms);
   m_dwStatus &= ~XFA_WidgetStatus_Focused;
   SetEditScrollOffset();
@@ -335,7 +335,8 @@ void CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
   switch (pEvent->GetType()) {
     case CFWL_Event::Type::TextChanged: {
-      CFWL_EvtTextChanged* event = static_cast<CFWL_EvtTextChanged*>(pEvent);
+      CFWL_EventTextChanged* event =
+          static_cast<CFWL_EventTextChanged*>(pEvent);
       CFX_WideString wsChange;
       OnTextChanged(m_pNormalWidget, wsChange, event->wsPrevText);
       break;
@@ -346,7 +347,7 @@ void CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
     }
     case CFWL_Event::Type::CheckWord: {
       CFX_WideString wstr(L"FWL_EVENT_DTP_SelectChanged");
-      CFWL_EvtCheckWord* event = static_cast<CFWL_EvtCheckWord*>(pEvent);
+      CFWL_EventCheckWord* event = static_cast<CFWL_EventCheckWord*>(pEvent);
       event->bCheckWord = CheckWord(event->bsWord.AsStringC());
       break;
     }
@@ -414,7 +415,7 @@ void CXFA_FFNumericEdit::UpdateWidgetProperty() {
 
 void CXFA_FFNumericEdit::OnProcessEvent(CFWL_Event* pEvent) {
   if (pEvent->GetType() == CFWL_Event::Type::Validate) {
-    CFWL_EvtValidate* event = static_cast<CFWL_EvtValidate*>(pEvent);
+    CFWL_EventValidate* event = static_cast<CFWL_EventValidate*>(pEvent);
     event->bValidate = OnValidate(m_pNormalWidget, event->wsInsert);
     return;
   }
@@ -679,7 +680,8 @@ void CXFA_FFDateTimeEdit::OnSelectChanged(CFWL_Widget* pWidget,
 
 void CXFA_FFDateTimeEdit::OnProcessEvent(CFWL_Event* pEvent) {
   if (pEvent->GetType() == CFWL_Event::Type::SelectChanged) {
-    CFWL_EvtSelectChanged* event = static_cast<CFWL_EvtSelectChanged*>(pEvent);
+    CFWL_EventSelectChanged* event =
+        static_cast<CFWL_EventSelectChanged*>(pEvent);
     OnSelectChanged(m_pNormalWidget, event->iYear, event->iMonth, event->iDay);
     return;
   }
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 99333ba1dd..f46c6a0381 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -17,7 +17,7 @@
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
-#include "xfa/fwl/core/fwl_widgethit.h"
+#include "xfa/fwl/fwl_widgethit.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/fxfa_widget.h"
diff --git a/xfa/fxfa/app/xfa_fwladapter.h b/xfa/fxfa/app/xfa_fwladapter.h
index 3aaa04e513..11181ddf36 100644
--- a/xfa/fxfa/app/xfa_fwladapter.h
+++ b/xfa/fxfa/app/xfa_fwladapter.h
@@ -9,7 +9,7 @@
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/fwl_error.h"
 
 class CFWL_Widget;
 
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp
index 0222ddd7f7..2ca6237109 100644
--- a/xfa/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/fxfa/app/xfa_fwltheme.cpp
@@ -9,19 +9,19 @@
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fwl/core/cfwl_barcode.h"
-#include "xfa/fwl/core/cfwl_caret.h"
-#include "xfa/fwl/core/cfwl_checkbox.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_monthcalendar.h"
-#include "xfa/fwl/core/cfwl_picturebox.h"
-#include "xfa/fwl/core/cfwl_pushbutton.h"
-#include "xfa/fwl/core/cfwl_scrollbar.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_barcode.h"
+#include "xfa/fwl/cfwl_caret.h"
+#include "xfa/fwl/cfwl_checkbox.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_monthcalendar.h"
+#include "xfa/fwl/cfwl_picturebox.h"
+#include "xfa/fwl/cfwl_pushbutton.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 #include "xfa/fxgraphics/cfx_color.h"
diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h
index 257995094a..98fd74c315 100644
--- a/xfa/fxfa/app/xfa_fwltheme.h
+++ b/xfa/fxfa/app/xfa_fwltheme.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_barcodetp.h"
 #include "xfa/fwl/theme/cfwl_carettp.h"
 #include "xfa/fwl/theme/cfwl_checkboxtp.h"
diff --git a/xfa/fxfa/xfa_ffapp.h b/xfa/fxfa/xfa_ffapp.h
index 5883be2279..bc6e948ebf 100644
--- a/xfa/fxfa/xfa_ffapp.h
+++ b/xfa/fxfa/xfa_ffapp.h
@@ -14,7 +14,7 @@
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
 #include "core/fxcrt/cfx_retain_ptr.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
-#include "xfa/fwl/core/cfwl_app.h"
+#include "xfa/fwl/cfwl_app.h"
 #include "xfa/fxfa/fxfa.h"
 
 class CXFA_DefFontMgr;
diff --git a/xfa/fxfa/xfa_ffwidget.h b/xfa/fxfa/xfa_ffwidget.h
index 031c35ba2b..f4ef8ce97b 100644
--- a/xfa/fxfa/xfa_ffwidget.h
+++ b/xfa/fxfa/xfa_ffwidget.h
@@ -11,7 +11,7 @@
 
 #include "core/fxcodec/fx_codec_def.h"
 #include "core/fxge/cfx_graphstatedata.h"
-#include "xfa/fwl/core/cfwl_app.h"
+#include "xfa/fwl/cfwl_app.h"
 #include "xfa/fxfa/fxfa.h"
 #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
 
diff --git a/xfa/fxgraphics/cfx_graphics.h b/xfa/fxgraphics/cfx_graphics.h
index 7d9fff3138..e18564bf6d 100644
--- a/xfa/fxgraphics/cfx_graphics.h
+++ b/xfa/fxgraphics/cfx_graphics.h
@@ -15,7 +15,7 @@
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_dib.h"
 #include "core/fxge/fx_font.h"
-#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/fwl_error.h"
 
 class CFX_Color;
 class CFX_Path;