use includes from irssi

src/irc/core/bans.c

@@ -18,10 +18,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/module.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"
@@ -29,7 +29,7 @@
 #include "irc-commands.h"
 #include "modes.h"
 #include "mode-lists.h"
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 #define BAN_TYPE_NORMAL (IRC_MASK_USER | IRC_MASK_DOMAIN)
 #define BAN_TYPE_USER (IRC_MASK_USER)

src/irc/core/channel-events.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "channels-setup.h"
-#include "settings.h"
-#include "recode.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/recode.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/channel-rejoin.c

@@ -20,9 +20,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/channels-query.c

@@ -39,13 +39,13 @@ loop:
 */
 
 #include "module.h"
-#include "misc.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
 #include "modes.h"
 #include "mode-lists.h"
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 #include "irc-servers.h"
 #include "irc-channels.h"
 #include "servers-redirect.h"

src/irc/core/ctcp.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "servers-idle.h"
-#include "ignore.h"
+#include <irssi/src/core/ignore.h>
 #include "ctcp.h"
 
 typedef struct {

src/irc/core/irc-cap.c

@@ -18,8 +18,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-cap.h"
 #include "irc-servers.h"

src/irc/core/irc-channels-setup.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "channels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/channels.h>
 
 void irc_channels_setup_init(void)
 {

src/irc/core/irc-channels.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "channels-setup.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/channels-setup.h>
 
 #include "bans.h"
 #include "modes.h"

src/irc/core/irc-channels.h

@@ -1,8 +1,9 @@
 #ifndef __IRC_CHANNELS_H
 #define __IRC_CHANNELS_H
 
-#include "chat-protocols.h"
-#include "channels.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/channels.h>
+#include "irc.h"
 
 /* Returns IRC_CHANNEL_REC if it's IRC channel, NULL if it isn't. */
 #define IRC_CHANNEL(channel) \
@@ -13,7 +14,7 @@
 
 #define STRUCT_SERVER_REC IRC_SERVER_REC
 struct _IRC_CHANNEL_REC {
-#include "channel-rec.h"
+#include <irssi/src/core/channel-rec.h>
 
 	GSList *banlist; /* list of bans */
 

src/irc/core/irc-chatnets.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-chatnets.h"
 

src/irc/core/irc-chatnets.h

@@ -1,8 +1,8 @@
 #ifndef __IRC_CHATNETS_H
 #define __IRC_CHATNETS_H
 
-#include "chat-protocols.h"
-#include "chatnets.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
 
 /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */
 #define IRC_CHATNET(chatnet) \
@@ -15,7 +15,7 @@
 #define IRCNET(ircnet) IRC_CHATNET(ircnet)
 
 struct _IRC_CHATNET_REC {
-#include "chatnet-rec.h"
+#include <irssi/src/core/chatnet-rec.h>
 
 	char *usermode;
 	char *alternate_nick;

src/irc/core/irc-commands.c

@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "recode.h"
-#include "special-vars.h"
-#include "settings.h"
-#include "window-item-def.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/window-item-def.h>
 
-#include "servers-reconnect.h"
+#include <irssi/src/core/servers-reconnect.h>
 #include "servers-redirect.h"
-#include "servers-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/nicklist.h>
 
 #include "bans.h"
 #include "irc-commands.h"

src/irc/core/irc-commands.h

@@ -1,7 +1,7 @@
 #ifndef __IRC_COMMANDS_H
 #define __IRC_COMMANDS_H
 
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 
 #define command_bind_irc(cmd, section, signal) \
         command_bind_proto(cmd, IRC_PROTOCOL, section, signal)

src/irc/core/irc-core.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "chat-protocols.h"
-#include "settings.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "irc-chatnets.h"
@@ -30,7 +30,7 @@
 #include "sasl.h"
 
 #include "irc-servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/core/channels-setup.h>
 
 #include "ctcp.h"
 #include "irc-commands.h"

src/irc/core/irc-expandos.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "expandos.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 #ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX 255

src/irc/core/irc-masks.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 
 #include "irc-masks.h"
 

src/irc/core/irc-masks.h

@@ -1,7 +1,7 @@
 #ifndef __IRC_MASKS_H
 #define __IRC_MASKS_H
 
-#include "masks.h"
+#include <irssi/src/core/masks.h>
 
 #define IRC_MASK_NICK   0x01
 #define IRC_MASK_USER   0x02

src/irc/core/irc-nicklist.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"
 #include "irc-masks.h"
 #include "irc-nicklist.h"
 #include "modes.h"
-#include "servers.h"
+#include <irssi/src/core/servers.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,

src/irc/core/irc-nicklist.h

@@ -1,7 +1,7 @@
 #ifndef __IRC_NICKLIST_H
 #define __IRC_NICKLIST_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,

src/irc/core/irc-queries.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-nicklist.h"
 #include "irc-servers.h"

src/irc/core/irc-queries.h

@@ -1,8 +1,8 @@
 #ifndef __IRC_QUERIES_H
 #define __IRC_QUERIES_H
 
-#include "chat-protocols.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/queries.h>
 
 /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */
 #define IRC_QUERY(query) \

src/irc/core/irc-servers-reconnect.c

@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "commands.h"
-#include "network.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
 
 #include "modes.h"
 #include "irc-servers.h"
 
-#include "settings.h"
+#include <irssi/src/core/settings.h>
 
 static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 				    IRC_SERVER_CONNECT_REC *src)

src/irc/core/irc-servers-setup.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "network.h"
-#include "servers-setup.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-chatnets.h"
 #include "irc-servers-setup.h"

src/irc/core/irc-servers-setup.h

@@ -1,8 +1,8 @@
 #ifndef __IRC_SERVERS_SETUP_H
 #define __IRC_SERVERS_SETUP_H
 
-#include "chat-protocols.h"
-#include "servers-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers-setup.h>
 
 #define IRC_SERVER_SETUP(server) \
 	PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \
@@ -12,7 +12,7 @@
 	(IRC_SERVER_SETUP(server) ? TRUE : FALSE)
 
 typedef struct {
-#include "server-setup-rec.h"
+#include <irssi/src/core/server-setup-rec.h>
 
         /* override the default if > 0 */
 	int max_cmds_at_once;

src/irc/core/irc-servers.c

@@ -20,13 +20,13 @@
 
 #include "module.h"
 
-#include "net-sendbuffer.h"
-#include "signals.h"
-#include "rawlog.h"
-#include "misc.h"
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/misc.h>
 
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
 #include "irc-nicklist.h"
 #include "irc-queries.h"
@@ -35,15 +35,15 @@
 #include "irc-cap.h"
 #include "sasl.h"
 
-#include "channels-setup.h"
+#include <irssi/src/core/channels-setup.h>
 #include "channel-rejoin.h"
 #include "servers-idle.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/servers-reconnect.h>
 #include "servers-redirect.h"
 #include "modes.h"
 
-#include "settings.h"
-#include "recode.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/recode.h>
 
 #define DEFAULT_MAX_KICKS 1
 #define DEFAULT_MAX_MODES 3

src/irc/core/irc-servers.h

@@ -1,8 +1,8 @@
 #ifndef __IRC_SERVERS_H
 #define __IRC_SERVERS_H
 
-#include "chat-protocols.h"
-#include "servers.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
 #include "modes.h"
 
 /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
@@ -22,7 +22,7 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
-#include "server-connect-rec.h"
+#include <irssi/src/core/server-connect-rec.h>
 
 	char *usermode;
 	char *alternate_nick;
@@ -40,7 +40,7 @@ struct _IRC_SERVER_CONNECT_REC {
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {
-#include "server-rec.h"
+#include <irssi/src/core/server-rec.h>
 
 	/* For deciding if event should be redirected */
 	GSList *redirects;

src/irc/core/irc-session.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "net-sendbuffer.h"
-#include "lib-config/iconfig.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/irc.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "rawlog.h"
-#include "misc.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/irc.h

@@ -49,7 +49,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
 		       int send_now, int immediate, int raw);
 
 /* Get count parameters from data */
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 char *event_get_param(char **data);
 char *event_get_params(const char *data, int count, ...);
 

src/irc/core/lag.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "servers-redirect.h"

src/irc/core/massjoin.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/mode-lists.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "signals.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/modes.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-commands.h"
 #include "irc-servers.h"
@@ -28,7 +28,7 @@
 #include "servers-redirect.h"
 #include "modes.h"
 #include "mode-lists.h"
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 /* Change nick's mode in channel */
 static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick,

src/irc/core/modes.h

@@ -2,7 +2,7 @@
 #define __MODES_H
 
 #include "irc-channels.h"
-#include "nicklist.h" /* MAX_USER_PREFIXES */
+#include <irssi/src/core/nicklist.h> /* MAX_USER_PREFIXES */
 
 typedef void mode_func_t(IRC_CHANNEL_REC *, const char *, char, char,
 			 char *, GString *);

src/irc/core/module.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <irssi/src/common.h>
 #include "irc.h"
 
 #define MODULE_NAME "irc/core"

src/irc/core/netsplit.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 #include "irc-channels.h"

src/irc/core/netsplit.h

@@ -1,7 +1,7 @@
 #ifndef __NETSPLIT_H
 #define __NETSPLIT_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 
 typedef struct {
 	char *server;

src/irc/core/sasl.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-cap.h"
 #include "irc-servers.h"

src/irc/core/servers-idle.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "irc-servers.h"
 #include "servers-idle.h"

src/irc/core/servers-redirect.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "rawlog.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/rawlog.h>
 
 #include "irc-servers.h"
 #include "servers-redirect.h"

src/irc/dcc/dcc-autoget.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "masks.h"
-#include "settings.h"
-#include "servers.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
 
 #include "dcc-get.h"
 

src/irc/dcc/dcc-chat.c

@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "recode.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "irc-queries.h"
-#include "masks.h"
+#include <irssi/src/core/masks.h>
 
 #include "dcc-chat.h"
 

src/irc/dcc/dcc-get.c

@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
-#include "settings.h"
-#include "net-sendbuffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/net-sendbuffer.h>
 #include "irc-servers.h"
 
 #include "dcc-get.h"

src/irc/dcc/dcc-queue.c

@@ -21,12 +21,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 #include "irc-servers.h"
 
 #include "dcc-queue.h"

src/irc/dcc/dcc-resume.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
 
 #include "dcc-file.h"
 #include "dcc-get.h"

src/irc/dcc/dcc-send.c

@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 

src/irc/dcc/dcc-server.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
 
 #include "irc-servers.h"
 

src/irc/dcc/dcc.c

@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "misc.h"
-#include "settings.h"
-#include "ignore.h"
-#include "levels.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/levels.h>
 
 #include "irc-servers.h"
-#include "servers-setup.h"
+#include <irssi/src/core/servers-setup.h>
 
 #include "dcc-chat.h"
 #include "dcc-get.h"

src/irc/dcc/dcc.h

@@ -1,8 +1,8 @@
 #ifndef __DCC_H
 #define __DCC_H
 
-#include "modules.h"
-#include "network.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
 
 #define DCC(dcc) ((DCC_REC *) (dcc))
 

src/irc/dcc/module.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <irssi/src/common.h>
 #include "irc.h"
 
 #define MODULE_NAME "irc/dcc"

src/irc/flood/autoignore.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
-#include "ignore.h"
+#include <irssi/src/core/ignore.h>
 
 void autoignore_update(IGNORE_REC *rec, int level)
 {

src/irc/flood/flood.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc.h"
 #include "irc-servers.h"
-#include "ignore.h"
+#include <irssi/src/core/ignore.h>
 
 void autoignore_init(void);
 void autoignore_deinit(void);

src/irc/flood/module.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <irssi/src/common.h>
 #include "irc.h"
 
 typedef struct {

src/irc/notifylist/module.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <irssi/src/common.h>
 #include "irc.h"
 
 #define MODULE_NAME "irc/notifylist"

src/irc/notifylist/notify-commands.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "notifylist.h"
 

src/irc/notifylist/notify-ison.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc.h"
 #include "irc-servers.h"

src/irc/notifylist/notify-setup.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc-servers.h"
 #include "notifylist.h"

src/irc/notifylist/notify-whois.c

@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "expandos.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
 
 #include "irc.h"
 #include "irc-servers.h"
-#include "masks.h"
+#include <irssi/src/core/masks.h>
 
 #include "notifylist.h"
 

src/irc/notifylist/notifylist.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "settings.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
 #include "irc.h"
 #include "irc-channels.h"
 #include "servers-redirect.h"
-#include "masks.h"
-#include "nicklist.h"
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/nicklist.h>
 
 #include "notifylist.h"
 #include "notify-setup.h"

src/irc/proxy/proxy.h

@@ -1,9 +1,9 @@
 #ifndef PROXY_H
 #define PROXY_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
-#include "network.h"
+#include <irssi/src/core/network.h>
 #include "irc.h"
 #include "irc-servers.h"