diff --git a/game/shared/multiplay_gamerules.cpp b/game/shared/multiplay_gamerules.cpp
index 815c5725..e0ea9e72 100644
--- a/game/shared/multiplay_gamerules.cpp
+++ b/game/shared/multiplay_gamerules.cpp
@@ -117,7 +117,7 @@ void cc_GotoNextMapInCycle()
 ConCommand skip_next_map( "skip_next_map", cc_SkipNextMapInCycle, "Skips the next map in the map rotation for the server." );
 ConCommand changelevel_next( "changelevel_next", cc_GotoNextMapInCycle, "Immediately changes to the next map in the map rotation for the server." );
 
-#ifndef TF_DLL && TF_MOD		// TF overrides the default value of this convar
+#if !defined( TF_DLL ) && !defined( TF_MOD )		// TF overrides the default value of this convar
 ConVar mp_waitingforplayers_time( "mp_waitingforplayers_time", "0", FCVAR_GAMEDLL, "WaitingForPlayers time length in seconds" );
 #endif
 
diff --git a/game/shared/tf2base/tf_gamerules.cpp b/game/shared/tf2base/tf_gamerules.cpp
index 99f151db..25d08ce2 100644
--- a/game/shared/tf2base/tf_gamerules.cpp
+++ b/game/shared/tf2base/tf_gamerules.cpp
@@ -42,7 +42,6 @@
 	#include "AI_ResponseSystem.h"
 	#include "hl2orange.spa.h"
 	#include "hltvdirector.h"
-	#include "multiplay_gamerules.h"
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
@@ -84,6 +83,7 @@ ConVar tf_birthday( "tf_birthday", "0", FCVAR_NOTIFY | FCVAR_REPLICATED );
 
 #ifdef GAME_DLL
 // TF overrides the default value of this convar
+ConVar mp_waitingforplayers_time( "mp_waitingforplayers_time", (IsX360()?"15":"30"), FCVAR_GAMEDLL | FCVAR_DEVELOPMENTONLY, "WaitingForPlayers time length in seconds" );
 ConVar tf_gravetalk( "tf_gravetalk", "1", FCVAR_NOTIFY, "Allows living players to hear dead players using text/voice chat." );
 ConVar tf_spectalk( "tf_spectalk", "1", FCVAR_NOTIFY, "Allows living players to hear spectators using text chat." );
 #endif