gl_buffer_cache: Batch vertex/tfb buffer binding

Query Cache: Disable write syncing on Android

src/CMakeLists.txt

@@ -181,15 +181,13 @@ else()
     endif()
 endif()
 
-add_subdirectory(audio_core)
 add_subdirectory(common)
 add_subdirectory(core)
-add_subdirectory(input_common)
-add_subdirectory(kernel)
-add_subdirectory(network)
-add_subdirectory(shader_recompiler)
-add_subdirectory(service)
+add_subdirectory(audio_core)
 add_subdirectory(video_core)
+add_subdirectory(network)
+add_subdirectory(input_common)
+add_subdirectory(shader_recompiler)
 
 if (YUZU_ROOM)
      add_subdirectory(dedicated_room)

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -373,8 +373,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
             .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val isEmulationActive = emulationViewModel.emulationStarted.value &&
+                !emulationViewModel.isEmulationStopping.value
             pictureInPictureParamsBuilder.setAutoEnterEnabled(
-                BooleanSetting.PICTURE_IN_PICTURE.boolean
+                BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive
             )
         }
         setPictureInPictureParams(pictureInPictureParamsBuilder.build())

src/android/app/src/main/jni/config.cpp

@@ -12,10 +12,10 @@
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "common/settings_enums.h"
+#include "core/hle/service/acc/profile_manager.h"
 #include "input_common/main.h"
 #include "jni/config.h"
 #include "jni/default_ini.h"
-#include "service/acc/profile_manager.h"
 #include "uisettings.h"
 
 namespace FS = Common::FS;

src/android/app/src/main/jni/native.cpp

@@ -47,15 +47,15 @@
 #include "core/hid/emulated_controller.h"
 #include "core/hid/hid_core.h"
 #include "core/hid/hid_types.h"
+#include "core/hle/service/am/applet_ae.h"
+#include "core/hle/service/am/applet_oe.h"
+#include "core/hle/service/am/applets/applets.h"
+#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
 #include "jni/android_common/android_common.h"
 #include "jni/config.h"
 #include "jni/id_cache.h"
 #include "jni/native.h"
-#include "service/am/applet_ae.h"
-#include "service/am/applet_oe.h"
-#include "service/am/applets/applets.h"
-#include "service/filesystem/filesystem.h"
 #include "video_core/renderer_base.h"
 
 #define jconst [[maybe_unused]] const auto

src/android/app/src/main/jni/native.h

@@ -5,10 +5,10 @@
 #include "common/detached_tasks.h"
 #include "core/core.h"
 #include "core/file_sys/registered_cache.h"
+#include "core/hle/service/acc/profile_manager.h"
 #include "core/perf_stats.h"
 #include "jni/applets/software_keyboard.h"
 #include "jni/emu_window/emu_window.h"
-#include "service/acc/profile_manager.h"
 #include "video_core/rasterizer_interface.h"
 
 #pragma once

src/android/app/src/main/jni/uisettings.h

@@ -13,7 +13,7 @@ struct Values {
     Settings::Linkage linkage;
 
     // Android
-    Settings::Setting<bool> picture_in_picture{linkage, true, "picture_in_picture",
+    Settings::Setting<bool> picture_in_picture{linkage, false, "picture_in_picture",
                                                Settings::Category::Android};
     Settings::Setting<s32> screen_layout{linkage,
                                          5,

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -139,7 +139,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/show_fps_text"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                style="@style/TextAppearance.Material3.BodySmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
@@ -147,7 +147,8 @@
                 android:focusable="false"
                 android:paddingHorizontal="20dp"
                 android:textColor="@android:color/white"
-                android:textSize="12sp"
+                android:shadowColor="@android:color/black"
+                android:shadowRadius="3"
                 tools:ignore="RtlHardcoded" />
 
         </FrameLayout>

src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp

@@ -12,7 +12,7 @@ bool IsValidChannelCount(u32 channel_count) {
 }
 
 bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
-    return total_stream_count > 0 && stereo_stream_count > 0 &&
+    return total_stream_count > 0 && static_cast<s32>(stereo_stream_count) >= 0 &&
            stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count);
 }
 } // namespace

src/audio_core/audio_in_manager.cpp

@@ -8,7 +8,7 @@
 #include "audio_core/sink/sink_details.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/audio_manager.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_manager.h"
 #include "core/core.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore {
 

src/audio_core/audio_out_manager.cpp

@@ -6,8 +6,8 @@
 #include "audio_core/audio_out_manager.h"
 #include "audio_core/out/audio_out.h"
 #include "core/core.h"
-#include "kernel/k_event.h"
-#include "service/audio/errors.h"
+#include "core/hle/kernel/k_event.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/audio_render_manager.h

@@ -11,7 +11,7 @@
 
 #include "audio_core/common/common.h"
 #include "audio_core/renderer/system_manager.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/device/device_session.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/sink/sink.h"
 #include "common/scratch_buffer.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/in/audio_in.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_in_manager.h"
 #include "audio_core/in/audio_in.h"
-#include "kernel/k_event.h"
+#include "core/hle/kernel/k_event.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/in/audio_in_system.cpp

@@ -9,7 +9,7 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "kernel/k_event.h"
+#include "core/hle/kernel/k_event.h"
 
 namespace AudioCore::AudioIn {
 

src/audio_core/in/audio_in_system.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/device/audio_buffers.h"
 #include "audio_core/device/device_session.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/decoder.cpp

@@ -148,7 +148,7 @@ Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out
     auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
     OpusPacketHeader header{ReverseHeader(*header_p)};
 
-    LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
+    LOG_TRACE(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
               header.size, input_data.size_bytes(), in_data.size_bytes());
 
     R_UNLESS(in_data.size_bytes() >= header.size &&

src/audio_core/opus/decoder.h

@@ -7,8 +7,8 @@
 
 #include "audio_core/opus/parameters.h"
 #include "common/common_types.h"
-#include "kernel/k_transfer_memory.h"
-#include "service/audio/errors.h"
+#include "core/hle/kernel/k_transfer_memory.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/decoder_manager.h

@@ -6,7 +6,7 @@
 #include "audio_core/opus/hardware_opus.h"
 #include "audio_core/opus/parameters.h"
 #include "common/common_types.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/opus/hardware_opus.h

@@ -9,7 +9,7 @@
 #include "audio_core/adsp/apps/opus/opus_decoder.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/adsp/mailbox.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::OpusDecoder {
 class HardwareOpus {

src/audio_core/out/audio_out.cpp

@@ -3,7 +3,7 @@
 
 #include "audio_core/audio_out_manager.h"
 #include "audio_core/out/audio_out.h"
-#include "kernel/k_event.h"
+#include "core/hle/kernel/k_event.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/out/audio_out_system.cpp

@@ -9,7 +9,7 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "kernel/k_event.h"
+#include "core/hle/kernel/k_event.h"
 
 namespace AudioCore::AudioOut {
 

src/audio_core/out/audio_out_system.h

@@ -11,7 +11,7 @@
 #include "audio_core/common/common.h"
 #include "audio_core/device/audio_buffers.h"
 #include "audio_core/device/device_session.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/renderer/audio_renderer.cpp

@@ -6,8 +6,8 @@
 #include "audio_core/renderer/audio_renderer.h"
 #include "audio_core/renderer/system_manager.h"
 #include "core/core.h"
-#include "kernel/k_transfer_memory.h"
-#include "service/audio/errors.h"
+#include "core/hle/kernel/k_transfer_memory.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/audio_renderer.h

@@ -6,7 +6,7 @@
 #include <span>
 
 #include "audio_core/renderer/system.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 class System;

src/audio_core/renderer/behavior/behavior_info.h

@@ -8,7 +8,7 @@
 
 #include "audio_core/common/common.h"
 #include "common/common_types.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 /**

src/audio_core/renderer/behavior/info_updater.h

@@ -6,7 +6,7 @@
 #include <span>
 
 #include "common/common_types.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 class BehaviorInfo;

src/audio_core/renderer/memory/pool_mapper.cpp

@@ -3,8 +3,8 @@
 
 #include "audio_core/renderer/memory/address_info.h"
 #include "audio_core/renderer/memory/pool_mapper.h"
-#include "kernel/k_process.h"
-#include "kernel/svc.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/svc.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/memory/pool_mapper.h

@@ -8,7 +8,7 @@
 #include "audio_core/renderer/behavior/behavior_info.h"
 #include "audio_core/renderer/memory/memory_pool_info.h"
 #include "common/common_types.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore::Renderer {
 class AddressInfo;

src/audio_core/renderer/system.cpp

@@ -31,9 +31,9 @@
 #include "common/alignment.h"
 #include "core/core.h"
 #include "core/core_timing.h"
+#include "core/hle/kernel/k_event.h"
+#include "core/hle/kernel/k_transfer_memory.h"
 #include "core/memory.h"
-#include "kernel/k_event.h"
-#include "kernel/k_transfer_memory.h"
 
 namespace AudioCore::Renderer {
 

src/audio_core/renderer/system.h

@@ -18,7 +18,7 @@
 #include "audio_core/renderer/upsampler/upsampler_manager.h"
 #include "audio_core/renderer/voice/voice_context.h"
 #include "common/thread.h"
-#include "service/audio/errors.h"
+#include "core/hle/service/audio/errors.h"
 
 namespace Core {
 namespace Memory {

src/common/settings_input.cpp

@@ -6,10 +6,11 @@
 namespace Settings {
 namespace NativeButton {
 const std::array<const char*, NumButtons> mapping = {{
-    "button_a",      "button_b",     "button_x",     "button_y",    "button_lstick",
-    "button_rstick", "button_l",     "button_r",     "button_zl",   "button_zr",
-    "button_plus",   "button_minus", "button_dleft", "button_dup",  "button_dright",
-    "button_ddown",  "button_sl",    "button_sr",    "button_home", "button_screenshot",
+    "button_a",       "button_b",       "button_x",      "button_y",    "button_lstick",
+    "button_rstick",  "button_l",       "button_r",      "button_zl",   "button_zr",
+    "button_plus",    "button_minus",   "button_dleft",  "button_dup",  "button_dright",
+    "button_ddown",   "button_slleft",  "button_srleft", "button_home", "button_screenshot",
+    "button_slright", "button_srright",
 }};
 }
 

src/common/settings_input.h

@@ -29,12 +29,15 @@ enum Values : int {
     DRight,
     DDown,
 
-    SL,
-    SR,
+    SLLeft,
+    SRLeft,
 
     Home,
     Screenshot,
 
+    SLRight,
+    SRRight,
+
     NumButtons,
 };
 

src/core/CMakeLists.txt

@@ -197,9 +197,653 @@ add_library(core STATIC
     hid/irs_types.h
     hid/motion_input.cpp
     hid/motion_input.h
-    api_version.h
-    ipc.h
-    result.h
+    hle/api_version.h
+    hle/ipc.h
+    hle/kernel/board/nintendo/nx/k_memory_layout.cpp
+    hle/kernel/board/nintendo/nx/k_memory_layout.h
+    hle/kernel/board/nintendo/nx/k_system_control.cpp
+    hle/kernel/board/nintendo/nx/k_system_control.h
+    hle/kernel/board/nintendo/nx/secure_monitor.h
+    hle/kernel/code_set.cpp
+    hle/kernel/code_set.h
+    hle/kernel/svc_results.h
+    hle/kernel/global_scheduler_context.cpp
+    hle/kernel/global_scheduler_context.h
+    hle/kernel/init/init_slab_setup.cpp
+    hle/kernel/init/init_slab_setup.h
+    hle/kernel/initial_process.h
+    hle/kernel/k_address_arbiter.cpp
+    hle/kernel/k_address_arbiter.h
+    hle/kernel/k_address_space_info.cpp
+    hle/kernel/k_address_space_info.h
+    hle/kernel/k_auto_object.cpp
+    hle/kernel/k_auto_object.h
+    hle/kernel/k_auto_object_container.cpp
+    hle/kernel/k_auto_object_container.h
+    hle/kernel/k_affinity_mask.h
+    hle/kernel/k_capabilities.cpp
+    hle/kernel/k_capabilities.h
+    hle/kernel/k_class_token.cpp
+    hle/kernel/k_class_token.h
+    hle/kernel/k_client_port.cpp
+    hle/kernel/k_client_port.h
+    hle/kernel/k_client_session.cpp
+    hle/kernel/k_client_session.h
+    hle/kernel/k_code_memory.cpp
+    hle/kernel/k_code_memory.h
+    hle/kernel/k_condition_variable.cpp
+    hle/kernel/k_condition_variable.h
+    hle/kernel/k_debug.h
+    hle/kernel/k_device_address_space.cpp
+    hle/kernel/k_device_address_space.h
+    hle/kernel/k_dynamic_page_manager.h
+    hle/kernel/k_dynamic_resource_manager.h
+    hle/kernel/k_dynamic_slab_heap.h
+    hle/kernel/k_event.cpp
+    hle/kernel/k_event.h
+    hle/kernel/k_event_info.h
+    hle/kernel/k_handle_table.cpp
+    hle/kernel/k_handle_table.h
+    hle/kernel/k_hardware_timer_base.h
+    hle/kernel/k_hardware_timer.cpp
+    hle/kernel/k_hardware_timer.h
+    hle/kernel/k_interrupt_manager.cpp
+    hle/kernel/k_interrupt_manager.h
+    hle/kernel/k_light_condition_variable.cpp
+    hle/kernel/k_light_condition_variable.h
+    hle/kernel/k_light_lock.cpp
+    hle/kernel/k_light_lock.h
+    hle/kernel/k_memory_block.h
+    hle/kernel/k_memory_block_manager.cpp
+    hle/kernel/k_memory_block_manager.h
+    hle/kernel/k_memory_layout.cpp
+    hle/kernel/k_memory_layout.h
+    hle/kernel/k_memory_manager.cpp
+    hle/kernel/k_memory_manager.h
+    hle/kernel/k_memory_region.h
+    hle/kernel/k_memory_region_type.h
+    hle/kernel/k_object_name.cpp
+    hle/kernel/k_object_name.h
+    hle/kernel/k_page_bitmap.h
+    hle/kernel/k_page_buffer.cpp
+    hle/kernel/k_page_buffer.h
+    hle/kernel/k_page_heap.cpp
+    hle/kernel/k_page_heap.h
+    hle/kernel/k_page_group.cpp
+    hle/kernel/k_page_group.h
+    hle/kernel/k_page_table.h
+    hle/kernel/k_page_table_base.cpp
+    hle/kernel/k_page_table_base.h
+    hle/kernel/k_page_table_manager.h
+    hle/kernel/k_page_table_slab_heap.h
+    hle/kernel/k_port.cpp
+    hle/kernel/k_port.h
+    hle/kernel/k_priority_queue.h
+    hle/kernel/k_process.cpp
+    hle/kernel/k_process.h
+    hle/kernel/k_process_page_table.h
+    hle/kernel/k_readable_event.cpp
+    hle/kernel/k_readable_event.h
+    hle/kernel/k_resource_limit.cpp
+    hle/kernel/k_resource_limit.h
+    hle/kernel/k_scheduler.cpp
+    hle/kernel/k_scheduler.h
+    hle/kernel/k_scheduler_lock.h
+    hle/kernel/k_scoped_lock.h
+    hle/kernel/k_scoped_resource_reservation.h
+    hle/kernel/k_scoped_scheduler_lock_and_sleep.h
+    hle/kernel/k_server_port.cpp
+    hle/kernel/k_server_port.h
+    hle/kernel/k_server_session.cpp
+    hle/kernel/k_server_session.h
+    hle/kernel/k_session.cpp
+    hle/kernel/k_session.h
+    hle/kernel/k_session_request.cpp
+    hle/kernel/k_session_request.h
+    hle/kernel/k_shared_memory.cpp
+    hle/kernel/k_shared_memory.h
+    hle/kernel/k_shared_memory_info.h
+    hle/kernel/k_slab_heap.h
+    hle/kernel/k_spin_lock.cpp
+    hle/kernel/k_spin_lock.h
+    hle/kernel/k_synchronization_object.cpp
+    hle/kernel/k_synchronization_object.h
+    hle/kernel/k_system_control.h
+    hle/kernel/k_system_resource.cpp
+    hle/kernel/k_system_resource.h
+    hle/kernel/k_thread.cpp
+    hle/kernel/k_thread.h
+    hle/kernel/k_thread_local_page.cpp
+    hle/kernel/k_thread_local_page.h
+    hle/kernel/k_thread_queue.cpp
+    hle/kernel/k_thread_queue.h
+    hle/kernel/k_timer_task.h
+    hle/kernel/k_trace.h
+    hle/kernel/k_transfer_memory.cpp
+    hle/kernel/k_transfer_memory.h
+    hle/kernel/k_typed_address.h
+    hle/kernel/k_worker_task.h
+    hle/kernel/k_worker_task_manager.cpp
+    hle/kernel/k_worker_task_manager.h
+    hle/kernel/kernel.cpp
+    hle/kernel/kernel.h
+    hle/kernel/memory_types.h
+    hle/kernel/message_buffer.h
+    hle/kernel/physical_core.cpp
+    hle/kernel/physical_core.h
+    hle/kernel/physical_memory.h
+    hle/kernel/slab_helpers.h
+    hle/kernel/svc.cpp
+    hle/kernel/svc.h
+    hle/kernel/svc_common.h
+    hle/kernel/svc_types.h
+    hle/kernel/svc/svc_activity.cpp
+    hle/kernel/svc/svc_address_arbiter.cpp
+    hle/kernel/svc/svc_address_translation.cpp
+    hle/kernel/svc/svc_cache.cpp
+    hle/kernel/svc/svc_code_memory.cpp
+    hle/kernel/svc/svc_condition_variable.cpp
+    hle/kernel/svc/svc_debug.cpp
+    hle/kernel/svc/svc_debug_string.cpp
+    hle/kernel/svc/svc_device_address_space.cpp
+    hle/kernel/svc/svc_event.cpp
+    hle/kernel/svc/svc_exception.cpp
+    hle/kernel/svc/svc_info.cpp
+    hle/kernel/svc/svc_insecure_memory.cpp
+    hle/kernel/svc/svc_interrupt_event.cpp
+    hle/kernel/svc/svc_io_pool.cpp
+    hle/kernel/svc/svc_ipc.cpp
+    hle/kernel/svc/svc_kernel_debug.cpp
+    hle/kernel/svc/svc_light_ipc.cpp
+    hle/kernel/svc/svc_lock.cpp
+    hle/kernel/svc/svc_memory.cpp
+    hle/kernel/svc/svc_physical_memory.cpp
+    hle/kernel/svc/svc_port.cpp
+    hle/kernel/svc/svc_power_management.cpp
+    hle/kernel/svc/svc_process.cpp
+    hle/kernel/svc/svc_process_memory.cpp
+    hle/kernel/svc/svc_processor.cpp
+    hle/kernel/svc/svc_query_memory.cpp
+    hle/kernel/svc/svc_register.cpp
+    hle/kernel/svc/svc_resource_limit.cpp
+    hle/kernel/svc/svc_secure_monitor_call.cpp
+    hle/kernel/svc/svc_session.cpp
+    hle/kernel/svc/svc_shared_memory.cpp
+    hle/kernel/svc/svc_synchronization.cpp
+    hle/kernel/svc/svc_thread.cpp
+    hle/kernel/svc/svc_thread_profiler.cpp
+    hle/kernel/svc/svc_tick.cpp
+    hle/kernel/svc/svc_transfer_memory.cpp
+    hle/result.h
+    hle/service/acc/acc.cpp
+    hle/service/acc/acc.h
+    hle/service/acc/acc_aa.cpp
+    hle/service/acc/acc_aa.h
+    hle/service/acc/acc_su.cpp
+    hle/service/acc/acc_su.h
+    hle/service/acc/acc_u0.cpp
+    hle/service/acc/acc_u0.h
+    hle/service/acc/acc_u1.cpp
+    hle/service/acc/acc_u1.h
+    hle/service/acc/async_context.cpp
+    hle/service/acc/async_context.h
+    hle/service/acc/errors.h
+    hle/service/acc/profile_manager.cpp
+    hle/service/acc/profile_manager.h
+    hle/service/am/am.cpp
+    hle/service/am/am.h
+    hle/service/am/applet_ae.cpp
+    hle/service/am/applet_ae.h
+    hle/service/am/applet_oe.cpp
+    hle/service/am/applet_oe.h
+    hle/service/am/applets/applet_cabinet.cpp
+    hle/service/am/applets/applet_cabinet.h
+    hle/service/am/applets/applet_controller.cpp
+    hle/service/am/applets/applet_controller.h
+    hle/service/am/applets/applet_error.cpp
+    hle/service/am/applets/applet_error.h
+    hle/service/am/applets/applet_general_backend.cpp
+    hle/service/am/applets/applet_general_backend.h
+    hle/service/am/applets/applet_mii_edit.cpp
+    hle/service/am/applets/applet_mii_edit.h
+    hle/service/am/applets/applet_mii_edit_types.h
+    hle/service/am/applets/applet_profile_select.cpp
+    hle/service/am/applets/applet_profile_select.h
+    hle/service/am/applets/applet_software_keyboard.cpp
+    hle/service/am/applets/applet_software_keyboard.h
+    hle/service/am/applets/applet_software_keyboard_types.h
+    hle/service/am/applets/applet_web_browser.cpp
+    hle/service/am/applets/applet_web_browser.h
+    hle/service/am/applets/applet_web_browser_types.h
+    hle/service/am/applets/applets.cpp
+    hle/service/am/applets/applets.h
+    hle/service/am/idle.cpp
+    hle/service/am/idle.h
+    hle/service/am/omm.cpp
+    hle/service/am/omm.h
+    hle/service/am/spsm.cpp
+    hle/service/am/spsm.h
+    hle/service/aoc/aoc_u.cpp
+    hle/service/aoc/aoc_u.h
+    hle/service/apm/apm.cpp
+    hle/service/apm/apm.h
+    hle/service/apm/apm_controller.cpp
+    hle/service/apm/apm_controller.h
+    hle/service/apm/apm_interface.cpp
+    hle/service/apm/apm_interface.h
+    hle/service/audio/audctl.cpp
+    hle/service/audio/audctl.h
+    hle/service/audio/audin_u.cpp
+    hle/service/audio/audin_u.h
+    hle/service/audio/audio.cpp
+    hle/service/audio/audio.h
+    hle/service/audio/audout_u.cpp
+    hle/service/audio/audout_u.h
+    hle/service/audio/audrec_a.cpp
+    hle/service/audio/audrec_a.h
+    hle/service/audio/audrec_u.cpp
+    hle/service/audio/audrec_u.h
+    hle/service/audio/audren_u.cpp
+    hle/service/audio/audren_u.h
+    hle/service/audio/errors.h
+    hle/service/audio/hwopus.cpp
+    hle/service/audio/hwopus.h
+    hle/service/bcat/backend/backend.cpp
+    hle/service/bcat/backend/backend.h
+    hle/service/bcat/bcat.cpp
+    hle/service/bcat/bcat.h
+    hle/service/bcat/bcat_module.cpp
+    hle/service/bcat/bcat_module.h
+    hle/service/bpc/bpc.cpp
+    hle/service/bpc/bpc.h
+    hle/service/btdrv/btdrv.cpp
+    hle/service/btdrv/btdrv.h
+    hle/service/btm/btm.cpp
+    hle/service/btm/btm.h
+    hle/service/caps/caps.cpp
+    hle/service/caps/caps.h
+    hle/service/caps/caps_a.cpp
+    hle/service/caps/caps_a.h
+    hle/service/caps/caps_c.cpp
+    hle/service/caps/caps_c.h
+    hle/service/caps/caps_manager.cpp
+    hle/service/caps/caps_manager.h
+    hle/service/caps/caps_result.h
+    hle/service/caps/caps_sc.cpp
+    hle/service/caps/caps_sc.h
+    hle/service/caps/caps_ss.cpp
+    hle/service/caps/caps_ss.h
+    hle/service/caps/caps_su.cpp
+    hle/service/caps/caps_su.h
+    hle/service/caps/caps_types.h
+    hle/service/caps/caps_u.cpp
+    hle/service/caps/caps_u.h
+    hle/service/erpt/erpt.cpp
+    hle/service/erpt/erpt.h
+    hle/service/es/es.cpp
+    hle/service/es/es.h
+    hle/service/eupld/eupld.cpp
+    hle/service/eupld/eupld.h
+    hle/service/fatal/fatal.cpp
+    hle/service/fatal/fatal.h
+    hle/service/fatal/fatal_p.cpp
+    hle/service/fatal/fatal_p.h
+    hle/service/fatal/fatal_u.cpp
+    hle/service/fatal/fatal_u.h
+    hle/service/filesystem/filesystem.cpp
+    hle/service/filesystem/filesystem.h
+    hle/service/filesystem/fsp_ldr.cpp
+    hle/service/filesystem/fsp_ldr.h
+    hle/service/filesystem/fsp_pr.cpp
+    hle/service/filesystem/fsp_pr.h
+    hle/service/filesystem/fsp_srv.cpp
+    hle/service/filesystem/fsp_srv.h
+    hle/service/fgm/fgm.cpp
+    hle/service/fgm/fgm.h
+    hle/service/friend/friend.cpp
+    hle/service/friend/friend.h
+    hle/service/friend/friend_interface.cpp
+    hle/service/friend/friend_interface.h
+    hle/service/glue/arp.cpp
+    hle/service/glue/arp.h
+    hle/service/glue/bgtc.cpp
+    hle/service/glue/bgtc.h
+    hle/service/glue/ectx.cpp
+    hle/service/glue/ectx.h
+    hle/service/glue/errors.h
+    hle/service/glue/glue.cpp
+    hle/service/glue/glue.h
+    hle/service/glue/glue_manager.cpp
+    hle/service/glue/glue_manager.h
+    hle/service/glue/notif.cpp
+    hle/service/glue/notif.h
+    hle/service/grc/grc.cpp
+    hle/service/grc/grc.h
+    hle/service/hid/hid.cpp
+    hle/service/hid/hid.h
+    hle/service/hid/hid_debug_server.cpp
+    hle/service/hid/hid_debug_server.h
+    hle/service/hid/hid_firmware_settings.cpp
+    hle/service/hid/hid_firmware_settings.h
+    hle/service/hid/hid_server.cpp
+    hle/service/hid/hid_server.h
+    hle/service/hid/hid_system_server.cpp
+    hle/service/hid/hid_system_server.h
+    hle/service/hid/hidbus.cpp
+    hle/service/hid/hidbus.h
+    hle/service/hid/irs.cpp
+    hle/service/hid/irs.h
+    hle/service/hid/irs_ring_lifo.h
+    hle/service/hid/resource_manager.cpp
+    hle/service/hid/resource_manager.h
+    hle/service/hid/ring_lifo.h
+    hle/service/hid/xcd.cpp
+    hle/service/hid/xcd.h
+    hle/service/hid/errors.h
+    hle/service/hid/controllers/console_sixaxis.cpp
+    hle/service/hid/controllers/console_sixaxis.h
+    hle/service/hid/controllers/controller_base.cpp
+    hle/service/hid/controllers/controller_base.h
+    hle/service/hid/controllers/debug_pad.cpp
+    hle/service/hid/controllers/debug_pad.h
+    hle/service/hid/controllers/gesture.cpp
+    hle/service/hid/controllers/gesture.h
+    hle/service/hid/controllers/keyboard.cpp
+    hle/service/hid/controllers/keyboard.h
+    hle/service/hid/controllers/mouse.cpp
+    hle/service/hid/controllers/mouse.h
+    hle/service/hid/controllers/npad.cpp
+    hle/service/hid/controllers/npad.h
+    hle/service/hid/controllers/palma.cpp
+    hle/service/hid/controllers/palma.h
+    hle/service/hid/controllers/stubbed.cpp
+    hle/service/hid/controllers/stubbed.h
+    hle/service/hid/controllers/touchscreen.cpp
+    hle/service/hid/controllers/touchscreen.h
+    hle/service/hid/controllers/xpad.cpp
+    hle/service/hid/controllers/xpad.h
+    hle/service/hid/hidbus/hidbus_base.cpp
+    hle/service/hid/hidbus/hidbus_base.h
+    hle/service/hid/hidbus/ringcon.cpp
+    hle/service/hid/hidbus/ringcon.h
+    hle/service/hid/hidbus/starlink.cpp
+    hle/service/hid/hidbus/starlink.h
+    hle/service/hid/hidbus/stubbed.cpp
+    hle/service/hid/hidbus/stubbed.h
+    hle/service/hid/irsensor/clustering_processor.cpp
+    hle/service/hid/irsensor/clustering_processor.h
+    hle/service/hid/irsensor/image_transfer_processor.cpp
+    hle/service/hid/irsensor/image_transfer_processor.h
+    hle/service/hid/irsensor/ir_led_processor.cpp
+    hle/service/hid/irsensor/ir_led_processor.h
+    hle/service/hid/irsensor/moment_processor.cpp
+    hle/service/hid/irsensor/moment_processor.h
+    hle/service/hid/irsensor/pointing_processor.cpp
+    hle/service/hid/irsensor/pointing_processor.h
+    hle/service/hid/irsensor/processor_base.cpp
+    hle/service/hid/irsensor/processor_base.h
+    hle/service/hid/irsensor/tera_plugin_processor.cpp
+    hle/service/hid/irsensor/tera_plugin_processor.h
+    hle/service/lbl/lbl.cpp
+    hle/service/lbl/lbl.h
+    hle/service/ldn/lan_discovery.cpp
+    hle/service/ldn/lan_discovery.h
+    hle/service/ldn/ldn_results.h
+    hle/service/ldn/ldn.cpp
+    hle/service/ldn/ldn.h
+    hle/service/ldn/ldn_types.h
+    hle/service/ldr/ldr.cpp
+    hle/service/ldr/ldr.h
+    hle/service/lm/lm.cpp
+    hle/service/lm/lm.h
+    hle/service/mig/mig.cpp
+    hle/service/mig/mig.h
+    hle/service/mii/types/char_info.cpp
+    hle/service/mii/types/char_info.h
+    hle/service/mii/types/core_data.cpp
+    hle/service/mii/types/core_data.h
+    hle/service/mii/types/raw_data.cpp
+    hle/service/mii/types/raw_data.h
+    hle/service/mii/types/store_data.cpp
+    hle/service/mii/types/store_data.h
+    hle/service/mii/types/ver3_store_data.cpp
+    hle/service/mii/types/ver3_store_data.h
+    hle/service/mii/mii.cpp
+    hle/service/mii/mii.h
+    hle/service/mii/mii_database.cpp
+    hle/service/mii/mii_database.h
+    hle/service/mii/mii_database_manager.cpp
+    hle/service/mii/mii_database_manager.h
+    hle/service/mii/mii_manager.cpp
+    hle/service/mii/mii_manager.h
+    hle/service/mii/mii_result.h
+    hle/service/mii/mii_types.h
+    hle/service/mii/mii_util.h
+    hle/service/mm/mm_u.cpp
+    hle/service/mm/mm_u.h
+    hle/service/mnpp/mnpp_app.cpp
+    hle/service/mnpp/mnpp_app.h
+    hle/service/ncm/ncm.cpp
+    hle/service/ncm/ncm.h
+    hle/service/nfc/common/amiibo_crypto.cpp
+    hle/service/nfc/common/amiibo_crypto.h
+    hle/service/nfc/common/device.cpp
+    hle/service/nfc/common/device.h
+    hle/service/nfc/common/device_manager.cpp
+    hle/service/nfc/common/device_manager.h
+    hle/service/nfc/mifare_result.h
+    hle/service/nfc/mifare_types.h
+    hle/service/nfc/nfc.cpp
+    hle/service/nfc/nfc.h
+    hle/service/nfc/nfc_interface.cpp
+    hle/service/nfc/nfc_interface.h
+    hle/service/nfc/nfc_result.h
+    hle/service/nfc/nfc_types.h
+    hle/service/nfp/nfp.cpp
+    hle/service/nfp/nfp.h
+    hle/service/nfp/nfp_interface.cpp
+    hle/service/nfp/nfp_interface.h
+    hle/service/nfp/nfp_result.h
+    hle/service/nfp/nfp_types.h
+    hle/service/ngc/ngc.cpp
+    hle/service/ngc/ngc.h
+    hle/service/nifm/nifm.cpp
+    hle/service/nifm/nifm.h
+    hle/service/nim/nim.cpp
+    hle/service/nim/nim.h
+    hle/service/npns/npns.cpp
+    hle/service/npns/npns.h
+    hle/service/ns/errors.h
+    hle/service/ns/iplatform_service_manager.cpp
+    hle/service/ns/iplatform_service_manager.h
+    hle/service/ns/language.cpp
+    hle/service/ns/language.h
+    hle/service/ns/ns.cpp
+    hle/service/ns/ns.h
+    hle/service/ns/pdm_qry.cpp
+    hle/service/ns/pdm_qry.h
+    hle/service/nvdrv/core/container.cpp
+    hle/service/nvdrv/core/container.h
+    hle/service/nvdrv/core/nvmap.cpp
+    hle/service/nvdrv/core/nvmap.h
+    hle/service/nvdrv/core/syncpoint_manager.cpp
+    hle/service/nvdrv/core/syncpoint_manager.h
+    hle/service/nvdrv/devices/nvdevice.h
+    hle/service/nvdrv/devices/nvdisp_disp0.cpp
+    hle/service/nvdrv/devices/nvdisp_disp0.h
+    hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+    hle/service/nvdrv/devices/nvhost_as_gpu.h
+    hle/service/nvdrv/devices/nvhost_ctrl.cpp
+    hle/service/nvdrv/devices/nvhost_ctrl.h
+    hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
+    hle/service/nvdrv/devices/nvhost_ctrl_gpu.h
+    hle/service/nvdrv/devices/nvhost_gpu.cpp
+    hle/service/nvdrv/devices/nvhost_gpu.h
+    hle/service/nvdrv/devices/nvhost_nvdec.cpp
+    hle/service/nvdrv/devices/nvhost_nvdec.h
+    hle/service/nvdrv/devices/nvhost_nvdec_common.cpp
+    hle/service/nvdrv/devices/nvhost_nvdec_common.h
+    hle/service/nvdrv/devices/nvhost_nvjpg.cpp
+    hle/service/nvdrv/devices/nvhost_nvjpg.h
+    hle/service/nvdrv/devices/nvhost_vic.cpp
+    hle/service/nvdrv/devices/nvhost_vic.h
+    hle/service/nvdrv/devices/nvmap.cpp
+    hle/service/nvdrv/devices/nvmap.h
+    hle/service/nvdrv/nvdata.h
+    hle/service/nvdrv/nvdrv.cpp
+    hle/service/nvdrv/nvdrv.h
+    hle/service/nvdrv/nvdrv_interface.cpp
+    hle/service/nvdrv/nvdrv_interface.h
+    hle/service/nvdrv/nvmemp.cpp
+    hle/service/nvdrv/nvmemp.h
+    hle/service/nvnflinger/binder.h
+    hle/service/nvnflinger/buffer_item.h
+    hle/service/nvnflinger/buffer_item_consumer.cpp
+    hle/service/nvnflinger/buffer_item_consumer.h
+    hle/service/nvnflinger/buffer_queue_consumer.cpp
+    hle/service/nvnflinger/buffer_queue_consumer.h
+    hle/service/nvnflinger/buffer_queue_core.cpp
+    hle/service/nvnflinger/buffer_queue_core.h
+    hle/service/nvnflinger/buffer_queue_defs.h
+    hle/service/nvnflinger/buffer_queue_producer.cpp
+    hle/service/nvnflinger/buffer_queue_producer.h
+    hle/service/nvnflinger/buffer_slot.h
+    hle/service/nvnflinger/buffer_transform_flags.h
+    hle/service/nvnflinger/consumer_base.cpp
+    hle/service/nvnflinger/consumer_base.h
+    hle/service/nvnflinger/consumer_listener.h
+    hle/service/nvnflinger/fb_share_buffer_manager.cpp
+    hle/service/nvnflinger/fb_share_buffer_manager.h
+    hle/service/nvnflinger/graphic_buffer_producer.cpp
+    hle/service/nvnflinger/graphic_buffer_producer.h
+    hle/service/nvnflinger/hos_binder_driver_server.cpp
+    hle/service/nvnflinger/hos_binder_driver_server.h
+    hle/service/nvnflinger/nvnflinger.cpp
+    hle/service/nvnflinger/nvnflinger.h
+    hle/service/nvnflinger/parcel.h
+    hle/service/nvnflinger/pixel_format.h
+    hle/service/nvnflinger/producer_listener.h
+    hle/service/nvnflinger/status.h
+    hle/service/nvnflinger/ui/fence.h
+    hle/service/nvnflinger/ui/graphic_buffer.cpp
+    hle/service/nvnflinger/ui/graphic_buffer.h
+    hle/service/nvnflinger/window.h
+    hle/service/olsc/olsc.cpp
+    hle/service/olsc/olsc.h
+    hle/service/pcie/pcie.cpp
+    hle/service/pcie/pcie.h
+    hle/service/pctl/pctl.cpp
+    hle/service/pctl/pctl.h
+    hle/service/pctl/pctl_module.cpp
+    hle/service/pctl/pctl_module.h
+    hle/service/pcv/pcv.cpp
+    hle/service/pcv/pcv.h
+    hle/service/pm/pm.cpp
+    hle/service/pm/pm.h
+    hle/service/prepo/prepo.cpp
+    hle/service/prepo/prepo.h
+    hle/service/psc/psc.cpp
+    hle/service/psc/psc.h
+    hle/service/ptm/psm.cpp
+    hle/service/ptm/psm.h
+    hle/service/ptm/ptm.cpp
+    hle/service/ptm/ptm.h
+    hle/service/ptm/ts.cpp
+    hle/service/ptm/ts.h
+    hle/service/hle_ipc.cpp
+    hle/service/hle_ipc.h
+    hle/service/ipc_helpers.h
+    hle/service/kernel_helpers.cpp
+    hle/service/kernel_helpers.h
+    hle/service/mutex.cpp
+    hle/service/mutex.h
+    hle/service/server_manager.cpp
+    hle/service/server_manager.h
+    hle/service/service.cpp
+    hle/service/service.h
+    hle/service/set/set.cpp
+    hle/service/set/set.h
+    hle/service/set/set_cal.cpp
+    hle/service/set/set_cal.h
+    hle/service/set/set_fd.cpp
+    hle/service/set/set_fd.h
+    hle/service/set/set_sys.cpp
+    hle/service/set/set_sys.h
+    hle/service/set/settings.cpp
+    hle/service/set/settings.h
+    hle/service/sm/sm.cpp
+    hle/service/sm/sm.h
+    hle/service/sm/sm_controller.cpp
+    hle/service/sm/sm_controller.h
+    hle/service/sockets/bsd.cpp
+    hle/service/sockets/bsd.h
+    hle/service/sockets/nsd.cpp
+    hle/service/sockets/nsd.h
+    hle/service/sockets/sfdnsres.cpp
+    hle/service/sockets/sfdnsres.h
+    hle/service/sockets/sockets.cpp
+    hle/service/sockets/sockets.h
+    hle/service/sockets/sockets_translate.cpp
+    hle/service/sockets/sockets_translate.h
+    hle/service/spl/csrng.cpp
+    hle/service/spl/csrng.h
+    hle/service/spl/spl.cpp
+    hle/service/spl/spl.h
+    hle/service/spl/spl_module.cpp
+    hle/service/spl/spl_module.h
+    hle/service/spl/spl_results.h
+    hle/service/spl/spl_types.h
+    hle/service/ssl/ssl.cpp
+    hle/service/ssl/ssl.h
+    hle/service/ssl/ssl_backend.h
+    hle/service/time/clock_types.h
+    hle/service/time/ephemeral_network_system_clock_context_writer.h
+    hle/service/time/ephemeral_network_system_clock_core.h
+    hle/service/time/errors.h
+    hle/service/time/local_system_clock_context_writer.h
+    hle/service/time/network_system_clock_context_writer.h
+    hle/service/time/standard_local_system_clock_core.h
+    hle/service/time/standard_network_system_clock_core.h
+    hle/service/time/standard_steady_clock_core.cpp
+    hle/service/time/standard_steady_clock_core.h
+    hle/service/time/standard_user_system_clock_core.cpp
+    hle/service/time/standard_user_system_clock_core.h
+    hle/service/time/steady_clock_core.h
+    hle/service/time/system_clock_context_update_callback.cpp
+    hle/service/time/system_clock_context_update_callback.h
+    hle/service/time/system_clock_core.cpp
+    hle/service/time/system_clock_core.h
+    hle/service/time/tick_based_steady_clock_core.cpp
+    hle/service/time/tick_based_steady_clock_core.h
+    hle/service/time/time.cpp
+    hle/service/time/time.h
+    hle/service/time/time_interface.cpp
+    hle/service/time/time_interface.h
+    hle/service/time/time_manager.cpp
+    hle/service/time/time_manager.h
+    hle/service/time/time_sharedmemory.cpp
+    hle/service/time/time_sharedmemory.h
+    hle/service/time/time_zone_content_manager.cpp
+    hle/service/time/time_zone_content_manager.h
+    hle/service/time/time_zone_manager.cpp
+    hle/service/time/time_zone_manager.h
+    hle/service/time/time_zone_service.cpp
+    hle/service/time/time_zone_service.h
+    hle/service/time/time_zone_types.h
+    hle/service/usb/usb.cpp
+    hle/service/usb/usb.h
+    hle/service/vi/display/vi_display.cpp
+    hle/service/vi/display/vi_display.h
+    hle/service/vi/layer/vi_layer.cpp
+    hle/service/vi/layer/vi_layer.h
+    hle/service/vi/vi.cpp
+    hle/service/vi/vi.h
+    hle/service/vi/vi_m.cpp
+    hle/service/vi/vi_m.h
+    hle/service/vi/vi_s.cpp
+    hle/service/vi/vi_s.h
+    hle/service/vi/vi_u.cpp
+    hle/service/vi/vi_u.h
     internal_network/network.cpp
     internal_network/network.h
     internal_network/network_interface.cpp
@@ -266,9 +910,8 @@ endif()
 
 create_target_directory_groups(core)
 
-target_link_libraries(core PUBLIC common PRIVATE audio_core kernel network service video_core nx_tzdb)
+target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
 target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
-
 if (MINGW)
     target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
 endif()
@@ -289,10 +932,31 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
         arm/dynarmic/dynarmic_cp15.h
         arm/dynarmic/dynarmic_exclusive_monitor.cpp
         arm/dynarmic/dynarmic_exclusive_monitor.h
+        hle/service/jit/jit_context.cpp
+        hle/service/jit/jit_context.h
+        hle/service/jit/jit.cpp
+        hle/service/jit/jit.h
     )
     target_link_libraries(core PRIVATE dynarmic::dynarmic)
 endif()
 
+if(ENABLE_OPENSSL)
+    target_sources(core PRIVATE
+        hle/service/ssl/ssl_backend_openssl.cpp)
+    target_link_libraries(core PRIVATE OpenSSL::SSL)
+elseif (APPLE)
+    target_sources(core PRIVATE
+        hle/service/ssl/ssl_backend_securetransport.cpp)
+    target_link_libraries(core PRIVATE "-framework Security")
+elseif (WIN32)
+    target_sources(core PRIVATE
+        hle/service/ssl/ssl_backend_schannel.cpp)
+    target_link_libraries(core PRIVATE crypt32 secur32)
+else()
+    target_sources(core PRIVATE
+        hle/service/ssl/ssl_backend_none.cpp)
+endif()
+
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(core PRIVATE precompiled_headers.h)
 endif()

src/core/arm/arm_interface.cpp

@@ -12,11 +12,11 @@
 #include "core/arm/symbols.h"
 #include "core/core.h"
 #include "core/debugger/debugger.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/svc.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
-#include "kernel/k_process.h"
-#include "kernel/k_thread.h"
-#include "kernel/svc.h"
 
 namespace Core {
 

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -17,9 +17,9 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/debugger/debugger.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/svc.h"
 #include "core/memory.h"
-#include "kernel/k_process.h"
-#include "kernel/svc.h"
 
 namespace Core {
 

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -17,9 +17,9 @@
 #include "core/core_timing.h"
 #include "core/debugger/debugger.h"
 #include "core/hardware_properties.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/svc.h"
 #include "core/memory.h"
-#include "kernel/k_process.h"
-#include "kernel/svc.h"
 
 namespace Core {
 

src/core/core.cpp

@@ -30,6 +30,19 @@
 #include "core/file_sys/vfs_real.h"
 #include "core/gpu_dirty_memory_manager.h"
 #include "core/hid/hid_core.h"
+#include "core/hle/kernel/k_memory_manager.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_resource_limit.h"
+#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/physical_core.h"
+#include "core/hle/service/am/applets/applets.h"
+#include "core/hle/service/apm/apm_controller.h"
+#include "core/hle/service/filesystem/filesystem.h"
+#include "core/hle/service/glue/glue_manager.h"
+#include "core/hle/service/service.h"
+#include "core/hle/service/sm/sm.h"
+#include "core/hle/service/time/time_manager.h"
 #include "core/internal_network/network.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
@@ -39,20 +52,7 @@
 #include "core/telemetry_session.h"
 #include "core/tools/freezer.h"
 #include "core/tools/renderdoc.h"
-#include "kernel/k_memory_manager.h"
-#include "kernel/k_process.h"
-#include "kernel/k_resource_limit.h"
-#include "kernel/k_scheduler.h"
-#include "kernel/kernel.h"
-#include "kernel/physical_core.h"
 #include "network/network.h"
-#include "service/am/applets/applets.h"
-#include "service/apm/apm_controller.h"
-#include "service/filesystem/filesystem.h"
-#include "service/glue/glue_manager.h"
-#include "service/service.h"
-#include "service/sm/sm.h"
-#include "service/time/time_manager.h"
 #include "video_core/host1x/host1x.h"
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"

src/core/cpu_manager.cpp

@@ -8,11 +8,11 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/cpu_manager.h"
-#include "kernel/k_interrupt_manager.h"
-#include "kernel/k_scheduler.h"
-#include "kernel/k_thread.h"
-#include "kernel/kernel.h"
-#include "kernel/physical_core.h"
+#include "core/hle/kernel/k_interrupt_manager.h"
+#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/physical_core.h"
 #include "video_core/gpu.h"
 
 namespace Core {

src/core/crypto/key_manager.cpp

@@ -28,8 +28,8 @@
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/registered_cache.h"
+#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
-#include "service/filesystem/filesystem.h"
 
 namespace Core::Crypto {
 namespace {

src/core/debugger/debugger.cpp

@@ -15,9 +15,9 @@
 #include "core/debugger/debugger.h"
 #include "core/debugger/debugger_interface.h"
 #include "core/debugger/gdbstub.h"
-#include "kernel/global_scheduler_context.h"
-#include "kernel/k_process.h"
-#include "kernel/k_scheduler.h"
+#include "core/hle/kernel/global_scheduler_context.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_scheduler.h"
 
 template <typename Readable, typename Buffer, typename Callback>
 static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) {

src/core/debugger/gdbstub.cpp

@@ -19,11 +19,11 @@
 #include "core/core.h"
 #include "core/debugger/gdbstub.h"
 #include "core/debugger/gdbstub_arch.h"
+#include "core/hle/kernel/k_page_table.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_thread.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
-#include "kernel/k_page_table.h"
-#include "kernel/k_process.h"
-#include "kernel/k_thread.h"
 
 namespace Core {
 

src/core/debugger/gdbstub_arch.cpp

@@ -3,7 +3,7 @@
 
 #include "common/hex_util.h"
 #include "core/debugger/gdbstub_arch.h"
-#include "kernel/k_thread.h"
+#include "core/hle/kernel/k_thread.h"
 
 namespace Core {
 

src/core/device_memory.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/device_memory.h"
-#include "kernel/board/nintendo/nx/k_system_control.h"
+#include "hle/kernel/board/nintendo/nx/k_system_control.h"
 
 namespace Core {
 

src/core/file_sys/errors.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_bucket_tree.h

@@ -11,7 +11,7 @@
 #include "common/literals.h"
 
 #include "core/file_sys/vfs.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_compression_common.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace FileSys {
 

src/core/file_sys/fssystem/fssystem_pooled_buffer.h

@@ -6,7 +6,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/literals.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace FileSys {
 

src/core/file_sys/patch_manager.cpp

@@ -24,12 +24,12 @@
 #include "core/file_sys/vfs_cached.h"
 #include "core/file_sys/vfs_layered.h"
 #include "core/file_sys/vfs_vector.h"
+#include "core/hle/service/filesystem/filesystem.h"
+#include "core/hle/service/ns/language.h"
+#include "core/hle/service/set/set.h"
 #include "core/loader/loader.h"
 #include "core/loader/nso.h"
 #include "core/memory/cheat_engine.h"
-#include "service/filesystem/filesystem.h"
-#include "service/ns/language.h"
-#include "service/set/set.h"
 
 namespace FileSys {
 namespace {

src/core/file_sys/romfs_factory.cpp

@@ -11,9 +11,9 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/romfs_factory.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
-#include "kernel/k_process.h"
-#include "service/filesystem/filesystem.h"
 
 namespace FileSys {
 

src/core/file_sys/romfs_factory.h

@@ -7,7 +7,7 @@
 
 #include "common/common_types.h"
 #include "core/file_sys/vfs_types.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace Loader {
 class AppLoader;

src/core/file_sys/savedata_factory.h

@@ -8,7 +8,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/file_sys/vfs.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace Core {
 class System;

src/core/file_sys/sdmc_factory.h

@@ -5,7 +5,7 @@
 
 #include <memory>
 #include "core/file_sys/vfs_types.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace FileSys {
 

src/core/file_sys/system_archive/shared_font.cpp

@@ -9,7 +9,7 @@
 #include "core/file_sys/system_archive/data/font_standard.h"
 #include "core/file_sys/system_archive/shared_font.h"
 #include "core/file_sys/vfs_vector.h"
-#include "service/ns/iplatform_service_manager.h"
+#include "core/hle/service/ns/iplatform_service_manager.h"
 
 namespace FileSys::SystemArchive {
 

src/core/file_sys/system_archive/system_version.cpp

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/logging/log.h"
-#include "core/api_version.h"
 #include "core/file_sys/system_archive/system_version.h"
 #include "core/file_sys/vfs_vector.h"
+#include "core/hle/api_version.h"
 
 namespace FileSys::SystemArchive {
 
 std::string GetLongDisplayVersion() {
-    return Core::ApiVersion::DISPLAY_TITLE;
+    return HLE::ApiVersion::DISPLAY_TITLE;
 }
 
 VirtualDir SystemVersion() {
@@ -17,19 +17,19 @@ VirtualDir SystemVersion() {
                 GetLongDisplayVersion());
 
     VirtualFile file = std::make_shared<VectorVfsFile>(std::vector<u8>(0x100), "file");
-    file->WriteObject(Core::ApiVersion::HOS_VERSION_MAJOR, 0);
-    file->WriteObject(Core::ApiVersion::HOS_VERSION_MINOR, 1);
-    file->WriteObject(Core::ApiVersion::HOS_VERSION_MICRO, 2);
-    file->WriteObject(Core::ApiVersion::SDK_REVISION_MAJOR, 4);
-    file->WriteObject(Core::ApiVersion::SDK_REVISION_MINOR, 5);
-    file->WriteArray(Core::ApiVersion::PLATFORM_STRING,
-                     std::min<u64>(sizeof(Core::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8);
-    file->WriteArray(Core::ApiVersion::VERSION_HASH,
-                     std::min<u64>(sizeof(Core::ApiVersion::VERSION_HASH), 0x40ULL), 0x28);
-    file->WriteArray(Core::ApiVersion::DISPLAY_VERSION,
-                     std::min<u64>(sizeof(Core::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68);
-    file->WriteArray(Core::ApiVersion::DISPLAY_TITLE,
-                     std::min<u64>(sizeof(Core::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80);
+    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MAJOR, 0);
+    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MINOR, 1);
+    file->WriteObject(HLE::ApiVersion::HOS_VERSION_MICRO, 2);
+    file->WriteObject(HLE::ApiVersion::SDK_REVISION_MAJOR, 4);
+    file->WriteObject(HLE::ApiVersion::SDK_REVISION_MINOR, 5);
+    file->WriteArray(HLE::ApiVersion::PLATFORM_STRING,
+                     std::min<u64>(sizeof(HLE::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8);
+    file->WriteArray(HLE::ApiVersion::VERSION_HASH,
+                     std::min<u64>(sizeof(HLE::ApiVersion::VERSION_HASH), 0x40ULL), 0x28);
+    file->WriteArray(HLE::ApiVersion::DISPLAY_VERSION,
+                     std::min<u64>(sizeof(HLE::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68);
+    file->WriteArray(HLE::ApiVersion::DISPLAY_TITLE,
+                     std::min<u64>(sizeof(HLE::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80);
     return std::make_shared<VectorVfsDirectory>(std::vector<VirtualFile>{file},
                                                 std::vector<VirtualDir>{}, "data");
 }

src/core/file_sys/system_archive/time_zone_binary.cpp

@@ -6,7 +6,7 @@
 #include "common/swap.h"
 #include "core/file_sys/system_archive/time_zone_binary.h"
 #include "core/file_sys/vfs_vector.h"
-#include "service/time/time_zone_types.h"
+#include "core/hle/service/time/time_zone_types.h"
 
 #include "nx_tzdb.h"
 

src/core/frontend/applets/cabinet.h

@@ -5,7 +5,7 @@
 
 #include <functional>
 #include "core/frontend/applets/applet.h"
-#include "service/nfp/nfp_types.h"
+#include "core/hle/service/nfp/nfp_types.h"
 
 namespace Service::NFC {
 class NfcDevice;

src/core/frontend/applets/error.h

@@ -7,7 +7,7 @@
 #include <functional>
 
 #include "core/frontend/applets/applet.h"
-#include "core/result.h"
+#include "core/hle/result.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/profile_select.cpp

@@ -3,7 +3,7 @@
 
 #include "common/settings.h"
 #include "core/frontend/applets/profile_select.h"
-#include "service/acc/profile_manager.h"
+#include "core/hle/service/acc/profile_manager.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/profile_select.h

@@ -8,7 +8,7 @@
 
 #include "common/uuid.h"
 #include "core/frontend/applets/applet.h"
-#include "service/am/applets/applet_profile_select.h"
+#include "core/hle/service/am/applets/applet_profile_select.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/software_keyboard.h

@@ -8,7 +8,7 @@
 #include "common/common_types.h"
 
 #include "core/frontend/applets/applet.h"
-#include "service/am/applets/applet_software_keyboard_types.h"
+#include "core/hle/service/am/applets/applet_software_keyboard_types.h"
 
 namespace Core::Frontend {
 

src/core/frontend/applets/web_browser.h

@@ -6,7 +6,7 @@
 #include <functional>
 
 #include "core/frontend/applets/applet.h"
-#include "service/am/applets/applet_web_browser_types.h"
+#include "core/hle/service/am/applets/applet_web_browser_types.h"
 
 namespace Core::Frontend {
 

src/core/hid/emulated_console.h

@@ -38,14 +38,6 @@ using TouchParams = std::array<Common::ParamPackage, MaxTouchDevices>;
 using ConsoleMotionValues = ConsoleMotionInfo;
 using TouchValues = std::array<Common::Input::TouchStatus, MaxTouchDevices>;
 
-struct TouchFinger {
-    u64 last_touch{};
-    Common::Point<float> position{};
-    u32 id{};
-    TouchAttribute attribute{};
-    bool pressed{};
-};
-
 // Contains all motion related data that is used on the services
 struct ConsoleMotion {
     Common::Vec3f accel{};

src/core/hid/emulated_controller.cpp

@@ -243,10 +243,12 @@ void EmulatedController::LoadTASParams() {
     tas_button_params[Settings::NativeButton::DUp].Set("button", 13);
     tas_button_params[Settings::NativeButton::DRight].Set("button", 14);
     tas_button_params[Settings::NativeButton::DDown].Set("button", 15);
-    tas_button_params[Settings::NativeButton::SL].Set("button", 16);
-    tas_button_params[Settings::NativeButton::SR].Set("button", 17);
+    tas_button_params[Settings::NativeButton::SLLeft].Set("button", 16);
+    tas_button_params[Settings::NativeButton::SRLeft].Set("button", 17);
     tas_button_params[Settings::NativeButton::Home].Set("button", 18);
     tas_button_params[Settings::NativeButton::Screenshot].Set("button", 19);
+    tas_button_params[Settings::NativeButton::SLRight].Set("button", 20);
+    tas_button_params[Settings::NativeButton::SRRight].Set("button", 21);
 
     tas_stick_params[Settings::NativeAnalog::LStick].Set("axis_x", 0);
     tas_stick_params[Settings::NativeAnalog::LStick].Set("axis_y", 1);
@@ -296,10 +298,12 @@ void EmulatedController::LoadVirtualGamepadParams() {
     virtual_button_params[Settings::NativeButton::DUp].Set("button", 13);
     virtual_button_params[Settings::NativeButton::DRight].Set("button", 14);
     virtual_button_params[Settings::NativeButton::DDown].Set("button", 15);
-    virtual_button_params[Settings::NativeButton::SL].Set("button", 16);
-    virtual_button_params[Settings::NativeButton::SR].Set("button", 17);
+    virtual_button_params[Settings::NativeButton::SLLeft].Set("button", 16);
+    virtual_button_params[Settings::NativeButton::SRLeft].Set("button", 17);
     virtual_button_params[Settings::NativeButton::Home].Set("button", 18);
     virtual_button_params[Settings::NativeButton::Screenshot].Set("button", 19);
+    virtual_button_params[Settings::NativeButton::SLRight].Set("button", 20);
+    virtual_button_params[Settings::NativeButton::SRRight].Set("button", 21);
 
     virtual_stick_params[Settings::NativeAnalog::LStick].Set("axis_x", 0);
     virtual_stick_params[Settings::NativeAnalog::LStick].Set("axis_y", 1);
@@ -867,12 +871,16 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
         controller.npad_button_state.down.Assign(current_status.value);
         controller.debug_pad_button_state.d_down.Assign(current_status.value);
         break;
-    case Settings::NativeButton::SL:
+    case Settings::NativeButton::SLLeft:
         controller.npad_button_state.left_sl.Assign(current_status.value);
+        break;
+    case Settings::NativeButton::SLRight:
         controller.npad_button_state.right_sl.Assign(current_status.value);
         break;
-    case Settings::NativeButton::SR:
+    case Settings::NativeButton::SRLeft:
         controller.npad_button_state.left_sr.Assign(current_status.value);
+        break;
+    case Settings::NativeButton::SRRight:
         controller.npad_button_state.right_sr.Assign(current_status.value);
         break;
     case Settings::NativeButton::Home:
@@ -1890,12 +1898,16 @@ NpadButton EmulatedController::GetTurboButtonMask() const {
         case Settings::NativeButton::DDown:
             button_mask.down.Assign(1);
             break;
-        case Settings::NativeButton::SL:
+        case Settings::NativeButton::SLLeft:
             button_mask.left_sl.Assign(1);
+            break;
+        case Settings::NativeButton::SLRight:
             button_mask.right_sl.Assign(1);
             break;
-        case Settings::NativeButton::SR:
+        case Settings::NativeButton::SRLeft:
             button_mask.left_sr.Assign(1);
+            break;
+        case Settings::NativeButton::SRRight:
             button_mask.right_sr.Assign(1);
             break;
         default:

src/core/hid/hid_types.h

@@ -356,6 +356,14 @@ struct TouchState {
 };
 static_assert(sizeof(TouchState) == 0x28, "Touchstate is an invalid size");
 
+struct TouchFinger {
+    u64 last_touch{};
+    Common::Point<float> position{};
+    u32 id{};
+    TouchAttribute attribute{};
+    bool pressed{};
+};
+
 // This is nn::hid::TouchScreenConfigurationForNx
 struct TouchScreenConfigurationForNx {
     TouchScreenModeForNx mode{TouchScreenModeForNx::UseSystemSetting};

src/core/hid/input_interpreter.cpp

@@ -4,14 +4,15 @@
 #include "core/core.h"
 #include "core/hid/hid_types.h"
 #include "core/hid/input_interpreter.h"
-#include "service/hid/controllers/npad.h"
-#include "service/hid/hid.h"
-#include "service/sm/sm.h"
+#include "core/hle/service/hid/controllers/npad.h"
+#include "core/hle/service/hid/hid_server.h"
+#include "core/hle/service/hid/resource_manager.h"
+#include "core/hle/service/sm/sm.h"
 
 InputInterpreter::InputInterpreter(Core::System& system)
     : npad{system.ServiceManager()
-               .GetService<Service::HID::Hid>("hid")
-               ->GetAppletResource()
+               .GetService<Service::HID::IHidServer>("hid")
+               ->GetResourceManager()
                ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {
     ResetButtonStates();
 }

src/core/hle/api_version.h

@@ -7,7 +7,7 @@
 
 // This file contains yuzu's HLE API version constants.
 
-namespace Core::ApiVersion {
+namespace HLE::ApiVersion {
 
 // Horizon OS version constants.
 
@@ -43,4 +43,4 @@ constexpr u32 GetTargetFirmware() {
     return AtmosphereTargetFirmware(HOS_VERSION_MAJOR, HOS_VERSION_MINOR, HOS_VERSION_MICRO);
 }
 
-} // namespace Core::ApiVersion
+} // namespace HLE::ApiVersion

src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp

@@ -3,10 +3,10 @@
 
 #include "common/alignment.h"
 #include "common/literals.h"
-#include "kernel/k_memory_layout.h"
-#include "kernel/k_memory_manager.h"
-#include "kernel/k_system_control.h"
-#include "kernel/k_trace.h"
+#include "core/hle/kernel/k_memory_layout.h"
+#include "core/hle/kernel/k_memory_manager.h"
+#include "core/hle/kernel/k_system_control.h"
+#include "core/hle/kernel/k_trace.h"
 
 namespace Kernel {
 

src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "kernel/k_typed_address.h"
+#include "core/hle/kernel/k_typed_address.h"
 
 namespace Kernel {
 

src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp

@@ -6,13 +6,13 @@
 #include "common/literals.h"
 #include "common/settings.h"
 
-#include "kernel/board/nintendo/nx/k_system_control.h"
-#include "kernel/board/nintendo/nx/secure_monitor.h"
-#include "kernel/k_memory_manager.h"
-#include "kernel/k_page_table.h"
-#include "kernel/k_trace.h"
-#include "kernel/kernel.h"
-#include "kernel/svc_results.h"
+#include "core/hle/kernel/board/nintendo/nx/k_system_control.h"
+#include "core/hle/kernel/board/nintendo/nx/secure_monitor.h"
+#include "core/hle/kernel/k_memory_manager.h"
+#include "core/hle/kernel/k_page_table.h"
+#include "core/hle/kernel/k_trace.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/svc_results.h"
 
 namespace Kernel::Board::Nintendo::Nx {
 

src/core/hle/kernel/board/nintendo/nx/k_system_control.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "core/result.h"
-#include "kernel/k_typed_address.h"
+#include "core/hle/kernel/k_typed_address.h"
+#include "core/hle/result.h"
 
 namespace Kernel {
 class KernelCore;

src/core/hle/kernel/code_set.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "kernel/code_set.h"
+#include "core/hle/kernel/code_set.h"
 
 namespace Kernel {
 

src/core/hle/kernel/code_set.h

@@ -5,8 +5,8 @@
 
 #include <cstddef>
 
-#include "kernel/k_typed_address.h"
-#include "kernel/physical_memory.h"
+#include "core/hle/kernel/k_typed_address.h"
+#include "core/hle/kernel/physical_memory.h"
 
 namespace Kernel {
 

src/core/hle/kernel/global_scheduler_context.cpp

@@ -5,10 +5,10 @@
 
 #include "common/assert.h"
 #include "core/core.h"
-#include "kernel/global_scheduler_context.h"
-#include "kernel/k_scheduler.h"
-#include "kernel/kernel.h"
-#include "kernel/physical_core.h"
+#include "core/hle/kernel/global_scheduler_context.h"
+#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/physical_core.h"
 
 namespace Kernel {
 

src/core/hle/kernel/global_scheduler_context.h

@@ -9,10 +9,10 @@
 
 #include "common/common_types.h"
 #include "core/hardware_properties.h"
-#include "kernel/k_priority_queue.h"
-#include "kernel/k_scheduler_lock.h"
-#include "kernel/k_thread.h"
-#include "kernel/svc_types.h"
+#include "core/hle/kernel/k_priority_queue.h"
+#include "core/hle/kernel/k_scheduler_lock.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/svc_types.h"
 
 namespace Kernel {
 

src/core/hle/kernel/init/init_slab_setup.cpp

@@ -7,29 +7,29 @@
 #include "core/core.h"
 #include "core/device_memory.h"
 #include "core/hardware_properties.h"
-#include "kernel/init/init_slab_setup.h"
-#include "kernel/k_code_memory.h"
-#include "kernel/k_debug.h"
-#include "kernel/k_device_address_space.h"
-#include "kernel/k_event.h"
-#include "kernel/k_event_info.h"
-#include "kernel/k_memory_layout.h"
-#include "kernel/k_memory_manager.h"
-#include "kernel/k_object_name.h"
-#include "kernel/k_page_buffer.h"
-#include "kernel/k_port.h"
-#include "kernel/k_process.h"
-#include "kernel/k_resource_limit.h"
-#include "kernel/k_session.h"
-#include "kernel/k_session_request.h"
-#include "kernel/k_shared_memory.h"
-#include "kernel/k_shared_memory_info.h"
-#include "kernel/k_system_control.h"
-#include "kernel/k_system_resource.h"
-#include "kernel/k_thread.h"
-#include "kernel/k_thread_local_page.h"
-#include "kernel/k_transfer_memory.h"
-#include "kernel/k_typed_address.h"
+#include "core/hle/kernel/init/init_slab_setup.h"
+#include "core/hle/kernel/k_code_memory.h"
+#include "core/hle/kernel/k_debug.h"
+#include "core/hle/kernel/k_device_address_space.h"
+#include "core/hle/kernel/k_event.h"
+#include "core/hle/kernel/k_event_info.h"
+#include "core/hle/kernel/k_memory_layout.h"
+#include "core/hle/kernel/k_memory_manager.h"
+#include "core/hle/kernel/k_object_name.h"
+#include "core/hle/kernel/k_page_buffer.h"
+#include "core/hle/kernel/k_port.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_resource_limit.h"
+#include "core/hle/kernel/k_session.h"
+#include "core/hle/kernel/k_session_request.h"
+#include "core/hle/kernel/k_shared_memory.h"
+#include "core/hle/kernel/k_shared_memory_info.h"
+#include "core/hle/kernel/k_system_control.h"
+#include "core/hle/kernel/k_system_resource.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_thread_local_page.h"
+#include "core/hle/kernel/k_transfer_memory.h"
+#include "core/hle/kernel/k_typed_address.h"
 
 namespace Kernel::Init {
 

src/core/hle/kernel/initial_process.h

@@ -5,8 +5,8 @@
 
 #include "common/common_types.h"
 #include "common/literals.h"
-#include "kernel/board/nintendo/nx/k_memory_layout.h"
-#include "kernel/board/nintendo/nx/k_system_control.h"
+#include "core/hle/kernel/board/nintendo/nx/k_memory_layout.h"
+#include "core/hle/kernel/board/nintendo/nx/k_system_control.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_address_arbiter.cpp

@@ -3,15 +3,15 @@
 
 #include "core/arm/exclusive_monitor.h"
 #include "core/core.h"
+#include "core/hle/kernel/k_address_arbiter.h"
+#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_thread_queue.h"
+#include "core/hle/kernel/k_typed_address.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/svc_results.h"
 #include "core/memory.h"
-#include "kernel/k_address_arbiter.h"
-#include "kernel/k_scheduler.h"
-#include "kernel/k_scoped_scheduler_lock_and_sleep.h"
-#include "kernel/k_thread.h"
-#include "kernel/k_thread_queue.h"
-#include "kernel/k_typed_address.h"
-#include "kernel/kernel.h"
-#include "kernel/svc_results.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_address_arbiter.h

@@ -5,8 +5,8 @@
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "kernel/k_condition_variable.h"
-#include "kernel/svc_types.h"
+#include "core/hle/kernel/k_condition_variable.h"
+#include "core/hle/kernel/svc_types.h"
 
 union Result;
 

src/core/hle/kernel/k_address_space_info.cpp

@@ -5,7 +5,7 @@
 
 #include "common/assert.h"
 #include "common/literals.h"
-#include "kernel/k_address_space_info.h"
+#include "core/hle/kernel/k_address_space_info.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_auto_object.cpp

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "kernel/k_auto_object.h"
-#include "kernel/kernel.h"
+#include "core/hle/kernel/k_auto_object.h"
+#include "core/hle/kernel/kernel.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_auto_object.h

@@ -11,7 +11,7 @@
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "kernel/k_class_token.h"
+#include "core/hle/kernel/k_class_token.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_auto_object_container.cpp

@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
-#include "kernel/k_auto_object_container.h"
+#include "core/hle/kernel/k_auto_object_container.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_auto_object_container.h

@@ -6,8 +6,8 @@
 #include <boost/intrusive/rbtree.hpp>
 
 #include "common/common_funcs.h"
-#include "kernel/k_auto_object.h"
-#include "kernel/k_light_lock.h"
+#include "core/hle/kernel/k_auto_object.h"
+#include "core/hle/kernel/k_light_lock.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_capabilities.cpp

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hardware_properties.h"
-#include "kernel/k_capabilities.h"
-#include "kernel/k_memory_layout.h"
-#include "kernel/k_process_page_table.h"
-#include "kernel/k_trace.h"
-#include "kernel/kernel.h"
-#include "kernel/svc_results.h"
-#include "kernel/svc_version.h"
+#include "core/hle/kernel/k_capabilities.h"
+#include "core/hle/kernel/k_memory_layout.h"
+#include "core/hle/kernel/k_process_page_table.h"
+#include "core/hle/kernel/k_trace.h"
+#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/svc_results.h"
+#include "core/hle/kernel/svc_version.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_capabilities.h

@@ -10,8 +10,8 @@
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
-#include "core/result.h"
-#include "kernel/svc_types.h"
+#include "core/hle/kernel/svc_types.h"
+#include "core/hle/result.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_class_token.cpp

@@ -1,24 +1,24 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "kernel/k_auto_object.h"
-#include "kernel/k_class_token.h"
-#include "kernel/k_client_port.h"
-#include "kernel/k_client_session.h"
-#include "kernel/k_code_memory.h"
-#include "kernel/k_event.h"
-#include "kernel/k_port.h"
-#include "kernel/k_process.h"
-#include "kernel/k_readable_event.h"
-#include "kernel/k_resource_limit.h"
-#include "kernel/k_server_port.h"
-#include "kernel/k_server_session.h"
-#include "kernel/k_session.h"
-#include "kernel/k_shared_memory.h"
-#include "kernel/k_synchronization_object.h"
-#include "kernel/k_system_resource.h"
-#include "kernel/k_thread.h"
-#include "kernel/k_transfer_memory.h"
+#include "core/hle/kernel/k_auto_object.h"
+#include "core/hle/kernel/k_class_token.h"
+#include "core/hle/kernel/k_client_port.h"
+#include "core/hle/kernel/k_client_session.h"
+#include "core/hle/kernel/k_code_memory.h"
+#include "core/hle/kernel/k_event.h"
+#include "core/hle/kernel/k_port.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_readable_event.h"
+#include "core/hle/kernel/k_resource_limit.h"
+#include "core/hle/kernel/k_server_port.h"
+#include "core/hle/kernel/k_server_session.h"
+#include "core/hle/kernel/k_session.h"
+#include "core/hle/kernel/k_shared_memory.h"
+#include "core/hle/kernel/k_synchronization_object.h"
+#include "core/hle/kernel/k_system_resource.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_transfer_memory.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_client_port.cpp

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/scope_exit.h"
-#include "kernel/k_client_port.h"
-#include "kernel/k_port.h"
-#include "kernel/k_scheduler.h"
-#include "kernel/k_scoped_resource_reservation.h"
-#include "kernel/k_session.h"
-#include "kernel/svc_results.h"
+#include "core/hle/kernel/k_client_port.h"
+#include "core/hle/kernel/k_port.h"
+#include "core/hle/kernel/k_scheduler.h"
+#include "core/hle/kernel/k_scoped_resource_reservation.h"
+#include "core/hle/kernel/k_session.h"
+#include "core/hle/kernel/svc_results.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_client_port.h

@@ -6,8 +6,8 @@
 #include <memory>
 
 #include "common/common_types.h"
-#include "core/result.h"
-#include "kernel/k_synchronization_object.h"
+#include "core/hle/kernel/k_synchronization_object.h"
+#include "core/hle/result.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_client_session.cpp

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/scope_exit.h"
-#include "core/result.h"
-#include "kernel/k_client_session.h"
-#include "kernel/k_server_session.h"
-#include "kernel/k_session.h"
-#include "kernel/k_thread.h"
+#include "core/hle/kernel/k_client_session.h"
+#include "core/hle/kernel/k_server_session.h"
+#include "core/hle/kernel/k_session.h"
+#include "core/hle/kernel/k_thread.h"
+#include "core/hle/result.h"
 
 namespace Kernel {
 

src/core/hle/kernel/k_client_session.h

@@ -5,9 +5,9 @@
 
 #include <string>
 
-#include "core/result.h"
-#include "kernel/k_auto_object.h"
-#include "kernel/slab_helpers.h"
+#include "core/hle/kernel/k_auto_object.h"
+#include "core/hle/kernel/slab_helpers.h"
+#include "core/hle/result.h"
 
 union Result;
 

src/core/hle/kernel/k_code_memory.cpp

@@ -4,15 +4,15 @@
 #include "common/alignment.h"
 #include "common/common_types.h"
 #include "core/device_memory.h"
-#include "core/result.h"
-#include "kernel/k_code_memory.h"
-#include "kernel/k_light_lock.h"
-#include "kernel/k_memory_block.h"
-#include "kernel/k_page_group.h"
-#include "kernel/k_page_table.h"
-#include "kernel/k_process.h"
-#include "kernel/slab_helpers.h"
-#include "kernel/svc_types.h"
+#include "core/hle/kernel/k_code_memory.h"
+#include "core/hle/kernel/k_light_lock.h"
+#include "core/hle/kernel/k_memory_block.h"
+#include "core/hle/kernel/k_page_group.h"
+#include "core/hle/kernel/k_page_table.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/slab_helpers.h"
+#include "core/hle/kernel/svc_types.h"
+#include "core/hle/result.h"
 
 namespace Kernel {