diff --git a/include/client.h b/include/client.h
index 1b934e764..a3acba6d2 100644
--- a/include/client.h
+++ b/include/client.h
@@ -38,7 +38,8 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "match.h"
+#include "irc_string.h"
+#include "sprintf_irc.h"
 #include "ircd.h"
 
 /* other structs */
@@ -373,12 +374,7 @@ struct exit_client_hook
  * ts stuff
  */
 #define TS_CURRENT	6
-
-#ifdef TS6_ONLY
 #define TS_MIN          6
-#else
-#define TS_MIN          3
-#endif
 
 #define TS_DOESTS       0x10000000
 #define DoesTS(x)       ((x)->tsinfo & TS_DOESTS)