#include "stdinc.h"
#include "client.h"
#include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "restart.h"
-#include "s_log.h"
+#include "logger.h"
#include "send.h"
#include "msg.h"
#include "parse.h"