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

xfa/fwl/basewidget/ifwl_pushbutton.h

Index: xfa/fwl/basewidget/ifwl_pushbutton.h
diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/fwl/basewidget/ifwl_pushbutton.h
similarity index 86%
rename from xfa/include/fwl/basewidget/fwl_pushbutton.h
rename to xfa/fwl/basewidget/ifwl_pushbutton.h
index 28f9df4fa62b370285104d2172190d727a7cec2c..400b0c1b384a2f9f43d3513f3a81f2c9d3ea71b4 100644
--- a/xfa/include/fwl/basewidget/fwl_pushbutton.h
+++ b/xfa/fwl/basewidget/ifwl_pushbutton.h
@@ -4,11 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
-#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
+#ifndef XFA_FWL_BASEWIDGET_IFWL_PUSHBUTTON_H_
+#define XFA_FWL_BASEWIDGET_IFWL_PUSHBUTTON_H_
 
 #include "xfa/fwl/core/fwl_widgetimp.h"
-#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/fwl/core/ifwl_dataprovider.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/ifwl_widget.h"
 
 #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON"
 #define FWL_CLASSHASH_PushButton 3521614244
@@ -40,10 +42,13 @@
 #define FWL_PARTSTATE_PSB_Focused (1L << 3)
 #define FWL_PARTSTATE_PSB_Mask (7L << 0)
 
+class CFX_DIBitmap;
+
 class IFWL_PushButtonDP : public IFWL_DataProvider {
  public:
   virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0;
 };
+
 class IFWL_PushButton : public IFWL_Widget {
  public:
   static IFWL_PushButton* Create(const CFWL_WidgetImpProperties& properties,
@@ -53,4 +58,4 @@ class IFWL_PushButton : public IFWL_Widget {
   IFWL_PushButton();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_PUSHBUTTON_H_