diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.h b/rpcs3/Emu/Cell/PPUProgramCompiler.h
index 5070c34516..f7d5a00559 100644
--- a/rpcs3/Emu/Cell/PPUProgramCompiler.h
+++ b/rpcs3/Emu/Cell/PPUProgramCompiler.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "PPUInstrTable.h"
+/*#include "PPUInstrTable.h"
 #include "Loader/ELF64.h"
-/*
+
 enum ArgType
 {
 	ARG_ERR     = 0,
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index cae1afd595..aad29e36da 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -38,11 +38,6 @@ static const std::string& BreakPointsDBName = "BreakPoints.dat";
 static const u16 bpdb_version = 0x1000;
 extern std::atomic<u32> g_thread_count;
 
-ModuleInitializer::ModuleInitializer()
-{
-	Emu.AddModuleInit(std::move(std::unique_ptr<ModuleInitializer>(this)));
-}
-
 Emulator::Emulator()
 	: m_status(Stopped)
 	, m_mode(DisAsm)
@@ -82,11 +77,6 @@ Emulator::~Emulator()
 
 void Emulator::Init()
 {
-	while(m_modules_init.size())
-	{
-		m_modules_init[0]->Init();
-		m_modules_init.erase(m_modules_init.begin());
-	}
 }
 
 void Emulator::SetPath(const std::string& path, const std::string& elf_path)
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index d011428d0a..e6d0a6d9c1 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -61,14 +61,6 @@ public:
 	u32 GetTLSMemsz() const { return tls_memsz; }
 };
 
-class ModuleInitializer
-{
-public:
-	ModuleInitializer();
-
-	virtual void Init() = 0;
-};
-
 class Emulator
 {
 	enum Mode
@@ -83,7 +75,6 @@ class Emulator
 
 	u32 m_rsx_callback;
 	u32 m_cpu_thr_stop;
-	std::vector<std::unique_ptr<ModuleInitializer>> m_modules_init;
 
 	std::vector<u64> m_break_points;
 	std::vector<u64> m_marked_points;
@@ -164,11 +155,6 @@ public:
 	ModuleManager&    GetModuleManager()   { return *m_module_manager; }
 	SyncPrimManager&  GetSyncPrimManager() { return *m_sync_prim_manager; }
 
-	void AddModuleInit(std::unique_ptr<ModuleInitializer> m)
-	{
-		m_modules_init.push_back(std::move(m));
-	}
-
 	void SetTLSData(u32 addr, u32 filesz, u32 memsz)
 	{
 		m_info.SetTLSData(addr, filesz, memsz);
diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp
index 3fc419f2f1..6528daf5de 100644
--- a/rpcs3/Gui/CompilerELF.cpp
+++ b/rpcs3/Gui/CompilerELF.cpp
@@ -1,8 +1,9 @@
 #include "stdafx_gui.h"
 #include "Utilities/rMsgBox.h"
 
-#include "Emu/Cell/PPUProgramCompiler.h"
-using namespace PPU_opcodes;
+//#include "Emu/Cell/PPUProgramCompiler.h"
+//using namespace PPU_opcodes;
+
 #include "CompilerELF.h"
 
 enum CompilerIDs
@@ -392,8 +393,8 @@ void CompilerELF::LoadElf(wxCommandEvent& event)
 	LoadElf(fmt::ToUTF8(ctrl.GetPath()));
 }
 
-#include "Emu/Cell/PPUDisAsm.h"
-#include "Emu/Cell/PPUDecoder.h"
+//#include "Emu/Cell/PPUDisAsm.h"
+//#include "Emu/Cell/PPUDecoder.h"
 
 void CompilerELF::LoadElf(const std::string& path)
 {