| Index: xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
 | 
| diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
 | 
| index 832e1ba5d1b0d73188d93d4cd0b9f152ea89a98b..54835a14e777cb9f724e0c6539a515e8060428fd 100644
 | 
| --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
 | 
| +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
 | 
| @@ -5,20 +5,20 @@
 | 
|  // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 | 
|  
 | 
|  #include "xfa/src/foxitlib.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_utils.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_object.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_document.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_parser.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_script.h"
 | 
|  #include "xfa/src/fxfa/src/common/xfa_docdata.h"
 | 
|  #include "xfa/src/fxfa/src/common/xfa_doclayout.h"
 | 
| -#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_document.h"
 | 
|  #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_object.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_parser.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_script.h"
 | 
| +#include "xfa/src/fxfa/src/common/xfa_utils.h"
 | 
|  #include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
 | 
|  #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
 | 
| +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
 | 
|  #include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
 | 
|  #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
 | 
| -#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
 | 
|  CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
 | 
|      : m_pLayoutProcessor(pLayoutProcessor),
 | 
|        m_pTemplatePageSetRoot(nullptr),
 | 
| 
 |