move the api headers into include/QF and clean up (most of) the resulting mess.

target specific files that I don't build won't compile yet. just put QF/
infront of the offending headers.

Also move ver_check into libqfutils

libs/gamecode/pr_edict.c

@@ -36,18 +36,18 @@
 # include <strings.h>
 #endif
 
-#include "cmd.h"
-#include "console.h"
-#include "crc.h"
-#include "cvar.h"
-#include "hash.h"
-#include "progs.h"
-#include "qdefs.h"
-#include "qendian.h"
-#include "quakefs.h"
-#include "sys.h"	//XXX
-#include "zone.h"
-#include "va.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/crc.h"
+#include "QF/cvar.h"
+#include "QF/hash.h"
+#include "QF/progs.h"
+#include "QF/qdefs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/sys.h"	//XXX
+#include "QF/zone.h"
+#include "QF/va.h"
 
 cvar_t     *pr_boundscheck;
 

libs/gamecode/pr_exec.c

@@ -38,10 +38,10 @@
 
 #include <stdarg.h>
 
-#include "console.h"
-#include "cvar.h"
-#include "progs.h"
-#include "sys.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/progs.h"
+#include "QF/sys.h"
 
 char       *pr_opnames[] = {
 	"DONE",

libs/gamecode/pr_strings.c

@@ -39,8 +39,8 @@
 
 #include <stdarg.h>
 
-#include "hash.h"
-#include "progs.h"
+#include "QF/hash.h"
+#include "QF/progs.h"
 
 static char *
 strref_get_key (void *_sr, void *notused)

libs/util/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libqfutil.a
 
-libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c  zone.c
+libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c zone.c
 
 all-local: ../libqfutil.a
 

libs/util/checksum.c

@@ -41,9 +41,9 @@
 # include <strings.h>
 #endif
 
-#include "checksum.h"
-#include "crc.h"
-#include "mdfour.h"
+#include "QF/checksum.h"
+#include "QF/crc.h"
+#include "QF/mdfour.h"
 
 static byte chktbl[1024 + 4] = {
 	0x78, 0xd2, 0x94, 0xe3, 0x41, 0xec, 0xd6, 0xd5, 0xcb, 0xfc, 0xdb, 0x8a,

libs/util/cmd.c

@@ -38,16 +38,16 @@
 
 #include <ctype.h>
 
-#include "cvar.h"
-#include "cmd.h"
-#include "console.h"
-#include "hash.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "quakefs.h"
-#include "sizebuf.h"
-#include "sys.h"
-#include "zone.h"
+#include "QF/cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/hash.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/quakefs.h"
+#include "QF/sizebuf.h"
+#include "QF/sys.h"
+#include "QF/zone.h"
 
 void        Cmd_ForwardToServer (void);
 

libs/util/crc.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "crc.h"
+#include "QF/crc.h"
 
 // this is a 16 bit, non-reflected CRC using the polynomial 0x1021
 // and the initial and final xor values shown below...  in other words, the

libs/util/cvar.c

@@ -42,11 +42,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "console.h"
-#include "cmd.h"
-#include "cvar.h"
-#include "hash.h"
-#include "qargs.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
+#include "QF/cvar.h"
+#include "QF/hash.h"
+#include "QF/qargs.h"
 
 cvar_t			*cvar_vars;
 char			*cvar_null_string = "";

libs/util/hash.c

@@ -37,8 +37,8 @@
 # include <strings.h>
 #endif
 
-#include "compat.h"
-#include "hash.h"
+#include "QF/compat.h"
+#include "QF/hash.h"
 
 static unsigned long
 hash (const char *str)

libs/util/info.c

@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "console.h"
-#include "info.h"
+#include "QF/console.h"
+#include "QF/info.h"
 
 /*
 	INFO STRINGS

libs/util/link.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "link.h"
+#include "QF/link.h"
 
 // ClearLink is used for new headnodes
 void

libs/util/mathlib.c

@@ -38,9 +38,9 @@
 
 #include <math.h>
 
-#include "mathlib.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/mathlib.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 vec3_t      vec3_origin = { 0, 0, 0 };
 int         nanmask = 255 << 23;

libs/util/mdfour.c

@@ -37,8 +37,8 @@
 # include <strings.h>
 #endif
 
-#include "mdfour.h"
-#include "uint32.h"
+#include "QF/mdfour.h"
+#include "QF/uint32.h"
 
 /* NOTE: This code makes no attempt to be fast!
 

libs/util/msg.c

@@ -36,9 +36,9 @@
 # include <strings.h>
 #endif
 
-#include "msg.h"
-#include "qendian.h"
-#include "sys.h"
+#include "QF/msg.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
 
 /*
 	MESSAGE IO FUNCTIONS

libs/util/qargs.c

@@ -43,11 +43,11 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "console.h"
-#include "cmd.h"
-#include "crc.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
+#include "QF/crc.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 static char **largv;
 static char *argvdummy = " ";

libs/util/qendian.c

@@ -34,7 +34,7 @@
 
 #include <ctype.h>
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 /*
 					BYTE ORDER FUNCTIONS

libs/util/qfplist.c

@@ -34,8 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "qfplist.h"
-#include "qtypes.h"
+#include "QF/qfplist.h"
+#include "QF/qtypes.h"
 
 static plitem_t *PL_ParsePropertyListItem (pldata_t *);
 static qboolean PL_SkipSpace (pldata_t *);

libs/util/sizebuf.c

@@ -36,10 +36,10 @@
 # include <strings.h>
 #endif
 
-#include "console.h"
-#include "sizebuf.h"
-#include "sys.h"
-#include "zone.h"
+#include "QF/console.h"
+#include "QF/sizebuf.h"
+#include "QF/sys.h"
+#include "QF/zone.h"
 
 void
 SZ_Alloc (sizebuf_t *buf, int startsize)

libs/util/va.c

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

libs/util/zone.c

@@ -38,11 +38,11 @@
 
 #include <stdlib.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "qargs.h"
-#include "sys.h"
-#include "zone.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/sys.h"
+#include "QF/zone.h"
 
 #define	DYNAMIC_SIZE	0x20000
 #define	ZONEID			0x1d4a11

nq/include/bspfile.h

@@ -29,7 +29,7 @@
 #ifndef __bspfile_h
 #define __bspfile_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 // upper design bounds
 

nq/include/client.h

@@ -31,15 +31,15 @@
 
 #include <stdio.h>
 
-#include "info.h"
-#include "mathlib.h"
+#include "QF/info.h"
+#include "QF/mathlib.h"
 #include "protocol.h"
 #include "net.h"
 #include "model.h"
 #include "sound.h"
 #include "render.h"
-#include "cvar.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/quakefs.h"
 #include "game.h"
 
 typedef struct usercmd_s

nq/include/context_x11.h

@@ -34,8 +34,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "cvar.h"
-#include "qtypes.h"
+#include "QF/cvar.h"
+#include "QF/qtypes.h"
 
 void GetEvent( void );
 

nq/include/dga_check.h

@@ -32,7 +32,7 @@
 
 #include <X11/Xlib.h>
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 /*
   VID_CheckDGA

nq/include/game.h

@@ -31,9 +31,9 @@
 #ifndef __game_h
 #define __game_h
 
-#include "qtypes.h"
-#include "cvar.h"
-#include "qdefs.h"
+#include "QF/qtypes.h"
+#include "QF/cvar.h"
+#include "QF/qdefs.h"
 
 #undef MAX_DATAGRAM
 #define	MAX_DATAGRAM	1024		// max length of unreliable message

nq/include/glquake.h

@@ -42,7 +42,7 @@
 
 #include <GL/gl.h>
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "model.h"
 #include "d_iface.h"
 

nq/include/host.h

@@ -29,8 +29,8 @@
 #ifndef __host_h
 #define __host_h
 
-#include "qtypes.h"
-#include "cvar.h"
+#include "QF/qtypes.h"
+#include "QF/cvar.h"
 
 extern qboolean noclip_anglehack;
 

nq/include/input.h

@@ -29,9 +29,9 @@
 #ifndef _INPUT_H
 #define _INPUT_H
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "protocol.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #define freelook (in_mlook.state&1 || cl_freelook->int_val)
 

nq/include/joystick.h

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "protocol.h"
 
 extern cvar_t	*joy_device;		// Joystick device name

nq/include/model.h

@@ -29,12 +29,12 @@
 #ifndef _MODEL_H
 #define _MODEL_H
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "render.h"
 #include "bspfile.h"
 #include "spritegn.h"
 #include "modelgen.h"
-#include "zone.h"
+#include "QF/zone.h"
 
 /*
 

nq/include/net.h

@@ -29,9 +29,9 @@
 #ifndef __net_h
 #define __net_h
 
-#include "gcc_attr.h"
-#include "sizebuf.h"
-#include "cvar.h"
+#include "QF/gcc_attr.h"
+#include "QF/sizebuf.h"
+#include "QF/cvar.h"
 
 struct qsockaddr
 {

nq/include/net_udp.h

@@ -29,7 +29,7 @@
 #ifndef __net_udp_h
 #define __net_udp_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 int  UDP_Init (void);
 void UDP_Shutdown (void);

nq/include/protocol.h

@@ -29,7 +29,7 @@
 #ifndef __protocol_h
 #define __protocol_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #define	PROTOCOL_VERSION	15
 

nq/include/render.h

@@ -29,8 +29,8 @@
 #ifndef __render_h
 #define __render_h
 
-#include "mathlib.h"
-#include "cvar.h"
+#include "QF/mathlib.h"
+#include "QF/cvar.h"
 #include "vid.h"
 #include "protocol.h"
 

nq/include/screen.h

@@ -29,8 +29,8 @@
 #ifndef __screen_h
 #define __screen_h
 
-#include "qtypes.h"
-#include "cvar.h"
+#include "QF/qtypes.h"
+#include "QF/cvar.h"
 
 void SCR_Init (void);
 void SCR_InitCvars (void);

nq/include/server.h

@@ -31,15 +31,15 @@
 
 #include <setjmp.h>
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 #include "net.h"
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "protocol.h"
 #include "model.h"
 #include "sv_progs.h"
-#include "sizebuf.h"
-#include "info.h"
-#include "quakeio.h"
+#include "QF/sizebuf.h"
+#include "QF/info.h"
+#include "QF/quakeio.h"
 #include "client.h"
 
 extern progs_t sv_pr_state;

nq/include/sound.h

@@ -30,9 +30,9 @@
 #ifndef __sound_h
 #define __sound_h
 
-#include "mathlib.h"
-#include "cvar.h"
-#include "zone.h"
+#include "QF/mathlib.h"
+#include "QF/cvar.h"
+#include "QF/zone.h"
 
 #define DEFAULT_SOUND_PACKET_VOLUME 255
 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0

nq/include/sv_progs.h

@@ -32,7 +32,7 @@
 #ifndef __sv_progs_h
 #define __sv_progs_h
 
-#include "progs.h"
+#include "QF/progs.h"
 #include "sv_pr_cmds.h"
 
 typedef struct {

nq/include/vid.h

@@ -29,7 +29,7 @@
 #ifndef __vid_h_
 #define __vid_h_
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #define VID_CBITS	6
 #define VID_GRADES	(1 << VID_CBITS)

nq/include/view.h

@@ -29,8 +29,8 @@
 #ifndef __view_h
 #define __view_h
 
-#include "qtypes.h"
-#include "cvar.h"
+#include "QF/qtypes.h"
+#include "QF/cvar.h"
 
 extern	byte		gammatable[256];	// palette is sent through this
 extern	byte		ramps[3][256];

nq/include/wad.h

@@ -29,7 +29,7 @@
 #ifndef __wad_h
 #define __wad_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 //===============
 //   TYPES

nq/include/world.h

@@ -29,7 +29,7 @@
 #ifndef __world_h
 #define __world_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "sv_progs.h"
 
 typedef struct

nq/source/cd_linux.c

@@ -43,10 +43,10 @@
 
 #include <linux/cdrom.h>
 
-#include "qargs.h"
-#include "cmd.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
 #include "cdaudio.h"
-#include "console.h"
+#include "QF/console.h"
 #include "sound.h"
 #include "client.h"
 

nq/source/cl_cam.c

@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "mathlib.h"
+#include "QF/mathlib.h"
 #include "client.h"
 #include "world.h"
 

nq/source/cl_cmd.c

@@ -38,10 +38,10 @@
 #endif
 
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "msg.h"
-#include "sizebuf.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/msg.h"
+#include "QF/sizebuf.h"
 
 /*
 	Cmd_ForwardToServer

nq/source/cl_demo.c

@@ -33,14 +33,14 @@
 
 #include <string.h>
 
-#include "qendian.h"
-#include "va.h"
+#include "QF/qendian.h"
+#include "QF/va.h"
 #include "host.h"
-#include "msg.h"
+#include "QF/msg.h"
 #include "client.h"
-#include "sys.h"
-#include "console.h"
-#include "cmd.h"
+#include "QF/sys.h"
+#include "QF/console.h"
+#include "QF/cmd.h"
 
 void        CL_FinishTimeDemo (void);
 

nq/source/cl_input.c

@@ -32,11 +32,11 @@
 
 #include <string.h>
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "host.h"
-#include "console.h"
+#include "QF/console.h"
 #include "client.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 
 /*
 ===============================================================================

nq/source/cl_main.c

@@ -31,18 +31,18 @@
 # include "config.h"
 #endif
 
-#include "msg.h"
-#include "cvar.h"
+#include "QF/msg.h"
+#include "QF/cvar.h"
 #include "client.h"
 #include "chase.h"
 #include "input.h"
 #include "host.h"
-#include "va.h"
+#include "QF/va.h"
 #include "host.h"
 #include "server.h"
-#include "console.h"
+#include "QF/console.h"
 #include "screen.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 
 // we need to declare some mouse variables here, because the menu system
 // references them even when on a unix system.

nq/source/cl_parse.c

@@ -35,16 +35,16 @@
 
 #include "client.h"
 #include "host.h"
-#include "msg.h"
-#include "console.h"
+#include "QF/msg.h"
+#include "QF/console.h"
 #include "cdaudio.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "sbar.h"
 #include "screen.h"
 #include "server.h"
 #include "game.h"
 #include "input.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 
 char       *svc_strings[] = {
 	"svc_bad",

nq/source/cl_tent.c

@@ -32,9 +32,9 @@
 
 #include "protocol.h"
 #include "client.h"
-#include "msg.h"
-#include "sys.h"
-#include "console.h"
+#include "QF/msg.h"
+#include "QF/sys.h"
+#include "QF/console.h"
 
 int         num_temp_entities;
 entity_t    cl_temp_entities[MAX_TEMP_ENTITIES];

nq/source/com.c

@@ -30,13 +30,13 @@
 # include "config.h"
 #endif
 
-#include "qendian.h"
-#include "cvar.h"
-#include "quakefs.h"
-#include "console.h"
-#include "qargs.h"
+#include "QF/qendian.h"
+#include "QF/cvar.h"
+#include "QF/quakefs.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
 #include "game.h"
-#include "cmd.h"
+#include "QF/cmd.h"
 
 cvar_t     *registered;
 cvar_t     *cmdline;

nq/source/console.c

@@ -39,16 +39,16 @@
 #include <stdarg.h>
 
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "host.h"
 #include "input.h"
-#include "keys.h"
-#include "qargs.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
 #include "screen.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 
 int         con_ormask;
 console_t   con_main;

nq/source/context_x11.c

@@ -58,13 +58,13 @@
 
 #include "context_x11.h"
 #include "dga_check.h"
-#include "va.h"
-#include "qargs.h"
-#include "qtypes.h"
+#include "QF/va.h"
+#include "QF/qargs.h"
+#include "QF/qtypes.h"
 #include "vid.h"
-#include "sys.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/sys.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "input.h"
 
 static void (*event_handlers[LASTEvent]) (XEvent *);

nq/source/d_modech.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "d_local.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 int         d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle;
 

nq/source/d_surf.c

@@ -34,9 +34,9 @@
 #include <stdlib.h>
 
 #include "game.h"
-#include "sys.h"
-#include "qargs.h"
-#include "console.h"
+#include "QF/sys.h"
+#include "QF/qargs.h"
+#include "QF/console.h"
 #include "d_local.h"
 #include "r_local.h"
 #include "d_iface.h"

nq/source/draw.c

@@ -32,9 +32,9 @@
 
 #include "draw.h"
 #include "vid.h"
-#include "zone.h"
-#include "sys.h"
-#include "quakefs.h"
+#include "QF/zone.h"
+#include "QF/sys.h"
+#include "QF/quakefs.h"
 #include "d_iface.h"
 #include "sound.h"
 

nq/source/game.c

@@ -31,7 +31,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "game.h"
 
 qboolean standard_quake = false;

nq/source/gib.c

@@ -4,12 +4,12 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_instructions.c

@@ -5,12 +5,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_interpret.c

@@ -5,12 +5,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_modules.c

@@ -6,12 +6,12 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_parse.c

@@ -4,12 +4,12 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_stack.c

@@ -5,12 +5,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gib_vars.c

@@ -5,12 +5,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "cvar.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "zone.h"
-#include "quakefs.h"
+#include "QF/cvar.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/zone.h"
+#include "QF/quakefs.h"
 #include "gib.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"

nq/source/gl_draw.c

@@ -36,25 +36,25 @@
 #include <strings.h>
 #endif
 
-#include "compat.h"
+#include "QF/compat.h"
 #include "bspfile.h"					// needed by: glquake.h
 #include "vid.h"
-#include "sys.h"
-#include "mathlib.h"					// needed by: protocol.h, render.h,
+#include "QF/sys.h"
+#include "QF/mathlib.h"					// needed by: protocol.h, render.h,
 										// client.h,
 			// modelgen.h, glmodel.h
 #include "wad.h"
 #include "draw.h"
-#include "cvar.h"
+#include "QF/cvar.h"
 #include "net.h"						// needed by: client.h
 #include "protocol.h"					// needed by: client.h
-#include "cmd.h"
+#include "QF/cmd.h"
 #include "sbar.h"
 #include "render.h"						// needed by: client.h, model.h,
 										// glquake.h
 #include "client.h"						// need cls in this file
 #include "model.h"						// needed by: glquake.h
-#include "console.h"
+#include "QF/console.h"
 #include "glquake.h"
 #include "view.h"
 

nq/source/gl_mesh.c

@@ -38,10 +38,10 @@
 
 #include <stdio.h>
 
-#include "console.h"
-#include "mdfour.h"
+#include "QF/console.h"
+#include "QF/mdfour.h"
 #include "model.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 
 /*
 	ALIAS MODEL DISPLAY LIST GENERATION

nq/source/gl_model_alias.c

@@ -34,10 +34,10 @@
 #endif
 
 #include "r_local.h"
-#include "sys.h"
-#include "console.h"
-#include "qendian.h"
-#include "checksum.h"
+#include "QF/sys.h"
+#include "QF/console.h"
+#include "QF/qendian.h"
+#include "QF/checksum.h"
 #include "glquake.h"
 
 extern char loadname[];

nq/source/gl_model_brush.c

@@ -34,10 +34,10 @@
 #endif
 
 #include "r_local.h"
-#include "sys.h"
-#include "console.h"
-#include "qendian.h"
-#include "checksum.h"
+#include "QF/sys.h"
+#include "QF/console.h"
+#include "QF/qendian.h"
+#include "QF/checksum.h"
 #include "glquake.h"
 
 extern char loadname[];

nq/source/gl_model_fullbright.c

@@ -34,10 +34,10 @@
 #endif
 
 #include "r_local.h"
-#include "sys.h"
-#include "console.h"
-#include "qendian.h"
-#include "checksum.h"
+#include "QF/sys.h"
+#include "QF/console.h"
+#include "QF/qendian.h"
+#include "QF/checksum.h"
 #include "glquake.h"
 
 int