diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index f9dd6c978..ca2f0548f 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -31,16 +31,15 @@
 
 
 #include "QF/qtypes.h"
-#include "QF/dstring.h"
 
 typedef struct cmd_buffer_s {
-	dstring_t *buffer; // Actual text
+	struct dstring_s *buffer; // Actual text
 	qboolean wait; // Execution stopped until next frame
 	qboolean legacy; // Backwards compatible with old command buffer style
 	unsigned int argc, maxargc; // Number of args, number of args allocated
-	dstring_t **argv; // Array of arguments
-	dstring_t *realline; // Actual command being processed
-	dstring_t *line; // Tokenized and reassembled command
+	struct dstring_s **argv; // Array of arguments
+	struct dstring_s *realline; // Actual command being processed
+	struct dstring_s *line; // Tokenized and reassembled command
 	int *args; // Array of positions of each token in above string
 	int *argspace; // Amount of space before each token
 	struct cmd_buffer_s *prev, *next; // Next buffer in the stack
diff --git a/libs/console/client.c b/libs/console/client.c
index 49dd58000..8782a5d02 100644
--- a/libs/console/client.c
+++ b/libs/console/client.c
@@ -44,6 +44,7 @@ static const char rcsid[] =
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
+#include "QF/dstring.h"
 #include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/plugin.h"
diff --git a/libs/console/server.c b/libs/console/server.c
index fe95d6643..9f186b151 100644
--- a/libs/console/server.c
+++ b/libs/console/server.c
@@ -58,6 +58,7 @@ static const char rcsid[] =
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
+#include "QF/dstring.h"
 #include "QF/keys.h"
 #include "QF/plugin.h"
 #include "QF/qtypes.h"