| Index: xfa/include/fwl/fwl.h
 | 
| diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h
 | 
| index 6ba115f0c924d74de19e2308dc0bea8ebcd34e9c..32048ce86f2476194b95b39fba080283cfda6564 100644
 | 
| --- a/xfa/include/fwl/fwl.h
 | 
| +++ b/xfa/include/fwl/fwl.h
 | 
| @@ -9,52 +9,57 @@
 | 
|  #ifndef XFA_INCLUDE_FWL_FWL_H_
 | 
|  #define XFA_INCLUDE_FWL_FWL_H_
 | 
|  
 | 
| -#include "xfa/include/fwl/core/fwl_error.h"
 | 
| -#include "xfa/include/fwl/core/fwl_target.h"
 | 
| -#include "xfa/include/fwl/core/fwl_thread.h"
 | 
| -#include "xfa/include/fwl/core/fwl_note.h"
 | 
| -#include "xfa/include/fwl/core/fwl_widgetdef.h"
 | 
| -#include "xfa/include/fwl/core/fwl_theme.h"
 | 
| -#include "xfa/include/fwl/core/fwl_widget.h"
 | 
| -#include "xfa/include/fwl/core/fwl_content.h"
 | 
| -#include "xfa/include/fwl/core/fwl_panel.h"
 | 
| -#include "xfa/include/fwl/core/fwl_form.h"
 | 
| -#include "xfa/include/fwl/core/fwl_widgetmgr.h"
 | 
| -#include "xfa/include/fwl/core/fwl_timer.h"
 | 
| -#include "xfa/include/fwl/core/fwl_app.h"
 | 
| -#include "xfa/include/fwl/core/fwl_grid.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
 | 
| +#include "xfa/include/fwl/adapter/fwl_adapternative.h"
 | 
| +#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
 | 
| +#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 | 
| +#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 | 
| +#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_barcode.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_caret.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_checkbox.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_listbox.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_edit.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_combobox.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_edit.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_listbox.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_menu.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
 | 
| +#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_barcode.h"
 | 
| -#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
 | 
|  #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_caret.h"
 | 
| +#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
 | 
| +#include "xfa/include/fwl/core/fwl_app.h"
 | 
| +#include "xfa/include/fwl/core/fwl_content.h"
 | 
| +#include "xfa/include/fwl/core/fwl_error.h"
 | 
| +#include "xfa/include/fwl/core/fwl_form.h"
 | 
| +#include "xfa/include/fwl/core/fwl_grid.h"
 | 
| +#include "xfa/include/fwl/core/fwl_note.h"
 | 
| +#include "xfa/include/fwl/core/fwl_panel.h"
 | 
| +#include "xfa/include/fwl/core/fwl_target.h"
 | 
| +#include "xfa/include/fwl/core/fwl_theme.h"
 | 
| +#include "xfa/include/fwl/core/fwl_thread.h"
 | 
| +#include "xfa/include/fwl/core/fwl_timer.h"
 | 
| +#include "xfa/include/fwl/core/fwl_widget.h"
 | 
| +#include "xfa/include/fwl/core/fwl_widgetdef.h"
 | 
| +#include "xfa/include/fwl/core/fwl_widgetmgr.h"
 | 
|  #include "xfa/include/fwl/lightwidget/app.h"
 | 
| -#include "xfa/include/fwl/lightwidget/widget.h"
 | 
| -#include "xfa/include/fwl/lightwidget/pushbutton.h"
 | 
| +#include "xfa/include/fwl/lightwidget/barcode.h"
 | 
| +#include "xfa/include/fwl/lightwidget/caret.h"
 | 
|  #include "xfa/include/fwl/lightwidget/checkbox.h"
 | 
| -#include "xfa/include/fwl/lightwidget/scrollbar.h"
 | 
| -#include "xfa/include/fwl/lightwidget/listbox.h"
 | 
| -#include "xfa/include/fwl/lightwidget/picturebox.h"
 | 
| -#include "xfa/include/fwl/lightwidget/edit.h"
 | 
|  #include "xfa/include/fwl/lightwidget/combobox.h"
 | 
|  #include "xfa/include/fwl/lightwidget/datetimepicker.h"
 | 
| -#include "xfa/include/fwl/lightwidget/barcode.h"
 | 
| +#include "xfa/include/fwl/lightwidget/edit.h"
 | 
| +#include "xfa/include/fwl/lightwidget/listbox.h"
 | 
| +#include "xfa/include/fwl/lightwidget/picturebox.h"
 | 
| +#include "xfa/include/fwl/lightwidget/pushbutton.h"
 | 
| +#include "xfa/include/fwl/lightwidget/scrollbar.h"
 | 
|  #include "xfa/include/fwl/lightwidget/theme.h"
 | 
|  #include "xfa/include/fwl/lightwidget/tooltipctrl.h"
 | 
| -#include "xfa/include/fwl/lightwidget/caret.h"
 | 
| -#include "xfa/include/fwl/theme/utils.h"
 | 
| -#include "xfa/include/fwl/theme/widgettp.h"
 | 
| +#include "xfa/include/fwl/lightwidget/widget.h"
 | 
| +#include "xfa/include/fwl/theme/barcodetp.h"
 | 
|  #include "xfa/include/fwl/theme/barcodetp.h"
 | 
| +#include "xfa/include/fwl/theme/carettp.h"
 | 
|  #include "xfa/include/fwl/theme/checkboxtp.h"
 | 
|  #include "xfa/include/fwl/theme/comboboxtp.h"
 | 
|  #include "xfa/include/fwl/theme/datetimepickertp.h"
 | 
| @@ -65,13 +70,8 @@
 | 
|  #include "xfa/include/fwl/theme/pictureboxtp.h"
 | 
|  #include "xfa/include/fwl/theme/pushbuttontp.h"
 | 
|  #include "xfa/include/fwl/theme/scrollbartp.h"
 | 
| +#include "xfa/include/fwl/theme/utils.h"
 | 
| +#include "xfa/include/fwl/theme/widgettp.h"
 | 
|  #include "xfa/include/fwl/theme/widgettp.h"
 | 
| -#include "xfa/include/fwl/theme/barcodetp.h"
 | 
| -#include "xfa/include/fwl/theme/carettp.h"
 | 
| -#include "xfa/include/fwl/adapter/fwl_adapternative.h"
 | 
| -#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
 | 
| -#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 | 
| -#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 | 
| -#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
 | 
|  
 | 
|  #endif  // XFA_INCLUDE_FWL_FWL_H_
 | 
| 
 |