| Index: xfa/src/fxfa/src/app/xfa_ffdocview.cpp
 | 
| diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
 | 
| index bf382c156ac0362e3ea2e70f8c0b7e209ca3884e..2ad07dbcac0f1ba542f7e58a11e1e6f5e18b74bd 100644
 | 
| --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
 | 
| +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
 | 
| @@ -5,30 +5,30 @@
 | 
|  // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 | 
|  
 | 
|  #include "xfa/src/foxitlib.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_common.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_fffield.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_fftext.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_fffield.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 | 
| -#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_fftext.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 | 
|  #include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 | 
| +#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_common.h"
 | 
|  extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = {
 | 
|      XFA_ATTRIBUTEENUM_Click,      XFA_ATTRIBUTEENUM_Change,
 | 
|      XFA_ATTRIBUTEENUM_DocClose,   XFA_ATTRIBUTEENUM_DocReady,
 | 
| 
 |