diff --git a/engine/Makefile.Linux b/engine/Makefile.Linux
index e6cb09322..c6206eab7 100644
--- a/engine/Makefile.Linux
+++ b/engine/Makefile.Linux
@@ -26,7 +26,7 @@ XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lpng -ljpeg
 SLDFLAGS=-lvga
 
 
-BASE_CFLAGS=-Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(QUX_DIR) -I/usr/X11R6/include -D_vsnprintf=vsnprintf -D_snprintf=snprintf
+BASE_CFLAGS=-Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(QUX_DIR) -I/usr/X11R6/include -D_vsnprintf=vsnprintf -D_snprintf=snprintf
 CLIENT_ONLY_CFLAGS=$(BASE_CFLAGS) -DCLIENTONLY
 SERVER_ONLY_CFLAGS=$(BASE_CFLAGS) -DSERVERONLY
 JOINT_CFLAGS=$(BASE_CFLAGS)
diff --git a/engine/client/teamplay.c b/engine/client/teamplay.c
index 9843a235f..c8d06d924 100644
--- a/engine/client/teamplay.c
+++ b/engine/client/teamplay.c
@@ -13,7 +13,7 @@
 
 #include "quakedef.h"
 
-#ifndef ZQUAKETEAMPLAY
+#if 0 //ndef ZQUAKETEAMPLAY
 
 cvar_t tp_name_armortype_ga	= {"tp_name_armortype_ga", "g"};
 cvar_t tp_name_armortype_ya	= {"tp_name_armortype_ya", "y"};