include/QF header cleanup. including config.h (or any file from include) is

a nono because headers in include/QF get installed, but include don't and thus
would break quakeforge-dev.

configure.in

@@ -252,19 +252,6 @@ AC_TRY_COMPILE(
 	AC_MSG_RESULT(no)
 )
 
-AC_MSG_CHECKING(for zero length array syntax)
-AC_TRY_COMPILE(
-	[],
-	[struct { int foo; int bar[0]; } foo;],
-	AC_DEFINE(ZERO_LENGTH_ARRAY,0) AC_MSG_RESULT([0]),
-	AC_TRY_COMPILE(
-	    [],
-		[struct { int foo; int bar[]; } foo;],
-		AC_DEFINE(ZERO_LENGTH_ARRAY,) AC_MSG_RESULT([]),
-		AC_DEFINE(ZERO_LENGTH_ARRAY,1) AC_MSG_RESULT([1] sorry about the waste)
-	)
-)
-
 dnl ==================================================================
 dnl Checks for library functions.
 dnl ==================================================================

include/Makefile.am

@@ -1,13 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = QF
-EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h block8.h \
-	buildnum.h context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h \
-	dosisms.h fbset.h gib_error.h gib_instructions.h gib_interpret.h \
-	gib_modules.h gib_parse.h gib_stack.h gib_vars.h gl_warp_sin.h \
-	glquake.h in_win.h logos.h menu.h mpdosock.h quakeasm.h r_cvar.h \
-	r_dynamic.h r_local.h r_shared.h sbar.h stamp-h.in vgamodes.h \
-	vid_dos.h view.h vregset.h winquake.h \
+EXTRA_DIST = asm_i386.h adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h \
+	block8.h buildnum.h compat.h context_x11.h d_iface.h d_ifacea.h d_local.h \
+	dga_check.h dosisms.h fbset.h gib_error.h gib_instructions.h \
+	gib_interpret.h gib_modules.h gib_parse.h gib_stack.h gib_vars.h \
+	gl_warp_sin.h glquake.h in_win.h logos.h menu.h mpdosock.h qfgl_ext.h \
+	quakeasm.h r_cvar.h r_dynamic.h r_local.h r_shared.h sbar.h stamp-h.in \
+	varrays.h vgamodes.h vid_dos.h view.h vregset.h winquake.h \
 	\
 	win32/bc/borland.c win32/bc/config.h \
 	\

include/QF/Makefile.am

@@ -1,10 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = plugin
 includedir = $(prefix)/include/QF
-include_HEADERS = asm_i386.h bspfile.h cdaudio.h checksum.h cmd.h compat.h \
+include_HEADERS = bspfile.h cdaudio.h checksum.h cmd.h \
 	console.h crc.h cvar.h draw.h gcc_attr.h gib.h hash.h hl.h info.h \
 	input.h joystick.h keys.h link.h locs.h mathlib.h mdfour.h model.h \
 	modelgen.h msg.h pcx.h plugin.h pr_comp.h progs.h qargs.h qdefs.h \
-	qendian.h qfgl_ext.h qfplist.h qtypes.h render.h screen.h sizebuf.h \
+	qendian.h qfplist.h qtypes.h render.h screen.h sizebuf.h \
 	skin.h sound.h spritegn.h sys.h teamplay.h texture.h tga.h uint32.h \
-	va.h varrays.h ver_check.h vfile.h vfs.h vid.h wad.h zone.h
+	va.h ver_check.h vfile.h vfs.h vid.h wad.h zone.h

include/QF/info.h

@@ -29,10 +29,6 @@
 #ifndef _INFO_H
 #define _INFO_H
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h> // for size_t. sys/types.h SHOULD be used, but can't :(bc)
 #include <QF/qtypes.h>
 

include/QF/qtypes.h

@@ -34,9 +34,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-//#include "QF/qdefs.h"
-//#include "QF/compat.h"
-
 #define MAX_QPATH	64
 
 #ifndef _DEF_BYTE_

include/QF/texture.h

@@ -32,16 +32,12 @@
 #ifndef __texture_h
 #define __texture_h
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 // could not use texture_t as that is used for models.
 typedef struct tex_s {
 	int width;
 	int height;
 	unsigned char *palette;					// 0 = 32 bit, otherise 8
-	unsigned char data[ZERO_LENGTH_ARRAY];
+	unsigned char data[4];					// variable length
 } tex_t;
 
 #endif // __texture_h

include/QF/va.h

@@ -30,10 +30,6 @@
 #ifndef __va_h
 #define __va_h
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "QF/gcc_attr.h"
 
 char	*va(char *format, ...) __attribute__((format(printf,1,2)));

include/QF/ver_check.h

@@ -29,10 +29,6 @@
 #ifndef __ver_check_h_
 #define __ver_check_h_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 /*
 	ver_compare
 

include/QF/vfile.h

@@ -30,24 +30,11 @@
 #ifndef __quakeio_h
 #define __quakeio_h
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdio.h>
 
-#ifdef HAVE_ZLIB
-# include <zlib.h>
-#endif
-
 #include "QF/gcc_attr.h"
 
-typedef struct {
-	FILE *file;
-#ifdef HAVE_ZLIB
-	gzFile *gzfile;
-#endif
-} VFile;
+typedef struct VFile_s VFile;
 
 void Qexpand_squiggle(const char *path, char *dest);
 int Qrename(const char *old, const char *new);

include/QF/wad.h

@@ -52,8 +52,7 @@
 typedef struct qpic_s
 {
 	int			width, height;
-//	byte		data[4];			// variably sized
-	byte		data[ZERO_LENGTH_ARRAY];			// variably sized
+	byte		data[4];			// variably sized
 } qpic_t;
 
 typedef struct

libs/audio/cd/cd_linux.c

@@ -48,7 +48,7 @@
 #include <time.h>
 #include <linux/cdrom.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"

libs/audio/cd/cd_sdl.c

@@ -41,7 +41,7 @@
 
 #include <SDL.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
 #include "QF/console.h"

libs/audio/cd/cd_win.c

@@ -34,7 +34,7 @@
 
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"

libs/audio/targets/snd_mix.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/sound.h"

libs/audio/targets/snd_mixa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 // #include "quakeasm.h"
 
 #ifdef USE_INTEL_ASM

libs/gamecode/pr_edict.c

@@ -39,7 +39,7 @@
 #include <stdio.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"

libs/gamecode/pr_exec.c

@@ -38,7 +38,7 @@
 
 #include <stdarg.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/progs.h"

libs/models/alias/gl_mesh.c

@@ -38,7 +38,7 @@
 
 #include <stdio.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/mdfour.h"
 #include "QF/model.h"

libs/models/alias/gl_model_alias.c

@@ -39,7 +39,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/model.h"
 #include "QF/qendian.h"

libs/models/alias/model_alias.c

@@ -39,7 +39,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/crc.h"
 #include "QF/info.h"
 #include "QF/model.h"

libs/models/brush/gl_model_brush.c

@@ -39,7 +39,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "glquake.h"
 #include "QF/model.h"

libs/models/brush/model_brush.c

@@ -43,7 +43,7 @@
 
 
 #include "QF/checksum.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/model.h"
 #include "QF/qendian.h"

libs/models/sprite/gl_model_sprite.c

@@ -40,7 +40,7 @@
 #endif
 
 #include "glquake.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/model.h"
 #include "QF/qendian.h"
 

libs/util/cmd.c

@@ -40,7 +40,7 @@
 
 #include "QF/cvar.h"
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/hash.h"
 #include "QF/qargs.h"

libs/util/console.c

@@ -38,7 +38,7 @@
 
 #include <stdarg.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/sys.h"

libs/util/cvar.c

@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"

libs/util/hash.c

@@ -37,7 +37,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/hash.h"
 
 static unsigned long

libs/util/info.c

@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/info.h"
 

libs/util/math.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 // #include "quakeasm.h"
 
 

libs/util/quakefs.c

@@ -62,7 +62,7 @@
 #include <limits.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/hash.h"

libs/util/quakeio.c

@@ -31,6 +31,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_ZLIB
+# include <zlib.h>
+#endif
 #ifdef HAVE_MALLOC_H
 # include <malloc.h>
 #endif
@@ -67,6 +70,14 @@
 # endif
 #endif
 
+struct VFile_s {
+	FILE *file;
+#ifdef HAVE_ZLIB
+	gzFile *gzfile;
+#endif
+};
+
+
 void
 Qexpand_squiggle (const char *path, char *dest)
 {

libs/util/sys.c

@@ -53,7 +53,7 @@
 # include <windows.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/sys.h"
 

libs/util/sys_error.c

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/sys.h"
 
 void

libs/util/va.c

@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/qtypes.h"
 #include "QF/va.h"
 

libs/video/renderer/gl/gl_dyn_part.c

@@ -39,13 +39,13 @@
 #include <stdlib.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/render.h"
 #include "QF/sys.h"
-#include "QF/varrays.h"
+#include "varrays.h"
 #include "QF/vfs.h"
 
 #include "glquake.h"

libs/video/renderer/gl/gl_rmain.c

@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/locs.h"

libs/video/renderer/gl/gl_rmisc.c

@@ -45,7 +45,7 @@
 #include "QF/skin.h"
 #include "QF/sys.h"
 #include "QF/vid.h"
-#include "QF/varrays.h"
+#include "varrays.h"
 #include "QF/vfs.h"
 
 #include "glquake.h"

libs/video/renderer/gl/gl_rsurf.c

@@ -40,7 +40,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/render.h"
 #include "QF/sys.h"

libs/video/renderer/gl/gl_screen.c

@@ -39,7 +39,7 @@
 #include <time.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"

libs/video/renderer/gl/gl_skin.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/render.h"

libs/video/renderer/gl/gl_sky.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/render.h"

libs/video/renderer/gl/gl_textures.c

@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/crc.h"
 #include "QF/cvar.h"

libs/video/renderer/r_cvar.c

@@ -1,3 +1,39 @@
+/*
+	r_cvar.c
+
+	renderer cvar definitions
+
+	Copyright (C) 2000       Bill Currie
+	                         Ragnvald Maartmann-Moe IV
+
+	Author: Bill Currie
+	        Ragnvald Maartmann-Moe IV
+	Date: 2001/5/17
+
+	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$
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include "QF/cvar.h"
 
 extern cvar_t *gl_sky_divide;		// FIXME

libs/video/renderer/r_part.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "QF/qargs.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/render.h"
 

libs/video/renderer/sw/d_draw.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/d_draw16.S

@@ -30,7 +30,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/d_init.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/render.h"
 #include "QF/vid.h"

libs/video/renderer/sw/d_parta.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "d_ifacea.h"
 #include "asm_draw.h"

libs/video/renderer/sw/d_polysa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/d_scana.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/d_spr8.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 

libs/video/renderer/sw/d_varsa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/screen.c

@@ -39,7 +39,7 @@
 #include <time.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"

libs/video/renderer/sw/surf16.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 

libs/video/renderer/sw/surf8.S

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 

libs/video/renderer/sw/sw_raclipa.S

@@ -30,7 +30,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/sw_raliasa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/sw_rdrawa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/sw_redgea.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 

libs/video/renderer/sw/sw_rmisc.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"

libs/video/renderer/sw/sw_rpart.c

@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"

libs/video/renderer/sw/sw_rvarsa.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

libs/video/renderer/sw/sw_skin.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/model.h"
 #include "QF/skin.h"
 

libs/video/renderer/sw/transform.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 
 #undef USE_INTEL_ASM //XXX asm pic hack

libs/video/targets/d_copy.S

@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 

libs/video/targets/in_sdl.c

@@ -31,7 +31,7 @@
 
 #include <SDL.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

libs/video/targets/in_svgalib.c

@@ -43,7 +43,7 @@
 #include <vgamouse.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

libs/video/targets/in_win.c

@@ -36,7 +36,7 @@
 #include <dinput.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/input.h"
 #include "QF/keys.h"

libs/video/targets/in_x11.c

@@ -55,7 +55,7 @@
 # include <X11/extensions/xf86dga.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
 #include "QF/cvar.h"

libs/video/targets/joy.c

@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

libs/video/targets/joy_win.c

@@ -42,7 +42,7 @@
 #undef byte
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

libs/video/targets/vid.c

@@ -31,7 +31,7 @@
 #endif
 #include <math.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"

libs/video/targets/vid_3dfxsvga.c

@@ -44,12 +44,12 @@
 #include <glide/sst1vid.h>
 #include <sys/signal.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "glquake.h"
 #include "QF/qargs.h"
 #include "QF/qendian.h"
-#include "QF/qfgl_ext.h"
+#include "qfgl_ext.h"
 #include "QF/quakefs.h"
 #include "sbar.h"
 #include "QF/sys.h"

libs/video/targets/vid_common_gl.c

@@ -44,12 +44,12 @@
 
 #include <GL/gl.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"
 #include "QF/qargs.h"
-#include "QF/qfgl_ext.h"
+#include "qfgl_ext.h"
 #include "QF/vfs.h"
 #include "QF/vid.h"
 

libs/video/targets/vid_glx.c

@@ -47,7 +47,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/input.h"
 #include "QF/qargs.h"

libs/video/targets/vid_sdl.c

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <SDL.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qendian.h"

libs/video/targets/vid_sgl.c

@@ -41,7 +41,7 @@
 
 #include <SDL.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"

libs/video/targets/vid_svgalib.c

@@ -46,7 +46,7 @@
 #include <vga.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

libs/video/targets/vid_wgl.c

@@ -34,7 +34,7 @@
 
 #include "QF/cdaudio.h"
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/input.h"
 #include "QF/keys.h"

libs/video/targets/vid_x11.c

@@ -66,7 +66,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"

nq/source/cl_demo.c

@@ -42,7 +42,7 @@
 #include "host.h"
 #include "QF/msg.h"
 #include "client.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/sys.h"
 #include "QF/console.h"
 #include "QF/cmd.h"

nq/source/cl_input.c

@@ -38,7 +38,7 @@
 
 #include "QF/cmd.h"
 #include "QF/console.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/input.h"
 #include "QF/keys.h"

nq/source/cl_main.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"

nq/source/console.c

@@ -39,7 +39,7 @@
 #include <stdarg.h>
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"

nq/source/dosasm.S

@@ -1,4 +1,4 @@
-#include "QF/asm_i386.h"
+#include "asm_i386.h"
 
 .data
 fpenv:	.long	0, 0, 0, 0, 0, 0, 0, 0

nq/source/gl_view.c

@@ -38,7 +38,7 @@
 
 #include <stdio.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/info.h"
 

nq/source/host.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "QF/cdaudio.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cmd.h"
 #include "QF/console.h"
 #include "QF/cvar.h"

nq/source/host_cmd.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/va.h"
 #include "QF/screen.h"

nq/source/host_skin.c

@@ -37,7 +37,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/msg.h"

nq/source/keys.c

@@ -44,7 +44,7 @@
 
 #include "client.h"
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/keys.h"

nq/source/locs.c

@@ -38,7 +38,7 @@
 
 #include <limits.h>
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/locs.h"
 #include "QF/qtypes.h"

nq/source/net_udp.c

@@ -76,7 +76,7 @@
 #include <libc.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"
 #include "QF/sys.h"

nq/source/pr_cmds.c

@@ -37,7 +37,7 @@
 #endif
 
 #include "QF/console.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/sys.h"
 #include "QF/cmd.h"

nq/source/r_view.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"

nq/source/sbar.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "QF/cmd.h"
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/cvar.h"
 #include "QF/draw.h"
 #include "QF/screen.h"

nq/source/skin.c

@@ -36,7 +36,7 @@
 # include <strings.h>
 #endif
 
-#include "QF/compat.h"
+#include "compat.h"
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/hash.h"