diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h
index 7abe4d94e..8a991c7d5 100644
--- a/include/QF/qtypes.h
+++ b/include/QF/qtypes.h
@@ -32,7 +32,12 @@
 #define __qtypes_h
 
 #include <stdio.h>
+
+#ifdef __QNX__
+#define msg_t qnx_msg_t
 #include <sys/types.h>
+#undef msg_t
+#endif
 
 #define MAX_QPATH	64
 
diff --git a/libs/gamecode/builtins/pr_cmds.c b/libs/gamecode/builtins/pr_cmds.c
index 1c0f65809..3a3bf41aa 100644
--- a/libs/gamecode/builtins/pr_cmds.c
+++ b/libs/gamecode/builtins/pr_cmds.c
@@ -47,7 +47,6 @@ static __attribute__ ((unused)) const char rcsid[] =
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/mathlib.h"
-#include "QF/msg.h"
 #include "QF/progs.h"
 #include "QF/sys.h"
 #include "QF/va.h"