| Index: xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp | 
| diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp | 
| similarity index 99% | 
| rename from xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp | 
| rename to xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp | 
| index 3a7589e3194b394e45c27b7777eba7e16f322b3f..102f225a1d853647df1e82b7bd20ed6be0523a49 100644 | 
| --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp | 
| +++ b/xfa/src/fwl/basewidget/fwl_monthcalendarimp.cpp | 
| @@ -4,16 +4,16 @@ | 
|  | 
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 
|  | 
| -#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h" | 
| +#include "xfa/src/fwl/basewidget/fwl_monthcalendarimp.h" | 
|  | 
| #include <algorithm> | 
|  | 
| #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" | 
| #include "xfa/include/fwl/core/fwl_theme.h" | 
| #include "xfa/src/fdp/include/fde_tto.h" | 
| -#include "xfa/src/fwl/src/core/fwl_noteimp.h" | 
| -#include "xfa/src/fwl/src/core/fwl_targetimp.h" | 
| -#include "xfa/src/fwl/src/core/fwl_widgetimp.h" | 
| +#include "xfa/src/fwl/core/fwl_noteimp.h" | 
| +#include "xfa/src/fwl/core/fwl_targetimp.h" | 
| +#include "xfa/src/fwl/core/fwl_widgetimp.h" | 
|  | 
| #define MONTHCAL_HSEP_HEIGHT 1 | 
| #define MONTHCAL_VSEP_WIDTH 1 | 
| @@ -974,8 +974,7 @@ FWL_ERR CFWL_MonthCalendarImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics, | 
| return m_pOwner->DrawWidget(pGraphics, pMatrix); | 
| } | 
|  | 
| -void CFWL_MonthCalendarImpDelegate::OnActivate(CFWL_Message* pMsg) { | 
| -} | 
| +void CFWL_MonthCalendarImpDelegate::OnActivate(CFWL_Message* pMsg) {} | 
|  | 
| void CFWL_MonthCalendarImpDelegate::OnFocusChanged(CFWL_Message* pMsg, | 
| FX_BOOL bSet) { | 
|  |