diff --git a/libctru/include/3ds/services/cfgu.h b/libctru/include/3ds/services/cfgu.h
index 9dc450c..07caabd 100644
--- a/libctru/include/3ds/services/cfgu.h
+++ b/libctru/include/3ds/services/cfgu.h
@@ -3,6 +3,7 @@
  * @brief CFGU (Configuration) Service
  */
 #pragma once
+#include <3ds/types.h>
 
 /// Configuration region values.
 typedef enum
@@ -96,7 +97,7 @@ Result CFGU_IsNFCSupported(bool* isSupported);
  * @param blkID ID of the block to retrieve.
  * @param outData Pointer to write the block data to.
  */
-Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData);
+Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, void* outData);
 
 /**
  * @brief Gets a config info block with flags = 4.
@@ -104,7 +105,7 @@ Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData);
  * @param blkID ID of the block to retrieve.
  * @param outData Pointer to write the block data to.
  */
-Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, u8* outData);
+Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, void* outData);
 
 /**
  * @brief Gets a config info block with flags = 8.
@@ -112,7 +113,7 @@ Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, u8* outData);
  * @param blkID ID of the block to retrieve.
  * @param outData Pointer to write the block data to.
  */
-Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, u8* outData);
+Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, void* outData);
 
 /**
  * @brief Sets a config info block with flags = 4.
@@ -120,7 +121,7 @@ Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, u8* outData);
  * @param blkID ID of the block to retrieve.
  * @param inData Pointer to block data to write.
  */
-Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, u8* inData);
+Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, const void* inData);
 
 /**
  * @brief Sets a config info block with flags = 8.
@@ -128,7 +129,7 @@ Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, u8* inData);
  * @param blkID ID of the block to retrieve.
  * @param inData Pointer to block data to write.
  */
-Result CFG_SetConfigInfoBlk8(u32 size, u32 blkID, u8* inData);
+Result CFG_SetConfigInfoBlk8(u32 size, u32 blkID, const void* inData);
 
 
 /**
diff --git a/libctru/source/services/cfgu.c b/libctru/source/services/cfgu.c
index 0aebac2..01f14fe 100644
--- a/libctru/source/services/cfgu.c
+++ b/libctru/source/services/cfgu.c
@@ -149,7 +149,7 @@ Result CFGU_IsNFCSupported(bool* isSupported)
 
 // See here for block IDs:
 // http://3dbrew.org/wiki/Config_Savegame#Configuration_blocks
-Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData)
+Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, void* outData)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -165,7 +165,7 @@ Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData)
 	return (Result)cmdbuf[1];
 }
 
-Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, u8* outData)
+Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, void* outData)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -181,7 +181,7 @@ Result CFG_GetConfigInfoBlk4(u32 size, u32 blkID, u8* outData)
 	return (Result)cmdbuf[1];
 }
 
-Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, u8* outData)
+Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, void* outData)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -197,7 +197,7 @@ Result CFG_GetConfigInfoBlk8(u32 size, u32 blkID, u8* outData)
 	return (Result)cmdbuf[1];
 }
 
-Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, u8* inData)
+Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, const void* inData)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -213,7 +213,7 @@ Result CFG_SetConfigInfoBlk4(u32 size, u32 blkID, u8* inData)
 	return (Result)cmdbuf[1];
 }
 
-Result CFG_SetConfigInfoBlk8(u32 size, u32 blkID, u8* inData)
+Result CFG_SetConfigInfoBlk8(u32 size, u32 blkID, const void* inData)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -246,7 +246,7 @@ Result CFGU_GetSystemLanguage(u8* language)
 	return CFGU_GetConfigInfoBlk2(1, 0xA0002, language);
 }
 
-Result CFGI_RestoreLocalFriendCodeSeed(void) 
+Result CFGI_RestoreLocalFriendCodeSeed(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -258,7 +258,7 @@ Result CFGI_RestoreLocalFriendCodeSeed(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_RestoreSecureInfo(void) 
+Result CFGI_RestoreSecureInfo(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -270,7 +270,7 @@ Result CFGI_RestoreSecureInfo(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_DeleteConfigSavefile(void) 
+Result CFGI_DeleteConfigSavefile(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -282,7 +282,7 @@ Result CFGI_DeleteConfigSavefile(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_FormatConfig(void) 
+Result CFGI_FormatConfig(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -294,7 +294,7 @@ Result CFGI_FormatConfig(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_ClearParentalControls(void) 
+Result CFGI_ClearParentalControls(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -306,7 +306,7 @@ Result CFGI_ClearParentalControls(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_VerifySigLocalFriendCodeSeed(void) 
+Result CFGI_VerifySigLocalFriendCodeSeed(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
@@ -318,7 +318,7 @@ Result CFGI_VerifySigLocalFriendCodeSeed(void)
 	return (Result)cmdbuf[1];
 }
 
-Result CFGI_VerifySigSecureInfo(void) 
+Result CFGI_VerifySigSecureInfo(void)
 {
 	Result ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
diff --git a/libctru/source/services/uds.c b/libctru/source/services/uds.c
index 38bc2d9..af3958e 100644
--- a/libctru/source/services/uds.c
+++ b/libctru/source/services/uds.c
@@ -128,7 +128,7 @@ Result udsGenerateNodeInfo(udsNodeInfo *nodeinfo, const char *username)
 	ret = cfguInit();
 	if (R_FAILED(ret))return ret;
 
-	ret = CFGU_GetConfigInfoBlk2(sizeof(nodeinfo->uds_friendcodeseed), 0x00090000, (u8*)&nodeinfo->uds_friendcodeseed);
+	ret = CFGU_GetConfigInfoBlk2(sizeof(nodeinfo->uds_friendcodeseed), 0x00090000, &nodeinfo->uds_friendcodeseed);
 	if (R_FAILED(ret))
 	{
 		cfguExit();