diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index 61d31fca42..1639eceeed 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "ModuleManager.h"
 
-extern Module sys_fs;
 extern Module cellAdec;
 extern Module cellAtrac;
 extern Module cellAudio;
@@ -16,18 +15,16 @@ extern Module cellGcmSys;
 extern Module cellGem;
 extern Module cellGifDec;
 extern Module cellJpgDec;
-extern Module sys_io;
 extern Module cellL10n;
 extern Module cellMic;
-extern Module sys_io;
 extern Module cellSysutil;
 extern Module cellNetCtl;
 extern Module cellOvis;
-extern Module sys_io;
 extern Module cellPamf;
 extern Module cellPngDec;
 extern Module cellResc;
 extern Module cellRtc;
+extern Module cellRudp;
 extern Module cellSail;
 extern Module cellScreenshot;
 extern Module cellSearch;
@@ -43,6 +40,7 @@ extern Module cellSysutilAp;
 extern Module cellUsbd;
 extern Module cellUserInfo;
 extern Module cellVdec;
+extern Module cellVoice;
 extern Module cellVpost;
 extern Module libmixer;
 extern Module sceNp;
@@ -51,6 +49,7 @@ extern Module sceNpCommerce2;
 extern Module sceNpSns;
 extern Module sceNpTrophy;
 extern Module sceNpTus;
+extern Module sys_fs;
 extern Module sys_io;
 extern Module sys_net;
 extern Module sysPrxForUser;
@@ -129,7 +128,7 @@ static const g_module_list[] =
 	{ 0x0043, "cellFiber", &cellFiber },
 	{ 0x0044, "sceNpCommerce2", &sceNpCommerce2 },
 	{ 0x0045, "sceNpTus", &sceNpTus },
-	{ 0x0046, "cellVoice", nullptr },
+	{ 0x0046, "cellVoice", &cellVoice },
 	{ 0x0047, "cellAdecCelp8", nullptr },
 	{ 0x0048, "cellCelp8Enc", nullptr },
 	{ 0x0049, "cellLicenseArea", nullptr },
diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
index 1a3051f881..9b825d1391 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp
@@ -1,8 +1,9 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/System.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellRudp_init();
-Module cellRudp(0x0057, cellRudp_init);
+extern Module cellRudp;
 
 // Return Codes
 enum
@@ -48,175 +49,175 @@ enum
 	CELL_RUDP_ERROR_KEEP_ALIVE_FAILURE           = 0x80770026,
 };
 
-int cellRudpInit()
+s32 cellRudpInit()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpEnd()
+s32 cellRudpEnd()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpEnableInternalIOThread()
+s32 cellRudpEnableInternalIOThread()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpSetEventHandler()
+s32 cellRudpSetEventHandler()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpSetMaxSegmentSize()
+s32 cellRudpSetMaxSegmentSize()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetMaxSegmentSize()
+s32 cellRudpGetMaxSegmentSize()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpCreateContext()
+s32 cellRudpCreateContext()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpSetOption()
+s32 cellRudpSetOption()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetOption()
+s32 cellRudpGetOption()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetContextStatus()
+s32 cellRudpGetContextStatus()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetStatus()
+s32 cellRudpGetStatus()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetLocalInfo()
+s32 cellRudpGetLocalInfo()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetRemoteInfo()
+s32 cellRudpGetRemoteInfo()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpBind()
+s32 cellRudpBind()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpInitiate()
+s32 cellRudpInitiate()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpActivate()
+s32 cellRudpActivate()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpTerminate()
+s32 cellRudpTerminate()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpRead()
+s32 cellRudpRead()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpWrite()
+s32 cellRudpWrite()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetSizeReadable()
+s32 cellRudpGetSizeReadable()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpGetSizeWritable()
+s32 cellRudpGetSizeWritable()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpFlush()
+s32 cellRudpFlush()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpPollCreate()
+s32 cellRudpPollCreate()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpPollDestroy()
+s32 cellRudpPollDestroy()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpPollControl()
+s32 cellRudpPollControl()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpPollWait()
+s32 cellRudpPollWait()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpNetReceived()
+s32 cellRudpNetReceived()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-int cellRudpProcessEvents()
+s32 cellRudpProcessEvents()
 {
 	UNIMPLEMENTED_FUNC(cellRudp);
 	return CELL_OK;
 }
 
-void cellRudp_init()
+Module cellRudp("cellRudp", []()
 {
 	REG_FUNC(cellRudp, cellRudpInit);
 	REG_FUNC(cellRudp, cellRudpEnd);
@@ -249,9 +250,8 @@ void cellRudp_init()
 	REG_FUNC(cellRudp, cellRudpPollDestroy);
 	REG_FUNC(cellRudp, cellRudpPollControl);
 	REG_FUNC(cellRudp, cellRudpPollWait);
-	//cellRudp.AddFunc(, cellRudpPollCancel);
+	//REG_FUNC(cellRudp, cellRudpPollCancel);
 
 	REG_FUNC(cellRudp, cellRudpNetReceived);
 	REG_FUNC(cellRudp, cellRudpProcessEvents);
-}
-#endif
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
index 146b6ae9ce..f62c866416 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp
@@ -35,4 +35,4 @@ Module cellScreenshot("cellScreenshot", []()
 	REG_FUNC(cellScreenshot, cellScreenShotSetOverlayImage);
 	REG_FUNC(cellScreenshot, cellScreenShotEnable);
 	REG_FUNC(cellScreenshot, cellScreenShotDisable);
-}
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
index f5426e1023..e9978c0979 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp
@@ -173,4 +173,4 @@ Module cellSearch("cellSearch", []()
 	REG_FUNC(cellSearch, cellSearchGetContentInfoDeveloperData);
 	REG_FUNC(cellSearch, cellSearchCancel);
 	REG_FUNC(cellSearch, cellSearchEnd);
-}
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
index ad7481c5ec..0e81263b83 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp
@@ -184,4 +184,4 @@ Module cellUsbd("cellUsbd", []()
 
 	REG_FUNC(cellUsbd, cellUsbdAllocateMemory);
 	REG_FUNC(cellUsbd, cellUsbdFreeMemory);
-}
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
index 6268fc3357..e9ed1f9da1 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp
@@ -1,8 +1,9 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/System.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellVoice_init();
-Module cellVoice(0x0046, cellVoice_init);
+extern Module cellVoice;
 
 // Error Codes
 enum
@@ -27,211 +28,211 @@ enum
 	CELL_VOICE_ERROR_TOPOLOGY              = 0x80310807,
 };
 
-int cellVoiceConnectIPortToOPort()
+s32 cellVoiceConnectIPortToOPort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceCreateNotifyEventQueue()
+s32 cellVoiceCreateNotifyEventQueue()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceCreatePort()
+s32 cellVoiceCreatePort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceDeletePort()
+s32 cellVoiceDeletePort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceDisconnectIPortFromOPort()
+s32 cellVoiceDisconnectIPortFromOPort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceEnd()
+s32 cellVoiceEnd()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetBitRate()
+s32 cellVoiceGetBitRate()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetMuteFlag()
+s32 cellVoiceGetMuteFlag()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetPortAttr()
+s32 cellVoiceGetPortAttr()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetPortInfo()
+s32 cellVoiceGetPortInfo()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetSignalState()
+s32 cellVoiceGetSignalState()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceGetVolume()
+s32 cellVoiceGetVolume()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceInit()
+s32 cellVoiceInit()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceInitEx()
+s32 cellVoiceInitEx()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoicePausePort()
+s32 cellVoicePausePort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoicePausePortAll()
+s32 cellVoicePausePortAll()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceRemoveNotifyEventQueue()
+s32 cellVoiceRemoveNotifyEventQueue()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceResetPort()
+s32 cellVoiceResetPort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceResumePort()
+s32 cellVoiceResumePort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceResumePortAll()
+s32 cellVoiceResumePortAll()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetBitRate()
+s32 cellVoiceSetBitRate()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetMuteFlag()
+s32 cellVoiceSetMuteFlag()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetMuteFlagAll()
+s32 cellVoiceSetMuteFlagAll()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetNotifyEventQueue()
+s32 cellVoiceSetNotifyEventQueue()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetPortAttr()
+s32 cellVoiceSetPortAttr()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceSetVolume()
+s32 cellVoiceSetVolume()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceStart()
+s32 cellVoiceStart()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceStartEx()
+s32 cellVoiceStartEx()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceStop()
+s32 cellVoiceStop()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceUpdatePort()
+s32 cellVoiceUpdatePort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceWriteToIPort()
+s32 cellVoiceWriteToIPort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceWriteToIPortEx()
+s32 cellVoiceWriteToIPortEx()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceReadFromOPort()
+s32 cellVoiceReadFromOPort()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-int cellVoiceDebugTopology()
+s32 cellVoiceDebugTopology()
 {
 	UNIMPLEMENTED_FUNC(cellVoice);
 	return CELL_OK;
 }
 
-void cellVoice_init()
+Module cellVoice("cellVoice", []()
 {
 	REG_FUNC(cellVoice, cellVoiceConnectIPortToOPort);
 	REG_FUNC(cellVoice, cellVoiceCreateNotifyEventQueue);
@@ -267,5 +268,4 @@ void cellVoice_init()
 	REG_FUNC(cellVoice, cellVoiceWriteToIPortEx);
 	REG_FUNC(cellVoice, cellVoiceReadFromOPort);
 	REG_FUNC(cellVoice, cellVoiceDebugTopology);
-}
-#endif
+});
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index acb7bbc576..d1ce9a1874 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -167,6 +167,9 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
@@ -206,6 +209,9 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellSaveData.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
@@ -248,6 +254,9 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
@@ -413,9 +422,6 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -452,9 +458,6 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -467,9 +470,6 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>