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

xfa/fwl/core/ifwl_grid.h

Index: xfa/fwl/core/ifwl_grid.h
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/fwl/core/ifwl_grid.h
similarity index 94%
rename from xfa/include/fwl/core/fwl_grid.h
rename to xfa/fwl/core/ifwl_grid.h
index c5b443b2b0c1a63661b982b824930ccd125a6a11..f1ef57f91257e048e6ecfa43d874c9f9b46acdfb 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/fwl/core/ifwl_grid.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
-#define XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+#ifndef XFA_FWL_CORE_IFWL_GRID_H_
+#define XFA_FWL_CORE_IFWL_GRID_H_
 
-#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/fwl/core/ifwl_content.h"
 
 class IFWL_Widget;
 
@@ -19,18 +19,21 @@ struct FWL_LAYOUTDATA {
   FX_FLOAT fWidth;
   FX_FLOAT fHeight;
 };
+
 enum FWL_GRIDUNIT {
   FWL_GRIDUNIT_Auto = 0,
   FWL_GRIDUNIT_Fixed,
   FWL_GRIDUNIT_Scaled,
   FWL_GRIDUNIT_Infinity,
 };
+
 enum FWL_GRIDMARGIN {
   FWL_GRIDMARGIN_Left = 0,
   FWL_GRIDMARGIN_Top,
   FWL_GRIDMARGIN_Right,
   FWL_GRIDMARGIN_Bottom,
 };
+
 enum FWL_GRIDSIZE {
   FWL_GRIDSIZE_Width = 0,
   FWL_GRIDSIZE_Height,
@@ -41,6 +44,7 @@ enum FWL_GRIDSIZE {
 };
 
 typedef struct FWL_HGRIDCOLROW_ { void* pData; } * FWL_HGRIDCOLROW;
+
 class IFWL_Grid : public IFWL_Content {
  public:
   static IFWL_Grid* Create(const CFWL_WidgetImpProperties& properties);
@@ -86,4 +90,4 @@ class IFWL_Grid : public IFWL_Content {
   IFWL_Grid();
 };
 
-#endif  // XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+#endif  // XFA_FWL_CORE_IFWL_GRID_H_