Use full paths to includes

configure.ac

@@ -765,6 +765,13 @@ themes/Makefile
 irssi-config
 ])
 
+dnl ** make the paths like include headers later
+AC_CONFIG_LINKS([
+irssi/irssi-config.h:irssi-config.h
+irssi/irssi-version.h:irssi-version.h
+])
+AC_LINK_FILES([$srcdir/src],[irssi/src])
+
 AC_OUTPUT
 
 dnl ** for building from objdir

src/common.h

@@ -11,9 +11,7 @@
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
 
-#ifdef HAVE_CONFIG_H
-#include "irssi-config.h"
-#endif
+#include <irssi/irssi-config.h>
 
 #include <stdio.h>
 #include <stddef.h>

src/core/Makefile.am

@@ -1,8 +1,6 @@
 noinst_LIBRARIES = libcore.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/core \
 	$(GLIB_CFLAGS) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DMODULEDIR=\""$(libdir)/irssi/modules"\"

src/core/args.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "args.h"
+#include <irssi/src/core/args.h>
 
 static GOptionContext *context = NULL;
 

src/core/capsicum.c

@@ -23,14 +23,14 @@
 */
 
 #include "module.h"
-#include "capsicum.h"
-#include "commands.h"
-#include "log.h"
-#include "misc.h"
-#include "network.h"
-#include "network-openssl.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/capsicum.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include <sys/param.h>
 #include <sys/capsicum.h>

src/core/channel-rec.h

@@ -1,6 +1,6 @@
 /* CHANNEL_REC definition, used for inheritance */
 
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 
 char *topic;
 char *topic_by;

src/core/channels-setup.c

@@ -19,14 +19,14 @@
 */
 
 #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 "chat-protocols.h"
-#include "chatnets.h"
-#include "servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *setupchannels;
 

src/core/channels-setup.h

@@ -1,7 +1,7 @@
 #ifndef __CHANNELS_SETUP_H
 #define __CHANNELS_SETUP_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 #define CHANNEL_SETUP(server) \
 	MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP")
@@ -10,7 +10,7 @@
 	(CHANNEL_SETUP(server) ? TRUE : FALSE)
 
 struct _CHANNEL_SETUP_REC {
-#include "channel-setup-rec.h"
+#include <irssi/src/core/channel-setup-rec.h>
 };
 
 extern GSList *setupchannels;

src/core/channels.c

@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "special-vars.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/nicklist.h>
 
 GSList *channels; /* List of all channels */
 

src/core/channels.h

@@ -1,7 +1,7 @@
 #ifndef __CHANNELS_H
 #define __CHANNELS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns CHANNEL_REC if it's channel, NULL if it isn't. */
 #define CHANNEL(channel) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _CHANNEL_REC {
-#include "channel-rec.h"
+#include <irssi/src/core/channel-rec.h>
 };
 
 extern GSList *channels;

src/core/chat-commands.c

@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "signals.h"
-#include "commands.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
-#include "channels.h"
-#include "queries.h"
-#include "window-item-def.h"
-#include "rawlog.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/core/rawlog.h>
 
 static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 					      char **rawlog_file)

src/core/chat-protocols.c

@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "chat-protocols.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/chat-protocols.h>
 
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels-setup.h"
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *chat_protocols;
 

src/core/chatnets.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
 
 GSList *chatnets; /* list of available chat networks */
 

src/core/chatnets.h

@@ -1,7 +1,7 @@
 #ifndef __CHATNETS_H
 #define __CHATNETS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */
 #define CHATNET(chatnet) \
@@ -11,7 +11,7 @@
 	(CHATNET(chatnet) ? TRUE : FALSE)
 
 struct _CHATNET_REC {
-#include "chatnet-rec.h"
+#include <irssi/src/core/chatnet-rec.h>
 };
 
 extern GSList *chatnets; /* list of available chat networks */

src/core/commands.c

@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "window-item-def.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/window-item-def.h>
 
-#include "servers.h"
-#include "channels.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
 
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 GSList *commands;
 char *current_command;

src/core/commands.h

@@ -1,7 +1,7 @@
 #ifndef __COMMANDS_H
 #define __COMMANDS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 typedef struct {
 	SIGNAL_FUNC func;

src/core/core.c

@@ -21,33 +21,33 @@
 #include "module.h"
 #include <signal.h>
 
-#include "args.h"
-#include "pidwait.h"
-#include "misc.h"
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/misc.h>
 
-#include "net-disconnect.h"
-#include "signals.h"
-#include "settings.h"
-#include "session.h"
+#include <irssi/src/core/net-disconnect.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/session.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "chatnets.h"
-#include "commands.h"
-#include "expandos.h"
-#include "write-buffer.h"
-#include "log.h"
-#include "rawlog.h"
-#include "ignore.h"
-#include "recode.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/recode.h>
 
-#include "channels.h"
-#include "queries.h"
-#include "nicklist.h"
-#include "nickmatch-cache.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>

src/core/core.h

@@ -1,7 +1,7 @@
 #ifndef __IRSSI_CORE_H
 #define __IRSSI_CORE_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 /* for determining what GUI is currently in use: */
 #define IRSSI_GUI_NONE	0

src/core/expandos.c

@@ -18,20 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "core.h"
+#include <irssi/src/core/core.h>
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "expandos.h"
-#include "settings.h"
-#include "commands.h"
-#include "misc.h"
-#include "irssi-version.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/irssi-version.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
-#include "window-item-def.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/window-item-def.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
 #  include <sys/utsname.h>

src/core/expandos.h

@@ -1,7 +1,7 @@
 #ifndef __EXPANDOS_H
 #define __EXPANDOS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 /* first argument of signal must match to active .. */
 typedef enum {

src/core/ignore.c

@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "iregex.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/iregex.h>
 
-#include "masks.h"
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "nickmatch-cache.h"
+#include <irssi/src/core/masks.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
-#include "ignore.h"
+#include <irssi/src/core/ignore.h>
 
 GSList *ignores;
 

src/core/ignore.h

@@ -1,7 +1,7 @@
 #ifndef __IGNORE_H
 #define __IGNORE_H
 
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 typedef struct _IGNORE_REC IGNORE_REC;
 

src/core/iregex-gregex.c

@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 struct _MatchInfo {
 	const char *valid_string;

src/core/iregex-regexh.c

@@ -1,4 +1,4 @@
-#include "iregex.h"
+#include <irssi/src/core/iregex.h>
 
 Regex *
 i_regex_new (const gchar *pattern,

src/core/iregex.h

@@ -1,7 +1,7 @@
 #ifndef __REGEX_H
 #define __REGEX_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 #ifdef USE_GREGEX
 

src/core/levels.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
 /* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {

src/core/line-split.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "misc.h"
+#include <irssi/src/core/misc.h>
 
 /* Maximum line length - split to two lines if it's longer than this.
 

src/core/log-away.c

@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "log.h"
-#include "servers.h"
-#include "settings.h"
-#include "write-buffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 static LOG_REC *awaylog;
 static int away_filepos;

src/core/log.c

@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "servers.h"
-#include "log.h"
-#include "write-buffer.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/servers.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/write-buffer.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #define DEFAULT_LOG_FILE_CREATE_MODE 600
 

src/core/masks.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "misc.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
+#include <irssi/src/core/servers.h>
 
 /* Returns TRUE if mask contains '!' ie. address should be checked too.
    Also checks if mask contained any wildcards. */

src/core/misc.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "misc.h"
-#include "commands.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/commands.h>
 
 typedef struct {
 	int condition;

src/core/module.h

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

src/core/modules-load.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "modules-load.h"
-#include "signals.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/signals.h>
 
-#include "settings.h"
-#include "commands.h"
-#include "misc.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
 #ifdef HAVE_GMODULE
 

src/core/modules-load.h

@@ -1,7 +1,7 @@
 #ifndef __MODULES_LOAD_H
 #define __MODULES_LOAD_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Load module - automatically tries to load also the related non-core
    modules given in `prefixes' (like irc, fe, fe_text, ..) */

src/core/modules.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
 
 GSList *modules;
 

src/core/net-disconnect.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 
 /* when quitting, wait for max. 5 seconds before forcing to close the socket */
 #define MAX_QUIT_CLOSE_WAIT 5

src/core/net-nonblock.c

@@ -22,8 +22,8 @@
 
 #include <signal.h>
 
-#include "pidwait.h"
-#include "net-nonblock.h"
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/net-nonblock.h>
 
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */

src/core/net-nonblock.h

@@ -1,7 +1,7 @@
 #ifndef __NET_NONBLOCK_H
 #define __NET_NONBLOCK_H
 
-#include "network.h"
+#include <irssi/src/core/network.h>
 
 typedef struct {
 	IPADDR ip4, ip6; /* resolved ip addresses */

src/core/net-sendbuffer.c

@@ -20,9 +20,9 @@
 
 #include "module.h"
 
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "line-split.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/line-split.h>
 
 /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
    is used */

src/core/network-openssl.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "network.h"
-#include "network-openssl.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "servers.h"
-#include "signals.h"
-#include "tls.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/tls.h>
 
 #include <openssl/crypto.h>
 #include <openssl/x509.h>

src/core/network.c

@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include "network.h"
+#include <irssi/src/core/network.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
 #include <sys/un.h>

src/core/nicklist.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "masks.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/masks.h>
 
 #define isalnumhigh(a) \
         (i_isalnum(a) || (unsigned char) (a) >= 128)

src/core/nicklist.h

@@ -11,7 +11,7 @@
 #define	MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */
 
 struct _NICK_REC {
-#include "nick-rec.h"
+#include <irssi/src/core/nick-rec.h>
 };
 
 /* Add new nick to list */

src/core/nickmatch-cache.c

@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "nickmatch-cache.h"
+#include <irssi/src/core/nickmatch-cache.h>
 
 static GSList *lists;
 

src/core/pidwait.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "modules.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/modules.h>
 
 static GHashTable *child_pids;
 static GSList *pids;

src/core/queries.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include "servers.h"
-#include "queries.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
 
 GSList *queries;
 

src/core/queries.h

@@ -1,7 +1,7 @@
 #ifndef __QUERIES_H
 #define __QUERIES_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns QUERY_REC if it's query, NULL if it isn't. */
 #define QUERY(query) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _QUERY_REC {
-#include "query-rec.h"
+#include <irssi/src/core/query-rec.h>
 };
 
 extern GSList *queries;

src/core/query-rec.h

@@ -1,6 +1,6 @@
 /* QUERY_REC definition, used for inheritance */
 
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 
 char *address;
 char *server_tag;

src/core/rawlog.c

@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "rawlog.h"
-#include "log.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "write-buffer.h"
-#include "settings.h"
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/settings.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "servers.h"
+#include <irssi/src/core/servers.h>
 
 static int rawlog_lines;
 static int signal_rawlog;

src/core/recode.c

@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include "settings.h"
-#include "servers.h"
-#include "signals.h"
-#include "lib-config/iconfig.h"
-#include "misc.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 static char *translit_charset;
 static gboolean term_is_utf8;

src/core/servers-reconnect.c

@@ -19,16 +19,16 @@
 */
 
 #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 "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
 
-#include "settings.h"
+#include <irssi/src/core/settings.h>
 
 GSList *reconnects;
 static int last_reconnect_tag;

src/core/servers-setup.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "network.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
 
 GSList *setupservers;
 

src/core/servers-setup.h

@@ -1,7 +1,7 @@
 #ifndef __SERVERS_SETUP_H
 #define __SERVERS_SETUP_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 #define SERVER_SETUP(server) \
 	MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP")
@@ -11,7 +11,7 @@
 
 /* servers */
 struct _SERVER_SETUP_REC {
-#include "server-setup-rec.h"
+#include <irssi/src/core/server-setup-rec.h>
 };
 
 extern GSList *setupservers;

src/core/servers.c

@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "net-disconnect.h"
-#include "net-nonblock.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "rawlog.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/net-disconnect.h>
+#include <irssi/src/core/net-nonblock.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-reconnect.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
 GSList *servers, *lookup_servers;
 

src/core/servers.h

@@ -1,7 +1,7 @@
 #ifndef __SERVERS_H
 #define __SERVERS_H
 
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 /* Returns SERVER_REC if it's server, NULL if it isn't. */
 #define SERVER(server) \
@@ -23,12 +23,12 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _SERVER_CONNECT_REC {
-#include "server-connect-rec.h"
+#include <irssi/src/core/server-connect-rec.h>
 };
 
 #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
 struct _SERVER_REC {
-#include "server-rec.h"
+#include <irssi/src/core/server-rec.h>
 };
 
 #define SEND_TARGET_CHANNEL	0

src/core/session.c

@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "args.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "pidwait.h"
-#include "lib-config/iconfig.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/lib-config/iconfig.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
 static char *session_file;
 char *irssi_binary = NULL;

src/core/settings.c

@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.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 "lib-config/iconfig.h"
-#include "recode.h"
-#include "settings.h"
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
 #include "default-config.h"
 
 #include <signal.h>

src/core/signals.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "modules.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/modules.h>
 
 typedef struct _SignalHook {
 	struct _SignalHook *next;

src/core/special-vars.c

@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "expandos.h"
-#include "settings.h"
-#include "servers.h"
-#include "misc.h"
-#include "utf8.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/utf8.h>
 
 #define isvarchar(c) \
         (i_isalnum(c) || (c) == '_')

src/core/special-vars.h

@@ -1,7 +1,7 @@
 #ifndef __SPECIAL_VARS_H
 #define __SPECIAL_VARS_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #define PARSE_FLAG_GETNAME	0x01 /* return argument name instead of it's value */
 #define PARSE_FLAG_ISSET_ANY	0x02 /* arg_used field specifies that at least one of the $variables was non-empty */

src/core/tls.c

@@ -18,7 +18,7 @@
 
 #include "module.h"
 
-#include "tls.h"
+#include <irssi/src/core/tls.h>
 
 TLS_REC *tls_create_rec()
 {

src/core/utf8.c

@@ -22,11 +22,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 #include "module.h"
 
 /* Provide is_utf8(): */
-#include "recode.h"
+#include <irssi/src/core/recode.h>
 
 int string_advance(char const **str, int policy)
 {

src/core/wcwidth-wrapper.c

@@ -22,9 +22,9 @@
 #include <wchar.h>
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "utf8.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/utf8.h>
 
 #ifdef HAVE_LIBUTF8PROC
 #include <utf8proc.h>

src/core/wcwidth.c

@@ -59,7 +59,7 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
-#include "utf8.h"
+#include <irssi/src/core/utf8.h>
 
 struct interval {
   int first;

src/core/window-item-def.h

@@ -3,7 +3,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _WI_ITEM_REC {
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 };
 
 #endif

src/core/write-buffer.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "settings.h"
-#include "write-buffer.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 #define BUFFER_BLOCK_SIZE 2048
 

src/fe-common/core/Makefile.am

@@ -1,7 +1,6 @@
 noinst_LIBRARIES = libfe_common_core.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"

src/fe-common/core/chat-completion.c

@@ -19,24 +19,24 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "misc.h"
-#include "levels.h"
-#include "lib-config/iconfig.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/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "queries.h"
-#include "nicklist.h"
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "completion.h"
-#include "chat-completion.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/chat-completion.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 enum {
 	COMPLETE_MCASE_NEVER = 0,

src/fe-common/core/command-history.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
-#include "command-history.h"
+#include <irssi/src/fe-common/core/command-history.h>
 
 /* command history */
 static GList *history_entries;

src/fe-common/core/command-history.h

@@ -1,7 +1,7 @@
 #ifndef __COMMAND_HISTORY_H
 #define __COMMAND_HISTORY_H
 
-#include "common.h"
+#include <irssi/src/common.h>
 
 typedef struct {
 	char *name;

src/fe-common/core/completion.c

@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.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/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "completion.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static GList *complist; /* list of commands we're currently completing */
 static char *last_line;

src/fe-common/core/completion.h

@@ -1,7 +1,7 @@
 #ifndef __COMPLETION_H
 #define __COMPLETION_H
 
-#include "window-items.h"
+#include <irssi/src/fe-common/core/window-items.h>
 
 /* automatic word completion - called when space/enter is pressed */
 char *auto_word_complete(const char *line, int *pos);

src/fe-common/core/fe-capsicum.c

@@ -23,11 +23,11 @@
 */
 
 #include "module.h"
-#include "fe-capsicum.h"
-#include "levels.h"
-#include "module-formats.h"
-#include "printtext.h"
-#include "signals.h"
+#include <irssi/src/fe-common/core/fe-capsicum.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
 
 static void capability_mode_enabled(void)
 {

src/fe-common/core/fe-channels.c

@@ -19,27 +19,27 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "special-vars.h"
-#include "utf8.h"
+#include <irssi/src/fe-common/core/module-formats.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 <irssi/src/core/special-vars.h>
+#include <irssi/src/core/utf8.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "nicklist.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "fe-windows.h"
-#include "fe-channels.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
 {

src/fe-common/core/fe-common-core.c

@@ -19,35 +19,35 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "args.h"
-#include "misc.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "servers-setup.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/servers-setup.h>
 
-#include "special-vars.h"
-#include "fe-core-commands.h"
-#include "fe-queries.h"
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
 #ifdef HAVE_CAPSICUM
-#include "fe-capsicum.h"
+#include <irssi/src/fe-common/core/fe-capsicum.h>
 #endif
-#include "hilight-text.h"
-#include "command-history.h"
-#include "completion.h"
-#include "keyboard.h"
-#include "printtext.h"
-#include "formats.h"
-#include "themes.h"
-#include "fe-channels.h"
-#include "fe-windows.h"
-#include "window-activity.h"
-#include "window-items.h"
-#include "windows-layout.h"
-#include "fe-recode.h"
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/command-history.h>
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-activity.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/windows-layout.h>
+#include <irssi/src/fe-common/core/fe-recode.h>
 
 #include <signal.h>
 

src/fe-common/core/fe-core-commands.c

@@ -18,22 +18,22 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "core.h"
+#include <irssi/src/core/core.h>
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.h"
-#include "irssi-version.h"
-#include "servers.h"
+#include <irssi/src/fe-common/core/module-formats.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 <irssi/irssi-version.h>
+#include <irssi/src/core/servers.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define PASTE_CHECK_SPEED 200 /* 0.2 sec */
 

src/fe-common/core/fe-exec.c

@@ -19,24 +19,24 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "pidwait.h"
-#include "line-split.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "misc.h"
-#include "levels.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/line-split.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/levels.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "queries.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
-#include "printtext.h"
-#include "fe-exec.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-exec.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include <signal.h>
 #include <stdlib.h>

src/fe-common/core/fe-exec.h

@@ -1,7 +1,7 @@
 #ifndef __FE_EXEC_H
 #define __FE_EXEC_H
 
-#include "fe-windows.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 #define EXEC_WI(query) \
 	MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \
@@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC;
 
 #define STRUCT_SERVER_REC void
 typedef struct {
-#include "window-item-rec.h"
+#include <irssi/src/core/window-item-rec.h>
 	PROCESS_REC *process;
 	unsigned int destroying:1;
 } EXEC_WI_REC;

src/fe-common/core/fe-expandos.c

@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include "expandos.h"
-#include "fe-windows.h"
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 /* Window ref# */
 static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)

src/fe-common/core/fe-help.c

@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "settings.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 "printtext.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
 {

src/fe-common/core/fe-ignore-messages.c

@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "levels.h"
-#include "ignore.h"
-#include "servers.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/servers.h>
 
 static void sig_message_public(SERVER_REC *server, const char *msg,
 			       const char *nick, const char *address,

src/fe-common/core/fe-ignore.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
+#include <irssi/src/fe-common/core/module-formats.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 "servers.h"
-#include "ignore.h"
-#include "printtext.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static char *ignore_get_key(IGNORE_REC *rec)
 {

src/fe-common/core/fe-log.c

@@ -19,30 +19,30 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "chat-protocols.h"
-#include "servers.h"
-#include "channels.h"
-#include "levels.h"
-#include "misc.h"
-#include "log.h"
-#include "special-vars.h"
-#include "settings.h"
-#include "lib-config/iconfig.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
 #ifdef HAVE_CAPSICUM
-#include "capsicum.h"
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "formats.h"
-#include "themes.h"
-#include "printtext.h"
-#include "fe-common-core.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-common-core.h>
 
-#include "channels-setup.h"
+#include <irssi/src/core/channels-setup.h>
 
 /* close autologs after 5 minutes of inactivity */
 #define AUTOLOG_INACTIVITY_CLOSE (60*5)

src/fe-common/core/fe-messages.c

@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.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/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "ignore.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/ignore.h>
 
-#include "window-items.h"
-#include "fe-queries.h"
-#include "hilight-text.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
 #define isnickchar(a) \

src/fe-common/core/fe-modules.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "modules-load.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "chat-protocols.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/chat-protocols.h>
 
-#include "printtext.h"
+#include <irssi/src/fe-common/core/printtext.h>
 
 #ifdef HAVE_GMODULE
 

src/fe-common/core/fe-queries.c

@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.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/settings.h>
 
-#include "chat-protocols.h"
-#include "servers.h"
-#include "queries.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
 
-#include "fe-core-commands.h"
-#include "fe-windows.h"
-#include "window-items.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static int queryclose_tag, query_auto_close, querycreate_level;
 

src/fe-common/core/fe-queries.h

@@ -1,7 +1,7 @@
 #ifndef __FE_QUERIES_H
 #define __FE_QUERIES_H
 
-#include "queries.h"
+#include <irssi/src/core/queries.h>
 
 /* Return query where to put the private message. */
 QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,

src/fe-common/core/fe-recode.c

@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include "modules.h"
-#include "module-formats.h"
-#include "commands.h"
-#include "levels.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "printtext.h"
-#include "formats.h"
-#include "recode.h"
+#include <irssi/src/core/modules.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/core/recode.h>
 
 static char *recode_fallback = NULL;
 static char *recode_out_default = NULL;

src/fe-common/core/fe-server.c

@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include "signals.h"
-#include "commands.h"
-#include "network.h"
-#include "levels.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/levels.h>
+#include <irssi/src/core/settings.h>
 
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers.h"
-#include "servers-setup.h"
-#include "servers-reconnect.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/servers-reconnect.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void print_servers(void)
 {

src/fe-common/core/fe-settings.c

@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "servers.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "fe-settings.h"
-#include "levels.h"
-#include "printtext.h"
-#include "keyboard.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/fe-settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/keyboard.h>
 
 static void set_print(SETTINGS_REC *rec)
 {

src/fe-common/core/fe-tls.c

@@ -17,15 +17,15 @@
  */
 
 #include "module.h"
-#include "signals.h"
-#include "settings.h"
-#include "levels.h"
-#include "tls.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/tls.h>
 
-#include "module-formats.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include "fe-tls.h"
+#include <irssi/src/fe-common/core/fe-tls.h>
 
 static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 {

src/fe-common/core/fe-windows.c

@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "modules.h"
-#include "signals.h"
-#include "commands.h"
-#include "servers.h"
-#include "misc.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 
-#include "printtext.h"
-#include "fe-windows.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 GSList *windows; /* first in the list is the active window,
                     next is the last active, etc. */

src/fe-common/core/fe-windows.h

@@ -1,8 +1,8 @@
 #ifndef __WINDOWS_H
 #define __WINDOWS_H
 
-#include "window-item-def.h"
-#include "command-history.h"
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/fe-common/core/command-history.h>
 
 enum {
         DATA_LEVEL_NONE = 0,

src/fe-common/core/formats.c

@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
 
-#include "levels.h"
-#include "servers.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.h>
 
-#include "fe-windows.h"
-#include "window-items.h"
-#include "formats.h"
-#include "themes.h"
-#include "recode.h"
-#include "utf8.h"
-#include "misc.h"
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/core/misc.h>
 
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";

src/fe-common/core/formats.h

@@ -1,8 +1,8 @@
 #ifndef __FORMATS_H
 #define __FORMATS_H
 
-#include "themes.h"
-#include "fe-windows.h"
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 #define GUI_PRINT_FLAG_BOLD          0x0001
 #define GUI_PRINT_FLAG_REVERSE       0x0002

src/fe-common/core/hilight-text.c

@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
-#include "iregex.h"
+#include <irssi/src/fe-common/core/module-formats.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/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/iregex.h>
 
-#include "servers.h"
-#include "channels.h"
-#include "nicklist.h"
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
-#include "hilight-text.h"
-#include "nickmatch-cache.h"
-#include "printtext.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/core/nickmatch-cache.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static NICKMATCH_REC *nickmatch;
 static int never_hilight_level, default_hilight_level;

src/fe-common/core/hilight-text.h

@@ -1,8 +1,8 @@
 #ifndef __HILIGHT_TEXT_H
 #define __HILIGHT_TEXT_H
 
-#include "iregex.h"
-#include "formats.h"
+#include <irssi/src/core/iregex.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 struct _HILIGHT_REC {
 	char *text;

src/fe-common/core/keyboard.c

@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "commands.h"
-#include "levels.h"
-#include "misc.h"
-#include "lib-config/iconfig.h"
-#include "settings.h"
+#include <irssi/src/fe-common/core/module-formats.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/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include "keyboard.h"
-#include "fe-windows.h"
-#include "printtext.h"
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define MAX_EXPAND_RECURSION 100
 

src/fe-common/core/keyboard.h

@@ -1,7 +1,7 @@
 #ifndef __KEYBOARD_H
 #define __KEYBOARD_H
 
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 typedef struct _KEYBOARD_REC KEYBOARD_REC;
 typedef struct _KEYINFO_REC KEYINFO_REC;

src/fe-common/core/module-formats.c

@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
 	{ MODULE_NAME, "Core", 0 },