diff --git a/src/System.h b/src/System.h
index 27b9409c..37f76053 100644
--- a/src/System.h
+++ b/src/System.h
@@ -1,12 +1,7 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#ifndef __LIBRETRO__
-#include <zlib.h>
-#include "common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "common/Types.h"
 
 #define winlog log
 
diff --git a/src/common/Patch.h b/src/common/Patch.h
index a8b496d9..1e69eb4f 100644
--- a/src/common/Patch.h
+++ b/src/common/Patch.h
@@ -1,11 +1,7 @@
 #ifndef PATCH_H
 #define PATCH_H
 
-#ifndef __LIBRETRO__
-#include "cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "Types.h"
 
 bool applyPatch(const char *patchname, uint8_t **rom, int *size);
 
diff --git a/src/common/Port.h b/src/common/Port.h
index baef9003..6e84f1ef 100644
--- a/src/common/Port.h
+++ b/src/common/Port.h
@@ -1,11 +1,7 @@
 #ifndef PORT_H
 #define PORT_H
 
-#ifndef __LIBRETRO__
-#include "cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "Types.h"
 
 #ifdef __CELLOS_LV2__
 /* PlayStation3 */
diff --git a/src/gb/gbGlobals.cpp b/src/gb/gbGlobals.cpp
index 5610cb80..bf057679 100644
--- a/src/gb/gbGlobals.cpp
+++ b/src/gb/gbGlobals.cpp
@@ -1,5 +1,5 @@
 #include <cstddef>
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 
 uint8_t* gbMemoryMap[16];
 
diff --git a/src/gb/gbGlobals.h b/src/gb/gbGlobals.h
index c4ecff19..9867b99b 100644
--- a/src/gb/gbGlobals.h
+++ b/src/gb/gbGlobals.h
@@ -1,7 +1,7 @@
 #ifndef GBGLOBALS_H
 #define GBGLOBALS_H
 
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 
 extern int gbRomSizeMask;
 extern int gbRomSize;
diff --git a/src/gb/gbMemory.h b/src/gb/gbMemory.h
index 235ee2ae..e6d4a559 100644
--- a/src/gb/gbMemory.h
+++ b/src/gb/gbMemory.h
@@ -1,7 +1,7 @@
 #ifndef GBMEMORY_H
 #define GBMEMORY_H
 
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 #include <time.h>
 
 struct mapperMBC1 {
diff --git a/src/gba/BreakpointStructures.h b/src/gba/BreakpointStructures.h
index 1e857097..3222f65e 100644
--- a/src/gba/BreakpointStructures.h
+++ b/src/gba/BreakpointStructures.h
@@ -1,11 +1,7 @@
 #ifndef VBA_BKS_H
 #define VBA_BKS_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #define readWord(addr) \
     ((map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]) + ((map[(addr + 1) >> 24].address[(addr + 1) & map[(addr + 1) >> 24].mask]) << 8) + ((map[(addr + 2) >> 24].address[(addr + 2) & map[(addr + 2) >> 24].mask]) << 16) + ((map[(addr + 3) >> 24].address[(addr + 3) & map[(addr + 3) >> 24].mask]) << 24))
diff --git a/src/gba/EEprom.h b/src/gba/EEprom.h
index 2bd24226..54abeb2c 100644
--- a/src/gba/EEprom.h
+++ b/src/gba/EEprom.h
@@ -1,13 +1,7 @@
 #ifndef EEPROM_H
 #define EEPROM_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
-
-#include <zlib.h>
+#include "../common/Types.h"
 
 #ifdef __LIBRETRO__
 extern void eepromSaveGame(uint8_t*& data);
diff --git a/src/gba/Flash.h b/src/gba/Flash.h
index 362f8775..f17a827d 100644
--- a/src/gba/Flash.h
+++ b/src/gba/Flash.h
@@ -1,12 +1,7 @@
 #ifndef FLASH_H
 #define FLASH_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#include <zlib.h>
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #define FLASH_128K_SZ 0x20000
 
diff --git a/src/gba/GBA.h b/src/gba/GBA.h
index b4a8348e..61adcdc1 100644
--- a/src/gba/GBA.h
+++ b/src/gba/GBA.h
@@ -1,12 +1,7 @@
 #ifndef GBA_H
 #define GBA_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
-
+#include "../common/Types.h"
 #include "../System.h"
 
 const uint64_t TICKS_PER_SECOND = 16777216;
diff --git a/src/gba/GBASockClient.h b/src/gba/GBASockClient.h
index c6c3713e..1c6c769d 100644
--- a/src/gba/GBASockClient.h
+++ b/src/gba/GBASockClient.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #include <SFML/Network.hpp>
 
diff --git a/src/gba/Sram.h b/src/gba/Sram.h
index 2f549480..50754da5 100644
--- a/src/gba/Sram.h
+++ b/src/gba/Sram.h
@@ -1,11 +1,7 @@
 #ifndef SRAM_H
 #define SRAM_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 uint8_t sramRead(uint32_t address);
 void sramWrite(uint32_t address, uint8_t byte);
diff --git a/src/sdl/filters.h b/src/sdl/filters.h
index 04aed5f2..1b29ca73 100644
--- a/src/sdl/filters.h
+++ b/src/sdl/filters.h
@@ -19,8 +19,7 @@
 #ifndef VBA_SDL_FILTERS_H
 #define VBA_SDL_FILTERS_H
 
-#include "../common/cstdint.h"
-
+#include "../common/Types.h"
 #include "../System.h"
 
 //