diff --git a/nq/include/d_local.h b/include/d_local.h
similarity index 91%
rename from nq/include/d_local.h
rename to include/d_local.h
index 693f7a267..0d119c366 100644
--- a/nq/include/d_local.h
+++ b/include/d_local.h
@@ -1,7 +1,7 @@
 /*
 	d_local.h
 
-	@description@
+	Private rasterization driver defs
 
 	Copyright (C) 1996-1997  Id Software, Inc.
 
@@ -26,6 +26,8 @@
 	$Id$
 */
 
+#ifndef _D_LOCAL_H
+#define _D_LOCAL_H
 
 #include "r_shared.h"
 
@@ -49,8 +51,8 @@ typedef struct surfcache_s
 	int					lightadj[MAXLIGHTMAPS]; // checked for strobe flush
 	int					dlight;
 	int					size;		// including header
-	unsigned			width;
-	unsigned			height;		// DEBUG only needed for debug
+	unsigned int		width;
+	unsigned int		height;		// DEBUG only needed for debug
 	float				mipscale;
 	struct texture_s	*texture;	// checked for animating textures
 	byte				data[4];	// width*height elements
@@ -74,8 +76,8 @@ extern float	d_sdivzstepu, d_tdivzstepu, d_zistepu;
 extern float	d_sdivzstepv, d_tdivzstepv, d_zistepv;
 extern float	d_sdivzorigin, d_tdivzorigin, d_ziorigin;
 
-fixed16_t	sadjust, tadjust;
-fixed16_t	bbextents, bbextentt;
+extern fixed16_t       sadjust, tadjust;
+extern fixed16_t       bbextents, bbextentt;
 
 
 void D_DrawSpans8 (espan_t *pspans);
@@ -117,3 +119,4 @@ extern float	d_scalemip[3];
 
 extern void (*d_drawspans) (espan_t *pspan);
 
+#endif	// _D_LOCAL_H
diff --git a/nq/include/Makefile.am b/nq/include/Makefile.am
index 6be933181..ade878706 100644
--- a/nq/include/Makefile.am
+++ b/nq/include/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
-EXTRA_DIST=	chase.h client.h config.h.in conproc.h \
-		d_local.h game.h glquake2.h host.h net.h net_bw.h \
+EXTRA_DIST=	chase.h client.h conproc.h \
+		game.h host.h net.h net_bw.h \
 		net_dgrm.h net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h \
 		net_vcr.h net_wins.h net_wipx.h progdefs.h progdefs.q1 \
-		progdefs.q2 protocol.h r_local.h r_shared.h render.h \
-		resource.h server.h sv_pr_cmds.h sv_progs.h world.h
+		progdefs.q2 protocol.h r_dynamic.h render.h \
+		server.h sv_pr_cmds.h sv_progs.h world.h
diff --git a/qw/include/Makefile.am b/qw/include/Makefile.am
index 3b5635c48..f5597b258 100644
--- a/qw/include/Makefile.am
+++ b/qw/include/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=	foreign
 
 EXTRA_DIST =	bothdefs.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \
 		cl_main.h cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h \
-		commdef.h d_local.h game.h host.h \
-		modelgen.h msg_ucmd.h net.h pmove.h progdefs.h \
-		protocol.h r_dynamic.h r_local.h r_shared.h render.h server.h \
+		game.h host.h \
+		msg_ucmd.h net.h pmove.h progdefs.h \
+		protocol.h r_dynamic.h render.h server.h \
 		sv_pr_cmds.h sv_progs.h world.h