Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/theme/scrollbartp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/include/fwl/theme/scrollbartp.h"
 
+#include "xfa/fwl/basewidget/ifwl_scrollbar.h"
+#include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
-#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
-#include "xfa/include/fwl/core/fwl_widget.h"
 
 #define FWL_SCROLL_PawLen 12.5f
 
 CFWL_ScrollBarTP::CFWL_ScrollBarTP() {
   m_pThemeData = new SBThemeData;
   SetThemeData(0);
 }
 CFWL_ScrollBarTP::~CFWL_ScrollBarTP() {
   if (m_pThemeData) {
     delete m_pThemeData;
@@ skipping 347 matching lines @@
     m_pThemeData->clrBtnBorder[1] = ArgbEncode(0xff, 218, 230, 254);
     m_pThemeData->clrPawColorLight[2] = ArgbEncode(0xff, 207, 221, 253);
     m_pThemeData->clrPawColorDark[2] = ArgbEncode(0xff, 131, 158, 216);
     m_pThemeData->clrBtnBK[2][0] = ArgbEncode(0xff, 167, 190, 245);
     m_pThemeData->clrBtnBK[2][1] = ArgbEncode(0xff, 146, 179, 249);
     m_pThemeData->clrBtnBorder[2] = ArgbEncode(0xff, 124, 159, 211);
     m_pThemeData->clrTrackBKStart = ArgbEncode(0xff, 243, 241, 236);
     m_pThemeData->clrTrackBKEnd = ArgbEncode(0xff, 254, 254, 251);
   }
 }