diff --git a/code/tools/asm/cmdlib.c b/code/tools/asm/cmdlib.c
index f3d85542..3f1ea3b5 100644
--- a/code/tools/asm/cmdlib.c
+++ b/code/tools/asm/cmdlib.c
@@ -28,14 +28,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef WIN32
 #include <direct.h>
 #include <windows.h>
-#endif
-
-#ifdef __linux
-#include <unistd.h>
-#endif
-
-#ifdef NeXT
+#elif defined(NeXT)
 #include <libc.h>
+#else
+#include <unistd.h>
 #endif
 
 #define	BASEDIRNAME	"quake"		// assumed to have a 2 or 3 following
diff --git a/code/tools/lcc/makefile b/code/tools/lcc/makefile
index 6de94eb8..a0c9a70e 100644
--- a/code/tools/lcc/makefile
+++ b/code/tools/lcc/makefile
@@ -140,10 +140,8 @@ $(BD)bprint$(O):	etc/bprint.c;		$(CC) $(LCC_CFLAGS) -c -Isrc -o $@ etc/bprint.c
 
 $(BD)q3lcc$(E):	$(BD)q3lcc$(O) $(BD)host$(O);	$(LD) $(LDFLAGS) -o $@ $(BD)q3lcc$(O) $(BD)host$(O) 
 
-SYSTEM=$(shell cc -print-search-dirs | head -n 1 | cut -b 10-)
-
 $(BD)q3lcc$(O):	etc/lcc.c;	$(CC) $(LCC_CFLAGS) -c -DTEMPDIR=\"$(TEMPDIR)\" -o $@ etc/lcc.c
-$(BD)host$(O):	$(HOSTFILE);	$(CC) $(LCC_CFLAGS) -c -DSYSTEM=\"$(SYSTEM)\" -o $@ $(HOSTFILE)
+$(BD)host$(O):	$(HOSTFILE);	$(CC) $(LCC_CFLAGS) -c -DSYSTEM=\"\" -o $@ $(HOSTFILE)
 
 LIBOBJS=$(BD)assert$(O) $(BD)bbexit$(O) $(BD)yynull$(O)