From 7658c07492b533da2a69f610beaa16c3e116d409 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 14 Aug 2020 17:33:49 -0700
Subject: [PATCH] strat: fix inclusion/ordering for some c headers

---
 libraries/libstratosphere/source/ams/ams_bpc.h   | 4 +---
 libraries/libstratosphere/source/dmnt/dmntcht.h  | 4 +---
 libraries/libstratosphere/source/service_guard.h | 9 +++++----
 libraries/libstratosphere/source/sm/sm_ams.h     | 4 +---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/libraries/libstratosphere/source/ams/ams_bpc.h b/libraries/libstratosphere/source/ams/ams_bpc.h
index 93da63092..f6825c418 100644
--- a/libraries/libstratosphere/source/ams/ams_bpc.h
+++ b/libraries/libstratosphere/source/ams/ams_bpc.h
@@ -15,9 +15,7 @@
  */
 
 #pragma once
-#include <switch/types.h>
-#include <switch/kernel/event.h>
-#include <switch/services/sm.h>
+#include <switch.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libraries/libstratosphere/source/dmnt/dmntcht.h b/libraries/libstratosphere/source/dmnt/dmntcht.h
index ef19824e0..62f895736 100644
--- a/libraries/libstratosphere/source/dmnt/dmntcht.h
+++ b/libraries/libstratosphere/source/dmnt/dmntcht.h
@@ -15,9 +15,7 @@
  */
 
 #pragma once
-#include <switch/types.h>
-#include <switch/kernel/event.h>
-#include <switch/services/sm.h>
+#include <switch.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libraries/libstratosphere/source/service_guard.h b/libraries/libstratosphere/source/service_guard.h
index 588a0c995..d7ce9a7a9 100644
--- a/libraries/libstratosphere/source/service_guard.h
+++ b/libraries/libstratosphere/source/service_guard.h
@@ -1,14 +1,15 @@
 #pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <switch/types.h>
 #include <switch/result.h>
 #include <switch/kernel/mutex.h>
 #include <switch/sf/service.h>
 #include <switch/services/sm.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ServiceGuard {
     Mutex mutex;
     u32 refCount;
diff --git a/libraries/libstratosphere/source/sm/sm_ams.h b/libraries/libstratosphere/source/sm/sm_ams.h
index 3036cde94..6bdf435b4 100644
--- a/libraries/libstratosphere/source/sm/sm_ams.h
+++ b/libraries/libstratosphere/source/sm/sm_ams.h
@@ -5,9 +5,7 @@
  * @copyright libnx Authors
  */
 #pragma once
-#include <switch/types.h>
-#include <switch/kernel/event.h>
-#include <switch/services/sm.h>
+#include <switch.h>
 
 #ifdef __cplusplus
 extern "C" {