diff --git a/tools/mbspc/botlib/l_script.c b/tools/mbspc/botlib/l_script.c
index 2c5b4a66..1bccbd95 100644
--- a/tools/mbspc/botlib/l_script.c
+++ b/tools/mbspc/botlib/l_script.c
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "l_log.h"
 #include "../mbspc/l_mem.h"
-#include "l_cmd.h"
+#include "../mbspc/l_cmd.h"
 
 #define qtrue	true
 #define qfalse	false
diff --git a/tools/mbspc/mbspc/aas_cfg.c b/tools/mbspc/mbspc/aas_cfg.c
index 08f573f0..f01e393b 100644
--- a/tools/mbspc/mbspc/aas_cfg.c
+++ b/tools/mbspc/mbspc/aas_cfg.c
@@ -19,9 +19,9 @@ along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
+#include <float.h>
 
 #include "qbsp.h"
-#include "float.h"
 #include "../botlib/aasfile.h"
 #include "aas_store.h"
 #include "aas_cfg.h"
diff --git a/tools/mbspc/mbspc/l_bsp_hl.h b/tools/mbspc/mbspc/l_bsp_hl.h
index 41462020..138e95ab 100644
--- a/tools/mbspc/mbspc/l_bsp_hl.h
+++ b/tools/mbspc/mbspc/l_bsp_hl.h
@@ -91,7 +91,7 @@ typedef struct
 
 typedef struct
 {
-	int			version;	
+	int			version;
 	hl_lump_t	lumps[HL_HEADER_LUMPS];
 } hl_dheader_t;
 
@@ -193,7 +193,7 @@ typedef struct
 	short		side;
 
 	int		firstedge;		// we must support > 64k edges
-	short		numedges;	
+	short		numedges;
 	short		texinfo;
 
 // lighting info
@@ -307,7 +307,6 @@ int HL_CompressVis(byte *vis, byte *dest);
 void HL_LoadBSPFile(char *filename, int offset, int length);
 void HL_WriteBSPFile(char *filename);
 void HL_PrintBSPFileSizes(void);
-void HL_PrintBSPFileSizes(void);
 void HL_ParseEntities(void);
 void HL_UnparseEntities(void);
 
diff --git a/tools/mbspc/mbspc/l_bsp_q3.c b/tools/mbspc/mbspc/l_bsp_q3.c
index 2d2d2c64..bcec5ce7 100644
--- a/tools/mbspc/mbspc/l_bsp_q3.c
+++ b/tools/mbspc/mbspc/l_bsp_q3.c
@@ -217,7 +217,7 @@ void Q3_SurfacePlane(q3_dsurface_t *surface, vec3_t normal, float *dist)
 */
 	if (VectorLength(normal) < 0.9)
 	{
-		printf("surface %td bogus normal vector %f %f %f\n", surface - q3_drawSurfaces, normal[0], normal[1], normal[2]);
+		printf("surface %ld bogus normal vector %f %f %f\n", (long)( surface - q3_drawSurfaces ), normal[0], normal[1], normal[2]);
 		printf("t1 = %f %f %f, t2 = %f %f %f\n", t1[0], t1[1], t1[2], t2[0], t2[1], t2[2]);
 		for (i = 0; i < surface->numVerts; i++)
 		{
diff --git a/tools/mbspc/mbspc/qfiles.h b/tools/mbspc/mbspc/qfiles.h
index 237dd7b2..8df67a7e 100644
--- a/tools/mbspc/mbspc/qfiles.h
+++ b/tools/mbspc/mbspc/qfiles.h
@@ -100,7 +100,7 @@ typedef struct
 	short	t;
 } dstvert_t;
 
-typedef struct 
+typedef struct
 {
 	short	index_xyz[3];
 	short	index_st[3];
@@ -156,7 +156,7 @@ typedef struct
 	int			ofs_st;			// byte offset from start for stverts
 	int			ofs_tris;		// offset for dtriangles
 	int			ofs_frames;		// offset for first frame
-	int			ofs_glcmds;	
+	int			ofs_glcmds;
 	int			ofs_end;		// end of file
 
 } dmdl_t;
@@ -285,7 +285,7 @@ typedef struct
 typedef struct
 {
 	int			ident;
-	int			version;	
+	int			version;
 	lump_t		lumps[HEADER_LUMPS];
 } dheader_t;
 
@@ -396,7 +396,7 @@ typedef struct
 
 typedef struct texinfo_s
 {
-	float		vecs[2][8];		// [s/t][xyz offset]
+	float		vecs[2][4];		// [s/t][xyz offset]
 	int			flags;			// miptex flags + overrides
 	int			value;			// light emission, etc
 	char		texture[32];	// texture name (textures/*.wal)
@@ -418,7 +418,7 @@ typedef struct
 	short		side;
 
 	int			firstedge;		// we must support > 64k edges
-	short		numedges;	
+	short		numedges;
 	short		texinfo;
 
 // lighting info