diff --git a/src/ARMJIT_RegisterCache.h b/src/ARMJIT_RegisterCache.h
index 603147ed..e0c4a157 100644
--- a/src/ARMJIT_RegisterCache.h
+++ b/src/ARMJIT_RegisterCache.h
@@ -20,6 +20,7 @@
 #define ARMJIT_REGCACHE_H
 
 #include "ARMJIT.h"
+#include "ARMJIT_Internal.h"
 
 // TODO: replace this in the future
 #include "dolphin/BitSet.h"
@@ -41,7 +42,7 @@ public:
     {
         for (int i = 0; i < 16; i++)
             Mapping[i] = (Reg)-1;
-        
+
         PCAllocatableAsSrc = ~(pcAllocatableAsSrc
             ? 0
             : (1 << 15));
diff --git a/src/DMA.h b/src/DMA.h
index c3d42def..ad194c11 100644
--- a/src/DMA.h
+++ b/src/DMA.h
@@ -20,6 +20,7 @@
 #define DMA_H
 
 #include "types.h"
+#include "Savestate.h"
 
 class DMA
 {
diff --git a/src/DMA_Timings.h b/src/DMA_Timings.h
index f25d196d..4281c783 100644
--- a/src/DMA_Timings.h
+++ b/src/DMA_Timings.h
@@ -19,6 +19,8 @@
 #ifndef DMA_TIMINGS_H
 #define DMA_TIMINGS_H
 
+#include "types.h"
+
 namespace DMATiming
 {
 
diff --git a/src/DSi_AES.h b/src/DSi_AES.h
index 48fca88e..d8ef98a4 100644
--- a/src/DSi_AES.h
+++ b/src/DSi_AES.h
@@ -20,6 +20,7 @@
 #define DSI_AES_H
 
 #include "types.h"
+#include "Savestate.h"
 
 namespace DSi_AES
 {
diff --git a/src/DSi_Camera.h b/src/DSi_Camera.h
index 62d33f05..e5926bb0 100644
--- a/src/DSi_Camera.h
+++ b/src/DSi_Camera.h
@@ -20,6 +20,7 @@
 #define DSI_CAMERA_H
 
 #include "types.h"
+#include "Savestate.h"
 
 class DSi_Camera
 {
diff --git a/src/DSi_DSP.h b/src/DSi_DSP.h
index ade88bac..ccf11611 100644
--- a/src/DSi_DSP.h
+++ b/src/DSi_DSP.h
@@ -19,6 +19,9 @@
 #ifndef DSI_DSP_H
 #define DSI_DSP_H
 
+#include "types.h"
+#include "Savestate.h"
+
 // TODO: for actual sound output
 // * audio callbacks
 // * SNDEXCNT
diff --git a/src/DSi_I2C.h b/src/DSi_I2C.h
index 7350fb5a..48c8e884 100644
--- a/src/DSi_I2C.h
+++ b/src/DSi_I2C.h
@@ -20,6 +20,7 @@
 #define DSI_I2C_H
 
 #include "types.h"
+#include "Savestate.h"
 
 namespace DSi_BPTWL
 {
diff --git a/src/DSi_NDMA.h b/src/DSi_NDMA.h
index 563c33f9..b1ea4c96 100644
--- a/src/DSi_NDMA.h
+++ b/src/DSi_NDMA.h
@@ -20,6 +20,7 @@
 #define DSI_NDMA_H
 
 #include "types.h"
+#include "Savestate.h"
 
 class DSi_NDMA
 {
diff --git a/src/DSi_NWifi.h b/src/DSi_NWifi.h
index 14c790a2..ffd56476 100644
--- a/src/DSi_NWifi.h
+++ b/src/DSi_NWifi.h
@@ -21,6 +21,7 @@
 
 #include "DSi_SD.h"
 #include "FIFO.h"
+#include "Savestate.h"
 
 class DSi_NWifi : public DSi_SDDevice
 {
diff --git a/src/DSi_SD.h b/src/DSi_SD.h
index 1d966068..5f6dbcd3 100644
--- a/src/DSi_SD.h
+++ b/src/DSi_SD.h
@@ -19,10 +19,10 @@
 #ifndef DSI_SD_H
 #define DSI_SD_H
 
-#include <string.h>
+#include <cstring>
 #include "FIFO.h"
 #include "FATStorage.h"
-
+#include "Savestate.h"
 
 class DSi_SDDevice;
 
diff --git a/src/DSi_SPI_TSC.h b/src/DSi_SPI_TSC.h
index 4d25c1ca..7a3acf43 100644
--- a/src/DSi_SPI_TSC.h
+++ b/src/DSi_SPI_TSC.h
@@ -19,6 +19,9 @@
 #ifndef DSI_SPI_TSC
 #define DSI_SPI_TSC
 
+#include "types.h"
+#include "Savestate.h"
+
 namespace DSi_SPI_TSC
 {
 
diff --git a/src/FIFO.h b/src/FIFO.h
index 68ab126e..80d9b8a0 100644
--- a/src/FIFO.h
+++ b/src/FIFO.h
@@ -20,6 +20,7 @@
 #define FIFO_H
 
 #include "types.h"
+#include "Savestate.h"
 
 template<typename T, u32 NumEntries>
 class FIFO
diff --git a/src/NDSCart.h b/src/NDSCart.h
index bbeb2ff9..10286ac3 100644
--- a/src/NDSCart.h
+++ b/src/NDSCart.h
@@ -22,6 +22,7 @@
 #include <string>
 
 #include "types.h"
+#include "Savestate.h"
 #include "NDS_Header.h"
 #include "FATStorage.h"
 
diff --git a/src/ROMList.h b/src/ROMList.h
index 8ed666b7..ab231129 100644
--- a/src/ROMList.h
+++ b/src/ROMList.h
@@ -19,6 +19,8 @@
 #ifndef ROMLIST_H
 #define ROMLIST_H
 
+#include "types.h"
+
 struct ROMListEntry
 {
 	u32 GameCode;
diff --git a/src/WifiAP.h b/src/WifiAP.h
index 187f16bd..e88132da 100644
--- a/src/WifiAP.h
+++ b/src/WifiAP.h
@@ -19,6 +19,8 @@
 #ifndef WIFIAP_H
 #define WIFIAP_H
 
+#include "types.h"
+
 namespace WifiAP
 {
 
diff --git a/src/melonDLDI.h b/src/melonDLDI.h
index 351bc158..261f798b 100644
--- a/src/melonDLDI.h
+++ b/src/melonDLDI.h
@@ -19,6 +19,8 @@
 #ifndef MELONDLDI_H
 #define MELONDLDI_H
 
+#include "types.h"
+
 const u8 melonDLDI[] =
 {
 	0xED, 0xA5, 0x8D, 0xBF, 0x20, 0x43, 0x68, 0x69, 0x73, 0x68, 0x6D, 0x00, 0x01, 0x09, 0x00, 0x00,