diff --git a/include/QF/checksum.h b/include/QF/checksum.h
index e55ced39d..acac5fbea 100644
--- a/include/QF/checksum.h
+++ b/include/QF/checksum.h
@@ -29,7 +29,7 @@
 #ifndef __checksum_h
 #define __checksum_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 unsigned int Com_BlockChecksum (void *buffer, int length);
 void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf);
diff --git a/include/QF/cmd.h b/include/QF/cmd.h
index 7d061f8dd..077cf393f 100644
--- a/include/QF/cmd.h
+++ b/include/QF/cmd.h
@@ -29,7 +29,7 @@
 #ifndef __cmd_h
 #define __cmd_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 //===========================================================================
 
diff --git a/include/QF/console.h b/include/QF/console.h
index 96c98dc7f..e1a416d04 100644
--- a/include/QF/console.h
+++ b/include/QF/console.h
@@ -32,8 +32,8 @@
 // console
 //
 
-#include "qtypes.h"
-#include "gcc_attr.h"
+#include "QF/qtypes.h"
+#include "QF/gcc_attr.h"
 
 #define		CON_TEXTSIZE	16384
 typedef struct
diff --git a/include/QF/crc.h b/include/QF/crc.h
index 8cc578d12..6c1dcba85 100644
--- a/include/QF/crc.h
+++ b/include/QF/crc.h
@@ -29,7 +29,7 @@
 #ifndef __crc_h
 #define __crc_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 void CRC_Init(unsigned short *crcvalue);
 void CRC_ProcessByte(unsigned short *crcvalue, byte data);
diff --git a/include/QF/cvar.h b/include/QF/cvar.h
index 64daf087c..e148143d2 100644
--- a/include/QF/cvar.h
+++ b/include/QF/cvar.h
@@ -29,8 +29,8 @@
 #ifndef __cvar_h
 #define __cvar_h
 
-#include "qtypes.h"
-#include "quakeio.h"
+#include "QF/qtypes.h"
+#include "QF/quakeio.h"
 
 typedef struct cvar_s
 {
diff --git a/include/QF/keys.h b/include/QF/keys.h
index f74add7a1..c1c8348fe 100644
--- a/include/QF/keys.h
+++ b/include/QF/keys.h
@@ -30,7 +30,7 @@
 #ifndef _KEYS_H
 #define _KEYS_H
 
-#include "quakeio.h"
+#include "QF/quakeio.h"
 
 // these are the key numbers that should be passed to Key_Event
 
diff --git a/include/QF/mathlib.h b/include/QF/mathlib.h
index aead50541..5319c48b6 100644
--- a/include/QF/mathlib.h
+++ b/include/QF/mathlib.h
@@ -30,7 +30,7 @@
 #define __mathlib_h
 
 #include <math.h>
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef M_PI
 # define M_PI	    3.14159265358979323846  // matches value in gcc v2 math.h
diff --git a/include/QF/mdfour.h b/include/QF/mdfour.h
index fd3556903..7cad5be60 100644
--- a/include/QF/mdfour.h
+++ b/include/QF/mdfour.h
@@ -30,7 +30,7 @@
 #ifndef __mdfour_h
 #define __mdfour_h
 
-#include "uint32.h"
+#include "QF/uint32.h"
 
 #define MDFOUR_DIGEST_BYTES 16
 
diff --git a/include/QF/msg.h b/include/QF/msg.h
index 4ef7532ad..130533365 100644
--- a/include/QF/msg.h
+++ b/include/QF/msg.h
@@ -28,7 +28,7 @@
 #ifndef _MSG_H
 #define _MSG_H
 
-#include "sizebuf.h"
+#include "QF/sizebuf.h"
 
 void MSG_WriteChar (sizebuf_t *sb, int c);
 void MSG_WriteByte (sizebuf_t *sb, int c);
diff --git a/include/QF/pr_comp.h b/include/QF/pr_comp.h
index 3f160f077..58b49e995 100644
--- a/include/QF/pr_comp.h
+++ b/include/QF/pr_comp.h
@@ -31,7 +31,7 @@
 #ifndef _PR_COMP_H
 #define _PR_COMP_H
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 typedef enum {
 	ev_void,
diff --git a/include/QF/progs.h b/include/QF/progs.h
index d6900a737..3260fd181 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -29,9 +29,9 @@
 #ifndef _PROGS_H
 #define _PROGS_H
 
-#include "link.h"
-#include "quakeio.h"
-#include "pr_comp.h"
+#include "QF/link.h"
+#include "QF/quakeio.h"
+#include "QF/pr_comp.h"
 
 typedef union eval_s
 {
diff --git a/include/QF/qargs.h b/include/QF/qargs.h
index 27ce99e8d..d0f8a1d94 100644
--- a/include/QF/qargs.h
+++ b/include/QF/qargs.h
@@ -31,7 +31,7 @@
 #ifndef __qargs_h
 #define __qargs_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 extern	int		com_argc;
 extern	char	**com_argv;
diff --git a/include/QF/qendian.h b/include/QF/qendian.h
index 66aab9bdb..b64727161 100644
--- a/include/QF/qendian.h
+++ b/include/QF/qendian.h
@@ -31,7 +31,7 @@
 #ifndef __qendian_h
 #define __qendian_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef NULL
 # define NULL ((void *)0)
diff --git a/include/QF/qfplist.h b/include/QF/qfplist.h
index 587f23b4e..637c5f847 100644
--- a/include/QF/qfplist.h
+++ b/include/QF/qfplist.h
@@ -29,7 +29,7 @@
 #ifndef __qfplist_h_
 #define __qfplist_h_
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 //	Ugly defines for fast checking and conversion from char to number
 #define inrange(ch,min,max) ((ch) >= (min) && (ch) <= (max))
diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h
index d09407383..9e1793bde 100644
--- a/include/QF/qtypes.h
+++ b/include/QF/qtypes.h
@@ -34,8 +34,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "qdefs.h"
-#include "compat.h"
+#include "QF/qdefs.h"
+#include "QF/compat.h"
 
 #define MAX_QPATH	64
 
diff --git a/include/QF/quakefs.h b/include/QF/quakefs.h
index a339b9b45..6ef83fd73 100644
--- a/include/QF/quakefs.h
+++ b/include/QF/quakefs.h
@@ -31,9 +31,9 @@
 #ifndef __quakefs_h
 #define __quakefs_h
 
-#include "qtypes.h"
-#include "quakeio.h"
-#include "cvar.h"
+#include "QF/qtypes.h"
+#include "QF/quakeio.h"
+#include "QF/cvar.h"
 
 //============================================================================
 
diff --git a/include/QF/quakeio.h b/include/QF/quakeio.h
index 2107370a4..b2a294c2f 100644
--- a/include/QF/quakeio.h
+++ b/include/QF/quakeio.h
@@ -40,7 +40,7 @@
 # include <zlib.h>
 #endif
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 typedef struct {
 	FILE *file;
diff --git a/include/QF/sizebuf.h b/include/QF/sizebuf.h
index 2c1164189..3920bfb2e 100644
--- a/include/QF/sizebuf.h
+++ b/include/QF/sizebuf.h
@@ -28,7 +28,7 @@
 #ifndef __sizebuf_h
 #define __sizebuf_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 typedef struct sizebuf_s
 {
diff --git a/include/QF/sys.h b/include/QF/sys.h
index accbaa0a6..b212d3e18 100644
--- a/include/QF/sys.h
+++ b/include/QF/sys.h
@@ -29,7 +29,7 @@
 #ifndef __sys_h
 #define __sys_h
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 //
 // file IO
diff --git a/include/QF/va.h b/include/QF/va.h
index 3aacee96f..37e481f11 100644
--- a/include/QF/va.h
+++ b/include/QF/va.h
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 char	*va(char *format, ...) __attribute__((format(printf,1,2)));
 // does a varargs printf into a temp buffer
diff --git a/nq/include/modelgen.h b/nq/include/modelgen.h
index e8db83281..17f083223 100644
--- a/nq/include/modelgen.h
+++ b/nq/include/modelgen.h
@@ -44,7 +44,7 @@
 #include "scriplib.h"
 #include "trilib.h"
 #include "lbmlib.h"
-#include "mathlib.h"
+#include "QF/mathlib.h"
 
 #endif
 
diff --git a/nq/include/spritegn.h b/nq/include/spritegn.h
index a9f05bcfb..1b0ed17cf 100644
--- a/nq/include/spritegn.h
+++ b/nq/include/spritegn.h
@@ -60,7 +60,7 @@
 #include "dictlib.h"
 #include "trilib.h"
 #include "lbmlib.h"
-#include "mathlib.h"
+#include "QF/mathlib.h"
 
 #endif
 
diff --git a/nq/source/d_vars.c b/nq/source/d_vars.c
index 042a3427f..4df56c041 100644
--- a/nq/source/d_vars.c
+++ b/nq/source/d_vars.c
@@ -32,7 +32,7 @@
 
 #ifndef	USE_INTEL_ASM
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.
diff --git a/nq/source/in_win.c b/nq/source/in_win.c
index 9cb4c998c..19b35fd57 100644
--- a/nq/source/in_win.c
+++ b/nq/source/in_win.c
@@ -39,10 +39,10 @@
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"
-#include "keys.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
+#include "QF/keys.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
 #include "input.h"
 //#include "dosisms.h"
 
diff --git a/nq/source/joy_null.c b/nq/source/joy_null.c
index 5b758dc4e..8e01b3907 100644
--- a/nq/source/joy_null.c
+++ b/nq/source/joy_null.c
@@ -30,10 +30,10 @@
 # include "config.h"
 #endif
 
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "protocol.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "client.h"
 
 // Joystick variables and structures
diff --git a/nq/source/net_ser.c b/nq/source/net_ser.c
index 4666518db..efd9997ae 100644
--- a/nq/source/net_ser.c
+++ b/nq/source/net_ser.c
@@ -33,7 +33,7 @@
 
 #include "net_ser.h"
 #include "dosisms.h"
-#include "crc.h"
+#include "QF/crc.h"
 
 #include "net_comx.c"
 
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index 4b79cd091..28cacc34f 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -33,9 +33,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "cvar.h"
-#include "host.h"
-#include "keys.h"
+#include "QF/cvar.h"
+#include "QF/host.h"
+#include "QF/keys.h"
 #include "client.h"
 
 int         m_return_state;
diff --git a/nq/source/sys_unixd.c b/nq/source/sys_unixd.c
index e38f683ba..42c808106 100644
--- a/nq/source/sys_unixd.c
+++ b/nq/source/sys_unixd.c
@@ -50,10 +50,10 @@
 #include <time.h>
 
 #include "client.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "host.h"
-#include "qtypes.h"
-#include "qargs.h"
+#include "QF/qtypes.h"
+#include "QF/qargs.h"
 
 qboolean    isDedicated;
 
diff --git a/nq/source/vid_mgl.c b/nq/source/vid_mgl.c
index 4d79a2d3a..aa87a4ed1 100644
--- a/nq/source/vid_mgl.c
+++ b/nq/source/vid_mgl.c
@@ -33,22 +33,22 @@
 #include <stdlib.h>
 
 #include "quakedef.h"
-#include "va.h"
+#include "QF/va.h"
 #include "winquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "d_local.h"
 #include "resource.h"
 #include "in_win.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "screen.h"
 #include "wad.h"
-#include "cmd.h"
-#include "qendian.h"
+#include "QF/cmd.h"
+#include "QF/qendian.h"
 #include "draw.h"
-#include "console.h"
+#include "QF/console.h"
 #include "sound.h"
 #include "cdaudio.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 
 #define	MINIMUM_MEMORY	0x550000
 
diff --git a/nq/source/vid_wgl.c b/nq/source/vid_wgl.c
index 46796c234..acb0f11ac 100644
--- a/nq/source/vid_wgl.c
+++ b/nq/source/vid_wgl.c
@@ -31,21 +31,21 @@
 # include "config.h"
 #endif
 #include "quakedef.h"
-#include "va.h"
+#include "QF/va.h"
 #include "winquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "resource.h"
 #include "glquake.h"
 #include "in_win.h"
 #include <commctrl.h>
 #include "screen.h"
-#include "keys.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/qendian.h"
 #include "draw.h"
 #include "cdaudio.h"
-#include "console.h"
+#include "QF/console.h"
 #include "sbar.h"
 
 extern void (*vid_menudrawfn) (void);
diff --git a/qw/include/hl.h b/qw/include/hl.h
index 7f835f999..fe91f2323 100644
--- a/qw/include/hl.h
+++ b/qw/include/hl.h
@@ -30,7 +30,7 @@
 #ifndef _HL_BSP_H
 #define _HL_BSP_H
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 extern void CL_ParseEntityLump(char *entdata);
 extern void HL_Mod_LoadLighting (lump_t *l);
diff --git a/qw/include/winquake.h b/qw/include/winquake.h
index f1c5a56e4..ac68a0784 100644
--- a/qw/include/winquake.h
+++ b/qw/include/winquake.h
@@ -43,7 +43,7 @@
 # include <mgraph.h>
 #endif
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef WM_MOUSEWHEEL
 # define WM_MOUSEWHEEL                   0x020A
diff --git a/qw/source/cd_sdl.c b/qw/source/cd_sdl.c
index 55afa0e4f..47815e84c 100644
--- a/qw/source/cd_sdl.c
+++ b/qw/source/cd_sdl.c
@@ -41,9 +41,9 @@
 #include <SDL.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 static qboolean cdValid = false;
diff --git a/qw/source/cd_sgi.c b/qw/source/cd_sgi.c
index 314720644..c35692495 100644
--- a/qw/source/cd_sgi.c
+++ b/qw/source/cd_sgi.c
@@ -36,9 +36,9 @@
 #include <dmedia/cdaudio.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 static qboolean initialized = false;
diff --git a/qw/source/cd_win.c b/qw/source/cd_win.c
index d5c16461d..7d88712c5 100644
--- a/qw/source/cd_win.c
+++ b/qw/source/cd_win.c
@@ -33,10 +33,10 @@
 #include <windows.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 extern HWND mainwindow;
diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c
index c02bd3c54..e88f32e62 100644
--- a/qw/source/cl_sys_sdl.c
+++ b/qw/source/cl_sys_sdl.c
@@ -56,9 +56,9 @@
 #include <SDL.H>
 #include <SDL_main.H>
 
-#include "sys.h"
-#include "qargs.h"
-#include "qargs.h"
+#include "QF/sys.h"
+#include "QF/qargs.h"
+#include "QF/qargs.h"
 #include "client.h"
 #include "host.h"
 
diff --git a/qw/source/cl_sys_win.c b/qw/source/cl_sys_win.c
index 7aa211006..ed2476a5f 100644
--- a/qw/source/cl_sys_win.c
+++ b/qw/source/cl_sys_win.c
@@ -39,13 +39,13 @@
 #include <windows.h>
 
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "host.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "resource.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "vid.h"
 
 qboolean    is_server = false;
diff --git a/qw/source/in_fbdev.c b/qw/source/in_fbdev.c
index 161405bd3..14e754c0d 100644
--- a/qw/source/in_fbdev.c
+++ b/qw/source/in_fbdev.c
@@ -38,8 +38,8 @@
 #include <sys/ioctl.h>
 
 #include "protocol.h"
-#include "cvar.h"
-#include "keys.h"
+#include "QF/cvar.h"
+#include "QF/keys.h"
 
 cvar_t		*_windowed_mouse;
 
diff --git a/qw/source/in_win.c b/qw/source/in_win.c
index c27e28bb1..6cbe2d55f 100644
--- a/qw/source/in_win.c
+++ b/qw/source/in_win.c
@@ -35,10 +35,10 @@
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"
-#include "keys.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
+#include "QF/keys.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
 #include "input.h"
 #include "cl_input.h"
 #include "view.h"
diff --git a/qw/source/joy_null.c b/qw/source/joy_null.c
index 94efbcf9f..a2cd8dadf 100644
--- a/qw/source/joy_null.c
+++ b/qw/source/joy_null.c
@@ -30,10 +30,10 @@
 # include "config.h"
 #endif
 
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "protocol.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 // Joystick variables and structures
 cvar_t     *joy_device;					// Joystick device name
diff --git a/qw/source/joy_win.c b/qw/source/joy_win.c
index d08313112..8de7989a4 100644
--- a/qw/source/joy_win.c
+++ b/qw/source/joy_win.c
@@ -42,14 +42,14 @@
 
 #include "cl_input.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "host.h"
 #include "input.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "protocol.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "view.h"
 
 // Joystick variables and structures
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 73f357ed0..c07019395 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -38,12 +38,12 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "net.h"
 #include "protocol.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 #include "server.h"
-#include "va.h"
+#include "QF/va.h"
 
 cvar_t     *netlogger;
 cvar_t     *netloglevel;
diff --git a/qw/source/net_udp6.c b/qw/source/net_udp6.c
index 71de55620..4695699ea 100644
--- a/qw/source/net_udp6.c
+++ b/qw/source/net_udp6.c
@@ -93,12 +93,12 @@
 # include <libc.h>
 #endif
 
-#include "console.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/msg.h"
 #include "net.h"
-#include "qargs.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN	512
diff --git a/qw/source/sv_sys_win.c b/qw/source/sv_sys_win.c
index ec7571d44..ffb1a5049 100644
--- a/qw/source/sv_sys_win.c
+++ b/qw/source/sv_sys_win.c
@@ -35,10 +35,10 @@
 #include <winsock.h>
 #include <conio.h>
 
-#include "qargs.h"
-#include "cvar.h"
+#include "QF/qargs.h"
+#include "QF/cvar.h"
 #include "server.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 
 qboolean    is_server = true;
diff --git a/qw/source/vid_fbdev.c b/qw/source/vid_fbdev.c
index 8a68845ab..f17d3f866 100644
--- a/qw/source/vid_fbdev.c
+++ b/qw/source/vid_fbdev.c
@@ -57,15 +57,15 @@
 #include <linux/kd.h>
 #include <linux/vt.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
 #include "input.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
 
 #include "fbset.h"
 
diff --git a/qw/source/vid_mgl.c b/qw/source/vid_mgl.c
index f35b8767b..2ceb3cdd0 100644
--- a/qw/source/vid_mgl.c
+++ b/qw/source/vid_mgl.c
@@ -33,20 +33,20 @@
 #include <stdlib.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "d_local.h"
 #include "draw.h"
 #include "host.h"
 #include "in_win.h"
-#include "keys.h"
-#include "qargs.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
 #include "resource.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "wad.h"
 #include "winquake.h"
 
diff --git a/qw/source/vid_wgl.c b/qw/source/vid_wgl.c
index 0dacc641f..c3fb3a8b7 100644
--- a/qw/source/vid_wgl.c
+++ b/qw/source/vid_wgl.c
@@ -31,21 +31,21 @@
 #endif
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "glquake.h"
 #include "host.h"
 #include "in_win.h"
-#include "keys.h"
-#include "qargs.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
 #include "resource.h"
 #include "sbar.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "winquake.h"
 
 extern void (*vid_menudrawfn) (void);