Merge pull request #1040 from ailin-nemui/module-paths2

Use full paths to includes

Makefile.am

@@ -21,6 +21,8 @@ SUBDIRS = src tests docs scripts themes utils
 confdir = $(sysconfdir)
 conf_DATA = irssi.conf
 
+pkgconfig_DATA = irssi-1.pc
+
 pkginclude_HEADERS = irssi-config.h irssi-version.h
 
 EXTRA_DIST = \
@@ -28,5 +30,4 @@ EXTRA_DIST = \
 	autogen.sh \
 	README.md \
 	$(conf_DATA) \
-	irssi-config.in \
 	irssi-icon.png

configure.ac

@@ -18,6 +18,8 @@ AM_PROG_LIBTOOL
 AC_PATH_PROG(sedpath, sed)
 AC_PATH_PROG(perlpath, perl)
 
+PKG_INSTALLDIR
+
 AC_CHECK_HEADERS(unistd.h dirent.h sys/ioctl.h sys/resource.h)
 
 # check posix headers..
@@ -762,10 +764,15 @@ docs/help/Makefile
 docs/help/in/Makefile
 utils/Makefile
 themes/Makefile
-irssi-config
+irssi-1.pc
 ])
 
+dnl ** make the paths like include headers later
+AC_CONFIG_LINKS([irssi/irssi-config.h:irssi-config.h])
+AC_LINK_FILES([$srcdir/src],[irssi/src])
+
 AC_OUTPUT
+$LN_S ../irssi-version.h irssi/irssi-version.h
 
 dnl ** for building from objdir
 old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir

irssi-1.pc.in

@@ -0,0 +1,20 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+prog_libs="@PROG_LIBS@"
+common_libs="@COMMON_LIBS@"
+
+perl_link_libs="@PERL_LINK_LIBS@"
+perl_fe_link_libs="@PERL_FE_LINK_LIBS@"
+perl_link_flags="@PERL_LINK_FLAGS@"
+
+chat_modules="@CHAT_MODULES@"
+irc_modules="@irc_MODULES@"
+
+Name: Irssi
+Description: Irssi chat client
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir} @OPENSSL_CFLAGS@
+Requires: glib-2.0

irssi-config.in

@@ -1,9 +0,0 @@
-PROG_LIBS="@PROG_LIBS@"
-COMMON_LIBS="@COMMON_LIBS@"
-
-PERL_LINK_LIBS="@PERL_LINK_LIBS@"
-PERL_FE_LINK_LIBS="@PERL_FE_LINK_LIBS@"
-PERL_LINK_FLAGS="@PERL_LINK_FLAGS@"
-
-CHAT_MODULES="@CHAT_MODULES@"
-irc_MODULES="@irc_MODULES@"

m4/pkg.m4

@@ -0,0 +1,275 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $2])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR

src/common.h

@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef IRSSI_COMMON_H
+#define IRSSI_COMMON_H
 
 #define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
 
@@ -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/args.h

@@ -1,5 +1,5 @@
-#ifndef __ARGS_H
-#define __ARGS_H
+#ifndef IRSSI_CORE_ARGS_H
+#define IRSSI_CORE_ARGS_H
 
 void args_register(GOptionEntry *options);
 void args_execute(int argc, char *argv[]);

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/capsicum.h

@@ -1,5 +1,5 @@
-#ifndef __CAPSICUM_H
-#define __CAPSICUM_H
+#ifndef IRSSI_CORE_CAPSICUM_H
+#define IRSSI_CORE_CAPSICUM_H
 
 gboolean capsicum_enabled(void);
 int capsicum_net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
@@ -12,4 +12,4 @@ void capsicum_mkdir_with_parents_wrapper(const char *path, int mode);
 void capsicum_init(void);
 void capsicum_deinit(void);
 
-#endif /* !__CAPSICUM_H */
+#endif /* !IRSSI_CORE_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
+#ifndef IRSSI_CORE_CHANNELS_SETUP_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_CHANNELS_H
+#define IRSSI_CORE_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/chat-protocols.h

@@ -1,5 +1,5 @@
-#ifndef __CHAT_PROTOCOLS_H
-#define __CHAT_PROTOCOLS_H
+#ifndef IRSSI_CORE_CHAT_PROTOCOLS_H
+#define IRSSI_CORE_CHAT_PROTOCOLS_H
 
 struct _CHAT_PROTOCOL_REC {
 	int id;

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
+#ifndef IRSSI_CORE_CHATNETS_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_COMMANDS_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_CORE_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_EXPANDOS_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_IGNORE_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_IREGEX_H
+#define IRSSI_CORE_IREGEX_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/levels.h

@@ -1,5 +1,5 @@
-#ifndef __LEVELS_H
-#define __LEVELS_H
+#ifndef IRSSI_CORE_LEVELS_H
+#define IRSSI_CORE_LEVELS_H
 
 /* This is pretty much IRC specific, but I think it would be easier for
    other chats to try to use these same levels instead of implementing too

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/line-split.h

@@ -1,5 +1,5 @@
-#ifndef __LINE_SPLIT_H
-#define __LINE_SPLIT_H
+#ifndef IRSSI_CORE_LINE_SPLIT_H
+#define IRSSI_CORE_LINE_SPLIT_H
 
 /* line-split `data'. Initially `*buffer' should contain NULL. */
 int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer);

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/log.h

@@ -1,5 +1,5 @@
-#ifndef __LOG_H
-#define __LOG_H
+#ifndef IRSSI_CORE_LOG_H
+#define IRSSI_CORE_LOG_H
 
 enum {
 	LOG_ITEM_TARGET, /* channel, query, .. */

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/masks.h

@@ -1,5 +1,5 @@
-#ifndef __MASKS_H
-#define __MASKS_H
+#ifndef IRSSI_CORE_MASKS_H
+#define IRSSI_CORE_MASKS_H
 
 int mask_match(SERVER_REC *server, const char *mask,
 	       const char *nick, const char *user, const char *host);

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/misc.h

@@ -1,5 +1,5 @@
-#ifndef __MISC_H
-#define __MISC_H
+#ifndef IRSSI_CORE_MISC_H
+#define IRSSI_CORE_MISC_H
 
 int g_input_add_poll(int fd, int priority, int condition,
 		     GInputFunction function, void *data);

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
+#ifndef IRSSI_CORE_MODULES_LOAD_H
+#define IRSSI_CORE_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/modules.h

@@ -1,5 +1,5 @@
-#ifndef __MODULES_H
-#define __MODULES_H
+#ifndef IRSSI_CORE_MODULES_H
+#define IRSSI_CORE_MODULES_H
 
 #define MODULE_DATA_INIT(rec) \
         (rec)->module_data = g_hash_table_new(g_str_hash, g_str_equal)

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-disconnect.h

@@ -1,5 +1,5 @@
-#ifndef __NET_DISCONNECT_H
-#define __NET_DISCONNECT_H
+#ifndef IRSSI_CORE_NET_DISCONNECT_H
+#define IRSSI_CORE_NET_DISCONNECT_H
 
 /* Try to let the other side close the connection, if it still isn't
    disconnected after certain amount of time, close it ourself */

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
+#ifndef IRSSI_CORE_NET_NONBLOCK_H
+#define IRSSI_CORE_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/net-sendbuffer.h

@@ -1,5 +1,5 @@
-#ifndef __NET_SENDBUFFER_H
-#define __NET_SENDBUFFER_H
+#ifndef IRSSI_CORE_NET_SENDBUFFER_H
+#define IRSSI_CORE_NET_SENDBUFFER_H
 
 #define DEFAULT_BUFFER_SIZE 8192
 #define MAX_BUFFER_SIZE 1048576

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-openssl.h

@@ -1,6 +1,6 @@
-#ifndef __NETWORK_OPENSSL_H
-#define __NETWORK_OPENSSL_H
+#ifndef IRSSI_CORE_NETWORK_OPENSSL_H
+#define IRSSI_CORE_NETWORK_OPENSSL_H
 
 gboolean irssi_ssl_init(void);
 
-#endif /* !__NETWORK_OPENSSL_H */
+#endif /* !IRSSI_CORE_NETWORK_OPENSSL_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/network.h

@@ -1,5 +1,5 @@
-#ifndef __NETWORK_H
-#define __NETWORK_H
+#ifndef IRSSI_CORE_NETWORK_H
+#define IRSSI_CORE_NETWORK_H
 
 #ifdef HAVE_SOCKS_H
 #include <socks.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

@@ -1,5 +1,5 @@
-#ifndef __NICKLIST_H
-#define __NICKLIST_H
+#ifndef IRSSI_CORE_NICKLIST_H
+#define IRSSI_CORE_NICKLIST_H
 
 /* Returns NICK_REC if it's nick, NULL if it isn't. */
 #define NICK(server) \
@@ -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/nickmatch-cache.h

@@ -1,5 +1,5 @@
-#ifndef __NICKMATCH_CACHE_H
-#define __NICKMATCH_CACHE_H
+#ifndef IRSSI_CORE_NICKMATCH_CACHE_H
+#define IRSSI_CORE_NICKMATCH_CACHE_H
 
 typedef void (*NICKMATCH_REBUILD_FUNC) (GHashTable *list,
 					CHANNEL_REC *channel, NICK_REC *nick);

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/pidwait.h

@@ -1,5 +1,5 @@
-#ifndef __PIDWAIT_H
-#define __PIDWAIT_H
+#ifndef IRSSI_CORE_PIDWAIT_H
+#define IRSSI_CORE_PIDWAIT_H
 
 void pidwait_init(void);
 void pidwait_deinit(void);

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
+#ifndef IRSSI_CORE_QUERIES_H
+#define IRSSI_CORE_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/rawlog.h

@@ -1,5 +1,5 @@
-#ifndef __RAWLOG_H
-#define __RAWLOG_H
+#ifndef IRSSI_CORE_RAWLOG_H
+#define IRSSI_CORE_RAWLOG_H
 
 struct _RAWLOG_REC {
 	int logging;

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/recode.h

@@ -1,5 +1,5 @@
-#ifndef __RECODE_H
-#define __RECODE_H
+#ifndef IRSSI_CORE_RECODE_H
+#define IRSSI_CORE_RECODE_H
 
 char *recode_in (const SERVER_REC *server, const char *str, const char *target);
 char *recode_out (const SERVER_REC *server, const char *str, const char *target);
@@ -12,4 +12,4 @@ void recode_update_charset(void);
 void recode_init (void);
 void recode_deinit (void);
 
-#endif /* __RECODE_H */
+#endif /* IRSSI_CORE_RECODE_H */

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-reconnect.h

@@ -1,5 +1,5 @@
-#ifndef __SERVER_RECONNECT_H
-#define __SERVER_RECONNECT_H
+#ifndef IRSSI_CORE_SERVERS_RECONNECT_H
+#define IRSSI_CORE_SERVERS_RECONNECT_H
 
 /* wait for half an hour before trying to reconnect to host where last
    connection failed */

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
+#ifndef IRSSI_CORE_SERVERS_SETUP_H
+#define IRSSI_CORE_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
+#ifndef IRSSI_CORE_SERVERS_H
+#define IRSSI_CORE_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/session.h

@@ -1,5 +1,5 @@
-#ifndef __SESSION_H
-#define __SESSION_H
+#ifndef IRSSI_CORE_SESSION_H
+#define IRSSI_CORE_SESSION_H
 
 extern char *irssi_binary;
 

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/settings.h

@@ -1,5 +1,5 @@
-#ifndef __SETTINGS_H
-#define __SETTINGS_H
+#ifndef IRSSI_CORE_SETTINGS_H
+#define IRSSI_CORE_SETTINGS_H
 
 typedef enum {
 	SETTING_TYPE_STRING,

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/signals.h

@@ -1,5 +1,5 @@
-#ifndef __SIGNAL_H
-#define __SIGNAL_H
+#ifndef IRSSI_CORE_SIGNALS_H
+#define IRSSI_CORE_SIGNALS_H
 
 #define SIGNAL_PRIORITY_LOW    	100
 #define SIGNAL_PRIORITY_DEFAULT	0

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
+#ifndef IRSSI_CORE_SPECIAL_VARS_H
+#define IRSSI_CORE_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/tls.h

@@ -16,8 +16,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#ifndef __TLS_H
-#define __TLS_H
+#ifndef IRSSI_CORE_TLS_H
+#define IRSSI_CORE_TLS_H
 
 #include <openssl/ssl.h>
 

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/utf8.h

@@ -1,5 +1,5 @@
-#ifndef __UTF8_H
-#define __UTF8_H
+#ifndef IRSSI_CORE_UTF8_H
+#define IRSSI_CORE_UTF8_H
 
 /* XXX I didn't check the encoding range of big5+. This is standard big5. */
 #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */

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

@@ -1,9 +1,9 @@
-#ifndef __WINDOW_ITEM_DEF_H
-#define __WINDOW_ITEM_DEF_H
+#ifndef IRSSI_CORE_WINDOW_ITEM_DEF_H
+#define IRSSI_CORE_WINDOW_ITEM_DEF_H
 
 #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/core/write-buffer.h

@@ -1,5 +1,5 @@
-#ifndef __WRITE_BUFFER_H
-#define __WRITE_BUFFER_H
+#ifndef IRSSI_CORE_WRITE_BUFFER_H
+#define IRSSI_CORE_WRITE_BUFFER_H
 
 int write_buffer(int handle, const void *data, int size);
 void write_buffer_flush(void);

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/chat-completion.h

@@ -1,5 +1,5 @@
-#ifndef __CHAT_COMPLETION_H
-#define __CHAT_COMPLETION_H
+#ifndef IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H
+#define IRSSI_FE_COMMON_CORE_CHAT_COMPLETION_H
 
 GList *completion_get_chatnets(const char *word);
 GList *completion_get_servers(const char *word);

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
+#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
+#define IRSSI_FE_COMMON_CORE_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;