summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-21 14:40:28 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-28 01:36:54 +0200
commit596b7c4f63e38d275b6a056d6125c0027a1376e7 (patch)
treefb0ab64194f7beb8ddeab145db68d27401ea9790 /src/core/hle
parentCommon: Cleanup memory and misc includes. (diff)
downloadyuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.gz
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.bz2
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.lz
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.xz
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.tar.zst
yuzu-596b7c4f63e38d275b6a056d6125c0027a1376e7.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/hle.cpp1
-rw-r--r--src/core/hle/kernel/kernel.cpp2
-rw-r--r--src/core/hle/kernel/kernel.h7
-rw-r--r--src/core/hle/kernel/session.h6
-rw-r--r--src/core/hle/kernel/thread.h1
-rw-r--r--src/core/hle/result.h2
-rw-r--r--src/core/hle/service/hid/hid.h16
-rw-r--r--src/core/hle/service/service.h1
8 files changed, 20 insertions, 16 deletions
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index fdeb9a028..cd0a400dc 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -10,7 +10,6 @@
#include "core/hle/hle.h"
#include "core/hle/config_mem.h"
#include "core/hle/shared_page.h"
-#include "core/hle/kernel/thread.h"
#include "core/hle/service/service.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 20e11da16..5711c0405 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -7,8 +7,6 @@
#include "common/assert.h"
#include "common/logging/log.h"
-#include "core/arm/arm_interface.h"
-#include "core/core.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/process.h"
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 64595f758..b29260b5d 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -4,10 +4,11 @@
#pragma once
-#include <boost/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include <algorithm>
#include <array>
-#include <memory>
+#include <cstddef>
#include <string>
#include <vector>
@@ -16,8 +17,6 @@
#include "core/hle/hle.h"
#include "core/hle/result.h"
-struct ApplicationInfo;
-
namespace Kernel {
class Thread;
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index 257da9105..adaffcafe 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -4,8 +4,14 @@
#pragma once
+#include <string>
+
+#include "common/assert.h"
+#include "common/common_types.h"
+
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h"
+#include "core/hle/result.h"
#include "core/memory.h"
namespace IPC {
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index b8160bb2c..1ff1d9b97 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -13,6 +13,7 @@
#include "core/core.h"
+#include "core/hle/hle.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/result.h"
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index ce633d841..cb2d681e0 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -4,7 +4,7 @@
#pragma once
-#include <cstddef>
+#include <new>
#include <type_traits>
#include <utility>
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 68e2bcee0..d50d479f8 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -6,16 +6,18 @@
#include <array>
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-#include "common/bit_field.h"
+#ifndef _MSC_VER
+#include <cstddef>
+#endif
-namespace Kernel {
- class SharedMemory;
- class Event;
-}
+#include "common/bit_field.h"
+#include "common/common_funcs.h"
+#include "common/common_types.h"
namespace Service {
+
+class Interface;
+
namespace HID {
/**
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 77bfb9ff1..af299ac21 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -11,7 +11,6 @@
#include "common/common_types.h"
-#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/session.h"
////////////////////////////////////////////////////////////////////////////////////////////////////