Remove empty newlines in #include blocks.

This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.

src/core/arm/disassembler/arm_disasm.cpp

@@ -1,12 +1,10 @@
 // Copyright 2006 The Android Open Source Project
 
+#include "core/arm/disassembler/arm_disasm.h"
 #include <string>
 #include <unordered_set>
-
 #include "common/common_types.h"
 #include "common/string_util.h"
-
-#include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/skyeye_common/armsupp.h"
 
 static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",

src/core/arm/disassembler/arm_disasm.h

@@ -3,7 +3,6 @@
 #pragma once
 
 #include <string>
-
 #include "common/common_types.h"
 
 // Note: this list of opcodes must match the list used to initialize

src/core/arm/disassembler/load_symbol_map.cpp

@@ -2,15 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/arm/disassembler/load_symbol_map.h"
 #include <sstream>
 #include <string>
 #include <vector>
-
 #include "common/file_util.h"
 #include "common/symbols.h"
 
-#include "core/arm/disassembler/load_symbol_map.h"
-
 /*
  * Loads a symbol map file for use with the disassembler
  * @param filename String filename path of symbol map file

src/core/arm/dynarmic/arm_dynarmic.cpp

@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/arm/dynarmic/arm_dynarmic.h"
+#include <dynarmic/dynarmic.h>
 #include "common/assert.h"
 #include "common/microprofile.h"
-
-#include <dynarmic/dynarmic.h>
-
-#include "core/arm/dynarmic/arm_dynarmic.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/core.h"
 #include "core/core_timing.h"

src/core/arm/dynarmic/arm_dynarmic.h

@@ -5,11 +5,8 @@
 #pragma once
 
 #include <memory>
-
 #include <dynarmic/dynarmic.h>
-
 #include "common/common_types.h"
-
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/armstate.h"
 

src/core/arm/dyncom/arm_dyncom.cpp

@@ -2,18 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/arm/dyncom/arm_dyncom.h"
 #include <cstring>
 #include <memory>
-
-#include "core/arm/skyeye_common/armstate.h"
-#include "core/arm/skyeye_common/armsupp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
-
-#include "core/arm/dyncom/arm_dyncom.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"
-
+#include "core/arm/skyeye_common/armstate.h"
+#include "core/arm/skyeye_common/armsupp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 

src/core/arm/dyncom/arm_dyncom.h

@@ -5,9 +5,7 @@
 #pragma once
 
 #include <memory>
-
 #include "common/common_types.h"
-
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/armstate.h"

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -4,27 +4,24 @@
 
 #define CITRA_IGNORE_EXIT(x)
 
+#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include <algorithm>
 #include <cstdio>
-
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
-
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/dyncom/arm_dyncom_dec.h"
-#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_thumb.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
+#include "core/gdbstub/gdbstub.h"
 #include "core/hle/svc.h"
 #include "core/memory.h"
 
-#include "core/gdbstub/gdbstub.h"
-
 #define RM BITS(sht_oper, 0, 3)
 #define RS BITS(sht_oper, 8, 11)
 

src/core/arm/dyncom/arm_dyncom_trans.cpp

@@ -1,10 +1,8 @@
+#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include <cstdlib>
-
 #include "common/assert.h"
 #include "common/common_types.h"
-
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
-#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"

src/core/arm/dyncom/arm_dyncom_trans.h

@@ -1,3 +1,6 @@
+#include <cstddef>
+#include "common/common_types.h"
+
 struct ARMul_State;
 typedef unsigned int (*shtop_fp_t)(ARMul_State* cpu, unsigned int sht_oper);
 

src/core/arm/skyeye_common/armstate.h

@@ -19,7 +19,6 @@
 
 #include <array>
 #include <unordered_map>
-
 #include "common/common_types.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 

src/core/arm/skyeye_common/armsupp.cpp

@@ -15,11 +15,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+#include "core/arm/skyeye_common/armsupp.h"
 #include "common/logging/log.h"
-
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/armstate.h"
-#include "core/arm/skyeye_common/armsupp.h"
 
 // Unsigned sum of absolute difference
 u8 ARMul_UnsignedAbsoluteDifference(u8 left, u8 right) {

src/core/arm/skyeye_common/vfp/vfp.cpp

@@ -20,13 +20,12 @@
 
 /* Note: this file handles interface with arm core and vfp registers */
 
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 
 void VFPInit(ARMul_State* state) {
     state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN << 24 | VFP_FPSID_SW << 23 | VFP_FPSID_SUBARCH << 16 |

src/core/arm/skyeye_common/vfp/vfpdouble.cpp

@@ -51,10 +51,10 @@
  * ===========================================================================
  */
 
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 
 static struct vfp_double vfp_double_default_qnan = {

src/core/arm/skyeye_common/vfp/vfpsingle.cpp

@@ -51,15 +51,13 @@
  * ===========================================================================
  */
 
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include <cinttypes>
-
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 
 static struct vfp_single vfp_single_default_qnan = {