22 files changed, 101 insertions, 101 deletions
diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp
index c14f1859d3..9ee4d54310 100644
--- a/xfa/src/fwl/src/core/fwl_appimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_appimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
   IFWL_App* pApp = new IFWL_App;
diff --git a/xfa/src/fwl/src/core/include/fwl_appimp.h b/xfa/src/fwl/src/core/fwl_appimp.h
index d30c1b0aab..1a046ed738 100644
--- a/xfa/src/fwl/src/core/include/fwl_appimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_APPIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
 
 #include <memory>
 
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_APPIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp
index df39d39630..e73f9cdd3e 100644
--- a/xfa/src/fwl/src/core/fwl_contentimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_contentimp.h"
+#include "xfa/src/fwl/src/core/fwl_contentimp.h"
 
 #include "xfa/include/fwl/core/fwl_content.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) {
   return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex);
diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/fwl_contentimp.h
index a67d18da0a..3ad800c2a0 100644
--- a/xfa/src/fwl/src/core/include/fwl_contentimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_CONTENTIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
 
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_CONTENTIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp
index df2f4db39a..2c4fe749a8 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_formimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_formproxyimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 #define FWL_SYSBTNSIZE 21
 #define FWL_SYSBTNMARGIN 5
diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/fwl_formimp.h
index 25a5ebedb4..c8875b0ee7 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_FORMIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
 
 #include "xfa/include/fwl/core/fwl_form.h"
-#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+#include "xfa/src/fwl/src/core/fwl_panelimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_FORMIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp
index 4a2c52eaac..91e39b4dde 100644
--- a/xfa/src/fwl/src/core/fwl_gridimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_gridimp.h"
+#include "xfa/src/fwl/src/core/fwl_gridimp.h"
 
-#include "xfa/src/fwl/src/core/include/fwl_contentimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.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"
 
 // static
 IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) {
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/fwl_gridimp.h
index 54f4e5046d..092b489cbb 100644
--- a/xfa/src/fwl/src/core/include/fwl_gridimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_GRIDIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_
+#define XFA_SRC_FWL_SRC_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/include/fwl_contentimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_GRIDIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 0ddfaf8f25..a4ff5cfb5b 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_noteimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_tooltipctrlimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm)
     : m_pForm(pForm), m_bContinueModal(TRUE) {}
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/fwl_noteimp.h
index eeb86b6026..d824208625 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_NOTEIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_
+#define XFA_SRC_FWL_SRC_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_INCLUDE_FWL_NOTEIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp
index 1b6c777ad2..f4d774e8fb 100644
--- a/xfa/src/fwl/src/core/fwl_panelimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_panelimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 // static
 IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/core/include/fwl_panelimp.h b/xfa/src/fwl/src/core/fwl_panelimp.h
index 86a6a0f211..c6f6fdc03f 100644
--- a/xfa/src/fwl/src/core/include/fwl_panelimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_PANELIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
 
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_PANELIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
index 4ece3e881f..020bd54749 100644
--- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {}
 CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {}
diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp
index 6898588515..57d39e3a9e 100644
--- a/xfa/src/fwl/src/core/fwl_targetimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_targetimp.h"
+#include "xfa/src/fwl/src/core/fwl_targetimp.h"
 
 FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const {
   return m_pImpl->GetClassName(wsClass);
diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/fwl_targetimp.h
index e9c9aeb099..0cc2729e27 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_TARGETIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_
+#define XFA_SRC_FWL_SRC_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_INCLUDE_FWL_TARGETIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp
index de48068a3c..2adb4af07c 100644
--- a/xfa/src/fwl/src/core/fwl_threadimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_threadimp.h"
+#include "xfa/src/fwl/src/core/fwl_threadimp.h"
 
-#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.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"
 
 void IFWL_Thread::Release() {
   delete m_pImpl;
diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/fwl_threadimp.h
index 169de6a06d..ead224ae12 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_THREADIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_
+#define XFA_SRC_FWL_SRC_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_INCLUDE_FWL_THREADIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp
index 19ab582340..0aec1357a4 100644
--- a/xfa/src/fwl/src/core/fwl_timerimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.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"
 
 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/src/core/fwl_widgetimp.cpp
index 7100f193c9..4e74d7b4f6 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_widgetimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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"
 
 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/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/fwl_widgetimp.h
index 65cd75e151..376294da13 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_WIDGETIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
+#define XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
 
 #include "xfa/include/fwl/core/fwl_widget.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
+#include "xfa/src/fwl/src/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_INCLUDE_FWL_WIDGETIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
index 9b6f695ee3..1237d9e0f8 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/src/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/include/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/src/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/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.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"
 
 FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) {
 #if (_FX_OS_ == _FX_MACOSX_)
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/fwl_widgetmgrimp.h
index 5c951777e8..ef72448531 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/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_INCLUDE_FWL_WIDGETMGRIMP_H_
-#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
+#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_
+#define XFA_SRC_FWL_SRC_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_INCLUDE_FWL_WIDGETMGRIMP_H_
+#endif  // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_