diff --git a/emscripten/RWebAudio.h b/emscripten/RWebAudio.h
index 25ae53c6e2..c8492fda99 100644
--- a/emscripten/RWebAudio.h
+++ b/emscripten/RWebAudio.h
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdbool.h>
+#include "../boolean.h"
 
 unsigned RWebAudioSampleRate(void);
 void *RWebAudioInit(unsigned latency);
diff --git a/emscripten/RWebCam.h b/emscripten/RWebCam.h
index 23b0e50317..b64a3cbc60 100644
--- a/emscripten/RWebCam.h
+++ b/emscripten/RWebCam.h
@@ -14,7 +14,7 @@
  */
 
 #include <stdint.h>
-#include <stdbool.h>
+#include "../boolean.h"
 #include "../driver.h"
 
 void *RWebCamInit(uint64_t caps, unsigned width, unsigned height);
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 994d78c8e4..ac39ee2d47 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -33,9 +33,9 @@
 #define MENU_TEXTURE_FULLSCREEN true
 #endif
 
-#ifndef __cplusplus
-#include <stdbool.h>
-#else
+#include "../../boolean.h"
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index de39a2b447..0386d11251 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -15,7 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
+#include "../../boolean.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../libretro_private.h"
diff --git a/gfx/rpng/rpng.h b/gfx/rpng/rpng.h
index eeb4f725d4..6f1818e6cc 100644
--- a/gfx/rpng/rpng.h
+++ b/gfx/rpng/rpng.h
@@ -18,9 +18,7 @@
 
 #include <stdint.h>
 
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
+#include "../../boolean.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
diff --git a/gx/gx_audio.c b/gx/gx_audio.c
index cbd9517f28..9122cad3a3 100644
--- a/gx/gx_audio.c
+++ b/gx/gx_audio.c
@@ -16,7 +16,7 @@
 
 #include "../driver.h"
 #include <stdlib.h>
-#include <stdbool.h>
+#include "../boolean.h"
 #include "../general.h"
 #include <malloc.h>
 #include <string.h>
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index fe2bdd2f09..3222433645 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -21,7 +21,7 @@
 #include <sdk_version.h>
 #endif
 
-#include <stdbool.h>
+#include "../boolean.h"
 
 #include "sdk_defines.h"
 
diff --git a/thread/xenon_sdl_threads.c b/thread/xenon_sdl_threads.c
index 0bffaaab7a..e235c6febf 100644
--- a/thread/xenon_sdl_threads.c
+++ b/thread/xenon_sdl_threads.c
@@ -19,7 +19,7 @@
 #include "SDL_thread.h"
 #include "SDL_mutex.h"
 #include <stdlib.h>
-#include <stdbool.h>
+#include "../boolean.h"
 
 SDL_cond *SDL_CreateCond(void)
 {
diff --git a/xenon/xenon360_audio.c b/xenon/xenon360_audio.c
index 08301c437f..6111d0474b 100644
--- a/xenon/xenon360_audio.c
+++ b/xenon/xenon360_audio.c
@@ -16,7 +16,7 @@
 
 #include "../driver.h"
 #include <stdlib.h>
-#include <stdbool.h>
+#include "../boolean.h"
 #include "../general.h"
 
 #include <xenon_sound/sound.h>