diff --git a/src/common/assert.h b/src/common/assert.h
index 9ca7adb153..4f26c63e99 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdio>
 #include <cstdlib>
 
 #include "common/common_funcs.h"
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp
index a68d53695d..15c6f595b2 100644
--- a/src/core/arm/interpreter/armsupp.cpp
+++ b/src/core/arm/interpreter/armsupp.cpp
@@ -15,6 +15,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+#include "common/logging/log.h"
+
 #include "core/mem_map.h"
 #include "core/arm/skyeye_common/armdefs.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
diff --git a/src/core/arm/skyeye_common/armmmu.h b/src/core/arm/skyeye_common/armmmu.h
index 22e564c3db..0463d83c83 100644
--- a/src/core/arm/skyeye_common/armmmu.h
+++ b/src/core/arm/skyeye_common/armmmu.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "common/swap.h"
+
 #include "core/mem_map.h"
 #include "core/arm/skyeye_common/armdefs.h"
 
diff --git a/src/core/file_sys/directory_backend.h b/src/core/file_sys/directory_backend.h
index 7f327dc424..a25dc0cfa3 100644
--- a/src/core/file_sys/directory_backend.h
+++ b/src/core/file_sys/directory_backend.h
@@ -4,12 +4,11 @@
 
 #pragma once
 
+#include <array>
 #include <cstddef>
 
 #include "common/common_types.h"
 
-#include "core/hle/kernel/kernel.h"
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
 
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index 35890af1f5..0b0f8a42a6 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "common/common.h"
 #include "common/common_types.h"
 
-#include "core/hle/kernel/kernel.h"
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace
 
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp
index 9fcfcc285e..35dc9cf580 100644
--- a/src/core/hle/config_mem.cpp
+++ b/src/core/hle/config_mem.cpp
@@ -2,6 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
+
+#include "common/assert.h"
 #include "common/common_types.h"
 #include "common/common_funcs.h"
 
@@ -61,7 +64,7 @@ template void Read<u16>(u16 &var, const u32 addr);
 template void Read<u8>(u8 &var, const u32 addr);
 
 void Init() {
-    memset(&config_mem, 0, sizeof(config_mem));
+    std::memset(&config_mem, 0, sizeof(config_mem));
 
     config_mem.update_flag = 0; // No update
     config_mem.sys_core_ver = 0x2;
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
index 94fae25516..4f227a3706 100644
--- a/src/core/hle/shared_page.cpp
+++ b/src/core/hle/shared_page.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
+
 #include "common/common_types.h"
 #include "common/common_funcs.h"
 
@@ -62,7 +64,7 @@ template void Read<u16>(u16 &var, const u32 addr);
 template void Read<u8>(u8 &var, const u32 addr);
 
 void Set3DSlider(float amount) {
-    memset(&shared_page, 0, sizeof(shared_page));
+    std::memset(&shared_page, 0, sizeof(shared_page));
 
     shared_page.sliderstate_3d = amount;
     shared_page.ledstate_3d = (amount == 0.0f); // off when non-zero
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 1af02973b5..b11f2ea686 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -4,11 +4,8 @@
 
 #pragma once
 
-#include "common/common.h"
 #include "common/common_types.h"
 
-#include "core/hle/kernel/kernel.h"
-
 namespace Memory {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////