diff --git a/include/context_x11.h b/include/context_x11.h
index ecc3b1f..b0f697f 100644
--- a/include/context_x11.h
+++ b/include/context_x11.h
@@ -31,10 +31,12 @@
 #ifndef __CONTEXT_X11_H__
 #define __CONTEXT_X11_H__
 
-#include <qtypes.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "cvar.h"
+#include "qtypes.h"
+
 void GetEvent( void );
 
 extern Display	*x_disp;
diff --git a/include/dga_check.h b/include/dga_check.h
index ae4233b..881d553 100644
--- a/include/dga_check.h
+++ b/include/dga_check.h
@@ -32,6 +32,8 @@
 
 #include <X11/Xlib.h>
 
+#include "qtypes.h"
+
 /*
   VID_CheckDGA
 
diff --git a/include/quakedef.h b/include/host.h
similarity index 100%
rename from include/quakedef.h
rename to include/host.h
diff --git a/source/cd_audio.c b/source/cd_audio.c
index e0d63f3..8478987 100644
--- a/source/cd_audio.c
+++ b/source/cd_audio.c
@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include <dpmi.h>
-#include "quakedef.h"
 #include "dosisms.h"
 
 extern cvar_t	*bgmvolume;
diff --git a/source/cd_null.c b/source/cd_null.c
index a42a525..36be29d 100644
--- a/source/cd_null.c
+++ b/source/cd_null.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 void CDAudio_Play(byte track, qboolean looping)
 {
diff --git a/source/cd_sdl.c b/source/cd_sdl.c
index ea4bab3..172b457 100644
--- a/source/cd_sdl.c
+++ b/source/cd_sdl.c
@@ -37,7 +37,6 @@
 # include <config.h>
 #endif
 #include <windows.h>
-#include "quakedef.h"
 #include "qargs.h"
 #include "console.h"
 #include "cdaudio.h"
diff --git a/source/cd_win.c b/source/cd_win.c
index c413969..19afeb0 100644
--- a/source/cd_win.c
+++ b/source/cd_win.c
@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include <windows.h>
-#include "quakedef.h"
 #include "qargs.h"
 #include "console.h"
 #include "cdaudio.h"
diff --git a/source/cl_demo.c b/source/cl_demo.c
index 5ca706b..ea76dde 100644
--- a/source/cl_demo.c
+++ b/source/cl_demo.c
@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "cvar.h"
 #include "sizebuf.h"
@@ -40,7 +42,6 @@
 #include "qendian.h"
 #include "va.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "cl_main.h"
 
diff --git a/source/cl_ents.c b/source/cl_ents.c
index aa590ee..07a4f37 100644
--- a/source/cl_ents.c
+++ b/source/cl_ents.c
@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "sys.h"
 #include "cvar.h"
@@ -40,7 +42,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "teamplay.h"
diff --git a/source/cl_input.c b/source/cl_input.c
index 9e7291e..7766a9e 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "input.h"
 #include "sys.h"
 #include "sys.h"
@@ -41,7 +43,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "checksum.h"
diff --git a/source/cl_main.c b/source/cl_main.c
index 04f59c5..f8c92b3 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -30,6 +30,8 @@
 # include "config.h"
 #endif
 #include <ctype.h>
+
+#include "host.h"
 #include "bothdefs.h"
 #include "input.h"
 #include "in_win.h"
@@ -45,7 +47,6 @@
 #include "console.h"
 #include "qendian.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "pmove.h"
 #include "view.h"
 #include "checksum.h"
diff --git a/source/cl_misc.c b/source/cl_misc.c
index 2d378a0..0014226 100644
--- a/source/cl_misc.c
+++ b/source/cl_misc.c
@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 
 qboolean ServerPaused (void)
 {
diff --git a/source/cl_parse.c b/source/cl_parse.c
index 00b2544..5933642 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -29,12 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "client.h"
 #include "cmd.h"
 #include "screen.h"
 #include "cdaudio.h"
-#include "quakedef.h"
 #include "bothdefs.h"
 #include "console.h"
 #include "msg.h"
diff --git a/source/cl_sys_sdl.c b/source/cl_sys_sdl.c
index c5dbbda..1a18ebf 100644
--- a/source/cl_sys_sdl.c
+++ b/source/cl_sys_sdl.c
@@ -58,7 +58,6 @@
 
 #include "sys.h"
 #include "qargs.h"
-#include "quakedef.h"
 #include "qargs.h"
 #include "client.h"
 
diff --git a/source/cl_sys_unix.c b/source/cl_sys_unix.c
index 00fb20e..13bf478 100644
--- a/source/cl_sys_unix.c
+++ b/source/cl_sys_unix.c
@@ -44,9 +44,9 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#include "sys.h"
+#include "host.h"
 #include "qargs.h"
-#include "quakedef.h"
+#include "sys.h"
 
 int noconinput = 0;
 qboolean	is_server = false;
diff --git a/source/cl_sys_win.c b/source/cl_sys_win.c
index 998a9b4..066a84f 100644
--- a/source/cl_sys_win.c
+++ b/source/cl_sys_win.c
@@ -36,7 +36,6 @@
 #include <io.h>
 #include <conio.h>
 
-#include "quakedef.h"
 #include "winquake.h"
 #include "resource.h"
 #include "sys.h"
diff --git a/source/cl_tent.c b/source/cl_tent.c
index aec3826..8c4ada6 100644
--- a/source/cl_tent.c
+++ b/source/cl_tent.c
@@ -29,7 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"	// Host_EndGame
+
+#include "host.h"
 #include "sys.h"
 #include "ctype.h"
 #include "render.h"
diff --git a/source/cl_trans.c b/source/cl_trans.c
index 68297f8..b0710d2 100644
--- a/source/cl_trans.c
+++ b/source/cl_trans.c
@@ -29,16 +29,17 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"   // Host_EndGame
-#include "sys.h"
-#include "vid.h"
-#include "client.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
+#include "host.h"
+#include "sys.h"
+#include "vid.h"
+#include "client.h"
+
 /*
 =====================
 CL_NewTranslation
diff --git a/source/d_edge.c b/source/d_edge.c
index 12973f2..7159824 100644
--- a/source/d_edge.c
+++ b/source/d_edge.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 static int	miplevel;
diff --git a/source/d_modech.c b/source/d_modech.c
index 784d1e7..4c69f13 100644
--- a/source/d_modech.c
+++ b/source/d_modech.c
@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include "sys.h"
-#include "quakedef.h"
 #include "d_local.h"
 
 int	d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
diff --git a/source/d_part.c b/source/d_part.c
index 783c7e5..318a5bb 100644
--- a/source/d_part.c
+++ b/source/d_part.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 
diff --git a/source/d_polyse.c b/source/d_polyse.c
index 986593c..c1800ec 100644
--- a/source/d_polyse.c
+++ b/source/d_polyse.c
@@ -30,7 +30,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 #include "bothdefs.h"
diff --git a/source/d_scan.c b/source/d_scan.c
index bd8ec94..1af03f4 100644
--- a/source/d_scan.c
+++ b/source/d_scan.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 
diff --git a/source/d_sky.c b/source/d_sky.c
index 38d5f55..53b7762 100644
--- a/source/d_sky.c
+++ b/source/d_sky.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 
diff --git a/source/d_sprite.c b/source/d_sprite.c
index da90a58..2207bc0 100644
--- a/source/d_sprite.c
+++ b/source/d_sprite.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 static int		sprite_height;
diff --git a/source/d_vars.c b/source/d_vars.c
index 3260181..dac7bed 100644
--- a/source/d_vars.c
+++ b/source/d_vars.c
@@ -31,7 +31,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include	"quakedef.h"
+
+#include "host.h"
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.
diff --git a/source/d_zpoint.c b/source/d_zpoint.c
index ae7f3b0..a34611c 100644
--- a/source/d_zpoint.c
+++ b/source/d_zpoint.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 
diff --git a/source/dga_check.c b/source/dga_check.c
index 8772bfd..2ff83ff 100644
--- a/source/dga_check.c
+++ b/source/dga_check.c
@@ -28,7 +28,9 @@
 	$Id$
 */
 
-#include <quakedef.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <X11/Xlib.h>
diff --git a/source/gl_dyn_part.c b/source/gl_dyn_part.c
index 13f6592..f05361b 100644
--- a/source/gl_dyn_part.c
+++ b/source/gl_dyn_part.c
@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "glquake.h"
-#include "quakedef.h"
 #include "cmd.h"
 #include "qargs.h"
 #include "console.h"
diff --git a/source/gl_refrag.c b/source/gl_refrag.c
index 1ddfede..6c76bf7 100644
--- a/source/gl_refrag.c
+++ b/source/gl_refrag.c
@@ -53,7 +53,6 @@
 #include "console.h"
 #include "glquake.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "cl_main.h"
 
 mnode_t	*r_pefragtopnode;
diff --git a/source/gl_trans.c b/source/gl_trans.c
index cc53aca..d7fb581 100644
--- a/source/gl_trans.c
+++ b/source/gl_trans.c
@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 #include "protocol.h"
 #include "glquake.h"
 
diff --git a/source/in_null.c b/source/in_null.c
index e44e5b4..e18076f 100644
--- a/source/in_null.c
+++ b/source/in_null.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 void IN_Init (void)
 {
diff --git a/source/in_sdl.c b/source/in_sdl.c
index a7e5b73..f4925b3 100644
--- a/source/in_sdl.c
+++ b/source/in_sdl.c
@@ -44,7 +44,6 @@
 #include "sys.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "vid.h"
 #include "view.h"
 
diff --git a/source/in_svgalib.c b/source/in_svgalib.c
index 1c8c6e5..921026c 100644
--- a/source/in_svgalib.c
+++ b/source/in_svgalib.c
@@ -29,6 +29,7 @@
 	$Id$
 */
 
+#include "host.h"
 #include "client.h"
 #include "cl_input.h"
 #include "cmd.h"
@@ -39,7 +40,6 @@
 #include "keys.h"
 #include "qargs.h"
 #include "qtypes.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "view.h"
 
diff --git a/source/in_win.c b/source/in_win.c
index ca34ec0..a11e6f7 100644
--- a/source/in_win.c
+++ b/source/in_win.c
@@ -34,7 +34,6 @@
 #ifdef __MINGW32__
 # define INITGUID
 #endif
-#include "quakedef.h"
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"
diff --git a/source/in_x11.c b/source/in_x11.c
index 672dfd0..1fa439c 100644
--- a/source/in_x11.c
+++ b/source/in_x11.c
@@ -55,9 +55,9 @@
 #include <X11/extensions/xf86dga.h>
 #endif
 
-#include "quakedef.h"
 #include "dga_check.h"
 #include "d_local.h"
+#include "host.h"
 #include "sound.h"
 #include "keys.h"
 #include "cvar.h"
diff --git a/source/menu.c b/source/menu.c
index 39ef6a7..bd29917 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -29,8 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
-#include "quakedef.h"
 #ifdef _WIN32
 #include "winquake.h"
 #endif
diff --git a/source/nonintel.c b/source/nonintel.c
index a5e0ae2..8160b4b 100644
--- a/source/nonintel.c
+++ b/source/nonintel.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 
 #ifndef USE_INTEL_ASM
 
diff --git a/source/r_aclip.c b/source/r_aclip.c
index 8d352da..6a636c7 100644
--- a/source/r_aclip.c
+++ b/source/r_aclip.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 
diff --git a/source/r_draw.c b/source/r_draw.c
index 96a0804..59e1c12 100644
--- a/source/r_draw.c
+++ b/source/r_draw.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"	// FIXME: shouldn't need to include this
 
diff --git a/source/r_light.c b/source/r_light.c
index 3366cc8..5025ccf 100644
--- a/source/r_light.c
+++ b/source/r_light.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 
 int	r_dlightframecount;
diff --git a/source/r_misc.c b/source/r_misc.c
index 471c9cd..574a691 100644
--- a/source/r_misc.c
+++ b/source/r_misc.c
@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "console.h"
 #include "cmd.h"
@@ -36,7 +38,6 @@
 #include "r_local.h"
 #include "draw.h"
 #include "menu.h"
-#include "quakedef.h"
 #include "cl_parse.h"
 
 qboolean	allowskybox;	// whether or not to allow skyboxes  --KB
diff --git a/source/r_part.c b/source/r_part.c
index c3e640f..cd7e25a 100644
--- a/source/r_part.c
+++ b/source/r_part.c
@@ -29,11 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "qargs.h"
 #include "r_local.h"
 #include "console.h"
 #include "quakefs.h"
-#include "quakedef.h"
 #include "r_dynamic.h"
 
 #include <stdlib.h>
diff --git a/source/r_sky.c b/source/r_sky.c
index 0a5f23c..445aced 100644
--- a/source/r_sky.c
+++ b/source/r_sky.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"
 
diff --git a/source/r_surf.c b/source/r_surf.c
index ccb1120..a8898dc 100644
--- a/source/r_surf.c
+++ b/source/r_surf.c
@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 #include "sys.h"
-#include "quakedef.h"
 #include "r_local.h"
 
 drawsurf_t	r_drawsurf;
diff --git a/source/r_vars.c b/source/r_vars.c
index ccbae4d..838ca65 100644
--- a/source/r_vars.c
+++ b/source/r_vars.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include	"quakedef.h"
 
 #ifndef USE_INTEL_ASM
 
diff --git a/source/r_view.c b/source/r_view.c
index 7c1fe93..1084279 100644
--- a/source/r_view.c
+++ b/source/r_view.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "host.h"
 #include "view.h"
 #include "bothdefs.h"
 #include "screen.h"
@@ -40,7 +41,6 @@
 #include "r_local.h"
 #include "msg.h"
 #include "commdef.h"
-#include "quakedef.h"
 
 /*
 
diff --git a/source/screen.c b/source/screen.c
index 858d268..78b43e1 100644
--- a/source/screen.c
+++ b/source/screen.c
@@ -38,11 +38,11 @@
 #include "console.h"
 #include "d_iface.h"
 #include "draw.h"
+#include "host.h"
 #include "keys.h"
 #include "menu.h"
 #include "pcx.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sbar.h"
 #include "skin.h"
 #include "sys.h"
diff --git a/source/snd_dma.c b/source/snd_dma.c
index ad56ebf..828ce3e 100644
--- a/source/snd_dma.c
+++ b/source/snd_dma.c
@@ -29,13 +29,14 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include "host.h"
 #include "sys.h"
 #include "sound.h"
 #include "cmd.h"
 #include "console.h"
 #include "client.h"
 #include "qargs.h"
-#include "quakedef.h"
 
 // fixme: Damn crappy complier doesn't allow me to UNDEF _win32 on command line!
 #ifdef WIN32SDL
diff --git a/source/snd_win.c b/source/snd_win.c
index fcadc1e..f23e859 100644
--- a/source/snd_win.c
+++ b/source/snd_win.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "winquake.h"
 #include "qargs.h"
 #include "console.h"
diff --git a/source/sw_view.c b/source/sw_view.c
index 5b9a31e..2062648 100644
--- a/source/sw_view.c
+++ b/source/sw_view.c
@@ -29,7 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
+
+#include "host.h"
 #include "r_local.h"
 
 extern byte 	gammatable[256];
diff --git a/source/sys_null.c b/source/sys_null.c
index 0a4b159..c7ed476 100644
--- a/source/sys_null.c
+++ b/source/sys_null.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "errno.h"
 
 
diff --git a/source/sys_unix.c b/source/sys_unix.c
index e7e2990..c8fbce4 100644
--- a/source/sys_unix.c
+++ b/source/sys_unix.c
@@ -30,10 +30,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "sys.h"
-#include "qargs.h"
-#include "cvar.h"
-#include "server.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,7 +39,10 @@
 #include <sys/time.h>
 
 #include "sys.h"
-#include "quakedef.h"
+#include "qargs.h"
+#include "host.h"
+#include "cvar.h"
+#include "server.h"
 
 /* This is unused in the client, but we need the symbol there too. */
 server_static_t	svs;
diff --git a/source/vid_3dfxsvga.c b/source/vid_3dfxsvga.c
index 3ca7b88..735bc8e 100644
--- a/source/vid_3dfxsvga.c
+++ b/source/vid_3dfxsvga.c
@@ -56,7 +56,6 @@
 #include "glquake.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "quakefs.h"
 #include "sbar.h"
 #include "sys.h"
diff --git a/source/vid_ggi.c b/source/vid_ggi.c
index d314d6b..eedb5ba 100644
--- a/source/vid_ggi.c
+++ b/source/vid_ggi.c
@@ -41,8 +41,6 @@
 
 #include "bothdefs.h"   // needed by: common.h, net.h, client.h
 
-#include "quakedef.h"
-
 #include "bspfile.h"    // needed by: glquake.h
 #include "vid.h"
 #include "sys.h"
diff --git a/source/vid_glx.c b/source/vid_glx.c
index 14877ce..444aeb5 100644
--- a/source/vid_glx.c
+++ b/source/vid_glx.c
@@ -42,16 +42,16 @@
 # include <X11/extensions/xf86dga.h>
 #endif
 
-#include "va.h"
 #include "console.h"
-#include "glquake.h"
-#include "quakefs.h"
-#include "input.h"
-#include "sbar.h"
 #include "context_x11.h"
-#include "quakedef.h"
-#include "qendian.h"
+#include "glquake.h"
+#include "host.h"
+#include "input.h"
 #include "qargs.h"
+#include "qendian.h"
+#include "quakefs.h"
+#include "sbar.h"
+#include "va.h"
 
 #define WARP_WIDTH		320
 #define WARP_HEIGHT 	200
diff --git a/source/vid_mgl.c b/source/vid_mgl.c
index 0528308..e3a7efc 100644
--- a/source/vid_mgl.c
+++ b/source/vid_mgl.c
@@ -31,7 +31,6 @@
 #endif
 #include <stdlib.h>
 
-#include "quakedef.h"
 #include "va.h"
 #include "winquake.h"
 #include "sys.h"
diff --git a/source/vid_null.c b/source/vid_null.c
index 1e5ea1a..1e1032a 100644
--- a/source/vid_null.c
+++ b/source/vid_null.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
 #include "d_local.h"
 
 viddef_t	vid;				// global video state
diff --git a/source/vid_sdl.c b/source/vid_sdl.c
index 35fe3f2..3f686b9 100644
--- a/source/vid_sdl.c
+++ b/source/vid_sdl.c
@@ -38,7 +38,6 @@
 #include "cvar.h"
 #include "d_local.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"
 #include "vid.h"
diff --git a/source/vid_sgl.c b/source/vid_sgl.c
index 0089745..a8a0909 100644
--- a/source/vid_sgl.c
+++ b/source/vid_sgl.c
@@ -40,7 +40,6 @@
 #include "console.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"
 #include "glquake.h"
diff --git a/source/vid_svgalib.c b/source/vid_svgalib.c
index 6b18a8e..d9a4f6c 100644
--- a/source/vid_svgalib.c
+++ b/source/vid_svgalib.c
@@ -34,7 +34,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "quakedef.h"
+
+#include "host.h"
 #include "d_local.h"
 #include "cvar.h"
 #include "cmd.h"
diff --git a/source/vid_wgl.c b/source/vid_wgl.c
index 6a59b8a..4aad143 100644
--- a/source/vid_wgl.c
+++ b/source/vid_wgl.c
@@ -29,7 +29,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "quakedef.h"
 #include "va.h"
 #include "winquake.h"
 #include "sys.h"
diff --git a/source/vid_x11.c b/source/vid_x11.c
index c29d57e..eb7ff39 100644
--- a/source/vid_x11.c
+++ b/source/vid_x11.c
@@ -69,13 +69,13 @@
 #include "d_local.h"
 #include "dga_check.h"
 #include "draw.h"
+#include "host.h"
 #include "input.h"
 #include "input.h"
 #include "keys.h"
 #include "menu.h"
 #include "qargs.h"
 #include "qendian.h"
-#include "quakedef.h"
 #include "sys.h"
 #include "va.h"