diff --git a/pcsx2/DEV9/ATA/ATA.h b/pcsx2/DEV9/ATA/ATA.h
index 6a81cee8da..3fe4ab5093 100644
--- a/pcsx2/DEV9/ATA/ATA.h
+++ b/pcsx2/DEV9/ATA/ATA.h
@@ -23,9 +23,6 @@
 #include "ghc/filesystem.h"
 #include <fstream>
 
-#include "PS2Edefs.h"
-#include "PS2Eext.h"
-
 #include "../SimpleQueue.h"
 
 class ATA
diff --git a/pcsx2/DEV9/DEV9.h b/pcsx2/DEV9/DEV9.h
index 1813c34b80..d108687418 100644
--- a/pcsx2/DEV9/DEV9.h
+++ b/pcsx2/DEV9/DEV9.h
@@ -25,8 +25,6 @@
 //#define WINVER 0x0600
 //#define _WIN32_WINNT 0x0500
 
-#include "PS2Edefs.h"
-#include "PS2Eext.h"
 #include "net.h"
 #include "PacketReader/IP/IP_Address.h"
 #include "ATA/ATA.h"
diff --git a/pcsx2/IopDma.h b/pcsx2/IopDma.h
index bbb9004c66..49e3b4e885 100644
--- a/pcsx2/IopDma.h
+++ b/pcsx2/IopDma.h
@@ -15,10 +15,6 @@
 
 #pragma once 
 
-#include "PS2Edefs.h"
-
-// defined in PS2Edefs.h
-
 extern void psxDma2(u32 madr, u32 bcr, u32 chcr);
 extern void psxDma3(u32 madr, u32 bcr, u32 chcr);
 extern void psxDma6(u32 madr, u32 bcr, u32 chcr);
diff --git a/pcsx2/PAD/Linux/controller.h b/pcsx2/PAD/Linux/controller.h
index 2b7bb5b16b..7b2e6a2cd1 100644
--- a/pcsx2/PAD/Linux/controller.h
+++ b/pcsx2/PAD/Linux/controller.h
@@ -15,7 +15,6 @@
 
 #pragma once
 #include <string.h> // for memset
-#include "PS2Edefs.h"
 #define MAX_KEYS 24
 
 extern void set_keyboard_key(int pad, int keysym, int index);
diff --git a/pcsx2/PAD/Windows/Global.h b/pcsx2/PAD/Windows/Global.h
index fcc2a55937..da5925951e 100644
--- a/pcsx2/PAD/Windows/Global.h
+++ b/pcsx2/PAD/Windows/Global.h
@@ -128,7 +128,5 @@ extern Window GSwin;
 #include <Dbt.h>
 #endif
 
-#include "PS2Edefs.h"
-
 // Needed for config screen
-void GetNameAndVersionString(wchar_t* out);
\ No newline at end of file
+void GetNameAndVersionString(wchar_t* out);
diff --git a/pcsx2/PAD/Windows/PAD.h b/pcsx2/PAD/Windows/PAD.h
index 76028ba61f..3c948f8cc8 100644
--- a/pcsx2/PAD/Windows/PAD.h
+++ b/pcsx2/PAD/Windows/PAD.h
@@ -24,7 +24,6 @@
 #include "Utilities/Console.h"
 #include <stdio.h>
 #include <assert.h>
-#include "PS2Edefs.h"
 
 #include <array>
 #include <vector>
@@ -57,4 +56,4 @@ s32 PADfreeze(int mode, freezeData* data);
 s32 PADsetSlot(u8 port, u8 slot);
 void PADsetSettingsDir(const char* dir);
 void PADDoFreezeOut(void* dest);
-void PADDoFreezeIn(pxInputStream& infp);
\ No newline at end of file
+void PADDoFreezeIn(pxInputStream& infp);
diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h
index 96f011f876..73b76d912b 100644
--- a/pcsx2/SaveState.h
+++ b/pcsx2/SaveState.h
@@ -15,7 +15,6 @@
 
 #pragma once
 
-#include "PS2Edefs.h"
 #include "System.h"
 
 // Savestate Versioning!
@@ -26,6 +25,18 @@
 
 static const u32 g_SaveVersion = (0x9A1F << 16) | 0x0000;
 
+// the freezing data between submodules and core
+// an interesting thing to note is that this dates back from before plugin
+// merges and was used to pass data between plugins and cores, although the
+// struct was system dependant as the size of int differs between systems, thus
+// subsystems making use of freezeData, like GSDump and save states aren't
+// necessarily portable; we might want to investigate this in the future -- govanify
+typedef struct
+{
+    int size;
+    s8 *data;
+} freezeData;
+
 // this function is meant to be used in the place of GSfreeze, and provides a safe layer
 // between the GS saving function and the MTGS's needs. :)
 extern s32 CALLBACK gsSafeFreeze( int mode, freezeData *data );
diff --git a/pcsx2/System.h b/pcsx2/System.h
index 04abe97349..cff7714f1f 100644
--- a/pcsx2/System.h
+++ b/pcsx2/System.h
@@ -19,7 +19,6 @@
 
 #include "Utilities/SafeArray.h"
 #include "Utilities/Threading.h"		// to use threading stuff, include the Threading namespace in your file.
-#include "Plugins.h"
 
 #include "vtlb.h"
 
diff --git a/pcsx2/gui/Saveslots.h b/pcsx2/gui/Saveslots.h
index 24444ad421..0ebcf2a6ea 100644
--- a/pcsx2/gui/Saveslots.h
+++ b/pcsx2/gui/Saveslots.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "PS2Edefs.h"
 #include "System.h"
 #include "Elfheader.h"
 #include "App.h"
@@ -134,4 +133,4 @@ extern void States_CycleSlotForward();
 extern void States_CycleSlotBackward();
 extern void States_SetCurrentSlot(int slot_num);
 extern int States_GetCurrentSlot();
-extern void States_updateLoadBackupMenuItem();
\ No newline at end of file
+extern void States_updateLoadBackupMenuItem();