strat: use consistent include style for lib headers

2024-09-19 15:28:53 -04:00 · 2021-09-30 19:21:08 -07:00 · 2021-09-30 19:21:08 -07:00 · 24d6933145
commit 24d6933145
parent 7444a68cd1
80 changed files with 144 additions and 144 deletions
--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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>
--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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 {
--- 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 {
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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"
+#include <stratosphere/hid/hid_api.hpp>
--- 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>
--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>
--- 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 {