diff --git a/TODO b/TODO
index 77ddf531..100bbf52 100644
--- a/TODO
+++ b/TODO
@@ -19,12 +19,16 @@
   [x] ssl channelmode (done by extban and chm_compat)
   [ ] acknowledgement message for SSL users like '* *** You are connected using SSL cipher "DHE RSA-AES 128 CBC-SHA"'
   [ ] ssl stuff files generator in ./configure time
-[?] merge some stuff from ircd-seven directly (to be determined what)
-  [?] remote d:lines support?
-  [?] +C (noctcp) channel/usermode
+[x] merge some stuff from ircd-seven directly (to be determined what)
+  [x] remote d:lines support
 [F] kline/xline/resv sync
 [F] make an ability of using bandb instead of .conf files as bans storage
+<<<<<<< local
 [/] drop non-TS6 (legacy protocol) support
+=======
+[F] drop non-TS6 (legacy protocol) support
+[F] Doxygen code documentation
+>>>>>>> other
 [F] module engine rework
   [F] more beautiful way of adding new channel modes by module
   [F] make nick/user/host validation functions/match tables able to work in separated modules,
@@ -32,9 +36,13 @@
   [F] auth checker module
   [F] resolver module
 [x] Remove glines entirely
-[ ] other stuff
+--- other stuff
+  [?] PASS selector:password for auth{} from ircd-seven? (useful for dynamic IPs)
+  [?] +C (noctcp) channel/usermode from ircd-seven?
   [?] internally split out +o/+v "ranks" into a series of permissions. this could allow for configure-defined 
       special access levels, halfops, etc. (would need to match globally, somehow. extra SVINFO param?)
   [?] somehow hide channel operators like ircnet can do?
   [x] merge m_join.c and m_sjoin.c in one module (same functions, done in ratbox3)
   [x] create chmode.h and put there all declarations of chm_* - this will make some modules clean
+[?] Move oper override server WALLOPS to global server notices?
+
diff --git a/include/client.h b/include/client.h
index a3acba6d..4190c779 100644
--- a/include/client.h
+++ b/include/client.h
@@ -38,8 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */