diff --git a/tools/mbspc/mbspc/l_bsp_hl.c b/tools/mbspc/mbspc/l_bsp_hl.c
index 8e589c74..48a81767 100644
--- a/tools/mbspc/mbspc/l_bsp_hl.c
+++ b/tools/mbspc/mbspc/l_bsp_hl.c
@@ -642,9 +642,6 @@ void HL_WriteBSPFile (char *filename)
 
 //============================================================================
 
-#define ENTRIES(a)		(sizeof(a)/sizeof(*(a)))
-#define ENTRYSIZE(a)	(sizeof(*(a)))
-
 int ArrayUsage( char *szItem, int items, int maxitems, int itemsize )
 {
 	float	percentage = maxitems ? items * 100.0 / maxitems : 0.0;
@@ -694,22 +691,22 @@ void HL_PrintBSPFileSizes(void)
 	qprintf("Object names  Objects/Maxobjs  Memory / Maxmem  Fullness\n" );
 	qprintf("------------  ---------------  ---------------  --------\n" );
 
-	totalmemory += ArrayUsage( "models",		hl_nummodels,		ENTRIES(hl_dmodels),		ENTRYSIZE(hl_dmodels) );
-	totalmemory += ArrayUsage( "planes",		hl_numplanes,		ENTRIES(hl_dplanes),		ENTRYSIZE(hl_dplanes) );
-	totalmemory += ArrayUsage( "vertexes",		hl_numvertexes,	ENTRIES(hl_dvertexes),	ENTRYSIZE(hl_dvertexes) );
-	totalmemory += ArrayUsage( "nodes",			hl_numnodes,		ENTRIES(hl_dnodes),		ENTRYSIZE(hl_dnodes) );
-	totalmemory += ArrayUsage( "texinfos",		hl_numtexinfo,		ENTRIES(hl_texinfo),		ENTRYSIZE(hl_texinfo) );
-	totalmemory += ArrayUsage( "faces",			hl_numfaces,		ENTRIES(hl_dfaces),		ENTRYSIZE(hl_dfaces) );
-	totalmemory += ArrayUsage( "clipnodes",	hl_numclipnodes,	ENTRIES(hl_dclipnodes),	ENTRYSIZE(hl_dclipnodes) );
-	totalmemory += ArrayUsage( "leaves",		hl_numleafs,		ENTRIES(hl_dleafs),		ENTRYSIZE(hl_dleafs) );
-	totalmemory += ArrayUsage( "marksurfaces",hl_nummarksurfaces,ENTRIES(hl_dmarksurfaces),ENTRYSIZE(hl_dmarksurfaces) );
-	totalmemory += ArrayUsage( "surfedges",	hl_numsurfedges,	ENTRIES(hl_dsurfedges),	ENTRYSIZE(hl_dsurfedges) );
-	totalmemory += ArrayUsage( "edges",			hl_numedges,		ENTRIES(hl_dedges),		ENTRYSIZE(hl_dedges) );
+	totalmemory += ArrayUsage( "models",       hl_nummodels,       HL_MAX_MAP_MODELS,       sizeof(*hl_dmodels) );
+	totalmemory += ArrayUsage( "planes",       hl_numplanes,       HL_MAX_MAP_PLANES,       sizeof(*hl_dplanes) );
+	totalmemory += ArrayUsage( "vertexes",     hl_numvertexes,     HL_MAX_MAP_VERTS,        sizeof(*hl_dvertexes) );
+	totalmemory += ArrayUsage( "nodes",        hl_numnodes,        HL_MAX_MAP_NODES,        sizeof(*hl_dnodes) );
+	totalmemory += ArrayUsage( "texinfos",     hl_numtexinfo,      HL_MAX_MAP_TEXINFO,      sizeof(*hl_texinfo) );
+	totalmemory += ArrayUsage( "faces",        hl_numfaces,        HL_MAX_MAP_FACES,        sizeof(*hl_dfaces) );
+	totalmemory += ArrayUsage( "clipnodes",    hl_numclipnodes,    HL_MAX_MAP_CLIPNODES,    sizeof(*hl_dclipnodes) );
+	totalmemory += ArrayUsage( "leaves",       hl_numleafs,        HL_MAX_MAP_LEAFS,        sizeof(*hl_dleafs) );
+	totalmemory += ArrayUsage( "marksurfaces", hl_nummarksurfaces, HL_MAX_MAP_MARKSURFACES, sizeof(*hl_dmarksurfaces) );
+	totalmemory += ArrayUsage( "surfedges",    hl_numsurfedges,    HL_MAX_MAP_SURFEDGES,    sizeof(*hl_dsurfedges) );
+	totalmemory += ArrayUsage( "edges",        hl_numedges,        HL_MAX_MAP_EDGES,        sizeof(*hl_dedges) );
 
-	totalmemory += GlobUsage( "texdata",		hl_texdatasize,	sizeof(hl_dtexdata) );
-	totalmemory += GlobUsage( "lightdata",		hl_lightdatasize,	sizeof(hl_dlightdata) );
-	totalmemory += GlobUsage( "visdata",		hl_visdatasize,	sizeof(hl_dvisdata) );
-	totalmemory += GlobUsage( "entdata",		hl_entdatasize,	sizeof(hl_dentdata) );
+	totalmemory += GlobUsage( "texdata",       hl_texdatasize,   HL_MAX_MAP_MIPTEX );
+	totalmemory += GlobUsage( "lightdata",     hl_lightdatasize, HL_MAX_MAP_LIGHTING );
+	totalmemory += GlobUsage( "visdata",       hl_visdatasize,   HL_MAX_MAP_VISIBILITY );
+	totalmemory += GlobUsage( "entdata",       hl_entdatasize,   HL_MAX_MAP_ENTSTRING );
 
 	qprintf( "=== Total BSP file data space used: %d bytes ===\n\n", totalmemory );
 }
diff --git a/tools/quake2/common/qfiles.h b/tools/quake2/common/qfiles.h
index 520b24a4..f54e53d0 100644
--- a/tools/quake2/common/qfiles.h
+++ b/tools/quake2/common/qfiles.h
@@ -32,7 +32,7 @@
    ========================================================================
  */
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	#ifdef NDEBUG                           // Don't show in a Release build
 		#pragma warning(disable : 4305)     // truncate from double to float
 		#pragma warning(disable : 4244)     // conversion from double to float
diff --git a/tools/quake2/q2map/qbsp.h b/tools/quake2/q2map/qbsp.h
index 10fec15e..66365d45 100644
--- a/tools/quake2/q2map/qbsp.h
+++ b/tools/quake2/q2map/qbsp.h
@@ -46,7 +46,7 @@
 #include "bspfile.h"
 #include "inout.h"
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	#ifdef NDEBUG                           // Don't show in a Release build
 		#pragma warning(disable : 4305)     // truncate from double to float
 		#pragma warning(disable : 4244)     // conversion from double to float
diff --git a/tools/quake2/q2map/qrad.h b/tools/quake2/q2map/qrad.h
index 9d9a9475..e3625e7b 100644
--- a/tools/quake2/q2map/qrad.h
+++ b/tools/quake2/q2map/qrad.h
@@ -40,7 +40,7 @@
 #include <windows.h>
 #endif
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	#ifdef NDEBUG                           // Don't show in a Release build
 		#pragma warning(disable : 4305)     // truncate from double to float
 		#pragma warning(disable : 4244)     // conversion from double to float
diff --git a/tools/quake2/q2map/qvis.h b/tools/quake2/q2map/qvis.h
index a509d009..8677250e 100644
--- a/tools/quake2/q2map/qvis.h
+++ b/tools/quake2/q2map/qvis.h
@@ -30,7 +30,7 @@
 #include "bspfile.h"
 #include "inout.h"
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	#ifdef NDEBUG                           // Don't show in a Release build
 		#pragma warning(disable : 4305)     // truncate from double to float
 		#pragma warning(disable : 4244)     // conversion from double to float
diff --git a/tools/quake2/qdata/qdata.h b/tools/quake2/qdata/qdata.h
index cb00003a..a1be605d 100644
--- a/tools/quake2/qdata/qdata.h
+++ b/tools/quake2/qdata/qdata.h
@@ -34,7 +34,7 @@
 #include "l3dslib.h"
 #include "bspfile.h"
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	#ifdef NDEBUG                           // Don't show in a Release build
 		#pragma warning(disable : 4305)     // truncate from double to float
 		#pragma warning(disable : 4244)     // conversion from double to float