diff --git a/CMakeLists.txt b/CMakeLists.txt
index 498bf69..b74aca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,10 +99,9 @@ set(srcs
 	source/progs.h
 	source/protocol.h
 	source/q_ctype.h
+	source/q_defs.h
 	source/q_sound.h
 	source/q_stdinc.h
-	source/qs_bmp.h
-	source/quakedef.h
 	source/r_alias.c
 	source/r_brush.c
 	source/r_part.c
@@ -154,7 +153,8 @@ set(srcs
 	source/zone.h)
 
 set(srcs_linux
-	source/linux/pl_linux.c)
+	source/linux/pl_linux.c
+	source/linux/qs_bmp.h)
 
 set(srcs_osx
 	source/osx/pl_osx.c)
diff --git a/source/bgmusic.c b/source/bgmusic.c
index b39f682..fd02da7 100644
--- a/source/bgmusic.c
+++ b/source/bgmusic.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "bgmusic.h"
 #include "cdaudio.h"
diff --git a/source/cd_null.c b/source/cd_null.c
index 351e4d0..a25fb3b 100644
--- a/source/cd_null.c
+++ b/source/cd_null.c
@@ -18,7 +18,7 @@
  */
 
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t CDAudio_Play(byte track, bool looping)
 {
diff --git a/source/cd_sdl.c b/source/cd_sdl.c
index c889fda..2b4914e 100644
--- a/source/cd_sdl.c
+++ b/source/cd_sdl.c
@@ -31,7 +31,7 @@
 
 #else /* defined(SDL_INIT_CDROM) */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "cdaudio.h"
 
 static bool cdValid = false;
diff --git a/source/cfgfile.c b/source/cfgfile.c
index 18ee834..1b5bbea 100644
--- a/source/cfgfile.c
+++ b/source/cfgfile.c
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 
 static fshandle_t               *cfg_file;
diff --git a/source/chase.c b/source/chase.c
index bbec0b8..32cf8be 100644
--- a/source/chase.c
+++ b/source/chase.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // chase.c -- chase camera code
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 cvar_t  chase_back = {"chase_back", "100", CVAR_NONE};
 cvar_t  chase_up = {"chase_up", "16", CVAR_NONE};
diff --git a/source/cl_demo.c b/source/cl_demo.c
index fca410c..de1408d 100644
--- a/source/cl_demo.c
+++ b/source/cl_demo.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 static void CL_FinishTimeDemo(void);
 
diff --git a/source/cl_input.c b/source/cl_input.c
index 0301af0..7f1a754 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t cl_maxpitch; //johnfitz -- variable pitch clamping
 extern cvar_t cl_minpitch; //johnfitz -- variable pitch clamping
diff --git a/source/cl_main.c b/source/cl_main.c
index 9911916..03fd518 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_main.c  -- client main loop
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 // we need to declare some mouse variables here, because the menu system
diff --git a/source/cl_parse.c b/source/cl_parse.c
index 6cb6513..b34228f 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_parse.c  -- parse a message received from the server
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 const char *svc_strings[] =
diff --git a/source/cl_tent.c b/source/cl_tent.c
index 5b2de10..9277cbd 100644
--- a/source/cl_tent.c
+++ b/source/cl_tent.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_tent.c -- client side temporary entities
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 entity_t *cl_temp_entities;
 int32_t  num_temp_entities;
diff --git a/source/cmd.c b/source/cmd.c
index 7b21d43..89f978c 100644
--- a/source/cmd.c
+++ b/source/cmd.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cmd.c -- Quake script command processing module
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 void Cmd_ForwardToServer(void);
 
diff --git a/source/common.c b/source/common.c
index 80c5a5e..572a695 100644
--- a/source/common.c
+++ b/source/common.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // common.c -- misc functions used in client and server
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "q_ctype.h"
 #include <errno.h>
 
diff --git a/source/console.c b/source/console.c
index f15850c..cbcb075 100644
--- a/source/console.c
+++ b/source/console.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <sys/types.h>
 #include <time.h>
 #include <sys/stat.h>
diff --git a/source/crc.c b/source/crc.c
index 20795fa..aef21fd 100644
--- a/source/crc.c
+++ b/source/crc.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 /* crc.c */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "crc.h"
 
 // this is a 16 bit, non-reflected CRC using the polynomial 0x1021
diff --git a/source/cvar.c b/source/cvar.c
index 93c0b2f..e98ec61 100644
--- a/source/cvar.c
+++ b/source/cvar.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cvar.c -- dynamic variable tracking
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 static cvar_t   *cvar_vars;
 static char     cvar_null_string[] = "";
diff --git a/source/gl_draw.c b/source/gl_draw.c
index 1ddb1d9..05437da 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // draw.c -- 2d drawing
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //extern uint8_t d_15to8table[65536]; //johnfitz -- never used
 
diff --git a/source/gl_fog.c b/source/gl_fog.c
index 7540391..587d68c 100644
--- a/source/gl_fog.c
+++ b/source/gl_fog.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_fog.c -- global and volumetric fog
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //==============================================================================
 //
diff --git a/source/gl_mesh.c b/source/gl_mesh.c
index 1135118..5bcb882 100644
--- a/source/gl_mesh.c
+++ b/source/gl_mesh.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_mesh.c: triangle model functions
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 
 /*
diff --git a/source/gl_model.c b/source/gl_model.c
index a26d372..316f24a 100644
--- a/source/gl_model.c
+++ b/source/gl_model.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 qmodel_t        *loadmodel;
 char    loadname[32];   // for hunk tags
diff --git a/source/gl_refrag.c b/source/gl_refrag.c
index 135ad0c..0c01015 100644
--- a/source/gl_refrag.c
+++ b/source/gl_refrag.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_efrag.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 mnode_t *r_pefragtopnode;
 
diff --git a/source/gl_rlight.c b/source/gl_rlight.c
index 8dfa266..4654a2f 100644
--- a/source/gl_rlight.c
+++ b/source/gl_rlight.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_light.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t r_dlightframecount;
 
diff --git a/source/gl_rmain.c b/source/gl_rmain.c
index cc04e16..27fef90 100644
--- a/source/gl_rmain.c
+++ b/source/gl_rmain.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_main.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 bool    r_cache_thrash;         // compatability
 
diff --git a/source/gl_rmisc.c b/source/gl_rmisc.c
index f39088a..3ac1155 100644
--- a/source/gl_rmisc.c
+++ b/source/gl_rmisc.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_misc.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //johnfitz -- new cvars
 extern cvar_t r_stereo;
diff --git a/source/gl_screen.c b/source/gl_screen.c
index be6cb5a..1d0807f 100644
--- a/source/gl_screen.c
+++ b/source/gl_screen.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // screen.c -- master for refresh, status bar, console, chat, notify, etc
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 
diff --git a/source/gl_sky.c b/source/gl_sky.c
index 384c34b..d3c609b 100644
--- a/source/gl_sky.c
+++ b/source/gl_sky.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_sky.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define MAX_CLIP_VERTS 64
 
diff --git a/source/gl_texmgr.c b/source/gl_texmgr.c
index fcf65a3..5bc8b7c 100644
--- a/source/gl_texmgr.c
+++ b/source/gl_texmgr.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //gl_texmgr.c -- fitzquake's texture manager. manages opengl texture images
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 const int32_t   gl_solid_format = 3;
 const int32_t   gl_alpha_format = 4;
diff --git a/source/gl_vidsdl.c b/source/gl_vidsdl.c
index 594cb6c..66cfe50 100644
--- a/source/gl_vidsdl.c
+++ b/source/gl_vidsdl.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_vidsdl.c -- SDL GL vid component
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "cfgfile.h"
 #include "bgmusic.h"
 #include <SDL.h>
diff --git a/source/gl_warp.c b/source/gl_warp.c
index 8a17213..1f4c40c 100644
--- a/source/gl_warp.c
+++ b/source/gl_warp.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_warp.c -- warping animation support
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t r_drawflat;
 
diff --git a/source/host.c b/source/host.c
index b7b353d..288b3fa 100644
--- a/source/host.c
+++ b/source/host.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // host.c -- coordinates spawning and killing of local servers
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 #include <setjmp.h>
 
diff --git a/source/host_cmd.c b/source/host_cmd.c
index 96ff4b6..cb6b209 100644
--- a/source/host_cmd.c
+++ b/source/host_cmd.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #if !PLATFORM_IS(WINDOWS)
 #include <dirent.h>
 #endif
diff --git a/source/image.c b/source/image.c
index e7e8b45..bebe510 100644
--- a/source/image.c
+++ b/source/image.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //image.c -- image loading
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_STATIC
diff --git a/source/in_sdl.c b/source/in_sdl.c
index 10ac055..03fbdfb 100644
--- a/source/in_sdl.c
+++ b/source/in_sdl.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 
 static bool     textmode;
diff --git a/source/keys.c b/source/keys.c
index 8a59452..ec6ef67 100644
--- a/source/keys.c
+++ b/source/keys.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /* key up events are sent even if in console mode */
 
diff --git a/source/linux/pl_linux.c b/source/linux/pl_linux.c
index a44ec71..16d26e4 100644
--- a/source/linux/pl_linux.c
+++ b/source/linux/pl_linux.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 
 static const Uint8 bmp_bytes[] =
diff --git a/source/qs_bmp.h b/source/linux/qs_bmp.h
similarity index 100%
rename from source/qs_bmp.h
rename to source/linux/qs_bmp.h
diff --git a/source/main_sdl.c b/source/main_sdl.c
index 7b1f869..a3d5546 100644
--- a/source/main_sdl.c
+++ b/source/main_sdl.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 #include <stdio.h>
 
diff --git a/source/mathlib.c b/source/mathlib.c
index a2f5c43..cfa255e 100644
--- a/source/mathlib.c
+++ b/source/mathlib.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // mathlib.c -- math primitives
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 vec3_t vec3_origin = {0, 0, 0};
 
diff --git a/source/menu.c b/source/menu.c
index 54a71bd..0d3d64d 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 void (*vid_menucmdfn)(void); //johnfitz
diff --git a/source/net_dgrm.c b/source/net_dgrm.c
index 3e04162..7dc9adc 100644
--- a/source/net_dgrm.c
+++ b/source/net_dgrm.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_dgrm.h"
 
diff --git a/source/net_loop.c b/source/net_loop.c
index 21087f1..b73328e 100644
--- a/source/net_loop.c
+++ b/source/net_loop.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_loop.h"
 
diff --git a/source/net_main.c b/source/net_main.c
index a9980ca..e8f581c 100644
--- a/source/net_main.c
+++ b/source/net_main.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 qsocket_t       *net_activeSockets = NULL;
diff --git a/source/osx/pl_osx.m b/source/osx/pl_osx.m
index 88aad09..bc2b549 100644
--- a/source/osx/pl_osx.m
+++ b/source/osx/pl_osx.m
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 #import <Cocoa/Cocoa.h>
 
diff --git a/source/pr_cmds.c b/source/pr_cmds.c
index 62a1dca..db791d7 100644
--- a/source/pr_cmds.c
+++ b/source/pr_cmds.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STRINGTEMP_BUFFERS              16
 #define STRINGTEMP_LENGTH               1024
diff --git a/source/pr_edict.c b/source/pr_edict.c
index f1cff7f..aeb9895 100644
--- a/source/pr_edict.c
+++ b/source/pr_edict.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_edict.c -- entity dictionary
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 dprograms_t             *progs;
 dfunction_t             *pr_functions;
diff --git a/source/pr_exec.c b/source/pr_exec.c
index 87aeac1..9ea8908 100644
--- a/source/pr_exec.c
+++ b/source/pr_exec.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 typedef struct
 {
diff --git a/source/quakedef.h b/source/q_defs.h
similarity index 99%
rename from source/quakedef.h
rename to source/q_defs.h
index 351e95f..c7bfdbc 100644
--- a/source/quakedef.h
+++ b/source/q_defs.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#ifndef spingle__quakedef_h
-#define spingle__quakedef_h
+#ifndef spingle__q_defs_h
+#define spingle__q_defs_h
 
 #define ENGINE_NAME "spingle"
 #define VERSION     "6.90"
diff --git a/source/r_alias.c b/source/r_alias.c
index 69b7bbb..cf7b042 100644
--- a/source/r_alias.c
+++ b/source/r_alias.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //r_alias.c -- alias model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t r_drawflat, gl_overbright_models, gl_fullbrights, r_lerpmodels, r_lerpmove; //johnfitz
 
diff --git a/source/r_brush.c b/source/r_brush.c
index d4a716e..fce62d8 100644
--- a/source/r_brush.c
+++ b/source/r_brush.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_brush.c: brush model rendering. renamed from r_surf.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t gl_fullbrights, r_drawflat, gl_overbright, r_oldwater; //johnfitz
 extern cvar_t gl_zfix; // QuakeSpasm z-fighting fix
diff --git a/source/r_part.c b/source/r_part.c
index eff428c..b1a7fa3 100644
--- a/source/r_part.c
+++ b/source/r_part.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define MAX_PARTICLES                   2048    // default max # of particles at one
 //  time
diff --git a/source/r_sprite.c b/source/r_sprite.c
index 7a24c74..0a1aead 100644
--- a/source/r_sprite.c
+++ b/source/r_sprite.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //r_sprite.c -- sprite model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 ================
diff --git a/source/r_world.c b/source/r_world.c
index af64911..a1bae1b 100644
--- a/source/r_world.c
+++ b/source/r_world.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_world.c: world model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t gl_fullbrights, r_drawflat, gl_overbright, r_oldwater, r_oldskyleaf, r_showtris; //johnfitz
 
diff --git a/source/sbar.c b/source/sbar.c
index 8438b35..610cdad 100644
--- a/source/sbar.c
+++ b/source/sbar.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sbar.c -- status bar code
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t         sb_updates;             // if >= vid.numpages, no update needed
 
diff --git a/source/snd_codec.c b/source/snd_codec.c
index 85d99e9..47e3834 100644
--- a/source/snd_codec.c
+++ b/source/snd_codec.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "snd_codeci.h"
 
diff --git a/source/snd_dma.c b/source/snd_dma.c
index b52b3b0..0285257 100644
--- a/source/snd_dma.c
+++ b/source/snd_dma.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // snd_dma.c -- main control for any streaming sound output device
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "bgmusic.h"
 
diff --git a/source/snd_flac.c b/source/snd_flac.c
index 8ff46f3..57a0b7e 100644
--- a/source/snd_flac.c
+++ b/source/snd_flac.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_FLAC)
 #include "snd_codec.h"
diff --git a/source/snd_mem.c b/source/snd_mem.c
index de5afd7..8015334 100644
--- a/source/snd_mem.c
+++ b/source/snd_mem.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mem.c: sound caching
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 ================
diff --git a/source/snd_mikmod.c b/source/snd_mikmod.c
index 5f5e720..276150e 100644
--- a/source/snd_mikmod.c
+++ b/source/snd_mikmod.c
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MIKMOD)
 #include "snd_codec.h"
diff --git a/source/snd_mix.c b/source/snd_mix.c
index 6df3270..59de4b9 100644
--- a/source/snd_mix.c
+++ b/source/snd_mix.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mix.c -- portable code to mix sounds for snd_dma.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define PAINTBUFFER_SIZE        2048
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
diff --git a/source/snd_mp3.c b/source/snd_mp3.c
index a7203e6..0de6f47 100644
--- a/source/snd_mp3.c
+++ b/source/snd_mp3.c
@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MP3)
 #include "snd_codec.h"
diff --git a/source/snd_mpg123.c b/source/snd_mpg123.c
index 83aff24..9107270 100644
--- a/source/snd_mpg123.c
+++ b/source/snd_mpg123.c
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MP3)
 #include "snd_codec.h"
diff --git a/source/snd_opus.c b/source/snd_opus.c
index 7d88d06..6ef620d 100644
--- a/source/snd_opus.c
+++ b/source/snd_opus.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_OPUS)
 #include "snd_codec.h"
diff --git a/source/snd_sdl.c b/source/snd_sdl.c
index f3f6d36..0904c72 100644
--- a/source/snd_sdl.c
+++ b/source/snd_sdl.c
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <SDL.h>
 
diff --git a/source/snd_umx.c b/source/snd_umx.c
index 421056b..7ae8d1c 100644
--- a/source/snd_umx.c
+++ b/source/snd_umx.c
@@ -27,7 +27,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include "snd_codec.h"
 #include "snd_codeci.h"
diff --git a/source/snd_vorbis.c b/source/snd_vorbis.c
index 9625ed5..b3a7afa 100644
--- a/source/snd_vorbis.c
+++ b/source/snd_vorbis.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_VORBIS)
 #include "snd_codec.h"
diff --git a/source/sv_main.c b/source/sv_main.c
index 5921cc1..58f97fc 100644
--- a/source/sv_main.c
+++ b/source/sv_main.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_main.c -- server main program
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 server_t        sv;
 server_static_t svs;
diff --git a/source/sv_move.c b/source/sv_move.c
index dad3e8c..6726622 100644
--- a/source/sv_move.c
+++ b/source/sv_move.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_move.c -- monster movement
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STEPSIZE        18
 
diff --git a/source/sv_phys.c b/source/sv_phys.c
index aa5e256..a9c663d 100644
--- a/source/sv_phys.c
+++ b/source/sv_phys.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_phys.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 
diff --git a/source/sv_user.c b/source/sv_user.c
index 030d8fa..7108bab 100644
--- a/source/sv_user.c
+++ b/source/sv_user.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_user.c -- server code for moving users
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 edict_t *sv_player;
 
diff --git a/source/unix/net_bsd.c b/source/unix/net_bsd.c
index ccedb34..f0899b2 100644
--- a/source/unix/net_bsd.c
+++ b/source/unix/net_bsd.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 #include "net_dgrm.h"
diff --git a/source/unix/net_udp.c b/source/unix/net_udp.c
index c21a994..ecd5728 100644
--- a/source/unix/net_udp.c
+++ b/source/unix/net_udp.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 static sys_socket_t net_acceptsocket = INVALID_SOCKET;  // socket for fielding new connections
diff --git a/source/unix/sys_sdl_unix.c b/source/unix/sys_sdl_unix.c
index d907a21..873fd5d 100644
--- a/source/unix/sys_sdl_unix.c
+++ b/source/unix/sys_sdl_unix.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/source/view.c b/source/view.c
index 80a09fb..2689b82 100644
--- a/source/view.c
+++ b/source/view.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // view.c -- player eye positioning
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 
diff --git a/source/wad.c b/source/wad.c
index 2484ad3..78423dc 100644
--- a/source/wad.c
+++ b/source/wad.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // wad.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t                         wad_numlumps;
 lumpinfo_t              *wad_lumps;
diff --git a/source/windows/net_win.c b/source/windows/net_win.c
index 3711e98..884440e 100644
--- a/source/windows/net_win.c
+++ b/source/windows/net_win.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 #include "net_dgrm.h"
diff --git a/source/windows/net_wins.c b/source/windows/net_wins.c
index 908b4f0..91cbaa0 100644
--- a/source/windows/net_wins.c
+++ b/source/windows/net_wins.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 static sys_socket_t net_acceptsocket = INVALID_SOCKET;  // socket for fielding new connections
diff --git a/source/windows/net_wipx.c b/source/windows/net_wipx.c
index c7fea64..ddc4405 100644
--- a/source/windows/net_wipx.c
+++ b/source/windows/net_wipx.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "q_stdinc.h"
 #include "net_sys.h"
 #include <wsipx.h>
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_wipx.h"
 
diff --git a/source/windows/pl_win.c b/source/windows/pl_win.c
index 2723441..4c654e1 100644
--- a/source/windows/pl_win.c
+++ b/source/windows/pl_win.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <windows.h>
 #include <SDL.h>
 #include <SDL_syswm.h>
diff --git a/source/windows/sys_sdl_win.c b/source/windows/sys_sdl_win.c
index 413e6d8..6c5f2b8 100644
--- a/source/windows/sys_sdl_win.c
+++ b/source/windows/sys_sdl_win.c
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <mmsystem.h>
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/source/world.c b/source/world.c
index 24562ec..b74729c 100644
--- a/source/world.c
+++ b/source/world.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // world.c -- world query functions
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 
diff --git a/source/zone.c b/source/zone.c
index 1d4ea6f..7784808 100644
--- a/source/zone.c
+++ b/source/zone.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // zone.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define DYNAMIC_SIZE    (4 * 1024 * 1024) // ericw -- was 512KB (64-bit) / 384KB (32-bit)