Reduce diffs with master in core

core/include/fxcrt/fx_ext.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
 #define CORE_INCLUDE_FXCRT_FX_EXT_H_
 
+#include <cctype>
+#include <cwctype>
+
 #include "fx_string.h"
 #include "fx_system.h"
 
-#include <cctype>
-#include <cwctype>
-
 FX_FLOAT FXSYS_tan(FX_FLOAT a);
 FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x);
 FX_FLOAT FXSYS_strtof(const FX_CHAR* pcsStr,
                       int32_t iLength = -1,
                       int32_t* pUsedLen = NULL);
 FX_FLOAT FXSYS_wcstof(const FX_WCHAR* pwsStr,
                       int32_t iLength = -1,
                       int32_t* pUsedLen = NULL);
 FX_WCHAR* FXSYS_wcsncpy(FX_WCHAR* dstStr, const FX_WCHAR* srcStr, size_t count);
 int32_t FXSYS_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count);
@@ skipping 81 matching lines @@
           j -= gap;
         }
         pArray[j + gap] = v1;
       }
       gap >>= 1;
     }
   }
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_EXT_H_