| Index: xfa/fwl/basewidget/fwl_editimp.cpp
 | 
| diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp
 | 
| index a0d707438e757bc529e1f4b64bcf9792b8ba6ec1..73c7fa31e14b75ea7802887c32501e1270d5349d 100644
 | 
| --- a/xfa/fwl/basewidget/fwl_editimp.cpp
 | 
| +++ b/xfa/fwl/basewidget/fwl_editimp.cpp
 | 
| @@ -15,16 +15,19 @@
 | 
|  #include "xfa/fwl/basewidget/fwl_caretimp.h"
 | 
|  #include "xfa/fwl/basewidget/fwl_comboboximp.h"
 | 
|  #include "xfa/fwl/basewidget/fwl_scrollbarimp.h"
 | 
| +#include "xfa/fwl/basewidget/ifwl_caret.h"
 | 
| +#include "xfa/fwl/basewidget/ifwl_datetimepicker.h"
 | 
| +#include "xfa/fwl/core/cfwl_message.h"
 | 
| +#include "xfa/fwl/core/cfwl_themebackground.h"
 | 
| +#include "xfa/fwl/core/cfwl_themepart.h"
 | 
|  #include "xfa/fwl/core/fwl_appimp.h"
 | 
|  #include "xfa/fwl/core/fwl_noteimp.h"
 | 
|  #include "xfa/fwl/core/fwl_targetimp.h"
 | 
|  #include "xfa/fwl/core/fwl_threadimp.h"
 | 
|  #include "xfa/fwl/core/fwl_widgetimp.h"
 | 
|  #include "xfa/fwl/core/fwl_widgetmgrimp.h"
 | 
| +#include "xfa/fwl/core/ifwl_themeprovider.h"
 | 
|  #include "xfa/fxgraphics/cfx_path.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_caret.h"
 | 
| -#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 | 
| -#include "xfa/include/fwl/core/fwl_theme.h"
 | 
|  
 | 
|  // static
 | 
|  IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties,
 | 
| 
 |