Move xfa/{fwl,fxbarcode,fxgraphics}/include up to parent

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index f2015c3d11aed0ede29a731c6f20750b97e99d22..efe8a28229c6db91eb5e2a83eb1190731b796ba6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1212,8 +1212,10 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/fwl_noteimp.h",
       "xfa/fwl/core/fwl_timerimp.cpp",
       "xfa/fwl/core/fwl_widgetdef.h",
+      "xfa/fwl/core/fwl_widgethit.h",
       "xfa/fwl/core/fwl_widgetimp.cpp",
       "xfa/fwl/core/fwl_widgetimp.h",
+      "xfa/fwl/core/ifwl_adaptertimermgr.h",
       "xfa/fwl/core/ifwl_app.h",
       "xfa/fwl/core/ifwl_dataprovider.h",
       "xfa/fwl/core/ifwl_form.h",
@@ -1221,8 +1223,6 @@ if (pdf_enable_xfa) {
       "xfa/fwl/core/ifwl_timer.h",
       "xfa/fwl/core/ifwl_widget.h",
       "xfa/fwl/core/ifwl_widgetdelegate.h",
-      "xfa/fwl/core/include/fwl_widgethit.h",
-      "xfa/fwl/core/include/ifwl_adaptertimermgr.h",
       "xfa/fwl/lightwidget/cfwl_barcode.cpp",
       "xfa/fwl/lightwidget/cfwl_barcode.h",
       "xfa/fwl/lightwidget/cfwl_checkbox.cpp",
@@ -1273,6 +1273,7 @@ if (pdf_enable_xfa) {
       "xfa/fxbarcode/BC_Dimension.cpp",
       "xfa/fxbarcode/BC_Dimension.h",
       "xfa/fxbarcode/BC_Library.cpp",
+      "xfa/fxbarcode/BC_Library.h",
       "xfa/fxbarcode/BC_TwoDimWriter.cpp",
       "xfa/fxbarcode/BC_TwoDimWriter.h",
       "xfa/fxbarcode/BC_UtilCodingConvert.cpp",
@@ -1346,7 +1347,6 @@ if (pdf_enable_xfa) {
       "xfa/fxbarcode/datamatrix/BC_TextEncoder.h",
       "xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp",
       "xfa/fxbarcode/datamatrix/BC_X12Encoder.h",
-      "xfa/fxbarcode/include/BC_Library.h",
       "xfa/fxbarcode/oned/BC_OneDimWriter.cpp",
       "xfa/fxbarcode/oned/BC_OneDimWriter.h",
       "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp",
@@ -1612,6 +1612,7 @@ if (pdf_enable_xfa) {
       "xfa/fxgraphics/cfx_color.cpp",
       "xfa/fxgraphics/cfx_color.h",
       "xfa/fxgraphics/cfx_graphics.cpp",
+      "xfa/fxgraphics/cfx_graphics.h",
       "xfa/fxgraphics/cfx_path.cpp",
       "xfa/fxgraphics/cfx_path.h",
       "xfa/fxgraphics/cfx_path_generator.cpp",
@@ -1620,7 +1621,6 @@ if (pdf_enable_xfa) {
       "xfa/fxgraphics/cfx_pattern.h",
       "xfa/fxgraphics/cfx_shading.cpp",
       "xfa/fxgraphics/cfx_shading.h",
-      "xfa/fxgraphics/include/cfx_graphics.h",
     ]
     include_dirs = [ "." ]
     deps = [