diff --git a/include/modules.h b/include/modules.h
index 601d79a5b..1e7223c3b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -23,7 +23,7 @@
 #define MOD_WE_SUPPORT  "3.2-b5*"
 #define MAXHOOKTYPES	20
 
-#if defined(_WIN32) && !defined(STATIC_LINKING)
+#if defined(_WIN32)
 #define DLLFUNC	_declspec(dllexport)
 #define irc_dlopen(x,y) LoadLibrary(x)
 #define irc_dlclose FreeLibrary
diff --git a/include/msg.h b/include/msg.h
index cfda8f73f..381664917 100644
--- a/include/msg.h
+++ b/include/msg.h
@@ -295,41 +295,35 @@
 
 #define MAXPARA    	15
 
-extern int m_private(), m_topic(), m_join(), m_part(), m_mode(), m_svsmode();
-extern int m_ping(), m_pong(), m_wallops(), m_kick(), m_svsnick();
-extern int m_nick(), m_error(), m_notice(), m_samode(), m_svsnoop();
-extern int m_invite(), m_quit(), m_kill(), m_svskill(), m_identify();
-extern int m_akill(), m_kline(), m_unkline(), m_rakill(), m_sqline();
-extern int m_zline(), m_unzline();
-extern int m_gnotice(), m_goper(), m_globops(), m_locops(), m_unsqline(),
-m_chatops();
+extern int m_topic(), m_join(), m_part(), m_mode();
+extern int m_wallops(), m_kick();
+extern int m_nick(), m_error(), m_samode();
+extern int m_invite(), m_svskill(), m_identify();
+extern int m_chatops(), m_dns();
+extern int m_gnotice(), m_goper(), m_globops(), m_locops();
 extern int m_protoctl();
-extern int m_motd(), m_whois(), m_user(), m_list();
+extern int m_motd(), m_user(), m_list();
 extern int m_server(), m_info(), m_links(), m_summon(), m_stats();
 extern int m_users(), m_version(), m_help();
 extern int m_services(), m_identify();
-extern int m_squit(), m_away(), m_connect();
-extern int m_oper(), m_pass(), m_trace();
+extern int m_squit(), m_connect();
+extern int m_pass(), m_trace();
 extern int m_time(), m_names(), m_admin();
 extern int m_lusers(), m_umode(), m_close();
 extern int m_motd(), m_whowas(), m_silence();
 extern int m_service(), m_userhost(), m_ison(), m_watch();
-extern int m_service(), m_servset(), m_servlist(), m_squery();
-extern int m_rehash(), m_restart(), m_die(), m_dns(), m_hash();
 
-extern int m_remgline(), m_map(), m_svs2mode(), m_admins(),
-m_dalinfo();
-extern int m_addline(), m_rules(), m_mkpasswd();
-extern int m_sethost(), m_nachat(), m_techat(), m_setident(), m_setname();
-extern int m_lag(), m_sdesc(), m_knock(), m_credits();
-extern int m_license(), m_chghost(), m_rping(), m_rpong();
-extern int m_netinfo(), m_sendumode(), m_addmotd(), m_addomotd();
-extern int m_svsmotd(), m_opermotd(), m_tsctl();
+extern int m_remgline(), m_map(), m_dalinfo();
+extern int m_addline(), m_rules();
+extern int m_knock(),m_credits();
+extern int m_license();
+extern int m_netinfo(), m_addmotd(), m_addomotd();
 extern int m_svsjoin(), m_sajoin(), m_svspart(), m_sapart();
-extern int m_chgident(), m_swhois(), m_svso(), m_svsfline();
-extern int m_tkl(), m_vhost(), m_botmotd(), m_sjoin(), m_htm();
+extern int m_svsfline();
+extern int m_vhost(), m_botmotd(), m_sjoin();
 extern int m_umode2(), m_dccdeny(), m_undccdeny();
-extern int m_chgname(), m_shun(), m_post(), m_cycle();
+extern int m_post(), m_cycle();
 extern int m_module(), m_alias();
+extern int m_hash(), m_rehash(), m_die(), m_restart();
 #endif
 
diff --git a/makefile.win32 b/makefile.win32
index ebd5e9a18..d46a50a45 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -44,7 +44,7 @@ MOD_FILES=SRC/L_COMMANDS.OBJ SRC/M_CHGHOST.OBJ SRC/M_SDESC.OBJ SRC/M_SETIDENT.OB
  SRC/M_PINGPONG.OBJ SRC/M_QUIT.OBJ SRC/M_RAKILL.OBJ SRC/M_RPING.OBJ SRC/M_SENDUMODE.OBJ \
  SRC/M_SQLINE.OBJ SRC/M_KILL.OBJ SRC/M_TSCTL.OBJ SRC/M_UNKLINE.OBJ \
  SRC/M_UNSQLINE.OBJ SRC/M_UNZLINE.OBJ SRC/M_WHOIS.OBJ SRC/M_ZLINE.OBJ \
- SRC/SCAN.OBJ SRC/SCAN_SOCKS.OBJ SRC/SCAN_HTTP.OBJ
+ SRC/SCAN.OBJ SRC/SCAN_SOCKS.OBJ SRC/SCAN_HTTP.OBJ SRC/M_TKL.OBJ
 
 
 ALL: CONF WIRCD.EXE
@@ -245,6 +245,10 @@ src/m_svsmotd.obj: src/modules/m_svsmotd.c $(INCLUDES)
 src/m_svsmode.obj: src/modules/m_svsmode.c $(INCLUDES)
         $(CC) $(CFLAGS) src/modules/m_svsmode.c
 
+src/m_tkl.obj: src/modules/m_tkl.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/modules/m_tkl.c
+
+
 src/m_swhois.obj: src/modules/m_swhois.c $(INCLUDES)
         $(CC) $(CFLAGS) src/modules/m_swhois.c
 
diff --git a/src/ircd.c b/src/ircd.c
index 4e75a4ff4..4fedf029f 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -1085,7 +1085,7 @@ int  InitwIRCD(argc, argv)
 #endif
 	init_dynconf();
 #ifdef STATIC_LINKING	
-	l_commands_init();
+        l_commands_Init();
 #endif
 	/* Add default class */
 	default_class = (ConfigItem_class *) MyMallocEx(sizeof(ConfigItem_class));
@@ -1208,7 +1208,7 @@ int  InitwIRCD(argc, argv)
 #endif
 	module_loadall();
 #ifdef STATIC_LINKING
-	l_commands_load(0);
+        l_commands_Load(0);
 #endif
 
 #ifndef NO_FDLIST
diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c
index b5d31c8cd..876046a98 100644
--- a/src/modules/l_commands.c
+++ b/src/modules/l_commands.c
@@ -82,7 +82,9 @@ int    l_commands_Init(int module_load)
 	/*
 	 * We call our add_Command crap here
 	*/
-	
+#ifdef SCAN_API
+        Module p;
+#endif
 	m_sethost_Init(module_load);
 	m_setname_Init(module_load);
 	m_chghost_Init(module_load);
@@ -126,8 +128,10 @@ int    l_commands_Init(int module_load)
 	m_guest_Init(module_load);
 #endif
 #ifdef SCAN_API
-	module_depend_resolve(scan_socks_Header.symdep);
-	module_depend_resolve(scan_http_Header.symdep);
+        p.header = &scan_socks_Header;
+        Module_Depend_Resolve(&p);
+        p.header = &scan_http_Header;
+        Module_Depend_Resolve(&p);
 	m_scan_Init(module_load);
 	scan_socks_Init(module_load);
 	scan_http_Init(module_load);
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index 1d67e6d95..deeba76a4 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -44,7 +44,7 @@
 
 static is_silenced PROTO((aClient *, aClient *));
 
-DLLFUNC static int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int notice);
+DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int notice);
 DLLFUNC int  m_notice(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 DLLFUNC int  m_private(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 
@@ -134,7 +134,7 @@ int	m_message_Unload(int module_unload)
 #define PREFIX_VOICE	0x2
 #define PREFIX_OP	0x4
 
-DLLFUNC static int m_message(cptr, sptr, parc, parv, notice)
+DLLFUNC int m_message(cptr, sptr, parc, parv, notice)
 	aClient *cptr, *sptr;
 	int  parc;
 	char *parv[];
diff --git a/src/packet.c b/src/packet.c
index 886aba260..9fc35d08c 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -191,13 +191,11 @@ void	init_CommandHash(void)
 	add_Command(MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA);
 	add_Command(MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1);
 	add_Command(MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1);
-	add_Command(MSG_OPERMOTD, TOK_OPERMOTD, m_opermotd, MAXPARA);
 	add_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA);
 	add_Command(MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA);
 	add_Command(MSG_SVSPART, TOK_SVSPART, m_svspart, MAXPARA);
 	add_Command(MSG_SAPART, TOK_SAPART, m_sapart, MAXPARA);
 	add_Command(MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA);
-	add_Command(MSG_TKL, TOK_TKL, m_tkl, MAXPARA);
 	add_Command(MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA);
 	add_Command(MSG_BOTMOTD, TOK_BOTMOTD, m_botmotd, MAXPARA);
 	add_Command(MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA);
diff --git a/src/win32/debug/StackTrace.dll b/src/win32/debug/StackTrace.dll
index 138acf5b2..aaf29eced 100644
Binary files a/src/win32/debug/StackTrace.dll and b/src/win32/debug/StackTrace.dll differ