diff --git a/code/client/cl_console.c b/code/client/cl_console.c
index 590f284..557d19f 100644
--- a/code/client/cl_console.c
+++ b/code/client/cl_console.c
@@ -624,7 +624,7 @@ void Con_DrawNotify (void)
 
 		Field_Draw(&chatField, skip * SMALLCHAR_WIDTH, v,
 			SCREEN_WIDTH - ( skip + 1 ) * SMALLCHAR_WIDTH, qtrue, qtrue);
-#elif XTRA
+#elif defined(XTRA)
 		if (chat_team)
 		{
 			SCR_DrawSmallString (8, v, "global:", 1.0f );
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index e9ef3ef..631be23 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 int demo_protocols[] =
 #ifdef ELITEFORCE
 { 0 };
-#elif XTRA
+#elif defined(XTRA)
 { 25, 59, 0 };
 #else
 { 67, 66, 0 };
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 025e234..a06ec03 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     #define HOMEPATH_NAME_MACOSX	HOMEPATH_NAME_WIN
     #define GAMENAME_FOR_MASTER		"EliteForce"
     #define LEGACY_PROTOCOL
-  #elif XTRA
+  #elif defined(XTRA)
     #define PRODUCT_NAME		"rpgxEF"
     #define BASEGAME			"baseEF"
     #define CLIENT_WINDOW_TITLE     	"rpgxEF"
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 43deac2..47f2bf7 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -265,7 +265,7 @@ PROTOCOL
 #ifdef ELITEFORCE
   #define PROTOCOL_VERSION		26
   #define PROTOCOL_LEGACY_VERSION	24
-#elif XTRA
+#elif defined(XTRA)
   #define PROTOCOL_VERSION		60
   #define PROTOCOL_LEGACY_VERSION	59
 #else