diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp
index d313bb6193..99f0951655 100644
--- a/Utilities/Config.cpp
+++ b/Utilities/Config.cpp
@@ -261,6 +261,22 @@ void cfg::node::from_default()
 	}
 }
 
+void cfg::bool_entry::from_default()
+{
+	value = def;
+}
+
+void cfg::string_entry::from_default()
+{
+	*this = def;
+}
+
+void cfg::set_entry::from_default()
+{
+	std::lock_guard<std::mutex> lock(m_mutex);
+	m_set = {};
+}
+
 cfg::root_node& cfg::get_root()
 {
 	// Magic static
diff --git a/Utilities/Config.h b/Utilities/Config.h
index 77b71d33db..8119963e71 100644
--- a/Utilities/Config.h
+++ b/Utilities/Config.h
@@ -141,10 +141,7 @@ namespace cfg
 			return *this;
 		}
 
-		void from_default() override
-		{
-			value = def;
-		}
+		void from_default() override;
 
 		std::string to_string() const override
 		{
@@ -428,10 +425,7 @@ namespace cfg
 			return m_value.size();
 		}
 
-		void from_default() override
-		{
-			*this = def;
-		}
+		void from_default() override;
 
 		std::string to_string() const override
 		{
@@ -473,11 +467,7 @@ namespace cfg
 			m_set = std::move(set);
 		}
 
-		void from_default() override
-		{
-			std::lock_guard<std::mutex> lock(m_mutex);
-			m_set = {};
-		}
+		void from_default() override;
 
 		std::vector<std::string> to_list() const override
 		{
diff --git a/Utilities/File.cpp b/Utilities/File.cpp
index f89f570cf6..eb1a2ba0d0 100644
--- a/Utilities/File.cpp
+++ b/Utilities/File.cpp
@@ -136,6 +136,18 @@ namespace fs
 		static device_manager instance;
 		return instance;
 	}
+
+	file_base::~file_base()
+	{
+	}
+
+	dir_base::~dir_base()
+	{
+	}
+
+	device_base::~device_base()
+	{
+	}
 }
 
 std::shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path)
diff --git a/Utilities/File.h b/Utilities/File.h
index 0146e8f422..a4d18108eb 100644
--- a/Utilities/File.h
+++ b/Utilities/File.h
@@ -57,7 +57,7 @@ namespace fs
 	// File handle base
 	struct file_base
 	{
-		virtual ~file_base() = default;
+		virtual ~file_base();
 
 		virtual stat_t stat() = 0;
 		virtual bool trunc(u64 length) = 0;
@@ -76,7 +76,7 @@ namespace fs
 	// Directory handle base
 	struct dir_base
 	{
-		virtual ~dir_base() = default;
+		virtual ~dir_base();
 
 		virtual bool read(dir_entry&) = 0;
 		virtual void rewind() = 0;
@@ -85,7 +85,7 @@ namespace fs
 	// Virtual device
 	struct device_base
 	{
-		virtual ~device_base() = default;
+		virtual ~device_base();
 
 		virtual bool stat(const std::string& path, stat_t& info) = 0;
 		virtual bool remove_dir(const std::string& path) = 0;
diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp
index 2140aff035..837a073a9a 100644
--- a/Utilities/Log.cpp
+++ b/Utilities/Log.cpp
@@ -76,6 +76,10 @@ namespace logs
 	channel ARMv7("ARMv7");
 }
 
+logs::listener::~listener()
+{
+}
+
 void logs::listener::add(logs::listener* _new)
 {
 	// Get first (main) listener
diff --git a/Utilities/Log.h b/Utilities/Log.h
index ad4ae67328..d9a3129bca 100644
--- a/Utilities/Log.h
+++ b/Utilities/Log.h
@@ -40,7 +40,7 @@ namespace logs
 	public:
 		constexpr listener() = default;
 
-		virtual ~listener() = default;
+		virtual ~listener();
 
 		// Process log message
 		virtual void log(const message& msg, const std::string& prefix, const std::string& text) = 0;
diff --git a/Utilities/variant.hpp b/Utilities/variant.hpp
index b712445bb7..eb52484ea4 100644
--- a/Utilities/variant.hpp
+++ b/Utilities/variant.hpp
@@ -73,16 +73,6 @@ namespace std {
 
 		}; // class bad_variant_access
 
-		template <typename R = void>
-		struct MAPBOX_VARIANT_DEPRECATED static_visitor
-		{
-			using result_type = R;
-
-		protected:
-			static_visitor() {}
-			~static_visitor() {}
-		};
-
 		namespace detail {
 
 			static constexpr std::size_t invalid_value = std::size_t(-1);
diff --git a/rpcs3/Crypto/aes.h b/rpcs3/Crypto/aes.h
index 6d85edc369..2b5d0f0f71 100644
--- a/rpcs3/Crypto/aes.h
+++ b/rpcs3/Crypto/aes.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#define POLARSSL_AES_ROM_TABLES
 /**
  * \file aes.h
  *
diff --git a/rpcs3/Emu/Audio/AudioDumper.cpp b/rpcs3/Emu/Audio/AudioDumper.cpp
index 6bb7283286..8c9e838053 100644
--- a/rpcs3/Emu/Audio/AudioDumper.cpp
+++ b/rpcs3/Emu/Audio/AudioDumper.cpp
@@ -1,5 +1,10 @@
 #include "stdafx.h"
 #include "AudioDumper.h"
+#include "AudioThread.h"
+
+AudioThread::~AudioThread()
+{
+}
 
 AudioDumper::AudioDumper(u16 ch)
 	: m_header(ch)
diff --git a/rpcs3/Emu/Audio/AudioThread.h b/rpcs3/Emu/Audio/AudioThread.h
index fc01b25d7c..ea061b3a66 100644
--- a/rpcs3/Emu/Audio/AudioThread.h
+++ b/rpcs3/Emu/Audio/AudioThread.h
@@ -3,7 +3,7 @@
 class AudioThread
 {
 public:
-	virtual ~AudioThread() = default;
+	virtual ~AudioThread();
 
 	virtual void Play() = 0;
 	virtual void Open(const void* src, int size) = 0;
diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
index ebb8c2f2a4..a5376dd060 100644
--- a/rpcs3/Emu/CPU/CPUThread.cpp
+++ b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -149,7 +149,7 @@ void cpu_thread::run()
 void cpu_thread::set_signal()
 {
 	verify("cpu_flag::signal" HERE), !state.test_and_set(cpu_flag::signal);
-	notify(); // TODO: lock_notify?
+	notify();
 }
 
 std::string cpu_thread::dump() const
diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h
index 8d03c03cdf..f89953d859 100644
--- a/rpcs3/Emu/Cell/MFC.h
+++ b/rpcs3/Emu/Cell/MFC.h
@@ -64,6 +64,22 @@ enum : u32
 	MFC_SPU_MAX_QUEUE_SPACE                 = 0x10,
 };
 
+enum : u32
+{
+	MFC_DMA_TAG_STATUS_UPDATE_EVENT    = 0x00000001,
+	MFC_DMA_TAG_CMD_STALL_NOTIFY_EVENT = 0x00000002,
+	MFC_DMA_QUEUE_VACANCY_EVENT        = 0x00000008,
+	MFC_SPU_MAILBOX_WRITTEN_EVENT      = 0x00000010,
+	MFC_DECREMENTER_EVENT              = 0x00000020,
+	MFC_PU_INT_MAILBOX_AVAIL_EVENT     = 0x00000040,
+	MFC_PU_MAILBOX_AVAIL_EVENT         = 0x00000080,
+	MFC_SIGNAL_2_EVENT                 = 0x00000100,
+	MFC_SIGNAL_1_EVENT                 = 0x00000200,
+	MFC_LLR_LOST_EVENT                 = 0x00000400,
+	MFC_PRIV_ATTN_EVENT                = 0x00000800,
+	MFG_MULTISOURCE_SYNC_EVENT         = 0x00001000,
+};
+
 struct spu_mfc_arg_t
 {
 	union
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
index 99f78b0e10..ce72623de3 100644
--- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
@@ -10,6 +10,10 @@
 
 extern logs::channel cellSysutil;
 
+MsgDialogBase::~MsgDialogBase()
+{
+}
+
 s32 cellMsgDialogOpen()
 {
 	fmt::throw_exception("Unimplemented" HERE);
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
index 81d3f3e363..76b2a4666c 100644
--- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
+++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
@@ -80,7 +80,7 @@ public:
 
 	std::function<void(s32 status)> on_close;
 
-	virtual ~MsgDialogBase() = default;
+	virtual ~MsgDialogBase();
 	virtual void Create(const std::string& msg) = 0;
 	virtual void CreateOsk(const std::string& msg, char16_t* osk_text) = 0;
 	virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) = 0;
diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp
index 173f94c573..f302cd748e 100644
--- a/rpcs3/Emu/Cell/SPURecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPURecompiler.cpp
@@ -8,6 +8,10 @@
 
 extern u64 get_system_time();
 
+spu_recompiler_base::~spu_recompiler_base()
+{
+}
+
 void spu_recompiler_base::enter(SPUThread& spu)
 {
 	if (spu.pc >= 0x40000 || spu.pc % 4)
diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h
index 355bde4bd5..3b400c1e73 100644
--- a/rpcs3/Emu/Cell/SPURecompiler.h
+++ b/rpcs3/Emu/Cell/SPURecompiler.h
@@ -15,7 +15,7 @@ protected:
 	u32 m_pos; // current position
 
 public:
-	virtual ~spu_recompiler_base() = default;
+	virtual ~spu_recompiler_base();
 
 	// Compile specified function
 	virtual void compile(spu_function_t& f) = 0;