diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c
index 7484e7f14..0dad4dbb2 100644
--- a/tools/qfcc/source/obj_type.c
+++ b/tools/qfcc/source/obj_type.c
@@ -40,7 +40,9 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#include <alloca.h>
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
 
 #include "compat.h"
 
diff --git a/tools/qflmp/lmp.c b/tools/qflmp/lmp.c
index 86393115b..d5f30ee50 100644
--- a/tools/qflmp/lmp.c
+++ b/tools/qflmp/lmp.c
@@ -56,6 +56,7 @@
 #include <QF/qendian.h>
 #include <QF/quakeio.h>
 #include <QF/sys.h>
+#include <QF/va.h>
 #include <QF/zone.h>
 
 #include "lmp.h"
@@ -90,7 +91,7 @@ replaceExtension (const char *oldstr, const char *extension)
 	char *newstr;
 
 	*blank = 0;
-	asprintf (&newstr, "%s.%s", tmp, extension);
+	newstr = nva ("%s.%s", tmp, extension);
 	free (tmp);
 	return newstr;
 }