From d94be49cb3d2da6dab7d33c5171011b8ad1b64ab Mon Sep 17 00:00:00 2001
From: yellows8 <yellows8@users.noreply.github.com>
Date: Wed, 27 Nov 2019 11:18:58 -0500
Subject: [PATCH] Moved common includes for libapplets into a dedicated
 internal header + minor other changes.

---
 nx/source/applets/album_la.c           | 5 +----
 nx/source/applets/error.c              | 6 +-----
 nx/source/applets/friends_la.c         | 5 +----
 nx/source/applets/libapplet.c          | 5 +----
 nx/source/applets/libapplet_internal.h | 5 +++++
 nx/source/applets/pctlauth.c           | 5 +----
 nx/source/applets/swkbd.c              | 5 +----
 nx/source/applets/web.c                | 5 +----
 8 files changed, 12 insertions(+), 29 deletions(-)
 create mode 100644 nx/source/applets/libapplet_internal.h

diff --git a/nx/source/applets/album_la.c b/nx/source/applets/album_la.c
index 64fef72d..ce51730a 100644
--- a/nx/source/applets/album_la.c
+++ b/nx/source/applets/album_la.c
@@ -1,8 +1,5 @@
 #include <string.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/album_la.h"
 
 static Result _albumLaShow(u8 arg, bool playStartupSound) {
diff --git a/nx/source/applets/error.c b/nx/source/applets/error.c
index ac7bc7c9..08a99369 100644
--- a/nx/source/applets/error.c
+++ b/nx/source/applets/error.c
@@ -1,9 +1,5 @@
 #include <string.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "services/set.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/error.h"
 #include "runtime/hosversion.h"
 
diff --git a/nx/source/applets/friends_la.c b/nx/source/applets/friends_la.c
index 34c7437e..b1c1053f 100644
--- a/nx/source/applets/friends_la.c
+++ b/nx/source/applets/friends_la.c
@@ -1,8 +1,5 @@
 #include <string.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/friends_la.h"
 #include "runtime/hosversion.h"
 
diff --git a/nx/source/applets/libapplet.c b/nx/source/applets/libapplet.c
index b319447e..d5f1197c 100644
--- a/nx/source/applets/libapplet.c
+++ b/nx/source/applets/libapplet.c
@@ -1,9 +1,6 @@
 #include <string.h>
-#include "types.h"
-#include "result.h"
+#include "libapplet_internal.h"
 #include "arm/counter.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
 
 static bool g_libappletJumpFlag;
 
diff --git a/nx/source/applets/libapplet_internal.h b/nx/source/applets/libapplet_internal.h
new file mode 100644
index 00000000..f02a3dc1
--- /dev/null
+++ b/nx/source/applets/libapplet_internal.h
@@ -0,0 +1,5 @@
+#pragma once
+#include "types.h"
+#include "result.h"
+#include "services/applet.h"
+#include "applets/libapplet.h"
diff --git a/nx/source/applets/pctlauth.c b/nx/source/applets/pctlauth.c
index bf29ae70..3713fbd1 100644
--- a/nx/source/applets/pctlauth.c
+++ b/nx/source/applets/pctlauth.c
@@ -1,8 +1,5 @@
 #include <string.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/pctlauth.h"
 #include "runtime/hosversion.h"
 
diff --git a/nx/source/applets/swkbd.c b/nx/source/applets/swkbd.c
index b41af807..cc1d7928 100644
--- a/nx/source/applets/swkbd.c
+++ b/nx/source/applets/swkbd.c
@@ -1,10 +1,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <math.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/swkbd.h"
 #include "runtime/hosversion.h"
 #include "runtime/util/utf.h"
diff --git a/nx/source/applets/web.c b/nx/source/applets/web.c
index 21b62fc9..3dac6f92 100644
--- a/nx/source/applets/web.c
+++ b/nx/source/applets/web.c
@@ -1,9 +1,6 @@
 #include <string.h>
 #include <malloc.h>
-#include "types.h"
-#include "result.h"
-#include "services/applet.h"
-#include "applets/libapplet.h"
+#include "libapplet_internal.h"
 #include "applets/web.h"
 #include "runtime/hosversion.h"