diff --git a/fifo_buffer.h b/fifo_buffer.h
index f34ae686b8..f2d410058d 100644
--- a/fifo_buffer.h
+++ b/fifo_buffer.h
@@ -17,6 +17,9 @@
 #ifndef __FIFO_BUFFER_H
 #define __FIFO_BUFFER_H
 
+#include <stdint.h>
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/message_queue.c b/message_queue.c
index 670419f661..c969330c42 100644
--- a/message_queue.c
+++ b/message_queue.c
@@ -15,7 +15,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
 #include <boolean.h>
 #include "message_queue.h"
 #include "retroarch_logger.h"
diff --git a/message_queue.h b/message_queue.h
index 81edc823db..5b24e9907a 100644
--- a/message_queue.h
+++ b/message_queue.h
@@ -17,6 +17,8 @@
 #ifndef __RARCH_MSG_QUEUE_H
 #define __RARCH_MSG_QUEUE_H
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif