Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/core/ifwl_form.h

Index: xfa/fwl/core/ifwl_form.h
diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/fwl/core/ifwl_form.h
similarity index 88%
rename from xfa/include/fwl/core/fwl_form.h
rename to xfa/fwl/core/ifwl_form.h
index 1fc39958f34f4116eec723bfda500f17506f3bb6..66391692a985b338256a24b29c055751a35ff54b 100644
--- a/xfa/include/fwl/core/fwl_form.h
+++ b/xfa/fwl/core/ifwl_form.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
-#define XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+#ifndef XFA_FWL_CORE_IFWL_FORM_H_
+#define XFA_FWL_CORE_IFWL_FORM_H_
 
-#include "xfa/include/fwl/core/fwl_panel.h"
-
-class IFWL_Widget;
-class IFWL_Form;
+#include "xfa/fwl/core/ifwl_panel.h"
+#include "xfa/fwl/core/ifwl_dataprovider.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
 
 #define FWL_CLASS_Form L"FWL_FORM"
 #define FWL_CLASSHASH_Form 881567292
@@ -23,9 +23,11 @@ class IFWL_Form;
 #define FWL_STYLEEXT_FRM_NoDrawClient (1L << 3)
 #define FWL_STYLEEXT_FRM_BorderCornerMask (3L << 1)
 #define FWL_STYLEEXT_FRM_Max (3)
+
 #if (_FX_OS_ == _FX_MACOSX_)
 #define FWL_UseMacSystemBorder
 #endif
+
 #define FWL_WGTCAPACITY_FRM_CYCaption (FWL_WGTCAPACITY_MAX + 1)
 #define FWL_WGTCAPACITY_FRM_CYNarrowCaption (FWL_WGTCAPACITY_MAX + 2)
 #define FWL_WGTCAPACITY_FRM_BigIcon (FWL_WGTCAPACITY_MAX + 3)
@@ -46,16 +48,13 @@ class IFWL_Form;
 #define FWL_PARTSTATE_FRM_Inactive 4
 #define FWL_PARTSTATE_FRM_Disabled 5
 
-class IFWL_FormDP : public IFWL_DataProvider {
- public:
-  virtual CFX_DIBitmap* GetIcon(IFWL_Widget* pWidget, FX_BOOL bBig) = 0;
-};
 enum FWL_FORMSIZE {
   FWL_FORMSIZE_Manual = 0,
   FWL_FORMSIZE_Width,
   FWL_FORMSIZE_Height,
   FWL_FORMSIZE_All,
 };
+
 enum FWL_COMMANDID {
   FWL_COMMANDID_Close = 0,
   FWL_COMMANDID_Ok,
@@ -67,6 +66,17 @@ enum FWL_COMMANDID {
   FWL_COMMANDID_No,
 };
 
+class CFX_DIBitmap;
+class CFX_WideString;
+class CFX_Path;
+class IFWL_Widget;
+class IFWL_Form;
+
+class IFWL_FormDP : public IFWL_DataProvider {
+ public:
+  virtual CFX_DIBitmap* GetIcon(IFWL_Widget* pWidget, FX_BOOL bBig) = 0;
+};
+
 class IFWL_Form : public IFWL_Panel {
  public:
   static IFWL_Form* CreateFormProxy(CFWL_WidgetImpProperties& properties,
@@ -84,4 +94,4 @@ class IFWL_Form : public IFWL_Panel {
   IFWL_Form();
 };
 
-#endif  // XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+#endif  // XFA_FWL_CORE_IFWL_FORM_H_