diff --git a/nx/include/switch/gfx/buffer_producer.h b/nx/include/switch/gfx/buffer_producer.h
index 3edfeb28..8ade36b3 100644
--- a/nx/include/switch/gfx/buffer_producer.h
+++ b/nx/include/switch/gfx/buffer_producer.h
@@ -105,7 +105,7 @@ enum {
 };
 
 Result bufferProducerInitialize(Binder *session);
-void bufferProducerExit();
+void bufferProducerExit(void);
 
 Result bufferProducerRequestBuffer(s32 bufferIdx, bufferProducerGraphicBuffer *buf);
 Result bufferProducerDequeueBuffer(bool async, u32 width, u32 height, s32 format, u32 usage, s32 *buf, bufferProducerFence *fence);
diff --git a/nx/include/switch/services/acc.h b/nx/include/switch/services/acc.h
index ef83d85e..90fbcaca 100644
--- a/nx/include/switch/services/acc.h
+++ b/nx/include/switch/services/acc.h
@@ -1,9 +1,10 @@
 #pragma once
 #include "../types.h"
+#include "sm.h"
 
 Result accountInitialize(void);
 void accountExit(void);
-Handle accountGetSessionService(void);
+Service* accountGetService(void);
 
 /// Get the userID for the currently active user. The output userID is only valid when the output account_selected==1, otherwise no user is currently selected.
 Result accountGetActiveUser(u128 *userID, bool *account_selected);
diff --git a/nx/source/gfx/nvgfx.c b/nx/source/gfx/nvgfx.c
index 02971b92..5b55e0f8 100644
--- a/nx/source/gfx/nvgfx.c
+++ b/nx/source/gfx/nvgfx.c
@@ -57,7 +57,7 @@ extern size_t g_gfx_singleframebuf_size;
 
 Result _gfxGraphicBufferInit(s32 buf, u32 nvmap_handle);
 
-Result nvmapobjInitialize(nvmapobj *obj, size_t size) {
+static Result nvmapobjInitialize(nvmapobj *obj, size_t size) {
     Result rc=0;
 
     if(obj->initialized)return 0;
@@ -77,7 +77,7 @@ Result nvmapobjInitialize(nvmapobj *obj, size_t size) {
     return rc;
 }
 
-void nvmapobjClose(nvmapobj *obj) {
+static void nvmapobjClose(nvmapobj *obj) {
     if(!obj->initialized)return;
 
     if (obj->mem) {
@@ -88,13 +88,13 @@ void nvmapobjClose(nvmapobj *obj) {
     memset(obj, 0, sizeof(nvmapobj));
 }
 
-void nvmapobjCloseAll(void) {
+static void nvmapobjCloseAll(void) {
     u32 pos=0;
 
     for(pos=0; pos<sizeof(nvmap_objs)/sizeof(nvmapobj); pos++) nvmapobjClose(&nvmap_objs[pos]);
 }
 
-Result nvmapobjSetup(nvmapobj *obj, u32 heapmask, u32 flags, u32 align, u8 kind) {
+static Result nvmapobjSetup(nvmapobj *obj, u32 heapmask, u32 flags, u32 align, u8 kind) {
     Result rc=0;
 
     rc = nvioctlNvmap_Create(g_nvgfx_fd_nvmap, obj->mem_size, &obj->handle);
diff --git a/nx/source/kernel/random.c b/nx/source/kernel/random.c
index 2087d2e2..69564956 100644
--- a/nx/source/kernel/random.c
+++ b/nx/source/kernel/random.c
@@ -65,7 +65,7 @@ static void _Round(u8 output[64], const u32 input[16])
 
 static const char sigma[16] = "expand 32-byte k";
 
-void chachaInit(ChaCha* x, const u8* key, const u8* iv)
+static void chachaInit(ChaCha* x, const u8* key, const u8* iv)
 {
     // Setup key.
     x->input[0]  = U8TO32_LITTLE(sigma + 0);
@@ -88,7 +88,7 @@ void chachaInit(ChaCha* x, const u8* key, const u8* iv)
     x->input[15] = U8TO32_LITTLE(iv + 4);
 }
 
-void chachaEncrypt(ChaCha* x, const u8* m, u8* c, size_t bytes)
+static void chachaEncrypt(ChaCha* x, const u8* m, u8* c, size_t bytes)
 {
     u8 output[64];
     int i;
@@ -123,7 +123,7 @@ static ChaCha g_chacha;
 static bool   g_randInit = false;
 static Mutex  g_randMutex;
 
-void _randomInit(void)
+static void _randomInit(void)
 {
     // Has already initialized?
     if (g_randInit)
diff --git a/nx/source/runtime/devices/console.c b/nx/source/runtime/devices/console.c
index 622518c1..0ddc4456 100644
--- a/nx/source/runtime/devices/console.c
+++ b/nx/source/runtime/devices/console.c
@@ -204,7 +204,7 @@ static inline void consolePosition(int x, int y) {
 }
 
 //---------------------------------------------------------------------------------
-ssize_t con_write(struct _reent *r,void *fd,const char *ptr, size_t len) {
+static ssize_t con_write(struct _reent *r,void *fd,const char *ptr, size_t len) {
 //---------------------------------------------------------------------------------
 
 	char chr;
diff --git a/nx/source/runtime/newlib.c b/nx/source/runtime/newlib.c
index fb810ab6..dccc888e 100644
--- a/nx/source/runtime/newlib.c
+++ b/nx/source/runtime/newlib.c
@@ -23,7 +23,7 @@ static struct _reent* __libnx_get_reent(void) {
     return tv->reent;
 }
 
-void newlibSetup() {
+void newlibSetup(void) {
     // Register newlib syscalls
     __syscalls.exit     = __libnx_exit;
     __syscalls.getreent = __libnx_get_reent;