diff --git a/include/QF/input.h b/include/QF/input.h
index 3d1c29672..054cc8bcb 100644
--- a/include/QF/input.h
+++ b/include/QF/input.h
@@ -29,8 +29,6 @@
 #ifndef __QF_input_h_
 #define __QF_input_h_
 
-#include <QF/cvar.h>
-
 struct {
 	vec3_t angles;
 	vec3_t position;
@@ -57,11 +55,11 @@ void IN_ModeChanged (void);
 
 void IN_HandlePause (qboolean paused);
 
-extern cvar_t		*_windowed_mouse;
-extern cvar_t		*m_filter;
-extern cvar_t		*in_freelook;
-extern cvar_t		*sensitivity;
-extern cvar_t		*lookstrafe;
+extern struct cvar_s		*_windowed_mouse;
+extern struct cvar_s		*m_filter;
+extern struct cvar_s		*in_freelook;
+extern struct cvar_s		*sensitivity;
+extern struct cvar_s		*lookstrafe;
 
 extern qboolean 	in_mouse_avail;
 extern float		in_mouse_x, in_mouse_y;
diff --git a/include/QF/plugin.h b/include/QF/plugin.h
index 58123e001..6577063c9 100644
--- a/include/QF/plugin.h
+++ b/include/QF/plugin.h
@@ -75,7 +75,7 @@ typedef plugin_t * (*P_PluginInfo) (void);
 /*
 	Plugin system variables
 */
-extern cvar_t	*fs_pluginpath;
+extern struct cvar_s	*fs_pluginpath;
 
 /*
 	Function prototypes
diff --git a/include/QF/render.h b/include/QF/render.h
index 16a972284..05dff2f65 100644
--- a/include/QF/render.h
+++ b/include/QF/render.h
@@ -29,7 +29,6 @@
 #ifndef __render_h
 #define __render_h
 
-#include "QF/cvar.h"
 #include "QF/mathlib.h"
 #include "QF/model.h"
 #include "QF/qdefs.h" // FIXME
diff --git a/include/QF/screen.h b/include/QF/screen.h
index bbe3ef6bc..d9de1301e 100644
--- a/include/QF/screen.h
+++ b/include/QF/screen.h
@@ -31,7 +31,6 @@
 #define __screen_h
 
 #include "QF/qtypes.h"
-#include "QF/cvar.h"
 
 void SCR_Init_Cvars (void);
 void SCR_Init (void);
@@ -72,10 +71,10 @@ extern	int			clearnotify;	// set to 0 whenever notify text is drawn
 extern	qboolean	scr_disabled_for_loading;
 extern	qboolean	scr_skipupdate;
 
-extern cvar_t		*scr_viewsize;
-extern cvar_t		*scr_fov;
-extern cvar_t		*scr_viewsize;
-extern cvar_t		*scr_consize;
+extern struct cvar_s		*scr_viewsize;
+extern struct cvar_s		*scr_fov;
+extern struct cvar_s		*scr_viewsize;
+extern struct cvar_s		*scr_consize;
 
 // only the refresh window will be updated unless these variables are flagged 
 extern	int			scr_copytop;
diff --git a/include/QF/sound.h b/include/QF/sound.h
index 99106e56e..64d46f74c 100644
--- a/include/QF/sound.h
+++ b/include/QF/sound.h
@@ -31,7 +31,6 @@
 #define _SOUND_H
 
 #include "QF/mathlib.h"
-#include "QF/cvar.h"
 #include "QF/zone.h"
 
 #define AMBIENT_WATER	0
@@ -177,16 +176,16 @@ extern volatile dma_t *shm;
 extern volatile dma_t sn;
 extern vec_t sound_nominal_clip_dist;
 
-extern	cvar_t *loadas8bit;
-extern	cvar_t *bgmvolume;
-extern	cvar_t *volume;
+extern	struct cvar_s *loadas8bit;
+extern	struct cvar_s *bgmvolume;
+extern	struct cvar_s *volume;
 
-extern	cvar_t	*snd_device;
-extern	cvar_t	*snd_rate;
-extern	cvar_t	*snd_bits;
-extern	cvar_t	*snd_stereo;
-extern	cvar_t	*snd_interp;
-extern cvar_t *snd_stereo_phase_separation;
+extern	struct cvar_s	*snd_device;
+extern	struct cvar_s	*snd_rate;
+extern	struct cvar_s	*snd_bits;
+extern	struct cvar_s	*snd_stereo;
+extern	struct cvar_s	*snd_interp;
+extern	struct cvar_s *snd_stereo_phase_separation;
 
 extern qboolean	snd_initialized;
 
diff --git a/include/QF/teamplay.h b/include/QF/teamplay.h
index 64709b00f..5d15eb2dc 100644
--- a/include/QF/teamplay.h
+++ b/include/QF/teamplay.h
@@ -29,10 +29,8 @@
 #ifndef __teamplay_h
 #define __teamplay_h
 
-#include "QF/cvar.h"
-
-extern cvar_t	*cl_parsesay;
-extern cvar_t	*cl_nofake;
+extern struct cvar_s	*cl_parsesay;
+extern struct cvar_s	*cl_nofake;
 
 void Team_Init_Cvars (void);
 void Team_BestWeaponImpulse (void);
diff --git a/include/QF/vfs.h b/include/QF/vfs.h
index 1d57d32c6..e702a0cbe 100644
--- a/include/QF/vfs.h
+++ b/include/QF/vfs.h
@@ -33,15 +33,14 @@
 
 #include "QF/qtypes.h"
 #include "QF/vfile.h"
-#include "QF/cvar.h"
 
 //============================================================================
 
 #define	MAX_OSPATH	128		// max length of a filesystem pathname
 
-extern cvar_t *fs_userpath;
-extern cvar_t *fs_sharepath;
-extern cvar_t *fs_skinbase;
+extern struct cvar_s *fs_userpath;
+extern struct cvar_s *fs_sharepath;
+extern struct cvar_s *fs_skinbase;
 
 extern int com_filesize;
 struct cache_user_s;
diff --git a/include/glquake.h b/include/glquake.h
index 072613a8c..d0bb87c3d 100644
--- a/include/glquake.h
+++ b/include/glquake.h
@@ -39,7 +39,6 @@
 
 #include <GL/gl.h>
 
-#include "QF/cvar.h"
 #include "QF/model.h"
 #include "QF/qfgl_ext.h"
 #include "QF/wad.h"
@@ -88,56 +87,56 @@ extern	int	netgraphtexture;	// netgraph texture
 
 extern	int	skytexturenum;		// index in cl.loadmodel, not gl texture object
 
-extern cvar_t	*r_novis;
-extern cvar_t	*r_particles;
-extern cvar_t	*r_norefresh;
-extern cvar_t	*r_drawviewmodel;
-extern cvar_t	*r_shadows;
-extern cvar_t	*r_wateralpha;
-extern cvar_t	*r_waterripple;
-extern cvar_t	*r_dynamic;
-extern cvar_t	*r_netgraph;
-extern cvar_t	*r_lightmap;
-extern cvar_t	*r_mirroralpha;
+extern struct cvar_s	*r_novis;
+extern struct cvar_s	*r_particles;
+extern struct cvar_s	*r_norefresh;
+extern struct cvar_s	*r_drawviewmodel;
+extern struct cvar_s	*r_shadows;
+extern struct cvar_s	*r_wateralpha;
+extern struct cvar_s	*r_waterripple;
+extern struct cvar_s	*r_dynamic;
+extern struct cvar_s	*r_netgraph;
+extern struct cvar_s	*r_lightmap;
+extern struct cvar_s	*r_mirroralpha;
 
-extern cvar_t	*gl_affinemodels;
-extern cvar_t	*gl_clear;
-extern cvar_t	*gl_cull;
-extern cvar_t	*gl_poly;
-extern cvar_t	*gl_texsort;
-extern cvar_t	*gl_smoothmodels;
-extern cvar_t	*gl_affinemodels;
-extern cvar_t	*gl_polyblend;
-extern cvar_t	*gl_fb_bmodels;
-extern cvar_t	*gl_fb_models;
-extern cvar_t   *gl_dlight_lightmap;
-extern cvar_t	*gl_dlight_polyblend;
-extern cvar_t	*gl_dlight_smooth;
-extern cvar_t	*gl_keeptjunctions;
-extern cvar_t	*gl_reporttjunctions;
-extern cvar_t	*gl_flashblend;
-extern cvar_t	*gl_multitexture;
-extern cvar_t	*gl_nocolors;
-extern cvar_t	*gl_doubleeyes;
+extern struct cvar_s	*gl_affinemodels;
+extern struct cvar_s	*gl_clear;
+extern struct cvar_s	*gl_cull;
+extern struct cvar_s	*gl_poly;
+extern struct cvar_s	*gl_texsort;
+extern struct cvar_s	*gl_smoothmodels;
+extern struct cvar_s	*gl_affinemodels;
+extern struct cvar_s	*gl_polyblend;
+extern struct cvar_s	*gl_fb_bmodels;
+extern struct cvar_s	*gl_fb_models;
+extern struct cvar_s   *gl_dlight_lightmap;
+extern struct cvar_s	*gl_dlight_polyblend;
+extern struct cvar_s	*gl_dlight_smooth;
+extern struct cvar_s	*gl_keeptjunctions;
+extern struct cvar_s	*gl_reporttjunctions;
+extern struct cvar_s	*gl_flashblend;
+extern struct cvar_s	*gl_multitexture;
+extern struct cvar_s	*gl_nocolors;
+extern struct cvar_s	*gl_doubleeyes;
 
-extern cvar_t	*gl_ztrick;
-extern cvar_t	*gl_finish;
-extern cvar_t	*gl_clear;
-extern cvar_t	*gl_subdivide_size;
-extern cvar_t	*gl_particles;
-extern cvar_t	*gl_fires;
-extern cvar_t	*gl_fb_models;
-extern cvar_t	*gl_fb_bmodels;
-extern cvar_t	*gl_poly;
-extern cvar_t	*gl_polyblend;
+extern struct cvar_s	*gl_ztrick;
+extern struct cvar_s	*gl_finish;
+extern struct cvar_s	*gl_clear;
+extern struct cvar_s	*gl_subdivide_size;
+extern struct cvar_s	*gl_particles;
+extern struct cvar_s	*gl_fires;
+extern struct cvar_s	*gl_fb_models;
+extern struct cvar_s	*gl_fb_bmodels;
+extern struct cvar_s	*gl_poly;
+extern struct cvar_s	*gl_polyblend;
 
-extern cvar_t	*gl_max_size;
-extern cvar_t	*gl_playermip;
+extern struct cvar_s	*gl_max_size;
+extern struct cvar_s	*gl_playermip;
 
-extern cvar_t	*r_skyname;
-extern cvar_t	*gl_skymultipass;
-extern cvar_t	*gl_sky_clip;
-extern cvar_t	*gl_sky_divide;
+extern struct cvar_s	*r_skyname;
+extern struct cvar_s	*gl_skymultipass;
+extern struct cvar_s	*gl_sky_clip;
+extern struct cvar_s	*gl_sky_divide;
 
 extern int		mirrortexturenum;	// quake texturenum, not gltexturenum
 extern qboolean	mirror;
diff --git a/include/r_cvar.h b/include/r_cvar.h
index c38293c41..491d610bc 100644
--- a/include/r_cvar.h
+++ b/include/r_cvar.h
@@ -1,79 +1,79 @@
-extern cvar_t     *cl_crossx;
-extern cvar_t     *cl_crossy;
-extern cvar_t     *cl_verstring;
-extern cvar_t     *crosshair;
-extern cvar_t     *crosshaircolor;
+extern struct cvar_s     *cl_crossx;
+extern struct cvar_s     *cl_crossy;
+extern struct cvar_s     *cl_verstring;
+extern struct cvar_s     *crosshair;
+extern struct cvar_s     *crosshaircolor;
 
-extern cvar_t     *d_mipcap;
-extern cvar_t     *d_mipscale;
-extern cvar_t     *d_subdiv16;
+extern struct cvar_s     *d_mipcap;
+extern struct cvar_s     *d_mipscale;
+extern struct cvar_s     *d_subdiv16;
 
-extern cvar_t     *gl_affinemodels;
-extern cvar_t     *gl_clear;
-extern cvar_t     *gl_conalpha;
-extern cvar_t     *gl_conspin;
-extern cvar_t     *gl_constretch;
-extern cvar_t     *gl_dlight_lightmap;
-extern cvar_t     *gl_dlight_polyblend;
-extern cvar_t     *gl_dlight_smooth;
-extern cvar_t     *gl_fb_bmodels;
-extern cvar_t     *gl_fb_models;
-extern cvar_t     *gl_fires;
-extern cvar_t     *gl_keeptjunctions;
-extern cvar_t     *gl_lerp_anim;
-extern cvar_t     *gl_lightmap_components;
-extern cvar_t     *gl_max_size;
-extern cvar_t     *gl_nocolors;
-extern cvar_t     *gl_picmip;
-extern cvar_t     *gl_playermip;
-extern cvar_t     *gl_reporttjunctions;
-extern cvar_t     *gl_sky_clip;
-extern cvar_t     *gl_skymultipass;
-extern cvar_t     *gl_texsort;
-extern cvar_t     *gl_triplebuffer;
+extern struct cvar_s     *gl_affinemodels;
+extern struct cvar_s     *gl_clear;
+extern struct cvar_s     *gl_conalpha;
+extern struct cvar_s     *gl_conspin;
+extern struct cvar_s     *gl_constretch;
+extern struct cvar_s     *gl_dlight_lightmap;
+extern struct cvar_s     *gl_dlight_polyblend;
+extern struct cvar_s     *gl_dlight_smooth;
+extern struct cvar_s     *gl_fb_bmodels;
+extern struct cvar_s     *gl_fb_models;
+extern struct cvar_s     *gl_fires;
+extern struct cvar_s     *gl_keeptjunctions;
+extern struct cvar_s     *gl_lerp_anim;
+extern struct cvar_s     *gl_lightmap_components;
+extern struct cvar_s     *gl_max_size;
+extern struct cvar_s     *gl_nocolors;
+extern struct cvar_s     *gl_picmip;
+extern struct cvar_s     *gl_playermip;
+extern struct cvar_s     *gl_reporttjunctions;
+extern struct cvar_s     *gl_sky_clip;
+extern struct cvar_s     *gl_skymultipass;
+extern struct cvar_s     *gl_texsort;
+extern struct cvar_s     *gl_triplebuffer;
 
-extern cvar_t     *r_aliasstats;
-extern cvar_t     *r_aliastransadj;
-extern cvar_t     *r_aliastransbase;
-extern cvar_t     *r_ambient;
-extern cvar_t     *r_clearcolor;
-extern cvar_t     *r_drawentities;
-extern cvar_t     *r_drawflat;
-extern cvar_t     *r_draworder;
-extern cvar_t     *r_drawviewmodel;
-extern cvar_t     *r_dspeeds;
-extern cvar_t     *r_dynamic;
-extern cvar_t     *r_fullbright;
-extern cvar_t     *r_graphheight;
-extern cvar_t     *r_lightmap;
-extern cvar_t     *r_maxedges;
-extern cvar_t     *r_maxsurfs;
-extern cvar_t     *r_mirroralpha;
-extern cvar_t     *r_netgraph;
-extern cvar_t     *r_netgraph_alpha;
-extern cvar_t     *r_netgraph_box;
-extern cvar_t     *r_norefresh;
-extern cvar_t     *r_novis;
-extern cvar_t     *r_numedges;
-extern cvar_t     *r_numsurfs;
-extern cvar_t     *r_particles;
-extern cvar_t     *r_reportedgeout;
-extern cvar_t     *r_reportsurfout;
-extern cvar_t     *r_shadows;
-extern cvar_t     *r_skyname;
-extern cvar_t     *r_speeds;
-extern cvar_t     *r_timegraph;
-extern cvar_t     *r_wateralpha;
-extern cvar_t     *r_waterripple;
-extern cvar_t     *r_waterwarp;
-extern cvar_t     *r_zgraph;
+extern struct cvar_s     *r_aliasstats;
+extern struct cvar_s     *r_aliastransadj;
+extern struct cvar_s     *r_aliastransbase;
+extern struct cvar_s     *r_ambient;
+extern struct cvar_s     *r_clearcolor;
+extern struct cvar_s     *r_drawentities;
+extern struct cvar_s     *r_drawflat;
+extern struct cvar_s     *r_draworder;
+extern struct cvar_s     *r_drawviewmodel;
+extern struct cvar_s     *r_dspeeds;
+extern struct cvar_s     *r_dynamic;
+extern struct cvar_s     *r_fullbright;
+extern struct cvar_s     *r_graphheight;
+extern struct cvar_s     *r_lightmap;
+extern struct cvar_s     *r_maxedges;
+extern struct cvar_s     *r_maxsurfs;
+extern struct cvar_s     *r_mirroralpha;
+extern struct cvar_s     *r_netgraph;
+extern struct cvar_s     *r_netgraph_alpha;
+extern struct cvar_s     *r_netgraph_box;
+extern struct cvar_s     *r_norefresh;
+extern struct cvar_s     *r_novis;
+extern struct cvar_s     *r_numedges;
+extern struct cvar_s     *r_numsurfs;
+extern struct cvar_s     *r_particles;
+extern struct cvar_s     *r_reportedgeout;
+extern struct cvar_s     *r_reportsurfout;
+extern struct cvar_s     *r_shadows;
+extern struct cvar_s     *r_skyname;
+extern struct cvar_s     *r_speeds;
+extern struct cvar_s     *r_timegraph;
+extern struct cvar_s     *r_wateralpha;
+extern struct cvar_s     *r_waterripple;
+extern struct cvar_s     *r_waterwarp;
+extern struct cvar_s     *r_zgraph;
 
-extern cvar_t     *scr_centertime;
-extern cvar_t     *scr_consize;
-extern cvar_t     *scr_conspeed;
-extern cvar_t     *scr_fov;
-extern cvar_t     *scr_printspeed;
-extern cvar_t     *scr_showpause;
-extern cvar_t     *scr_showram;
-extern cvar_t     *scr_showturtle;
-extern cvar_t     *scr_viewsize;
+extern struct cvar_s     *scr_centertime;
+extern struct cvar_s     *scr_consize;
+extern struct cvar_s     *scr_conspeed;
+extern struct cvar_s     *scr_fov;
+extern struct cvar_s     *scr_printspeed;
+extern struct cvar_s     *scr_showpause;
+extern struct cvar_s     *scr_showram;
+extern struct cvar_s     *scr_showturtle;
+extern struct cvar_s     *scr_viewsize;
diff --git a/include/r_local.h b/include/r_local.h
index 71e5b6efd..0eb8e113b 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -30,7 +30,6 @@
 #define _R_LOCAL_H
 
 #include "QF/mathlib.h"
-#include "QF/cvar.h"
 #include "QF/vid.h"
 #include "QF/model.h"
 #include "r_shared.h"
diff --git a/include/view.h b/include/view.h
index 6bf8c450c..5e03a5ea5 100644
--- a/include/view.h
+++ b/include/view.h
@@ -31,7 +31,6 @@
 #define __view_h_
 
 #include "QF/mathlib.h"
-#include "QF/cvar.h"
 
 #define INFO_CSHIFT_BONUS		(1 << 0)
 #define INFO_CSHIFT_CONTENTS	(1 << 1)
diff --git a/libs/audio/snd.c b/libs/audio/snd.c
index 8e99e46f2..5481ec6ec 100644
--- a/libs/audio/snd.c
+++ b/libs/audio/snd.c
@@ -28,7 +28,7 @@
 	$Id$
 */
 
-#include "QF/qtypes.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 #include "QF/plugin.h"
 #include "QF/console.h"
diff --git a/libs/audio/snd_common.c b/libs/audio/snd_common.c
index efa4d9edd..54525b01d 100644
--- a/libs/audio/snd_common.c
+++ b/libs/audio/snd_common.c
@@ -28,7 +28,7 @@
 	$Id$
 */
 
-#include "QF/qtypes.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 
 channel_t   channels[MAX_CHANNELS];
diff --git a/libs/audio/targets/snd_alsa_0_9.c b/libs/audio/targets/snd_alsa_0_9.c
index 94f74b0f4..e4afb4e32 100644
--- a/libs/audio/targets/snd_alsa_0_9.c
+++ b/libs/audio/targets/snd_alsa_0_9.c
@@ -35,7 +35,7 @@
 
 #include <sys/asoundlib.h>
 
-#include "QF/qtypes.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 #include "QF/qargs.h"
 #include "QF/console.h"
diff --git a/libs/audio/targets/snd_disk.c b/libs/audio/targets/snd_disk.c
index 407ab059e..77e5e1346 100644
--- a/libs/audio/targets/snd_disk.c
+++ b/libs/audio/targets/snd_disk.c
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 #include "QF/qargs.h"
 #include "QF/plugin.h"
diff --git a/libs/audio/targets/snd_dma.c b/libs/audio/targets/snd_dma.c
index 0d82c6dc7..da1ef7c89 100644
--- a/libs/audio/targets/snd_dma.c
+++ b/libs/audio/targets/snd_dma.c
@@ -43,6 +43,7 @@
 #endif
 
 #include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "QF/console.h"
 #include "QF/model.h"
 #include "QF/qargs.h"
diff --git a/libs/audio/targets/snd_mem.c b/libs/audio/targets/snd_mem.c
index 6becca99e..39eac9152 100644
--- a/libs/audio/targets/snd_mem.c
+++ b/libs/audio/targets/snd_mem.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/qendian.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
diff --git a/libs/audio/targets/snd_mix.c b/libs/audio/targets/snd_mix.c
index 0771070f2..391cbdb72 100644
--- a/libs/audio/targets/snd_mix.c
+++ b/libs/audio/targets/snd_mix.c
@@ -38,6 +38,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 
 #ifdef _WIN32
diff --git a/libs/audio/targets/snd_null.c b/libs/audio/targets/snd_null.c
index a32a9dbc0..b551a9da2 100644
--- a/libs/audio/targets/snd_null.c
+++ b/libs/audio/targets/snd_null.c
@@ -29,7 +29,7 @@
 	$Id$
 */
 
-#include "QF/qtypes.h"
+#include "QF/cvar.h"
 #include "QF/sound.h"
 #include "QF/plugin.h"
 
diff --git a/libs/audio/targets/snd_oss.c b/libs/audio/targets/snd_oss.c
index edba9d82d..4584d3a31 100644
--- a/libs/audio/targets/snd_oss.c
+++ b/libs/audio/targets/snd_oss.c
@@ -57,6 +57,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/sound.h"
 #include "QF/plugin.h"
diff --git a/libs/util/plugin.c b/libs/util/plugin.c
index 84c0a134c..507ae1a53 100644
--- a/libs/util/plugin.c
+++ b/libs/util/plugin.c
@@ -53,6 +53,7 @@
 # endif
 #endif
 
+#include "QF/cvar.h"
 #include <QF/plugin.h>
 #include <QF/console.h>
 
diff --git a/libs/video/renderer/gl/gl_draw.c b/libs/video/renderer/gl/gl_draw.c
index 6ea2cbceb..703a1b906 100644
--- a/libs/video/renderer/gl/gl_draw.c
+++ b/libs/video/renderer/gl/gl_draw.c
@@ -40,6 +40,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/render.h"
 #include "QF/screen.h"
diff --git a/libs/video/renderer/gl/gl_dyn_fires.c b/libs/video/renderer/gl/gl_dyn_fires.c
index f2a0468dd..edc95ac8a 100644
--- a/libs/video/renderer/gl/gl_dyn_fires.c
+++ b/libs/video/renderer/gl/gl_dyn_fires.c
@@ -40,6 +40,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/render.h"
 
 #include "glquake.h"
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index afa1c58a2..edb5d3ff9 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
diff --git a/libs/video/renderer/gl/gl_rlight.c b/libs/video/renderer/gl/gl_rlight.c
index 179384d2e..49dc3c6ee 100644
--- a/libs/video/renderer/gl/gl_rlight.c
+++ b/libs/video/renderer/gl/gl_rlight.c
@@ -39,6 +39,7 @@
 #include <math.h>
 #include <stdio.h>
 
+#include "QF/cvar.h"
 #include "QF/render.h"
 
 #include "glquake.h"
diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c
index 39714fb3a..e36595868 100644
--- a/libs/video/renderer/gl/gl_rmain.c
+++ b/libs/video/renderer/gl/gl_rmain.c
@@ -42,6 +42,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/qargs.h"
diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c
index 077b9f8a4..fed878aa5 100644
--- a/libs/video/renderer/gl/gl_rsurf.c
+++ b/libs/video/renderer/gl/gl_rsurf.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/render.h"
 #include "QF/sys.h"
 
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index fdab6ca3b..0c40e7314 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
diff --git a/libs/video/renderer/gl/gl_skin.c b/libs/video/renderer/gl/gl_skin.c
index 674397db8..d5df9b118 100644
--- a/libs/video/renderer/gl/gl_skin.c
+++ b/libs/video/renderer/gl/gl_skin.c
@@ -32,6 +32,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/render.h"
 #include "QF/skin.h"
 #include "QF/texture.h"
diff --git a/libs/video/renderer/gl/gl_sky.c b/libs/video/renderer/gl/gl_sky.c
index 8f2346b2b..7e0703fb6 100644
--- a/libs/video/renderer/gl/gl_sky.c
+++ b/libs/video/renderer/gl/gl_sky.c
@@ -38,6 +38,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/render.h"
 #include "QF/tga.h"
 #include "QF/vfs.h"
diff --git a/libs/video/renderer/gl/gl_textures.c b/libs/video/renderer/gl/gl_textures.c
index 4d55438fc..3b0001600 100644
--- a/libs/video/renderer/gl/gl_textures.c
+++ b/libs/video/renderer/gl/gl_textures.c
@@ -43,6 +43,7 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/crc.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
diff --git a/libs/video/renderer/sw/d_edge.c b/libs/video/renderer/sw/d_edge.c
index 2020e983a..c19d6db4a 100644
--- a/libs/video/renderer/sw/d_edge.c
+++ b/libs/video/renderer/sw/d_edge.c
@@ -30,9 +30,11 @@
 # include "config.h"
 #endif
 
+#include "QF/cvar.h"
+#include "QF/render.h"
+
 #include "d_local.h"
 #include "r_local.h"
-#include "QF/render.h"
 
 static int  miplevel;
 
diff --git a/libs/video/renderer/sw/draw.c b/libs/video/renderer/sw/draw.c
index 0986b8cf7..7180c3d60 100644
--- a/libs/video/renderer/sw/draw.c
+++ b/libs/video/renderer/sw/draw.c
@@ -37,6 +37,7 @@
 #endif
 
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/sound.h"
 #include "QF/sys.h"
diff --git a/libs/video/renderer/sw/screen.c b/libs/video/renderer/sw/screen.c
index d2f0cfa0f..10829f32d 100644
--- a/libs/video/renderer/sw/screen.c
+++ b/libs/video/renderer/sw/screen.c
@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/keys.h"
 #include "QF/pcx.h"
diff --git a/libs/video/renderer/sw/sw_graph.c b/libs/video/renderer/sw/sw_graph.c
index c37cc0652..4cfeec3f2 100644
--- a/libs/video/renderer/sw/sw_graph.c
+++ b/libs/video/renderer/sw/sw_graph.c
@@ -30,6 +30,7 @@
 # include "config.h"
 #endif
 
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/render.h"
 
diff --git a/libs/video/renderer/sw/sw_rmain.c b/libs/video/renderer/sw/sw_rmain.c
index 86b9ae4ce..773737ccc 100644
--- a/libs/video/renderer/sw/sw_rmain.c
+++ b/libs/video/renderer/sw/sw_rmain.c
@@ -40,6 +40,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/locs.h"
 #include "QF/mathlib.h"
 #include "QF/render.h"
diff --git a/libs/video/renderer/sw/sw_rmisc.c b/libs/video/renderer/sw/sw_rmisc.c
index 7f8e7c262..0ed9fde6e 100644
--- a/libs/video/renderer/sw/sw_rmisc.c
+++ b/libs/video/renderer/sw/sw_rmisc.c
@@ -33,6 +33,7 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/render.h"
 #include "QF/sys.h"
diff --git a/libs/video/renderer/sw/sw_rpart.c b/libs/video/renderer/sw/sw_rpart.c
index 3879c8e41..d2e643acc 100644
--- a/libs/video/renderer/sw/sw_rpart.c
+++ b/libs/video/renderer/sw/sw_rpart.c
@@ -34,6 +34,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/vfs.h"
 #include "QF/render.h"
diff --git a/libs/video/targets/vid_common_gl.c b/libs/video/targets/vid_common_gl.c
index 802681cb6..d243d8b11 100644
--- a/libs/video/targets/vid_common_gl.c
+++ b/libs/video/targets/vid_common_gl.c
@@ -46,11 +46,13 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/input.h"
 #include "QF/qargs.h"
 #include "QF/qfgl_ext.h"
 #include "QF/vfs.h"
 #include "QF/vid.h"
+
 #include "glquake.h"
 #include "sbar.h"
 
diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c
index c257defdf..c5cf06b1e 100644
--- a/libs/video/targets/vid_sgl.c
+++ b/libs/video/targets/vid_sgl.c
@@ -43,14 +43,16 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
-#include "glquake.h"
+#include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "sbar.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 #include "QF/vid.h"
 
+#include "glquake.h"
+#include "sbar.h"
+
 #ifdef WIN32
 /* FIXME: this is evil hack to get full DirectSound support with SDL */
 # include <windows.h>
diff --git a/nq/include/chase.h b/nq/include/chase.h
index 1c4ac6a3b..d4f59bcdd 100644
--- a/nq/include/chase.h
+++ b/nq/include/chase.h
@@ -29,7 +29,7 @@
 #ifndef __chase_h
 #define __chase_h
 
-extern	cvar_t	*chase_active;
+extern	struct cvar_s	*chase_active;
 
 void Chase_Init_Cvars (void);
 void Chase_Reset (void);
diff --git a/nq/include/client.h b/nq/include/client.h
index cf7dca95e..c5ee2e22f 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 
-#include "QF/cvar.h"
 #include "QF/info.h"
 #include "QF/mathlib.h"
 #include "QF/model.h"
@@ -235,38 +234,38 @@ typedef struct
 /*
   cvars
 */
-extern cvar_t	*cl_name;
-extern cvar_t	*cl_color;
+extern struct cvar_s	*cl_name;
+extern struct cvar_s	*cl_color;
 
-extern cvar_t	*cl_upspeed;
-extern cvar_t	*cl_forwardspeed;
-extern cvar_t	*cl_backspeed;
-extern cvar_t	*cl_sidespeed;
+extern struct cvar_s	*cl_upspeed;
+extern struct cvar_s	*cl_forwardspeed;
+extern struct cvar_s	*cl_backspeed;
+extern struct cvar_s	*cl_sidespeed;
 
-extern cvar_t	*cl_movespeedkey;
+extern struct cvar_s	*cl_movespeedkey;
 
-extern cvar_t	*cl_yawspeed;
-extern cvar_t	*cl_pitchspeed;
+extern struct cvar_s	*cl_yawspeed;
+extern struct cvar_s	*cl_pitchspeed;
 
-extern cvar_t	*cl_anglespeedkey;
+extern struct cvar_s	*cl_anglespeedkey;
 
-extern cvar_t	*cl_autofire;
+extern struct cvar_s	*cl_autofire;
 
-extern cvar_t	*cl_shownet;
-extern cvar_t	*cl_nolerp;
+extern struct cvar_s	*cl_shownet;
+extern struct cvar_s	*cl_nolerp;
 
-extern cvar_t	*cl_sbar;
-extern cvar_t	*cl_hudswap;
+extern struct cvar_s	*cl_sbar;
+extern struct cvar_s	*cl_hudswap;
 
-extern cvar_t	*cl_pitchdriftspeed;
-extern cvar_t	*lookspring;
+extern struct cvar_s	*cl_pitchdriftspeed;
+extern struct cvar_s	*lookspring;
 
-extern cvar_t	*m_pitch;
-extern cvar_t	*m_yaw;
-extern cvar_t	*m_forward;
-extern cvar_t	*m_side;
+extern struct cvar_s	*m_pitch;
+extern struct cvar_s	*m_yaw;
+extern struct cvar_s	*m_forward;
+extern struct cvar_s	*m_side;
 
-extern struct cvar_s *cl_name;
+extern struct cvar_s	*cl_name;
 
 #define	MAX_TEMP_ENTITIES	64			// lightning bolts, etc
 #define	MAX_STATIC_ENTITIES	128			// torches, etc
diff --git a/nq/include/game.h b/nq/include/game.h
index 17bec69ad..4b2fec2f8 100644
--- a/nq/include/game.h
+++ b/nq/include/game.h
@@ -32,7 +32,6 @@
 #define __game_h
 
 #include "QF/qtypes.h"
-#include "QF/cvar.h"
 #include "QF/qdefs.h"
 
 #undef MAX_DATAGRAM
@@ -165,7 +164,7 @@ extern int			current_skill;		// skill level for currently loaded level (in case
 
 extern qboolean		isDedicated;
 extern qboolean		abyss, rogue, hipnotic, standard_quake;
-extern cvar_t		*registered;
+extern struct cvar_s		*registered;
 
 void Game_Init (void);
 
diff --git a/nq/include/host.h b/nq/include/host.h
index 6f67831f0..408a31b47 100644
--- a/nq/include/host.h
+++ b/nq/include/host.h
@@ -31,7 +31,6 @@
 
 #include "QF/gcc_attr.h"
 #include "QF/qtypes.h"
-#include "QF/cvar.h"
 
 extern qboolean noclip_anglehack;
 
@@ -47,11 +46,11 @@ typedef struct
 
 extern	quakeparms_t host_parms;
 
-extern	cvar_t	*sys_ticrate;
-extern	cvar_t	*sys_nostdout;
-extern	cvar_t	*developer;
+extern	struct cvar_s	*sys_ticrate;
+extern	struct cvar_s	*sys_nostdout;
+extern	struct cvar_s	*developer;
 
-extern	cvar_t	*pausable;
+extern	struct cvar_s	*pausable;
 
 extern	qboolean	host_initialized;		// true if into command execution
 extern	double		host_frametime;
diff --git a/nq/include/net.h b/nq/include/net.h
index 6611c371b..13b320845 100644
--- a/nq/include/net.h
+++ b/nq/include/net.h
@@ -31,7 +31,6 @@
 
 #include "QF/gcc_attr.h"
 #include "QF/sizebuf.h"
-#include "QF/cvar.h"
 
 struct qsockaddr
 {
@@ -349,14 +348,14 @@ extern	qboolean	slistLocal;
 
 void NET_Slist_f (void);
 
-extern cvar_t	*config_com_port;
-extern cvar_t	*config_com_irq;
-extern cvar_t	*config_com_baud;
-extern cvar_t	*config_com_modem;
-extern cvar_t	*config_modem_dialtype;
-extern cvar_t	*config_modem_clear;
-extern cvar_t	*config_modem_init;
-extern cvar_t	*config_modem_hangup;
-extern cvar_t	*hostname;
+extern struct cvar_s	*config_com_port;
+extern struct cvar_s	*config_com_irq;
+extern struct cvar_s	*config_com_baud;
+extern struct cvar_s	*config_com_modem;
+extern struct cvar_s	*config_modem_dialtype;
+extern struct cvar_s	*config_modem_clear;
+extern struct cvar_s	*config_modem_init;
+extern struct cvar_s	*config_modem_hangup;
+extern struct cvar_s	*hostname;
 
 #endif // __net_h
diff --git a/nq/include/server.h b/nq/include/server.h
index 9f5013a37..6e5e22ef0 100644
--- a/nq/include/server.h
+++ b/nq/include/server.h
@@ -32,15 +32,15 @@
 #include <setjmp.h>
 
 #include "QF/gcc_attr.h"
-#include "net.h"
-#include "QF/cvar.h"
-#include "protocol.h"
 #include "QF/model.h"
-#include "sv_progs.h"
 #include "QF/sizebuf.h"
 #include "QF/info.h"
 #include "QF/vfile.h"
+
 #include "client.h"
+#include "net.h"
+#include "protocol.h"
+#include "sv_progs.h"
 
 extern progs_t sv_pr_state;
 
@@ -220,26 +220,26 @@ typedef struct client_s
 
 //============================================================================
 
-extern	cvar_t	*teamplay;
-extern	cvar_t	*skill;
-extern	cvar_t	*deathmatch;
-extern	cvar_t	*coop;
-extern	cvar_t	*fraglimit;
-extern	cvar_t	*timelimit;
+extern	struct cvar_s	*teamplay;
+extern	struct cvar_s	*skill;
+extern	struct cvar_s	*deathmatch;
+extern	struct cvar_s	*coop;
+extern	struct cvar_s	*fraglimit;
+extern	struct cvar_s	*timelimit;
 
 
-extern	cvar_t	*sv_maxvelocity;
-extern	cvar_t	*sv_gravity;
-extern	cvar_t	*sv_nostep;
-extern	cvar_t	*sv_friction;
-extern	cvar_t	*sv_edgefriction;
-extern	cvar_t	*sv_stopspeed;
-extern	cvar_t	*sv_maxspeed;
-extern	cvar_t	*sv_accelerate;
-extern	cvar_t	*sv_idealpitchscale;
-extern	cvar_t	*sv_aim;
-extern	cvar_t	*sv_friction;
-extern	cvar_t	*sv_stopspeed;
+extern	struct cvar_s	*sv_maxvelocity;
+extern	struct cvar_s	*sv_gravity;
+extern	struct cvar_s	*sv_nostep;
+extern	struct cvar_s	*sv_friction;
+extern	struct cvar_s	*sv_edgefriction;
+extern	struct cvar_s	*sv_stopspeed;
+extern	struct cvar_s	*sv_maxspeed;
+extern	struct cvar_s	*sv_accelerate;
+extern	struct cvar_s	*sv_idealpitchscale;
+extern	struct cvar_s	*sv_aim;
+extern	struct cvar_s	*sv_friction;
+extern	struct cvar_s	*sv_stopspeed;
 
 extern	server_static_t	svs;				// persistant server info
 extern	server_t		sv;					// local server
diff --git a/nq/source/cl_cam.c b/nq/source/cl_cam.c
index ce4519ae4..74efbd63c 100644
--- a/nq/source/cl_cam.c
+++ b/nq/source/cl_cam.c
@@ -30,6 +30,7 @@
 # include "config.h"
 #endif
 
+#include "QF/cvar.h"
 #include "QF/mathlib.h"
 #include "client.h"
 #include "world.h"
diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c
index 57a4da237..2e9ece06a 100644
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@@ -39,6 +39,7 @@
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/input.h"
 #include "QF/keys.h"
 #include "QF/msg.h"
diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c
index 08967c664..535082ab8 100644
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@@ -39,6 +39,7 @@
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/sys.h"
 #include "QF/screen.h"
diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c
index 02cf40df5..bf062f4c7 100644
--- a/nq/source/cl_screen.c
+++ b/nq/source/cl_screen.c
@@ -39,6 +39,7 @@
 #include <time.h>
 
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/pcx.h"
 #include "QF/screen.h"
diff --git a/nq/source/console.c b/nq/source/console.c
index 1d23bf752..2528f5fba 100644
--- a/nq/source/console.c
+++ b/nq/source/console.c
@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/input.h"
 #include "QF/keys.h"
diff --git a/nq/source/gl_view.c b/nq/source/gl_view.c
index fbaf15c81..bcec563a1 100644
--- a/nq/source/gl_view.c
+++ b/nq/source/gl_view.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/info.h"
 
 #include "client.h"
diff --git a/nq/source/host.c b/nq/source/host.c
index cf5df819d..595b347c7 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -34,6 +34,7 @@
 #include "QF/compat.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/gib.h"
 #include "QF/input.h"
diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c
index f67f972e8..fbb68f7a9 100644
--- a/nq/source/host_cmd.c
+++ b/nq/source/host_cmd.c
@@ -30,12 +30,9 @@
 # include "config.h"
 #endif
 
-#include "client.h"
-#include "server.h"
-#include "host.h"
 #include "QF/cmd.h"
 #include "QF/compat.h"
-#include "world.h"
+#include "QF/cvar.h"
 #include "QF/va.h"
 #include "QF/screen.h"
 #include "QF/msg.h"
@@ -43,7 +40,12 @@
 #include "QF/console.h"
 #include "QF/keys.h"
 #include "QF/sys.h"
+
+#include "client.h"
+#include "host.h"
+#include "server.h"
 #include "sv_progs.h"
+#include "world.h"
 
 int         current_skill;
 
diff --git a/nq/source/host_skin.c b/nq/source/host_skin.c
index cb1590773..9093d50df 100644
--- a/nq/source/host_skin.c
+++ b/nq/source/host_skin.c
@@ -39,6 +39,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
 #include "QF/skin.h"
diff --git a/nq/source/net_dgrm.c b/nq/source/net_dgrm.c
index e0adb357a..fe0897f32 100644
--- a/nq/source/net_dgrm.c
+++ b/nq/source/net_dgrm.c
@@ -38,6 +38,7 @@
 #endif
 
 #include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "QF/sys.h"
 #include "QF/keys.h"
 #include "QF/qendian.h"
diff --git a/nq/source/net_loop.c b/nq/source/net_loop.c
index d76577cca..1a906aa66 100644
--- a/nq/source/net_loop.c
+++ b/nq/source/net_loop.c
@@ -30,12 +30,14 @@
 # include "config.h"
 #endif
 
+#include "QF/cvar.h"
 #include "QF/msg.h"
+#include "QF/console.h"
+#include "QF/sys.h"
+
 #include "net.h"
 #include "net_loop.h"
 #include "client.h"
-#include "QF/console.h"
-#include "QF/sys.h"
 #include "server.h"
 
 qboolean    localconnectpending = false;
diff --git a/nq/source/net_main.c b/nq/source/net_main.c
index 2feecf0ba..f4a658051 100644
--- a/nq/source/net_main.c
+++ b/nq/source/net_main.c
@@ -38,6 +38,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/qargs.h"
 #include "QF/sizebuf.h"
diff --git a/nq/source/net_udp.c b/nq/source/net_udp.c
index 5d58317a6..6953d1e2c 100644
--- a/nq/source/net_udp.c
+++ b/nq/source/net_udp.c
@@ -76,12 +76,14 @@
 #include <libc.h>
 #endif
 
-#include "net.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"
 #include "QF/console.h"
 
+#include "net.h"
+
 #ifdef _WIN32
 # undef EWOULDBLOCK
 # define EWOULDBLOCK    WSAEWOULDBLOCK
diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c
index 95e521142..c8c214212 100644
--- a/nq/source/pr_cmds.c
+++ b/nq/source/pr_cmds.c
@@ -38,6 +38,7 @@
 
 #include "QF/console.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/sys.h"
 #include "QF/cmd.h"
 #include "QF/va.h"
diff --git a/nq/source/r_view.c b/nq/source/r_view.c
index 53d96162c..b049e2a56 100644
--- a/nq/source/r_view.c
+++ b/nq/source/r_view.c
@@ -33,6 +33,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
diff --git a/nq/source/sbar.c b/nq/source/sbar.c
index 2cd4a5d7a..ee20fa756 100644
--- a/nq/source/sbar.c
+++ b/nq/source/sbar.c
@@ -33,6 +33,7 @@
 
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/screen.h"
 #include "QF/vid.h"
diff --git a/nq/source/skin.c b/nq/source/skin.c
index fa337d9b8..c31dd3f0b 100644
--- a/nq/source/skin.c
+++ b/nq/source/skin.c
@@ -38,6 +38,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/hash.h"
 #include "QF/pcx.h"
 #include "QF/skin.h"
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index f7fc1f57f..5da22c2de 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -30,15 +30,16 @@
 # include "config.h"
 #endif
 
-#include "server.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/sys.h"
 #include "QF/cmd.h"
 #include "host.h"
-#include "world.h"
+#include "server.h"
 #include "sv_progs.h"
+#include "world.h"
 
 server_t    sv;
 server_static_t svs;
diff --git a/nq/source/sv_phys.c b/nq/source/sv_phys.c
index b321998f2..8523499b8 100644
--- a/nq/source/sv_phys.c
+++ b/nq/source/sv_phys.c
@@ -30,12 +30,14 @@
 # include "config.h"
 #endif
 
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/sys.h"
+
 #include "server.h"
 #include "host.h"
 #include "world.h"
-#include "QF/console.h"
 #include "sv_progs.h"
-#include "QF/sys.h"
 
 /*
 
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index fe9fc4bb6..9079d1b5b 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -39,11 +39,12 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
+
 #include "host.h"
 #include "server.h"
 #include "sv_progs.h"
 #include "world.h"
-
 #include "progdefs.h"
 
 progs_t     sv_pr_state;
diff --git a/nq/source/sv_user.c b/nq/source/sv_user.c
index 41a3e42ae..e405261bd 100644
--- a/nq/source/sv_user.c
+++ b/nq/source/sv_user.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "server.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/console.h"
 #include "world.h"
diff --git a/nq/source/sw_view.c b/nq/source/sw_view.c
index 03497a429..1cecc6a40 100644
--- a/nq/source/sw_view.c
+++ b/nq/source/sw_view.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/info.h"
 
 #include "client.h"
diff --git a/qw/include/game.h b/qw/include/game.h
index ab7b5bbff..e17b462e9 100644
--- a/qw/include/game.h
+++ b/qw/include/game.h
@@ -32,10 +32,9 @@
 #define __game_h
 
 #include "QF/qtypes.h"
-#include "QF/cvar.h"
 #include "QF/qdefs.h"
 
-extern cvar_t		*registered;
+extern struct cvar_s		*registered;
 
 void Game_Init (void);
 void Game_Init_Cvars (void);
diff --git a/qw/include/net.h b/qw/include/net.h
index dbd27d91c..d61b67493 100644
--- a/qw/include/net.h
+++ b/qw/include/net.h
@@ -30,7 +30,6 @@
 #define _NET_H
 
 #include "QF/gcc_attr.h"
-#include "QF/cvar.h"
 #include "QF/qdefs.h"
 #include "QF/sizebuf.h"
 
@@ -51,7 +50,7 @@ extern	netadr_t	net_local_adr;
 extern	netadr_t	net_from;		// address of who sent the packet
 extern	struct msg_s *net_message;
 
-extern	cvar_t	*hostname;
+extern	struct cvar_s	*hostname;
 
 extern	int		net_socket;
 
diff --git a/qw/include/server.h b/qw/include/server.h
index a8cd6e7d6..1fb457728 100644
--- a/qw/include/server.h
+++ b/qw/include/server.h
@@ -31,16 +31,16 @@
 #define _SERVER_H
 
 #include "QF/gcc_attr.h"
-#include "host.h"
-#include "net.h"
-#include "QF/cvar.h"
-#include "protocol.h"
 #include "QF/model.h"
 #include "QF/progs.h"
 #include "QF/sizebuf.h"
 #include "QF/info.h"
 #include "QF/vfile.h"
 
+#include "host.h"
+#include "net.h"
+#include "protocol.h"
+
 #define	QW_SERVER
 
 #define	MAX_MASTERS	8				// max recipients for heartbeat packets
@@ -369,16 +369,16 @@ typedef enum
 //============================================================================
 // FIXME: declare exported variables in their own relevant .h
 
-extern	cvar_t	*sv_mintic, *sv_maxtic;
-extern	cvar_t	*sv_maxspeed;
+extern	struct cvar_s	*sv_mintic, *sv_maxtic;
+extern	struct cvar_s	*sv_maxspeed;
 
 extern	netadr_t	master_adr[MAX_MASTERS];	// address of the master server
 
-extern	cvar_t	*spawn;
-extern	cvar_t	*teamplay;
-extern	cvar_t	*deathmatch;
-extern	cvar_t	*fraglimit;
-extern	cvar_t	*timelimit;
+extern	struct cvar_s	*spawn;
+extern	struct cvar_s	*teamplay;
+extern	struct cvar_s	*deathmatch;
+extern	struct cvar_s	*fraglimit;
+extern	struct cvar_s	*timelimit;
 
 extern	server_static_t	svs;				// persistant server info
 extern	char	*svs_info;					// evil memory saving hack :)
diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c
index f6e559cc0..392b01958 100644
--- a/qw/source/cl_cam.c
+++ b/qw/source/cl_cam.c
@@ -43,11 +43,13 @@
 
 #include <math.h>
 
-#include "cl_cam.h"
-#include "client.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
+
+#include "cl_cam.h"
+#include "client.h"
 #include "pmove.h"
 #include "sbar.h"
 
diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c
index 931fbad03..53f32e54d 100644
--- a/qw/source/cl_ents.c
+++ b/qw/source/cl_ents.c
@@ -38,6 +38,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/render.h"
 #include "QF/skin.h"
diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c
index c6e3b2081..b8e0b360f 100644
--- a/qw/source/cl_input.c
+++ b/qw/source/cl_input.c
@@ -37,20 +37,22 @@
 #endif
 
 #include "QF/checksum.h"
+#include "QF/cmd.h"
+#include "QF/compat.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/input.h"
+#include "QF/keys.h"
+#include "QF/msg.h"
+#include "QF/teamplay.h"
+
 #include "cl_cam.h"
 #include "cl_demo.h"
 #include "cl_input.h"
 #include "cl_parse.h"
 #include "client.h"
-#include "QF/cmd.h"
-#include "QF/compat.h"
-#include "QF/console.h"
 #include "host.h"
-#include "QF/input.h"
-#include "QF/keys.h"
-#include "QF/msg.h"
 #include "msg_ucmd.h"
-#include "QF/teamplay.h"
 #include "view.h"
 
 cvar_t     *cl_nodelta;
diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c
index 00ed994d6..1e1b5f7be 100644
--- a/qw/source/cl_ngraph.c
+++ b/qw/source/cl_ngraph.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/render.h"
 
diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c
index f98d8dacb..f5f067f49 100644
--- a/qw/source/cl_parse.c
+++ b/qw/source/cl_parse.c
@@ -46,6 +46,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
 #include "QF/sound.h"
diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c
index 30fe80b68..469a278a2 100644
--- a/qw/source/cl_screen.c
+++ b/qw/source/cl_screen.c
@@ -39,6 +39,7 @@
 #include <time.h>
 
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/pcx.h"
 #include "QF/screen.h"
diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c
index 3250b07d3..3c94e1264 100644
--- a/qw/source/cl_skin.c
+++ b/qw/source/cl_skin.c
@@ -39,6 +39,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
 #include "QF/va.h"
diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c
index 393108d86..fdee17259 100644
--- a/qw/source/cl_slist.c
+++ b/qw/source/cl_slist.c
@@ -52,15 +52,17 @@
 #endif
 #include <stdlib.h>
 
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/sys.h"
+#include "QF/va.h"
+#include "QF/vfile.h"
+
 #include "bothdefs.h"
 #include "cl_main.h"
 #include "cl_slist.h"
 #include "client.h"
-#include "QF/cmd.h"
-#include "QF/console.h"
-#include "QF/sys.h"
-#include "QF/va.h"
-#include "QF/vfile.h"
 
 server_entry_t *slist;
 server_entry_t *all_slist;
diff --git a/qw/source/console.c b/qw/source/console.c
index 1d23bf752..2528f5fba 100644
--- a/qw/source/console.c
+++ b/qw/source/console.c
@@ -41,6 +41,7 @@
 #include "QF/cmd.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/input.h"
 #include "QF/keys.h"
diff --git a/qw/source/gl_view.c b/qw/source/gl_view.c
index d0dd2cb29..d77fb75c9 100644
--- a/qw/source/gl_view.c
+++ b/qw/source/gl_view.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/info.h"
 
 #include "bothdefs.h"
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index f0c569fbd..1881cc677 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -40,6 +40,7 @@
 #include <stdarg.h>
 
 #include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/va.h"
 #include "QF/vfs.h"
diff --git a/qw/source/sbar.c b/qw/source/sbar.c
index a33f6e4df..60a4ec3b6 100644
--- a/qw/source/sbar.c
+++ b/qw/source/sbar.c
@@ -40,6 +40,7 @@
 
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
diff --git a/qw/source/skin.c b/qw/source/skin.c
index e108d7cd0..a5bdf23c1 100644
--- a/qw/source/skin.c
+++ b/qw/source/skin.c
@@ -38,6 +38,7 @@
 
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/hash.h"
 #include "QF/pcx.h"
 #include "QF/skin.h"
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index 3bc630fb2..410cfc659 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -38,18 +38,20 @@
 
 #include <stdlib.h>
 
-#include "bothdefs.h"
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
 #include "QF/vfs.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "QF/sys.h"
 #include "QF/va.h"
 
+#include "bothdefs.h"
+#include "server.h"
+#include "sv_progs.h"
+
 qboolean    sv_allow_cheats;
 
 int         fp_messages = 4, fp_persecond = 4, fp_secondsdead = 10;
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index fec461327..a26b1373d 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -41,6 +41,7 @@
 
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/model.h"
 #include "QF/msg.h"
 #include "QF/plugin.h"
@@ -50,6 +51,7 @@
 #include "QF/ver_check.h"
 #include "QF/vfs.h"
 #include "QF/zone.h"
+
 #include "bothdefs.h"
 #include "buildnum.h"
 #include "game.h"
diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c
index b6c4ac52f..012d28aea 100644
--- a/qw/source/sv_pr_cmds.c
+++ b/qw/source/sv_pr_cmds.c
@@ -35,12 +35,14 @@
 
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
+#include "QF/va.h"
+
 #include "server.h"
 #include "sv_pr_cmds.h"
 #include "sv_progs.h"
 #include "world.h"
-#include "QF/va.h"
 
 #define	RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e))
 #define	RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s))
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index a44307634..cf7e1a397 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -39,6 +39,8 @@
 
 #include "QF/cmd.h"
 #include "QF/compat.h"
+#include "QF/cvar.h"
+
 #include "server.h"
 #include "progdefs.h"
 #include "sv_progs.h"
diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c
index e302a1f0f..b10d3b825 100644
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@@ -37,15 +37,17 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "bothdefs.h"
 #include "QF/compat.h"
 #include "QF/console.h"
+#include "QF/cvar.h"
 #include "QF/msg.h"
-#include "server.h"
-#include "sv_progs.h"
 #include "QF/sys.h"
 #include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
 
+#include "bothdefs.h"
+#include "server.h"
+#include "sv_progs.h"
+
 #define CHAN_AUTO   0
 #define CHAN_WEAPON 1
 #define CHAN_VOICE  2
diff --git a/qw/source/sw_view.c b/qw/source/sw_view.c
index c6be3369b..506b6513d 100644
--- a/qw/source/sw_view.c
+++ b/qw/source/sw_view.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "QF/compat.h"
+#include "QF/cvar.h"
 #include "QF/info.h"
 
 #include "bothdefs.h"
diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c
index 8f29ccc52..14ae1fa28 100644
--- a/qw/source/teamplay.c
+++ b/qw/source/teamplay.c
@@ -41,6 +41,7 @@
 #include "QF/compat.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
+#include "QF/cvar.h"
 #include "QF/locs.h"
 #include "QF/model.h"
 #include "QF/sys.h"