From d0b634334277ffbe3680b8ed938a47d396b0e719 Mon Sep 17 00:00:00 2001
From: hax0kartik <pokemonemerald0@gmail.com>
Date: Mon, 1 Apr 2019 13:36:13 +0000
Subject: [PATCH] Do not include 3ds.h within ctrulib headers

---
 libctru/include/3ds.h                     | 1 +
 libctru/include/3ds/applets/miiselector.h | 3 ++-
 libctru/include/3ds/mii.h                 | 2 +-
 libctru/include/3ds/services/frd.h        | 1 -
 libctru/source/services/frd.c             | 7 +++++++
 libctru/source/services/mcuhwc.c          | 7 ++++++-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/libctru/include/3ds.h b/libctru/include/3ds.h
index 2b4f0e5..5d79be5 100644
--- a/libctru/include/3ds.h
+++ b/libctru/include/3ds.h
@@ -89,6 +89,7 @@ extern "C" {
 #include <3ds/sdmc.h>
 #include <3ds/romfs.h>
 #include <3ds/font.h>
+#include <3ds/mii.h>
 
 #ifdef __cplusplus
 }
diff --git a/libctru/include/3ds/applets/miiselector.h b/libctru/include/3ds/applets/miiselector.h
index 632ab3b..1012370 100644
--- a/libctru/include/3ds/applets/miiselector.h
+++ b/libctru/include/3ds/applets/miiselector.h
@@ -5,6 +5,7 @@
 
 #pragma once
 #include <3ds/types.h>
+#include <3ds/mii.h>
 
 /// Magic value needed to launch the applet.
 #define MIISELECTOR_MAGIC 0x13DE28CF
@@ -61,7 +62,7 @@ typedef struct
 	u32 guest_mii_was_selected;         ///< 1 if a Guest Mii was selected, 0 otherwise.
 	u32 guest_mii_index;                ///< Index of the selected Guest Mii,
 	                                    ///< 0xFFFFFFFF if no guest was selected.
-	char mii[MIISELECTOR_MIIDATA_SIZE]; ///< Data of selected Mii.
+	MiiData mii;                        ///< Data of selected Mii.
 	u16 _pad0x68;                       ///< @private
 	u16 checksum;                       ///< Checksum of the returned Mii data.
 	                                    ///< Stored as a big-endian value; use
diff --git a/libctru/include/3ds/mii.h b/libctru/include/3ds/mii.h
index 9b4ae67..d264e4c 100644
--- a/libctru/include/3ds/mii.h
+++ b/libctru/include/3ds/mii.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <3ds.h>
+#include <3ds/types.h>
 
 typedef struct
 {
diff --git a/libctru/include/3ds/services/frd.h b/libctru/include/3ds/services/frd.h
index d1e99d3..933aacb 100644
--- a/libctru/include/3ds/services/frd.h
+++ b/libctru/include/3ds/services/frd.h
@@ -3,7 +3,6 @@
  * @brief Friend Services
  */
 #pragma once
-#include <3ds.h>
 #include <3ds/mii.h>
 
 #define FRIEND_SCREEN_NAME_SIZE 0xB   ///< 11-byte UTF-16 screen name
diff --git a/libctru/source/services/frd.c b/libctru/source/services/frd.c
index df3ba2c..2a2df7f 100644
--- a/libctru/source/services/frd.c
+++ b/libctru/source/services/frd.c
@@ -1,5 +1,12 @@
 #include <string.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/synchronization.h>
+#include <3ds/ipc.h>
+#include <3ds/result.h>
+#include <3ds/srv.h>
 #include <3ds/services/frd.h>
+#include <3ds/util/utf.h>
 
 static Handle frdHandle;
 static int frdRefCount;
diff --git a/libctru/source/services/mcuhwc.c b/libctru/source/services/mcuhwc.c
index 4e5ba67..9693dd2 100644
--- a/libctru/source/services/mcuhwc.c
+++ b/libctru/source/services/mcuhwc.c
@@ -1,4 +1,9 @@
-#include <3ds.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/synchronization.h>
+#include <3ds/ipc.h>
+#include <3ds/result.h>
+#include <3ds/srv.h>
 #include <3ds/services/mcuhwc.h>
 
 static Handle mcuHwcHandle;