diff --git a/tools/mbspc/mbspc/bspc.c b/tools/mbspc/mbspc/bspc.c
index 4c4150aa..9f0d0315 100644
--- a/tools/mbspc/mbspc/bspc.c
+++ b/tools/mbspc/mbspc/bspc.c
@@ -52,7 +52,6 @@ char			name[1024];
 vec_t			microvolume = 1.0;
 char			outbase[32];
 int				entity_num;
-aas_settings_t	aassettings;
 
 qboolean	noprune;			//don't prune nodes (bspc.c)
 qboolean	glview;				//create a gl view
diff --git a/tools/mbspc/mbspc/l_bsp_hl.c b/tools/mbspc/mbspc/l_bsp_hl.c
index 740b354a..8e589c74 100644
--- a/tools/mbspc/mbspc/l_bsp_hl.c
+++ b/tools/mbspc/mbspc/l_bsp_hl.c
@@ -491,8 +491,8 @@ void HL_SwapBSPFile (qboolean todisk)
 } //end of the function HL_SwapBSPFile
 
 
-hl_dheader_t	*hl_header;
-int				hl_fileLength;
+static hl_dheader_t	*hl_header;
+static int				hl_fileLength;
 
 int HL_CopyLump (int lump, void *dest, int size, int maxsize)
 {
@@ -585,8 +585,8 @@ void	HL_LoadBSPFile (char *filename, int offset, int length)
 
 //============================================================================
 
-FILE		*wadfile;
-hl_dheader_t	outheader;
+static FILE		*wadfile;
+static hl_dheader_t	outheader;
 
 void HL_AddLump (int lumpnum, void *data, int len)
 {
diff --git a/tools/mbspc/mbspc/l_bsp_q1.c b/tools/mbspc/mbspc/l_bsp_q1.c
index 79f9200f..7b11efad 100644
--- a/tools/mbspc/mbspc/l_bsp_q1.c
+++ b/tools/mbspc/mbspc/l_bsp_q1.c
@@ -383,8 +383,8 @@ void Q1_SwapBSPFile (qboolean todisk)
 }
 
 
-q1_dheader_t *q1_header;
-int			q1_fileLength;
+static q1_dheader_t *q1_header;
+static int			q1_fileLength;
 
 int Q1_CopyLump (int lump, void *dest, int size, int maxsize)
 {
@@ -460,8 +460,8 @@ void	Q1_LoadBSPFile(char *filename, int offset, int length)
 
 //============================================================================
 
-FILE *q1_wadfile;
-q1_dheader_t q1_outheader;
+static FILE *q1_wadfile;
+static q1_dheader_t q1_outheader;
 
 void Q1_AddLump (int lumpnum, void *data, int len)
 {
diff --git a/tools/mbspc/mbspc/l_bsp_q2.c b/tools/mbspc/mbspc/l_bsp_q2.c
index b6ae2d10..f1715a51 100644
--- a/tools/mbspc/mbspc/l_bsp_q2.c
+++ b/tools/mbspc/mbspc/l_bsp_q2.c
@@ -830,7 +830,7 @@ void Q2_SwapBSPFile (qboolean todisk)
 } //end of the function Q2_SwapBSPFile
 
 
-dheader_t	*header;
+static dheader_t	*header;
 
 int Q2_CopyLump (int lump, void *dest, int size, int maxsize)
 {
@@ -948,8 +948,8 @@ void	Q2_LoadBSPFileTexinfo (char *filename)
 
 //============================================================================
 
-FILE		*wadfile;
-dheader_t	outheader;
+static FILE		*wadfile;
+static dheader_t	outheader;
 
 void Q2_AddLump (int lumpnum, void *data, int len)
 {
diff --git a/tools/mbspc/mbspc/l_bsp_sin.c b/tools/mbspc/mbspc/l_bsp_sin.c
index fa7e0ebc..28e9593d 100644
--- a/tools/mbspc/mbspc/l_bsp_sin.c
+++ b/tools/mbspc/mbspc/l_bsp_sin.c
@@ -786,7 +786,7 @@ void Sin_SwapBSPFile (qboolean todisk)
 } //end of the function Sin_SwapBSPFile
 
 
-sin_dheader_t	*header;
+static sin_dheader_t	*header;
 #ifdef SIN
 int Sin_CopyLump (int lump, void *dest, int size, int maxsize)
 {
@@ -942,8 +942,8 @@ void	Sin_LoadBSPFileTexinfo (char *filename)
 
 //============================================================================
 
-FILE		*wadfile;
-sin_dheader_t	outheader;
+static FILE		*wadfile;
+static sin_dheader_t	outheader;
 
 #ifdef SIN
 void Sin_AddLump (int lumpnum, void *data, int len, int size, int maxsize)
diff --git a/tools/quake2/q2map/patches.c b/tools/quake2/q2map/patches.c
index 1e8b91c8..acea436e 100644
--- a/tools/quake2/q2map/patches.c
+++ b/tools/quake2/q2map/patches.c
@@ -31,6 +31,8 @@ vec3_t texture_reflectivity[MAX_MAP_TEXINFO];
    ===================================================================
  */
 
+void ( *CalcTextureReflectivity )( void );
+
 /*
    ======================
    CalcTextureReflectivity_Quake2
diff --git a/tools/quake2/q2map/qbsp.c b/tools/quake2/q2map/qbsp.c
index 4d51a82b..ba05c834 100644
--- a/tools/quake2/q2map/qbsp.c
+++ b/tools/quake2/q2map/qbsp.c
@@ -45,7 +45,7 @@ qboolean noopt;
 qboolean leaktest;
 qboolean verboseentities;
 
-char outbase[32];
+extern char outbase[32];
 
 int block_xl = -8, block_xh = 7, block_yl = -8, block_yh = 7;
 
diff --git a/tools/quake2/q2map/qrad.c b/tools/quake2/q2map/qrad.c
index e39c3e2d..f18af843 100644
--- a/tools/quake2/q2map/qrad.c
+++ b/tools/quake2/q2map/qrad.c
@@ -64,11 +64,11 @@ float maxlight = 196;
 
 float lightscale = 1.0;
 
-qboolean glview;
+extern qboolean glview;
 
 qboolean nopvs;
 
-char source[1024];
+extern char source[1024];
 
 float direct_scale =  0.4;
 float entity_scale =  1.0;
diff --git a/tools/quake2/q2map/qrad.h b/tools/quake2/q2map/qrad.h
index bc96b568..9d9a9475 100644
--- a/tools/quake2/q2map/qrad.h
+++ b/tools/quake2/q2map/qrad.h
@@ -172,7 +172,7 @@ void MakeTnodes( dmodel_t *bm );
 void MakePatches( void );
 void SubdividePatches( void );
 void PairEdges( void );
-void ( *CalcTextureReflectivity )( void );
+extern void ( *CalcTextureReflectivity )( void );
 void CalcTextureReflectivity_Quake2( void );
 void CalcTextureReflectivity_Heretic2( void );
 
diff --git a/tools/quake2/q2map/qvis.c b/tools/quake2/q2map/qvis.c
index 130479e0..dc6e2783 100644
--- a/tools/quake2/q2map/qvis.c
+++ b/tools/quake2/q2map/qvis.c
@@ -27,8 +27,8 @@
 int numportals;
 int portalclusters;
 
-char inbase[32];
-char outbase[32];
+extern char inbase[32];
+extern char outbase[32];
 
 portal_t    *portals;
 leaf_t      *leafs;
diff --git a/tools/quake2/qdata_heretic2/animcomp.c b/tools/quake2/qdata_heretic2/animcomp.c
index 8cff497f..a1998dd4 100644
--- a/tools/quake2/qdata_heretic2/animcomp.c
+++ b/tools/quake2/qdata_heretic2/animcomp.c
@@ -37,7 +37,7 @@ float *best;
 float *comp;
 float *tcomp;
 float *bestcomp;
-float *frames;
+static float *frames;
 float *base;
 
 int MatWidth;
diff --git a/tools/quake2/qdata_heretic2/book.c b/tools/quake2/qdata_heretic2/book.c
index 066a5223..4236033b 100644
--- a/tools/quake2/qdata_heretic2/book.c
+++ b/tools/quake2/qdata_heretic2/book.c
@@ -22,12 +22,6 @@
 
 #include "qdata.h"
 
-byte            *byteimage, *lbmpalette;
-int byteimagewidth, byteimageheight;
-
-qboolean TrueColorImage;
-int longimagewidth, longimageheight;
-
 char book_prefix[1024];
 byte buffer[640 * 480];
 unsigned long bufferl[640 * 480];
diff --git a/tools/quake2/qdata_heretic2/common/qfiles.h b/tools/quake2/qdata_heretic2/common/qfiles.h
index fd20cc99..7e68c6c4 100644
--- a/tools/quake2/qdata_heretic2/common/qfiles.h
+++ b/tools/quake2/qdata_heretic2/common/qfiles.h
@@ -611,7 +611,7 @@ enum
 	MATERIAL_WOOD,
 };
 
-materialtype_t  *materialtypes;
+extern materialtype_t  *materialtypes;
 
 void QFile_ReadMaterialTypes( char* filename );
 
diff --git a/tools/quake2/qdata_heretic2/models.c b/tools/quake2/qdata_heretic2/models.c
index 06e73aa8..e1e88b45 100644
--- a/tools/quake2/qdata_heretic2/models.c
+++ b/tools/quake2/qdata_heretic2/models.c
@@ -73,7 +73,7 @@ int new_num_verts[NUM_CLUSTERS + 1];
 
 //================================================================
 
-frame_t g_frames[MAX_FRAMES];
+static frame_t g_frames[MAX_FRAMES];
 //frame_t		*g_frames;
 
 static dmdl_t model;
diff --git a/tools/quake2/qdata_heretic2/pics.c b/tools/quake2/qdata_heretic2/pics.c
index ca1f1fb7..2cc379e4 100644
--- a/tools/quake2/qdata_heretic2/pics.c
+++ b/tools/quake2/qdata_heretic2/pics.c
@@ -22,13 +22,6 @@
 
 #include "qdata.h"
 
-byte            *byteimage, *lbmpalette;
-int byteimagewidth, byteimageheight;
-
-qboolean TrueColorImage;
-unsigned        *longimage;
-int longimagewidth, longimageheight;
-
 char pic_prefix[1024];
 extern char        *g_outputDir;
 
diff --git a/tools/quake2/qdata_heretic2/sprites.c b/tools/quake2/qdata_heretic2/sprites.c
index 74f8873c..05f8cf31 100644
--- a/tools/quake2/qdata_heretic2/sprites.c
+++ b/tools/quake2/qdata_heretic2/sprites.c
@@ -25,7 +25,7 @@
 #define MAX_SPRFRAMES           MAX_MD2SKINS
 
 dsprite_t sprite;
-dsprframe_t frames[MAX_SPRFRAMES];
+static dsprframe_t frames[MAX_SPRFRAMES];
 
 byte            *byteimage, *lbmpalette;
 int byteimagewidth, byteimageheight;
@@ -41,7 +41,6 @@ void FinishSprite( void );
 void Cmd_Spritename( void );
 
 char spr_prefix[1024];
-char pic_prefix[1024];
 
 extern char        *g_outputDir;