diff --git a/nq/include/render.h b/include/QF/render.h
similarity index 98%
rename from nq/include/render.h
rename to include/QF/render.h
index 970beb265..fd2a9baa9 100644
--- a/nq/include/render.h
+++ b/include/QF/render.h
@@ -34,8 +34,6 @@
 #include "QF/model.h"
 #include "QF/vid.h"
 
-#include "protocol.h"
-
 #define	TOP_RANGE		16			// soldier uniform colors
 #define	BOTTOM_RANGE	96
 
@@ -44,7 +42,7 @@ typedef struct entity_s
 {
 	qboolean				forcelink;		// model changed
 	int						update_type;
-	entity_state_t			baseline;		// to fill in defaults in updates
+	struct entity_state_s	*baseline;		// to fill in defaults in updates
 	double					msgtime;		// time of last update
 
 	int						keynum; // for matching entities in different frames
diff --git a/nq/include/client.h b/nq/include/client.h
index 1256f4c48..fbaeb4914 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -41,7 +41,7 @@
 #include "net.h"
 #include "protocol.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 #include "game.h"
 
 
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 93f5dee02..09dc2a84b 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -46,7 +46,7 @@
 #include "host.h"
 #include "host.h"
 #include "r_dynamic.h"
-#include "render.h"
+#include "QF/render.h"
 #include "server.h"
 
 byte       *vid_colormap;
diff --git a/nq/source/d_edge.c b/nq/source/d_edge.c
index c9b234b47..2020e983a 100644
--- a/nq/source/d_edge.c
+++ b/nq/source/d_edge.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static int  miplevel;
 
diff --git a/nq/source/d_init.c b/nq/source/d_init.c
index ebe2640d7..a480df141 100644
--- a/nq/source/d_init.c
+++ b/nq/source/d_init.c
@@ -36,7 +36,7 @@
 
 #include "d_local.h"
 #include "r_cvar.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define NUM_MIPS	4
 
diff --git a/nq/source/d_modech.c b/nq/source/d_modech.c
index caf1f0582..4784d414c 100644
--- a/nq/source/d_modech.c
+++ b/nq/source/d_modech.c
@@ -33,7 +33,7 @@
 #include "QF/sys.h"
 
 #include "d_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 int         d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
 
diff --git a/nq/source/d_scan.c b/nq/source/d_scan.c
index e70af537e..177645ebc 100644
--- a/nq/source/d_scan.c
+++ b/nq/source/d_scan.c
@@ -33,7 +33,7 @@
 #include "client.h"
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 unsigned char *r_turb_pbase, *r_turb_pdest;
 fixed16_t   r_turb_s, r_turb_t, r_turb_sstep, r_turb_tstep;
diff --git a/nq/source/d_sky.c b/nq/source/d_sky.c
index e523bf320..9614298ef 100644
--- a/nq/source/d_sky.c
+++ b/nq/source/d_sky.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define SKY_SPAN_SHIFT	5
 #define SKY_SPAN_MAX	(1 << SKY_SPAN_SHIFT)
diff --git a/nq/source/d_sprite.c b/nq/source/d_sprite.c
index f1b0bb4ad..831c07b83 100644
--- a/nq/source/d_sprite.c
+++ b/nq/source/d_sprite.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "d_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static int  sprite_height;
 static int  minindex, maxindex;
diff --git a/nq/source/gl_dyn_part.c b/nq/source/gl_dyn_part.c
index e3bdc73d5..ae53efeb3 100644
--- a/nq/source/gl_dyn_part.c
+++ b/nq/source/gl_dyn_part.c
@@ -49,7 +49,7 @@
 #include "glquake.h"
 #include "host.h"
 #include "r_dynamic.h"
-#include "render.h"
+#include "QF/render.h"
 
 static particle_t *particles, **freeparticles;
 static short r_numparticles, numparticles;
diff --git a/nq/source/gl_rmisc.c b/nq/source/gl_rmisc.c
index 7fbcda7e7..a7583455e 100644
--- a/nq/source/gl_rmisc.c
+++ b/nq/source/gl_rmisc.c
@@ -50,7 +50,7 @@
 #include "glquake.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 varray_t2f_c4f_v3f_t varray[MAX_VARRAY_VERTS];
 
diff --git a/nq/source/gl_skin.c b/nq/source/gl_skin.c
index a6df01009..337138959 100644
--- a/nq/source/gl_skin.c
+++ b/nq/source/gl_skin.c
@@ -36,7 +36,7 @@
 #include "QF/texture.h"
 
 #include "glquake.h"
-#include "render.h"
+#include "QF/render.h"
 
 static byte translate[256];
 static unsigned int translate32[256];
diff --git a/nq/source/gl_sky.c b/nq/source/gl_sky.c
index 7a9f3b9cd..2ccfd6412 100644
--- a/nq/source/gl_sky.c
+++ b/nq/source/gl_sky.c
@@ -43,7 +43,7 @@
 #include "QF/vid.h"
 
 #include "glquake.h"
-#include "render.h"
+#include "QF/render.h"
 #include "view.h"
 
 extern double realtime;
diff --git a/nq/source/r_part.c b/nq/source/r_part.c
index c8864b441..016d625ad 100644
--- a/nq/source/r_part.c
+++ b/nq/source/r_part.c
@@ -37,7 +37,7 @@
 
 #include "client.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define MAX_PARTICLES			2048	// default max # of particles at one
 										// time
diff --git a/nq/source/sw_raclip.c b/nq/source/sw_raclip.c
index 4983bf16f..2f8fa109a 100644
--- a/nq/source/sw_raclip.c
+++ b/nq/source/sw_raclip.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static finalvert_t fv[2][8];
 static auxvert_t av[8];
diff --git a/nq/source/sw_rbsp.c b/nq/source/sw_rbsp.c
index c3892b998..617924fbc 100644
--- a/nq/source/sw_rbsp.c
+++ b/nq/source/sw_rbsp.c
@@ -37,7 +37,7 @@
 
 #include "client.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 // current entity info
 qboolean    insubmodel;
diff --git a/nq/source/sw_rdraw.c b/nq/source/sw_rdraw.c
index 3e900bbad..c2fe65152 100644
--- a/nq/source/sw_rdraw.c
+++ b/nq/source/sw_rdraw.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define MAXLEFTCLIPEDGES		100
 
diff --git a/nq/source/sw_redge.c b/nq/source/sw_redge.c
index 44255c843..2c458151d 100644
--- a/nq/source/sw_redge.c
+++ b/nq/source/sw_redge.c
@@ -34,7 +34,7 @@
 
 #include "d_ifacea.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #if 0
 FIXME
diff --git a/nq/source/sw_rmisc.c b/nq/source/sw_rmisc.c
index fabc24e37..b8e02a223 100644
--- a/nq/source/sw_rmisc.c
+++ b/nq/source/sw_rmisc.c
@@ -38,7 +38,7 @@
 
 #include "host.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 #include "sbar.h"
 #include "server.h"
 #include "view.h"
diff --git a/nq/source/sw_skin.c b/nq/source/sw_skin.c
index 817056767..6bc947e75 100644
--- a/nq/source/sw_skin.c
+++ b/nq/source/sw_skin.c
@@ -40,7 +40,7 @@
 #include "QF/model.h"
 #include "QF/skin.h"
 
-#include "render.h"
+#include "QF/render.h"
 
 
 void
diff --git a/qw/include/cl_main.h b/qw/include/cl_main.h
index 4715dd59b..ab4d2a8bc 100644
--- a/qw/include/cl_main.h
+++ b/qw/include/cl_main.h
@@ -31,7 +31,7 @@
 
 #include "client.h"
 #include "QF/qtypes.h"
-#include "render.h"
+#include "QF/render.h"
 
 dlight_t *CL_AllocDlight (int key);
 void	CL_DecayLights (void);
diff --git a/qw/include/client.h b/qw/include/client.h
index 744c3a1fe..7c9579624 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -37,7 +37,7 @@
 #include "net.h"
 #include "protocol.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 
 /*
diff --git a/qw/include/render.h b/qw/include/render.h
deleted file mode 100644
index 0446a3944..000000000
--- a/qw/include/render.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	render.h
-
-	public interface to refresh functions
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-	$Id$
-*/
-
-#ifndef __render_h
-#define __render_h
-
-#include "QF/cvar.h"
-#include "QF/mathlib.h"
-#include "QF/model.h"
-#include "QF/vid.h"
-
-#define	TOP_RANGE		16			// soldier uniform colors
-#define	BOTTOM_RANGE	96
-
-
-typedef struct entity_s
-{
-	int						keynum; // for matching entities in different frames
-	vec3_t					origin;
-	vec3_t					old_origin;
-	vec3_t					angles;
-	vec3_t					msg_origins[2];	// last two updates (0 is newest)
-	vec3_t					msg_angles[2];	// last two updates (0 is newest)
-	struct model_s			*model;			// NULL = no model
-	int						frame;
-	byte					*colormap;
-	int						skinnum;		// for Alias models
-
-	struct player_info_s	*scoreboard;	// identify player
-
-	float					syncbase;		// for client-side animations
-
-	struct efrag_s			*efrag;			// linked list of efrags
-	int						visframe;		// last frame this entity was
-											// found in an active leaf
-
-	float					colormod[3];	// color tint for model
-	float					alpha;			// opacity (alpha) of the model
-	float					scale;			// size scaler of the model
-	float					glow_size;		// how big the glow is (can be negative)
-	byte					glow_color;		// color of glow (paletted)
-
-// FIXME: could turn these into a union
-	int						trivial_accept;
-	struct mnode_s			*topnode; // for bmodels, first world node that
-									  // splits bmodel, or NULL if not split
-
-	// Animation interpolation
-	float                   frame_start_time;
-	float                   frame_interval;
-	int						pose1;
-	int						pose2;
-} entity_t;
-
-// !!! if this is changed, it must be changed in asm_draw.h too !!!
-typedef struct
-{
-	vrect_t		vrect;				// subwindow in video for refresh
-									// FIXME: not need vrect next field here?
-	vrect_t		aliasvrect;			// scaled Alias version
-	int			vrectright, vrectbottom;	// right & bottom screen coords
-	int			aliasvrectright, aliasvrectbottom;	// scaled Alias versions
-	float		vrectrightedge;			// rightmost right edge we care about,
-										//  for use in edge list
-	float		fvrectx, fvrecty;		// for floating-point compares
-	float		fvrectx_adj, fvrecty_adj; // left and top edges, for clamping
-	int			vrect_x_adj_shift20;	// (vrect.x + 0.5 - epsilon) << 20
-	int			vrectright_adj_shift20;	// (vrectright + 0.5 - epsilon) << 20
-	float		fvrectright_adj, fvrectbottom_adj;
-										// right and bottom edges, for clamping
-	float		fvrectright;			// rightmost edge, for Alias clamping
-	float		fvrectbottom;			// bottommost edge, for Alias clamping
-	float		horizontalFieldOfView;	// at Z = 1.0, this many X is visible 
-										// 2.0 = 90 degrees
-	float		xOrigin;			// should probably always be 0.5
-	float		yOrigin;			// between be around 0.3 to 0.5
-
-	vec3_t		vieworg;
-	vec3_t		viewangles;
-
-	float		fov_x, fov_y;
-
-	int			ambientlight;
-} refdef_t;
-
-
-/*
-  REFRESH
-*/
-
-extern	int		reinit_surfcache;
-
-extern	refdef_t	r_refdef;
-extern vec3_t	r_origin, vpn, vright, vup;
-
-extern	struct texture_s	*r_notexture_mip;
-
-extern entity_t r_worldentity;
-
-void R_Init (void);
-void R_Init_Cvars (void);
-void R_InitEfrags (void);
-void R_InitSky (struct texture_s *mt);	// called at level load
-void R_Textures_Init (void);
-void R_RenderView (void);		// must set r_refdef first
-void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect);
-								// called whenever r_refdef or vid change
-
-void R_AddEfrags (entity_t *ent);
-void R_RemoveEfrags (entity_t *ent);
-
-void R_NewMap (void);
-
-
-// LordHavoc: relative bmodel lighting
-void R_PushDlights (vec3_t entorigin);
-void R_DrawWaterSurfaces (void);
-
-/*
-  Surface cache related
-*/
-extern	int		reinit_surfcache;	// if 1, surface cache is currently empty
-extern qboolean	r_cache_thrash;	// set if thrashing the surface cache
-
-void *D_SurfaceCacheAddress (void);
-int D_SurfaceCacheForRes (int width, int height);
-void D_FlushCaches (void);
-void D_DeleteSurfaceCache (void);
-void D_InitCaches (void *buffer, int size);
-void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
-
-void R_LoadSkys (const char *);
-
-#endif // __render_h
diff --git a/qw/source/d_edge.c b/qw/source/d_edge.c
index c9b234b47..2020e983a 100644
--- a/qw/source/d_edge.c
+++ b/qw/source/d_edge.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static int  miplevel;
 
diff --git a/qw/source/d_init.c b/qw/source/d_init.c
index 052c19c7c..59f3c9234 100644
--- a/qw/source/d_init.c
+++ b/qw/source/d_init.c
@@ -37,7 +37,7 @@
 #include "bothdefs.h"
 #include "d_local.h"
 #include "r_cvar.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define NUM_MIPS	4
 
diff --git a/qw/source/d_modech.c b/qw/source/d_modech.c
index caf1f0582..4784d414c 100644
--- a/qw/source/d_modech.c
+++ b/qw/source/d_modech.c
@@ -33,7 +33,7 @@
 #include "QF/sys.h"
 
 #include "d_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 int         d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
 
diff --git a/qw/source/d_scan.c b/qw/source/d_scan.c
index e70af537e..177645ebc 100644
--- a/qw/source/d_scan.c
+++ b/qw/source/d_scan.c
@@ -33,7 +33,7 @@
 #include "client.h"
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 unsigned char *r_turb_pbase, *r_turb_pdest;
 fixed16_t   r_turb_s, r_turb_t, r_turb_sstep, r_turb_tstep;
diff --git a/qw/source/d_sky.c b/qw/source/d_sky.c
index e523bf320..9614298ef 100644
--- a/qw/source/d_sky.c
+++ b/qw/source/d_sky.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define SKY_SPAN_SHIFT	5
 #define SKY_SPAN_MAX	(1 << SKY_SPAN_SHIFT)
diff --git a/qw/source/d_sprite.c b/qw/source/d_sprite.c
index f1b0bb4ad..831c07b83 100644
--- a/qw/source/d_sprite.c
+++ b/qw/source/d_sprite.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "d_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static int  sprite_height;
 static int  minindex, maxindex;
diff --git a/qw/source/gl_dyn_part.c b/qw/source/gl_dyn_part.c
index e3bdc73d5..ae53efeb3 100644
--- a/qw/source/gl_dyn_part.c
+++ b/qw/source/gl_dyn_part.c
@@ -49,7 +49,7 @@
 #include "glquake.h"
 #include "host.h"
 #include "r_dynamic.h"
-#include "render.h"
+#include "QF/render.h"
 
 static particle_t *particles, **freeparticles;
 static short r_numparticles, numparticles;
diff --git a/qw/source/gl_rmisc.c b/qw/source/gl_rmisc.c
index 3455576e1..3e23441a1 100644
--- a/qw/source/gl_rmisc.c
+++ b/qw/source/gl_rmisc.c
@@ -50,7 +50,7 @@
 #include "glquake.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 varray_t2f_c4f_v3f_t varray[MAX_VARRAY_VERTS];
 
diff --git a/qw/source/gl_skin.c b/qw/source/gl_skin.c
index 6115054f8..b5b9e42a1 100644
--- a/qw/source/gl_skin.c
+++ b/qw/source/gl_skin.c
@@ -36,7 +36,7 @@
 #include "QF/texture.h"
 
 #include "glquake.h"
-#include "render.h"
+#include "QF/render.h"
 
 static byte translate[256];
 static unsigned int translate32[256];
diff --git a/qw/source/gl_sky.c b/qw/source/gl_sky.c
index 7a9f3b9cd..2ccfd6412 100644
--- a/qw/source/gl_sky.c
+++ b/qw/source/gl_sky.c
@@ -43,7 +43,7 @@
 #include "QF/vid.h"
 
 #include "glquake.h"
-#include "render.h"
+#include "QF/render.h"
 #include "view.h"
 
 extern double realtime;
diff --git a/qw/source/sw_raclip.c b/qw/source/sw_raclip.c
index 4983bf16f..2f8fa109a 100644
--- a/qw/source/sw_raclip.c
+++ b/qw/source/sw_raclip.c
@@ -32,7 +32,7 @@
 
 #include "d_local.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 static finalvert_t fv[2][8];
 static auxvert_t av[8];
diff --git a/qw/source/sw_ralias.c b/qw/source/sw_ralias.c
index 221cc4379..e0d4cd15a 100644
--- a/qw/source/sw_ralias.c
+++ b/qw/source/sw_ralias.c
@@ -38,7 +38,7 @@
 #include "client.h"
 #include "d_ifacea.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define LIGHT_MIN	5	// lowest light value we'll allow, to
 						// avoid the need for inner-loop light clamping
diff --git a/qw/source/sw_rbsp.c b/qw/source/sw_rbsp.c
index c3892b998..617924fbc 100644
--- a/qw/source/sw_rbsp.c
+++ b/qw/source/sw_rbsp.c
@@ -37,7 +37,7 @@
 
 #include "client.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 // current entity info
 qboolean    insubmodel;
diff --git a/qw/source/sw_rdraw.c b/qw/source/sw_rdraw.c
index 95a8ba151..d854b6077 100644
--- a/qw/source/sw_rdraw.c
+++ b/qw/source/sw_rdraw.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #define MAXLEFTCLIPEDGES		100
 
diff --git a/qw/source/sw_redge.c b/qw/source/sw_redge.c
index 44255c843..2c458151d 100644
--- a/qw/source/sw_redge.c
+++ b/qw/source/sw_redge.c
@@ -34,7 +34,7 @@
 
 #include "d_ifacea.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 
 #if 0
 FIXME
diff --git a/qw/source/sw_rmisc.c b/qw/source/sw_rmisc.c
index 6122c278d..1fb2f69ae 100644
--- a/qw/source/sw_rmisc.c
+++ b/qw/source/sw_rmisc.c
@@ -40,7 +40,7 @@
 #include "client.h"
 #include "host.h"
 #include "r_local.h"
-#include "render.h"
+#include "QF/render.h"
 #include "sbar.h"
 
 void
diff --git a/qw/source/sw_skin.c b/qw/source/sw_skin.c
index 781586fbd..e695fbf51 100644
--- a/qw/source/sw_skin.c
+++ b/qw/source/sw_skin.c
@@ -39,7 +39,7 @@
 #include "QF/compat.h"
 #include "QF/skin.h"
 
-#include "render.h"
+#include "QF/render.h"
 
 
 void