From 6e606c515f56b456a8031b235fd4f8d8453483a4 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Mon, 8 Sep 2014 17:52:00 -0700
Subject: [PATCH] core: Prune redundant includes

---
 src/core/arm/disassembler/load_symbol_map.cpp | 1 -
 src/core/core.cpp                             | 6 ------
 src/core/hle/config_mem.cpp                   | 1 -
 src/core/hle/coprocessor.cpp                  | 1 -
 src/core/hle/hle.cpp                          | 1 -
 src/core/hle/kernel/archive.cpp               | 1 -
 src/core/hle/kernel/kernel.cpp                | 2 --
 src/core/hle/kernel/thread.cpp                | 3 ---
 src/core/hle/service/fs.cpp                   | 2 --
 src/core/hle/service/gsp.cpp                  | 1 -
 src/core/hle/service/ndm.cpp                  | 2 --
 src/core/hle/service/service.cpp              | 5 -----
 src/core/hle/service/srv.cpp                  | 1 -
 src/core/hle/svc.cpp                          | 3 ---
 src/core/hw/gpu.cpp                           | 2 --
 src/core/hw/hw.cpp                            | 1 -
 src/core/hw/ndma.cpp                          | 1 -
 src/core/loader/loader.cpp                    | 1 -
 src/core/mem_map.cpp                          | 1 -
 src/core/mem_map_funcs.cpp                    | 1 -
 20 files changed, 37 deletions(-)

diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index d7fc0a0421..f156c43ce2 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "common/symbols.h"
-#include "common/common_types.h"
 #include "common/file_util.h"
 
 #include "core/arm/disassembler/load_symbol_map.h"
diff --git a/src/core/core.cpp b/src/core/core.cpp
index f21801e52b..01d4f0afaa 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -3,15 +3,9 @@
 // Refer to the license.txt file included.
 
 #include "common/common_types.h"
-#include "common/log.h"
-#include "common/symbols.h"
-
-#include "video_core/video_core.h"
 
 #include "core/core.h"
-#include "core/mem_map.h"
 #include "core/hw/hw.h"
-#include "core/hw/gpu.h"
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/interpreter/arm_interpreter.h"
 
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp
index 8c898b2653..a45e614278 100644
--- a/src/core/hle/config_mem.cpp
+++ b/src/core/hle/config_mem.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.  
 
 #include "common/common_types.h"
-#include "common/log.h"
 
 #include "core/hle/config_mem.h"
 
diff --git a/src/core/hle/coprocessor.cpp b/src/core/hle/coprocessor.cpp
index 9a5b0dedaa..1eb33eb868 100644
--- a/src/core/hle/coprocessor.cpp
+++ b/src/core/hle/coprocessor.cpp
@@ -5,7 +5,6 @@
 #include "core/hle/coprocessor.h"
 #include "core/hle/hle.h"
 #include "core/mem_map.h"
-#include "core/core.h"
 
 namespace HLE {
 
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index 53cda4a61b..b03894ad74 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -6,7 +6,6 @@
 
 #include "core/mem_map.h"
 #include "core/hle/hle.h"
-#include "core/hle/svc.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/service/service.h"
 
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 1596367c3c..20536f40ff 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -7,7 +7,6 @@
 
 #include "core/file_sys/archive.h"
 #include "core/hle/service/service.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a4a2588756..e56f1879e7 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.  
 
-#include <string.h>
-
 #include "common/common.h"
 
 #include "core/core.h"
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 8bd9ca1a18..33c0b2a472 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -3,10 +3,8 @@
 // Refer to the license.txt file included.  
 
 #include <algorithm>
-#include <cstdio>
 #include <list>
 #include <map>
-#include <string>
 #include <vector>
 
 #include "common/common.h"
@@ -15,7 +13,6 @@
 #include "core/core.h"
 #include "core/mem_map.h"
 #include "core/hle/hle.h"
-#include "core/hle/svc.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
 
diff --git a/src/core/hle/service/fs.cpp b/src/core/hle/service/fs.cpp
index 5eabf36ad5..9e1998b0fd 100644
--- a/src/core/hle/service/fs.cpp
+++ b/src/core/hle/service/fs.cpp
@@ -4,8 +4,6 @@
 
 #include "common/common.h"
 
-#include "core/loader/loader.h"
-#include "core/hle/hle.h"
 #include "core/hle/service/fs.h"
 #include "core/hle/kernel/archive.h"
 
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp
index 46c5a8ddd9..accbe84e3c 100644
--- a/src/core/hle/service/gsp.cpp
+++ b/src/core/hle/service/gsp.cpp
@@ -7,7 +7,6 @@
 #include "common/bit_field.h"
 
 #include "core/mem_map.h"
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/gsp.h"
diff --git a/src/core/hle/service/ndm.cpp b/src/core/hle/service/ndm.cpp
index 48755b6a74..f6af0a1533 100644
--- a/src/core/hle/service/ndm.cpp
+++ b/src/core/hle/service/ndm.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common/log.h"
-
 #include "core/hle/hle.h"
 #include "core/hle/service/ndm.h"
 
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 00ac1c9c6c..9eb1726aa2 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -3,11 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "common/common.h"
-#include "common/log.h"
 #include "common/string_util.h"
 
-#include "core/hle/hle.h"
-
 #include "core/hle/service/service.h"
 #include "core/hle/service/apt.h"
 #include "core/hle/service/fs.h"
@@ -16,8 +13,6 @@
 #include "core/hle/service/ndm.h"
 #include "core/hle/service/srv.h"
 
-#include "core/hle/kernel/kernel.h"
-
 namespace Service {
 
 Manager* g_manager = nullptr;  ///< Service manager
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 23be3cf2cc..eb2c73f93f 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -4,7 +4,6 @@
 
 #include "core/hle/hle.h"
 #include "core/hle/service/srv.h"
-#include "core/hle/service/service.h"
 #include "core/hle/kernel/event.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index bdcfae6f5c..07a750b895 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.  
 
 #include <map>
-#include <string>
 
 #include "common/string_util.h"
 #include "common/symbols.h"
@@ -12,13 +11,11 @@
 
 #include "core/hle/kernel/address_arbiter.h"
 #include "core/hle/kernel/event.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/kernel/thread.h"
 
 #include "core/hle/function_wrappers.h"
-#include "core/hle/svc.h"
 #include "core/hle/service/service.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 8709b8eb77..2e09437767 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -3,13 +3,11 @@
 // Refer to the license.txt file included.
 
 #include "common/common_types.h"
-#include "common/log.h"
 
 #include "core/core.h"
 #include "core/mem_map.h"
 
 #include "core/hle/hle.h"
-#include "core/hle/kernel/thread.h"
 #include "core/hle/service/gsp.h"
 
 #include "core/hw/gpu.h"
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index ed70486e61..efd94f1472 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "common/common_types.h"
-#include "common/log.h"
 
 #include "core/hw/hw.h"
 #include "core/hw/gpu.h"
diff --git a/src/core/hw/ndma.cpp b/src/core/hw/ndma.cpp
index f6aa72d161..158241fd6d 100644
--- a/src/core/hw/ndma.cpp
+++ b/src/core/hw/ndma.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "common/common_types.h"
-#include "common/log.h"
 
 #include "core/hw/ndma.h"
 
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 365f5a2777..5cbb26f54d 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -5,7 +5,6 @@
 #include <memory>
 
 #include "core/file_sys/archive_romfs.h"
-#include "core/loader/loader.h"
 #include "core/loader/elf.h"
 #include "core/loader/ncch.h"
 #include "core/hle/kernel/archive.h"
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 14fc014712..cf12f24d91 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -6,7 +6,6 @@
 #include "common/mem_arena.h"
 
 #include "core/mem_map.h"
-#include "core/core.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 391b75fc2d..f510df8350 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -8,7 +8,6 @@
 
 #include "core/mem_map.h"
 #include "core/hw/hw.h"
-#include "hle/hle.h"
 #include "hle/config_mem.h"
 
 namespace Memory {