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.

3 files changed, 2 insertions, 7 deletions

diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index b3b9971e8..068f395ac 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/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",
diff --git a/src/core/arm/disassembler/arm_disasm.h b/src/core/arm/disassembler/arm_disasm.h
index 031f973d6..300e228ed 100644
--- a/src/core/arm/disassembler/arm_disasm.h
+++ b/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
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index 58e8e6fa1..e602d4511 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/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