diff --git a/Makefile b/Makefile
index 753dea46d3..68640ddcaf 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ OBJ = frontend/frontend.o \
 		settings.o \
 		dynamic.o \
 		dynamic_dummy.o \
-		message.o \
+		message_queue.o \
 		rewind.o \
 		gfx/gfx_common.o \
 		input/input_common.o \
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 7126d26202..dae7328b91 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -10,7 +10,7 @@ OBJ = frontend/frontend_emscripten.o \
 		hash.o \
 		dynamic.o \
 		dynamic_dummy.o \
-		message.o \
+		message_queue.o \
 		rewind.o \
 		movie.o \
 		gfx/gfx_common.o \
diff --git a/Makefile.win b/Makefile.win
index f6ed9754b8..5d13dd5984 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -12,7 +12,7 @@ OBJ = frontend/frontend.o \
 		hash.o \
 		dynamic.o \
 		dynamic_dummy.o \
-		message.o \
+		message_queue.o \
 		rewind.o \
 		movie.o \
 		gfx/gfx_common.o \
diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index f8ee54018d..f4745081a1 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -28,7 +28,7 @@
 #include "../../gfx/gfx_common.h"
 #include "../../gfx/gfx_context.h"
 
-#include "../../message.h"
+#include "../../message_queue.h"
 #include "../../general.h"
 
 enum {
diff --git a/general.h b/general.h
index b005699268..14268b3624 100644
--- a/general.h
+++ b/general.h
@@ -23,7 +23,7 @@
 #include <setjmp.h>
 #include "driver.h"
 #include "record/ffemu.h"
-#include "message.h"
+#include "message_queue.h"
 #include "rewind.h"
 #include "movie.h"
 #include "autosave.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 460e3cbe5c..733ee80221 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -433,7 +433,7 @@ FILE
 /*============================================================
 MESSAGE
 ============================================================ */
-#include "../message.c"
+#include "../message_queue.c"
 
 /*============================================================
 PATCH
diff --git a/message.c b/message_queue.c
similarity index 98%
rename from message.c
rename to message_queue.c
index 569a87373b..30bb8cf110 100644
--- a/message.c
+++ b/message_queue.c
@@ -13,9 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "message.h"
 #include <stdlib.h>
 #include <string.h>
+#include <stddef.h>
+#include "message_queue.h"
 #include "boolean.h"
 #include "compat/posix_string.h"
 
diff --git a/message.h b/message_queue.h
similarity index 98%
rename from message.h
rename to message_queue.h
index f8fd4d6216..2f23227d31 100644
--- a/message.h
+++ b/message_queue.h
@@ -17,8 +17,6 @@
 #ifndef __RARCH_MSG_QUEUE_H
 #define __RARCH_MSG_QUEUE_H
 
-#include <stddef.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj
index 210eea37dc..5ac9935a59 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj
@@ -371,7 +371,7 @@
     <ClInclude Include="..\..\file.h" />
     <ClInclude Include="..\..\general.h" />
     <ClInclude Include="..\..\libretro.hpp" />
-    <ClInclude Include="..\..\message.h" />
+    <ClInclude Include="..\..\message_queue.h" />
     <ClInclude Include="..\..\netplay.h" />
     <ClInclude Include="..\..\rewind.h" />
     <ClInclude Include="..\..\screenshot.h" />
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
index 72e55d896c..6c04a5462f 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
@@ -73,7 +73,7 @@
     <ClInclude Include="..\..\general.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\message.h">
+    <ClInclude Include="..\..\message_queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\netplay.h">
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 486a794ca3..77b7cfb3da 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -259,7 +259,7 @@
     </ClCompile>
     <ClCompile Include="..\..\input\autoconf\builtin_win.c">
     </ClCompile>
-    <ClCompile Include="..\..\message.c">
+    <ClCompile Include="..\..\message_queue.c">
     </ClCompile>
     <ClCompile Include="..\..\movie.c">
     </ClCompile>
diff --git a/netplay.c b/netplay.c
index 8b9b557e61..340fa5b488 100644
--- a/netplay.c
+++ b/netplay.c
@@ -22,7 +22,7 @@
 #include "general.h"
 #include "autosave.h"
 #include "dynamic.h"
-#include "message.h"
+#include "message_queue.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp
index 3a843764af..112cd07845 100644
--- a/xdk/xdk_d3d.cpp
+++ b/xdk/xdk_d3d.cpp
@@ -28,7 +28,7 @@
 
 #include "./../gfx/gfx_context.h"
 #include "../general.h"
-#include "../message.h"
+#include "../message_queue.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"