diff --git a/src/System.h b/src/System.h
index 03c97ff5..34ae2486 100644
--- a/src/System.h
+++ b/src/System.h
@@ -1,7 +1,11 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
+#ifndef __LIBRETRO__
 #include "common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #ifndef __LIBRETRO__
 #include <zlib.h>
diff --git a/src/common/Patch.h b/src/common/Patch.h
index 83b3ebd6..a8b496d9 100644
--- a/src/common/Patch.h
+++ b/src/common/Patch.h
@@ -1,7 +1,11 @@
 #ifndef PATCH_H
 #define PATCH_H
 
+#ifndef __LIBRETRO__
 #include "cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 bool applyPatch(const char *patchname, uint8_t **rom, int *size);
 
diff --git a/src/common/Port.h b/src/common/Port.h
index 40cab6cd..baef9003 100644
--- a/src/common/Port.h
+++ b/src/common/Port.h
@@ -1,7 +1,11 @@
 #ifndef PORT_H
 #define PORT_H
 
+#ifndef __LIBRETRO__
 #include "cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #ifdef __CELLOS_LV2__
 /* PlayStation3 */
diff --git a/src/gba/BreakpointStructures.h b/src/gba/BreakpointStructures.h
index 6b58279c..1e857097 100644
--- a/src/gba/BreakpointStructures.h
+++ b/src/gba/BreakpointStructures.h
@@ -1,7 +1,11 @@
 #ifndef VBA_BKS_H
 #define VBA_BKS_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #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 48cfa5a8..7139c62b 100644
--- a/src/gba/EEprom.h
+++ b/src/gba/EEprom.h
@@ -1,7 +1,12 @@
 #ifndef EEPROM_H
 #define EEPROM_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
+
 #include <zlib.h>
 
 #ifdef __LIBRETRO__
diff --git a/src/gba/Flash.h b/src/gba/Flash.h
index 5a74bab3..5d051c26 100644
--- a/src/gba/Flash.h
+++ b/src/gba/Flash.h
@@ -1,7 +1,12 @@
 #ifndef FLASH_H
 #define FLASH_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
+
 #include <zlib.h>
 
 #define FLASH_128K_SZ 0x20000
diff --git a/src/gba/GBA.h b/src/gba/GBA.h
index 9b953923..b4a8348e 100644
--- a/src/gba/GBA.h
+++ b/src/gba/GBA.h
@@ -1,7 +1,11 @@
 #ifndef GBA_H
 #define GBA_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #include "../System.h"
 
diff --git a/src/gba/GBASockClient.h b/src/gba/GBASockClient.h
index b4791708..c6c3713e 100644
--- a/src/gba/GBASockClient.h
+++ b/src/gba/GBASockClient.h
@@ -1,6 +1,11 @@
 #pragma once
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
+
 #include <SFML/Network.hpp>
 
 class GBASockClient {
diff --git a/src/gba/Sram.h b/src/gba/Sram.h
index fbbc16a6..2f549480 100644
--- a/src/gba/Sram.h
+++ b/src/gba/Sram.h
@@ -1,7 +1,11 @@
 #ifndef SRAM_H
 #define SRAM_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 uint8_t sramRead(uint32_t address);
 void sramWrite(uint32_t address, uint8_t byte);
diff --git a/src/libretro/SoundRetro.cpp b/src/libretro/SoundRetro.cpp
index 62b79ede..44c60bca 100644
--- a/src/libretro/SoundRetro.cpp
+++ b/src/libretro/SoundRetro.cpp
@@ -15,7 +15,6 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#include "../common/cstdint.h"
 #include "SoundRetro.h"
 #include "libretro.h"
 unsigned g_audio_frames;
diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp
index 0e4219a4..8b137380 100644
--- a/src/libretro/libretro.cpp
+++ b/src/libretro/libretro.cpp
@@ -1,4 +1,3 @@
-#include "../common/cstdint.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>