From c8550c378b843626fca3814665d1a09d4b1ad83c Mon Sep 17 00:00:00 2001
From: yellows8 <yellows8@users.noreply.github.com>
Date: Fri, 4 Oct 2019 10:18:57 -0400
Subject: [PATCH] Include sf/service.h instead of sm.h, in the service/ headers
 for services which were previously updated for new-ipc.

---
 nx/include/switch/services/applet.h | 1 +
 nx/include/switch/services/async.h  | 1 +
 nx/include/switch/services/fs.h     | 2 +-
 nx/include/switch/services/fsldr.h  | 4 ++--
 nx/include/switch/services/lr.h     | 2 +-
 nx/include/switch/services/ns.h     | 1 +
 nx/include/switch/services/nv.h     | 1 +
 nx/include/switch/services/pm.h     | 2 +-
 nx/include/switch/services/ro.h     | 2 +-
 nx/include/switch/services/ts.h     | 1 +
 10 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/nx/include/switch/services/applet.h b/nx/include/switch/services/applet.h
index 55b93f31..e9572cf8 100644
--- a/nx/include/switch/services/applet.h
+++ b/nx/include/switch/services/applet.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 #include "../types.h"
+#include "../sf/service.h"
 #include "../services/apm.h"
 #include "../services/pdm.h"
 #include "../services/caps.h"
diff --git a/nx/include/switch/services/async.h b/nx/include/switch/services/async.h
index 72f9beb9..98f68488 100644
--- a/nx/include/switch/services/async.h
+++ b/nx/include/switch/services/async.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 #include "../types.h"
+#include "../sf/service.h"
 #include "../applets/error.h"
 #include "../kernel/event.h"
 
diff --git a/nx/include/switch/services/fs.h b/nx/include/switch/services/fs.h
index bdc3c93e..88a8432c 100644
--- a/nx/include/switch/services/fs.h
+++ b/nx/include/switch/services/fs.h
@@ -9,7 +9,7 @@
 #pragma once
 #include "../types.h"
 #include "../kernel/event.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 
 // We use wrapped handles for type safety.
 
diff --git a/nx/include/switch/services/fsldr.h b/nx/include/switch/services/fsldr.h
index bd471517..3e4a8224 100644
--- a/nx/include/switch/services/fsldr.h
+++ b/nx/include/switch/services/fsldr.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 #include "../types.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 #include "../services/fs.h"
 
 Result fsldrInitialize(void);
@@ -15,4 +15,4 @@ Service* fsldrGetServiceSession(void);
 
 Result fsldrOpenCodeFileSystem(u64 tid, const char *path, FsFileSystem* out);
 Result fsldrIsArchivedProgram(u64 pid, bool *out);
-Result fsldrSetCurrentProcess(void);
\ No newline at end of file
+Result fsldrSetCurrentProcess(void);
diff --git a/nx/include/switch/services/lr.h b/nx/include/switch/services/lr.h
index 7c382db0..dac7f60a 100644
--- a/nx/include/switch/services/lr.h
+++ b/nx/include/switch/services/lr.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 #include "../types.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 #include "../services/fs.h"
 
 typedef struct {
diff --git a/nx/include/switch/services/ns.h b/nx/include/switch/services/ns.h
index e8196423..f3733666 100644
--- a/nx/include/switch/services/ns.h
+++ b/nx/include/switch/services/ns.h
@@ -7,6 +7,7 @@
 #pragma once
 #include "../types.h"
 #include "../nacp.h"
+#include "../sf/service.h"
 #include "../services/fs.h"
 #include "../services/ncm.h"
 #include "../services/async.h"
diff --git a/nx/include/switch/services/nv.h b/nx/include/switch/services/nv.h
index 353627cf..056cb4d0 100644
--- a/nx/include/switch/services/nv.h
+++ b/nx/include/switch/services/nv.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 #include "../types.h"
+#include "../sf/service.h"
 #include "../kernel/event.h"
 
 Result nvInitialize(void);
diff --git a/nx/include/switch/services/pm.h b/nx/include/switch/services/pm.h
index 8a268b63..5175a994 100644
--- a/nx/include/switch/services/pm.h
+++ b/nx/include/switch/services/pm.h
@@ -9,7 +9,7 @@
 #pragma once
 #include "../types.h"
 #include "../kernel/event.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 
 /// LaunchFlag
 typedef enum {
diff --git a/nx/include/switch/services/ro.h b/nx/include/switch/services/ro.h
index 492ed929..7c7680e5 100644
--- a/nx/include/switch/services/ro.h
+++ b/nx/include/switch/services/ro.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 #include "../types.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 #include "../services/ldr.h"
 
 Result ldrRoInitialize(void);
diff --git a/nx/include/switch/services/ts.h b/nx/include/switch/services/ts.h
index 2d30b2ce..cc85b0c8 100644
--- a/nx/include/switch/services/ts.h
+++ b/nx/include/switch/services/ts.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 #include "../types.h"
+#include "../sf/service.h"
 
 /// Location
 typedef enum {