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

xfa/fwl/basewidget/ifwl_picturebox.h

Index: xfa/fwl/basewidget/ifwl_picturebox.h
diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/fwl/basewidget/ifwl_picturebox.h
similarity index 84%
rename from xfa/include/fwl/basewidget/fwl_picturebox.h
rename to xfa/fwl/basewidget/ifwl_picturebox.h
index 123607a80453d40102420daf961dadeeaa9baf24..acc34f78d40b3f69e586d7574adc2a79345418ec 100644
--- a/xfa/include/fwl/basewidget/fwl_picturebox.h
+++ b/xfa/fwl/basewidget/ifwl_picturebox.h
@@ -4,10 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
-#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
+#ifndef XFA_FWL_BASEWIDGET_IFWL_PICTUREBOX_H_
+#define XFA_FWL_BASEWIDGET_IFWL_PICTUREBOX_H_
 
 #include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_dataprovider.h"
+#include "xfa/fwl/core/ifwl_widget.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/fwl_error.h"
 
 #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX"
 #define FWL_CLASSHASH_PictureBox 2974721741
@@ -31,6 +35,8 @@
 #define FWL_PARTSTATE_PTB_Normal (0L << 0)
 #define FWL_PARTSTATE_PTB_Disabled (1L << 0)
 
+class CFX_DIBitmap;
+
 class IFWL_PictureBoxDP : public IFWL_DataProvider {
  public:
   virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0;
@@ -50,4 +56,4 @@ class IFWL_PictureBox : public IFWL_Widget {
   IFWL_PictureBox();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_PICTUREBOX_H_