Sort headers in non-xfa directories.

This CL runs the chromium sort-headers.py script over the non-xfa code.
XFA will be done after the includes have been updated to full paths.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1711793002 .

core/include/fxcrt/fx_stream.h

diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h
index 263a355..b35b635 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/include/fxcrt/fx_stream.h
@@ -23,8 +23,8 @@
 #define FX_FILESIZE int32_t
 #else
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif

core/include/fxcrt/fx_system.h

diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index 5ab7f72..d523770 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -55,13 +55,13 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define _CRT_SECURE_NO_WARNINGS
-#include <sal.h>
 #include <windows.h>
+#include <sal.h>
 #endif
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include <libkern/OSAtomic.h>
 #include <Carbon/Carbon.h>
+#include <libkern/OSAtomic.h>
 #endif
 
 #ifdef __cplusplus

core/src/fpdfapi/fpdf_basic_module.cpp

diff --git a/core/src/fpdfapi/fpdf_basic_module.cpp b/core/src/fpdfapi/fpdf_basic_module.cpp
index a2a7e09..cf843cc 100644
--- a/core/src/fpdfapi/fpdf_basic_module.cpp
+++ b/core/src/fpdfapi/fpdf_basic_module.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fxcodec/fx_codec.h"
 
 namespace {
 

core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index e8bd55e..7d294c4 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fpdfapi/fpdf_serial.h"
 #include "core/include/fpdfapi/fpdf_parser.h"
+#include "core/include/fpdfapi/fpdf_serial.h"
+#include "core/include/fxcrt/fx_ext.h"
 #include "third_party/base/stl_util.h"
 
 #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024)

core/src/fpdfapi/fpdf_font/fpdf_font.cpp

diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index 540f9a0..8d5a61a 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -6,13 +6,13 @@
 
 #include "core/src/fpdfapi/fpdf_font/font_int.h"
 
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
 #include "third_party/base/stl_util.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_

core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index db2eec6..ba75753 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -10,8 +10,8 @@
 
 #include <algorithm>
 
-#include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_module.h"
+#include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fxcodec/fx_codec.h"
 
 namespace {

core/src/fxcodec/codec/fx_codec_progress.cpp

diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/src/fxcodec/codec/fx_codec_progress.cpp
index 1165f7f..2edf750 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/src/fxcodec/codec/fx_codec_progress.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxge/fx_dib.h"
 #include "core/src/fxcodec/codec/fx_codec_progress.h"
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,

core/src/fxcrt/fx_basic_gcc.cpp

diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp
index 50499a8..d905d6b 100644
--- a/core/src/fxcrt/fx_basic_gcc.cpp
+++ b/core/src/fxcrt/fx_basic_gcc.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include <limits>
 #include <cctype>
 #include <cwctype>
+#include <limits>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_string.h"

core/src/fxcrt/fx_basic_util.cpp

diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index 9f32ebe..fdf7284 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -10,8 +10,8 @@
 #include <cctype>
 
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
-#include <sys/types.h>
 #include <dirent.h>
+#include <sys/types.h>
 #else
 #include <direct.h>
 #endif

core/src/fxge/android/fpf_skiafontmgr.cpp

diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index 2c13a59..ce3b805 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -12,8 +12,8 @@
 #define FPF_SKIAMATCHWEIGHT_NAME2 60
 #define FPF_SKIAMATCHWEIGHT_1 16
 #define FPF_SKIAMATCHWEIGHT_2 8
-#include "core/src/fxge/android/fpf_skiafontmgr.h"
 #include "core/src/fxge/android/fpf_skiafont.h"
+#include "core/src/fxge/android/fpf_skiafontmgr.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

core/src/fxge/android/fpf_skiamodule.cpp

diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp
index 2cae2c8..116b65f 100644
--- a/core/src/fxge/android/fpf_skiamodule.cpp
+++ b/core/src/fxge/android/fpf_skiamodule.cpp
@@ -6,8 +6,8 @@
 
 #include "core/src/fxge/android/fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
-#include "core/src/fxge/android/fpf_skiamodule.h"
 #include "core/src/fxge/android/fpf_skiafontmgr.h"
+#include "core/src/fxge/android/fpf_skiamodule.h"
 static IFPF_DeviceModule* gs_pPFModule = NULL;
 IFPF_DeviceModule* FPF_GetDeviceModule() {
   if (!gs_pPFModule) {

core/src/fxge/apple/fx_apple_platform.cpp

diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp
index 470b19c..5108f7e 100644
--- a/core/src/fxge/apple/fx_apple_platform.cpp
+++ b/core/src/fxge/apple/fx_apple_platform.cpp
@@ -9,10 +9,10 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
-#include "core/src/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_apple.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/apple/apple_int.h"
 #include "core/src/fxge/dib/dib_int.h"
 #include "core/src/fxge/ge/fx_text_int.h"
 

core/src/fxge/apple/fx_quartz_device.cpp

diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp
index c6c382c..e77daff 100644
--- a/core/src/fxge/apple/fx_quartz_device.cpp
+++ b/core/src/fxge/apple/fx_quartz_device.cpp
@@ -12,8 +12,8 @@
 #include "core/src/fxge/ge/fx_text_int.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-#include "core/src/fxge/apple/apple_int.h"
 #include "core/include/fxge/fx_ge_apple.h"
+#include "core/src/fxge/apple/apple_int.h"
 #ifndef CGFLOAT_IS_DOUBLE
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
 #endif

core/src/fxge/dib/fx_dib_composite.cpp

diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp
index 56bde94..6068dff 100644
--- a/core/src/fxge/dib/fx_dib_composite.cpp
+++ b/core/src/fxge/dib/fx_dib_composite.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/dib/dib_int.h"
 
 const uint8_t _color_sqrt[256] = {

core/src/fxge/dib/fx_dib_main.cpp

diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp
index 484797d..7c27d54 100644
--- a/core/src/fxge/dib/fx_dib_main.cpp
+++ b/core/src/fxge/dib/fx_dib_main.cpp
@@ -8,8 +8,8 @@
 
 #include <limits.h>
 
-#include "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/dib/dib_int.h"
 
 FX_BOOL ConvertBuffer(FXDIB_Format dest_format,

core/src/fxge/ge/fx_ge_text.cpp

diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp
index 7dbeac3..ae426b0 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/src/fxge/ge/fx_ge_text.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxge/fx_ge.h"
-#include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/include/fxge/fx_freetype.h"
+#include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/ge/fx_text_int.h"
 
 #undef FX_GAMMA

core/src/fxge/skia/fx_skia_device.cpp

diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index 1bcbc53..dede637 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -8,10 +8,10 @@
 #include "core/include/fxcodec/fx_codec.h"
 
 #include "SkDashPathEffect.h"
-#include "SkTLazy.h"
-#include "SkScan.h"
 #include "SkRasterClip.h"
+#include "SkScan.h"
 #include "SkStroke.h"
+#include "SkTLazy.h"
 
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
 #include "core/src/fxge/skia/fx_skia_blitter_new.h"

fpdfsdk/include/formfiller/FFL_ComboBox.h

diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index 590a646..672b0b2 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -7,8 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "core/include/fxcrt/fx_string.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CBA_FontMap;
 class CPDFSDK_Document;

fpdfsdk/include/fpdfxfa/fpdfxfa_util.h

diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
index 6cb0791..9678453 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
@@ -9,6 +9,7 @@
 
 #include <vector>
 
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 
 #define JS_STR_VIEWERTYPE_STANDARD L"Exchange"

fpdfsdk/include/fsdk_define.h

diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 7f9c387..e7e29e6 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -28,8 +28,8 @@
 #endif  // PDF_ENABLE_XFA
 
 #ifdef _WIN32
-#include <tchar.h>
 #include <math.h>
+#include <tchar.h>
 #endif
 
 // Convert a #FX_ARGB to a #FX_COLORREF.

fpdfsdk/include/jsapi/fxjs_v8.h

diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index 50b2656..76373ac 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -14,8 +14,8 @@
 #ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 #define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 
-#include <v8.h>
 #include <v8-util.h>
+#include <v8.h>
 
 #include <vector>
 

fpdfsdk/src/fpdfdoc_embeddertest.cpp

diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp
index 1c66a15..a789dad 100644
--- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp
@@ -7,8 +7,8 @@
 #include "public/fpdfview.h"
 #include "testing/embedder_test.h"
 #include "testing/fx_string_testhelpers.h"
-#include "testing/test_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/test_support.h"
 
 class FPDFDocEmbeddertest : public EmbedderTest {};
 

fpdfsdk/src/fpdftext_embeddertest.cpp

diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp
index e84a96e..3eaa581 100644
--- a/fpdfsdk/src/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/src/fpdftext_embeddertest.cpp
@@ -6,8 +6,8 @@
 #include "public/fpdf_text.h"
 #include "public/fpdfview.h"
 #include "testing/embedder_test.h"
-#include "testing/test_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/test_support.h"
 
 namespace {
 

fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
index 1006bf9..7c68609 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/fsdk_define.h"
-#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h"
 #include "public/fpdf_formfill.h"
 
 CPDFXFA_App* CPDFXFA_App::g_pApp = NULL;

fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index b937af4..7bea8b6 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/fsdk_define.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "public/fpdf_formfill.h"
 

fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
index 24c1ed1..fab90a2 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/fsdk_define.h"
-#include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h"
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
 
 CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index)
     : m_pPDFPage(NULL),

fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
index bd817a4..03f1cfc 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
 
 std::vector<CFWL_TimerInfo*> CXFA_FWLAdapterTimerMgr::s_TimerArray;
 

fpdfsdk/src/javascript/JS_Object.cpp

diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index ca9bd00..3f0fe8c 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -7,9 +7,9 @@
 #include "fpdfsdk/src/javascript/JS_Object.h"
 
 #include "fpdfsdk/include/fsdk_mgr.h"  // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "fpdfsdk/src/javascript/JS_Context.h"
 #include "fpdfsdk/src/javascript/JS_Define.h"
-#include "fpdfsdk/include/javascript/IJavaScript.h"
 
 namespace {
 

fpdfsdk/src/javascript/console.cpp

diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp
index 5666bec..2f56c1e 100644
--- a/fpdfsdk/src/javascript/console.cpp
+++ b/fpdfsdk/src/javascript/console.cpp
@@ -6,12 +6,12 @@
 
 #include "fpdfsdk/src/javascript/console.h"
 
+#include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "fpdfsdk/src/javascript/JS_Context.h"
 #include "fpdfsdk/src/javascript/JS_Define.h"
 #include "fpdfsdk/src/javascript/JS_EventHandler.h"
 #include "fpdfsdk/src/javascript/JS_Object.h"
 #include "fpdfsdk/src/javascript/JS_Value.h"
-#include "fpdfsdk/include/javascript/IJavaScript.h"
 
 /* ------------------------ console ------------------------ */
 

fpdfsdk/src/javascript/public_methods_embeddertest.cpp

diff --git a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp
index c61215a..cf6f968 100644
--- a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp
+++ b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp
@@ -6,8 +6,8 @@
 
 #include "core/include/fxcrt/fx_string.h"
 #include "fpdfsdk/src/javascript/PublicMethods.h"
-#include "testing/js_embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/js_embedder_test.h"
 
 namespace {
 

fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp

diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
index 8fce27b..b7700c8 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "testing/js_embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/js_embedder_test.h"
 
 namespace {
 

testing/embedder_test.cpp

diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index ceca205..38a3dcd 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -20,8 +20,8 @@
 #include "testing/utils/path_service.h"
 
 #ifdef PDF_ENABLE_V8
-#include "v8/include/v8.h"
 #include "v8/include/v8-platform.h"
+#include "v8/include/v8.h"
 #endif  // PDF_ENABLE_V8
 
 namespace {

testing/fx_string_testhelpers.cpp

diff --git a/testing/fx_string_testhelpers.cpp b/testing/fx_string_testhelpers.cpp
index aebe1a8..e6b4a38 100644
--- a/testing/fx_string_testhelpers.cpp
+++ b/testing/fx_string_testhelpers.cpp
@@ -4,8 +4,8 @@
 
 #include "testing/fx_string_testhelpers.h"
 
-#include <ios>
 #include <iomanip>
+#include <ios>
 
 namespace {
 

testing/test_support.h

diff --git a/testing/test_support.h b/testing/test_support.h
index 16ed06f..359324d 100644
--- a/testing/test_support.h
+++ b/testing/test_support.h
@@ -9,8 +9,8 @@
 #include <memory>
 #include <string>
 
-#include "public/fpdfview.h"
 #include "public/fpdf_save.h"
+#include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/v8.h"