From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 21 Sep 2016 00:21:23 +0900
Subject: 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/video_core/clipper.cpp                             | 5 +----
 src/video_core/command_processor.cpp                   | 5 +----
 src/video_core/command_processor.h                     | 1 -
 src/video_core/debug_utils/debug_utils.cpp             | 2 --
 src/video_core/debug_utils/debug_utils.h               | 2 --
 src/video_core/gpu_debugger.h                          | 1 -
 src/video_core/pica.cpp                                | 3 +--
 src/video_core/pica_state.h                            | 2 --
 src/video_core/pica_types.h                            | 1 -
 src/video_core/primitive_assembly.cpp                  | 3 +--
 src/video_core/primitive_assembly.h                    | 1 -
 src/video_core/rasterizer.cpp                          | 5 +----
 src/video_core/rasterizer_interface.h                  | 1 -
 src/video_core/renderer_base.cpp                       | 3 +--
 src/video_core/renderer_base.h                         | 2 --
 src/video_core/renderer_opengl/gl_rasterizer.cpp       | 6 +-----
 src/video_core/renderer_opengl/gl_rasterizer.h         | 4 ----
 src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 6 +-----
 src/video_core/renderer_opengl/gl_rasterizer_cache.h   | 4 ----
 src/video_core/renderer_opengl/gl_resource_manager.h   | 3 ---
 src/video_core/renderer_opengl/gl_shader_gen.cpp       | 4 +---
 src/video_core/renderer_opengl/gl_shader_util.cpp      | 4 +---
 src/video_core/renderer_opengl/gl_state.cpp            | 4 +---
 src/video_core/renderer_opengl/pica_to_gl.h            | 3 ---
 src/video_core/renderer_opengl/renderer_opengl.cpp     | 6 +-----
 src/video_core/renderer_opengl/renderer_opengl.h       | 4 ----
 src/video_core/shader/shader.cpp                       | 7 +------
 src/video_core/shader/shader.h                         | 4 ----
 src/video_core/shader/shader_interpreter.cpp           | 5 +----
 src/video_core/shader/shader_jit_x64.cpp               | 6 +-----
 src/video_core/shader/shader_jit_x64.h                 | 3 ---
 src/video_core/swrasterizer.h                          | 1 -
 src/video_core/vertex_loader.cpp                       | 6 +-----
 src/video_core/vertex_loader.h                         | 1 -
 src/video_core/video_core.cpp                          | 4 +---
 35 files changed, 17 insertions(+), 105 deletions(-)

(limited to 'src/video_core')

diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index 82178d249..5aad47418 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -2,19 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/clipper.h"
 #include <algorithm>
 #include <array>
 #include <cstddef>
-
 #include <boost/container/static_vector.hpp>
 #include <boost/container/vector.hpp>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
-
-#include "video_core/clipper.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 04a4ee3a2..5c74b68e9 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -2,22 +2,19 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/command_processor.h"
 #include <array>
 #include <cstddef>
 #include <memory>
 #include <utility>
-
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
-
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "core/tracer/recorder.h"
-
-#include "video_core/command_processor.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h
index b8dad8e7b..62ad2d3f3 100644
--- a/src/video_core/command_processor.h
+++ b/src/video_core/command_processor.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <type_traits>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 194e5833c..8806464d9 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -20,7 +20,6 @@
 #include <nihstro/bit_field.h>
 #include <nihstro/float24.h>
 #include <nihstro/shader_binary.h>
-
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/color.h"
@@ -29,7 +28,6 @@
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/vector_math.h"
-
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index fe3ed247d..189c93abb 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -15,10 +15,8 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include "common/common_types.h"
 #include "common/vector_math.h"
-
 #include "video_core/pica.h"
 
 namespace CiTrace {
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index aea391619..3c6636d66 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
-
 #include "core/hle/service/gsp_gpu.h"
 
 class GraphicsDebugger {
diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp
index ffd13e717..771e83fe7 100644
--- a/src/video_core/pica.cpp
+++ b/src/video_core/pica.cpp
@@ -2,12 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/pica.h"
 #include <cstring>
 #include <iterator>
 #include <unordered_map>
 #include <utility>
-
-#include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
diff --git a/src/video_core/pica_state.h b/src/video_core/pica_state.h
index 2dbd6413f..e4f2e6d5d 100644
--- a/src/video_core/pica_state.h
+++ b/src/video_core/pica_state.h
@@ -5,10 +5,8 @@
 #pragma once
 
 #include <array>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
-
 #include "video_core/pica.h"
 #include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
diff --git a/src/video_core/pica_types.h b/src/video_core/pica_types.h
index 20f648b03..5d7e10066 100644
--- a/src/video_core/pica_types.h
+++ b/src/video_core/pica_types.h
@@ -6,7 +6,6 @@
 
 #include <cmath>
 #include <cstring>
-
 #include "common/common_types.h"
 
 namespace Pica {
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp
index 901cca26b..670ffb67d 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/primitive_assembly.h"
 #include "common/logging/log.h"
-
 #include "video_core/pica.h"
-#include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
 
 namespace Pica {
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h
index 2ad15a858..0384d5984 100644
--- a/src/video_core/primitive_assembly.h
+++ b/src/video_core/primitive_assembly.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <functional>
-
 #include "video_core/pica.h"
 
 namespace Pica {
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index f815d6cf0..c179573d6 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/rasterizer.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
-
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/color.h"
@@ -14,15 +14,12 @@
 #include "common/math_util.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
-
 #include "core/hw/gpu.h"
 #include "core/memory.h"
-
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
-#include "video_core/rasterizer.h"
 #include "video_core/shader/shader.h"
 #include "video_core/utils.h"
 
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h
index c7bd29f12..71df233b5 100644
--- a/src/video_core/rasterizer_interface.h
+++ b/src/video_core/rasterizer_interface.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "common/common_types.h"
-
 #include "core/hw/gpu.h"
 
 struct ScreenInfo;
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
index 090683276..91347dea8 100644
--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_base.h"
 #include <atomic>
 #include <memory>
-
-#include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/swrasterizer.h"
 #include "video_core/video_core.h"
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index daacdb167..589aca857 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -5,9 +5,7 @@
 #pragma once
 
 #include <memory>
-
 #include "common/common_types.h"
-
 #include "video_core/rasterizer_interface.h"
 
 class EmuWindow;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 37977464d..45a4dc97d 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -2,24 +2,20 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include <memory>
 #include <string>
 #include <tuple>
 #include <utility>
-
 #include <glad/glad.h>
-
 #include "common/assert.h"
 #include "common/color.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/vector_math.h"
-
 #include "core/hw/gpu.h"
-
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
-#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 #include "video_core/renderer_opengl/pica_to_gl.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 60d70539c..24fefed1b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -10,16 +10,12 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
-
 #include <glad/glad.h>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/hash.h"
 #include "common/vector_math.h"
-
 #include "core/hw/gpu.h"
-
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index ec3300ca6..ce9a193bd 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include <algorithm>
 #include <atomic>
 #include <cstring>
@@ -9,21 +10,16 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-
 #include <glad/glad.h>
-
 #include "common/bit_field.h"
 #include "common/emu_window.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"
 #include "common/microprofile.h"
 #include "common/vector_math.h"
-
 #include "core/memory.h"
-
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica_state.h"
-#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include "video_core/renderer_opengl/gl_state.h"
 #include "video_core/utils.h"
 #include "video_core/video_core.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index b2272bda8..849530d86 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -8,16 +8,12 @@
 #include <memory>
 #include <set>
 #include <tuple>
-
 #include <boost/icl/interval_map.hpp>
 #include <glad/glad.h>
-
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-
 #include "core/hw/gpu.h"
-
 #include "video_core/pica.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
 
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h
index 2f40eb646..13301ec9f 100644
--- a/src/video_core/renderer_opengl/gl_resource_manager.h
+++ b/src/video_core/renderer_opengl/gl_resource_manager.h
@@ -5,11 +5,8 @@
 #pragma once
 
 #include <utility>
-
 #include <glad/glad.h>
-
 #include "common/common_types.h"
-
 #include "video_core/renderer_opengl/gl_shader_util.h"
 #include "video_core/renderer_opengl/gl_state.h"
 
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index 9392c67b8..52cee2ee2 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include <array>
 #include <cstddef>
-
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/logging/log.h"
-
 #include "video_core/pica.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
-#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 
 using Pica::Regs;
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 7d90ec6a3..c8ba3b92d 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/gl_shader_util.h"
 #include <vector>
-
 #include <glad/glad.h>
-
 #include "common/logging/log.h"
-#include "video_core/renderer_opengl/gl_shader_util.h"
 
 namespace GLShader {
 
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index a97269d44..96af8469d 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/gl_state.h"
 #include <glad/glad.h>
-
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 
-#include "video_core/renderer_opengl/gl_state.h"
-
 OpenGLState OpenGLState::cur_state;
 
 OpenGLState::OpenGLState() {
diff --git a/src/video_core/renderer_opengl/pica_to_gl.h b/src/video_core/renderer_opengl/pica_to_gl.h
index 415358b6c..cc49867c8 100644
--- a/src/video_core/renderer_opengl/pica_to_gl.h
+++ b/src/video_core/renderer_opengl/pica_to_gl.h
@@ -6,15 +6,12 @@
 
 #include <array>
 #include <cstddef>
-
 #include <glad/glad.h>
-
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-
 #include "video_core/pica.h"
 
 using GLvec2 = std::array<GLfloat, 2>;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index a1d08e04d..962785bdd 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -2,30 +2,26 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/renderer_opengl/renderer_opengl.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
 #include <memory>
-
 #include <glad/glad.h>
-
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/emu_window.h"
 #include "common/logging/log.h"
 #include "common/profiler_reporting.h"
 #include "common/synchronized_wrapper.h"
-
 #include "core/hw/gpu.h"
 #include "core/hw/hw.h"
 #include "core/hw/lcd.h"
 #include "core/memory.h"
 #include "core/settings.h"
 #include "core/tracer/recorder.h"
-
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/rasterizer_interface.h"
-#include "video_core/renderer_opengl/renderer_opengl.h"
 #include "video_core/video_core.h"
 
 static const char vertex_shader[] = R"(
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 762b790c1..87c556cff 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -5,14 +5,10 @@
 #pragma once
 
 #include <array>
-
 #include <glad/glad.h>
-
 #include "common/common_types.h"
 #include "common/math_util.h"
-
 #include "core/hw/gpu.h"
-
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
 #include "video_core/renderer_opengl/gl_state.h"
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index c38bdcc3c..53e91df03 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -2,28 +2,23 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/shader/shader.h"
 #include <atomic>
 #include <cmath>
 #include <cstring>
 #include <unordered_map>
 #include <utility>
-
 #include <boost/range/algorithm/fill.hpp>
-
 #include "common/bit_field.h"
 #include "common/hash.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
-
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
-#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
-
 #ifdef ARCHITECTURE_x86_64
 #include "video_core/shader/shader_jit_x64.h"
 #endif // ARCHITECTURE_x86_64
-
 #include "video_core/video_core.h"
 
 namespace Pica {
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index 79c716b6e..8858d67f8 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -9,16 +9,12 @@
 #include <memory>
 #include <type_traits>
 #include <vector>
-
 #include <boost/container/static_vector.hpp>
-
 #include <nihstro/shader_bytecode.h>
-
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/vector_math.h"
-
 #include "video_core/pica.h"
 #include "video_core/pica_types.h"
 
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index 41df8a2fd..5df3c4e86 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -2,21 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/shader/shader.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
 #include <numeric>
-
 #include <nihstro/shader_bytecode.h>
-
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
-
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
-#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
 
 using nihstro::OpCode;
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index d1b2ce8d5..5f1323799 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -2,23 +2,19 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "shader.h"
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <xmmintrin.h>
-
 #include <nihstro/shader_bytecode.h>
-
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
 #include "common/x64/abi.h"
 #include "common/x64/cpu_detect.h"
 #include "common/x64/emitter.h"
-
-#include "shader.h"
 #include "shader_jit_x64.h"
-
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
 
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h
index 2f37ef8bf..98de5ecef 100644
--- a/src/video_core/shader/shader_jit_x64.h
+++ b/src/video_core/shader/shader_jit_x64.h
@@ -8,13 +8,10 @@
 #include <cstddef>
 #include <utility>
 #include <vector>
-
 #include <nihstro/shader_bytecode.h>
-
 #include "common/bit_set.h"
 #include "common/common_types.h"
 #include "common/x64/emitter.h"
-
 #include "video_core/shader/shader.h"
 
 using nihstro::Instruction;
diff --git a/src/video_core/swrasterizer.h b/src/video_core/swrasterizer.h
index 12dc56bef..6d42d7409 100644
--- a/src/video_core/swrasterizer.h
+++ b/src/video_core/swrasterizer.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "common/common_types.h"
-
 #include "video_core/rasterizer_interface.h"
 
 namespace Pica {
diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp
index 9dcd9d748..5704e9fea 100644
--- a/src/video_core/vertex_loader.cpp
+++ b/src/video_core/vertex_loader.cpp
@@ -1,22 +1,18 @@
+#include "video_core/vertex_loader.h"
 #include <memory>
-
 #include <boost/range/algorithm/fill.hpp>
-
 #include "common/alignment.h"
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
-
 #include "core/memory.h"
-
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
 #include "video_core/shader/shader.h"
-#include "video_core/vertex_loader.h"
 
 namespace Pica {
 
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h
index 4f8d79f14..9f2098bb2 100644
--- a/src/video_core/vertex_loader.h
+++ b/src/video_core/vertex_loader.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <array>
-
 #include "common/common_types.h"
 #include "video_core/pica.h"
 
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 880f4990d..b06a88b78 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "video_core/video_core.h"
 #include <memory>
-
 #include "common/logging/log.h"
-
 #include "video_core/pica.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/renderer_opengl.h"
-#include "video_core/video_core.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Video Core namespace
-- 
cgit v1.2.3