Remove xfa/src/fwl/src and move code up a level.

This Cl moves the xfa/src/fwl/src code up to the previously empty parent
directory and removes xfa/src/fwl/src.

R=tsepez@chromium.org

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

79 files changed, 317 insertions, 334 deletions

diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/basewidget/fwl_barcodeimp.cpp
index 93bd2bee22..af604f15a6 100644
--- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_barcodeimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_barcodeimp.h"
+#include "xfa/src/fwl/basewidget/fwl_barcodeimp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_Barcode* IFWL_Barcode::Create(const CFWL_WidgetImpProperties& properties) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.h b/xfa/src/fwl/basewidget/fwl_barcodeimp.h
index 9426a7f928..eedcb16024 100644
--- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.h
+++ b/xfa/src/fwl/basewidget/fwl_barcodeimp.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_BARCODEIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_BARCODEIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_BARCODEIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_BARCODEIMP_H_
 
 #include "xfa/include/fwl/basewidget/fwl_barcode.h"
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 #include "xfa/include/fwl/basewidget/fxmath_barcode.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
 
 class CFWL_WidgetImpProperties;
 class CFWL_BarcodeImpDelegate;
@@ -51,4 +51,4 @@ class CFWL_BarcodeImpDelegate : public CFWL_EditImpDelegate {
   FWL_ERR OnProcessEvent(CFWL_Event* pEvent) override;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_BARCODEIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_BARCODEIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/basewidget/fwl_caretimp.cpp
index e414b32630..752f889dcf 100644
--- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_caretimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_caretimp.h"
+#include "xfa/src/fwl/basewidget/fwl_caretimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_caret.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.h b/xfa/src/fwl/basewidget/fwl_caretimp.h
index ae334e944b..e3dde63ab6 100644
--- a/xfa/src/fwl/src/basewidget/fwl_caretimp.h
+++ b/xfa/src/fwl/basewidget/fwl_caretimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_CARETIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_CARETIMP_H_
 
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -64,4 +64,4 @@ class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_CaretImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_CARETIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
index b167b6fff3..ba9f0fedc3 100644
--- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_checkboximp.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_checkboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_checkboximp.h"
 
 #include <algorithm>
 
 #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 #define FWL_CKB_CaptionMargin 5
 
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.h b/xfa/src/fwl/basewidget/fwl_checkboximp.h
index c1ce80dcda..98702aaa59 100644
--- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.h
+++ b/xfa/src/fwl/basewidget/fwl_checkboximp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_CHECKBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_CHECKBOXIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -61,4 +61,4 @@ class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_CheckBoxImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_CHECKBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
index d9f6220a1c..842ab8aaa9 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
+#include "xfa/src/fwl/basewidget/fwl_listboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 // static
 IFWL_ComboBox* IFWL_ComboBox::Create(
@@ -136,8 +136,7 @@ CFWL_ComboEditImp::CFWL_ComboEditImp(const CFWL_WidgetImpProperties& properties,
 }
 
 CFWL_ComboEditImpDelegate::CFWL_ComboEditImpDelegate(CFWL_ComboEditImp* pOwner)
-    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {
-}
+    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {}
 int32_t CFWL_ComboEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -279,8 +278,7 @@ void CFWL_ComboListImp::SetFocus(FX_BOOL bSet) {
   CFWL_WidgetImp::SetFocus(bSet);
 }
 CFWL_ComboListImpDelegate::CFWL_ComboListImpDelegate(CFWL_ComboListImp* pOwner)
-    : CFWL_ListBoxImpDelegate(pOwner), m_pOwner(pOwner) {
-}
+    : CFWL_ListBoxImpDelegate(pOwner), m_pOwner(pOwner) {}
 int32_t CFWL_ComboListImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -477,8 +475,7 @@ CFWL_ComboBoxImp::CFWL_ComboBoxImp(const CFWL_WidgetImpProperties& properties,
   m_rtBtn.Reset();
   m_rtHandler.Reset();
 }
-CFWL_ComboBoxImp::~CFWL_ComboBoxImp() {
-}
+CFWL_ComboBoxImp::~CFWL_ComboBoxImp() {}
 FWL_ERR CFWL_ComboBoxImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_ComboBox;
   return FWL_ERR_Succeeded;
@@ -1533,8 +1530,9 @@ void CFWL_ComboBoxImpDelegate::DoSubCtrlKey(CFWL_MsgKey* pMsg) {
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
   if (bUp || bDown) {
-    int32_t iCount = static_cast<CFWL_ComboListImp*>(
-                         m_pOwner->m_pListBox->GetImpl())->CountItems();
+    int32_t iCount =
+        static_cast<CFWL_ComboListImp*>(m_pOwner->m_pListBox->GetImpl())
+            ->CountItems();
     if (iCount < 1) {
       return;
     }
@@ -1731,8 +1729,7 @@ CFWL_ComboProxyImpDelegate::CFWL_ComboProxyImpDelegate(
       m_bLButtonUpSelf(FALSE),
       m_fStartPos(0),
       m_pForm(pForm),
-      m_pComboBox(pComboBox) {
-}
+      m_pComboBox(pComboBox) {}
 int32_t CFWL_ComboProxyImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -1808,8 +1805,7 @@ void CFWL_ComboProxyImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     m_bLButtonUpSelf = TRUE;
   }
 }
-void CFWL_ComboProxyImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {
-}
+void CFWL_ComboProxyImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {}
 void CFWL_ComboProxyImpDelegate::OnDeactive(CFWL_MsgDeactivate* pMsg) {
   m_pComboBox->ShowDropList(FALSE);
 }
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.h b/xfa/src/fwl/basewidget/fwl_comboboximp.h
index f215367491..000e0afe9c 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.h
+++ b/xfa/src/fwl/basewidget/fwl_comboboximp.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_COMBOBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_COMBOBOXIMP_H_
 
 #include <memory>
 
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_listboximp.h"
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -234,4 +234,4 @@ class CFWL_ComboProxyImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ComboBoxImp* m_pComboBox;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_COMBOBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/basewidget/fwl_datetimepickerimp.cpp
index fb04dd1cbe..c969418c3a 100644
--- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_datetimepickerimp.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h"
+#include "xfa/src/fwl/basewidget/fwl_datetimepickerimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
+#include "xfa/src/fwl/basewidget/fwl_monthcalendarimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 #define FWL_DTP_WIDTH 100
 #define FWL_DTP_HEIGHT 20
@@ -67,8 +67,7 @@ IFWL_DateTimeEdit* IFWL_DateTimeEdit::Create(
   return pDateTimeEdit;
 }
 
-IFWL_DateTimePicker::IFWL_DateTimePicker() {
-}
+IFWL_DateTimePicker::IFWL_DateTimePicker() {}
 int32_t IFWL_DateTimePicker::CountSelRanges() {
   return static_cast<CFWL_DateTimePickerImp*>(GetImpl())
       ->GetDataTimeEdit()
@@ -166,8 +165,7 @@ FWL_ERR CFWL_DateTimeEdit::Finalize() {
 }
 CFWL_DateTimeEditImpDelegate::CFWL_DateTimeEditImpDelegate(
     CFWL_DateTimeEdit* pOwner)
-    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {
-}
+    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {}
 int32_t CFWL_DateTimeEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_OnProcessMessage(pMessage);
@@ -425,8 +423,7 @@ CFWL_DateTimePickerImp::CFWL_DateTimePickerImp(
       m_pForm(nullptr) {
   m_rtBtn.Set(0, 0, 0, 0);
 }
-CFWL_DateTimePickerImp::~CFWL_DateTimePickerImp() {
-}
+CFWL_DateTimePickerImp::~CFWL_DateTimePickerImp() {}
 FWL_ERR CFWL_DateTimePickerImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_DateTimePicker;
   return FWL_ERR_Succeeded;
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h b/xfa/src/fwl/basewidget/fwl_datetimepickerimp.h
index b1b7207104..4bc1063db5 100644
--- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h
+++ b/xfa/src/fwl/basewidget/fwl_datetimepickerimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
 
 #include <memory>
 
@@ -14,8 +14,8 @@
 #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_monthcalendarimp.h"
 
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
@@ -232,4 +232,4 @@ class CFWL_DateTimePickerImpDelegate : public CFWL_WidgetImpDelegate {
   void DisForm_OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE);
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/basewidget/fwl_editimp.cpp
index 8e876ed67d..5afaee1357 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_editimp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
 
 #include <algorithm>
 
@@ -14,15 +14,15 @@
 #include "xfa/src/fdp/include/fde_rdr.h"
 #include "xfa/src/fdp/include/fde_rdv.h"
 #include "xfa/src/fee/include/ifde_txtedtpage.h"
-#include "xfa/src/fwl/src/basewidget/fwl_caretimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_caretimp.h"
+#include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 // static
 IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties,
@@ -2148,5 +2148,4 @@ FX_BOOL CFWL_EditImpDelegate::OnScroll(IFWL_ScrollBar* pScrollBar,
   }
   return TRUE;
 }
-void CFWL_EditImpDelegate::DoCursor(CFWL_MsgMouse* pMsg) {
-}
+void CFWL_EditImpDelegate::DoCursor(CFWL_MsgMouse* pMsg) {}
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.h b/xfa/src/fwl/basewidget/fwl_editimp.h
index bec5c89f83..0dbdca27a0 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.h
+++ b/xfa/src/fwl/basewidget/fwl_editimp.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_EDITIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_EDITIMP_H_
 
 #include <memory>
 #include <vector>
 
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 #include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
@@ -205,4 +205,4 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_EditImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_EDITIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/basewidget/fwl_formproxyimp.cpp
index 5035a3ba30..3985f00b77 100644
--- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_formproxyimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h"
+#include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
 
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties,
                                      IFWL_Widget* pOuter)
diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.h b/xfa/src/fwl/basewidget/fwl_formproxyimp.h
index 6b7cc822ff..56ef05360c 100644
--- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.h
+++ b/xfa/src/fwl/basewidget/fwl_formproxyimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class CFWL_FormProxyImpDelegate;
@@ -39,4 +39,4 @@ class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_FormProxyImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
index dc7c33f2c6..26b27e8637 100644
--- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_listboximp.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 #define FWL_LISTBOX_ItemTextMargin 2
 
@@ -71,8 +71,7 @@ CFWL_ListBoxImp::CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties,
   m_rtConent.Reset();
   m_rtStatic.Reset();
 }
-CFWL_ListBoxImp::~CFWL_ListBoxImp() {
-}
+CFWL_ListBoxImp::~CFWL_ListBoxImp() {}
 FWL_ERR CFWL_ListBoxImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_ListBox;
   return FWL_ERR_Succeeded;
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.h b/xfa/src/fwl/basewidget/fwl_listboximp.h
index ae86e7359c..614b76c495 100644
--- a/xfa/src/fwl/src/basewidget/fwl_listboximp.h
+++ b/xfa/src/fwl/basewidget/fwl_listboximp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_LISTBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_LISTBOXIMP_H_
 
 #include <memory>
 
@@ -13,7 +13,7 @@
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/basewidget/fwl_listbox.h"
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_ListBoxImpDelegate;
 
@@ -118,4 +118,4 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ListBoxImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_LISTBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
index 3a7589e319..102f225a1d 100644
--- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h"
+#include "xfa/src/fwl/basewidget/fwl_monthcalendarimp.h"
 
 #include <algorithm>
 
 #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 #define MONTHCAL_HSEP_HEIGHT 1
 #define MONTHCAL_VSEP_WIDTH 1
@@ -974,8 +974,7 @@ FWL_ERR CFWL_MonthCalendarImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
   return m_pOwner->DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_MonthCalendarImpDelegate::OnActivate(CFWL_Message* pMsg) {
-}
+void CFWL_MonthCalendarImpDelegate::OnActivate(CFWL_Message* pMsg) {}
 
 void CFWL_MonthCalendarImpDelegate::OnFocusChanged(CFWL_Message* pMsg,
                                                    FX_BOOL bSet) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.h
index 5832f2e35c..98b295ed6e 100644
--- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h
+++ b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
 
 #include "xfa/src/fgas/include/fx_datetime.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -240,4 +240,4 @@ class CFWL_MonthCalendarImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_MonthCalendarImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_MONTHCALENDARIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/basewidget/fwl_pictureboximp.cpp
index 9e41143371..d0efaf3d2a 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_pictureboximp.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_pictureboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_pictureboximp.h"
 
 #include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_PictureBox* IFWL_PictureBox::Create(
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.h b/xfa/src/fwl/basewidget/fwl_pictureboximp.h
index aa2fa25799..cfa50afb70 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.h
+++ b/xfa/src/fwl/basewidget/fwl_pictureboximp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_PICTUREBOXIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_PICTUREBOXIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -50,4 +50,4 @@ class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_PictureBoxImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_PICTUREBOXIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
index a91fb0413e..2325217dc2 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h"
+#include "xfa/src/fwl/basewidget/fwl_pushbuttonimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_PushButton* IFWL_PushButton::Create(
@@ -23,8 +23,7 @@ IFWL_PushButton* IFWL_PushButton::Create(
   pPushButtonImpl->SetInterface(pPushButton);
   return pPushButton;
 }
-IFWL_PushButton::IFWL_PushButton() {
-}
+IFWL_PushButton::IFWL_PushButton() {}
 
 CFWL_PushButtonImp::CFWL_PushButtonImp(
     const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.h
index 96139e1385..5869074ba7 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h
+++ b/xfa/src/fwl/basewidget/fwl_pushbuttonimp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -62,4 +62,4 @@ class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_PushButtonImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/basewidget/fwl_scrollbarimp.cpp
index 81f4cad0a2..c43ebbbc85 100644
--- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_scrollbarimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h"
+#include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 #define FWL_SCROLLBAR_Elapse 500
 #define FWL_SCROLLBAR_MinThumb 5
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h b/xfa/src/fwl/basewidget/fwl_scrollbarimp.h
index 5bc3d0677f..be1f25470e 100644
--- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/basewidget/fwl_scrollbarimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
 
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -136,4 +136,4 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ScrollBarImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/basewidget/fwl_spinbuttonimp.cpp
index 037e7ccf36..fd7c226102 100644
--- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_spinbuttonimp.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h"
+#include "xfa/src/fwl/basewidget/fwl_spinbuttonimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 #define FWL_SPN_MinWidth 18
 #define FWL_SPN_MinHeight 32
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h b/xfa/src/fwl/basewidget/fwl_spinbuttonimp.h
index 6da9a603d3..769db28c30 100644
--- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h
+++ b/xfa/src/fwl/basewidget/fwl_spinbuttonimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
 
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class CFWL_SpinButtonImpDelegate;
@@ -66,4 +66,4 @@ class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_SpinButtonImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_SPINBUTTONIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
index 89efc42866..63966ba4c8 100644
--- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h"
+#include "xfa/src/fwl/basewidget/fwl_tooltipctrlimp.h"
 
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_ToolTip* IFWL_ToolTip::Create(const CFWL_WidgetImpProperties& properties,
@@ -33,8 +33,7 @@ FWL_ERR IFWL_ToolTip::Show() {
 FWL_ERR IFWL_ToolTip::Hide() {
   return static_cast<CFWL_ToolTipImp*>(GetImpl())->Hide();
 }
-IFWL_ToolTip::IFWL_ToolTip() {
-}
+IFWL_ToolTip::IFWL_ToolTip() {}
 CFWL_ToolTipImp::CFWL_ToolTipImp(const CFWL_WidgetImpProperties& properties,
                                  IFWL_Widget* pOuter)
     : CFWL_FormImp(properties, pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.h
index f72e57a68d..08fb7b0639 100644
--- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h
+++ b/xfa/src/fwl/basewidget/fwl_tooltipctrlimp.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
 
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -83,4 +83,4 @@ class CFWL_ToolTipImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_ToolTipImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_
diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/basewidget/fxmath_barcodeimp.cpp
index 19aff16250..8c9bfe432c 100644
--- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp
+++ b/xfa/src/fwl/basewidget/fxmath_barcodeimp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h"
+#include "xfa/src/fwl/basewidget/fxmath_barcodeimp.h"
 
 static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
   switch (type) {
diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h b/xfa/src/fwl/basewidget/fxmath_barcodeimp.h
index 1942d7ff64..22cb97bcc4 100644
--- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/basewidget/fxmath_barcodeimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_
-#define XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_
+#ifndef XFA_SRC_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_
+#define XFA_SRC_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_
 
 #include "xfa/include/fwl/basewidget/fxmath_barcode.h"
 
@@ -53,4 +53,4 @@ class CFX_Barcode : public IFX_Barcode {
   CBC_CodeBase* m_pBCEngine;
 };
 
-#endif  // XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_
+#endif  // XFA_SRC_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/core/fwl_appimp.cpp
index 9ee4d54310..43a3d0badf 100644
--- a/xfa/src/fwl/src/core/fwl_appimp.cpp
+++ b/xfa/src/fwl/core/fwl_appimp.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
 
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
   IFWL_App* pApp = new IFWL_App;
diff --git a/xfa/src/fwl/src/core/fwl_appimp.h b/xfa/src/fwl/core/fwl_appimp.h
index 1a046ed738..fa4ffecc65 100644
--- a/xfa/src/fwl/src/core/fwl_appimp.h
+++ b/xfa/src/fwl/core/fwl_appimp.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_APPIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_APPIMP_H_
 
 #include <memory>
 
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
 
 class CFWL_WidgetMgr;
 class IFWL_AdapterNative;
@@ -35,4 +35,4 @@ class CFWL_AppImp : public CFWL_NoteThreadImp {
   IFWL_ThemeProvider* m_pThemeProvider;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_APPIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/core/fwl_contentimp.cpp
index e73f9cdd3e..d415e33a26 100644
--- a/xfa/src/fwl/src/core/fwl_contentimp.cpp
+++ b/xfa/src/fwl/core/fwl_contentimp.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_contentimp.h"
+#include "xfa/src/fwl/core/fwl_contentimp.h"
 
 #include "xfa/include/fwl/core/fwl_content.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) {
   return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex);
@@ -34,8 +34,7 @@ FWL_ERR IFWL_Content::GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
 FWL_ERR IFWL_Content::SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight) {
   return static_cast<CFWL_ContentImp*>(GetImpl())->SetMaxSize(fWidth, fHeight);
 }
-IFWL_Content::IFWL_Content() {
-}
+IFWL_Content::IFWL_Content() {}
 CFWL_ContentImp::CFWL_ContentImp(const CFWL_WidgetImpProperties& properties,
                                  IFWL_Widget* pOuter)
     : CFWL_WidgetImp(properties, pOuter),
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.h b/xfa/src/fwl/core/fwl_contentimp.h
index 3ad800c2a0..d2b0277a86 100644
--- a/xfa/src/fwl/src/core/fwl_contentimp.h
+++ b/xfa/src/fwl/core/fwl_contentimp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_CONTENTIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_CONTENTIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class IFWL_Widget;
 
@@ -32,4 +32,4 @@ class CFWL_ContentImp : public CFWL_WidgetImp {
   FX_FLOAT m_fHeightMax;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_CONTENTIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/core/fwl_formimp.cpp
index 2c4fe749a8..426c1faa63 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/core/fwl_formimp.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
 
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 #define FWL_SYSBTNSIZE 21
 #define FWL_SYSBTNMARGIN 5
@@ -647,8 +647,7 @@ void CFWL_FormImp::SetWorkAreaRect() {
   pWidgetMgr->SetMaximize_Native(m_pInterface);
   Repaint(&m_rtRelative);
 }
-void CFWL_FormImp::SetCursor(FX_FLOAT fx, FX_FLOAT fy) {
-}
+void CFWL_FormImp::SetCursor(FX_FLOAT fx, FX_FLOAT fy) {}
 void CFWL_FormImp::Layout() {
   GetRelativeRect(m_rtRelative);
 #ifndef FWL_UseMacSystemBorder
@@ -871,8 +870,7 @@ void CFWL_FormImp::DoHeightLimit(FX_FLOAT& fTop,
   }
 }
 CFWL_FormImpDelegate::CFWL_FormImpDelegate(CFWL_FormImp* pOwner)
-    : m_pOwner(pOwner) {
-}
+    : m_pOwner(pOwner) {}
 int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
 #ifdef FWL_UseMacSystemBorder
   if (!pMessage)
diff --git a/xfa/src/fwl/src/core/fwl_formimp.h b/xfa/src/fwl/core/fwl_formimp.h
index c8875b0ee7..ad31da807c 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.h
+++ b/xfa/src/fwl/core/fwl_formimp.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_FORMIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_FORMIMP_H_
 
 #include "xfa/include/fwl/core/fwl_form.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_NoteLoop;
 class CFWL_WidgetImpProperties;
@@ -190,4 +190,4 @@ class CFWL_FormImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_FormImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_FORMIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/core/fwl_gridimp.cpp
index 91e39b4dde..1230fa2655 100644
--- a/xfa/src/fwl/src/core/fwl_gridimp.cpp
+++ b/xfa/src/fwl/core/fwl_gridimp.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_gridimp.h"
+#include "xfa/src/fwl/core/fwl_gridimp.h"
 
-#include "xfa/src/fwl/src/core/fwl_contentimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_contentimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 // static
 IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) {
@@ -1361,8 +1361,7 @@ void CFWL_GridImp::SetScaledColRowsSize(const CFX_PtrArray& spanScaleds,
   }
 }
 CFWL_GridImpDelegate::CFWL_GridImpDelegate(CFWL_GridImp* pOwner)
-    : m_pOwner(pOwner) {
-}
+    : m_pOwner(pOwner) {}
 int32_t CFWL_GridImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (pMessage->GetClassID() != FWL_MSGHASH_Mouse) {
     return 0;
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.h b/xfa/src/fwl/core/fwl_gridimp.h
index 092b489cbb..326b236295 100644
--- a/xfa/src/fwl/src/core/fwl_gridimp.h
+++ b/xfa/src/fwl/core/fwl_gridimp.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_GRIDIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_GRIDIMP_H_
 
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_grid.h"
-#include "xfa/src/fwl/src/core/fwl_contentimp.h"
+#include "xfa/src/fwl/core/fwl_contentimp.h"
 
 class CFWL_GridLength {
  public:
@@ -194,4 +194,4 @@ class CFWL_GridImpDelegate : public CFWL_WidgetImpDelegate {
   CFWL_GridImp* m_pOwner;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_GRIDIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/core/fwl_noteimp.cpp
index a4ff5cfb5b..3a46446362 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/core/fwl_noteimp.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_grid.h"
-#include "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_tooltipctrlimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm)
     : m_pForm(pForm), m_bContinueModal(TRUE) {}
@@ -278,46 +278,46 @@ FWL_ERR CFWL_NoteDriver::Run() {
     }
   }
 #elif(_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
-  FX_BOOL bIdle = TRUE;
-  int32_t iIdleCount = 0;
-  CFWL_NoteLoop* pTopLoop = NULL;
-  for (;;) {
-    pTopLoop = GetTopLoop();
-    if (!pTopLoop || !pTopLoop->ContinueModal()) {
-      break;
-    }
-    if (UnqueueMessage(pTopLoop)) {
-      continue;
-    }
-    while (bIdle && !(pWidgetMgr->CheckMessage_Native())) {
-      if (FWL_ERR_Indefinite == pTopLoop->Idle(iIdleCount++)) {
-        bIdle = FALSE;
+    FX_BOOL bIdle = TRUE;
+    int32_t iIdleCount = 0;
+    CFWL_NoteLoop* pTopLoop = NULL;
+    for (;;) {
+      pTopLoop = GetTopLoop();
+      if (!pTopLoop || !pTopLoop->ContinueModal()) {
+        break;
       }
+      if (UnqueueMessage(pTopLoop)) {
+        continue;
+      }
+      while (bIdle && !(pWidgetMgr->CheckMessage_Native())) {
+        if (FWL_ERR_Indefinite == pTopLoop->Idle(iIdleCount++)) {
+          bIdle = FALSE;
+        }
+      }
+      do {
+        if (FWL_ERR_Indefinite == pWidgetMgr->DispatchMessage_Native()) {
+          break;
+        }
+        if (pWidgetMgr->IsIdleMessage_Native()) {
+          bIdle = TRUE;
+          iIdleCount = 0;
+        }
+      } while (pWidgetMgr->CheckMessage_Native());
     }
-    do {
-      if (FWL_ERR_Indefinite == pWidgetMgr->DispatchMessage_Native()) {
+#elif(_FX_OS_ == _FX_LINUX_DESKTOP_)
+    CFWL_NoteLoop* pTopLoop = NULL;
+    for (;;) {
+      pTopLoop = GetTopLoop();
+      if (!pTopLoop || !pTopLoop->ContinueModal()) {
         break;
       }
-      if (pWidgetMgr->IsIdleMessage_Native()) {
-        bIdle = TRUE;
-        iIdleCount = 0;
+      if (UnqueueMessage(pTopLoop)) {
+        continue;
+      }
+      if (pWidgetMgr->CheckMessage_Native()) {
+        pWidgetMgr->DispatchMessage_Native();
       }
-    } while (pWidgetMgr->CheckMessage_Native());
-  }
-#elif(_FX_OS_ == _FX_LINUX_DESKTOP_)
-  CFWL_NoteLoop* pTopLoop = NULL;
-  for (;;) {
-    pTopLoop = GetTopLoop();
-    if (!pTopLoop || !pTopLoop->ContinueModal()) {
-      break;
-    }
-    if (UnqueueMessage(pTopLoop)) {
-      continue;
-    }
-    if (pWidgetMgr->CheckMessage_Native()) {
-      pWidgetMgr->DispatchMessage_Native();
     }
-  }
 #endif
   return FWL_ERR_Succeeded;
 }
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.h b/xfa/src/fwl/core/fwl_noteimp.h
index d824208625..72e1a8ef96 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.h
+++ b/xfa/src/fwl/core/fwl_noteimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_NOTEIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_NOTEIMP_H_
 
 #include "xfa/include/fwl/core/fwl_note.h"
 
@@ -154,4 +154,4 @@ class CFWL_ToolTipContainer {
   static CFWL_ToolTipContainer* s_pInstance;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_NOTEIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/core/fwl_panelimp.cpp
index f4d774e8fb..7d6c8ee874 100644
--- a/xfa/src/fwl/src/core/fwl_panelimp.cpp
+++ b/xfa/src/fwl/core/fwl_panelimp.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
 
 #include "xfa/include/fwl/core/fwl_content.h"
 #include "xfa/include/fwl/core/fwl_grid.h"
 #include "xfa/include/fwl/core/fwl_panel.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 // static
 IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.h b/xfa/src/fwl/core/fwl_panelimp.h
index c6f6fdc03f..1bd7159054 100644
--- a/xfa/src/fwl/src/core/fwl_panelimp.h
+++ b/xfa/src/fwl/core/fwl_panelimp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_PANELIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_PANELIMP_H_
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
@@ -29,4 +29,4 @@ class CFWL_PanelImp : public CFWL_WidgetImp {
   IFWL_Content* m_pContent;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_PANELIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/core/fwl_sdadapterimp.cpp
index 020bd54749..fedd6b285d 100644
--- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
+++ b/xfa/src/fwl/core/fwl_sdadapterimp.cpp
@@ -10,10 +10,10 @@
 #include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/core/fwl_app.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {}
 CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {}
diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/core/fwl_targetimp.cpp
index 57d39e3a9e..0c8d5fbce0 100644
--- a/xfa/src/fwl/src/core/fwl_targetimp.cpp
+++ b/xfa/src/fwl/core/fwl_targetimp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
 
 FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const {
   return m_pImpl->GetClassName(wsClass);
@@ -25,8 +25,7 @@ IFWL_Target::~IFWL_Target() {
   delete m_pImpl;
 }
 CFWL_TargetImp::CFWL_TargetImp() {}
-CFWL_TargetImp::~CFWL_TargetImp() {
-}
+CFWL_TargetImp::~CFWL_TargetImp() {}
 FWL_ERR CFWL_TargetImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass.Empty();
   return FWL_ERR_Succeeded;
diff --git a/xfa/src/fwl/src/core/fwl_targetimp.h b/xfa/src/fwl/core/fwl_targetimp.h
index 0cc2729e27..e243d39e9b 100644
--- a/xfa/src/fwl/src/core/fwl_targetimp.h
+++ b/xfa/src/fwl/core/fwl_targetimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_TARGETIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_TARGETIMP_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/include/fwl/core/fwl_target.h"
@@ -24,4 +24,4 @@ class CFWL_TargetImp {
   CFWL_TargetImp();
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_TARGETIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/core/fwl_threadimp.cpp
index 2adb4af07c..28df34eade 100644
--- a/xfa/src/fwl/src/core/fwl_threadimp.cpp
+++ b/xfa/src/fwl/core/fwl_threadimp.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
 
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
 
 void IFWL_Thread::Release() {
   delete m_pImpl;
diff --git a/xfa/src/fwl/src/core/fwl_threadimp.h b/xfa/src/fwl/core/fwl_threadimp.h
index ead224ae12..eaf30e6350 100644
--- a/xfa/src/fwl/src/core/fwl_threadimp.h
+++ b/xfa/src/fwl/core/fwl_threadimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_THREADIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_THREADIMP_H_
 
 #include "xfa/include/fwl/core/fwl_thread.h"  // For FWL_HTHREAD.
 
@@ -37,4 +37,4 @@ class CFWL_NoteThreadImp : public CFWL_ThreadImp {
   CFWL_NoteDriver* const m_pNoteDriver;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_THREADIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/core/fwl_timerimp.cpp
index 0aec1357a4..503c0f759e 100644
--- a/xfa/src/fwl/src/core/fwl_timerimp.cpp
+++ b/xfa/src/fwl/core/fwl_timerimp.cpp
@@ -8,9 +8,9 @@
 #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_timer.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
 
 FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer,
                           FX_DWORD dwElapse,
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/core/fwl_widgetimp.cpp
index 4e74d7b4f6..1e788260c2 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/core/fwl_widgetimp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 #include <algorithm>
 
@@ -19,11 +19,11 @@
 #include "xfa/include/fwl/core/fwl_form.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
   return static_cast<CFWL_WidgetImp*>(GetImpl())
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.h b/xfa/src/fwl/core/fwl_widgetimp.h
index 376294da13..d0dcf3cfc1 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.h
+++ b/xfa/src/fwl/core/fwl_widgetimp.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_WIDGETIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_WIDGETIMP_H_
 
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
 
 class CFWL_NoteThreadImp;
 class CFWL_WidgetImpProperties;
@@ -159,4 +159,4 @@ class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
                        const CFX_Matrix* pMatrix = NULL) override;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_WIDGETIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/core/fwl_widgetmgrimp.cpp
index 1237d9e0f8..aeb655b9ad 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/core/fwl_widgetmgrimp.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 #include "xfa/include/fwl/adapter/fwl_adapternative.h"
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_form.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) {
 #if (_FX_OS_ == _FX_MACOSX_)
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.h b/xfa/src/fwl/core/fwl_widgetmgrimp.h
index ef72448531..f3dfb36017 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/core/fwl_widgetmgrimp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_
+#ifndef XFA_SRC_FWL_CORE_FWL_WIDGETMGRIMP_H_
+#define XFA_SRC_FWL_CORE_FWL_WIDGETMGRIMP_H_
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
 
@@ -167,4 +167,4 @@ class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate {
   CFWL_WidgetMgr* m_pWidgetMgr;
 };
 
-#endif  // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_
+#endif  // XFA_SRC_FWL_CORE_FWL_WIDGETMGRIMP_H_
diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/lightwidget/app.cpp
index 31a39c17f0..31a39c17f0 100644
--- a/xfa/src/fwl/src/lightwidget/app.cpp
+++ b/xfa/src/fwl/lightwidget/app.cpp
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/lightwidget/barcode.cpp
index 4f05837352..4f05837352 100644
--- a/xfa/src/fwl/src/lightwidget/barcode.cpp
+++ b/xfa/src/fwl/lightwidget/barcode.cpp
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/lightwidget/caret.cpp
index cd37a3fe1e..bb5fd4cf9e 100644
--- a/xfa/src/fwl/src/lightwidget/caret.cpp
+++ b/xfa/src/fwl/lightwidget/caret.cpp
@@ -10,7 +10,7 @@
 
 #include "xfa/include/fwl/basewidget/fwl_caret.h"
 #include "xfa/include/fwl/lightwidget/edit.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
 
 CFWL_Caret* CFWL_Caret::Create() {
   return new CFWL_Caret;
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/lightwidget/checkbox.cpp
index 6b7a370973..6b7a370973 100644
--- a/xfa/src/fwl/src/lightwidget/checkbox.cpp
+++ b/xfa/src/fwl/lightwidget/checkbox.cpp
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/lightwidget/combobox.cpp
index aadb0d5ab6..aadb0d5ab6 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/lightwidget/combobox.cpp
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/lightwidget/datetimepicker.cpp
index 957ed87fed..957ed87fed 100644
--- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
+++ b/xfa/src/fwl/lightwidget/datetimepicker.cpp
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/lightwidget/edit.cpp
index cf87ae031d..cf87ae031d 100644
--- a/xfa/src/fwl/src/lightwidget/edit.cpp
+++ b/xfa/src/fwl/lightwidget/edit.cpp
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/lightwidget/listbox.cpp
index 6a7a26cd1b..6a7a26cd1b 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/lightwidget/listbox.cpp
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/lightwidget/picturebox.cpp
index e35741c3ac..e35741c3ac 100644
--- a/xfa/src/fwl/src/lightwidget/picturebox.cpp
+++ b/xfa/src/fwl/lightwidget/picturebox.cpp
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/lightwidget/pushbutton.cpp
index c9fb74e5f5..c9fb74e5f5 100644
--- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp
+++ b/xfa/src/fwl/lightwidget/pushbutton.cpp
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/lightwidget/scrollbar.cpp
index cc927e724e..cc927e724e 100644
--- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp
+++ b/xfa/src/fwl/lightwidget/scrollbar.cpp
diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/lightwidget/theme.cpp
index fe9f55928b..fe9f55928b 100644
--- a/xfa/src/fwl/src/lightwidget/theme.cpp
+++ b/xfa/src/fwl/lightwidget/theme.cpp
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/lightwidget/tooltipctrl.cpp
index 71be73c433..5a308c4c84 100644
--- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
+++ b/xfa/src/fwl/lightwidget/tooltipctrl.cpp
@@ -8,12 +8,12 @@
 
 #include <memory>
 
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 CFWL_ToolTip* CFWL_ToolTip::Create() {
   return new CFWL_ToolTip;
diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/lightwidget/widget.cpp
index dd2225637f..dc7de101bd 100644
--- a/xfa/src/fwl/src/lightwidget/widget.cpp
+++ b/xfa/src/fwl/lightwidget/widget.cpp
@@ -9,11 +9,11 @@
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/include/fwl/core/fwl_thread.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 CFWL_WidgetImpProperties CFWL_WidgetProperties::MakeWidgetImpProperties(
     IFWL_DataProvider* pDataProvider) const {
diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/theme/barcodetp.cpp
index 477ce99d9b..477ce99d9b 100644
--- a/xfa/src/fwl/src/theme/barcodetp.cpp
+++ b/xfa/src/fwl/theme/barcodetp.cpp
diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/theme/carettp.cpp
index 88b01d9f3d..88b01d9f3d 100644
--- a/xfa/src/fwl/src/theme/carettp.cpp
+++ b/xfa/src/fwl/theme/carettp.cpp
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/theme/checkboxtp.cpp
index a33291472a..a33291472a 100644
--- a/xfa/src/fwl/src/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/theme/checkboxtp.cpp
diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/theme/comboboxtp.cpp
index 33be07d44c..33be07d44c 100644
--- a/xfa/src/fwl/src/theme/comboboxtp.cpp
+++ b/xfa/src/fwl/theme/comboboxtp.cpp
diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/theme/datetimepickertp.cpp
index 5efe0b850e..5efe0b850e 100644
--- a/xfa/src/fwl/src/theme/datetimepickertp.cpp
+++ b/xfa/src/fwl/theme/datetimepickertp.cpp
diff --git a/xfa/src/fwl/src/theme/edittp.cpp b/xfa/src/fwl/theme/edittp.cpp
index a206faffe8..a206faffe8 100644
--- a/xfa/src/fwl/src/theme/edittp.cpp
+++ b/xfa/src/fwl/theme/edittp.cpp
diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/theme/formtp.cpp
index 1d6dcd1c17..1d6dcd1c17 100644
--- a/xfa/src/fwl/src/theme/formtp.cpp
+++ b/xfa/src/fwl/theme/formtp.cpp
diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/theme/listboxtp.cpp
index 8ffe669835..8ffe669835 100644
--- a/xfa/src/fwl/src/theme/listboxtp.cpp
+++ b/xfa/src/fwl/theme/listboxtp.cpp
diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/theme/monthcalendartp.cpp
index 47384b979f..47384b979f 100644
--- a/xfa/src/fwl/src/theme/monthcalendartp.cpp
+++ b/xfa/src/fwl/theme/monthcalendartp.cpp
diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/theme/pictureboxtp.cpp
index 5d7c079e86..5d7c079e86 100644
--- a/xfa/src/fwl/src/theme/pictureboxtp.cpp
+++ b/xfa/src/fwl/theme/pictureboxtp.cpp
diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/theme/pushbuttontp.cpp
index 76e0eab7dc..76e0eab7dc 100644
--- a/xfa/src/fwl/src/theme/pushbuttontp.cpp
+++ b/xfa/src/fwl/theme/pushbuttontp.cpp
diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/theme/scrollbartp.cpp
index 424ff549e5..424ff549e5 100644
--- a/xfa/src/fwl/src/theme/scrollbartp.cpp
+++ b/xfa/src/fwl/theme/scrollbartp.cpp
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/theme/widgettp.cpp
index 7fa7812092..7fa7812092 100644
--- a/xfa/src/fwl/src/theme/widgettp.cpp
+++ b/xfa/src/fwl/theme/widgettp.cpp