Merge pull request #1387 from lioncash/func

services: minor changes

src/core/hle/service/ac_u.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "common/logging/log.h"
-#include "core/hle/hle.h"
 #include "core/hle/service/ac_u.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/act_u.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/act_u.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/am/am.cpp

@@ -10,10 +10,6 @@
 #include "core/hle/service/am/am_net.h"
 #include "core/hle/service/am/am_sys.h"
 
-#include "core/hle/hle.h"
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-
 namespace Service {
 namespace AM {
 

src/core/hle/service/am/am.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
+
+class Interface;
+
 namespace AM {
 
 /**

src/core/hle/service/am/am_app.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_app.h"
 

src/core/hle/service/am/am_net.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_net.h"
 

src/core/hle/service/am/am_sys.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_sys.h"
 

src/core/hle/service/am/am_u.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_u.h"
 

src/core/hle/service/apt/apt.cpp

@@ -13,12 +13,10 @@
 #include "core/hle/service/apt/apt_s.h"
 #include "core/hle/service/apt/apt_u.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "core/hle/kernel/thread.h"
 
 namespace Service {
 namespace APT {

src/core/hle/service/apt/apt_a.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_a.h"
 

src/core/hle/service/apt/apt_s.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-
-#include "core/hle/hle.h"
 #include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_s.h"
 

src/core/hle/service/apt/apt_u.cpp

@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-
-#include "common/file_util.h"
-
 #include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_u.h"
 

src/core/hle/service/boss/boss.cpp

@@ -7,10 +7,6 @@
 #include "core/hle/service/boss/boss_p.h"
 #include "core/hle/service/boss/boss_u.h"
 
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
-
 namespace Service {
 namespace BOSS {
 

src/core/hle/service/boss/boss.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
 namespace BOSS {
 

src/core/hle/service/boss/boss_p.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/boss/boss.h"
 #include "core/hle/service/boss/boss_p.h"
 
 namespace Service {

src/core/hle/service/boss/boss_u.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/boss/boss.h"
 #include "core/hle/service/boss/boss_u.h"
 
 namespace Service {

src/core/hle/service/cam/cam.cpp

@@ -11,10 +11,6 @@
 #include "core/hle/service/cam/cam_s.h"
 #include "core/hle/service/cam/cam_u.h"
 
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
-
 namespace Service {
 namespace CAM {
 

src/core/hle/service/cam/cam.h

@@ -4,8 +4,7 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
+#include "common/common_types.h"
 
 namespace Service {
 namespace CAM {

src/core/hle/service/cam/cam_c.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_c.h"
 
 namespace Service {

src/core/hle/service/cam/cam_q.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_q.h"
 
 namespace Service {

src/core/hle/service/cam/cam_s.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_s.h"
 
 namespace Service {

src/core/hle/service/cam/cam_u.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_u.h"
 
 namespace Service {

src/core/hle/service/cecd/cecd.cpp

@@ -9,10 +9,6 @@
 #include "core/hle/service/cecd/cecd_s.h"
 #include "core/hle/service/cecd/cecd_u.h"
 
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
-
 namespace Service {
 namespace CECD {
 

src/core/hle/service/cecd/cecd.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
 namespace CECD {
 

src/core/hle/service/cecd/cecd_s.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cecd/cecd_s.h"
 
 namespace Service {

src/core/hle/service/cecd/cecd_u.cpp

@@ -2,18 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cecd/cecd_u.h"
 
 namespace Service {
 namespace CECD {
 
-// Empty arrays are illegal -- commented out until an entry is added.
-//const Interface::FunctionInfo FunctionTable[] = { };
+static const Interface::FunctionInfo FunctionTable[] = {
+    { 0x00120104, nullptr, "ReadSavedData" },
+};
 
 CECD_U_Interface::CECD_U_Interface() {
-    //Register(FunctionTable);
+    Register(FunctionTable);
 }
 
 } // namespace CECD

src/core/hle/service/cfg/cfg.cpp

@@ -11,6 +11,7 @@
 #include "core/file_sys/archive_systemsavedata.h"
 #include "core/file_sys/file_backend.h"
 #include "core/settings.h"
+#include "core/hle/result.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_i.h"
 #include "core/hle/service/cfg/cfg_s.h"

src/core/hle/service/cfg/cfg.h

@@ -5,10 +5,15 @@
 #pragma once
 
 #include <array>
-#include "core/hle/result.h"
-#include "core/hle/service/service.h"
+
+#include "common/common_types.h"
+
+union ResultCode;
 
 namespace Service {
+
+class Interface;
+
 namespace CFG {
 
 enum SystemModel {

src/core/hle/service/cfg/cfg_i.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_i.h"
 

src/core/hle/service/cfg/cfg_s.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_s.h"
 

src/core/hle/service/cfg/cfg_u.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_u.h"
 

src/core/hle/service/dsp_dsp.cpp

@@ -4,7 +4,6 @@
 
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/service/dsp_dsp.h"
 

src/core/hle/service/err_f.cpp

@@ -2,9 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/bit_field.h"
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/service/err_f.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/frd/frd.cpp

@@ -7,10 +7,6 @@
 #include "core/hle/service/frd/frd_a.h"
 #include "core/hle/service/frd/frd_u.h"
 
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
-
 namespace Service {
 namespace FRD {
 

src/core/hle/service/frd/frd.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
 namespace FRD {
 

src/core/hle/service/frd/frd_a.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/frd/frd.h"
 #include "core/hle/service/frd/frd_a.h"
 
 namespace Service {

src/core/hle/service/frd/frd_u.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/frd/frd.h"
 #include "core/hle/service/frd/frd_u.h"
 
 namespace Service {

src/core/hle/service/gsp_lcd.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/bit_field.h"
-
 #include "core/hle/service/gsp_lcd.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/hid/hid.cpp

@@ -13,7 +13,6 @@
 #include "core/core_timing.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
 
 #include "video_core/video_core.h"
 

src/core/hle/service/hid/hid_spvr.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_spvr.h"
 

src/core/hle/service/hid/hid_user.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_user.h"
 

src/core/hle/service/http_c.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/http_c.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/ir/ir.cpp

@@ -8,7 +8,6 @@
 #include "core/hle/service/ir/ir_u.h"
 #include "core/hle/service/ir/ir_user.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
 

src/core/hle/service/ir/ir.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
+
+class Interface;
+
 namespace IR {
 
 /**

src/core/hle/service/ir/ir_rst.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_rst.h"
 

src/core/hle/service/ir/ir_u.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_u.h"
 
 namespace Service {

src/core/hle/service/ir/ir_user.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/ir/ir.h"
 #include "core/hle/service/ir/ir_user.h"
 
 namespace Service {

src/core/hle/service/ldr_ro.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/service/ldr_ro.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/mic_u.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/mic_u.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/ndm_u.cpp

@@ -2,8 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "ndm_u.h"
+#include "core/hle/service/ndm_u.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace NDM_U

src/core/hle/service/news/news.cpp

@@ -9,10 +9,6 @@
 #include "core/hle/service/news/news_s.h"
 #include "core/hle/service/news/news_u.h"
 
-#include "core/hle/hle.h"
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-
 namespace Service {
 namespace NEWS {
 

src/core/hle/service/news/news.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
 namespace NEWS {
 

src/core/hle/service/news/news_s.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/news/news.h"
 #include "core/hle/service/news/news_s.h"
 

src/core/hle/service/news/news_u.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/news/news.h"
 #include "core/hle/service/news/news_u.h"
 
 namespace Service {

src/core/hle/service/nim/nim.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
 #include "core/hle/service/service.h"
@@ -10,10 +11,6 @@
 #include "core/hle/service/nim/nim_s.h"
 #include "core/hle/service/nim/nim_u.h"
 
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/hle.h"
-
 namespace Service {
 namespace NIM {
 

src/core/hle/service/nim/nim.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"
-
 namespace Service {
+
+class Interface;
+
 namespace NIM {
 
 /**

src/core/hle/service/nim/nim_aoc.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/nim/nim_aoc.h"
 
 namespace Service {

src/core/hle/service/nim/nim_s.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
-#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/nim/nim_s.h"
 
 namespace Service {

src/core/hle/service/nim/nim_u.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/nim/nim.h"
 #include "core/hle/service/nim/nim_u.h"
 

src/core/hle/service/ns_s.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-
-#include "core/hle/hle.h"
 #include "core/hle/service/ns_s.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -14,14 +12,19 @@ namespace NS_S {
 const Interface::FunctionInfo FunctionTable[] = {
     {0x000100C0, nullptr,                      "LaunchFIRM"},
     {0x000200C0, nullptr,                      "LaunchTitle"},
+    {0x00030000, nullptr,                      "TerminateApplication"},
+    {0x00040040, nullptr,                      "TerminateProcess"},
     {0x000500C0, nullptr,                      "LaunchApplicationFIRM"},
     {0x00060042, nullptr,                      "SetFIRMParams4A0"},
     {0x00070042, nullptr,                      "CardUpdateInitialize"},
-    {0x000D0140, nullptr,                      "SetFIRMParams4B0"},
+    {0x00080000, nullptr,                      "CardUpdateShutdown"},
+    {0x000D0140, nullptr,                      "SetTWLBannerHMAC"},
     {0x000E0000, nullptr,                      "ShutdownAsync"},
     {0x00100180, nullptr,                      "RebootSystem"},
+    {0x00110100, nullptr,                      "TerminateTitle"},
+    {0x001200C0, nullptr,                      "SetApplicationCpuTimeLimit"},
     {0x00150140, nullptr,                      "LaunchApplication"},
-    {0x00160000, nullptr,                      "HardRebootSystem"},
+    {0x00160000, nullptr,                      "RebootSystemClean"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/nwm_uds.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/service/nwm_uds.h"
 

src/core/hle/service/pm_app.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/pm_app.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/ptm/ptm.h

@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include <array>
-#include "core/hle/service/service.h"
-#include "core/hle/result.h"
+#include "common/common_types.h"
 
 namespace Service {
+
+class Interface;
+
 namespace PTM {
 
 /// Charge levels used by PTM functions

src/core/hle/service/ptm/ptm_play.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/ptm/ptm_play.h"
 
 namespace Service {

src/core/hle/service/ptm/ptm_sysm.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "core/hle/service/ptm/ptm.h"
 #include "core/hle/service/ptm/ptm_sysm.h"
 

src/core/hle/service/ptm/ptm_u.cpp

@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/logging/log.h"
-
-#include "core/hle/hle.h"
 #include "core/hle/service/ptm/ptm.h"
 #include "core/hle/service/ptm/ptm_u.h"
 

src/core/hle/service/srv.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/service/srv.h"
 #include "core/hle/kernel/event.h"
 

src/core/hle/service/ssl_c.cpp

@@ -4,7 +4,7 @@
 
 #include <random>
 
-#include "core/hle/hle.h"
+#include "common/common_types.h"
 #include "core/hle/service/ssl_c.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/service/y2r_u.cpp

@@ -4,15 +4,15 @@
 
 #include <cstring>
 
+#include "common/common_types.h"
 #include "common/logging/log.h"
 
-#include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
+#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/y2r_u.h"
 #include "core/hw/y2r.h"
 
 #include "video_core/renderer_base.h"
-#include "video_core/utils.h"
 #include "video_core/video_core.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////