diff --git a/libctru/include/3ds/services/ac.h b/libctru/include/3ds/services/ac.h
index 22b3f28..6e5fc0f 100644
--- a/libctru/include/3ds/services/ac.h
+++ b/libctru/include/3ds/services/ac.h
@@ -12,10 +12,9 @@ Result acExit(void);
 
 /**
  * @brief Gets the current Wifi status.
- * @param servhandle Optional pointer to the service handle to use.
  * @param out Pointer to output the current Wifi status to. (0 = not connected, 1 = O3DS Internet, 2 = N3DS Internet)
  */
-Result ACU_GetWifiStatus(Handle* servhandle, u32 *out);
+Result ACU_GetWifiStatus(u32 *out);
 
 /// Waits for the system to connect to the internet.
 Result ACU_WaitInternetConnection(void);
diff --git a/libctru/include/3ds/services/cfgnor.h b/libctru/include/3ds/services/cfgnor.h
index 7132a53..38886c3 100644
--- a/libctru/include/3ds/services/cfgnor.h
+++ b/libctru/include/3ds/services/cfgnor.h
@@ -11,7 +11,7 @@
 Result CFGNOR_Initialize(u8 value);
 
 /// Shuts down CFGNOR.
-Result CFGNOR_Shutdown();
+Result CFGNOR_Shutdown(void);
 
 /**
  * @brief Reads data from NOR.
diff --git a/libctru/include/3ds/services/csnd.h b/libctru/include/3ds/services/csnd.h
index 64a964e..10d4d46 100644
--- a/libctru/include/3ds/services/csnd.h
+++ b/libctru/include/3ds/services/csnd.h
@@ -1,6 +1,6 @@
 /**
  * @file csnd.h
- * @brief CSND service.
+ * @brief CSND service. Usage of this service is deprecated in favor of NDSP.
  */
 #pragma once
 
diff --git a/libctru/include/3ds/services/hb.h b/libctru/include/3ds/services/hb.h
index db63fd4..63740f3 100644
--- a/libctru/include/3ds/services/hb.h
+++ b/libctru/include/3ds/services/hb.h
@@ -11,10 +11,10 @@
 #include <3ds/types.h>
 
 /// Initializes HB.
-Result hbInit();
+Result hbInit(void);
 
 /// Exits HB.
-void hbExit();
+void hbExit(void);
 
 /// Flushes/invalidates the entire data/instruction cache.
 Result HB_FlushInvalidateCache(void);
diff --git a/libctru/source/services/ac.c b/libctru/source/services/ac.c
index 7c99ad2..a1a36e0 100644
--- a/libctru/source/services/ac.c
+++ b/libctru/source/services/ac.c
@@ -20,9 +20,8 @@ Result acExit(void)
 }
 
 // ptr=0x200-byte outbuf
-Result ACU_CreateDefaultConfig(Handle* servhandle, u32 *ptr)
+Result ACU_CreateDefaultConfig(u32 *ptr)
 {
-	if(!servhandle)servhandle=&acHandle;
 	Result ret=0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 *staticbufs = getThreadStaticBuffers();
@@ -34,7 +33,7 @@ Result ACU_CreateDefaultConfig(Handle* servhandle, u32 *ptr)
 	staticbufs[0] = IPC_Desc_StaticBuffer(0x200,0);
 	staticbufs[1] = (u32)ptr;
 
-	if((ret = svcSendSyncRequest(*servhandle))!=0)return ret;
+	if((ret = svcSendSyncRequest(acHandle))!=0)return ret;
 
 	staticbufs[0] = savedValue0;
 	staticbufs[1] = savedValue1;
@@ -43,9 +42,8 @@ Result ACU_CreateDefaultConfig(Handle* servhandle, u32 *ptr)
 }
 
 // Unknown what this cmd does at the time of writing. (ptr=0x200-byte inbuf/outbuf)
-Result ACU_cmd26(Handle* servhandle, u32 *ptr, u8 val)
+Result ACU_cmd26(u32 *ptr, u8 val)
 {
-	if(!servhandle)servhandle=&acHandle;
 	Result ret=0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 *staticbufs = getThreadStaticBuffers();
@@ -60,7 +58,7 @@ Result ACU_cmd26(Handle* servhandle, u32 *ptr, u8 val)
 	cmdbuf[2] = IPC_Desc_StaticBuffer(0x200,0);
 	cmdbuf[3] = (u32)ptr;
 
-	if((ret = svcSendSyncRequest(*servhandle))!=0)return ret;
+	if((ret = svcSendSyncRequest(acHandle))!=0)return ret;
 
 	staticbufs[0] = savedValue0;
 	staticbufs[1] = savedValue1;
@@ -68,15 +66,14 @@ Result ACU_cmd26(Handle* servhandle, u32 *ptr, u8 val)
 	return (Result)cmdbuf[1];
 }
 
-Result ACU_GetWifiStatus(Handle* servhandle, u32 *out)
+Result ACU_GetWifiStatus(u32 *out)
 {
-	if(!servhandle)servhandle=&acHandle;
 	Result ret=0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 
 	cmdbuf[0] = IPC_MakeHeader(0xD,0,0); // 0x000D0000
 
-	if((ret = svcSendSyncRequest(*servhandle))!=0)return ret;
+	if((ret = svcSendSyncRequest(acHandle))!=0)return ret;
 
 	*out = cmdbuf[2];
 
@@ -85,19 +82,18 @@ Result ACU_GetWifiStatus(Handle* servhandle, u32 *out)
 
 Result ACU_WaitInternetConnection(void)
 {
-	Handle servhandle = 0;
 	Result ret=0;
 	u32 outval=0;
 
-	if((ret = srvGetServiceHandle(&servhandle, "ac:u"))!=0)return ret;
+	if((ret = acInit())!=0)return ret;
 
 	while(1)
 	{
-		ret = ACU_GetWifiStatus(&servhandle, &outval);
+		ret = ACU_GetWifiStatus(&outval);
 		if(ret==0 && outval!=0)break;
 	}
 
-	svcCloseHandle(servhandle);
+	acExit();
 
 	return ret;
 }
diff --git a/libctru/source/services/cfgnor.c b/libctru/source/services/cfgnor.c
index c21c830..7918496 100644
--- a/libctru/source/services/cfgnor.c
+++ b/libctru/source/services/cfgnor.c
@@ -24,7 +24,7 @@ Result CFGNOR_Initialize(u8 value)
 	return ret;
 }
 
-Result CFGNOR_Shutdown()
+Result CFGNOR_Shutdown(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
diff --git a/libctru/source/services/hb.c b/libctru/source/services/hb.c
index 6c1efc2..777b2b3 100644
--- a/libctru/source/services/hb.c
+++ b/libctru/source/services/hb.c
@@ -6,12 +6,12 @@
 
 static Handle hbHandle;
 
-Result hbInit()
+Result hbInit(void)
 {
 	return srvGetServiceHandle(&hbHandle, "hb:HB");
 }
 
-void hbExit()
+void hbExit(void)
 {
 	svcCloseHandle(hbHandle);
 }