diff --git a/unsupported/m_clearchan.c b/unsupported/m_clearchan.c
index a76d7b8..f1c557e 100644
--- a/unsupported/m_clearchan.c
+++ b/unsupported/m_clearchan.c
@@ -20,7 +20,6 @@
  *   $Id: m_clearchan.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
diff --git a/unsupported/m_force.c b/unsupported/m_force.c
index d4962a1..20a3ccf 100644
--- a/unsupported/m_force.c
+++ b/unsupported/m_force.c
@@ -30,7 +30,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -40,7 +39,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -50,8 +48,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
-
 
 static int mo_forcejoin(struct Client *client_p, struct Client *source_p,
 			int parc, const char *parv[]);
@@ -219,7 +215,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p, int parc, const c
 
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +nt", me.name, chptr->chname);
 
-		target_p->localClient->last_join_time = CurrentTime;
+		target_p->localClient->last_join_time = rb_current_time();
 		channel_member_names(chptr, target_p, 1);
 
 		/* we do this to let the oper know that a channel was created, this will be