diff --git a/src/core/signal-registry-macros.h b/src/core/signal-registry-macros.h
new file mode 100644
index 00000000..e12727ae
--- /dev/null
+++ b/src/core/signal-registry-macros.h
@@ -0,0 +1,53 @@
+#ifndef IRSSI_CORE_SIGNAL_REGISTRY_MACROS_H
+#define IRSSI_CORE_SIGNAL_REGISTRY_MACROS_H
+
+/*
+ escaping for identifiers to string signals:
+   " " -> "_"
+   "_" -> "__"
+*/
+#define SIGNAL_REGISTER_FIX_NAME(VAR) {			\
+		char *i, *o ;				\
+		for (i = o = VAR; i; i++, o++) {	\
+			if (*i == '_') {		\
+				if (i[1] == '_') {	\
+					i++;		\
+					*o = '_';	\
+				} else {		\
+					*o = ' ';	\
+				}			\
+			} else {			\
+				*o = *i;		\
+			}				\
+		}					\
+		*o = '\0';				\
+	}
+
+#define SIGNAL_REGISTER(SIGNAL, NUM, PROTO, ...)			\
+	inline static void signal_emit__ ## SIGNAL  PROTO  {		\
+		static int SIGNAL ## _id;				\
+		if ( ! SIGNAL ## _id ) {				\
+			char signal_name[] = #SIGNAL ;			\
+			SIGNAL_REGISTER_FIX_NAME(signal_name);		\
+			SIGNAL ## _id = signal_get_uniq_id(signal_name); \
+		}							\
+		signal_emit_id(SIGNAL ## _id , NUM , ## __VA_ARGS__ );	\
+	}								\
+
+#define SIGNAL_REGISTER_F(SIGNAL, NUM, PROTO, ARG, ...)			\
+	inline static void signal_emit__ ## SIGNAL ## _ PROTO  {	\
+		char *signal_name, base_signal_name[] = #SIGNAL;	\
+		SIGNAL_REGISTER_FIX_NAME(base_signal_name);		\
+		signal_name = g_strconcat(base_signal_name, " ", ARG, NULL); \
+		signal_emit(signal_name , NUM , ## __VA_ARGS__ );	\
+		g_free(signal_name);					\
+	}								\
+
+
+#define STYPE(TYPE) typedef struct _ ## TYPE TYPE
+
+typedef void *int_in_ptr;
+typedef void *mem_ptr;	
+typedef struct _GSList GSList;
+
+#endif
diff --git a/src/core/signal-registry.def b/src/core/signal-registry.def
new file mode 100644
index 00000000..a001593b
--- /dev/null
+++ b/src/core/signal-registry.def
@@ -0,0 +1,229 @@
+// core
+SIGNAL_REGISTER(gui_exit, 0, (void))
+SIGNAL_REGISTER(gui_dialog, 2, (char *type, const char *text),
+	 type, text)
+
+// chat-protocols.c:
+SIGNAL_REGISTER(chat_protocol_created, 1, (CHAT_PROTOCOL_REC *chat_protocol),
+	 chat_protocol)
+SIGNAL_REGISTER(chat_protocol_updated, 1, (CHAT_PROTOCOL_REC *chat_protocol),
+	 chat_protocol)
+SIGNAL_REGISTER(chat_protocol_destroyed, 1, (CHAT_PROTOCOL_REC *chat_protocol),
+	 chat_protocol)
+SIGNAL_REGISTER(chat_protocol_deinit, 1, (CHAT_PROTOCOL_REC *chat_protocol),
+	 chat_protocol)
+
+// channels.c:
+SIGNAL_REGISTER(channel_created, 2, (CHANNEL_REC *channel, int_in_ptr automatic),
+	 channel, automatic)
+SIGNAL_REGISTER(channel_destroyed, 1, (CHANNEL_REC *channel),
+	 channel)
+SIGNAL_REGISTER(channel_name_changed, 1, (CHANNEL_REC *channel),
+	 channel)
+
+// channels-setup.c
+SIGNAL_REGISTER(channel_setup_created, 2, (CHANNEL_SETUP_REC *channel_setup, CONFIG_NODE *node),
+	 channel_setup, node)
+SIGNAL_REGISTER(channel_setup_destroyed, 1, (CHANNEL_SETUP_REC *channel_setup),
+	 channel_setup)
+
+// chatnets.c:
+SIGNAL_REGISTER(chatnet_created, 1, (CHATNET_REC *chatnet),
+	 chatnet)
+SIGNAL_REGISTER(chatnet_destroyed, 1, (CHATNET_REC *chatnet),
+	 chatnet)
+SIGNAL_REGISTER(chatnet_saved, 2, (CHATNET_REC *chatnet, CONFIG_NODE *node),
+	 chatnet, node)
+SIGNAL_REGISTER(chatnet_removed, 1, (CHATNET_REC *chatnet),
+	 chatnet)
+SIGNAL_REGISTER(chatnet_read, 2, (CHATNET_REC *chatnet, CONFIG_NODE *node),
+	 chatnet, node)
+
+// commands.c:
+SIGNAL_REGISTER(commandlist_new, 1, (COMMAND_REC *command),
+	 command)
+SIGNAL_REGISTER(commandlist_remove, 1, (COMMAND_REC *command),
+	 command)
+SIGNAL_REGISTER(list_subcommands, 1, (const char *command),
+	 command)
+SIGNAL_REGISTER(error_command, 2, (int_in_ptr err, char *cmd),
+	 err, cmd)
+
+SIGNAL_REGISTER(send_command, 3, (char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
+	 args, server, wi_item)
+SIGNAL_REGISTER(send_text, 3, (const char *line, SERVER_REC *server, WI_ITEM_REC *wi_item),
+	 line, server, wi_item)
+SIGNAL_REGISTER_F(command, 3, (const char *cmd, char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
+	 cmd, args, server, wi_item)
+SIGNAL_REGISTER(default_command, 3, (char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
+	 args, server, wi_item)
+
+// chat-commands.c:
+SIGNAL_REGISTER(chat_protocol_unknown, 1, (const char *protocol),
+	 protocol)
+SIGNAL_REGISTER(message_own__public, 3, (SERVER_REC *server, char *msg, char *target),
+	 server, msg, target)
+SIGNAL_REGISTER(message_own__private, 4, (SERVER_REC *server, char *msg, char *target, char *orig_target),
+	 server, msg, target, orig_target)
+
+// ignore.c:
+SIGNAL_REGISTER(ignore_created, 1, (IGNORE_REC *ignore),
+	 ignore)
+SIGNAL_REGISTER(ignore_destroyed, 1, (IGNORE_REC *ignore),
+	 ignore)
+SIGNAL_REGISTER(ignore_changed, 1, (IGNORE_REC *ignore),
+	 ignore)
+
+// log.c:
+SIGNAL_REGISTER(log_new, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_remove, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_create_failed, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_locked, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_started, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_stopped, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_rotated, 1, (LOG_REC *log),
+	 log)
+SIGNAL_REGISTER(log_written, 2, (LOG_REC *log, const char *line),
+	 log, line)
+SIGNAL_REGISTER(log_config_save, 2, (LOG_REC *log, CONFIG_NODE *node),
+	 log, node)
+SIGNAL_REGISTER(log_config_read, 2, (LOG_REC *log, CONFIG_NODE *node),
+	 log, node)
+
+// log-away.c:
+SIGNAL_REGISTER(awaylog_show, 3, (LOG_REC *log, int_in_ptr away_msgs, int_in_ptr filepos),
+	 log, away_msgs, filepos)
+
+// modules.c:
+SIGNAL_REGISTER(module_loaded, 2, (MODULE_REC *module, MODULE_FILE_REC *module_file),
+	 module, module_file)
+SIGNAL_REGISTER(module_unloaded, 2, (MODULE_REC *module, MODULE_FILE_REC *module_file),
+	 module, module_file)
+SIGNAL_REGISTER(module_error, 4, (int_in_ptr error, const char *text, const char *rootmodule, const char *submodule),
+	 error, text, rootmodule, submodule)
+
+// network-openssl.c:
+SIGNAL_REGISTER(tls_handshake_finished, 2, (SERVER_REC *server, TLS_REC *tls),
+	 server, tls)
+
+// nicklist.c:
+SIGNAL_REGISTER(nicklist_new, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+SIGNAL_REGISTER(nicklist_remove, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+SIGNAL_REGISTER(nicklist_changed, 3, (CHANNEL_REC *channel, NICK_REC *nick, const char *old_nick),
+	 channel, nick, old_nick)
+SIGNAL_REGISTER(nicklist_host_changed, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+SIGNAL_REGISTER(nicklist_gone_changed, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+SIGNAL_REGISTER(nicklist_serverop_changed, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+
+// pidwait.c:
+SIGNAL_REGISTER(pidwait, 2, (int_in_ptr pid, int_in_ptr status),
+	 pid, status)
+
+// queries.c:
+SIGNAL_REGISTER(query_created, 2, (QUERY_REC *query, int_in_ptr automatic),
+	 query, automatic)
+SIGNAL_REGISTER(query_destroyed, 1, (QUERY_REC *query),
+	 query)
+SIGNAL_REGISTER(query_nick_changed, 2, (QUERY_REC *query, const char *orignick),
+	 query, orignick)
+SIGNAL_REGISTER(window_item_name_changed, 1, (WI_ITEM_REC *wi_item),
+	 wi_item)
+SIGNAL_REGISTER(query_address_changed, 1, (QUERY_REC *query),
+	 query)
+SIGNAL_REGISTER(query_server_changed, 1, (QUERY_REC *query),
+	 query)
+
+// rawlog.c:
+SIGNAL_REGISTER(rawlog, 2, (RAWLOG_REC *rawlog, char *data),
+	 rawlog, data)
+
+// server.c:
+SIGNAL_REGISTER(server_looking, 1, (SERVER_REC *server),
+	 server)
+SIGNAL_REGISTER(server_nick_changed, 1, (SERVER_REC *server),
+	 server)
+SIGNAL_REGISTER(server_connected, 1, (SERVER_REC *server),
+	 server)
+SIGNAL_REGISTER(server_connecting, 2, (SERVER_REC *server, mem_ptr ip),
+	 server, ip)
+SIGNAL_REGISTER(server_connect_failed, 2, (SERVER_REC *server, const char *msg),
+	 server, msg)
+SIGNAL_REGISTER(server_disconnected, 1, (SERVER_REC *server),
+	 server)
+SIGNAL_REGISTER(server_quit, 2, (SERVER_REC *server, char *msg),
+	 server, msg)
+SIGNAL_REGISTER(server_sendmsg, 4, (SERVER_REC *server, char *target, char *msg, int_in_ptr target_type),
+	 server, target, msg, target_type)
+SIGNAL_REGISTER(server_destroyed, 1, (SERVER_REC *server),
+	 server)
+
+// servers-setup.c
+SIGNAL_REGISTER(server_setup_fill_connect, 1, (SERVER_CONNECT_REC *server_connect),
+	 server_connect)
+SIGNAL_REGISTER(server_setup_fill_reconn, 2, (SERVER_CONNECT_REC *server_connect, SERVER_SETUP_REC *server_setup),
+	 server_connect, server_setup)
+SIGNAL_REGISTER(server_setup_fill_server, 2, (SERVER_CONNECT_REC *server_connect, SERVER_SETUP_REC *server_setup),
+	 server_connect, server_setup)
+SIGNAL_REGISTER(server_setup_fill_chatnet, 2, (SERVER_CONNECT_REC *server_connect, CHATNET_REC *chatnet),
+	 server_connect, chatnet)
+SIGNAL_REGISTER(server_setup_read, 2, (SERVER_SETUP_REC *server_setup, CONFIG_NODE *node),
+	 server_setup, node)
+SIGNAL_REGISTER(server_setup_saved, 2, (SERVER_SETUP_REC *server_setup, CONFIG_NODE *node),
+	 server_setup, node)
+SIGNAL_REGISTER(server_setup_destroyed, 1, (SERVER_SETUP_REC *server_setup),
+	 server_setup)
+SIGNAL_REGISTER(server_setup_updated, 1, (SERVER_SETUP_REC *server_setup),
+	 server_setup)
+
+// servers-reconnect.c:
+SIGNAL_REGISTER(server_reconnect_save_status, 2, (SERVER_CONNECT_REC *server_connect, SERVER_REC *server),
+	 server_connect, server)
+SIGNAL_REGISTER(server_reconnect_remove, 1, (RECONNECT_REC *reconnect),
+	 reconnect)
+SIGNAL_REGISTER(server_reconnect_not_found, 1, (const char *tag),
+	 tag)
+SIGNAL_REGISTER(server_connect_copy, 2, (SERVER_CONNECT_REC **dest, SERVER_CONNECT_REC *server_connect),
+	 dest, server_connect)
+
+// session.c
+SIGNAL_REGISTER(session_save, 1, (CONFIG_REC *config),
+	 config)
+SIGNAL_REGISTER(session_save_nick, 4, (CHANNEL_REC *channel, NICK_REC *nick, CONFIG_REC *config, CONFIG_NODE *node),
+	 channel, nick, config, node)
+SIGNAL_REGISTER(session_save_channel, 3, (CHANNEL_REC *channel, CONFIG_REC *config, CONFIG_NODE *node),
+	 channel, config, node)
+SIGNAL_REGISTER(session_save_server, 3, (SERVER_REC *server, CONFIG_REC *config, CONFIG_NODE *node),
+	 server, config, node)
+SIGNAL_REGISTER(session_restore_nick, 2, (CHANNEL_REC *channel, NICK_REC *nick),
+	 channel, nick)
+SIGNAL_REGISTER(session_restore_channel, 2, (CHANNEL_REC *channel, CONFIG_NODE *node),
+	 channel, node)
+SIGNAL_REGISTER(session_restore_server, 2, (SERVER_REC *server, CONFIG_NODE *node),
+	 server, node)
+SIGNAL_REGISTER(session_restore, 1, (CONFIG_REC *config),
+	 config)
+
+// settings.c:
+SIGNAL_REGISTER(setup_changed, 0, (void))
+SIGNAL_REGISTER(setup_reread, 1, (char *fname),
+	 fname)
+SIGNAL_REGISTER(setup_saved, 2, (const char *fname, int_in_ptr autosaved),
+	 fname, autosaved)
+SIGNAL_REGISTER(settings_errors, 1, (const char *msg),
+	 msg)
+SIGNAL_REGISTER(settings_userinfo_changed, 1, (uint_in_ptr flags),
+	 flags)
+SIGNAL_REGISTER(irssi_init_userinfo_changed, 1, (uint_in_ptr flags),
+	 flags)
+ 
diff --git a/src/core/signal-registry.def.in b/src/core/signal-registry.def.in
new file mode 100644
index 00000000..cf4f7250
--- /dev/null
+++ b/src/core/signal-registry.def.in
@@ -0,0 +1,137 @@
+// core
+ "gui exit"
+ "gui dialog", char *type, const char *text
+
+// chat-protocols.c:
+ "chat protocol created", CHAT_PROTOCOL_REC
+ "chat protocol updated", CHAT_PROTOCOL_REC
+ "chat protocol destroyed", CHAT_PROTOCOL_REC
+ "chat protocol deinit", CHAT_PROTOCOL_REC
+
+// channels.c:
+ "channel created", CHANNEL_REC, int automatic
+ "channel destroyed", CHANNEL_REC
+ "channel name changed", CHANNEL_REC
+
+// channels-setup.c
+ "channel setup created", CHANNEL_SETUP_REC, CONFIG_NODE
+ "channel setup destroyed", CHANNEL_SETUP_REC
+
+// chatnets.c:
+ "chatnet created", CHATNET_REC
+ "chatnet destroyed", CHATNET_REC
+ "chatnet saved", CHATNET_REC, CONFIG_NODE
+ "chatnet removed", CHATNET_REC
+ "chatnet read", CHATNET_REC, CONFIG_NODE
+
+// commands.c:
+ "commandlist new", COMMAND_REC
+ "commandlist remove", COMMAND_REC
+ "list subcommands", const char *command
+ "error command", int err, char *cmd
+
+ "send command", char *args, SERVER_REC, WI_ITEM_REC
+ "send text", const char *line, SERVER_REC, WI_ITEM_REC
+ "command "<cmd>, char *args, SERVER_REC, WI_ITEM_REC
+ "default command", char *args, SERVER_REC, WI_ITEM_REC
+
+// chat-commands.c:
+ "chat protocol unknown", const char *protocol
+ "message own_public", SERVER_REC, char *msg, char *target
+ "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
+
+// ignore.c:
+ "ignore created", IGNORE_REC
+ "ignore destroyed", IGNORE_REC
+ "ignore changed", IGNORE_REC
+
+// log.c:
+ "log new", LOG_REC
+ "log remove", LOG_REC
+ "log create failed", LOG_REC
+ "log locked", LOG_REC
+ "log started", LOG_REC
+ "log stopped", LOG_REC
+ "log rotated", LOG_REC
+ "log written", LOG_REC, const char *line
+ "log config save", LOG_REC, CONFIG_NODE
+ "log config read", LOG_REC, CONFIG_NODE
+
+// log-away.c:
+ "awaylog show", LOG_REC, int away_msgs, int filepos
+
+// modules.c:
+ "module loaded", MODULE_REC, MODULE_FILE_REC
+ "module unloaded", MODULE_REC, MODULE_FILE_REC
+ "module error", int error, const char *text, const char *rootmodule, const char *submodule
+
+// network-openssl.c:
+ "tls handshake finished", SERVER_REC, TLS_REC
+
+// nicklist.c:
+ "nicklist new", CHANNEL_REC, NICK_REC
+ "nicklist remove", CHANNEL_REC, NICK_REC
+ "nicklist changed", CHANNEL_REC, NICK_REC, const char *old_nick
+ "nicklist host changed", CHANNEL_REC, NICK_REC
+ "nicklist gone changed", CHANNEL_REC, NICK_REC
+ "nicklist serverop changed", CHANNEL_REC, NICK_REC
+
+// pidwait.c:
+ "pidwait", int pid, int status
+
+// queries.c:
+ "query created", QUERY_REC, int automatic
+ "query destroyed", QUERY_REC
+ "query nick changed", QUERY_REC, const char *orignick
+ "window item name changed", WI_ITEM_REC
+ "query address changed", QUERY_REC
+ "query server changed", QUERY_REC
+
+// rawlog.c:
+ "rawlog", RAWLOG_REC, char *data
+
+// server.c:
+ "server looking", SERVER_REC
+ "server nick changed", SERVER_REC
+ "server connected", SERVER_REC
+ "server connecting", SERVER_REC, mem_ptr ip
+ "server connect failed", SERVER_REC, const char *msg
+ "server disconnected", SERVER_REC
+ "server quit", SERVER_REC, char *msg
+ "server sendmsg", SERVER_REC, char *target, char *msg, int target_type
+ "server destroyed", SERVER_REC
+
+// servers-setup.c
+ "server setup fill connect", SERVER_CONNECT_REC
+ "server setup fill reconn", SERVER_CONNECT_REC, SERVER_SETUP_REC
+ "server setup fill server", SERVER_CONNECT_REC, SERVER_SETUP_REC
+ "server setup fill chatnet", SERVER_CONNECT_REC, CHATNET_REC
+ "server setup read", SERVER_SETUP_REC, CONFIG_NODE
+ "server setup saved", SERVER_SETUP_REC, CONFIG_NODE
+ "server setup destroyed", SERVER_SETUP_REC
+ "server setup updated", SERVER_SETUP_REC
+
+// servers-reconnect.c:
+ "server reconnect save status", SERVER_CONNECT_REC, SERVER_REC
+ "server reconnect remove", RECONNECT_REC
+ "server reconnect not found", const char *tag
+ "server connect copy", SERVER_CONNECT_REC **dest, SERVER_CONNECT_REC
+
+// session.c
+ "session save", CONFIG_REC
+ "session save nick", CHANNEL_REC, NICK_REC, CONFIG_REC, CONFIG_NODE
+ "session save channel", CHANNEL_REC, CONFIG_REC, CONFIG_NODE
+ "session save server", SERVER_REC, CONFIG_REC, CONFIG_NODE
+ "session restore nick", CHANNEL_REC, NICK_REC
+ "session restore channel", CHANNEL_REC, CONFIG_NODE
+ "session restore server", SERVER_REC, CONFIG_NODE
+ "session restore", CONFIG_REC
+
+// settings.c:
+ "setup changed"
+ "setup reread", char *fname
+ "setup saved", const char *fname, int autosaved
+ "settings errors", const char *msg
+ "settings userinfo changed", uint flags
+ "irssi init userinfo changed", uint flags
+ 
diff --git a/src/core/signal-registry.h b/src/core/signal-registry.h
new file mode 100644
index 00000000..f70be5ed
--- /dev/null
+++ b/src/core/signal-registry.h
@@ -0,0 +1,21 @@
+#ifndef IRSSI_CORE_SIGNAL_REGISTRY_H
+#define IRSSI_CORE_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+STYPE(COMMAND_REC);
+STYPE(IGNORE_REC);
+STYPE(RAWLOG_REC);
+STYPE(LOG_REC);
+STYPE(RECONNECT_REC);
+STYPE(TLS_REC);
+STYPE(CONFIG_REC);
+STYPE(SESSION_REC);
+STYPE(CONFIG_NODE);
+typedef void *int_in_ptr;
+typedef void *uint_in_ptr;
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/fe-common/core/signal-registry.def b/src/fe-common/core/signal-registry.def
new file mode 100644
index 00000000..03b852b6
--- /dev/null
+++ b/src/fe-common/core/signal-registry.def
@@ -0,0 +1,154 @@
+// FE common
+
+SIGNAL_REGISTER(gui_print_text, 6,
+	(WINDOW_REC *window, int_in_ptr fg, int_in_ptr bg, int_in_ptr flags, char *text, TEXT_DEST_REC *text_dest),
+	 window, fg, bg, flags, text, text_dest)
+
+// (Can be used to determine when all "gui print text"s are sent (not required)))
+SIGNAL_REGISTER(gui_print_text_finished, 1,
+	(WINDOW_REC *window),
+	 window)
+
+// completion.c:
+SIGNAL_REGISTER(complete_word, 5,
+	(GList * of char*, WINDOW_REC *window, char *word, char *linestart, int_in_ptr *want_space),
+	GList * of char*, window, word, linestart, want_space)
+
+// fe-common-core.c:
+SIGNAL_REGISTER(irssi_init_read_settings, 0,
+	(void))
+
+// fe-exec.c:
+SIGNAL_REGISTER(exec_new, 1,
+	(PROCESS_REC *process),
+	 process)
+SIGNAL_REGISTER(exec_remove, 2,
+	(PROCESS_REC *process, int_in_ptr status),
+	 process, status)
+SIGNAL_REGISTER(exec_input, 2,
+	(PROCESS_REC *process, char *text),
+	 process, text)
+
+// fe-messages.c:
+SIGNAL_REGISTER(message_public, 5,
+	(SERVER_REC *server, char *msg, char *nick, char *address, char *target),
+	 server, msg, nick, address, target)
+SIGNAL_REGISTER(message_private, 5,
+	(SERVER_REC *server, char *msg, char *nick, char *address, char *target),
+	 server, msg, nick, address, target)
+SIGNAL_REGISTER(message_join, 4,
+	(SERVER_REC *server, char *channel, char *nick, char *address),
+	 server, channel, nick, address)
+SIGNAL_REGISTER(message_part, 5,
+	(SERVER_REC *server, char *channel, char *nick, char *address, char *reason),
+	 server, channel, nick, address, reason)
+SIGNAL_REGISTER(message_quit, 4,
+	(SERVER_REC *server, char *nick, char *address, char *reason),
+	 server, nick, address, reason)
+SIGNAL_REGISTER(message_kick, 6,
+	(SERVER_REC *server, char *channel, char *nick, char *kicker, char *address, char *reason),
+	 server, channel, nick, kicker, address, reason)
+SIGNAL_REGISTER(message_nick, 4,
+	(SERVER_REC *server, char *newnick, char *oldnick, char *address),
+	 server, newnick, oldnick, address)
+SIGNAL_REGISTER(message_own__nick, 4,
+	(SERVER_REC *server, char *newnick, char *oldnick, char *address),
+	 server, newnick, oldnick, address)
+SIGNAL_REGISTER(message_invite, 4,
+	(SERVER_REC *server, char *channel, char *nick, char *address),
+	 server, channel, nick, address)
+SIGNAL_REGISTER(message_topic, 5,
+	(SERVER_REC *server, char *channel, char *topic, char *nick, char *address),
+	 server, channel, topic, nick, address)
+
+// fe-log.c:
+SIGNAL_REGISTER(awaylog_show, 3,
+	(LOG_REC *log, int_in_ptr away_msgs, int_in_ptr filepos),
+	 log, away_msgs, filepos)
+
+// keyboard.c:
+SIGNAL_REGISTER(keyinfo_created, 1,
+	(KEYINFO_REC *keyinfo),
+	 keyinfo)
+SIGNAL_REGISTER(keyinfo_destroyed, 1,
+	(KEYINFO_REC *keyinfo),
+	 keyinfo)
+
+// printtext.c:
+SIGNAL_REGISTER(print_text, 3,
+	(TEXT_DEST_REC *dest, char *text, char *stripped),
+	 dest, text, stripped)
+
+// themes.c:
+SIGNAL_REGISTER(theme_created, 1,
+	(THEME_REC *theme),
+	 theme)
+SIGNAL_REGISTER(theme_destroyed, 1,
+	(THEME_REC *theme),
+	 theme)
+
+// window-activity.c:
+SIGNAL_REGISTER(window_hilight, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_hilight_check, 4,
+	(TEXT_DEST_REC *text_dest, char *msg, int_in_ptr *data_level, int_in_ptr *should_ignore),
+	 text_dest, msg, data_level, should_ignore)
+SIGNAL_REGISTER(window_dehilight, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_activity, 2,
+	(WINDOW_REC *window, int_in_ptr old_level),
+	 window, old_level)
+SIGNAL_REGISTER(window_item_hilight, 1,
+	(WI_ITEM_REC *wi_item),
+	 wi_item)
+SIGNAL_REGISTER(window_item_activity, 2,
+	(WI_ITEM_REC *wi_item, int_in_ptr old_level),
+	 wi_item, old_level)
+
+// window-items.c:
+SIGNAL_REGISTER(window_item_new, 2,
+	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+	 window, wi_item)
+SIGNAL_REGISTER(window_item_remove, 2,
+	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+	 window, wi_item)
+SIGNAL_REGISTER(window_item_moved, 3,
+	(WINDOW_REC *window, WI_ITEM_REC *wi_item, WINDOW_REC *window),
+	 window, wi_item, window)
+SIGNAL_REGISTER(window_item_changed, 2,
+	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+	 window, wi_item)
+SIGNAL_REGISTER(window_item_server_changed, 2,
+	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+	 window, wi_item)
+
+// windows.c:
+SIGNAL_REGISTER(window_created, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_destroyed, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_changed, 2,
+	(WINDOW_REC *window, WINDOW_REC old),
+	 window, old)
+SIGNAL_REGISTER(window_changed_automatic, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_server_changed, 2,
+	(WINDOW_REC *window, SERVER_REC *server),
+	 window, server)
+SIGNAL_REGISTER(window_refnum_changed, 2,
+	(WINDOW_REC *window, int_in_ptr old),
+	 window, old)
+SIGNAL_REGISTER(window_name_changed, 1,
+	(WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(window_history_changed, 2,
+	(WINDOW_REC *window, char *oldname),
+	 window, oldname)
+SIGNAL_REGISTER(window_level_changed, 1,
+	(WINDOW_REC *window),
+	 window)
diff --git a/src/fe-common/core/signal-registry.def.in b/src/fe-common/core/signal-registry.def.in
new file mode 100644
index 00000000..5909248d
--- /dev/null
+++ b/src/fe-common/core/signal-registry.def.in
@@ -0,0 +1,69 @@
+// FE common
+
+ "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, TEXT_DEST_REC
+
+// (Can be used to determine when all "gui print text"s are sent (not required))
+ "gui print text finished", WINDOW_REC
+
+// completion.c:
+ "complete word", GList * of char*, WINDOW_REC, char *word, char *linestart, int *want_space
+
+// fe-common-core.c:
+ "irssi init read settings"
+
+// fe-exec.c:
+ "exec new", PROCESS_REC
+ "exec remove", PROCESS_REC, int status
+ "exec input", PROCESS_REC, char *text
+
+// fe-messages.c:
+ "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message join", SERVER_REC, char *channel, char *nick, char *address
+ "message part", SERVER_REC, char *channel, char *nick, char *address, char *reason
+ "message quit", SERVER_REC, char *nick, char *address, char *reason
+ "message kick", SERVER_REC, char *channel, char *nick, char *kicker, char *address, char *reason
+ "message nick", SERVER_REC, char *newnick, char *oldnick, char *address
+ "message own_nick", SERVER_REC, char *newnick, char *oldnick, char *address
+ "message invite", SERVER_REC, char *channel, char *nick, char *address
+ "message topic", SERVER_REC, char *channel, char *topic, char *nick, char *address
+
+// fe-log.c:
+ "awaylog show", LOG_REC, int away_msgs, int filepos
+
+// keyboard.c:
+ "keyinfo created", KEYINFO_REC
+ "keyinfo destroyed", KEYINFO_REC
+
+// printtext.c:
+ "print text", TEXT_DEST_REC *dest, char *text, char *stripped
+
+// themes.c:
+ "theme created", THEME_REC
+ "theme destroyed", THEME_REC
+
+// window-activity.c:
+ "window hilight", WINDOW_REC
+ "window hilight check", TEXT_DEST_REC, char *msg, int *data_level, int *should_ignore
+ "window dehilight", WINDOW_REC
+ "window activity", WINDOW_REC, int old_level
+ "window item hilight", WI_ITEM_REC
+ "window item activity", WI_ITEM_REC, int old_level
+
+// window-items.c:
+ "window item new", WINDOW_REC, WI_ITEM_REC
+ "window item remove", WINDOW_REC, WI_ITEM_REC
+ "window item moved", WINDOW_REC, WI_ITEM_REC, WINDOW_REC
+ "window item changed", WINDOW_REC, WI_ITEM_REC
+ "window item server changed", WINDOW_REC, WI_ITEM_REC
+
+// windows.c:
+ "window created", WINDOW_REC
+ "window destroyed", WINDOW_REC
+ "window changed", WINDOW_REC, WINDOW_REC old
+ "window changed automatic", WINDOW_REC
+ "window server changed", WINDOW_REC, SERVER_REC
+ "window refnum changed", WINDOW_REC, int old
+ "window name changed", WINDOW_REC
+ "window history changed", WINDOW_REC, char *oldname
+ "window level changed", WINDOW_REC
diff --git a/src/fe-common/core/signal-registry.h b/src/fe-common/core/signal-registry.h
new file mode 100644
index 00000000..1c823e94
--- /dev/null
+++ b/src/fe-common/core/signal-registry.h
@@ -0,0 +1,10 @@
+#ifndef IRSSI_FE_COMMON_CORE_SIGNAL_REGISTRY_H
+#define IRSSI_FE_COMMON_CORE_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/fe-common/irc/signal-registry.def b/src/fe-common/irc/signal-registry.def
new file mode 100644
index 00000000..397e01d5
--- /dev/null
+++ b/src/fe-common/irc/signal-registry.def
@@ -0,0 +1,25 @@
+// FE IRC
+
+// fe-events.c:
+ "default event numeric", SERVER_REC, char *data, char *nick, char *address
+
+// fe-irc-messages.c:
+ "message irc op_public", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message irc own_wall", SERVER_REC, char *msg, char *target
+ "message irc own_action", SERVER_REC, char *msg, char *target
+ "message irc action", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message irc own_notice", SERVER_REC, char *msg, char *target
+ "message irc notice", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message irc own_ctcp", SERVER_REC, char *cmd, char *data, char *target
+ "message irc ctcp", SERVER_REC, char *cmd, char *data, char *nick, char *address, char *target
+
+// fe-modes.c:
+ "message irc mode", SERVER_REC, char *channel, char *nick, char *addr, char *mode
+
+// dcc/fe-dcc-chat-messages.c:
+ "message dcc own", DCC_REC *dcc, char *msg
+ "message dcc own_action", DCC_REC *dcc, char *msg
+ "message dcc own_ctcp", DCC_REC *dcc, char *cmd, char *data
+ "message dcc", DCC_REC *dcc, char *msg
+ "message dcc action", DCC_REC *dcc, char *msg
+ "message dcc ctcp", DCC_REC *dcc, char *cmd, char *data
diff --git a/src/fe-text/signal-registry.def b/src/fe-text/signal-registry.def
new file mode 100644
index 00000000..8e483804
--- /dev/null
+++ b/src/fe-text/signal-registry.def
@@ -0,0 +1,11 @@
+// Text FE
+
+// gui-readline.c:
+ "gui key pressed", int key
+
+// gui-printtext.c:
+ "beep"
+ "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
+
+// textbuffer-view.c
+ "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
diff --git a/src/irc/core/signal-registry.def b/src/irc/core/signal-registry.def
new file mode 100644
index 00000000..2be89a9b
--- /dev/null
+++ b/src/irc/core/signal-registry.def
@@ -0,0 +1,223 @@
+
+// bans.c:
+SIGNAL_REGISTER(ban_type_changed, 1, (char *bantype),
+	 bantype)
+
+// channels, nicklist:
+SIGNAL_REGISTER(channel_joined, 1, (CHANNEL_REC *channel),
+	 channel)
+SIGNAL_REGISTER(channel_wholist, 1, (CHANNEL_REC *channel),
+	 channel)
+SIGNAL_REGISTER(channel_sync, 1, (CHANNEL_REC *channel),
+	 channel)
+
+SIGNAL_REGISTER(channel_topic_changed, 1, (CHANNEL_REC *channel),
+	 channel)
+
+// channel-rejoin.c
+SIGNAL_REGISTER(channel_rejoin_remove, 2, (SERVER_REC *server, REJOIN_REC *rejoin),
+	 server, rejoin)
+SIGNAL_REGISTER(channel_rejoin_new, 2, (SERVER_REC *server, REJOIN_REC *rejoin),
+	 server, rejoin)
+
+// ctcp.c:
+
+SIGNAL_REGISTER(ctcp_msg, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+SIGNAL_REGISTER_F(ctcp_msg, 5, (const char *cmd, IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 cmd, irc_server, args, nick, addr, target)
+SIGNAL_REGISTER(default_ctcp_msg, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+SIGNAL_REGISTER(ctcp_reply, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+SIGNAL_REGISTER_F(ctcp_reply, 5, (const char *cmd, IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 cmd, irc_server, args, nick, addr, target)
+SIGNAL_REGISTER(default_ctcp_reply, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+SIGNAL_REGISTER(ctcp_action, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+
+// irc-servers.c:
+SIGNAL_REGISTER(event_connected, 1, (SERVER_REC *server),
+	 server)
+
+// irc-cap.c
+SIGNAL_REGISTER_F(server_cap_ack, 1, (const char *cmd, IRC_SERVER_REC *irc_server),
+	 cmd, irc_server)
+SIGNAL_REGISTER_F(server_cap_nak, 1, (const char *cmd, IRC_SERVER_REC *irc_server),
+	 cmd, irc_server)
+SIGNAL_REGISTER_F(server_cap_new, 1, (const char *cmd, IRC_SERVER_REC *irc_server),
+	 cmd, irc_server)
+SIGNAL_REGISTER_F(server_cap_delete, 1, (const char *cmd, IRC_SERVER_REC *irc_server),
+	 cmd, irc_server)
+SIGNAL_REGISTER(server_cap_end, 1, (IRC_SERVER_REC *irc_server),
+	 irc_server)
+SIGNAL_REGISTER(server_cap_req, 2, (IRC_SERVER_REC *irc_server, char *caps),
+	 irc_server, caps)
+
+// sasl.c
+SIGNAL_REGISTER(server_sasl_failure, 2, (SERVER_REC *server, char *reason),
+	 server, reason)
+SIGNAL_REGISTER(server_sasl_success, 1, (SERVER_REC *server),
+	 server)
+
+// irc.c:
+
+SIGNAL_REGISTER(server_event, 4, (SERVER_REC *server, char *data, char *sender_nick, char *sender_address),
+	 server, data, sender_nick, sender_address)
+SIGNAL_REGISTER_F(event, 4, (const char *cmd, SERVER_REC *server, const char *args, const char *sender_nick, const char *sender_address),
+	 cmd, server, args, sender_nick, sender_address)
+SIGNAL_REGISTER(default_event, 4, (SERVER_REC *server, char *data, char *sender_nick, char *sender_address),
+	 server, data, sender_nick, sender_address)
+SIGNAL_REGISTER(whois_default_event, 4, (SERVER_REC *server, char *args, char *sender_nick, char *sender_address),
+	 server, args, sender_nick, sender_address)
+
+SIGNAL_REGISTER(server_incoming, 2, (SERVER_REC *server, char *data),
+	 server, data)
+
+// (for perl parser..))
+SIGNAL_REGISTER_F(redir, 4, (const char *cmd, SERVER_REC *server, char *args, char *sender_nick, char *sender_address),
+	 cmd, server, args, sender_nick, sender_address)
+
+// lag.c:
+SIGNAL_REGISTER(server_lag, 1, (SERVER_REC *server),
+	 server)
+SIGNAL_REGISTER(server_lag_disconnect, 1, (SERVER_REC *server),
+	 server)
+
+// massjoin.c:
+SIGNAL_REGISTER(massjoin, 2, (CHANNEL_REC *channel, GSList *nicks/*<NICK_REC*>*/),
+	 channel, nicks)
+
+// mode-lists.c:
+SIGNAL_REGISTER(ban_new, 2, (CHANNEL_REC *channel, BAN_REC *ban),
+	 channel, ban)
+SIGNAL_REGISTER(ban_remove, 3, (CHANNEL_REC *channel, BAN_REC *ban, const char *setby),
+	 channel, ban, setby)
+
+// modes.c:
+SIGNAL_REGISTER(channel_mode_changed, 2, (CHANNEL_REC *channel, const char *setby),
+	 channel, setby)
+SIGNAL_REGISTER(nick_mode_changed, 5, (CHANNEL_REC *channel, NICK_REC *nick, const char *setby, const char *mode, const char *type),
+	 channel, nick, setby, mode, type)
+SIGNAL_REGISTER(user_mode_changed, 2, (SERVER_REC *server, char *old),
+	 server, old)
+SIGNAL_REGISTER(away_mode_changed, 1, (SERVER_REC *server),
+	 server)
+
+// netsplit.c:
+SIGNAL_REGISTER(netsplit_server_new, 2, (IRC_SERVER_REC *irc_server, NETSPLIT_SERVER_REC *netsplit_server),
+	 irc_server, netsplit_server)
+SIGNAL_REGISTER(netsplit_server_remove, 2, (IRC_SERVER_REC *irc_server, NETSPLIT_SERVER_REC *netsplit_server),
+	 irc_server, netsplit_server)
+SIGNAL_REGISTER(netsplit_new, 1, (NETSPLIT_REC *netsplit),
+	 netsplit)
+SIGNAL_REGISTER(netsplit_remove, 1, (NETSPLIT_REC *netsplit),
+	 netsplit)
+
+// dcc*.c:
+
+SIGNAL_REGISTER_F(dcc_ctcp, 2, (const char *cmd, char *args, DCC_REC *dcc),
+	 cmd, args, dcc)
+SIGNAL_REGISTER(default_dcc_ctcp, 2, (char *args, DCC_REC *dcc),
+	 args, dcc)
+SIGNAL_REGISTER(dcc_unknown_ctcp, 3, (char *args, char *sender, char *sendaddr),
+	 args, sender, sendaddr)
+
+SIGNAL_REGISTER_F(dcc_reply, 2, (const char *cmd, char *args, DCC_REC *dcc),
+	 cmd, args, dcc)
+SIGNAL_REGISTER(default_dcc_reply, 2, (char *args, DCC_REC *dcc),
+	 args, dcc)
+SIGNAL_REGISTER(dcc_unknown_reply, 3, (char *args, char *sender, char *sendaddr),
+	 args, sender, sendaddr)
+
+SIGNAL_REGISTER(dcc_created, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_destroyed, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_connected, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_rejected, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_closed, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_request, 2, (DCC_REC *dcc, const char *sendaddr),
+	 dcc, sendaddr)
+SIGNAL_REGISTER(dcc_request_send, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_chat_message, 2, (CHAT_DCC_REC *chat_dcc, char *msg),
+	 chat_dcc, msg)
+SIGNAL_REGISTER(dcc_transfer_update, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_get_receive, 1, (GET_DCC_REC *get_dcc),
+	 get_dcc)
+SIGNAL_REGISTER(dcc_send_pasv, 1, (SEND_DCC_REC *send_dcc),
+	 send_dcc)
+SIGNAL_REGISTER(dcc_server_message, 2, (SERVER_DCC_REC *server_dcc, char *msg),
+	 server_dcc, msg)
+SIGNAL_REGISTER(dcc_server_started, 1, (SERVER_DCC_REC *server_dcc),
+	 server_dcc)
+SIGNAL_REGISTER(dcc_error_connect, 1, (DCC_REC *dcc),
+	 dcc)
+SIGNAL_REGISTER(dcc_error_file_create, 3, (DCC_REC *dcc, const char *filename, const char *errmsg),
+	 dcc, filename, errmsg)
+SIGNAL_REGISTER(dcc_error_file_open, 3, (const char *nick, const char *filename, int_in_ptr errno),
+	 nick, filename, errno)
+SIGNAL_REGISTER(dcc_error_get_not_found, 1, (const char *nick),
+	 nick)
+SIGNAL_REGISTER(dcc_error_send_no_route, 2, (const char *nick, char *file),
+	 nick, file)
+SIGNAL_REGISTER(dcc_error_send_exists, 2, (const char *nick, const char *filename),
+	 nick, filename)
+SIGNAL_REGISTER(dcc_error_unknown_type, 1, (const char *type),
+	 type)
+SIGNAL_REGISTER(dcc_error_close_not_found, 3, (const char *type, const char *nick, char *filename),
+	 type, nick, filename)
+SIGNAL_REGISTER(dcc_error_write, 2, (DCC_REC *dcc, const char *errmsg),
+	 dcc, errmsg)
+SIGNAL_REGISTER(dcc_error_ctcp, 5, (const char *type, const char *data, const char *nick, const char *addr, const char *target),
+	 type, data, nick, addr, target)
+
+SIGNAL_REGISTER(default_ctcp_msg_dcc, 6, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target, DCC_REC *dcc),
+	 irc_server, args, nick, addr, target, dcc)
+SIGNAL_REGISTER(default_ctcp_reply_dcc, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 irc_server, args, nick, addr, target)
+
+// autoignore.c:
+
+SIGNAL_REGISTER(autoignore_new, 2, (SERVER_REC *server, AUTOIGNORE_REC *autoignore),
+	 server, autoignore)
+SIGNAL_REGISTER(autoignore_remove, 2, (SERVER_REC *server, AUTOIGNORE_REC *autoignore),
+	 server, autoignore)
+
+// flood.c:
+
+SIGNAL_REGISTER(flood, 5, (SERVER_REC *server, const char *nick, const char *host, int_in_ptr level, const char *target),
+	 server, nick, host, level, target)
+
+// notifylist.c:
+
+SIGNAL_REGISTER(notifylist_new, 1, (NOTIFYLIST_REC *notifylist),
+	 notifylist)
+SIGNAL_REGISTER(notifylist_remove, 1, (NOTIFYLIST_REC *notifylist),
+	 notifylist)
+SIGNAL_REGISTER(notifylist_joined, 6, (SERVER_REC *server, char *nick, char *user, char *host, const char *realname, char *awaymsg),
+	 server, nick, user, host, realname, awaymsg)
+SIGNAL_REGISTER(notifylist_away_changed, 6, (SERVER_REC *server, char *nick, char *user, char *host, const char *realname, char *awaymsg),
+	 server, nick, user, host, realname, awaymsg)
+SIGNAL_REGISTER(notifylist_left, 6, (SERVER_REC *server, char *nick, char *user, char *host, const char *realname, char *awaymsg),
+	 server, nick, user, host, realname, awaymsg)
+
+// proxy/listen.c:
+
+SIGNAL_REGISTER(proxy_client_connecting, 1, (CLIENT_REC *client),
+	 client)
+SIGNAL_REGISTER(proxy_client_connected, 1, (CLIENT_REC *client),
+	 client)
+SIGNAL_REGISTER(proxy_client_disconnected, 1, (CLIENT_REC *client),
+	 client)
+SIGNAL_REGISTER(proxy_client_command, 3, (CLIENT_REC *client, char *args, char *data),
+	 client, args, data)
+SIGNAL_REGISTER(proxy_client_dump, 2, (CLIENT_REC *client, char *data),
+	 client, data)
+
diff --git a/src/irc/core/signal-registry.def.in b/src/irc/core/signal-registry.def.in
new file mode 100644
index 00000000..baac0415
--- /dev/null
+++ b/src/irc/core/signal-registry.def.in
@@ -0,0 +1,137 @@
+
+// bans.c:
+ "ban type changed", char *bantype
+
+// channels, nicklist:
+ "channel joined", CHANNEL_REC
+ "channel wholist", CHANNEL_REC
+ "channel sync", CHANNEL_REC
+
+ "channel topic changed", CHANNEL_REC
+
+// channel-rejoin.c
+ "channel rejoin remove", SERVER_REC, REJOIN_REC
+ "channel rejoin new", SERVER_REC, REJOIN_REC
+
+// ctcp.c:
+
+ "ctcp msg", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "ctcp msg "<cmd>, IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "default ctcp msg", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "ctcp reply", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "ctcp reply "<cmd>, IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "default ctcp reply", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "ctcp action", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+
+// irc-servers.c:
+ "event connected", SERVER_REC
+
+// irc-cap.c
+ "server cap ack "<cmd>, IRC_SERVER_REC
+ "server cap nak "<cmd>, IRC_SERVER_REC
+ "server cap new "<cmd>, IRC_SERVER_REC
+ "server cap delete "<cmd>, IRC_SERVER_REC
+ "server cap end", IRC_SERVER_REC
+ "server cap req", IRC_SERVER_REC, char *caps
+
+// sasl.c
+ "server sasl failure", SERVER_REC, char *reason
+ "server sasl success", SERVER_REC
+
+// irc.c:
+
+ "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
+ "event "<cmd>, SERVER_REC, const char *args, const char *sender_nick, const char *sender_address
+ "default event", SERVER_REC, char *data, char *sender_nick, char *sender_address
+ "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
+
+ "server incoming", SERVER_REC, char *data
+
+// (for perl parser..)
+ "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
+
+// lag.c:
+ "server lag", SERVER_REC
+ "server lag disconnect", SERVER_REC
+
+// massjoin.c:
+ "massjoin", CHANNEL_REC, GSList *nicks/*<NICK_REC*>*/
+
+// mode-lists.c:
+ "ban new", CHANNEL_REC, BAN_REC
+ "ban remove", CHANNEL_REC, BAN_REC, const char *setby
+
+// modes.c:
+ "channel mode changed", CHANNEL_REC, const char *setby
+ "nick mode changed", CHANNEL_REC, NICK_REC, const char *setby, const char *mode, const char *type
+ "user mode changed", SERVER_REC, char *old
+ "away mode changed", SERVER_REC
+
+// netsplit.c:
+ "netsplit server new", IRC_SERVER_REC, NETSPLIT_SERVER_REC
+ "netsplit server remove", IRC_SERVER_REC, NETSPLIT_SERVER_REC
+ "netsplit new", NETSPLIT_REC
+ "netsplit remove", NETSPLIT_REC
+
+// dcc*.c:
+
+ "dcc ctcp "<cmd>, char *args, DCC_REC
+ "default dcc ctcp", char *args, DCC_REC
+ "dcc unknown ctcp", char *args, char *sender, char *sendaddr
+
+ "dcc reply "<cmd>, char *args, DCC_REC
+ "default dcc reply", char *args, DCC_REC
+ "dcc unknown reply", char *args, char *sender, char *sendaddr
+
+ "dcc created", DCC_REC
+ "dcc destroyed", DCC_REC
+ "dcc connected", DCC_REC
+ "dcc rejected", DCC_REC
+ "dcc closed", DCC_REC
+ "dcc request", DCC_REC, const char *sendaddr
+ "dcc request send", DCC_REC
+ "dcc chat message", CHAT_DCC_REC, char *msg
+ "dcc transfer update", DCC_REC
+ "dcc get receive", GET_DCC_REC
+ "dcc send pasv", SEND_DCC_REC
+ "dcc server message", SERVER_DCC_REC, char *msg
+ "dcc server started", SERVER_DCC_REC
+ "dcc error connect", DCC_REC
+ "dcc error file create", DCC_REC, const char *filename, const char *errmsg
+ "dcc error file open", const char *nick, const char *filename, int errno
+ "dcc error get not found", const char *nick
+ "dcc error send no route", const char *nick, char *file
+ "dcc error send exists", const char *nick, const char *filename
+ "dcc error unknown type", const char *type
+ "dcc error close not found", const char *type, const char *nick, char *filename
+ "dcc error write", DCC_REC, const char *errmsg
+ "dcc error ctcp", const char *type, const char *data, const char *nick, const char *addr, const char *target
+
+ "default ctcp msg dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target, DCC_REC
+ "default ctcp reply dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+
+// autoignore.c:
+
+ "autoignore new", SERVER_REC, AUTOIGNORE_REC
+ "autoignore remove", SERVER_REC, AUTOIGNORE_REC
+
+// flood.c:
+
+ "flood", SERVER_REC, const char *nick, const char *host, int level, const char *target
+
+// notifylist.c:
+
+ "notifylist new", NOTIFYLIST_REC
+ "notifylist remove", NOTIFYLIST_REC
+ "notifylist joined", SERVER_REC, char *nick, char *user, char *host, const char *realname, char *awaymsg
+ "notifylist away changed", SERVER_REC, char *nick, char *user, char *host, const char *realname, char *awaymsg
+ "notifylist left", SERVER_REC, char *nick, char *user, char *host, const char *realname, char *awaymsg
+
+// proxy/listen.c:
+
+ "proxy client connecting", CLIENT_REC
+ "proxy client connected", CLIENT_REC
+ "proxy client disconnected", CLIENT_REC
+ "proxy client command", CLIENT_REC, char *args, char *data
+ "proxy client dump", CLIENT_REC, char *data
+
diff --git a/src/irc/core/signal-registry.h b/src/irc/core/signal-registry.h
new file mode 100644
index 00000000..ef2c2ea4
--- /dev/null
+++ b/src/irc/core/signal-registry.h
@@ -0,0 +1,24 @@
+#ifndef IRSSI_IRC_CORE_SIGNAL_REGISTRY_H
+#define IRSSI_IRC_CORE_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+STYPE(BAN_REC);
+STYPE(NETSPLIT_SERVER_REC);
+STYPE(NETSPLIT_REC);
+STYPE(DCC_REC);
+STYPE(AUTOIGNORE_REC);
+STYPE(NOTIFYLIST_REC);
+STYPE(CLIENT_REC);
+STYPE(REJOIN_REC);
+typedef struct CHAT_DCC_REC CHAT_DCC_REC;
+STYPE(GET_DCC_REC);
+STYPE(SEND_DCC_REC);
+typedef struct SERVER_DCC_REC SERVER_DCC_REC;
+typedef void *int_in_ptr;
+typedef void *uint_in_ptr;
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/otr/signal-registry.def b/src/otr/signal-registry.def
new file mode 100644
index 00000000..3f1d91fc
--- /dev/null
+++ b/src/otr/signal-registry.def
@@ -0,0 +1,4 @@
+// OTR Core
+
+// otr.c:
+ "otr event", SERVER_REC, char *nick, char *status
diff --git a/src/perl/signal-registry.def b/src/perl/signal-registry.def
new file mode 100644
index 00000000..c09b416b
--- /dev/null
+++ b/src/perl/signal-registry.def
@@ -0,0 +1,3 @@
+// Perl
+
+"script error", PERL_SCRIPT_REC, char *errormsg