diff --git a/Changes b/Changes
index fbdd34c47..f9d97e0dc 100644
--- a/Changes
+++ b/Changes
@@ -653,3 +653,6 @@
 - NickChars: Updated polish a bit, and added polish-w1250 which is unfortunately more
   common than real latin2 (iso-8859-2), supplied by k4be as well.
 - NickChars: Added 'icelandic', supplied by Saevar.
+- Updated wircd.def
+- Fixed a bug where USERIP would say USERHOST in the not-enough-parameters numeric
+  (#0002366) reported by vonitsanet.
diff --git a/src/modules/m_userip.c b/src/modules/m_userip.c
index 36f1f8a50..b7cb2d13e 100644
--- a/src/modules/m_userip.c
+++ b/src/modules/m_userip.c
@@ -94,7 +94,7 @@ DLLFUNC CMD_FUNC(m_userip)
 	if (parc < 2)
 	{
 		sendto_one(sptr, rpl_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "USERHOST");
+		    me.name, parv[0], "USERIP");
 		return 0;
 	}
 
diff --git a/wircd.def b/wircd.def
index d041e47d8..8d8cd1d50 100644
--- a/wircd.def
+++ b/wircd.def
@@ -1,892 +1,918 @@
-; dlltool --output-def wircd.def.in --export-all-symbols SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ SRC/S_CONF.OBJ SRC/FDLIST.OBJ SRC/DBUF.OBJ SRC/CLOAK.OBJ SRC/HASH.OBJ SRC/PARSE.OBJ SRC/IRCD.OBJ SRC/S_NUMERIC.OBJ SRC/WHOWAS.OBJ SRC/S_AUTH.OBJ SRC/HELP.OBJ SRC/S_MISC.OBJ SRC/MATCH.OBJ SRC/CRULE.OBJ SRC/S_DEBUG.OBJ SRC/SUPPORT.OBJ SRC/LIST.OBJ SRC/S_ERR.OBJ SRC/PACKET.OBJ SRC/S_BSD.OBJ SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/VERSION.OBJ SRC/RES_INIT.OBJ SRC/RES_COMP.OBJ SRC/RES_MKQUERY.OBJ SRC/RES_SKIPNAME.OBJ SRC/S_KLINE.OBJ SRC/S_EXTRA.OBJ SRC/IRCSPRINTF.OBJ SRC/LUSERS.OBJ SRC/SCACHE.OBJ SRC/ALN.OBJ SRC/BADWORDS.OBJ SRC/WEBTV.OBJ SRC/RES.OBJ SRC/MODULES.OBJ SRC/S_SVS.OBJ SRC/EVENTS.OBJ SRC/UMODES.OBJ SRC/AUTH.OBJ SRC/CIDR.OBJ SRC/SSL.OBJ SRC/RANDOM.OBJ SRC/EXTCMODES.OBJ SRC/MD5.OBJ SRC/API-ISUPPORT.OBJ SRC/API-COMMAND.OBJ SRC/EXTBANS.OBJ
+; dlltool --output-def wircd.def.in --export-all-symbols SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ SRC/S_CONF.OBJ SRC/FDLIST.OBJ SRC/DBUF.OBJ SRC/CLOAK.OBJ SRC/HASH.OBJ SRC/PARSE.OBJ SRC/IRCD.OBJ SRC/S_NUMERIC.OBJ SRC/WHOWAS.OBJ SRC/S_AUTH.OBJ SRC/HELP.OBJ SRC/S_MISC.OBJ SRC/MATCH.OBJ SRC/CRULE.OBJ SRC/S_DEBUG.OBJ SRC/SUPPORT.OBJ SRC/LIST.OBJ SRC/S_ERR.OBJ SRC/PACKET.OBJ SRC/S_BSD.OBJ SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/CHARSYS.OBJ SRC/VERSION.OBJ SRC/RES_INIT.OBJ SRC/RES_COMP.OBJ SRC/RES_MKQUERY.OBJ SRC/RES_SKIPNAME.OBJ SRC/S_KLINE.OBJ SRC/S_EXTRA.OBJ SRC/IRCSPRINTF.OBJ SRC/LUSERS.OBJ SRC/SCACHE.OBJ SRC/ALN.OBJ SRC/BADWORDS.OBJ SRC/WEBTV.OBJ SRC/RES.OBJ SRC/MODULES.OBJ SRC/S_SVS.OBJ SRC/EVENTS.OBJ SRC/UMODES.OBJ SRC/AUTH.OBJ SRC/CIDR.OBJ SRC/SSL.OBJ SRC/RANDOM.OBJ SRC/EXTCMODES.OBJ SRC/MD5.OBJ SRC/API-ISUPPORT.OBJ SRC/API-COMMAND.OBJ SRC/EXTBANS.OBJ
 EXPORTS
-	zlinebuf
-	AllUmodes
-	AllowClient
-	AuthTypes
-	Auth_Check
-	Auth_CheckError
-	Auth_ConvertConf2AuthStruct
-	Auth_DeleteAuthStruct
-	Auth_FindType
-	Auth_Make
-	CallCmdoverride
-	CallbackAddMain
-	CallbackDel
-	Callbacks
-	Channelmode_Table
-	Channelmode_highest
-	CmdoverrideAdd
-	CmdoverrideDel
-	CmodeAdd
-	CmodeDel
-	CommandAdd
-	CommandDel
-	CommandExists
-	CommandHash
-	DCCdeny_add
-	DCCdeny_del
-	DeleteTempModules
-	DoEvents
-	DoMD5
-	DoesOp
-	EXTMODE_NONOTICE
-	EXTMODE_STRIPBADWORDS
-	EfunctionAddMain
-	EfunctionDel
-	Efunctions
-	EventAddEx
-	EventDel
-	EventFind
-	EventMarkDel
-	EventMod
-	EventStatus
-	ExtBan_Table
-	ExtBan_highest
-	ExtbanAdd
-	ExtbanDel
-	Find_Help
-	Find_alias
-	Find_ban
-	Find_banEx
-	Find_channel_allowed
-	Find_class
-	Find_deny_dcc
-	Find_except
-	Find_link
-	Find_listen
-	Find_oper
-	Find_tld
-	Find_uline
-	Find_vhost
-	HTMLOCK
-	Halfop_mode
-	HookAddMain
-	HookDel
-	Hooks
-	HooktypeAdd
-	HooktypeDel
-	HooktypeFind
-	Hooktypes
-	IRCstats
-	Inet_ia2p
-	Inet_ia2pNB
-	Inet_si2p
-	Inet_si2pB
-	Init_all_testing_modules
-	InitwIRCD
-	IsupportAdd
-	IsupportDel
-	IsupportFind
-	IsupportSetValue
-	IsupportStrings
-	Isupports
-	LCF
-	LRV
-	LastSlot
-	LockEventSystem
-	MD5_Final
-	MD5_Init
-	MD5_Update
-	ModuleGetError
-	ModuleGetErrorStr
-	ModuleGetOptions
-	ModuleSetOptions
-	Module_AddAsChild
-	Module_Create
-	Module_DelayChildren
-	Module_Depend_Resolve
-	Module_Find
-	Module_Init
-	Module_IsAlreadyChild
-	Module_Sym
-	Module_SymEx
-	Module_SymX
-	Module_Unload
-	Module_free
-	Module_make
-	Modules
-	MyMallocEx
-	NOW
-	OpenFiles
-	RCallbacks
-	REPORT_DO_DNS
-	REPORT_DO_ID
-	REPORT_FAIL_DNS
-	REPORT_FAIL_ID
-	REPORT_FIN_DNS
-	REPORT_FIN_DNSC
-	REPORT_FIN_ID
-	R_do_dns
-	R_do_id
-	R_fail_dns
-	R_fail_id
-	R_fin_dns
-	R_fin_dnsc
-	R_fin_id
-	SJSynchList
-	SNO_CLIENT
-	SNO_EYES
-	SNO_FCLIENT
-	SNO_FLOOD
-	SNO_FNICKCHANGE
-	SNO_JUNK
-	SNO_KILLS
-	SNO_NICKCHANGE
-	SNO_OPER
-	SNO_QLINE
-	SNO_SNOTICE
-	SNO_SPAMF
-	SNO_TKL
-	SNO_VHOST
-	SVSNOOP
-	SendUmodes
-	Servers
-	SetupEvents
-	SnomaskAdd
-	SnomaskDel
-	Snomask_Table
-	Snomask_highest
-	SocketLoop
-	StatsZ
-	StripColors
-	StripControlCodes
-	TS2ts
-	TSoffset
-	ThrottlingHash
-	TokenHash
-	UMODE_ADMIN
-	UMODE_BOT
-	UMODE_COADMIN
-	UMODE_DEAF
-	UMODE_FAILOP
-	UMODE_HELPOP
-	UMODE_HIDE
-	UMODE_HIDEOPER
-	UMODE_HIDEWHOIS
-	UMODE_INVISIBLE
-	UMODE_KIX
-	UMODE_LOCOP
-	UMODE_NETADMIN
-	UMODE_NOCTCP
-	UMODE_OPER
-	UMODE_REGNICK
-	UMODE_RGSTRONLY
-	UMODE_SADMIN
-	UMODE_SECURE
-	UMODE_SERVICES
-	UMODE_SERVNOTICE
-	UMODE_SETHOST
-	UMODE_STRIPBADWORDS
-	UMODE_VICTIM
-	UMODE_WALLOP
-	UMODE_WEBTV
-	UMODE_WHOIS
-	UmodeAdd
-	UmodeDel
-	Unload_all_loaded_modules
-	Unload_all_testing_modules
-	UnlockEventSystem
-	Usermode_Table
-	Usermode_highest
-	VersionflagAdd
-	VersionflagDel
-	VersionflagFind
-	Versionflags
-	WHOWAS
-	WHOWASHASH
-	WSAErrors
-	__ircd_dn_skipname
-	_match
-	add_Command
-	add_CommandX
-	add_Command_backend
-	add_ListItem
-	add_client_to_list
-	add_connection
-	add_dccallow
-	add_entropy_configfile
-	add_history
-	add_include
-	add_invite
-	add_listener2
-	add_listmode
-	add_local_client
-	add_local_domain
-	add_send_mode_param
-	add_server_to_table
-	add_silence
-	add_throttling_bucket
-	add_to_channel_hash_table
-	add_to_client_hash_table
-	add_to_watch_hash_table
-	add_user_to_channel
-	addto_fdlist
-	advanced_check
-	areason
-	atime
-	atime_exp
-	atoi_tab
-	b64_decode
-	b64_encode
-	backupbuf
-	badwords_stats
-	ban_flooder
-	ban_ip
-	ban_realhost
-	ban_version
-	ban_virthost
-	banact_chartoval
-	banact_stringtoval
-	banact_valtochar
-	banact_valtostring
-	base64_to_int6_map
-	base64dec
-	base64enc
-	booted
-	bootopt
-	botmotd
-	buildid
-	busycli_fdlist
-	cFlagTab
-	callbacks_check
-	callbacks_switchover
-	can_join
-	can_send
-	canonize
-	chanfloodtimer_add
-	chanfloodtimer_del
-	chanfloodtimer_find
-	chanfloodtimer_stopchantimers
-	channel
-	channel_canjoin
-	channel_modef_string
-	channel_modes
-	char_atribs
-	check_channelmask
-	check_client
-	check_fdlists
-	check_for_chan_flood
-	check_for_target_limit
-	check_pings
-	check_registered
-	check_registered_user
-	check_string
-	checklist
-	chess
-	chmode_str
-	clean_ban_mask
-	clean_channelname
-	clear_channel_hash_table
-	clear_client_hash_table
-	clear_scache_hash_table
-	clear_watch_hash_table
-	client
-	close_connection
-	close_connections
-	close_listeners
-	cmdstr
-	cmodestring
-	collapse
-	completed_connection
-	conf
-	conf_admin
-	conf_admin_tail
-	conf_alias
-	conf_allow
-	conf_allow_channel
-	conf_allow_dcc
-	conf_badword_channel
-	conf_badword_message
-	conf_badword_quit
-	conf_ban
-	conf_class
-	conf_debuglevel
-	conf_deny_channel
-	conf_deny_dcc
-	conf_deny_link
-	conf_deny_version
-	conf_drpass
-	conf_except
-	conf_help
-	conf_include
-	conf_link
-	conf_listen
-	conf_log
-	conf_me
-	conf_offchans
-	conf_oper
-	conf_tld
-	conf_ulines
-	conf_vhost
-	config_binary_flags_search
-	config_binary_search
-	config_checkval
-	config_error
-	config_error_flag
-	config_find_entry
-	config_free
-	config_load
-	config_parse_flood
-	config_post_test
-	config_progress
-	config_rehash
-	config_run
-	config_setdefaultsettings
-	config_status
-	config_test
-	config_verbose
-	config_warn
-	configfile
-	connect_server
-	convert_time
-	count_oper_sessions
-	count_scache
-	count_watch_memory
-	count_whowas_memory
-	create_snomask
-	create_tkl_except
-	creation
-	cres_mem
-	crule__andor
-	crule__not
-	crule_connected
-	crule_directcon
-	crule_directop
-	crule_errstr
-	crule_errstring
-	crule_eval
-	crule_free
-	crule_funclist
-	crule_gettoken
-	crule_getword
-	crule_parse
-	crule_parseandexpr
-	crule_parsearglist
-	crule_parsefunction
-	crule_parseorexpr
-	crule_parseprimary
-	crule_test
-	crule_via
-	currentrate
-	currentrate2
-	currlife
-	dalinfotext
-	date
-	dbuf_delete
-	dbuf_get
-	dbuf_getmsg
-	dbuf_map
-	dbuf_put
-	dbufalloc
-	dbufblocks
-	dcc_isdiscouraged
-	dcc_isforbidden
-	dcc_sync
-	dcc_wipe_services
-	debuglevel
-	debugmode
-	decode_ip
-	default_class
-	default_fdlist
-	del_Command
-	del_ListItem
-	del_async_connects
-	del_dccallow
-	del_from_channel_hash_table
-	del_from_client_hash_table
-	del_from_watch_hash_table
-	del_invite
-	del_listmode
-	del_queries
-	del_silence
-	del_throttling_bucket
-	delete_classblock
-	delete_linkblock
-	delfrom_fdlist
-	deliver_it
-	dgets
-	dn_skipname
-	do_chanflood
-	do_chanflood_action
-	do_cmd
-	do_join
-	do_mode
-	do_nick_name
-	do_numeric
-	dontspread
-	dopacket
-	dospamfilter
-	e_check_fdlists
-	e_clean_out_throttling_buckets
-	e_unload_module_delayed
-	efunctions_check
-	efunctions_switchover
-	encode_ip
-	events
-	exit_client
-	expire_cache
-	extban_conv_param_nuh
-	extban_init
-	extban_modec_conv_param
-	extban_modec_is_banned
-	extban_moden_is_banned
-	extban_modeq_is_banned
-	extban_moder_conv_param
-	extban_moder_is_banned
-	extbanstr
-	extchmstr
-	extcmode_default_requirechop
-	extcmode_default_requirehalfop
-	extcmode_duplicate_paramlist
-	extcmode_free_paramlist
-	extcmode_get_struct
-	extcmode_init
-	extraflags
-	fast_badword_match
-	fast_badword_replace
-	find_Command
-	find_CommandEx
-	find_Command_simple
-	find_by_hash
-	find_chasing
-	find_client
-	find_invex
-	find_match_server
-	find_member_link
-	find_membership_link
-	find_name
-	find_nickserv
-	find_or_add
-	find_person
-	find_qline
-	find_server
-	find_server_b64_or_real
-	find_server_by_base64
-	find_server_by_numeric
-	find_server_id
-	find_server_quick_search
-	find_server_quick_straight
-	find_server_quickx
-	find_shun
-	find_spamfilter_user
-	find_str_match_link
-	find_throttling_bucket
-	find_tkline_match
-	find_tkline_match_zap
-	find_user_link
-	findmod_by_bantype
-	flag_add
-	flag_del
-	flinks
-	flush_cache
-	flush_connections
-	flush_fdlist_connections
-	free_ban
-	free_class
-	free_client
-	free_iConf
-	free_link
-	free_member
-	free_membership
-	free_str_list
-	free_synchlist
-	free_user
-	freelink
-	freelinks
-	freemember
-	freemembership
-	freemembershipL
-	garbage_collect
-	generation
-	get_access
-	get_chanbitbychar
-	get_channel
-	get_client_host
-	get_client_name
-	get_client_name2
-	get_cptr_status
-	get_history
-	get_mode_str
-	get_modestr
-	get_res
-	get_res_from_reg_9x
-	get_res_from_reg_nt
-	get_res_interfaces_nt
-	get_res_nt
-	get_sno_str
-	get_snostr
-	get_sockerr
-	get_sockhost
-	gethost_byaddr
-	gethost_byname
-	gethost_byname_revquery
-	getrandom16
-	getrandom32
-	getrandom8
-	getreply
-	global_count
-	gnulicense
-	has_voice
-	hash_channel_name
-	hash_check_watch
-	hash_del_watch_list
-	hash_find_channel
-	hash_find_client
-	hash_find_nickserver
-	hash_find_server
-	hash_get_chan_bucket
-	hash_get_watch
-	hash_nick_name
-	hash_nn_name
-	hash_throttling
-	hash_whowas_name
-	helpign
-	highest_rate
-	highest_rate2
-	hunt_server
-	hunt_server_token
-	hunt_server_token_quiet
-	iConf
-	iCstrip
-	iNAH_host
-	ident_failed
-	inet_netof
-	inet_ntop
-	inet_pton
-	inetntoa
-	inetntop
-	inetport
-	infotext
-	init_CommandHash
-	init_conf
-	init_dynconf
-	init_fdlist
-	init_ircstats
-	init_modef
-	init_random
-	init_resolver
-	init_sys
-	init_throttling_hash
-	initlists
-	initstats
-	initwhowas
-	int6_to_base64_map
-	ipport_seperate
-	ircd__putlong
-	ircd__putshort
-	ircd_dn_comp
-	ircd_dn_expand
-	ircd_getlong
-	ircd_getshort
-	ircd_log
-	ircd_res
-	ircd_res_init
-	ircd_res_mkquery
-	ircd_res_randomid
-	ircsprintf
-	ircst
-	ircstp
-	ircvsprintf
-	is_banned
-	is_chan_op
-	is_chanowner
-	is_chanownprotop
-	is_chanprot
-	is_half_op
-	is_skochanop
-	isupport_init
-	join_channel
-	last_allinuse
-	last_garbage_collect
-	lastlucheck
-	lastrecvK
-	lastsendK
-	lifesux
-	link_cleanup
-	list_scache
-	listen_cleanup
-	load_conf
-	load_includes
-	load_tunefile
-	local
-	localdie
-	loop
-	loop_event
-	m_alias
-	m_botmotd
-	m_credits
-	m_dalinfo
-	m_die
-	m_dns
-	m_error
-	m_info
-	m_info_send
-	m_license
-	m_module
-	m_motd
-	m_names
-	m_opermotd
-	m_rehash
-	m_restart
-	m_summon
-	m_tkl
-	m_umode
-	m_users
-	m_version
-	m_watch
-	make_ban
-	make_class
-	make_client
-	make_cmodestr
-	make_extbanstr
-	make_extcmodestr
-	make_isupportstrings
-	make_link
-	make_member
-	make_membership
-	make_nick_user_host
-	make_server
-	make_synchlist
-	make_umodestr
-	make_user
-	make_user_host
-	make_virthost
-	match
-	match_ip
-	match_ipv4
-	max_client_count
-	max_connection_count
-	max_global_count
-	me
-	me_hash
-	modebuf
-	modef_event
-	module_loadall
-	motd
-	motd_tm
-	my_itoa
-	myargv
-	myctime
-	myncmp
-	next_client
-	nextconnect
-	nextdnscheck
-	nextexpire
-	nextping
-	noisy_htm
-	now
-	ns_stats
-	num
-	numclients
-	numeric_collides
-	off_history
-	oflagbuf
-	oflagstr
-	on_dccallow_list
-	op_can_override
-	oper_access
-	oper_fdlist
-	opermode
-	opermotd
-	our_crc32
-	our_dlerror
-	our_strcasestr
-	outofmemory
-	parabuf
-	parse
-	parse_addlag
-	parse_help
-	parse_modsys_version
-	parse_netmask
-	parse_tkl_para
-	place_host_ban
-	port_range
-	portnum
-	pretty_mask
-	pretty_time_val
-	read_authports
-	read_file
-	read_file_ex
-	read_message
-	readcalls
-	register_user
-	rehash
-	rehash_internal
-	rehash_motdrules
-	rejoin_dojoinandmode
-	rejoin_doparts
-	remove_client_from_list
-	remove_dcc_references
-	remove_local_client
-	remove_oper_snomasks
-	remove_server_from_table
-	remove_user_from_channel
-	removefld_list
-	report_baderror
-	report_error
-	requiredstuff
-	reread_motdsandrules
-	reset_help
-	resfd
-	restart
-	rfc2time
-	rfctime
-	rules
-	run_configuration
-	s_die
-	s_rehash
-	s_restart
-	save_stats
-	save_tunefile
-	sbrk0
-	send_authports
-	send_channel_modes
-	send_channel_modes_sjoin
-	send_channel_modes_sjoin3
-	send_list
-	send_proto
-	send_queued
-	send_umode
-	send_umode_out
-	send_umode_out_nickv2
-	send_user_joins
-	sendanyways
-	sendbufto_one
-	sendmodeto_one
-	sendnotice
-	sendto_all_butone
-	sendto_channel_butone
-	sendto_channel_butserv
-	sendto_channel_butserv_butone
-	sendto_channelprefix_butone
-	sendto_channelprefix_butone_tok
-	sendto_chanops_butone
-	sendto_chmodemucrap
-	sendto_common_channels
-	sendto_connectnotice
-	sendto_failops
-	sendto_failops_whoare_opers
-	sendto_fconnectnotice
-	sendto_locfailops
-	sendto_match_butone
-	sendto_match_servs
-	sendto_message_one
-	sendto_one
-	sendto_one_nickcmd
-	sendto_opers
-	sendto_opers_butone
-	sendto_ops
-	sendto_ops_butme
-	sendto_ops_butone
-	sendto_prefix_one
-	sendto_realops
-	sendto_serv_butone
-	sendto_serv_butone_nickcmd
-	sendto_serv_butone_nickv2
-	sendto_serv_butone_quit
-	sendto_serv_butone_sjoin
-	sendto_serv_butone_token
-	sendto_serv_butone_token_opt
-	sendto_serv_nickv2
-	sendto_serv_nickv2_token
-	sendto_serv_sjoin
-	sendto_snomask
-	sendto_snomask_global
-	sendto_snomask_normal
-	sendto_snomask_normal_global
-	sendto_umode
-	sendto_umode_raw
-	sentalong_marker
-	serv_fdlist
-	server_reboot
-	serveropts
-	set_blocking
-	set_channelmodes
-	set_mode
-	set_non_blocking
-	set_snomask
-	set_sock_opts
-	set_usermode
-	settings
-	short_motd
-	smotd
-	smotd_tm
-	smycmp
-	snprintf
-	sock_strerror
-	spamf_ugly_vchanoverride
-	spamfilter_getconftargets
-	spamfilter_gettargets
-	spamfilter_inttostring_long
-	spamfilter_target_inttostring
-	start_auth
-	start_of_normal_client_handshake
-	stripbadwords
-	stripbadwords_channel
-	stripbadwords_message
-	stripbadwords_quit
-	strlcat
-	strlcpy
-	strlncat
-	strrangetok
-	strtoken
-	sub1_from_channel
-	svsmotd
-	tainted
-	target_is_spamexcept
-	tempiConf
-	throttle_can_connect
-	timeofday
-	timeout_query_list
-	tkl_add_line
-	tkl_check_expire
-	tkl_del_line
-	tkl_expire
-	tkl_hash
-	tkl_init
-	tkl_stats
-	tkl_synch
-	tkl_typetochar
-	tklines
-	tolowertab
-	touppertab
-	trim_str
-	trouble_info
-	umode_allow_all
-	umode_allow_opers
-	umode_delete
-	umode_get
-	umode_init
-	umodestring
-	unknown_fdlist
-	unload_all_modules
-	unload_all_unused_snomasks
-	unload_all_unused_umodes
-	unload_loaded_includes
-	unload_notloaded_includes
-	unreal_buildspamfilter
-	unreal_checkregex
-	unreal_copyfile
-	unreal_copyfileex
-	unreal_decodespace
-	unreal_encodespace
-	unreal_getfilemodtime
-	unreal_getfilename
-	unreal_getpathname
-	unreal_mktemp
-	unreal_setfilemodtime
-	unrealcredits
-	unreallogo
-	valid_host
-	verify_opercount
-	version
-	vsendto_one
-	vsendto_prefix_one
-	vsnprintf
-	w_whois
-	webtv_cmds
-	webtv_parse
-	whowas_next
-	write_pidfile
-	??_C@_0L@PKJOOFPP@?$DMcensored?$DO?$AA@
+	zlinebuf
+	AllUmodes
+	AllowClient
+	AuthTypes
+	Auth_Check
+	Auth_CheckError
+	Auth_ConvertConf2AuthStruct
+	Auth_DeleteAuthStruct
+	Auth_FindType
+	Auth_Make
+	CallCmdoverride
+	CallbackAddMain
+	CallbackDel
+	Callbacks
+	Channelmode_Table
+	Channelmode_highest
+	CmdoverrideAdd
+	CmdoverrideDel
+	CmodeAdd
+	CmodeDel
+	CommandAdd
+	CommandDel
+	CommandExists
+	CommandHash
+	DCCdeny_add
+	DCCdeny_del
+	DeleteTempModules
+	DoEvents
+	DoMD5
+	DoesOp
+	EXTMODE_JOINTHROTTLE
+	EXTMODE_NONOTICE
+	EXTMODE_STRIPBADWORDS
+	EfunctionAddMain
+	EfunctionDel
+	Efunctions
+	EventAddEx
+	EventDel
+	EventFind
+	EventMarkDel
+	EventMod
+	EventStatus
+	ExtBan_Table
+	ExtBan_highest
+	ExtbanAdd
+	ExtbanDel
+	Find_Help
+	Find_alias
+	Find_ban
+	Find_banEx
+	Find_channel_allowed
+	Find_class
+	Find_deny_dcc
+	Find_except
+	Find_link
+	Find_listen
+	Find_oper
+	Find_tld
+	Find_uline
+	Find_vhost
+	HTMLOCK
+	Halfop_mode
+	HookAddMain
+	HookDel
+	Hooks
+	HooktypeAdd
+	HooktypeDel
+	HooktypeFind
+	Hooktypes
+	IRCstats
+	Inet_ia2p
+	Inet_ia2pNB
+	Inet_si2p
+	Inet_si2pB
+	Init_all_testing_modules
+	InitwIRCD
+	IsupportAdd
+	IsupportDel
+	IsupportFind
+	IsupportSetValue
+	IsupportStrings
+	Isupports
+	LCF
+	LRV
+	LastSlot
+	LockEventSystem
+	MD5_Final
+	MD5_Init
+	MD5_Update
+	ModuleGetError
+	ModuleGetErrorStr
+	ModuleGetOptions
+	ModuleSetOptions
+	Module_AddAsChild
+	Module_Create
+	Module_DelayChildren
+	Module_Depend_Resolve
+	Module_Find
+	Module_Init
+	Module_IsAlreadyChild
+	Module_Sym
+	Module_SymEx
+	Module_SymX
+	Module_Unload
+	Module_free
+	Module_make
+	Modules
+	MyMallocEx
+	NOW
+	OpenFiles
+	RCallbacks
+	REPORT_DO_DNS
+	REPORT_DO_ID
+	REPORT_FAIL_DNS
+	REPORT_FAIL_ID
+	REPORT_FIN_DNS
+	REPORT_FIN_DNSC
+	REPORT_FIN_ID
+	R_do_dns
+	R_do_id
+	R_fail_dns
+	R_fail_id
+	R_fin_dns
+	R_fin_dnsc
+	R_fin_id
+	SJSynchList
+	SNO_CLIENT
+	SNO_EYES
+	SNO_FCLIENT
+	SNO_FLOOD
+	SNO_FNICKCHANGE
+	SNO_JUNK
+	SNO_KILLS
+	SNO_NICKCHANGE
+	SNO_OPER
+	SNO_QLINE
+	SNO_SNOTICE
+	SNO_SPAMF
+	SNO_TKL
+	SNO_VHOST
+	SVSNOOP
+	SendUmodes
+	Servers
+	SetupEvents
+	SnomaskAdd
+	SnomaskDel
+	Snomask_Table
+	Snomask_highest
+	SocketLoop
+	StatsZ
+	StripColors
+	StripControlCodes
+	TS2ts
+	TSoffset
+	ThrottlingHash
+	TokenHash
+	UMODE_ADMIN
+	UMODE_BOT
+	UMODE_COADMIN
+	UMODE_DEAF
+	UMODE_FAILOP
+	UMODE_HELPOP
+	UMODE_HIDE
+	UMODE_HIDEOPER
+	UMODE_HIDEWHOIS
+	UMODE_INVISIBLE
+	UMODE_KIX
+	UMODE_LOCOP
+	UMODE_NETADMIN
+	UMODE_NOCTCP
+	UMODE_OPER
+	UMODE_REGNICK
+	UMODE_RGSTRONLY
+	UMODE_SADMIN
+	UMODE_SECURE
+	UMODE_SERVICES
+	UMODE_SERVNOTICE
+	UMODE_SETHOST
+	UMODE_STRIPBADWORDS
+	UMODE_VICTIM
+	UMODE_WALLOP
+	UMODE_WEBTV
+	UMODE_WHOIS
+	UmodeAdd
+	UmodeDel
+	Unload_all_loaded_modules
+	Unload_all_testing_modules
+	UnlockEventSystem
+	Usermode_Table
+	Usermode_highest
+	VersionflagAdd
+	VersionflagDel
+	VersionflagFind
+	Versionflags
+	WHOWAS
+	WHOWASHASH
+	WSAErrors
+	__ircd_dn_skipname
+	_match
+	add_Command
+	add_CommandX
+	add_Command_backend
+	add_ListItem
+	add_client_to_list
+	add_connection
+	add_dccallow
+	add_entropy_configfile
+	add_history
+	add_include
+	add_invite
+	add_listener2
+	add_listmode
+	add_local_client
+	add_local_domain
+	add_send_mode_param
+	add_server_to_table
+	add_silence
+	add_throttling_bucket
+	add_to_channel_hash_table
+	add_to_client_hash_table
+	add_to_watch_hash_table
+	add_user_to_channel
+	addto_fdlist
+	advanced_check
+	areason
+	atime
+	atime_exp
+	atoi_tab
+	b64_decode
+	b64_encode
+	backupbuf
+	badwords_stats
+	ban_flooder
+	ban_ip
+	ban_realhost
+	ban_version
+	ban_virthost
+	banact_chartoval
+	banact_stringtoval
+	banact_valtochar
+	banact_valtostring
+	base64_to_int6_map
+	base64dec
+	base64enc
+	booted
+	bootopt
+	botmotd
+	buildid
+	busycli_fdlist
+	cFlagTab
+	callbacks_check
+	callbacks_switchover
+	can_join
+	can_send
+	canonize
+	chanfloodtimer_add
+	chanfloodtimer_del
+	chanfloodtimer_find
+	chanfloodtimer_stopchantimers
+	channel
+	channel_canjoin
+	channel_modef_string
+	channel_modes
+	char_atribs
+	charsys_add_language
+	charsys_addallowed
+	charsys_addmultibyterange
+	charsys_finish
+	charsys_postconftest
+	charsys_reset
+	charsys_reset_pretest
+	charsys_test_language
+	check_channelmask
+	check_client
+	check_fdlists
+	check_for_chan_flood
+	check_for_target_limit
+	check_pings
+	check_registered
+	check_registered_user
+	check_string
+	checklist
+	chess
+	chmode_str
+	clean_ban_mask
+	clean_channelname
+	clear_channel_hash_table
+	clear_client_hash_table
+	clear_scache_hash_table
+	clear_watch_hash_table
+	client
+	close_connection
+	close_connections
+	close_listeners
+	cmdstr
+	cmodej_addentry
+	cmodej_cleanup_structs
+	cmodej_conv_param
+	cmodej_delchannelentries
+	cmodej_delentry
+	cmodej_deluserentries
+	cmodej_dup_struct
+	cmodej_free_param
+	cmodej_get_param
+	cmodej_is_ok
+	cmodej_put_param
+	cmodej_sjoin_check
+	cmodestring
+	collapse
+	completed_connection
+	conf
+	conf_admin
+	conf_admin_tail
+	conf_alias
+	conf_allow
+	conf_allow_channel
+	conf_allow_dcc
+	conf_badword_channel
+	conf_badword_message
+	conf_badword_quit
+	conf_ban
+	conf_class
+	conf_debuglevel
+	conf_deny_channel
+	conf_deny_dcc
+	conf_deny_link
+	conf_deny_version
+	conf_drpass
+	conf_except
+	conf_help
+	conf_include
+	conf_link
+	conf_listen
+	conf_log
+	conf_me
+	conf_offchans
+	conf_oper
+	conf_tld
+	conf_ulines
+	conf_vhost
+	config_binary_flags_search
+	config_binary_search
+	config_checkval
+	config_error
+	config_error_flag
+	config_find_entry
+	config_free
+	config_load
+	config_parse_flood
+	config_post_test
+	config_progress
+	config_rehash
+	config_run
+	config_setdefaultsettings
+	config_status
+	config_test
+	config_verbose
+	config_warn
+	configfile
+	connect_server
+	convert_time
+	count_oper_sessions
+	count_scache
+	count_watch_memory
+	count_whowas_memory
+	create_snomask
+	create_tkl_except
+	creation
+	cres_mem
+	crule__andor
+	crule__not
+	crule_connected
+	crule_directcon
+	crule_directop
+	crule_errstr
+	crule_errstring
+	crule_eval
+	crule_free
+	crule_funclist
+	crule_gettoken
+	crule_getword
+	crule_parse
+	crule_parseandexpr
+	crule_parsearglist
+	crule_parsefunction
+	crule_parseorexpr
+	crule_parseprimary
+	crule_test
+	crule_via
+	currentrate
+	currentrate2
+	currlife
+	dalinfotext
+	date
+	dbuf_delete
+	dbuf_get
+	dbuf_getmsg
+	dbuf_map
+	dbuf_put
+	dbufalloc
+	dbufblocks
+	dcc_isdiscouraged
+	dcc_isforbidden
+	dcc_sync
+	dcc_wipe_services
+	debuglevel
+	debugmode
+	decode_ip
+	default_class
+	default_fdlist
+	del_Command
+	del_ListItem
+	del_async_connects
+	del_dccallow
+	del_from_channel_hash_table
+	del_from_client_hash_table
+	del_from_watch_hash_table
+	del_invite
+	del_listmode
+	del_queries
+	del_silence
+	del_throttling_bucket
+	delete_classblock
+	delete_linkblock
+	delfrom_fdlist
+	deliver_it
+	dgets
+	dn_skipname
+	do_chanflood
+	do_chanflood_action
+	do_cmd
+	do_join
+	do_mode
+	do_nick_name
+	do_numeric
+	do_remote_nick_name
+	dontspread
+	dopacket
+	dospamfilter
+	e_check_fdlists
+	e_clean_out_throttling_buckets
+	e_unload_module_delayed
+	efunctions_check
+	efunctions_switchover
+	encode_ip
+	events
+	exit_client
+	expire_cache
+	extban_conv_param_nuh
+	extban_init
+	extban_modec_conv_param
+	extban_modec_is_banned
+	extban_moden_is_banned
+	extban_modeq_is_banned
+	extban_moder_conv_param
+	extban_moder_is_banned
+	extbanstr
+	extchmstr
+	extcmode_default_requirechop
+	extcmode_default_requirehalfop
+	extcmode_duplicate_paramlist
+	extcmode_free_paramlist
+	extcmode_get_struct
+	extcmode_init
+	extraflags
+	fast_badword_match
+	fast_badword_replace
+	find_Command
+	find_CommandEx
+	find_Command_simple
+	find_by_hash
+	find_chasing
+	find_client
+	find_invex
+	find_match_server
+	find_member_link
+	find_membership_link
+	find_name
+	find_nickserv
+	find_or_add
+	find_person
+	find_qline
+	find_server
+	find_server_b64_or_real
+	find_server_by_base64
+	find_server_by_numeric
+	find_server_id
+	find_server_quick_search
+	find_server_quick_straight
+	find_server_quickx
+	find_shun
+	find_spamfilter_user
+	find_str_match_link
+	find_throttling_bucket
+	find_tkline_match
+	find_tkline_match_zap
+	find_user_link
+	findmod_by_bantype
+	flag_add
+	flag_del
+	flinks
+	flush_cache
+	flush_connections
+	flush_fdlist_connections
+	free_ban
+	free_class
+	free_client
+	free_iConf
+	free_link
+	free_member
+	free_membership
+	free_str_list
+	free_synchlist
+	free_user
+	freelink
+	freelinks
+	freemember
+	freemembership
+	freemembershipL
+	garbage_collect
+	generation
+	get_access
+	get_chanbitbychar
+	get_channel
+	get_client_host
+	get_client_name
+	get_client_name2
+	get_cptr_status
+	get_history
+	get_mode_str
+	get_modestr
+	get_res
+	get_res_from_reg_9x
+	get_res_from_reg_nt
+	get_res_interfaces_nt
+	get_res_nt
+	get_sno_str
+	get_snostr
+	get_sockerr
+	get_sockhost
+	gethost_byaddr
+	gethost_byname
+	gethost_byname_revquery
+	getrandom16
+	getrandom32
+	getrandom8
+	getreply
+	global_count
+	gnulicense
+	has_voice
+	hash_channel_name
+	hash_check_watch
+	hash_del_watch_list
+	hash_find_channel
+	hash_find_client
+	hash_find_nickserver
+	hash_find_server
+	hash_get_chan_bucket
+	hash_get_watch
+	hash_nick_name
+	hash_nn_name
+	hash_throttling
+	hash_whowas_name
+	helpign
+	highest_rate
+	highest_rate2
+	hunt_server
+	hunt_server_token
+	hunt_server_token_quiet
+	iConf
+	iCstrip
+	iNAH_host
+	ident_failed
+	ilanglist
+	illegalnickchars
+	inet_netof
+	inet_ntop
+	inet_pton
+	inetntoa
+	inetntop
+	inetport
+	infotext
+	init_CommandHash
+	init_conf
+	init_dynconf
+	init_fdlist
+	init_ircstats
+	init_modef
+	init_random
+	init_resolver
+	init_sys
+	init_throttling_hash
+	initlists
+	initstats
+	initwhowas
+	int6_to_base64_map
+	ipport_seperate
+	ircd__putlong
+	ircd__putshort
+	ircd_dn_comp
+	ircd_dn_expand
+	ircd_getlong
+	ircd_getshort
+	ircd_log
+	ircd_res
+	ircd_res_init
+	ircd_res_mkquery
+	ircd_res_randomid
+	ircsprintf
+	ircst
+	ircstp
+	ircvsprintf
+	is_banned
+	is_chan_op
+	is_chanowner
+	is_chanownprotop
+	is_chanprot
+	is_half_op
+	is_skochanop
+	isupport_init
+	join_channel
+	langsinuse
+	last_allinuse
+	last_garbage_collect
+	lastlucheck
+	lastrecvK
+	lastsendK
+	lifesux
+	link_cleanup
+	list_scache
+	listen_cleanup
+	load_conf
+	load_includes
+	load_tunefile
+	local
+	localdie
+	loop
+	loop_event
+	m_alias
+	m_botmotd
+	m_credits
+	m_dalinfo
+	m_die
+	m_dns
+	m_error
+	m_info
+	m_info_send
+	m_license
+	m_module
+	m_motd
+	m_names
+	m_opermotd
+	m_rehash
+	m_restart
+	m_summon
+	m_tkl
+	m_umode
+	m_users
+	m_version
+	m_watch
+	make_ban
+	make_class
+	make_client
+	make_cmodestr
+	make_extbanstr
+	make_extcmodestr
+	make_isupportstrings
+	make_link
+	make_member
+	make_membership
+	make_nick_user_host
+	make_server
+	make_synchlist
+	make_umodestr
+	make_user
+	make_user_host
+	make_virthost
+	match
+	match_ip
+	match_ipv4
+	max_client_count
+	max_connection_count
+	max_global_count
+	mblist
+	mblist_tail
+	me
+	me_hash
+	modebuf
+	modef_event
+	module_loadall
+	motd
+	motd_tm
+	my_itoa
+	myargv
+	myctime
+	myncmp
+	next_client
+	nextconnect
+	nextdnscheck
+	nextexpire
+	nextping
+	noisy_htm
+	now
+	ns_stats
+	num
+	numclients
+	numeric_collides
+	off_history
+	oflagbuf
+	oflagstr
+	on_dccallow_list
+	op_can_override
+	oper_access
+	oper_fdlist
+	opermode
+	opermotd
+	our_crc32
+	our_dlerror
+	our_strcasestr
+	outofmemory
+	parabuf
+	parse
+	parse_addlag
+	parse_help
+	parse_modsys_version
+	parse_netmask
+	parse_tkl_para
+	place_host_ban
+	port_range
+	portnum
+	pretty_mask
+	pretty_time_val
+	read_authports
+	read_file
+	read_file_ex
+	read_message
+	readcalls
+	register_user
+	rehash
+	rehash_internal
+	rehash_motdrules
+	rejoin_dojoinandmode
+	rejoin_doparts
+	remove_client_from_list
+	remove_dcc_references
+	remove_local_client
+	remove_oper_snomasks
+	remove_server_from_table
+	remove_user_from_channel
+	removefld_list
+	report_baderror
+	report_error
+	requiredstuff
+	reread_motdsandrules
+	reset_help
+	resfd
+	restart
+	rfc2time
+	rfctime
+	rules
+	run_configuration
+	s_die
+	s_rehash
+	s_restart
+	save_stats
+	save_tunefile
+	sbrk0
+	send_authports
+	send_channel_modes
+	send_channel_modes_sjoin
+	send_channel_modes_sjoin3
+	send_list
+	send_proto
+	send_queued
+	send_umode
+	send_umode_out
+	send_umode_out_nickv2
+	send_user_joins
+	sendanyways
+	sendbufto_one
+	sendmodeto_one
+	sendnotice
+	sendto_all_butone
+	sendto_channel_butone
+	sendto_channel_butserv
+	sendto_channel_butserv_butone
+	sendto_channelprefix_butone
+	sendto_channelprefix_butone_tok
+	sendto_chanops_butone
+	sendto_chmodemucrap
+	sendto_common_channels
+	sendto_connectnotice
+	sendto_failops
+	sendto_failops_whoare_opers
+	sendto_fconnectnotice
+	sendto_locfailops
+	sendto_match_butone
+	sendto_match_servs
+	sendto_message_one
+	sendto_one
+	sendto_one_nickcmd
+	sendto_opers
+	sendto_opers_butone
+	sendto_ops
+	sendto_ops_butme
+	sendto_ops_butone
+	sendto_prefix_one
+	sendto_realops
+	sendto_serv_butone
+	sendto_serv_butone_nickcmd
+	sendto_serv_butone_nickv2
+	sendto_serv_butone_quit
+	sendto_serv_butone_sjoin
+	sendto_serv_butone_token
+	sendto_serv_butone_token_opt
+	sendto_serv_nickv2
+	sendto_serv_nickv2_token
+	sendto_serv_sjoin
+	sendto_snomask
+	sendto_snomask_global
+	sendto_snomask_normal
+	sendto_snomask_normal_global
+	sendto_umode
+	sendto_umode_raw
+	sentalong_marker
+	serv_fdlist
+	server_reboot
+	serveropts
+	set_blocking
+	set_channelmodes
+	set_mode
+	set_non_blocking
+	set_snomask
+	set_sock_opts
+	set_usermode
+	settings
+	short_motd
+	smotd
+	smotd_tm
+	smycmp
+	snprintf
+	sock_strerror
+	spamf_ugly_vchanoverride
+	spamfilter_getconftargets
+	spamfilter_gettargets
+	spamfilter_inttostring_long
+	spamfilter_target_inttostring
+	start_auth
+	start_of_normal_client_handshake
+	stripbadwords
+	stripbadwords_channel
+	stripbadwords_message
+	stripbadwords_quit
+	strlcat
+	strlcpy
+	strlncat
+	strrangetok
+	strtoken
+	sub1_from_channel
+	svsmotd
+	tainted
+	target_is_spamexcept
+	tempiConf
+	throttle_can_connect
+	timeofday
+	timeout_query_list
+	tkl_add_line
+	tkl_check_expire
+	tkl_del_line
+	tkl_expire
+	tkl_hash
+	tkl_init
+	tkl_stats
+	tkl_synch
+	tkl_typetochar
+	tklines
+	tolowertab
+	touppertab
+	trim_str
+	trouble_info
+	umode_allow_all
+	umode_allow_opers
+	umode_delete
+	umode_get
+	umode_init
+	umodestring
+	unknown_fdlist
+	unload_all_modules
+	unload_all_unused_snomasks
+	unload_all_unused_umodes
+	unload_loaded_includes
+	unload_notloaded_includes
+	unreal_buildspamfilter
+	unreal_checkregex
+	unreal_copyfile
+	unreal_copyfileex
+	unreal_decodespace
+	unreal_encodespace
+	unreal_getfilemodtime
+	unreal_getfilename
+	unreal_getpathname
+	unreal_mktemp
+	unreal_setfilemodtime
+	unrealcredits
+	unreallogo
+	valid_host
+	verify_opercount
+	version
+	vsendto_one
+	vsendto_prefix_one
+	vsnprintf
+	w_whois
+	webtv_cmds
+	webtv_parse
+	whowas_next
+	write_pidfile