From 75d507425a10d2af44a68fb1dce388d98b317236 Mon Sep 17 00:00:00 2001
From: Michael Theall <pigman46@gmail.com>
Date: Thu, 7 May 2020 23:30:23 -0500
Subject: [PATCH] Minor future-proofing

---
 source/3ds/imgui_citro3d.cpp | 1 +
 source/3ds/platform.cpp      | 1 +
 source/fs.cpp                | 1 +
 source/ftpConfig.cpp         | 2 +-
 source/nds/platform.cpp      | 1 +
 source/switch/imgui_deko3d.h | 2 ++
 source/switch/init.c         | 2 +-
 source/switch/platform.cpp   | 3 +--
 8 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/source/3ds/imgui_citro3d.cpp b/source/3ds/imgui_citro3d.cpp
index f7e3399..55bd077 100644
--- a/source/3ds/imgui_citro3d.cpp
+++ b/source/3ds/imgui_citro3d.cpp
@@ -28,6 +28,7 @@
 #include "imgui.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <vector>
diff --git a/source/3ds/platform.cpp b/source/3ds/platform.cpp
index f89e25a..dbfe3c9 100644
--- a/source/3ds/platform.cpp
+++ b/source/3ds/platform.cpp
@@ -77,6 +77,7 @@ bool s_backlight = true;
 aptHookCookie s_aptHookCookie;
 
 #ifdef CLASSIC
+/// \brief Host address
 in_addr_t s_addr = 0;
 #else
 /// \brief Clear color
diff --git a/source/fs.cpp b/source/fs.cpp
index 9c59d76..7cdb3c8 100644
--- a/source/fs.cpp
+++ b/source/fs.cpp
@@ -22,6 +22,7 @@
 
 #include <cinttypes>
 #include <cstdio>
+#include <string>
 
 #if defined(NDS) || defined(_3DS) || defined(__SWITCH__)
 #define getline __getline
diff --git a/source/ftpConfig.cpp b/source/ftpConfig.cpp
index 00c0db3..7f768f2 100644
--- a/source/ftpConfig.cpp
+++ b/source/ftpConfig.cpp
@@ -25,7 +25,7 @@
 
 #include <sys/stat.h>
 
-//#include <algorithm>
+#include <limits>
 
 namespace
 {
diff --git a/source/nds/platform.cpp b/source/nds/platform.cpp
index 4ff844e..cda3416 100644
--- a/source/nds/platform.cpp
+++ b/source/nds/platform.cpp
@@ -39,6 +39,7 @@ PrintConsole g_sessionConsole;
 
 namespace
 {
+/// \brief Host address
 struct in_addr s_addr = {0};
 /// \brief Whether to power backlight
 bool s_backlight = true;
diff --git a/source/switch/imgui_deko3d.h b/source/switch/imgui_deko3d.h
index e47d135..bcdf75d 100644
--- a/source/switch/imgui_deko3d.h
+++ b/source/switch/imgui_deko3d.h
@@ -23,6 +23,8 @@
 #ifndef CLASSIC
 #include <deko3d.hpp>
 
+#include <cstdint>
+
 namespace imgui
 {
 namespace deko3d
diff --git a/source/switch/init.c b/source/switch/init.c
index eecea57..76cbefa 100644
--- a/source/switch/init.c
+++ b/source/switch/init.c
@@ -55,7 +55,7 @@ void userAppInit ()
 	appletLockExit ();
 
 	romfsInit ();
-	plInitialize ();
+	plInitialize (PlServiceType_User);
 	psmInitialize ();
 	nifmInitialize (NifmServiceType_User);
 	socketInitialize (&s_socketInitConfig);
diff --git a/source/switch/platform.cpp b/source/switch/platform.cpp
index 279edca..e0b0f64 100644
--- a/source/switch/platform.cpp
+++ b/source/switch/platform.cpp
@@ -57,6 +57,7 @@ bool s_backlight = true;
 AppletHookCookie s_appletHookCookie;
 
 #ifdef CLASSIC
+/// \brief Host address
 in_addr_t s_addr = 0;
 #else
 /// \brief Texture index
@@ -527,8 +528,6 @@ void drawStatus ()
 }
 }
 
-
-
 bool platform::init ()
 {
 #ifdef CLASSIC