diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index 0026d0a912..5702ec85aa 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -32,10 +32,12 @@ extern Module cellNetCtl;
 extern Module cellOvis;
 extern Module cellPamf;
 extern Module cellPngDec;
+extern Module cellPngEnc;
 extern Module cellResc;
 extern Module cellRtc;
 extern Module cellRudp;
 extern Module cellSail;
+extern Module cellSailRec;
 extern Module cellSaveData;
 extern Module cellMinisSaveData;
 extern Module cellScreenshot;
@@ -51,6 +53,7 @@ extern Module cellSysmodule;
 extern Module cellSysutil;
 extern Module cellSysutilAp;
 extern Module cellUsbd;
+extern Module cellUsbPspcm;
 extern Module cellUserInfo;
 extern Module cellVdec;
 extern Module cellVoice;
@@ -137,7 +140,7 @@ const g_module_list[] =
 	{ 0x0029, "cellAdecAt3", nullptr },
 	{ 0x002a, "cellDmuxPamf", nullptr },
 	{ 0x002e, "sys_lv2dbg", &sys_lv2dbg },
-	{ 0x0030, "cellUsbpspcm", nullptr },
+	{ 0x0030, "cellUsbPspcm", &cellUsbPspcm },
 	{ 0x0031, "cellAvconfExt", &cellAvconfExt },
 	{ 0x0032, "cellUserInfo", &cellUserInfo },
 	{ 0x0033, "cellSaveData", &cellSaveData },
@@ -167,7 +170,7 @@ const g_module_list[] =
 	{ 0x004e, "cellScreenShotUtility", &cellScreenshot },
 	{ 0x004f, "cellMusicDecode", nullptr },
 	{ 0x0050, "cellSpursJq", &cellSpursJq },
-	{ 0x0052, "cellPngEnc", nullptr },
+	{ 0x0052, "cellPngEnc", &cellPngEnc },
 	{ 0x0053, "cellMusicDecode2", nullptr },
 	{ 0x0055, "cellSync2", &cellSync2 },
 	{ 0x0056, "sceNpUtil", &sceNpUtil },
@@ -189,7 +192,7 @@ const g_module_list[] =
 	{ 0xf02e, "cellPhotoDecode", nullptr },
 	{ 0xf02f, "cellSearch", &cellSearch },
 	{ 0xf030, "cellAvchat2", nullptr },
-	{ 0xf034, "cellSailRec", nullptr },
+	{ 0xf034, "cellSailRec", &cellSailRec },
 	{ 0xf035, "sceNpTrophy", &sceNpTrophy },
 	{ 0xf053, "cellAdecAt3multi", nullptr },
 	{ 0xf054, "cellAtracMulti", &cellAtracMulti },
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
index 8c05cb884d..d65ed8a933 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellPngEnc_init();
-Module cellPngEnc(0x0052, cellPngEnc_init);
+extern Module cellPngEnc;
 
 // Error Codes
 enum
@@ -15,61 +15,61 @@ enum
 	CELL_PNGENC_ERROR_FATAL = 0x80611296,
 };
 
-int cellPngEncQueryAttr()
+s32 cellPngEncQueryAttr()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncOpen()
+s32 cellPngEncOpen()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncOpenEx()
+s32 cellPngEncOpenEx()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncClose()
+s32 cellPngEncClose()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncWaitForInput()
+s32 cellPngEncWaitForInput()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncEncodePicture()
+s32 cellPngEncEncodePicture()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncWaitForOutput()
+s32 cellPngEncWaitForOutput()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncGetStreamInfo()
+s32 cellPngEncGetStreamInfo()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-int cellPngEncReset()
+s32 cellPngEncReset()
 {
 	UNIMPLEMENTED_FUNC(cellPngEnc);
 	return CELL_OK;
 }
 
-void cellPngEnc_init()
+Module cellPngEnc("cellPngEnc", []()
 {
 	REG_FUNC(cellPngEnc, cellPngEncQueryAttr);
 	REG_FUNC(cellPngEnc, cellPngEncOpen);
@@ -80,5 +80,4 @@ void cellPngEnc_init()
 	REG_FUNC(cellPngEnc, cellPngEncWaitForOutput);
 	REG_FUNC(cellPngEnc, cellPngEncGetStreamInfo);
 	REG_FUNC(cellPngEnc, cellPngEncReset);
-}
-#endif
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
index 3a23954543..242e57079e 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellSailRec_init();
-Module cellSailRec(0xf034, cellSailRec_init);
+extern Module cellSailRec;
 
 // Error Codes
 enum
@@ -21,223 +21,241 @@ enum
 	CELL_SAIL_ERROR_FATAL              = 0x806107FF,
 };
 
-int cellSailProfileSetEsAudioParameter()
+s32 cellSailProfileSetEsAudioParameter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailProfileSetEsVideoParameter()
+s32 cellSailProfileSetEsVideoParameter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailProfileSetStreamParameter()
+s32 cellSailProfileSetStreamParameter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailVideoConverterCanProcess()
+s32 cellSailVideoConverterCanProcess()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailVideoConverterProcess()
+s32 cellSailVideoConverterProcess()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailVideoConverterCanGetResult()
+s32 cellSailVideoConverterCanGetResult()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailVideoConverterGetResult()
+s32 cellSailVideoConverterGetResult()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioInitialize()
+s32 cellSailFeederAudioInitialize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioFinalize()
+s32 cellSailFeederAudioFinalize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioNotifyCallCompleted()
+s32 cellSailFeederAudioNotifyCallCompleted()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioNotifyFrameOut()
+s32 cellSailFeederAudioNotifyFrameOut()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioNotifySessionEnd()
+s32 cellSailFeederAudioNotifySessionEnd()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederAudioNotifySessionError()
+s32 cellSailFeederAudioNotifySessionError()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoInitialize()
+s32 cellSailFeederVideoInitialize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoFinalize()
+s32 cellSailFeederVideoFinalize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoNotifyCallCompleted()
+s32 cellSailFeederVideoNotifyCallCompleted()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoNotifyFrameOut()
+s32 cellSailFeederVideoNotifyFrameOut()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoNotifySessionEnd()
+s32 cellSailFeederVideoNotifySessionEnd()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailFeederVideoNotifySessionError()
+s32 cellSailFeederVideoNotifySessionError()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderInitialize()
+s32 cellSailRecorderInitialize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderFinalize()
+s32 cellSailRecorderFinalize()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderSetFeederAudio()
+s32 cellSailRecorderSetFeederAudio()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderSetFeederVideo()
+s32 cellSailRecorderSetFeederVideo()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderSetParameter()
+s32 cellSailRecorderSetParameter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderGetParameter()
+s32 cellSailRecorderGetParameter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderBoot()
+s32 cellSailRecorderSubscribeEvent()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderCreateProfile()
+s32 cellSailRecorderUnsubscribeEvent()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderDestroyProfile()
+s32 cellSailRecorderReplaceEventHandler()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderCreateVideoConverter()
+s32 cellSailRecorderBoot()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderDestroyVideoConverter()
+s32 cellSailRecorderCreateProfile()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderOpenStream()
+s32 cellSailRecorderDestroyProfile()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderCloseStream()
+s32 cellSailRecorderCreateVideoConverter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderStart()
+s32 cellSailRecorderDestroyVideoConverter()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderStop()
+s32 cellSailRecorderOpenStream()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderCancel()
+s32 cellSailRecorderCloseStream()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-int cellSailRecorderDumpImage()
+s32 cellSailRecorderStart()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }
 
-void cellSailRec_init()
+s32 cellSailRecorderStop()
+{
+	UNIMPLEMENTED_FUNC(cellSailRec);
+	return CELL_OK;
+}
+
+s32 cellSailRecorderCancel()
+{
+	UNIMPLEMENTED_FUNC(cellSailRec);
+	return CELL_OK;
+}
+
+s32 cellSailRecorderDumpImage()
+{
+	UNIMPLEMENTED_FUNC(cellSailRec);
+	return CELL_OK;
+}
+
+Module cellSailRec("cellSailRec", []()
 {
 	REG_FUNC(cellSailRec, cellSailProfileSetEsAudioParameter);
 	REG_FUNC(cellSailRec, cellSailProfileSetEsVideoParameter);
@@ -247,7 +265,6 @@ void cellSailRec_init()
 	REG_FUNC(cellSailRec, cellSailVideoConverterProcess);
 	REG_FUNC(cellSailRec, cellSailVideoConverterCanGetResult);
 	REG_FUNC(cellSailRec, cellSailVideoConverterGetResult);
-	//cellSailRec.AddFunc(, CellSailVideoConverterFuncProcessDone);
 
 	REG_FUNC(cellSailRec, cellSailFeederAudioInitialize);
 	REG_FUNC(cellSailRec, cellSailFeederAudioFinalize);
@@ -269,9 +286,9 @@ void cellSailRec_init()
 	REG_FUNC(cellSailRec, cellSailRecorderSetFeederVideo);
 	REG_FUNC(cellSailRec, cellSailRecorderSetParameter);
 	REG_FUNC(cellSailRec, cellSailRecorderGetParameter);
-	//cellSailRec.AddFunc(, cellSailRecorderSubscribeEvent);
-	//cellSailRec.AddFunc(, cellSailRecorderUnsubscribeEvent);
-	//cellSailRec.AddFunc(, cellSailRecorderReplaceEventHandler);
+	REG_FUNC(cellSailRec, cellSailRecorderSubscribeEvent);
+	REG_FUNC(cellSailRec, cellSailRecorderUnsubscribeEvent);
+	REG_FUNC(cellSailRec, cellSailRecorderReplaceEventHandler);
 	REG_FUNC(cellSailRec, cellSailRecorderBoot);
 	REG_FUNC(cellSailRec, cellSailRecorderCreateProfile);
 	REG_FUNC(cellSailRec, cellSailRecorderDestroyProfile);
@@ -284,5 +301,4 @@ void cellSailRec_init()
 	REG_FUNC(cellSailRec, cellSailRecorderCancel);
 
 	REG_FUNC(cellSailRec, cellSailRecorderDumpImage);
-}
-#endif
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
index 6a1603a546..c69e0cb85e 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellUsbpspcm_init();
-Module cellUsbpspcm(0x0030, cellUsbpspcm_init);
+extern Module cellUsbPspcm;
 
 // Return Codes
 enum
@@ -21,196 +21,195 @@ enum
 	CELL_USBPSPCM_ERROR_NO_DATA         = 0x8011040C,
 };
 
-int cellUsbPspcmInit()
+s32 cellUsbPspcmInit()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmEnd()
+s32 cellUsbPspcmEnd()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmCalcPoolSize()
+s32 cellUsbPspcmCalcPoolSize()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmRegister()
+s32 cellUsbPspcmRegister()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmUnregister()
+s32 cellUsbPspcmUnregister()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmGetAddr()
+s32 cellUsbPspcmGetAddr()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmBind()
+s32 cellUsbPspcmBind()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmBindAsync()
+s32 cellUsbPspcmBindAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmWaitBindAsync()
+s32 cellUsbPspcmWaitBindAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmPollBindAsync()
+s32 cellUsbPspcmPollBindAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmCancelBind()
+s32 cellUsbPspcmCancelBind()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmClose()
+s32 cellUsbPspcmClose()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmSend()
+s32 cellUsbPspcmSend()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmSendAsync()
+s32 cellUsbPspcmSendAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmWaitSendAsync()
+s32 cellUsbPspcmWaitSendAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmPollSendAsync()
+s32 cellUsbPspcmPollSendAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmRecv()
+s32 cellUsbPspcmRecv()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmRecvAsync()
+s32 cellUsbPspcmRecvAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmWaitRecvAsync()
+s32 cellUsbPspcmWaitRecvAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmPollRecvAsync()
+s32 cellUsbPspcmPollRecvAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmReset()
+s32 cellUsbPspcmReset()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmResetAsync()
+s32 cellUsbPspcmResetAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmWaitResetAsync()
+s32 cellUsbPspcmWaitResetAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmPollResetAsync()
+s32 cellUsbPspcmPollResetAsync()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmWaitData()
+s32 cellUsbPspcmWaitData()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmPollData()
+s32 cellUsbPspcmPollData()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-int cellUsbPspcmCancelWaitData()
+s32 cellUsbPspcmCancelWaitData()
 {
-	UNIMPLEMENTED_FUNC(cellUsbpspcm);
+	UNIMPLEMENTED_FUNC(cellUsbPspcm);
 	return CELL_OK;
 }
 
-void cellUsbpspcm_init()
+Module cellUsbPspcm("cellUsbPspcm", []()
 {
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmInit);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmEnd);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmCalcPoolSize);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmRegister);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmUnregister);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmGetAddr);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmBind);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmBindAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmWaitBindAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmPollBindAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmCancelBind);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmClose);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmSend);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmSendAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmWaitSendAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmPollSendAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmRecv);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmRecvAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmWaitRecvAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmPollRecvAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmReset);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmResetAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmWaitResetAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmPollResetAsync);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmWaitData);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmPollData);
-	REG_FUNC(cellUsbpspcm, cellUsbPspcmCancelWaitData);
-}
-#endif
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmInit);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmEnd);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmCalcPoolSize);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmRegister);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmUnregister);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmGetAddr);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmBind);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmBindAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmWaitBindAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmPollBindAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmCancelBind);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmClose);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmSend);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmSendAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmWaitSendAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmPollSendAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmRecv);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmRecvAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmWaitRecvAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmPollRecvAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmReset);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmResetAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmWaitResetAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmPollResetAsync);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmWaitData);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmPollData);
+	REG_FUNC(cellUsbPspcm, cellUsbPspcmCancelWaitData);
+});
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 2ede4820ff..9f18397481 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -431,18 +431,9 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -887,6 +878,15 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">