From 0e8c6a08ea3f7d884fc39fd89454a2aea5e4ae5b Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Wed, 2 Oct 2019 23:34:27 +1000
Subject: [PATCH] Fix libstrat includes

---
 .../libstratosphere/include/stratosphere/lr/lr_types.hpp    | 2 +-
 .../libstratosphere/include/stratosphere/util/util_uuid.hpp | 1 +
 stratosphere/libstratosphere/source/updater/updater_api.cpp | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/stratosphere/libstratosphere/include/stratosphere/lr/lr_types.hpp b/stratosphere/libstratosphere/include/stratosphere/lr/lr_types.hpp
index e845201d9..7ef1a9ed6 100644
--- a/stratosphere/libstratosphere/include/stratosphere/lr/lr_types.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/lr/lr_types.hpp
@@ -15,8 +15,8 @@
  */
 
 #pragma once
+#include <cstring>
 #include <switch.h>
-#include <stratosphere.hpp>
 
 namespace sts::lr {
 
diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_uuid.hpp b/stratosphere/libstratosphere/include/stratosphere/util/util_uuid.hpp
index 34f08eedb..70487e4d7 100644
--- a/stratosphere/libstratosphere/include/stratosphere/util/util_uuid.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/util/util_uuid.hpp
@@ -15,6 +15,7 @@
  */
 
 #pragma once
+#include <cstring>
 #include <switch.h>
 
 namespace sts::util {
diff --git a/stratosphere/libstratosphere/source/updater/updater_api.cpp b/stratosphere/libstratosphere/source/updater/updater_api.cpp
index f027e5089..2e6afd254 100644
--- a/stratosphere/libstratosphere/source/updater/updater_api.cpp
+++ b/stratosphere/libstratosphere/source/updater/updater_api.cpp
@@ -349,7 +349,7 @@ namespace sts::updater {
                     void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
 
                     size_t size;
-                    R_TRY(fs::ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
+                    R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
                     if (HasEks(boot_image_update_type)) {
                         R_TRY(boot0_accessor.UpdateEks(bct, work));
                     }
@@ -411,7 +411,7 @@ namespace sts::updater {
                     void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
 
                     size_t size;
-                    R_TRY(fs::ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
+                    R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
                     if (HasEks(boot_image_update_type)) {
                         R_TRY(boot0_accessor.UpdateEks(bct, work));
                     }
@@ -465,7 +465,7 @@ namespace sts::updater {
             void *work = reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(work_buffer) + BctSize);
 
             size_t size;
-            R_TRY(fs::ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
+            R_TRY(ReadFile(&size, bct, BctSize, GetBctPath(boot_image_update_type)));
             if (HasEks(boot_image_update_type)) {
                 R_TRY(accessor.UpdateEks(bct, work));
             }