diff --git a/include/QF/cbuf.h b/include/QF/cbuf.h
index 55326b435..192dc82ef 100644
--- a/include/QF/cbuf.h
+++ b/include/QF/cbuf.h
@@ -63,10 +63,6 @@ typedef struct cbuf_s {
 
 extern cbuf_t *cbuf_active;
 
-extern const char *com_token;
-const char *COM_Parse (const char *data);
-void COM_TokenizeString (const char *str, cbuf_args_t *args);
-
 cbuf_args_t *Cbuf_ArgsNew (void);
 void Cbuf_ArgsDelete (cbuf_args_t *);
 void Cbuf_ArgsAdd (cbuf_args_t *args, const char *arg);
diff --git a/include/QF/idparse.h b/include/QF/idparse.h
index 5a2f42a2f..9409e6747 100644
--- a/include/QF/idparse.h
+++ b/include/QF/idparse.h
@@ -28,6 +28,8 @@
 
 */
 
+extern const char *com_token;
+
 const char *COM_Parse (const char *data);
 void COM_TokenizeString (const char *str, cbuf_args_t *args);
 void COM_extract_line (cbuf_t *cbuf);
diff --git a/libs/gamecode/engine/pr_edict.c b/libs/gamecode/engine/pr_edict.c
index 8d18ccef4..aa0d5a1c2 100644
--- a/libs/gamecode/engine/pr_edict.c
+++ b/libs/gamecode/engine/pr_edict.c
@@ -40,6 +40,7 @@ static const char rcsid[] =
 #include <stdio.h>
 
 #include "QF/cbuf.h"
+#include "QF/idparse.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"
 #include "QF/hash.h"
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index 345dad6b0..c9bd4bd8c 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -32,6 +32,7 @@ static const char rcsid[] =
 #endif
 
 #include "QF/cbuf.h"
+#include "QF/idparse.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/va.h"
diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c
index b65d42d1d..1cab08e45 100644
--- a/qw/source/sv_user.c
+++ b/qw/source/sv_user.c
@@ -43,6 +43,7 @@ static const char rcsid[] =
 #include <ctype.h>
 
 #include "QF/cbuf.h"
+#include "QF/idparse.h"
 #include "QF/checksum.h"
 #include "QF/clip_hull.h"
 #include "QF/cmd.h"
diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c
index 93de2fb9e..7c92e0bef 100644
--- a/tools/qfcc/source/qfcc.c
+++ b/tools/qfcc/source/qfcc.c
@@ -55,6 +55,7 @@ static const char rcsid[] =
 #include <stdio.h>
 
 #include <QF/cbuf.h>
+#include <QF/idparse.h>
 #include <QF/crc.h>
 #include <QF/dstring.h>
 #include <QF/hash.h>