diff --git a/include/bspfile.h b/include/bspfile.h
index 4a0becc..95f4410 100644
--- a/include/bspfile.h
+++ b/include/bspfile.h
@@ -30,9 +30,6 @@
 #ifndef _BSPFILE_H
 #define _BSPFILE_H
 
-#include "qtypes.h"
-
-
 // upper design bounds
 
 #define	MAX_MAP_HULLS		4
diff --git a/include/cl_cam.h b/include/cl_cam.h
index 6bb48a6..5f6d0c4 100644
--- a/include/cl_cam.h
+++ b/include/cl_cam.h
@@ -1,7 +1,7 @@
 /*
-	client.h
+	cl_cam.h
 
-	Client definitions
+	Client camera definitions
 
 	Copyright (C) 1996-1997  Id Software, Inc.
 
@@ -33,14 +33,9 @@
 // try to get them self-sufficient by including whatever other 
 // headers they might need
 
-#include <stdio.h>
 
-#include "qtypes.h"
 #include "protocol.h"
 
-//
-// cl_cam.c
-//
 #define CAM_NONE	0
 #define CAM_TRACK	1
 
diff --git a/include/cl_pred.h b/include/cl_pred.h
index ac0fc1f..b1a820e 100644
--- a/include/cl_pred.h
+++ b/include/cl_pred.h
@@ -29,7 +29,6 @@
 #ifndef _CL_PRED_H
 #define _CL_PRED_H
 
-#include "qtypes.h"
 #include "client.h"
 
 void CL_Prediction_Init_Cvars (void);
diff --git a/include/client.h b/include/client.h
index 7010e52..965d71c 100644
--- a/include/client.h
+++ b/include/client.h
@@ -29,21 +29,13 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
-// since all headers are circular-protected with #ifdef _xxx_H
-// try to get them self-sufficient by including whatever other 
-// headers they might need
-
-#include <stdio.h>
-
 #include "info.h"
-#include "mathlib.h"
-#include "protocol.h"
 #include "net.h"
-#include "model.h"
-#include "sound.h"
-#include "render.h"
-#include "cvar.h"
+#include "protocol.h"
 #include "quakefs.h"
+#include "render.h"
+#include "vid.h"
+#include "zone.h"
 
 typedef struct
 {
@@ -321,36 +313,36 @@ typedef struct
 //
 // cvars
 //
-extern  cvar_t	*cl_warncmd;
-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_warncmd;
+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_shownet;
-extern	cvar_t	*cl_sbar;
-extern	cvar_t	*cl_sbar_separator;
-extern	cvar_t	*cl_hudswap;
+extern	struct cvar_s	*cl_shownet;
+extern	struct cvar_s	*cl_sbar;
+extern	struct cvar_s	*cl_sbar_separator;
+extern	struct cvar_s	*cl_hudswap;
 
-extern	cvar_t	*cl_pitchdriftspeed;
-extern	cvar_t	*lookspring;
-extern	cvar_t	*lookstrafe;
-extern	cvar_t	*sensitivity;
-extern	cvar_t	*cl_freelook;
+extern	struct cvar_s	*cl_pitchdriftspeed;
+extern	struct cvar_s	*lookspring;
+extern	struct cvar_s	*lookstrafe;
+extern	struct cvar_s	*sensitivity;
+extern	struct cvar_s	*cl_freelook;
 
-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	cvar_t	*name;
+extern	struct cvar_s	*name;
 
 
 #define	MAX_STATIC_ENTITIES	128			// torches, etc
diff --git a/include/commdef.h b/include/commdef.h
index 91e7271..69e9ab9 100644
--- a/include/commdef.h
+++ b/include/commdef.h
@@ -34,8 +34,8 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
 #include "gcc_attr.h"
+#include "qtypes.h"
 
 /* The host system specifies the base of the directory tree, the
    command line parms passed to the program, and the amount of memory
@@ -53,8 +53,8 @@ typedef struct
 /* Host */
 extern	quakeparms_t host_parms;
 
-extern	cvar_t		*sys_nostdout;
-extern	cvar_t		*developer;
+extern	struct cvar_s	*sys_nostdout;
+extern	struct cvar_s	*developer;
 
 extern	qboolean	host_initialized;	/* True if into command execution. */
 //extern	double		host_frametime;
diff --git a/include/context_x11.h b/include/context_x11.h
index d55790e..2783696 100644
--- a/include/context_x11.h
+++ b/include/context_x11.h
@@ -34,7 +34,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "cvar.h"
 #include "qtypes.h"
 
 void GetEvent( void );
@@ -48,7 +47,7 @@ extern Window	x_win;
 extern qboolean doShm;
 extern int		x_shmeventtype;
 extern qboolean oktodraw;
-extern cvar_t	*vid_fullscreen;
+extern struct cvar_s	*vid_fullscreen;
 
 qboolean x11_add_event (int event, void (*event_handler)(XEvent *));
 qboolean x11_del_event (int event, void (*event_handler)(XEvent *));
diff --git a/include/d_iface.h b/include/d_iface.h
index 90fdda9..eae297a 100644
--- a/include/d_iface.h
+++ b/include/d_iface.h
@@ -31,7 +31,6 @@
 
 #include "mathlib.h"
 #include "model.h"
-#include "cvar.h"
 
 #define WARP_WIDTH		320
 #define WARP_HEIGHT		200
@@ -120,7 +119,7 @@ typedef struct
 	int		color;
 } zpointdesc_t;
 
-extern cvar_t	*r_drawflat;
+extern struct cvar_s	*r_drawflat;
 extern int		d_spanpixcount;
 extern int		r_framecount;		// sequence # of current frame since Quake
 									//  started
diff --git a/include/fractalnoise.h b/include/fractalnoise.h
index 143940c..52ee5dc 100644
--- a/include/fractalnoise.h
+++ b/include/fractalnoise.h
@@ -29,8 +29,6 @@
 #ifndef _FRACTALNOISE_H
 #define _FRACTALNOISE_H
 
-#include <stdlib.h>
-
 void fractalnoise(unsigned char *noise, int size);
 
 #endif // _FRACTALNOISE_H
diff --git a/include/glquake.h b/include/glquake.h
index be13883..7b3fb2c 100644
--- a/include/glquake.h
+++ b/include/glquake.h
@@ -45,7 +45,6 @@
 #endif
 
 #include <GL/gl.h>
-//#include <GL/glu.h>
 
 #include "model.h"
 #include "render.h"
diff --git a/include/info.h b/include/info.h
index c65de7c..24f4c1e 100644
--- a/include/info.h
+++ b/include/info.h
@@ -29,6 +29,14 @@
 #ifndef _INFO_H
 #define _INFO_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #define	MAX_INFO_STRING			512
 #define	MAX_SERVERINFO_STRING	512
 #define	MAX_LOCALINFO_STRING	32768
diff --git a/source/cl_main.c b/source/cl_main.c
index 24f304c..458d4f3 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -41,9 +41,7 @@
 #ifdef HAVE_WINSOCK_H
 #include <winsock.h>
 #endif
-#ifdef HAVE_SETJMP_H
 #include <setjmp.h>
-#endif
 
 #include "bothdefs.h"
 #include "buildnum.h"
diff --git a/source/cl_misc.c b/source/cl_misc.c
index e2b9ea2..fbbb1e1 100644
--- a/source/cl_misc.c
+++ b/source/cl_misc.c
@@ -30,6 +30,8 @@
 # include "config.h"
 #endif
 
+#include <stdarg.h>
+
 #include "host.h"
 #include "sys.h"
 
diff --git a/source/cl_parse.c b/source/cl_parse.c
index ec7deba..6b8ce16 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -60,6 +60,7 @@
 #include "screen.h"
 #include "sbar.h"
 #include "skin.h"
+#include "sound.h"
 #include "teamplay.h"
 #include "va.h"
 #include "view.h"
diff --git a/source/cl_sys_unix.c b/source/cl_sys_unix.c
index df87ef0..b4fab92 100644
--- a/source/cl_sys_unix.c
+++ b/source/cl_sys_unix.c
@@ -44,6 +44,7 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
+#include "cvar.h"
 #include "host.h"
 #include "qargs.h"
 #include "sys.h"
diff --git a/source/cl_tent.c b/source/cl_tent.c
index b541c45..3b8e886 100644
--- a/source/cl_tent.c
+++ b/source/cl_tent.c
@@ -45,8 +45,10 @@
 #include "client.h"
 #include "console.h"
 #include "host.h"
+#include "model.h"
 #include "msg.h"
 #include "r_dynamic.h"
+#include "sound.h"
 
 #define	MAX_BEAMS	8
 #define MAX_BEAM_ENTS 20
diff --git a/source/gl_rmain.c b/source/gl_rmain.c
index d8bb9a5..0166a86 100644
--- a/source/gl_rmain.c
+++ b/source/gl_rmain.c
@@ -49,6 +49,7 @@
 #include "qargs.h"
 #include "r_dynamic.h"
 #include "skin.h"
+#include "sound.h"
 #include "sys.h"
 #include "view.h"
 
diff --git a/source/menu.c b/source/menu.c
index 3fd0126..1661cf6 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -66,6 +66,7 @@
 #include "va.h"
 #include "vid.h"
 #include "view.h"
+#include "winquake.h"
 
 void        (*vid_menudrawfn) (void);
 void        (*vid_menukeyfn) (int key);
diff --git a/source/r_edge.c b/source/r_edge.c
index a3ad82f..a4add6e 100644
--- a/source/r_edge.c
+++ b/source/r_edge.c
@@ -32,6 +32,7 @@
 
 #include "d_ifacea.h"
 #include "r_local.h"
+#include "sound.h"
 
 #if 0
 // FIXME
diff --git a/source/r_main.c b/source/r_main.c
index 6ed2bfa..ac1c6bb 100644
--- a/source/r_main.c
+++ b/source/r_main.c
@@ -45,6 +45,7 @@
 #include "cmd.h"
 #include "r_local.h"
 #include "screen.h"
+#include "sound.h"
 #include "sys.h"
 #include "view.h"
 
diff --git a/source/snd_dma.c b/source/snd_dma.c
index d050dd4..7124adf 100644
--- a/source/snd_dma.c
+++ b/source/snd_dma.c
@@ -42,6 +42,7 @@
 #include "cmd.h"
 #include "console.h"
 #include "host.h"
+#include "model.h"
 #include "qargs.h"
 #include "sys.h"
 #include "sound.h"
diff --git a/source/teamplay.c b/source/teamplay.c
index eba53e1..ba0682a 100644
--- a/source/teamplay.c
+++ b/source/teamplay.c
@@ -43,6 +43,7 @@
 #include "cmd.h"
 #include "client.h"
 #include "locs.h"
+#include "model.h"
 #include "quakefs.h"
 #include "sys.h"
 #include "teamplay.h"
diff --git a/source/world.c b/source/world.c
index 2ff166e..e88766b 100644
--- a/source/world.c
+++ b/source/world.c
@@ -41,6 +41,7 @@
 #include "commdef.h"
 #include "console.h"
 #include "crc.h"
+#include "mathlib.h"
 #include "server.h"
 #include "world.h"