diff --git a/libraries/libstratosphere/include/stratosphere/ams.hpp b/libraries/libstratosphere/include/stratosphere/ams.hpp
index 250e756f5..1cc778c31 100644
--- a/libraries/libstratosphere/include/stratosphere/ams.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "ams/ams_types.hpp"
-#include "ams/ams_exosphere_api.hpp"
-#include "ams/ams_emummc_api.hpp"
-#include "ams/ams_environment.hpp"
+#include <stratosphere/ams/ams_types.hpp>
+#include <stratosphere/ams/ams_exosphere_api.hpp>
+#include <stratosphere/ams/ams_emummc_api.hpp>
+#include <stratosphere/ams/ams_environment.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp b/libraries/libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp
index 4597b2adf..ace825830 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "ams_types.hpp"
+#include <stratosphere/ams/ams_types.hpp>
 
 namespace ams::emummc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/ams/ams_environment.hpp b/libraries/libstratosphere/include/stratosphere/ams/ams_environment.hpp
index 13f20a5d5..065ee2be4 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/ams_environment.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/ams_environment.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "ams_types.hpp"
+#include <stratosphere/ams/ams_types.hpp>
 
 namespace ams {
 
diff --git a/libraries/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp b/libraries/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp
index 69bbb4d8f..4e258d886 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "ams_types.hpp"
+#include <stratosphere/ams/ams_types.hpp>
 
 namespace ams::exosphere {
 
diff --git a/libraries/libstratosphere/include/stratosphere/ams/ams_types.hpp b/libraries/libstratosphere/include/stratosphere/ams/ams_types.hpp
index 48789fd11..7ce4c9acd 100644
--- a/libraries/libstratosphere/include/stratosphere/ams/ams_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/ams/ams_types.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "../sf/sf_buffer_tags.hpp"
-#include "../hos.hpp"
+#include <stratosphere/sf/sf_buffer_tags.hpp>
+#include <stratosphere/hos.hpp>
 
 namespace ams::exosphere {
 
diff --git a/libraries/libstratosphere/include/stratosphere/boot2.hpp b/libraries/libstratosphere/include/stratosphere/boot2.hpp
index ff72c8b0a..ece5cb03b 100644
--- a/libraries/libstratosphere/include/stratosphere/boot2.hpp
+++ b/libraries/libstratosphere/include/stratosphere/boot2.hpp
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#include "boot2/boot2_api.hpp"
+#include <stratosphere/boot2/boot2_api.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/cfg.hpp b/libraries/libstratosphere/include/stratosphere/cfg.hpp
index d825db9a5..aea10f16a 100644
--- a/libraries/libstratosphere/include/stratosphere/cfg.hpp
+++ b/libraries/libstratosphere/include/stratosphere/cfg.hpp
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#include "cfg/cfg_api.hpp"
+#include <stratosphere/cfg/cfg_api.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/cfg/cfg_api.hpp b/libraries/libstratosphere/include/stratosphere/cfg/cfg_api.hpp
index 3d7b13b27..c8bf37102 100644
--- a/libraries/libstratosphere/include/stratosphere/cfg/cfg_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/cfg/cfg_api.hpp
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "cfg_types.hpp"
-#include "cfg_locale_types.hpp"
-#include "../sm/sm_types.hpp"
+#include <stratosphere/cfg/cfg_types.hpp>
+#include <stratosphere/cfg/cfg_locale_types.hpp>
+#include <stratosphere/sm/sm_types.hpp>
 
 namespace ams::cfg {
 
diff --git a/libraries/libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp b/libraries/libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp
index ba6f95a6b..620c29166 100644
--- a/libraries/libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "cfg_types.hpp"
-#include "../settings/settings_types.hpp"
+#include <stratosphere/cfg/cfg_types.hpp>
+#include <stratosphere/settings/settings_types.hpp>
 
 namespace ams::cfg {
 
diff --git a/libraries/libstratosphere/include/stratosphere/dmnt.hpp b/libraries/libstratosphere/include/stratosphere/dmnt.hpp
index 5772a435c..c09474cc5 100644
--- a/libraries/libstratosphere/include/stratosphere/dmnt.hpp
+++ b/libraries/libstratosphere/include/stratosphere/dmnt.hpp
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#include "dmnt/dmnt_cheat_types.hpp"
+#include <stratosphere/dmnt/dmnt_cheat_types.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_application.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_application.hpp
index 8745e1b67..92504fee4 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_application.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_application.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_code.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_code.hpp
index 4db4ba3dd..b38b776b1 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_code.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_code.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 #include <stratosphere/ncm/ncm_ids.hpp>
 
 namespace ams::fs {
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_content.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_content.hpp
index 32a2eded9..2b3ee7afd 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_content.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_content.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 #include <stratosphere/ncm/ncm_ids.hpp>
 
 namespace ams::fs {
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_content_storage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_content_storage.hpp
index 4a52391e2..ccd079300 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_content_storage.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_content_storage.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp
index b70170382..cda0398a1 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_save_data_types.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_save_data_types.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_directory.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_directory.hpp
index c2e3a76b1..75a333eb7 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_directory.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_directory.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_file.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_file.hpp
index 36e7d790b..1f176b355 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_file.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_file.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
index f6852db93..50f814775 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_game_card.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_game_card.hpp
index 612b7844a..22ddbc397 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_game_card.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_game_card.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_i_event_notifier.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_i_event_notifier.hpp
index 375ed1afd..b2b22f6ee 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_i_event_notifier.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_i_event_notifier.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_image_directory.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_image_directory.hpp
index 76252ae18..58c4faa49 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_image_directory.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_image_directory.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
index 7a837242d..07ade15d9 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_file.hpp"
-#include "fs_operate_range.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_file.hpp>
+#include <stratosphere/fs/fs_operate_range.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_management.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_management.hpp
index 7084daeab..0defd217b 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_management.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_management.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp
index 4049e7f93..d73b95aca 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_memory_storage.hpp
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "impl/fs_newable.hpp"
-#include "fs_istorage.hpp"
-#include "fs_query_range.hpp"
+#include <stratosphere/fs/impl/fs_newable.hpp>
+#include <stratosphere/fs/fs_istorage.hpp>
+#include <stratosphere/fs/fs_query_range.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_mount.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_mount.hpp
index 1344b2a4d..62c996e69 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_mount.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_mount.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_operate_range.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_operate_range.hpp
index 3d2b8a285..08667241c 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_operate_range.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_operate_range.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
index 554dcdfef..523b825d6 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_istorage.hpp"
-#include "impl/fs_newable.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_istorage.hpp>
+#include <stratosphere/fs/impl/fs_newable.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_management.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_management.hpp
index c502631f5..f2ead33eb 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_management.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_management.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_save_data_types.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_save_data_types.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_transaction.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_transaction.hpp
index a39762441..b1d7a622f 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_transaction.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_transaction.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_save_data_types.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_save_data_types.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_types.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_types.hpp
index be6e0f05b..1ebfc0dd1 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_save_data_types.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_sd_card.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_sd_card.hpp
index 183f7bea5..029e139ea 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_sd_card.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_sd_card.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_signed_system_partition.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_signed_system_partition.hpp
index 1c0ff5b28..3c613af2c 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_signed_system_partition.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_signed_system_partition.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp
index 08ac3cf7b..56241edfa 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_substorage.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "impl/fs_newable.hpp"
-#include "fs_istorage.hpp"
+#include <stratosphere/fs/impl/fs_newable.hpp>
+#include <stratosphere/fs/fs_istorage.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_system_data.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_system_data.hpp
index e95425e86..12529a306 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_system_data.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_system_data.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_system_save_data.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_system_save_data.hpp
index 95093dcde..83e8cc2ca 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fs_system_save_data.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_system_save_data.hpp
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fs_common.hpp"
-#include "fs_save_data_types.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_save_data_types.hpp>
 
 namespace ams::fs {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
index 40a845c3c..60c8d0a3c 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "../fs_common.hpp"
-#include "../fs_directory.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_directory.hpp>
 
 namespace ams::fs::fsa {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
index d40e6879e..325be05c5 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
@@ -15,9 +15,9 @@
  */
 
 #pragma once
-#include "../fs_common.hpp"
-#include "../fs_filesystem.hpp"
-#include "../fs_filesystem_for_debug.hpp"
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/fs/fs_filesystem.hpp>
+#include <stratosphere/fs/fs_filesystem_for_debug.hpp>
 
 namespace ams::fs::fsa {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_registrar.hpp b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_registrar.hpp
index 36d283407..ce5cea1ba 100644
--- a/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_registrar.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/fsa/fs_registrar.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fs::fsa {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp b/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp
index 79c421a58..65c73535b 100644
--- a/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp
@@ -14,5 +14,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "interface_adapters/fssrv_storage_interface_adapter.hpp"
-#include "interface_adapters/fssrv_filesystem_interface_adapter.hpp"
+#include <stratosphere/fssrv/interface_adapters/fssrv_storage_interface_adapter.hpp>
+#include <stratosphere/fssrv/interface_adapters/fssrv_filesystem_interface_adapter.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp b/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp
index 2d970b4ec..79bd2c958 100644
--- a/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "../fs/fs_common.hpp"
+#include <stratosphere/fs/fs_common.hpp>
 
 namespace ams::fssrv {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
index 0bc6645df..265b996e5 100644
--- a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "impl/fssystem_path_resolution_filesystem.hpp"
+#include <stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp>
 
 namespace ams::fssystem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
index 54ccfba3c..c4382aa16 100644
--- a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "impl/fssystem_path_resolution_filesystem.hpp"
+#include <stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp>
 
 namespace ams::fssystem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_partition_file_system.hpp b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_partition_file_system.hpp
index 97897dfae..5c2375154 100644
--- a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_partition_file_system.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_partition_file_system.hpp
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "fssystem_partition_file_system_meta.hpp"
-#include "../fs/fsa/fs_ifile.hpp"
-#include "../fs/fsa/fs_idirectory.hpp"
-#include "../fs/fsa/fs_ifilesystem.hpp"
+#include <stratosphere/fssystem/fssystem_partition_file_system_meta.hpp>
+#include <stratosphere/fs/fsa/fs_ifile.hpp>
+#include <stratosphere/fs/fsa/fs_idirectory.hpp>
+#include <stratosphere/fs/fsa/fs_ifilesystem.hpp>
 
 namespace ams::fssystem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
index 61ac5dd3c..7c5611833 100644
--- a/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "impl/fssystem_path_resolution_filesystem.hpp"
+#include <stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp>
 
 namespace ams::fssystem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/hid.hpp b/libraries/libstratosphere/include/stratosphere/hid.hpp
index 47d983dfc..d7961e0fc 100644
--- a/libraries/libstratosphere/include/stratosphere/hid.hpp
+++ b/libraries/libstratosphere/include/stratosphere/hid.hpp
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#include "hid/hid_api.hpp"
\ No newline at end of file
+#include <stratosphere/hid/hid_api.hpp>
\ No newline at end of file
diff --git a/libraries/libstratosphere/include/stratosphere/kvdb.hpp b/libraries/libstratosphere/include/stratosphere/kvdb.hpp
index 37346ac2e..0241c393b 100644
--- a/libraries/libstratosphere/include/stratosphere/kvdb.hpp
+++ b/libraries/libstratosphere/include/stratosphere/kvdb.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "kvdb/kvdb_auto_buffer.hpp"
-#include "kvdb/kvdb_bounded_string.hpp"
-#include "kvdb/kvdb_archive.hpp"
-#include "kvdb/kvdb_memory_key_value_store.hpp"
-#include "kvdb/kvdb_file_key_value_store.hpp"
-#include "kvdb/kvdb_file_key_value_cache.hpp"
+#include <stratosphere/kvdb/kvdb_auto_buffer.hpp>
+#include <stratosphere/kvdb/kvdb_bounded_string.hpp>
+#include <stratosphere/kvdb/kvdb_archive.hpp>
+#include <stratosphere/kvdb/kvdb_memory_key_value_store.hpp>
+#include <stratosphere/kvdb/kvdb_file_key_value_store.hpp>
+#include <stratosphere/kvdb/kvdb_file_key_value_cache.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/lmem.hpp b/libraries/libstratosphere/include/stratosphere/lmem.hpp
index fa85facb6..d3dee39e8 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem.hpp
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include "lmem/lmem_common.hpp"
-#include "lmem/lmem_exp_heap.hpp"
-#include "lmem/lmem_unit_heap.hpp"
+#include <stratosphere/lmem/lmem_common.hpp>
+#include <stratosphere/lmem/lmem_exp_heap.hpp>
+#include <stratosphere/lmem/lmem_unit_heap.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp b/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
index 3009fa42f..c517ce0d2 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem/impl/lmem_impl_common.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "../../os.hpp"
+#include <stratosphere/os.hpp>
 
 namespace ams::lmem::impl {
 
diff --git a/libraries/libstratosphere/include/stratosphere/lmem/lmem_common.hpp b/libraries/libstratosphere/include/stratosphere/lmem/lmem_common.hpp
index 090fa9fa4..f26ace44b 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem/lmem_common.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem/lmem_common.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "impl/lmem_impl_common.hpp"
+#include <stratosphere/lmem/impl/lmem_impl_common.hpp>
 
 namespace ams::lmem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/lmem/lmem_exp_heap.hpp b/libraries/libstratosphere/include/stratosphere/lmem/lmem_exp_heap.hpp
index 9660ca976..83888f3ab 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem/lmem_exp_heap.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem/lmem_exp_heap.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "lmem_common.hpp"
+#include <stratosphere/lmem/lmem_common.hpp>
 
 namespace ams::lmem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/lmem/lmem_unit_heap.hpp b/libraries/libstratosphere/include/stratosphere/lmem/lmem_unit_heap.hpp
index 565ad825b..8dae7ee41 100644
--- a/libraries/libstratosphere/include/stratosphere/lmem/lmem_unit_heap.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lmem/lmem_unit_heap.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "lmem_common.hpp"
+#include <stratosphere/lmem/lmem_common.hpp>
 
 namespace ams::lmem {
 
diff --git a/libraries/libstratosphere/include/stratosphere/map.hpp b/libraries/libstratosphere/include/stratosphere/map.hpp
index 3932d4b1b..c613d3e22 100644
--- a/libraries/libstratosphere/include/stratosphere/map.hpp
+++ b/libraries/libstratosphere/include/stratosphere/map.hpp
@@ -16,5 +16,5 @@
 
 #pragma once
 
-#include "map/map_types.hpp"
-#include "map/map_api.hpp"
+#include <stratosphere/map/map_types.hpp>
+#include <stratosphere/map/map_api.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/map/map_api.hpp b/libraries/libstratosphere/include/stratosphere/map/map_api.hpp
index 1a596df9d..7755fb17e 100644
--- a/libraries/libstratosphere/include/stratosphere/map/map_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/map/map_api.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "map_types.hpp"
+#include <stratosphere/map/map_types.hpp>
 
 namespace ams::map {
 
diff --git a/libraries/libstratosphere/include/stratosphere/os/os_managed_handle.hpp b/libraries/libstratosphere/include/stratosphere/os/os_managed_handle.hpp
index 737c3c245..c15a422c2 100644
--- a/libraries/libstratosphere/include/stratosphere/os/os_managed_handle.hpp
+++ b/libraries/libstratosphere/include/stratosphere/os/os_managed_handle.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "os_common_types.hpp"
+#include <stratosphere/os/os_common_types.hpp>
 
 namespace ams::os {
 
diff --git a/libraries/libstratosphere/include/stratosphere/os/os_process_handle.hpp b/libraries/libstratosphere/include/stratosphere/os/os_process_handle.hpp
index 08dd75717..25b49d044 100644
--- a/libraries/libstratosphere/include/stratosphere/os/os_process_handle.hpp
+++ b/libraries/libstratosphere/include/stratosphere/os/os_process_handle.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "os_managed_handle.hpp"
+#include <stratosphere/os/os_managed_handle.hpp>
 
 namespace ams::os {
 
diff --git a/libraries/libstratosphere/include/stratosphere/os/os_random.hpp b/libraries/libstratosphere/include/stratosphere/os/os_random.hpp
index e1576122f..dc275a925 100644
--- a/libraries/libstratosphere/include/stratosphere/os/os_random.hpp
+++ b/libraries/libstratosphere/include/stratosphere/os/os_random.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "os_common_types.hpp"
+#include <stratosphere/os/os_common_types.hpp>
 
 namespace ams::os {
 
diff --git a/libraries/libstratosphere/include/stratosphere/os/os_tick.hpp b/libraries/libstratosphere/include/stratosphere/os/os_tick.hpp
index 05338e77d..765ca8aa8 100644
--- a/libraries/libstratosphere/include/stratosphere/os/os_tick.hpp
+++ b/libraries/libstratosphere/include/stratosphere/os/os_tick.hpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "os_common_types.hpp"
+#include <stratosphere/os/os_common_types.hpp>
 
 namespace ams::os {
 
diff --git a/libraries/libstratosphere/include/stratosphere/patcher.hpp b/libraries/libstratosphere/include/stratosphere/patcher.hpp
index 76223c62f..3e8d3c95a 100644
--- a/libraries/libstratosphere/include/stratosphere/patcher.hpp
+++ b/libraries/libstratosphere/include/stratosphere/patcher.hpp
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#include "patcher/patcher_api.hpp"
+#include <stratosphere/patcher/patcher_api.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp b/libraries/libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp
index a88ef7e6b..c71aa3d55 100644
--- a/libraries/libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pm_types.hpp"
+#include <stratosphere/pm/pm_types.hpp>
 
 namespace ams::pm::bm {
 
diff --git a/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp b/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp
index 28699b52b..d61fa8349 100644
--- a/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../os/os_common_types.hpp"
+#include <stratosphere/os/os_common_types.hpp>
 
 namespace ams::pm {
 
diff --git a/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp b/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp
index 9e6e677c8..117181b11 100644
--- a/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "settings_fwdbg_types.hpp"
+#include <stratosphere/settings/settings_fwdbg_types.hpp>
 
 namespace ams::settings::fwdbg {
 
diff --git a/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp b/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp
index 7fee0800c..0429d058e 100644
--- a/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <vapours.hpp>
-#include "../sf/sf_buffer_tags.hpp"
+#include <stratosphere/sf/sf_buffer_tags.hpp>
 
 namespace ams::settings::fwdbg {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
index bf380c829..b7d3eba00 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "../sf_common.hpp"
-#include "sf_cmif_service_object_holder.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
index 34680b2fe..179d84f57 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
@@ -15,9 +15,9 @@
  */
 
 #pragma once
-#include "sf_cmif_service_dispatch.hpp"
-#include "sf_cmif_domain_api.hpp"
-#include "sf_cmif_server_message_processor.hpp"
+#include <stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_domain_api.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
index e3a268704..04d21e37f 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../sf_common.hpp"
+#include <stratosphere/sf/sf_common.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
index f96c6fd49..f518f8191 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "../sf_service_object.hpp"
-#include "sf_cmif_pointer_and_size.hpp"
+#include <stratosphere/sf/sf_service_object.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
index 827147576..8f1f07f9d 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
@@ -15,9 +15,9 @@
  */
 
 #pragma once
-#include "../sf_service_object.hpp"
-#include "sf_cmif_pointer_and_size.hpp"
-#include "sf_cmif_server_message_processor.hpp"
+#include <stratosphere/sf/sf_service_object.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp>
 
 namespace ams::sf::hipc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
index cc9340caa..9192c1bea 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "../sf_service_object.hpp"
-#include "sf_cmif_service_dispatch.hpp"
+#include <stratosphere/sf/sf_service_object.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp
index dfb20ccc6..0a39b15ae 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "../sf_common.hpp"
-#include "../cmif/sf_cmif_pointer_and_size.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
 
 namespace ams::sf::hipc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
index f26419d8d..c014f2a2b 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "sf_hipc_server_session_manager.hpp"
-#include "../cmif/sf_cmif_domain_manager.hpp"
+#include <stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_domain_manager.hpp>
 
 namespace ams::sf::hipc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
index a50792e36..97b209e38 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "sf_hipc_server_domain_session_manager.hpp"
-#include "../../sm.hpp"
+#include <stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp>
+#include <stratosphere/sm.hpp>
 
 namespace ams::sf::hipc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
index 72778b417..b248a62ee 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
@@ -15,11 +15,11 @@
  */
 
 #pragma once
-#include "../sf_common.hpp"
-#include "../sf_service_object.hpp"
-#include "../cmif/sf_cmif_pointer_and_size.hpp"
-#include "../cmif/sf_cmif_service_object_holder.hpp"
-#include "sf_hipc_api.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/sf_service_object.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp>
+#include <stratosphere/sf/hipc/sf_hipc_api.hpp>
 
 namespace ams::sf::cmif {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp b/libraries/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
index 19f760b75..38ca1526d 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
@@ -15,17 +15,17 @@
  */
 
 #pragma once
-#include "../sf_common.hpp"
-#include "../sf_service_object.hpp"
-#include "../sf_out.hpp"
-#include "../sf_buffers.hpp"
-#include "../sf_handles.hpp"
-#include "../cmif/sf_cmif_pointer_and_size.hpp"
-#include "../cmif/sf_cmif_service_dispatch.hpp"
-#include "../cmif/sf_cmif_service_object_holder.hpp"
-#include "../cmif/sf_cmif_domain_api.hpp"
-#include "../hipc/sf_hipc_api.hpp"
-#include "../hipc/sf_hipc_server_session_manager.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/sf_service_object.hpp>
+#include <stratosphere/sf/sf_out.hpp>
+#include <stratosphere/sf/sf_buffers.hpp>
+#include <stratosphere/sf/sf_handles.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_domain_api.hpp>
+#include <stratosphere/sf/hipc/sf_hipc_api.hpp>
+#include <stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp>
 
 /* Serialization classes. */
 namespace ams::sf {
diff --git a/libraries/libstratosphere/include/stratosphere/sf/sf_buffers.hpp b/libraries/libstratosphere/include/stratosphere/sf/sf_buffers.hpp
index 438e88f67..fb306b81c 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/sf_buffers.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/sf_buffers.hpp
@@ -15,10 +15,10 @@
  */
 
 #pragma once
-#include "sf_common.hpp"
-#include "sf_out.hpp"
-#include "cmif/sf_cmif_pointer_and_size.hpp"
-#include "sf_buffer_tags.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/sf_out.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
+#include <stratosphere/sf/sf_buffer_tags.hpp>
 
 namespace ams::sf {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sf/sf_handles.hpp b/libraries/libstratosphere/include/stratosphere/sf/sf_handles.hpp
index 047a18737..d9812a298 100644
--- a/libraries/libstratosphere/include/stratosphere/sf/sf_handles.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sf/sf_handles.hpp
@@ -15,9 +15,9 @@
  */
 
 #pragma once
-#include "sf_common.hpp"
-#include "sf_out.hpp"
-#include "cmif/sf_cmif_pointer_and_size.hpp"
+#include <stratosphere/sf/sf_common.hpp>
+#include <stratosphere/sf/sf_out.hpp>
+#include <stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp>
 
 namespace ams::sf {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp b/libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp
index e14a417c0..50c20d0ca 100644
--- a/libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sm/sm_api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "sm_types.hpp"
+#include <stratosphere/sm/sm_types.hpp>
 
 namespace ams::sm {
 
diff --git a/libraries/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp b/libraries/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp
index d78f63b1b..fa3d53abb 100644
--- a/libraries/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "sm_types.hpp"
+#include <stratosphere/sm/sm_types.hpp>
 
 namespace ams::sm::mitm {
 
diff --git a/libraries/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp b/libraries/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp
index ace91218d..b4841f097 100644
--- a/libraries/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp
+++ b/libraries/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../spl_types.hpp"
+#include <stratosphere/spl/spl_types.hpp>
 
 namespace ams::spl::smc {
 
diff --git a/libraries/libstratosphere/include/stratosphere/updater.hpp b/libraries/libstratosphere/include/stratosphere/updater.hpp
index 6cf813fad..ebe907f5c 100644
--- a/libraries/libstratosphere/include/stratosphere/updater.hpp
+++ b/libraries/libstratosphere/include/stratosphere/updater.hpp
@@ -16,5 +16,5 @@
 
 #pragma once
 
-#include "updater/updater_types.hpp"
-#include "updater/updater_api.hpp"
+#include <stratosphere/updater/updater_types.hpp>
+#include <stratosphere/updater/updater_api.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/updater/updater_api.hpp b/libraries/libstratosphere/include/stratosphere/updater/updater_api.hpp
index 268d80213..0267033f7 100644
--- a/libraries/libstratosphere/include/stratosphere/updater/updater_api.hpp
+++ b/libraries/libstratosphere/include/stratosphere/updater/updater_api.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "updater_types.hpp"
-#include "../spl/spl_types.hpp"
+#include <stratosphere/updater/updater_types.hpp>
+#include <stratosphere/spl/spl_types.hpp>
 
 namespace ams::updater {