From 7bb2ee96ca8eda85aeac054e9986e00d0bfbd29b Mon Sep 17 00:00:00 2001
From: kofany <j@dabrowski.biz>
Date: Fri, 22 Aug 2025 20:24:12 +0200
Subject: [PATCH] =?UTF-8?q?Zmiana=20irssi=20->=20irssip=20dla=20bezkonflik?=
 =?UTF-8?q?towych=20test=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Zmiana incdir z 'irssi' na 'irssip' w meson.build
- Zmiana nazwy binarja z 'irssi' na 'irssip'
- Zmiana katalogu config z ~/.irssi na ~/.irssip
- Aktualizacja wszystkich include paths z <irssi/> na <irssip/>
- Przywrócenie nazw plików źródłowych do oryginalnych 'irssi*'

Teraz może być instalowane w /opt/irssip bez konfliktów z systemowym irssi:
- Binarka: /opt/irssip/bin/irssip
- Konfiguracja: ~/.irssip/
- Moduły Perl: /opt/irssip/lib/irssip/perl/Irssi.pm
- Separacja modułów: systemowy irssi nie znajdzie naszych modułów w @INC
---
 meson.build                                   |  2 +-
 src/common.h                                  |  4 +-
 src/core/args.c                               |  2 +-
 src/core/capsicum.c                           | 16 +++---
 src/core/channel-rec.h                        |  2 +-
 src/core/channels-setup.c                     | 14 +++---
 src/core/channels-setup.h                     |  4 +-
 src/core/channels.c                           | 14 +++---
 src/core/channels.h                           |  4 +-
 src/core/chat-commands.c                      | 28 +++++------
 src/core/chat-protocols.c                     | 14 +++---
 src/core/chatnets.c                           | 18 +++----
 src/core/chatnets.h                           |  4 +-
 src/core/commands.c                           | 18 +++----
 src/core/commands.h                           |  2 +-
 src/core/core.c                               | 48 +++++++++---------
 src/core/core.h                               |  2 +-
 src/core/expandos.c                           | 24 ++++-----
 src/core/expandos.h                           |  2 +-
 src/core/ignore.c                             | 24 ++++-----
 src/core/ignore.h                             |  2 +-
 src/core/iregex-gregex.c                      |  2 +-
 src/core/iregex.h                             |  2 +-
 src/core/levels.c                             |  4 +-
 src/core/line-split.c                         |  2 +-
 src/core/log-away.c                           | 12 ++---
 src/core/log.c                                | 20 ++++----
 src/core/masks.c                              |  6 +--
 src/core/misc.c                               |  4 +-
 src/core/module.h                             |  2 +-
 src/core/modules-load.c                       | 12 ++---
 src/core/modules-load.h                       |  2 +-
 src/core/modules.c                            |  4 +-
 src/core/net-disconnect.c                     |  2 +-
 src/core/net-nonblock.c                       |  4 +-
 src/core/net-nonblock.h                       |  2 +-
 src/core/net-sendbuffer.c                     |  6 +--
 src/core/network-openssl.c                    | 14 +++---
 src/core/network.c                            |  4 +-
 src/core/nicklist.c                           | 12 ++---
 src/core/nicklist.h                           |  2 +-
 src/core/nickmatch-cache.c                    |  8 +--
 src/core/pidwait.c                            |  4 +-
 src/core/queries.c                            |  8 +--
 src/core/queries.h                            |  4 +-
 src/core/query-rec.h                          |  2 +-
 src/core/rawlog.c                             | 20 ++++----
 src/core/recode.c                             | 10 ++--
 src/core/refstrings.c                         |  2 +-
 src/core/servers-reconnect.c                  | 16 +++---
 src/core/servers-setup.c                      | 16 +++---
 src/core/servers-setup.h                      |  4 +-
 src/core/servers.c                            | 30 +++++------
 src/core/servers.h                            |  6 +--
 src/core/session.c                            | 26 +++++-----
 src/core/settings.c                           | 14 +++---
 src/core/signals.c                            |  4 +-
 src/core/special-vars.c                       | 16 +++---
 src/core/special-vars.h                       |  2 +-
 src/core/tls.c                                |  2 +-
 src/core/utf8.c                               |  4 +-
 src/core/wcwidth-wrapper.c                    |  6 +--
 src/core/wcwidth.c                            |  2 +-
 src/core/window-item-def.h                    |  2 +-
 src/core/write-buffer.c                       |  8 +--
 src/fe-common/core/chat-completion.c          | 32 ++++++------
 src/fe-common/core/command-history.c          | 14 +++---
 src/fe-common/core/command-history.h          |  2 +-
 src/fe-common/core/completion.c               | 18 +++----
 src/fe-common/core/completion.h               |  2 +-
 src/fe-common/core/fe-capsicum.c              | 10 ++--
 src/fe-common/core/fe-channels.c              | 38 +++++++-------
 src/fe-common/core/fe-common-core.c           | 50 +++++++++----------
 src/fe-common/core/fe-core-commands.c         | 24 ++++-----
 src/fe-common/core/fe-exec.c                  | 32 ++++++------
 src/fe-common/core/fe-exec.h                  |  4 +-
 src/fe-common/core/fe-expandos.c              |  4 +-
 src/fe-common/core/fe-help.c                  | 14 +++---
 src/fe-common/core/fe-ignore-messages.c       |  8 +--
 src/fe-common/core/fe-ignore.c                | 16 +++---
 src/fe-common/core/fe-log.c                   | 40 +++++++--------
 src/fe-common/core/fe-messages.c              | 30 +++++------
 src/fe-common/core/fe-modules.c               | 16 +++---
 src/fe-common/core/fe-queries.c               | 26 +++++-----
 src/fe-common/core/fe-queries.h               |  2 +-
 src/fe-common/core/fe-recode.c                | 18 +++----
 src/fe-common/core/fe-server.c                | 24 ++++-----
 src/fe-common/core/fe-settings.c              | 22 ++++----
 src/fe-common/core/fe-tls.c                   | 14 +++---
 src/fe-common/core/fe-windows.c               | 22 ++++----
 src/fe-common/core/fe-windows.h               |  4 +-
 src/fe-common/core/formats.c                  | 28 +++++------
 src/fe-common/core/formats.h                  |  6 +--
 src/fe-common/core/hilight-text.c             | 30 +++++------
 src/fe-common/core/hilight-text.h             |  4 +-
 src/fe-common/core/keyboard.c                 | 20 ++++----
 src/fe-common/core/keyboard.h                 |  2 +-
 src/fe-common/core/module-formats.c           |  2 +-
 src/fe-common/core/module-formats.h           |  2 +-
 src/fe-common/core/module.h                   |  4 +-
 src/fe-common/core/printtext.c                | 22 ++++----
 src/fe-common/core/printtext.h                |  4 +-
 src/fe-common/core/themes.c                   | 20 ++++----
 src/fe-common/core/window-activity.c          | 24 ++++-----
 src/fe-common/core/window-commands.c          | 26 +++++-----
 src/fe-common/core/window-items.c             | 20 ++++----
 src/fe-common/core/window-items.h             |  2 +-
 src/fe-common/core/windows-layout.c           | 28 +++++------
 src/fe-common/irc/dcc/fe-dcc-chat-messages.c  | 16 +++---
 src/fe-common/irc/dcc/fe-dcc-chat.c           | 26 +++++-----
 src/fe-common/irc/dcc/fe-dcc-get.c            | 18 +++----
 src/fe-common/irc/dcc/fe-dcc-send.c           | 22 ++++----
 src/fe-common/irc/dcc/fe-dcc-server.c         | 16 +++---
 src/fe-common/irc/dcc/fe-dcc.c                | 24 ++++-----
 src/fe-common/irc/dcc/module-formats.c        |  2 +-
 src/fe-common/irc/dcc/module-formats.h        |  2 +-
 src/fe-common/irc/dcc/module.h                |  4 +-
 src/fe-common/irc/fe-cap.c                    | 12 ++---
 src/fe-common/irc/fe-common-irc.c             | 18 +++----
 src/fe-common/irc/fe-ctcp.c                   | 22 ++++----
 src/fe-common/irc/fe-events-numeric.c         | 30 +++++------
 src/fe-common/irc/fe-events.c                 | 40 +++++++--------
 src/fe-common/irc/fe-irc-channels.c           | 18 +++----
 src/fe-common/irc/fe-irc-commands.c           | 38 +++++++-------
 src/fe-common/irc/fe-irc-messages.c           | 34 ++++++-------
 src/fe-common/irc/fe-irc-queries.c            | 16 +++---
 src/fe-common/irc/fe-irc-server.c             | 26 +++++-----
 src/fe-common/irc/fe-ircnet.c                 | 22 ++++----
 src/fe-common/irc/fe-modes.c                  | 20 ++++----
 src/fe-common/irc/fe-netjoin.c                | 20 ++++----
 src/fe-common/irc/fe-netsplit.c               | 18 +++----
 src/fe-common/irc/fe-sasl.c                   | 16 +++---
 src/fe-common/irc/fe-whois.c                  | 16 +++---
 src/fe-common/irc/irc-completion.c            |  4 +-
 src/fe-common/irc/module-formats.c            |  2 +-
 src/fe-common/irc/module-formats.h            |  2 +-
 src/fe-common/irc/module.h                    |  4 +-
 src/fe-common/irc/notifylist/fe-notifylist.c  | 26 +++++-----
 src/fe-common/irc/notifylist/module-formats.c |  2 +-
 src/fe-common/irc/notifylist/module-formats.h |  2 +-
 src/fe-common/irc/notifylist/module.h         |  4 +-
 src/fe-fuzz/fe-common/core/theme-load.c       | 24 ++++-----
 src/fe-fuzz/irc/core/event-get-params.c       | 22 ++++----
 src/fe-fuzz/irssi.c                           | 20 ++++----
 src/fe-fuzz/null-logger.c                     |  2 +-
 src/fe-fuzz/server.c                          | 36 ++++++-------
 src/fe-none/irssi.c                           | 12 ++---
 src/fe-none/module.h                          |  2 +-
 src/fe-text/gui-entry.c                       | 16 +++---
 src/fe-text/gui-expandos.c                    |  6 +--
 src/fe-text/gui-printtext.c                   | 18 +++----
 src/fe-text/gui-printtext.h                   |  6 +--
 src/fe-text/gui-readline.c                    | 32 ++++++------
 src/fe-text/gui-windows.c                     | 18 +++----
 src/fe-text/gui-windows.h                     |  4 +-
 src/fe-text/irssi.c                           | 44 ++++++++--------
 src/fe-text/lastlog.c                         | 18 +++----
 src/fe-text/mainwindow-activity.c             |  6 +--
 src/fe-text/mainwindows-layout.c              | 16 +++---
 src/fe-text/mainwindows.c                     | 18 +++----
 src/fe-text/mainwindows.h                     |  4 +-
 src/fe-text/meson.build                       |  2 +-
 src/fe-text/module-formats.c                  |  2 +-
 src/fe-text/module-formats.h                  |  2 +-
 src/fe-text/module.h                          |  4 +-
 src/fe-text/sidepanels.c                      | 34 ++++++-------
 src/fe-text/sidepanels.h                      |  2 +-
 src/fe-text/statusbar-config.c                | 18 +++----
 src/fe-text/statusbar-config.h                |  2 +-
 src/fe-text/statusbar-items.c                 | 14 +++---
 src/fe-text/statusbar.c                       | 16 +++---
 src/fe-text/statusbar.h                       |  4 +-
 src/fe-text/term-terminfo.c                   | 12 ++---
 src/fe-text/term.c                            | 10 ++--
 src/fe-text/term.h                            |  2 +-
 src/fe-text/terminfo-core.c                   |  6 +--
 src/fe-text/textbuffer-commands.c             | 22 ++++----
 src/fe-text/textbuffer-formats.c              | 28 +++++------
 src/fe-text/textbuffer-formats.h              |  4 +-
 src/fe-text/textbuffer-view.c                 | 12 ++---
 src/fe-text/textbuffer-view.h                 |  4 +-
 src/fe-text/textbuffer.c                      | 12 ++---
 src/irc/core/bans.c                           | 20 ++++----
 src/irc/core/channel-events.c                 | 16 +++---
 src/irc/core/channel-events.h                 |  2 +-
 src/irc/core/channel-rejoin.c                 | 14 +++---
 src/irc/core/channels-query.c                 | 18 +++----
 src/irc/core/ctcp.c                           | 18 +++----
 src/irc/core/irc-cap.c                        |  8 +--
 src/irc/core/irc-channels-setup.c             |  4 +-
 src/irc/core/irc-channels.c                   | 22 ++++----
 src/irc/core/irc-channels.h                   |  6 +--
 src/irc/core/irc-chatnets.c                   |  8 +--
 src/irc/core/irc-chatnets.h                   |  6 +--
 src/irc/core/irc-commands.c                   | 28 +++++------
 src/irc/core/irc-commands.h                   |  2 +-
 src/irc/core/irc-core.c                       | 26 +++++-----
 src/irc/core/irc-expandos.c                   | 12 ++---
 src/irc/core/irc-masks.c                      |  4 +-
 src/irc/core/irc-masks.h                      |  2 +-
 src/irc/core/irc-nicklist.c                   | 16 +++---
 src/irc/core/irc-nicklist.h                   |  2 +-
 src/irc/core/irc-queries.c                    | 10 ++--
 src/irc/core/irc-queries.h                    |  4 +-
 src/irc/core/irc-servers-reconnect.c          | 12 ++---
 src/irc/core/irc-servers-setup.c              | 18 +++----
 src/irc/core/irc-servers-setup.h              |  6 +--
 src/irc/core/irc-servers.c                    | 44 ++++++++--------
 src/irc/core/irc-servers.h                    | 12 ++---
 src/irc/core/irc-session.c                    | 20 ++++----
 src/irc/core/irc.c                            | 18 +++----
 src/irc/core/irc.h                            |  2 +-
 src/irc/core/lag.c                            | 10 ++--
 src/irc/core/massjoin.c                       | 10 ++--
 src/irc/core/mode-lists.c                     | 10 ++--
 src/irc/core/modes.c                          | 20 ++++----
 src/irc/core/modes.h                          |  4 +-
 src/irc/core/module.h                         |  4 +-
 src/irc/core/netsplit.c                       | 12 ++---
 src/irc/core/netsplit.h                       |  2 +-
 src/irc/core/sasl.c                           | 10 ++--
 src/irc/core/scram.c                          |  2 +-
 src/irc/core/servers-idle.c                   |  8 +--
 src/irc/core/servers-redirect.c               | 10 ++--
 src/irc/dcc/dcc-autoget.c                     | 12 ++---
 src/irc/dcc/dcc-chat.c                        | 22 ++++----
 src/irc/dcc/dcc-chat.h                        |  4 +-
 src/irc/dcc/dcc-file-rec.h                    |  2 +-
 src/irc/dcc/dcc-file.h                        |  4 +-
 src/irc/dcc/dcc-get.c                         | 18 +++----
 src/irc/dcc/dcc-get.h                         |  4 +-
 src/irc/dcc/dcc-queue.c                       | 16 +++---
 src/irc/dcc/dcc-queue.h                       |  2 +-
 src/irc/dcc/dcc-resume.c                      | 16 +++---
 src/irc/dcc/dcc-send.c                        | 20 ++++----
 src/irc/dcc/dcc-send.h                        |  4 +-
 src/irc/dcc/dcc-server.c                      | 18 +++----
 src/irc/dcc/dcc-server.h                      |  4 +-
 src/irc/dcc/dcc.c                             | 26 +++++-----
 src/irc/dcc/dcc.h                             |  6 +--
 src/irc/dcc/module.h                          |  4 +-
 src/irc/flood/autoignore.c                    | 16 +++---
 src/irc/flood/flood.c                         | 16 +++---
 src/irc/flood/module.h                        |  4 +-
 src/irc/notifylist/module.h                   |  6 +--
 src/irc/notifylist/notify-commands.c          | 10 ++--
 src/irc/notifylist/notify-ison.c              | 14 +++---
 src/irc/notifylist/notify-setup.c             |  8 +--
 src/irc/notifylist/notify-whois.c             | 12 ++---
 src/irc/notifylist/notifylist.c               | 20 ++++----
 src/irc/proxy/dump.c                          | 18 +++----
 src/irc/proxy/listen.c                        | 20 ++++----
 src/irc/proxy/module.h                        | 10 ++--
 src/irc/proxy/proxy.c                         |  8 +--
 src/irc/proxy/proxy.h                         |  8 +--
 src/lib-config/module.h                       |  4 +-
 src/otr/key.c                                 | 14 +++---
 src/otr/key.h                                 |  6 +--
 src/otr/module.h                              |  4 +-
 src/otr/otr-fe.c                              | 22 ++++----
 src/otr/otr-formats.c                         |  4 +-
 src/otr/otr-formats.h                         |  2 +-
 src/otr/otr-module.c                          | 26 +++++-----
 src/otr/otr-ops.c                             | 16 +++---
 src/otr/otr.c                                 | 16 +++---
 src/otr/otr.h                                 |  4 +-
 src/perl/common/Core.xs                       | 12 ++---
 src/perl/common/Expando.xs                    |  2 +-
 src/perl/common/Settings.xs                   |  2 +-
 src/perl/common/module.h                      | 46 ++++++++---------
 src/perl/irc/Ctcp.xs                          |  2 +-
 src/perl/irc/Server.xs                        |  2 +-
 src/perl/irc/module.h                         | 42 ++++++++--------
 src/perl/module-formats.c                     |  2 +-
 src/perl/module-formats.h                     |  2 +-
 src/perl/module.h                             |  2 +-
 src/perl/perl-common.c                        | 38 +++++++-------
 src/perl/perl-core.c                          | 18 +++----
 src/perl/perl-fe.c                            | 18 +++----
 src/perl/perl-signals.c                       | 16 +++---
 src/perl/perl-sources.c                       | 10 ++--
 src/perl/textui/TextBuffer.xs                 |  2 +-
 src/perl/textui/module.h                      | 16 +++---
 src/perl/ui/Window.xs                         |  2 +-
 src/perl/ui/module.h                          | 16 +++---
 tests/fe-common/core/test-formats.c           |  4 +-
 tests/fe-text/test-paste-join-multiline.c     |  4 +-
 tests/irc/core/test-channel-events.c          | 22 ++++----
 tests/irc/core/test-irc.c                     |  2 +-
 tests/irc/flood/test-796.c                    | 20 ++++----
 290 files changed, 1822 insertions(+), 1822 deletions(-)

diff --git a/meson.build b/meson.build
index f2550641..e27260aa 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ if host_machine.system() == 'android'
 endif
 
 includedir          = get_option('includedir')
-incdir              = 'irssi'
+incdir              = 'irssip'
 moduledir           = get_option('libdir') / incdir / 'modules'
 helpdir             = get_option('datadir') / incdir / 'help'
 themedir            = get_option('datadir') / incdir / 'themes'
diff --git a/src/common.h b/src/common.h
index e514f279..d2cb0964 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_COMMON_H
 #define IRSSI_COMMON_H
 
-#define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */
+#define IRSSI_DIR_FULL "%s/.irssip" /* %s == g_get_home_dir() */
 
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
@@ -11,7 +11,7 @@
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
 
-#include <irssi/irssi-config.h>
+#include <irssip/irssi-config.h>
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/src/core/args.c b/src/core/args.c
index 5e2b1412..89aeed3c 100644
--- a/src/core/args.c
+++ b/src/core/args.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/args.h>
+#include <irssip/src/core/args.h>
 
 static GOptionContext *context = NULL;
 
diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index d73d15fb..5985d9c1 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -23,14 +23,14 @@
 */
 
 #include "module.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 <irssip/src/core/capsicum.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/network-openssl.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
diff --git a/src/core/channel-rec.h b/src/core/channel-rec.h
index f1e30fa0..61e4492d 100644
--- a/src/core/channel-rec.h
+++ b/src/core/channel-rec.h
@@ -1,6 +1,6 @@
 /* CHANNEL_REC definition, used for inheritance */
 
-#include <irssi/src/core/window-item-rec.h>
+#include <irssip/src/core/window-item-rec.h>
 
 char *topic;
 char *topic_by;
diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c
index 5e2930ad..6198bfee 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.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>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels-setup.h>
 
 GSList *setupchannels;
 
diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h
index c0297aec..ac37008f 100644
--- a/src/core/channels-setup.h
+++ b/src/core/channels-setup.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_CHANNELS_SETUP_H
 #define IRSSI_CORE_CHANNELS_SETUP_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/channel-setup-rec.h>
+#include <irssip/src/core/channel-setup-rec.h>
 };
 
 extern GSList *setupchannels;
diff --git a/src/core/channels.c b/src/core/channels.c
index 68209a7c..6e321d59 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/special-vars.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.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 <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/channels-setup.h>
+#include <irssip/src/core/nicklist.h>
 
 GSList *channels; /* List of all channels */
 
diff --git a/src/core/channels.h b/src/core/channels.h
index 197d2254..c758c0e2 100644
--- a/src/core/channels.h
+++ b/src/core/channels.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_CHANNELS_H
 #define IRSSI_CORE_CHANNELS_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/channel-rec.h>
+#include <irssip/src/core/channel-rec.h>
 };
 
 extern GSList *channels;
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 10da0d2c..2da54cef 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.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 <irssip/src/core/network.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.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/chatnets.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/window-item-def.h>
-#include <irssi/src/core/rawlog.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/window-item-def.h>
+#include <irssip/src/core/rawlog.h>
 
 static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
 					      char **rawlog_file)
diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c
index 1a6ecbb3..d71fe19a 100644
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/chat-protocols.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/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/channels-setup.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels-setup.h>
 
 GSList *chat_protocols;
 
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index 770c7595..bdf940ca 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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 <irssi/src/core/misc.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/chatnets.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
 
 GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */
 
diff --git a/src/core/chatnets.h b/src/core/chatnets.h
index accdd0ad..49d76802 100644
--- a/src/core/chatnets.h
+++ b/src/core/chatnets.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_CHATNETS_H
 #define IRSSI_CORE_CHATNETS_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/chatnet-rec.h>
+#include <irssip/src/core/chatnet-rec.h>
 };
 
 extern GSList *chatnets; /* list of available chat networks */
diff --git a/src/core/commands.c b/src/core/commands.c
index deb5fe90..0288ef9d 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/window-item-def.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
 
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
 GSList *commands;
 char *current_command;
diff --git a/src/core/commands.h b/src/core/commands.h
index 7c6bd87b..abc31afb 100644
--- a/src/core/commands.h
+++ b/src/core/commands.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_COMMANDS_H
 #define IRSSI_CORE_COMMANDS_H
 
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
 typedef struct {
 	SIGNAL_FUNC func;
diff --git a/src/core/core.c b/src/core/core.c
index 5d72ca0a..b25911d0 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -21,35 +21,35 @@
 #include "module.h"
 #include <signal.h>
 
-#include <irssi/src/core/args.h>
-#include <irssi/src/core/pidwait.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/src/core/misc.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>
+#include <irssip/src/core/net-disconnect.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/session.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/chatnets.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/log.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/recode.h>
-#include <irssi/src/core/refstrings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/write-buffer.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/refstrings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/write-buffer.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>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/core/nickmatch-cache.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
diff --git a/src/core/core.h b/src/core/core.h
index 62c54b22..c0e78205 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_CORE_H
 #define IRSSI_CORE_CORE_H
 
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 /* for determining what GUI is currently in use: */
 #define IRSSI_GUI_NONE	0
diff --git a/src/core/expandos.c b/src/core/expandos.c
index 0f317e51..9e5a3895 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -18,20 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/core/core.h>
+#include <irssip/src/core/core.h>
 #include "module.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 <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/irssi-version.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>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/window-item-def.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
 #  include <sys/utsname.h>
diff --git a/src/core/expandos.h b/src/core/expandos.h
index 17cee608..443869c8 100644
--- a/src/core/expandos.h
+++ b/src/core/expandos.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_EXPANDOS_H
 #define IRSSI_CORE_EXPANDOS_H
 
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
 /* first argument of signal must match to active .. */
 typedef enum {
diff --git a/src/core/ignore.c b/src/core/ignore.c
index da892c1e..f10d53c0 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/iregex.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 <irssip/src/core/masks.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/core/nickmatch-cache.h>
 
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/core/ignore.h>
 
 GSList *ignores;
 
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 739514a9..1b203d74 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_IGNORE_H
 #define IRSSI_CORE_IGNORE_H
 
-#include <irssi/src/core/iregex.h>
+#include <irssip/src/core/iregex.h>
 
 typedef struct _IGNORE_REC IGNORE_REC;
 
diff --git a/src/core/iregex-gregex.c b/src/core/iregex-gregex.c
index 60b4ec58..0ceb91c8 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <irssi/src/core/iregex.h>
+#include <irssip/src/core/iregex.h>
 
 struct _MatchInfo {
 	const char *valid_string;
diff --git a/src/core/iregex.h b/src/core/iregex.h
index 68156e02..7f044b18 100644
--- a/src/core/iregex.h
+++ b/src/core/iregex.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_IREGEX_H
 #define IRSSI_CORE_IREGEX_H
 
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #include <glib.h>
 typedef	GRegex Regex;
diff --git a/src/core/levels.c b/src/core/levels.c
index 0cd99b10..f66b7002 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
 
 /* the order of these levels must match the bits in levels.h */
 static const char *levels[] = {
diff --git a/src/core/line-split.c b/src/core/line-split.c
index b1e67914..604e6ad3 100644
--- a/src/core/line-split.c
+++ b/src/core/line-split.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/misc.h>
 
 /* Maximum line length - split to two lines if it's longer than this.
 
diff --git a/src/core/log-away.c b/src/core/log-away.c
index d6dac4d9..cacf5f0e 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/write-buffer.h>
 
 static LOG_REC *awaylog;
 static int away_filepos;
diff --git a/src/core/log.c b/src/core/log.c
index 5bc953a1..d607f20e 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/write-buffer.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
 #define DEFAULT_LOG_FILE_CREATE_MODE 600
 
diff --git a/src/core/masks.c b/src/core/masks.c
index a84ac44d..bdf0dfb8 100644
--- a/src/core/masks.c
+++ b/src/core/masks.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/servers.h>
 
 /* Returns TRUE if mask contains '!' ie. address should be checked too.
    Also checks if mask contained any wildcards. */
diff --git a/src/core/misc.c b/src/core/misc.c
index 9ee549a1..60e95b45 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/commands.h>
 
 typedef struct {
 	int condition;
diff --git a/src/core/module.h b/src/core/module.h
index 639e7e29..bf746ce6 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -1,3 +1,3 @@
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #define MODULE_NAME "core"
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index 11c4dd6b..bb929a54 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
 
 /* Returns the module name without path, "lib" prefix or ".so" suffix */
 static char *module_get_name(const char *path, int *start, int *end)
diff --git a/src/core/modules-load.h b/src/core/modules-load.h
index a99bcdfe..06538689 100644
--- a/src/core/modules-load.h
+++ b/src/core/modules-load.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_MODULES_LOAD_H
 #define IRSSI_CORE_MODULES_LOAD_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/src/core/modules.h>
 
 /* Load module - automatically tries to load also the related non-core
    modules given in `prefixes' (like irc, fe, fe_text, ..) */
diff --git a/src/core/modules.c b/src/core/modules.c
index 38c33dea..84a48adb 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
 
 GSList *modules;
 
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 2ed3a421..28de213a 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/network.h>
 
 #include <sys/select.h>
 
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 643884ee..0c6673de 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -22,8 +22,8 @@
 
 #include <signal.h>
 
-#include <irssi/src/core/pidwait.h>
-#include <irssi/src/core/net-nonblock.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/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 */
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index c93dd9e3..00708633 100644
--- a/src/core/net-nonblock.h
+++ b/src/core/net-nonblock.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_NET_NONBLOCK_H
 #define IRSSI_CORE_NET_NONBLOCK_H
 
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/network.h>
 
 typedef struct {
 	IPADDR ip4, ip6; /* resolved ip addresses */
diff --git a/src/core/net-sendbuffer.c b/src/core/net-sendbuffer.c
index 0cb462a1..7d2dba62 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -20,9 +20,9 @@
 
 #include "module.h"
 
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/line-split.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/line-split.h>
 
 /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
    is used */
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 5104e7dd..6ba37767 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.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 <irssip/src/core/network.h>
+#include <irssip/src/core/network-openssl.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/tls.h>
 
 #include <openssl/crypto.h>
 #include <openssl/objects.h>
diff --git a/src/core/network.c b/src/core/network.c
index fa70d62a..48425135 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/network.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
 #include <sys/un.h>
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 34c4b24b..4a94c0cd 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.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>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/core/masks.h>
 
 #define isalnumhigh(a) \
         (i_isalnum(a) || (unsigned char) (a) >= 128)
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 7999be0a..42fdf487 100644
--- a/src/core/nicklist.h
+++ b/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 <irssi/src/core/nick-rec.h>
+#include <irssip/src/core/nick-rec.h>
 };
 
 /* Add new nick to list */
diff --git a/src/core/nickmatch-cache.c b/src/core/nickmatch-cache.c
index c8fc1157..4bb7889d 100644
--- a/src/core/nickmatch-cache.c
+++ b/src/core/nickmatch-cache.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.h>
 
-#include <irssi/src/core/nickmatch-cache.h>
+#include <irssip/src/core/nickmatch-cache.h>
 
 static GSList *lists;
 
diff --git a/src/core/pidwait.c b/src/core/pidwait.c
index f421c1d6..d7b7a2a2 100644
--- a/src/core/pidwait.c
+++ b/src/core/pidwait.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/modules.h>
 
 static GHashTable *child_pids;
 static GSList *pids;
diff --git a/src/core/queries.c b/src/core/queries.c
index fe86271f..6c7a080f 100644
--- a/src/core/queries.c
+++ b/src/core/queries.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/queries.h>
 
 GSList *queries;
 
diff --git a/src/core/queries.h b/src/core/queries.h
index c6170361..a0e8ea7b 100644
--- a/src/core/queries.h
+++ b/src/core/queries.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_QUERIES_H
 #define IRSSI_CORE_QUERIES_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/query-rec.h>
+#include <irssip/src/core/query-rec.h>
 };
 
 extern GSList *queries;
diff --git a/src/core/query-rec.h b/src/core/query-rec.h
index cc15c9ec..43cd1bc2 100644
--- a/src/core/query-rec.h
+++ b/src/core/query-rec.h
@@ -1,6 +1,6 @@
 /* QUERY_REC definition, used for inheritance */
 
-#include <irssi/src/core/window-item-rec.h>
+#include <irssip/src/core/window-item-rec.h>
 
 char *address;
 char *server_tag;
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index ea2b5e6d..df2618d6 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/write-buffer.h>
+#include <irssip/src/core/settings.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/servers.h>
 
 static int rawlog_lines;
 static int signal_rawlog;
diff --git a/src/core/recode.c b/src/core/recode.c
index 7185dd99..f9f6ac1b 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/misc.h>
 
 static char *translit_charset;
 static gboolean term_is_utf8;
diff --git a/src/core/refstrings.c b/src/core/refstrings.c
index 8f220f6f..ff354f59 100644
--- a/src/core/refstrings.c
+++ b/src/core/refstrings.c
@@ -1,7 +1,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include <irssi/src/core/refstrings.h>
+#include <irssip/src/core/refstrings.h>
 
 #if GLIB_CHECK_VERSION(2, 58, 0)
 
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index a9d9422b..e7bd9379 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/signals.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 <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/servers-reconnect.h>
 
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/settings.h>
 
 GSList *reconnects;
 static int last_reconnect_tag;
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index ff3d6584..43873712 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.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 <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
 
 GSList *setupservers;
 
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index 742ed4dd..22c076e5 100644
--- a/src/core/servers-setup.h
+++ b/src/core/servers-setup.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_SERVERS_SETUP_H
 #define IRSSI_CORE_SERVERS_SETUP_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/server-setup-rec.h>
+#include <irssip/src/core/server-setup-rec.h>
 };
 
 extern GSList *setupservers;
diff --git a/src/core/servers.c b/src/core/servers.c
index 811081e8..5b91588e 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.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/rawlog.h>
-#include <irssi/src/core/refstrings.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/net-disconnect.h>
+#include <irssip/src/core/net-nonblock.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/refstrings.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.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>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
 
 GSList *servers, *lookup_servers;
 
diff --git a/src/core/servers.h b/src/core/servers.h
index d52603eb..394fd7b7 100644
--- a/src/core/servers.h
+++ b/src/core/servers.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_SERVERS_H
 #define IRSSI_CORE_SERVERS_H
 
-#include <irssi/src/core/modules.h>
+#include <irssip/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 <irssi/src/core/server-connect-rec.h>
+#include <irssip/src/core/server-connect-rec.h>
 };
 
 #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
 struct _SERVER_REC {
-#include <irssi/src/core/server-rec.h>
+#include <irssip/src/core/server-rec.h>
 };
 
 #define SEND_TARGET_CHANNEL	0
diff --git a/src/core/session.c b/src/core/session.c
index 3a63a785..5d1f1863 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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 <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/misc.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>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.h>
 
 static char *session_file;
 char *irssi_binary = NULL;
diff --git a/src/core/settings.c b/src/core/settings.c
index 065c8fed..d2bd58ca 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/recode.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/settings.h>
 #include "default-config.h"
 
 #include <signal.h>
diff --git a/src/core/signals.c b/src/core/signals.c
index e52e6907..5c71a935 100644
--- a/src/core/signals.c
+++ b/src/core/signals.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/modules.h>
 
 typedef struct _SignalHook {
 	struct _SignalHook *next;
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index 8c890645..72ba8aac 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/refstrings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/refstrings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/utf8.h>
 
 #define isvarchar(c) \
         (i_isalnum(c) || (c) == '_')
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index 87aba7d6..d2c7d455 100644
--- a/src/core/special-vars.h
+++ b/src/core/special-vars.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_CORE_SPECIAL_VARS_H
 #define IRSSI_CORE_SPECIAL_VARS_H
 
-#include <irssi/src/core/signals.h>
+#include <irssip/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 */
diff --git a/src/core/tls.c b/src/core/tls.c
index bd5c8329..d56b0507 100644
--- a/src/core/tls.c
+++ b/src/core/tls.c
@@ -18,7 +18,7 @@
 
 #include "module.h"
 
-#include <irssi/src/core/tls.h>
+#include <irssip/src/core/tls.h>
 
 TLS_REC *tls_create_rec()
 {
diff --git a/src/core/utf8.c b/src/core/utf8.c
index 5ef030d3..7ae1096e 100644
--- a/src/core/utf8.c
+++ b/src/core/utf8.c
@@ -22,11 +22,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/utf8.h>
 #include "module.h"
 
 /* Provide is_utf8(): */
-#include <irssi/src/core/recode.h>
+#include <irssip/src/core/recode.h>
 
 int string_advance(char const **str, int policy)
 {
diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
index b3881d38..9692c08c 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -22,9 +22,9 @@
 #include <wchar.h>
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/utf8.h>
 
 #ifdef HAVE_LIBUTF8PROC
 #include <utf8proc.h>
diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c
index 5226d695..3e0ae339 100644
--- a/src/core/wcwidth.c
+++ b/src/core/wcwidth.c
@@ -59,7 +59,7 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/utf8.h>
 
 struct interval {
   int first;
diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h
index 6944c921..0e924ce9 100644
--- a/src/core/window-item-def.h
+++ b/src/core/window-item-def.h
@@ -3,7 +3,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _WI_ITEM_REC {
-#include <irssi/src/core/window-item-rec.h>
+#include <irssip/src/core/window-item-rec.h>
 };
 
 #endif
diff --git a/src/core/write-buffer.c b/src/core/write-buffer.c
index a1401542..e5d57d96 100644
--- a/src/core/write-buffer.c
+++ b/src/core/write-buffer.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/write-buffer.h>
 
 #define BUFFER_BLOCK_SIZE 2048
 
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index be16db7e..08fc9e3c 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.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 <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/channels-setup.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.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>
+#include <irssip/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/core/chat-completion.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
 enum {
 	COMPLETE_MCASE_NEVER = 0,
diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index ccb8bfd9..9e0ff569 100644
--- a/src/fe-common/core/command-history.c
+++ b/src/fe-common/core/command-history.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
-#include <irssi/src/fe-common/core/command-history.h>
+#include <irssip/src/fe-common/core/command-history.h>
 
 /* command history */
 static GList *history_entries;
diff --git a/src/fe-common/core/command-history.h b/src/fe-common/core/command-history.h
index f4042640..7327454e 100644
--- a/src/fe-common/core/command-history.h
+++ b/src/fe-common/core/command-history.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
 #define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
 
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 852eabff..73622782 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/completion.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static GList *complist; /* list of commands we're currently completing */
 static char *last_line;
diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h
index d505aa84..18aad48a 100644
--- a/src/fe-common/core/completion.h
+++ b/src/fe-common/core/completion.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H
 #define IRSSI_FE_COMMON_CORE_COMPLETION_H
 
-#include <irssi/src/fe-common/core/window-items.h>
+#include <irssip/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);
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
index d7ea95ee..2760f8ad 100644
--- a/src/fe-common/core/fe-capsicum.c
+++ b/src/fe-common/core/fe-capsicum.c
@@ -23,11 +23,11 @@
 */
 
 #include "module.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>
+#include <irssip/src/fe-common/core/fe-capsicum.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/core/signals.h>
 
 static void capability_mode_enabled(void)
 {
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 220737b7..49dcb2bd 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -19,27 +19,27 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/utf8.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 <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/channels-setup.h>
+#include <irssip/src/core/nicklist.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>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/fe-channels.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
 {
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index 9724354f..d0364305 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -19,35 +19,35 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/servers-setup.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/servers-setup.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>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/fe-common/core/fe-core-commands.h>
+#include <irssip/src/fe-common/core/fe-queries.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/fe-common/core/fe-capsicum.h>
+#include <irssip/src/fe-common/core/fe-capsicum.h>
 #endif
-#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 <irssip/src/fe-common/core/hilight-text.h>
+#include <irssip/src/fe-common/core/command-history.h>
+#include <irssip/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/core/keyboard.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/fe-channels.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-activity.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/windows-layout.h>
+#include <irssip/src/fe-common/core/fe-recode.h>
 
 #include <signal.h>
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 207bcff5..2ceb63f7 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -18,22 +18,22 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/core/core.h>
+#include <irssip/src/core/core.h>
 #include "module.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>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/irssi-version.h>
+#include <irssip/src/core/servers.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define PASTE_CHECK_SPEED 200 /* 0.2 sec */
 
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 0e929bae..bc25cacc 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.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 <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/src/core/line-split.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.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 <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-exec.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h
index 824d3d8a..30ee8c78 100644
--- a/src/fe-common/core/fe-exec.h
+++ b/src/fe-common/core/fe-exec.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H
 #define IRSSI_FE_COMMON_CORE_FE_EXEC_H
 
-#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssip/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 <irssi/src/core/window-item-rec.h>
+#include <irssip/src/core/window-item-rec.h>
 	PROCESS_REC *process;
 	unsigned int destroying:1;
 } EXEC_WI_REC;
diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c
index 9a48b4b1..6fba4071 100644
--- a/src/fe-common/core/fe-expandos.c
+++ b/src/fe-common/core/fe-expandos.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
 
 /* Window ref# */
 static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)
diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index 9c428062..bcaf6558 100644
--- a/src/fe-common/core/fe-help.c
+++ b/src/fe-common/core/fe-help.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
 {
diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index 4f625dec..121bcffe 100644
--- a/src/fe-common/core/fe-ignore-messages.c
+++ b/src/fe-common/core/fe-ignore-messages.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/servers.h>
 
 static void sig_message_public(SERVER_REC *server, const char *msg,
 			       const char *nick, const char *address,
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 3594b6f6..88ae3fec 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -20,15 +20,15 @@
 
 #include "module.h"
 #include <time.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static char *ignore_get_key(IGNORE_REC *rec)
 {
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 0d29d6c3..7b988a6e 100644
--- a/src/fe-common/core/fe-log.c
+++ b/src/fe-common/core/fe-log.c
@@ -19,30 +19,30 @@
 */
 
 #include "module.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>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/lib-config/iconfig.h>
 #ifdef HAVE_CAPSICUM
-#include <irssi/src/core/capsicum.h>
+#include <irssip/src/core/capsicum.h>
 #endif
 
-#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 <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
 
-#include <irssi/src/core/channels-setup.h>
+#include <irssip/src/core/channels-setup.h>
 
 /* close autologs after 5 minutes of inactivity */
 #define AUTOLOG_INACTIVITY_CLOSE (60*5)
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index c6e9a838..980da809 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.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 <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/core/ignore.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>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/fe-queries.h>
+#include <irssip/src/fe-common/core/hilight-text.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
 #define isnickchar(a) \
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index a1714996..0f7b77d1 100644
--- a/src/fe-common/core/fe-modules.c
+++ b/src/fe-common/core/fe-modules.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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 <irssip/src/core/modules.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/chat-protocols.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void sig_module_error(void *number, const char *data,
 			     const char *rootmodule, const char *submodule)
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index dce53804..37e8516b 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/queries.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>
+#include <irssip/src/fe-common/core/fe-core-commands.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static int queryclose_tag, query_auto_close, querycreate_level;
 
diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h
index 30c45e4e..60971e60 100644
--- a/src/fe-common/core/fe-queries.h
+++ b/src/fe-common/core/fe-queries.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H
 #define IRSSI_FE_COMMON_CORE_FE_QUERIES_H
 
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/queries.h>
 
 /* Return query where to put the private message. */
 QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c
index 5e7c1e47..a9d68ae8 100644
--- a/src/fe-common/core/fe-recode.c
+++ b/src/fe-common/core/fe-recode.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/core/recode.h>
 
 static char *recode_fallback = NULL;
 static char *recode_out_default = NULL;
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 56acf020..f69949cb 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.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 <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/servers-reconnect.h>
 
-#include <irssi/src/fe-common/core/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void print_servers(void)
 {
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index f686916f..44b5418d 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/fe-common/core/fe-settings.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/keyboard.h>
 
 static void set_print(SETTINGS_REC *rec)
 {
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index d72a13b0..fd106758 100644
--- a/src/fe-common/core/fe-tls.c
+++ b/src/fe-common/core/fe-tls.c
@@ -17,15 +17,15 @@
  */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/tls.h>
 
-#include <irssi/src/fe-common/core/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/fe-common/core/fe-tls.h>
+#include <irssip/src/fe-common/core/fe-tls.h>
 
 static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
 {
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index d575813d..4b917b48 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/levels.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>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
 GSList *windows; /* first in the list is the active window,
                     next is the last active, etc. */
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index d5c60c81..357b82e3 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
 #define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
 
-#include <irssi/src/core/window-item-def.h>
-#include <irssi/src/fe-common/core/command-history.h>
+#include <irssip/src/core/window-item-def.h>
+#include <irssip/src/fe-common/core/command-history.h>
 
 enum {
         DATA_LEVEL_NONE = 0,
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index f7614b6f..e04a503d 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.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>
-#include <irssi/src/core/refstrings.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/utf8.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/refstrings.h>
 
 static const char *format_backs = "04261537";
 static const char *format_fores = "kbgcrmyw";
diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h
index 79b90ded..227076cc 100644
--- a/src/fe-common/core/formats.h
+++ b/src/fe-common/core/formats.h
@@ -1,9 +1,9 @@
 #ifndef IRSSI_FE_COMMON_CORE_FORMATS_H
 #define IRSSI_FE_COMMON_CORE_FORMATS_H
 
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/themes.h>
 
 #define GUI_PRINT_FLAG_BOLD          0x0001
 #define GUI_PRINT_FLAG_REVERSE       0x0002
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 2412a1f8..551095ff 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/iregex.h>
 
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/nicklist.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>
+#include <irssip/src/fe-common/core/hilight-text.h>
+#include <irssip/src/core/nickmatch-cache.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 static NICKMATCH_REC *nickmatch;
 static int never_hilight_level, default_hilight_level;
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 0dfe78f3..0e15ac6c 100644
--- a/src/fe-common/core/hilight-text.h
+++ b/src/fe-common/core/hilight-text.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
 #define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
 
-#include <irssi/src/core/iregex.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/core/iregex.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 struct _HILIGHT_REC {
 	char *text;
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index e0e061dd..fda30176 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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 <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.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>
+#include <irssip/src/fe-common/core/keyboard.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define MAX_EXPAND_RECURSION 100
 
diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h
index b19536a0..4793d4da 100644
--- a/src/fe-common/core/keyboard.h
+++ b/src/fe-common/core/keyboard.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H
 #define IRSSI_FE_COMMON_CORE_KEYBOARD_H
 
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
 typedef struct _KEYBOARD_REC KEYBOARD_REC;
 typedef struct _KEYINFO_REC KEYINFO_REC;
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index c4d9be96..d9725f88 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
 	/* clang-format off */
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index 1b1927b1..eaee79f1 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 enum {
 	TXT_MODULE_NAME,
diff --git a/src/fe-common/core/module.h b/src/fe-common/core/module.h
index e629dc51..dce87f90 100644
--- a/src/fe-common/core/module.h
+++ b/src/fe-common/core/module.h
@@ -1,8 +1,8 @@
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #define MODULE_NAME "fe-common/core"
 
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/utf8.h>
 typedef struct {
 	time_t time;
 	char *nick;
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 9de8d740..52fa8cde 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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/settings.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static int beep_msg_level, beep_msg_level_ignore, beep_when_away, beep_when_window_active;
 
diff --git a/src/fe-common/core/printtext.h b/src/fe-common/core/printtext.h
index c223a3ec..26f731e9 100644
--- a/src/fe-common/core/printtext.h
+++ b/src/fe-common/core/printtext.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_COMMON_CORE_PRINTTEXT_H
 #define IRSSI_FE_COMMON_CORE_PRINTTEXT_H
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
 void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index 58d17b8e..217c5bc0 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #include "default-theme.h"
 
diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c
index 2884c3eb..8d9943fe 100644
--- a/src/fe-common/core/window-activity.c
+++ b/src/fe-common/core/window-activity.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/window-items.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/fe-common/core/hilight-text.h>
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/fe-common/core/hilight-text.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
 
 static char **hide_targets;
 static int hide_level, msg_level, hilight_level, signal_window_hilight_check;
diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 6669ba43..6e40f535 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.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/misc.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/fe-common/core/themes.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/windows-layout.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/command-history.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/windows-layout.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/command-history.h>
 
 static void window_print_binds(WINDOW_REC *win)
 {
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c
index c60c796c..851e7f1c 100644
--- a/src/fe-common/core/window-items.c
+++ b/src/fe-common/core/window-items.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/levels.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>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void window_item_add_signal(WINDOW_REC *window, WI_ITEM_REC *item, int automatic, int send_signal)
 {
diff --git a/src/fe-common/core/window-items.h b/src/fe-common/core/window-items.h
index 5bfa92fa..5ce5449c 100644
--- a/src/fe-common/core/window-items.h
+++ b/src/fe-common/core/window-items.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
 #define IRSSI_FE_COMMON_CORE_WINDOW_ITEMS_H
 
-#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
 
 /* Add/remove/destroy window item from `window' */
 void window_item_add(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index fa209f48..561b2354 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
 
-#include <irssi/src/fe-common/core/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
 static WINDOW_REC *restore_win;
 
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
index 8dd67f7b..3a37be61 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat-messages.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/core/ignore.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void sig_message_dcc_own(CHAT_DCC_REC *dcc, const char *msg)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c
index 4099e2f1..21aec50b 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.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 <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-messages.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-messages.h>
 
-#include <irssi/src/fe-common/core/chat-completion.h>
+#include <irssip/src/fe-common/core/chat-completion.h>
 
 void fe_dcc_chat_messages_init(void);
 void fe_dcc_chat_messages_deinit(void);
diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c
index e75640bc..ab8941a8 100644
--- a/src/fe-common/irc/dcc/fe-dcc-get.c
+++ b/src/fe-common/irc/dcc/fe-dcc-get.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/dcc/dcc-file.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/dcc/dcc-file.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/fe-common/irc/dcc/fe-dcc.h>
+#include <irssip/src/fe-common/irc/dcc/fe-dcc.h>
 
 static void dcc_request(GET_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c
index cf9b634e..ea57e0a6 100644
--- a/src/fe-common/irc/dcc/fe-dcc-send.c
+++ b/src/fe-common/irc/dcc/fe-dcc-send.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/dcc/dcc-file.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
-#include <irssi/src/irc/dcc/dcc-queue.h>
+#include <irssip/src/irc/dcc/dcc-file.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-queue.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/completion.h>
 
-#include <irssi/src/fe-common/irc/dcc/fe-dcc.h>
+#include <irssip/src/fe-common/irc/dcc/fe-dcc.h>
 
 static void dcc_connected(SEND_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc-server.c b/src/fe-common/irc/dcc/fe-dcc-server.c
index eaab9637..7252d4c5 100644
--- a/src/fe-common/irc/dcc/fe-dcc-server.c
+++ b/src/fe-common/irc/dcc/fe-dcc-server.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/irc/dcc/dcc-server.h>
+#include <irssip/src/irc/dcc/dcc-server.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
 
 static void dcc_server_started(SERVER_DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index f5fb3b22..293a52bf 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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 <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/irc/dcc/dcc-file.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-file.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
 
-#include <irssi/src/fe-common/irc/dcc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/irc/dcc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
 
 void fe_dcc_chat_init(void);
 void fe_dcc_chat_deinit(void);
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index f973cd9e..ff6e8986 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_irc_dcc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
diff --git a/src/fe-common/irc/dcc/module-formats.h b/src/fe-common/irc/dcc/module-formats.h
index 204c7dd5..37d43992 100644
--- a/src/fe-common/irc/dcc/module-formats.h
+++ b/src/fe-common/irc/dcc/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/dcc/module.h b/src/fe-common/irc/dcc/module.h
index 54934469..bba85374 100644
--- a/src/fe-common/irc/dcc/module.h
+++ b/src/fe-common/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc/dcc"
diff --git a/src/fe-common/irc/fe-cap.c b/src/fe-common/irc/fe-cap.c
index a75f2bb3..6a33f972 100644
--- a/src/fe-common/irc/fe-cap.c
+++ b/src/fe-common/irc/fe-cap.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static const struct {
 	const char *command;
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 5f097ec2..5f6a548b 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/irc/fe-irc-server.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/irc/fe-irc-server.h>
+#include <irssip/src/fe-common/irc/fe-irc-channels.h>
 
 void fe_irc_queries_init(void);
 void fe_irc_queries_deinit(void);
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index cc60ea92..0b767c5e 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/ignore.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>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void ctcp_default_msg(IRC_SERVER_REC *server, const char *data,
 			     const char *nick, const char *addr,
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 8035cebf..1ae7bd20 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/irc/core/mode-lists.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/irc/core/mode-lists.h>
 
-#include <irssi/src/fe-common/core/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-channels.h>
-#include <irssi/src/fe-common/irc/fe-irc-server.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-channels.h>
+#include <irssip/src/fe-common/irc/fe-irc-server.h>
+#include <irssip/src/fe-common/irc/fe-irc-channels.h>
 
 static void print_event_received(IRC_SERVER_REC *server, const char *data,
 				 const char *nick, int target_param);
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index b6b3e75a..26b58754 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -19,29 +19,29 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/core/servers-reconnect.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/irc-masks.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-masks.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-queries.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/irc/fe-irc-server.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-queries.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/irc/fe-irc-server.h>
+#include <irssip/src/fe-common/irc/fe-irc-channels.h>
 
 static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 			  const char *nick, const char *addr)
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 39752984..aacc9a7d 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/channel-rejoin.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/channel-rejoin.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>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
 
 int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target)
 {
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 368a3fa6..aa3aa5b7 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -19,27 +19,27 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.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 <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-queries.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-queries.h>
 
-#include <irssi/src/fe-common/core/fe-queries.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>
-#include <irssi/src/fe-common/core/keyboard.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>
+#include <irssip/src/fe-common/core/fe-queries.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/keyboard.h>
+#include <irssip/src/fe-common/irc/fe-irc-channels.h>
 
 /* SYNTAX: ME <message> */
 static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 89346648..46663b02 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -19,26 +19,26 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-queries.h>
 
-#include <irssi/src/fe-common/core/module-formats.h>
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-messages.h>
+#include <irssip/src/fe-common/core/module-formats.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-messages.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/window-items.h>
-#include <irssi/src/fe-common/irc/fe-irc-channels.h>
-#include <irssi/src/fe-common/irc/fe-irc-server.h>
+#include <irssip/src/fe-common/core/fe-queries.h>
+#include <irssip/src/fe-common/core/hilight-text.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/irc/fe-irc-channels.h>
+#include <irssip/src/fe-common/irc/fe-irc-server.h>
 
 static void sig_message_own_public(SERVER_REC *server, const char *msg,
 				   const char *target, const char *origtarget)
diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index 22aaa145..d63a663c 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
 
 int query_type;
 
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 4aad7ee0..76b4cf28 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/core/servers-setup.h>
+#include <irssip/src/core/servers-setup.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/core/servers-reconnect.h>
-#include <irssi/src/irc/core/irc-servers-setup.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/irc/core/irc-servers-setup.h>
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
 {
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 3484d923..2103b93e 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/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/chatnets.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/chatnets.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/core/servers-setup.h>
-#include <irssi/src/core/channels-setup.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels-setup.h>
 
 static void cmd_network_list(void)
 {
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 623fca0c..48e6bc98 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/core/ignore.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define MODE_WAIT_TIME 3 /* how many seconds to wait for identical modes */
 
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index ea41f7fa..1b8545b0 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/irc/core/netsplit.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/irc/core/netsplit.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define NETJOIN_WAIT_TIME 5 /* how many seconds to wait for the netsplitted JOIN messages to stop */
 #define NETJOIN_MAX_WAIT 30 /* how many seconds to wait for nick to join to the rest of the channels she was before the netsplit */
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index b76d4ce7..6d8ce72b 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/irc/core/netsplit.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/irc/core/netsplit.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 #define SPLIT_WAIT_TIME 5 /* how many seconds to wait for the QUIT split messages to stop */
 
diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c
index 72fec58e..562bf3f0 100644
--- a/src/fe-common/irc/fe-sasl.c
+++ b/src/fe-common/irc/fe-sasl.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/irc/core/sasl.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void sig_sasl_success(IRC_SERVER_REC *server)
 {
diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index 412cb56b..bdc4bdfe 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -1,16 +1,16 @@
 /* Copyright (C) 1999-2004 Timo Sirainen */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/fe-common/irc/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 /* When enabled, prints WHOIS replies into active window while preserving
  * formatting and theming. */
diff --git a/src/fe-common/irc/irc-completion.c b/src/fe-common/irc/irc-completion.c
index 71e2e0c8..1a63c0bc 100644
--- a/src/fe-common/irc/irc-completion.c
+++ b/src/fe-common/irc/irc-completion.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-common/core/chat-completion.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-common/core/chat-completion.h>
 
 static void sig_complete_stats(GList **list, WINDOW_REC *window,
 			       const char *word, const char *line,
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 86310157..913f0385 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 /* clang-format off */
 FORMAT_REC fecommon_irc_formats[] = {
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 722f8d40..bfbb0a77 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 /* clang-format off */
 enum {
diff --git a/src/fe-common/irc/module.h b/src/fe-common/irc/module.h
index ad63c95e..b68feff6 100644
--- a/src/fe-common/irc/module.h
+++ b/src/fe-common/irc/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc"
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index 68b98a09..e191e889 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/irc/notifylist/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/chatnets.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/fe-common/irc/notifylist/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 /* add the nick of a hostmask to list if it isn't there already */
 static GSList *mask_add_once(GSList *list, const char *mask)
diff --git a/src/fe-common/irc/notifylist/module-formats.c b/src/fe-common/irc/notifylist/module-formats.c
index 12f41fb5..d004e76c 100644
--- a/src/fe-common/irc/notifylist/module-formats.c
+++ b/src/fe-common/irc/notifylist/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_irc_notifylist_formats[] =
 {
diff --git a/src/fe-common/irc/notifylist/module-formats.h b/src/fe-common/irc/notifylist/module-formats.h
index ff3085e1..dd809995 100644
--- a/src/fe-common/irc/notifylist/module-formats.h
+++ b/src/fe-common/irc/notifylist/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/notifylist/module.h b/src/fe-common/irc/notifylist/module.h
index 0e5ca451..a2f12b99 100644
--- a/src/fe-common/irc/notifylist/module.h
+++ b/src/fe-common/irc/notifylist/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "fe-common/irc/notifylist"
diff --git a/src/fe-fuzz/fe-common/core/theme-load.c b/src/fe-fuzz/fe-common/core/theme-load.c
index f6db8f5f..a9ff389e 100644
--- a/src/fe-fuzz/fe-common/core/theme-load.c
+++ b/src/fe-fuzz/fe-common/core/theme-load.c
@@ -18,18 +18,18 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/fe-text/module.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-fuzz/null-logger.h>
+#include <irssip/src/fe-text/module.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/irc/core/event-get-params.c b/src/fe-fuzz/irc/core/event-get-params.c
index 3cdb789f..a33b9b2a 100644
--- a/src/fe-fuzz/irc/core/event-get-params.c
+++ b/src/fe-fuzz/irc/core/event-get-params.c
@@ -18,17 +18,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/fe-text/module.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/fe-fuzz/null-logger.h>
+#include <irssip/src/fe-text/module.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-text/module-formats.h> // need to explicitly grab from fe-text
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 6f79223a..8508a25d 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -18,16 +18,16 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/fe-text/module.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-text/module-formats.h> /* need to explicitly grab from fe-text */
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-fuzz/null-logger.h>
+#include <irssip/src/fe-text/module.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-text/module-formats.h> /* need to explicitly grab from fe-text */
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/null-logger.c b/src/fe-fuzz/null-logger.c
index dd88b84a..c6c996bb 100644
--- a/src/fe-fuzz/null-logger.c
+++ b/src/fe-fuzz/null-logger.c
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-fuzz/null-logger.h>
+#include <irssip/src/fe-fuzz/null-logger.h>
 
 #include <glib.h>
 
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index 25579c8c..eb77244e 100644
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@@ -18,20 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/irc/core/module.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/servers-setup.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/network-openssl.h>
-#include <irssi/src/core/net-sendbuffer.h>
+#include <irssip/src/irc/core/module.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/network-openssl.h>
+#include <irssip/src/core/net-sendbuffer.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -39,10 +39,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/fe-fuzz/null-logger.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/fe-fuzz/null-logger.h>
 
 /* irc-core.c */
 void irc_core_init(void);
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index c442bd7f..f290c40d 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/core.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/core.h>
 
 static GMainLoop *main_loop;
 static char *autoload_module;
diff --git a/src/fe-none/module.h b/src/fe-none/module.h
index cf956eaa..1e1b5e36 100644
--- a/src/fe-none/module.h
+++ b/src/fe-none/module.h
@@ -1,3 +1,3 @@
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #define MODULE_NAME "fe-none"
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index ad362f20..b8319f68 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/utf8.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/utf8.h>
+#include <irssip/src/fe-common/core/formats.h>
 
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/core/recode.h>
 
 #undef i_toupper
 #undef i_tolower
diff --git a/src/fe-text/gui-expandos.c b/src/fe-text/gui-expandos.c
index a6b11418..e5823e6d 100644
--- a/src/fe-text/gui-expandos.c
+++ b/src/fe-text/gui-expandos.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/expandos.h>
+#include <irssip/src/core/expandos.h>
 
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/gui-readline.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/gui-readline.h>
 
 /* idle time */
 static char *expando_idletime(SERVER_REC *server, void *item, int *free_ret)
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index 2091b5a3..535ce48f 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/gui-windows.h>
 
 /* Terminal indexed colour map */
 int mirc_colors[] = { 15, 0, 1, 2, 12, 4, 5, 6, 14, 10, 3, 11, 9, 13, 8, 7,
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index 0acf4d31..9bd28c5d 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -1,9 +1,9 @@
 #ifndef IRSSI_FE_TEXT_GUI_PRINTTEXT_H
 #define IRSSI_FE_TEXT_GUI_PRINTTEXT_H
 
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 extern int mirc_colors[];
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 91fefae3..56639aa7 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/fe-common/core/completion.h>
-#include <irssi/src/fe-common/core/command-history.h>
-#include <irssi/src/fe-common/core/keyboard.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/core/command-history.h>
+#include <irssip/src/fe-common/core/keyboard.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/sidepanels.h>
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/sidepanels.h>
+#include <irssip/src/core/utf8.h>
 
 #include <string.h>
 #include <signal.h>
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 46be2396..83fbeebb 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
 
 static int window_create_override;
 static int wcwidth_impl;
diff --git a/src/fe-text/gui-windows.h b/src/fe-text/gui-windows.h
index 52a64cea..b7def21a 100644
--- a/src/fe-text/gui-windows.h
+++ b/src/fe-text/gui-windows.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_TEXT_GUI_WINDOWS_H
 #define IRSSI_FE_TEXT_GUI_WINDOWS_H
 
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
 
 #define WINDOW_GUI(a) ((GUI_WINDOW_REC *) ((a)->gui_data))
 #define WINDOW_MAIN(a) (WINDOW_GUI(a)->parent)
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 8d8ad0c0..42c4a121 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -19,30 +19,30 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/core/modules-load.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/session.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/core/modules-load.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/session.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
-#include <irssi/src/fe-common/core/fe-settings.h>
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/fe-common/core/fe-settings.h>
+#include <irssip/src/fe-common/core/themes.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/gui-readline.h>
-#include <irssi/src/fe-text/statusbar.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/irssi-version.h>
-#include <irssi/src/fe-text/sidepanels.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/gui-readline.h>
+#include <irssip/src/fe-text/statusbar.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/irssi-version.h>
+#include <irssip/src/fe-text/sidepanels.h>
 
 #include <signal.h>
 #include <locale.h>
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 89ee30a9..86bc1f3f 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
 
 #define DEFAULT_LASTLOG_BEFORE 3
 #define DEFAULT_LASTLOG_AFTER 3
diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c
index d3759ace..b33020a8 100644
--- a/src/fe-text/mainwindow-activity.c
+++ b/src/fe-text/mainwindow-activity.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/gui-windows.h>
 
 /* Don't send window activity if window is already visible in
    another mainwindow */
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index ef13892f..7cbf2e66 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
 
 static void sig_layout_window_save(WINDOW_REC *window, CONFIG_NODE *node)
 {
diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 447bb0ea..31c5d759 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-text/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/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/gui-windows.h>
 
 #define NEW_WINDOW_SIZE (WINDOW_MIN_SIZE + 1)
 
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index 432c1c57..a1448838 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_TEXT_MAINWINDOWS_H
 #define IRSSI_FE_TEXT_MAINWINDOWS_H
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-text/term.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-text/term.h>
 
 #define WINDOW_MIN_SIZE 2
 #define NEW_WINDOW_WIDTH 20 /* must be >= MIN_SCREEN_WIDTH defined in term.c */
diff --git a/src/fe-text/meson.build b/src/fe-text/meson.build
index 27f0fc0a..c88b0159 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-executable('irssi',
+executable('irssip',
   files(
     #### terminfo_sources ####
     'term-terminfo.c',
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e1bbc1fa..133d9fd2 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 FORMAT_REC gui_text_formats[] = {
 	/* clang-format off */
diff --git a/src/fe-text/module-formats.h b/src/fe-text/module-formats.h
index 394d9232..990afaf1 100644
--- a/src/fe-text/module-formats.h
+++ b/src/fe-text/module-formats.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_TEXT_MODULE_FORMATS_H
 #define IRSSI_FE_TEXT_MODULE_FORMATS_H
 
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 /* This mirrors indices in module-formats.c order; keep in sync if changed. */
 
diff --git a/src/fe-text/module.h b/src/fe-text/module.h
index b1eeeb0e..5c5937f4 100644
--- a/src/fe-text/module.h
+++ b/src/fe-text/module.h
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/fe-text/term.h>
+#include <irssip/src/common.h>
+#include <irssip/src/fe-text/term.h>
 
 #define MODULE_NAME "fe-text"
 
diff --git a/src/fe-text/sidepanels.c b/src/fe-text/sidepanels.c
index e976776c..937ae8fe 100644
--- a/src/fe-text/sidepanels.c
+++ b/src/fe-text/sidepanels.c
@@ -1,21 +1,21 @@
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/sidepanels.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/window-items.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/sidepanels.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
 #include <stdarg.h>
 
 /* Custom data level for channel events (join/part/quit/nick) */
diff --git a/src/fe-text/sidepanels.h b/src/fe-text/sidepanels.h
index 93481877..4aa5058e 100644
--- a/src/fe-text/sidepanels.h
+++ b/src/fe-text/sidepanels.h
@@ -2,7 +2,7 @@
 #define IRSSI_FE_TEXT_SIDEPANELS_H
 
 #include <glib.h>
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 void sidepanels_init(void);
 void sidepanels_deinit(void);
diff --git a/src/fe-text/statusbar-config.c b/src/fe-text/statusbar-config.c
index 3cfa5379..62b7fe03 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/fe-text/statusbar.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-text/statusbar.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 static void read_statusbar_config_from_node(CONFIG_NODE *node);
 
diff --git a/src/fe-text/statusbar-config.h b/src/fe-text/statusbar-config.h
index 239918db..3fc52c6e 100644
--- a/src/fe-text/statusbar-config.h
+++ b/src/fe-text/statusbar-config.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_FE_TEXT_STATUSBAR_CONFIG_H
 #define IRSSI_FE_TEXT_STATUSBAR_CONFIG_H
 
-#include <irssi/src/fe-text/statusbar.h>
+#include <irssip/src/fe-text/statusbar.h>
 
 void statusbar_config_destroy(STATUSBAR_GROUP_REC *group,
 			      STATUSBAR_CONFIG_REC *config);
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 6e7cf8a5..bca872ca 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-text/statusbar.h>
-#include <irssi/src/fe-text/gui-entry.h>
-#include <irssi/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-text/statusbar.h>
+#include <irssip/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/gui-windows.h>
 
 /* how often to redraw lagging time (seconds) */
 #define LAG_REFRESH_TIME 10
diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c
index 2439d101..b1501e9d 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/special-vars.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/special-vars.h>
 
-#include <irssi/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/themes.h>
 
-#include <irssi/src/fe-text/statusbar.h>
-#include <irssi/src/fe-text/statusbar-config.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/statusbar.h>
+#include <irssip/src/fe-text/statusbar-config.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
 
 void statusbar_items_init(void);
 void statusbar_items_deinit(void);
diff --git a/src/fe-text/statusbar.h b/src/fe-text/statusbar.h
index 140d355d..46ed1964 100644
--- a/src/fe-text/statusbar.h
+++ b/src/fe-text/statusbar.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_TEXT_STATUSBAR_H
 #define IRSSI_FE_TEXT_STATUSBAR_H
 
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/statusbar-item.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/statusbar-item.h>
 
 #define STATUSBAR_PRIORITY_HIGH		100
 #define STATUSBAR_PRIORITY_NORMAL	0
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index 9bcdd5a0..5005bc94 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/terminfo-core.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/terminfo-core.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/core/utf8.h>
 
 #include <signal.h>
 #include <termios.h>
diff --git a/src/fe-text/term.c b/src/fe-text/term.c
index 5587fe20..c4271326 100644
--- a/src/fe-text/term.c
+++ b/src/fe-text/term.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/fe-text/term.h>
-#include <irssi/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/term.h>
+#include <irssip/src/fe-text/mainwindows.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
diff --git a/src/fe-text/term.h b/src/fe-text/term.h
index 601b12c6..22199a0d 100644
--- a/src/fe-text/term.h
+++ b/src/fe-text/term.h
@@ -27,7 +27,7 @@ typedef struct _TERM_WINDOW TERM_WINDOW;
 #define TERM_TYPE_UTF8		1
 #define TERM_TYPE_BIG5		2
 
-#include <irssi/src/core/utf8.h>
+#include <irssip/src/core/utf8.h>
 
 extern TERM_WINDOW *root_window;
 extern int term_width, term_height;
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c
index 0aa329f4..d0b868f9 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -1,7 +1,7 @@
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/fe-text/terminfo-core.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/fe-text/terminfo-core.h>
 
 #ifndef _POSIX_VDISABLE
 #  define _POSIX_VDISABLE 0
diff --git a/src/fe-text/textbuffer-commands.c b/src/fe-text/textbuffer-commands.c
index 3d1d963b..45deaa85 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/refstrings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-text/module-formats.h>
-#include <irssi/src/fe-text/textbuffer-formats.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/refstrings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-text/module-formats.h>
+#include <irssip/src/fe-text/textbuffer-formats.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-text/gui-windows.h>
 
 static int activity_hide_window_hidelevel;
 
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index bbf9f229..495f9e1e 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -1,18 +1,18 @@
 #include "module.h"
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/refstrings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/textbuffer-formats.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/refstrings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/textbuffer-formats.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
 
 TEXT_BUFFER_REC *color_buf;
 gboolean scrollback_format;
diff --git a/src/fe-text/textbuffer-formats.h b/src/fe-text/textbuffer-formats.h
index 86587563..56dc2abb 100644
--- a/src/fe-text/textbuffer-formats.h
+++ b/src/fe-text/textbuffer-formats.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_TEXT_TEXTBUFFER_FORMATS_H
 #define IRSSI_FE_TEXT_TEXTBUFFER_FORMATS_H
 
-#include <irssi/src/fe-text/textbuffer.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-text/textbuffer.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 typedef struct _TEXT_BUFFER_FORMAT_REC {
 	char *module;
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index ee474785..b9e89714 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -21,12 +21,12 @@
 #define	G_LOG_DOMAIN "TextBufferView"
 
 #include "module.h"
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/utf8.h>
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-text/textbuffer-formats.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/utf8.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-text/textbuffer-formats.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index cdd3cbe5..22940241 100644
--- a/src/fe-text/textbuffer-view.h
+++ b/src/fe-text/textbuffer-view.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H
 #define IRSSI_FE_TEXT_TEXTBUFFER_VIEW_H
 
-#include <irssi/src/fe-text/textbuffer.h>
-#include <irssi/src/fe-text/term.h>
+#include <irssip/src/fe-text/textbuffer.h>
+#include <irssip/src/fe-text/term.h>
 
 typedef struct _TEXT_BUFFER_VIEW_REC TEXT_BUFFER_VIEW_REC;
 
diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c
index 8a206f2c..62410235 100644
--- a/src/fe-text/textbuffer.c
+++ b/src/fe-text/textbuffer.c
@@ -21,13 +21,13 @@
 #define	G_LOG_DOMAIN "TextBuffer"
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/core/utf8.h>
-#include <irssi/src/core/iregex.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/core/utf8.h>
+#include <irssip/src/core/iregex.h>
 
-#include <irssi/src/fe-text/textbuffer-formats.h>
-#include <irssi/src/fe-text/textbuffer.h>
+#include <irssip/src/fe-text/textbuffer-formats.h>
+#include <irssip/src/fe-text/textbuffer.h>
 
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
 
diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 5281ac95..1e049136 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-masks.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-masks.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/core/nicklist.h>
 
 #define BAN_TYPE_NORMAL (IRC_MASK_USER | IRC_MASK_DOMAIN)
 #define BAN_TYPE_USER (IRC_MASK_USER)
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 3cdfe964..bcd4b8e4 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/irc/core/channel-events.h>
-#include <irssi/src/core/channels-setup.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/irc/core/channel-events.h>
+#include <irssip/src/core/channels-setup.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
 
 static void check_join_failure(IRC_SERVER_REC *server, const char *channel)
 {
diff --git a/src/irc/core/channel-events.h b/src/irc/core/channel-events.h
index ada3e3a1..096dbb4b 100644
--- a/src/irc/core/channel-events.h
+++ b/src/irc/core/channel-events.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_CORE_CHANNEL_EVENTS_H
 #define IRSSI_IRC_CORE_CHANNEL_EVENTS_H
 
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc.h>
 
 void channel_events_init(void);
 void channel_events_deinit(void);
diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c
index f49c69b6..17a20f12 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -20,14 +20,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/channel-rejoin.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/channel-rejoin.h>
 
 #define REJOIN_TIMEOUT (1000*60*5) /* try to rejoin every 5 minutes */
 
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 05c9768c..177540c3 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -39,16 +39,16 @@ loop:
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/core/nicklist.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
 /* here are the WHOX commands we send. the full spec can be found on [1].
 
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c
index 42b93411..15e7dff5 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-idle.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/irc/core/ctcp.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-idle.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/irc/core/ctcp.h>
 
 typedef struct {
 	char *name;
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 2c2df7f9..ccc8ad2b 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -18,11 +18,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-cap.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-cap.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
 int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
 {
diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c
index 93874d35..d57d8758 100644
--- a/src/irc/core/irc-channels-setup.c
+++ b/src/irc/core/irc-channels-setup.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/channels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/channels.h>
 
 void irc_channels_setup_init(void)
 {
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 24f57f8d..70888262 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/channels-setup.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/channels-setup.h>
 
-#include <irssi/src/irc/core/bans.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/channel-rejoin.h>
+#include <irssip/src/irc/core/bans.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/channel-rejoin.h>
 
 void channels_query_init(void);
 void channels_query_deinit(void);
diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h
index 0f955dd8..778246f8 100644
--- a/src/irc/core/irc-channels.h
+++ b/src/irc/core/irc-channels.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_IRC_CORE_IRC_CHANNELS_H
 #define IRSSI_IRC_CORE_IRC_CHANNELS_H
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/channels.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/channels.h>
 
 /* Returns IRC_CHANNEL_REC if it's IRC channel, NULL if it isn't. */
 #define IRC_CHANNEL(channel) \
@@ -27,7 +27,7 @@ enum {
 
 #define STRUCT_SERVER_REC IRC_SERVER_REC
 struct _IRC_CHANNEL_REC {
-#include <irssi/src/core/channel-rec.h>
+#include <irssip/src/core/channel-rec.h>
 
 	GSList *banlist; /* list of bans */
 
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index c3b24a11..a94eba2a 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
 
 void ircnet_create(IRC_CHATNET_REC *rec)
 {
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 10e98921..f65275ed 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_IRC_CORE_IRC_CHATNETS_H
 #define IRSSI_IRC_CORE_IRC_CHATNETS_H
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/chatnets.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
 
 /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */
 #define IRC_CHATNET(chatnet) \
@@ -15,7 +15,7 @@
 #define IRCNET(ircnet) IRC_CHATNET(ircnet)
 
 struct _IRC_CHATNET_REC {
-#include <irssi/src/core/chatnet-rec.h>
+#include <irssip/src/core/chatnet-rec.h>
 
 	char *usermode;
 	char *alternate_nick;
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 5f234c54..efe9a8ee 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/recode.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/window-item-def.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/window-item-def.h>
 
-#include <irssi/src/core/servers-reconnect.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/core/servers-setup.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/nicklist.h>
 
-#include <irssi/src/irc/core/bans.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/bans.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-queries.h>
 
 /* How often to check if there's anyone to be unbanned in knockout list */
 #define KNOCKOUT_TIMECHECK 10000
diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h
index 6f689313..ed9851ff 100644
--- a/src/irc/core/irc-commands.h
+++ b/src/irc/core/irc-commands.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_CORE_IRC_COMMANDS_H
 #define IRSSI_IRC_CORE_IRC_COMMANDS_H
 
-#include <irssi/src/core/commands.h>
+#include <irssip/src/core/commands.h>
 
 #define command_bind_irc(cmd, section, signal) \
         command_bind_proto(cmd, IRC_PROTOCOL, section, signal)
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index 136bff85..523c23c1 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/core/irc-cap.h>
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-cap.h>
+#include <irssip/src/irc/core/sasl.h>
 
-#include <irssi/src/irc/core/irc-servers-setup.h>
-#include <irssi/src/core/channels-setup.h>
+#include <irssip/src/irc/core/irc-servers-setup.h>
+#include <irssip/src/core/channels-setup.h>
 
-#include <irssi/src/irc/core/ctcp.h>
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/netsplit.h>
+#include <irssip/src/irc/core/ctcp.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/netsplit.h>
 
 void irc_expandos_init(void);
 void irc_expandos_deinit(void);
diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 625e6e8b..666fd8d3 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/expandos.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/expandos.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/core/nicklist.h>
 
 #ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX 255
diff --git a/src/irc/core/irc-masks.c b/src/irc/core/irc-masks.c
index e2c5aea6..71cd9d24 100644
--- a/src/irc/core/irc-masks.c
+++ b/src/irc/core/irc-masks.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/network.h>
 
-#include <irssi/src/irc/core/irc-masks.h>
+#include <irssip/src/irc/core/irc-masks.h>
 
 static char *get_domain_mask(char *host)
 {
diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h
index 5696bbb5..8db2fd19 100644
--- a/src/irc/core/irc-masks.h
+++ b/src/irc/core/irc-masks.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_CORE_IRC_MASKS_H
 #define IRSSI_IRC_CORE_IRC_MASKS_H
 
-#include <irssi/src/core/masks.h>
+#include <irssip/src/core/masks.h>
 
 #define IRC_MASK_NICK   0x01
 #define IRC_MASK_USER   0x02
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index f62a96f2..68fda8b3 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-masks.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-masks.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/core/servers.h>
 
 static void nicklist_set_modes(IRC_CHANNEL_REC *channel, NICK_REC *rec, gboolean op,
                                gboolean halfop, gboolean voice, const char *prefixes,
diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h
index 7ac3176d..876f9172 100644
--- a/src/irc/core/irc-nicklist.h
+++ b/src/irc/core/irc-nicklist.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_CORE_IRC_NICKLIST_H
 #define IRSSI_IRC_CORE_IRC_NICKLIST_H
 
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/nicklist.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 9c7eb6a9..8bb474a3 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
 
 QUERY_REC *irc_query_create(const char *server_tag,
 			    const char *nick, int automatic)
diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h
index f6680ed2..5b2a7c1a 100644
--- a/src/irc/core/irc-queries.h
+++ b/src/irc/core/irc-queries.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_IRC_CORE_IRC_QUERIES_H
 #define IRSSI_IRC_CORE_IRC_QUERIES_H
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/queries.h>
 
 /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */
 #define IRC_QUERY(query) \
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index e18a5a9b..0c928409 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/settings.h>
 
 static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
 				    IRC_SERVER_CONNECT_REC *src)
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index 2d94a48b..037b19d6 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/servers-setup.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/core/irc-servers-setup.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-servers-setup.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/sasl.h>
 
 /* Fill information to connection from server setup record */
 static void sig_server_setup_fill_reconn(IRC_SERVER_CONNECT_REC *conn,
diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h
index ce5f0868..9ed2c614 100644
--- a/src/irc/core/irc-servers-setup.h
+++ b/src/irc/core/irc-servers-setup.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H
 #define IRSSI_IRC_CORE_IRC_SERVERS_SETUP_H
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/servers-setup.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers-setup.h>
 
 #define IRC_SERVER_SETUP(server) \
 	PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \
@@ -18,7 +18,7 @@ enum {
 };
 
 typedef struct {
-#include <irssi/src/core/server-setup-rec.h>
+#include <irssip/src/core/server-setup-rec.h>
 
         /* override the default if > 0 */
 	int max_cmds_at_once;
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 7e8fdb5a..4dc41506 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -20,31 +20,31 @@
 
 #include "module.h"
 
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
 
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/core/irc-servers-setup.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-cap.h>
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-servers-setup.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-cap.h>
+#include <irssip/src/irc/core/sasl.h>
 
-#include <irssi/src/core/channels-setup.h>
-#include <irssi/src/irc/core/channel-rejoin.h>
-#include <irssi/src/irc/core/servers-idle.h>
-#include <irssi/src/core/servers-reconnect.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/irc/core/modes.h>
+#include <irssip/src/core/channels-setup.h>
+#include <irssip/src/irc/core/channel-rejoin.h>
+#include <irssip/src/irc/core/servers-idle.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/modes.h>
 
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/recode.h>
 
 #define DEFAULT_MAX_KICKS 1
 #define DEFAULT_MAX_MODES 3
@@ -364,7 +364,7 @@ static void init_ssl_loop(IRC_SERVER_REC *server, GIOChannel *handle)
 	}
 }
 
-#include <irssi/src/core/line-split.h>
+#include <irssip/src/core/line-split.h>
 void irc_server_send_starttls(IRC_SERVER_REC *server)
 {
 	g_return_if_fail(server != NULL);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 53ff1436..82df135f 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -1,10 +1,10 @@
 #ifndef IRSSI_IRC_CORE_IRC_SERVERS_H
 #define IRSSI_IRC_CORE_IRC_SERVERS_H
 
-#include <irssi/src/core/chat-protocols.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/scram.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/scram.h>
 
 /*
  * 63 is the maximum hostname length defined by the protocol.  10 is a common
@@ -46,7 +46,7 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _IRC_SERVER_CONNECT_REC {
-#include <irssi/src/core/server-connect-rec.h>
+#include <irssip/src/core/server-connect-rec.h>
 
 	char *usermode;
 	char *alternate_nick;
@@ -68,7 +68,7 @@ struct _IRC_SERVER_CONNECT_REC {
 
 #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC
 struct _IRC_SERVER_REC {
-#include <irssi/src/core/server-rec.h>
+#include <irssip/src/core/server-rec.h>
 
 	int max_message_len; /* Maximum message length, default = 510 = 512 - 2 (for CR+LF) */
 
diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c
index 49d9a3f2..d7ba04da 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/network.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-servers-setup.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers-setup.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
 
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/irc/core/sasl.h>
 
 struct _isupport_data { CONFIG_REC *config; CONFIG_NODE *node; };
 
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index a52e9198..4431aefb 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/refstrings.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/refstrings.h>
 
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
 char *current_server_event;
 static int signal_default_event;
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index 92fb4ccb..aaff5494 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -60,7 +60,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 GHashTable *irc_parse_message_tags(const char *tags);
 
 /* Get count parameters from data */
-#include <irssi/src/core/commands.h>
+#include <irssip/src/core/commands.h>
 char *event_get_param(char **data);
 char *event_get_params(const char *data, int count, ...);
 
diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index aef5e617..4d6fc67b 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
 static int timeout_tag;
 
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index 15a9a9a8..613ca395 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
 
 static int massjoin_tag;
 static int massjoin_max_joins;
diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c
index d2d7234f..3eb60573 100644
--- a/src/irc/core/mode-lists.c
+++ b/src/irc/core/mode-lists.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/mode-lists.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/mode-lists.h>
 
 static void ban_free(GSList **list, BAN_REC *rec)
 {
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index ff37a1e1..0dcafe1a 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-commands.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/core/nicklist.h>
 
 /* Change nick's mode in channel */
 static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h
index f899a06d..ec2fa7ed 100644
--- a/src/irc/core/modes.h
+++ b/src/irc/core/modes.h
@@ -1,8 +1,8 @@
 #ifndef IRSSI_IRC_CORE_MODES_H
 #define IRSSI_IRC_CORE_MODES_H
 
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/core/nicklist.h> /* MAX_USER_PREFIXES */
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/core/nicklist.h> /* MAX_USER_PREFIXES */
 
 typedef void mode_func_t(IRC_CHANNEL_REC *, const char *, char, char,
 			 char *, GString *);
diff --git a/src/irc/core/module.h b/src/irc/core/module.h
index 41800038..68344733 100644
--- a/src/irc/core/module.h
+++ b/src/irc/core/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/core"
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 4a902c9e..8a50ad2d 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/netsplit.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/netsplit.h>
 
 /* How long to keep netsplits in memory (seconds) */
 #define NETSPLIT_MAX_REMEMBER (60*60)
diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h
index 50edf63b..f0b601ea 100644
--- a/src/irc/core/netsplit.h
+++ b/src/irc/core/netsplit.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_CORE_NETSPLIT_H
 #define IRSSI_IRC_CORE_NETSPLIT_H
 
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/nicklist.h>
 
 typedef struct {
 	char *server;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 89ca4a9e..6a85b2d7 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-cap.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/sasl.h>
+#include <irssip/src/irc/core/irc-cap.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/sasl.h>
 
 /*
  * Based on IRCv3 SASL Extension Specification:
diff --git a/src/irc/core/scram.c b/src/irc/core/scram.c
index 4c950140..81e76bf8 100644
--- a/src/irc/core/scram.c
+++ b/src/irc/core/scram.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/irc/core/scram.h>
+#include <irssip/src/irc/core/scram.h>
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 
diff --git a/src/irc/core/servers-idle.c b/src/irc/core/servers-idle.c
index 93c8f05a..43debd75 100644
--- a/src/irc/core/servers-idle.c
+++ b/src/irc/core/servers-idle.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-idle.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-idle.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
 typedef struct {
 	char *cmd;
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 50560883..d6e628bc 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/rawlog.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/rawlog.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
 #define DEFAULT_REDIRECT_TIMEOUT 60
 
diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c
index ba0bed0b..129329bb 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/masks.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/masks.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
 
 static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
 {
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 68da0e27..e6d5c844 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/recode.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/core/masks.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/core/masks.h>
 
-#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
 
 static char *dcc_chat_get_new_id(const char *nick)
 {
diff --git a/src/irc/dcc/dcc-chat.h b/src/irc/dcc/dcc-chat.h
index ef992bb8..2a48ec4b 100644
--- a/src/irc/dcc/dcc-chat.h
+++ b/src/irc/dcc/dcc-chat.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_DCC_DCC_CHAT_H
 #define IRSSI_IRC_DCC_DCC_CHAT_H
 
-#include <irssi/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc.h>
 
 #define DCC_CHAT(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, CHAT_DCC_REC, type, "DCC", "CHAT")
@@ -10,7 +10,7 @@
 	(DCC_CHAT(dcc) ? TRUE : FALSE)
 
 struct CHAT_DCC_REC {
-#include <irssi/src/irc/dcc/dcc-rec.h>
+#include <irssip/src/irc/dcc/dcc-rec.h>
 
 	char *id; /* unique identifier - usually same as nick. */
 	NET_SENDBUF_REC *sendbuf;
diff --git a/src/irc/dcc/dcc-file-rec.h b/src/irc/dcc/dcc-file-rec.h
index 28a488e4..b6683569 100644
--- a/src/irc/dcc/dcc-file-rec.h
+++ b/src/irc/dcc/dcc-file-rec.h
@@ -1,4 +1,4 @@
-#include <irssi/src/irc/dcc/dcc-rec.h>
+#include <irssip/src/irc/dcc/dcc-rec.h>
 
 uoff_t size, skipped; /* file size / skipped at start */
 int fhandle; /* file handle */
diff --git a/src/irc/dcc/dcc-file.h b/src/irc/dcc/dcc-file.h
index 38986354..d9b29f7f 100644
--- a/src/irc/dcc/dcc-file.h
+++ b/src/irc/dcc/dcc-file.h
@@ -1,10 +1,10 @@
 #ifndef IRSSI_IRC_DCC_DCC_FILE_H
 #define IRSSI_IRC_DCC_DCC_FILE_H
 
-#include <irssi/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc.h>
 
 typedef struct {
-#include <irssi/src/irc/dcc/dcc-file-rec.h>
+#include <irssip/src/irc/dcc/dcc-file-rec.h>
 } FILE_DCC_REC;
 
 #endif
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index cc1c9e43..1cd8fa3c 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
 
 static char *dcc_get_recv_buffer;
 
diff --git a/src/irc/dcc/dcc-get.h b/src/irc/dcc/dcc-get.h
index 3624f2c8..943d2cee 100644
--- a/src/irc/dcc/dcc-get.h
+++ b/src/irc/dcc/dcc-get.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_DCC_DCC_GET_H
 #define IRSSI_IRC_DCC_DCC_GET_H
 
-#include <irssi/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc.h>
 
 #define DCC_GET(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, GET_DCC_REC, type, "DCC", "GET")
@@ -18,7 +18,7 @@ enum {
 };
 
 typedef struct {
-#include <irssi/src/irc/dcc/dcc-file-rec.h>
+#include <irssip/src/irc/dcc/dcc-file-rec.h>
 
 	int get_type; /* what to do if file exists? */
 	char *file; /* file name we're really moving, arg is just the reference */
diff --git a/src/irc/dcc/dcc-queue.c b/src/irc/dcc/dcc-queue.c
index 0253be4f..5cb592e7 100644
--- a/src/irc/dcc/dcc-queue.c
+++ b/src/irc/dcc/dcc-queue.c
@@ -21,15 +21,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/irc/dcc/dcc-queue.h>
+#include <irssip/src/irc/dcc/dcc-queue.h>
 
 static GPtrArray *queuelist;
 
diff --git a/src/irc/dcc/dcc-queue.h b/src/irc/dcc/dcc-queue.h
index 08dcee38..5b7f3ab0 100644
--- a/src/irc/dcc/dcc-queue.h
+++ b/src/irc/dcc/dcc-queue.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_DCC_DCC_QUEUE_H
 #define IRSSI_IRC_DCC_DCC_QUEUE_H
 
-#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
 
 enum {
 	DCC_QUEUE_NORMAL,
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index dd62ff9d..ce10974a 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/dcc/dcc-file.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
-#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-file.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
 
 static FILE_DCC_REC *dcc_resume_find(int type, const char *nick, int port)
 {
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index eccb8d37..67b82126 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/irc/dcc/dcc-send.h>
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/irc/dcc/dcc-queue.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-queue.h>
 
 #include <glob.h>
 
diff --git a/src/irc/dcc/dcc-send.h b/src/irc/dcc/dcc-send.h
index 881ef64e..4382415a 100644
--- a/src/irc/dcc/dcc-send.h
+++ b/src/irc/dcc/dcc-send.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_DCC_DCC_SEND_H
 #define IRSSI_IRC_DCC_DCC_SEND_H
 
-#include <irssi/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc.h>
 
 #define DCC_SEND(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, SEND_DCC_REC, type, "DCC", "SEND")
@@ -10,7 +10,7 @@
 	(DCC_SEND(dcc) ? TRUE : FALSE)
 
 typedef struct {
-#include <irssi/src/irc/dcc/dcc-file-rec.h>
+#include <irssip/src/irc/dcc/dcc-file-rec.h>
 
 	unsigned int file_quoted:1; /* file name was received quoted ("file name") */
 
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 4d1e94aa..90ab012d 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-server.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-server.h>
 
 void sig_dccget_connected(GET_DCC_REC *dcc);
 GET_DCC_REC *dcc_get_create(IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
diff --git a/src/irc/dcc/dcc-server.h b/src/irc/dcc/dcc-server.h
index 1a4449d4..86a49956 100644
--- a/src/irc/dcc/dcc-server.h
+++ b/src/irc/dcc/dcc-server.h
@@ -1,7 +1,7 @@
 #ifndef IRSSI_IRC_DCC_DCC_SERVER_H
 #define IRSSI_IRC_DCC_DCC_SERVER_H
 
-#include <irssi/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc.h>
 
 #define DCC_SERVER(dcc) \
 	MODULE_CHECK_CAST_MODULE(dcc, SERVER_DCC_REC, type, "DCC", "SERVER")
@@ -10,7 +10,7 @@
 	(DCC_SERVER(dcc) ? TRUE : FALSE)
 
 struct SERVER_DCC_REC {
-#include <irssi/src/irc/dcc/dcc-rec.h>
+#include <irssip/src/irc/dcc/dcc-rec.h>
 	NET_SENDBUF_REC *sendbuf;
 
 	unsigned int accept_send:1;   /* Accept SEND connections */
diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c
index bb1c6c22..520ba277 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/servers-setup.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/servers-setup.h>
 
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
-#include <irssi/src/irc/dcc/dcc-server.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/dcc/dcc-server.h>
 
 void dcc_resume_init(void);
 void dcc_resume_deinit(void);
diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h
index 258d3395..482a304c 100644
--- a/src/irc/dcc/dcc.h
+++ b/src/irc/dcc/dcc.h
@@ -1,15 +1,15 @@
 #ifndef IRSSI_IRC_DCC_DCC_H
 #define IRSSI_IRC_DCC_DCC_H
 
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/network.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/network.h>
 
 #define DCC(dcc) ((DCC_REC *) (dcc))
 
 typedef struct CHAT_DCC_REC CHAT_DCC_REC;
 
 typedef struct {
-#include <irssi/src/irc/dcc/dcc-rec.h>
+#include <irssip/src/irc/dcc/dcc-rec.h>
 } DCC_REC;
 
 /* fully connected? */
diff --git a/src/irc/dcc/module.h b/src/irc/dcc/module.h
index 4330d0a3..5464cd21 100644
--- a/src/irc/dcc/module.h
+++ b/src/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/dcc"
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index 33bd91f4..895cab59 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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 <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/ignore.h>
 
 void autoignore_update(IGNORE_REC *rec, int level)
 {
diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c
index a1472648..3fae5820 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/ignore.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/ignore.h>
 
 void autoignore_init(void);
 void autoignore_deinit(void);
diff --git a/src/irc/flood/module.h b/src/irc/flood/module.h
index a80c46f7..8a0d1b36 100644
--- a/src/irc/flood/module.h
+++ b/src/irc/flood/module.h
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 typedef struct {
 	/* Flood protection */
diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h
index f109afff..e3fafffc 100644
--- a/src/irc/notifylist/module.h
+++ b/src/irc/notifylist/module.h
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/common.h>
+#include <irssip/src/irc/core/irc.h>
 
 #define MODULE_NAME "irc/notifylist"
 
@@ -23,7 +23,7 @@ typedef struct {
 	GSList *ison_tempusers; /* Temporary list for saving /ISON events.. */
 } MODULE_SERVER_REC;
 
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
 NOTIFY_NICK_REC *notify_nick_create(IRC_SERVER_REC *server, const char *nick);
 void notify_nick_destroy(NOTIFY_NICK_REC *rec);
diff --git a/src/irc/notifylist/notify-commands.c b/src/irc/notifylist/notify-commands.c
index e7bceaac..8931e81b 100644
--- a/src/irc/notifylist/notify-commands.c
+++ b/src/irc/notifylist/notify-commands.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
 /* SYNTAX: NOTIFY [-away] <mask> [<ircnets>] */
 static void cmd_notify(gchar *data)
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 809394c4..507298f6 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
 #define DEFAULT_NOTIFY_CHECK_TIME "1min"
 #define DEFAULT_NOTIFY_WHOIS_TIME "5min"
diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c
index 62f983e2..531823be 100644
--- a/src/irc/notifylist/notify-setup.c
+++ b/src/irc/notifylist/notify-setup.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/lib-config/iconfig.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/lib-config/iconfig.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
 void notifylist_add_config(NOTIFYLIST_REC *rec)
 {
diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c
index bdfd72b4..c469f863 100644
--- a/src/irc/notifylist/notify-whois.c
+++ b/src/irc/notifylist/notify-whois.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/expandos.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/expandos.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/masks.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/masks.h>
 
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
 static char *last_notify_nick;
 
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index 73737b37..b70d841c 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/core/masks.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/core/masks.h>
+#include <irssip/src/core/nicklist.h>
 
-#include <irssi/src/irc/notifylist/notifylist.h>
-#include <irssi/src/irc/notifylist/notify-setup.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/notifylist/notify-setup.h>
 
 GSList *notifies;
 
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 82dc1fe5..51a212c4 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/irssi-version.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/irssi-version.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/modes.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/modes.h>
 
 void proxy_outdata(CLIENT_REC *client, const char *data, ...)
 {
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index 19aba87d..dfab831f 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/net-sendbuffer.h>
-#include <irssi/src/irc/core/servers-redirect.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/net-sendbuffer.h>
+#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/misc.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-channels.h>
 
-#include <irssi/src/fe-common/core/printtext.h> /* FIXME: evil. need to do fe-proxy */
+#include <irssip/src/fe-common/core/printtext.h> /* FIXME: evil. need to do fe-proxy */
 
 #include <sys/un.h>
 
diff --git a/src/irc/proxy/module.h b/src/irc/proxy/module.h
index b6ad3a4c..ddd02972 100644
--- a/src/irc/proxy/module.h
+++ b/src/irc/proxy/module.h
@@ -1,12 +1,12 @@
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #define MODULE_NAME "proxy"
 
-#include <irssi/src/core/network.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
-#include <irssi/src/irc/proxy/proxy.h>
+#include <irssip/src/irc/proxy/proxy.h>
 
 extern GSList *proxy_listens;
 extern GSList *proxy_clients;
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index d32b6009..3ccb4e00 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
 /* SYNTAX: IRSSIPROXY STATUS */
 static void cmd_irssiproxy_status(const char *data, IRC_SERVER_REC *server)
diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h
index 5b3d25f5..49ca1c44 100644
--- a/src/irc/proxy/proxy.h
+++ b/src/irc/proxy/proxy.h
@@ -1,11 +1,11 @@
 #ifndef IRSSI_IRC_PROXY_PROXY_H
 #define IRSSI_IRC_PROXY_PROXY_H
 
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
-#include <irssi/src/core/network.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
 
 typedef struct {
 	int port;
diff --git a/src/lib-config/module.h b/src/lib-config/module.h
index eb09d70e..ac3d8dd1 100644
--- a/src/lib-config/module.h
+++ b/src/lib-config/module.h
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/lib-config/iconfig.h>
+#include <irssip/src/common.h>
+#include <irssip/src/lib-config/iconfig.h>
 
 /* private */
 int config_error(CONFIG_REC *rec, const char *msg);
diff --git a/src/otr/key.c b/src/otr/key.c
index 36eb9f9d..d0b7397b 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -28,15 +28,15 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <irssi/src/otr/key.h>
+#include <irssip/src/otr/key.h>
 
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/pidwait.h>
-#include <irssi/src/fe-common/core/printtext.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/src/fe-common/core/printtext.h>
 
-#include <irssi/src/otr/irssi-otr.h>
-#include <irssi/src/otr/otr-formats.h>
+#include <irssip/src/otr/irssi-otr.h>
+#include <irssip/src/otr/otr-formats.h>
 
 /*
  * Status of key generation.
diff --git a/src/otr/key.h b/src/otr/key.h
index e9476953..4f99a5d1 100644
--- a/src/otr/key.h
+++ b/src/otr/key.h
@@ -21,10 +21,10 @@
 #ifndef IRSSI_OTR_KEY_H
 #define IRSSI_OTR_KEY_H
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/servers.h>
 
-#include <irssi/src/otr/otr.h>
+#include <irssip/src/otr/otr.h>
 
 void key_gen_run(struct otr_user_state *ustate, const char *account_name);
 void key_load(struct otr_user_state *ustate);
diff --git a/src/otr/module.h b/src/otr/module.h
index dab26345..dc8dba42 100644
--- a/src/otr/module.h
+++ b/src/otr/module.h
@@ -21,8 +21,8 @@
 #ifndef IRSSI_OTR_MODULE
 #define IRSSI_OTR_MODULE
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/servers.h>
 
 void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target);
 
diff --git a/src/otr/otr-fe.c b/src/otr/otr-fe.c
index 80b50ae5..7808c115 100644
--- a/src/otr/otr-fe.c
+++ b/src/otr/otr-fe.c
@@ -20,18 +20,18 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/fe-text/statusbar-item.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/fe-text/statusbar-item.h>
 
-#include <irssi/src/otr/otr.h>
-#include <irssi/src/otr/otr-formats.h>
-#include <irssi/src/otr/key.h>
+#include <irssip/src/otr/otr.h>
+#include <irssip/src/otr/otr-formats.h>
+#include <irssip/src/otr/key.h>
 
 static void cmd_otr(const char *data, SERVER_REC *server, void *item)
 {
diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c
index af4d8aad..ff2fd473 100644
--- a/src/otr/otr-formats.c
+++ b/src/otr/otr-formats.c
@@ -19,8 +19,8 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include <irssi/src/otr/otr.h>
-#include <irssi/src/otr/otr-formats.h>
+#include <irssip/src/otr/otr.h>
+#include <irssip/src/otr/otr-formats.h>
 
 FORMAT_REC fe_otr_formats[] = {
 	/* clang-format off */
diff --git a/src/otr/otr-formats.h b/src/otr/otr-formats.h
index cf895dcb..b0f74fad 100644
--- a/src/otr/otr-formats.h
+++ b/src/otr/otr-formats.h
@@ -22,7 +22,7 @@
 #ifndef IRSSI_OTR_FORMATS_H
 #define IRSSI_OTR_FORMATS_H
 
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 /*
  * Must be in sync with the fe_otr_formats array.
diff --git a/src/otr/otr-module.c b/src/otr/otr-module.c
index 6fe4c9f2..193adec2 100644
--- a/src/otr/otr-module.c
+++ b/src/otr/otr-module.c
@@ -24,21 +24,21 @@
 
 #include "module.h"
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/commands.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/commands.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/core/irc-commands.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-commands.h>
 
-#include <irssi/src/otr/key.h>
-#include <irssi/src/otr/otr.h>
-#include <irssi/src/otr/otr-formats.h>
-#include <irssi/src/otr/otr-fe.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/otr/key.h>
+#include <irssip/src/otr/otr.h>
+#include <irssip/src/otr/otr-formats.h>
+#include <irssip/src/otr/otr-fe.h>
+#include <irssip/src/core/misc.h>
 
 /*
  * Global state for the user. Init when the module loads.
diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c
index f87e6e94..c2350454 100644
--- a/src/otr/otr-ops.c
+++ b/src/otr/otr-ops.c
@@ -17,17 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA
  */
 
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
 
-#include <irssi/src/otr/key.h>
+#include <irssip/src/otr/key.h>
 #include "module.h"
-#include <irssi/src/otr/otr-formats.h>
-#include <irssi/src/otr/irssi-otr.h>
+#include <irssip/src/otr/otr-formats.h>
+#include <irssip/src/otr/irssi-otr.h>
 
 static OtrlPolicy OTR_DEFAULT_POLICY = OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE;
 
diff --git a/src/otr/otr.c b/src/otr/otr.c
index abe24726..f52e4681 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -24,15 +24,15 @@
 #include <gcrypt.h>
 #include <unistd.h>
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-text/statusbar-item.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-text/statusbar-item.h>
 
-#include <irssi/src/otr/irssi-otr.h>
-#include <irssi/src/otr/otr-formats.h>
-#include <irssi/src/otr/key.h>
+#include <irssip/src/otr/irssi-otr.h>
+#include <irssip/src/otr/otr-formats.h>
+#include <irssip/src/otr/key.h>
 
 static int otr_debug = 0;
 
diff --git a/src/otr/otr.h b/src/otr/otr.h
index e0324a13..0bbe1561 100644
--- a/src/otr/otr.h
+++ b/src/otr/otr.h
@@ -28,8 +28,8 @@
 #include <libotr/context.h>
 #include <libotr/privkey.h>
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/servers.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/servers.h>
 
 /* irssi module name */
 #define MODULE_NAME                   "otr/core"
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index 94a8398a..1dd6d1a5 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -1,12 +1,12 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/irssi-version.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/core/utf8.h>
-#include <irssi/src/core/recode.h>
+#include <irssip/irssi-version.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/core/utf8.h>
+#include <irssip/src/core/recode.h>
 
-#include <irssi/src/core/pidwait.h>
-#include <irssi/src/core/session.h>
+#include <irssip/src/core/pidwait.h>
+#include <irssip/src/core/session.h>
 
 #define DEFAULT_COMMAND_CATEGORY "Perl scripts' commands"
 
diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs
index 1dc36d27..c1498f83 100644
--- a/src/perl/common/Expando.xs
+++ b/src/perl/common/Expando.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/expandos.h>
+#include <irssip/src/core/expandos.h>
 
 typedef struct {
 	PERL_SCRIPT_REC *script;
diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs
index 0f172411..ecf3e530 100644
--- a/src/perl/common/Settings.xs
+++ b/src/perl/common/Settings.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/misc.h>
 
 static GHashTable *perl_settings;
 
diff --git a/src/perl/common/module.h b/src/perl/common/module.h
index 92a712f8..3819175b 100644
--- a/src/perl/common/module.h
+++ b/src/perl/common/module.h
@@ -1,32 +1,32 @@
 #define NEED_PERL_H
 #define HAVE_CONFIG_H
-#include <irssi/src/perl/module.h>
+#include <irssip/src/perl/module.h>
 #include <XSUB.h>
 
-#include <irssi/src/core/network.h>
-#include <irssi/src/core/levels.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/log.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/masks.h>
-#include <irssi/src/core/special-vars.h>
-#include <irssi/src/core/window-item-def.h>
+#include <irssip/src/core/network.h>
+#include <irssip/src/core/levels.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/masks.h>
+#include <irssip/src/core/special-vars.h>
+#include <irssip/src/core/window-item-def.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-reconnect.h>
-#include <irssi/src/core/servers-setup.h>
-#include <irssi/src/core/channels.h>
-#include <irssi/src/core/queries.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/servers-reconnect.h>
+#include <irssip/src/core/servers-setup.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.h>
 
-#include <irssi/src/perl/perl-core.h>
-#include <irssi/src/perl/perl-common.h>
-#include <irssi/src/perl/perl-signals.h>
-#include <irssi/src/perl/perl-sources.h>
+#include <irssip/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-common.h>
+#include <irssip/src/perl/perl-signals.h>
+#include <irssip/src/perl/perl-sources.h>
 
 typedef COMMAND_REC *Irssi__Command;
 typedef LOG_REC *Irssi__Log;
diff --git a/src/perl/irc/Ctcp.xs b/src/perl/irc/Ctcp.xs
index 34978870..d37188bc 100644
--- a/src/perl/irc/Ctcp.xs
+++ b/src/perl/irc/Ctcp.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/irc/core/ctcp.h>
+#include <irssip/src/irc/core/ctcp.h>
 
 MODULE = Irssi::Irc::Ctcp	PACKAGE = Irssi
 PROTOTYPES: ENABLE
diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index 63e3111a..74db21a6 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -1,6 +1,6 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/misc.h>
+#include <irssip/src/core/misc.h>
 
 static GSList *register_hash2list(HV *hv)
 {
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index 3dcfb065..d49dcd4a 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,28 +1,28 @@
-#include <irssi/src/perl/common/module.h>
+#include <irssip/src/perl/common/module.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-chatnets.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-queries.h>
-#include <irssi/src/irc/core/irc-nicklist.h>
-#include <irssi/src/irc/core/irc-masks.h>
-#include <irssi/src/irc/core/irc-cap.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-queries.h>
+#include <irssip/src/irc/core/irc-nicklist.h>
+#include <irssip/src/irc/core/irc-masks.h>
+#include <irssip/src/irc/core/irc-cap.h>
 
-#include <irssi/src/irc/core/bans.h>
-#include <irssi/src/irc/core/modes.h>
-#include <irssi/src/irc/core/mode-lists.h>
-#include <irssi/src/irc/core/netsplit.h>
-#include <irssi/src/irc/core/servers-redirect.h>
+#include <irssip/src/irc/core/bans.h>
+#include <irssip/src/irc/core/modes.h>
+#include <irssip/src/irc/core/mode-lists.h>
+#include <irssip/src/irc/core/netsplit.h>
+#include <irssip/src/irc/core/servers-redirect.h>
 
-#include <irssi/src/irc/dcc/dcc.h>
-#include <irssi/src/irc/dcc/dcc-file.h>
-#include <irssi/src/irc/dcc/dcc-chat.h>
-#include <irssi/src/irc/dcc/dcc-get.h>
-#include <irssi/src/irc/dcc/dcc-send.h>
-#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssip/src/irc/dcc/dcc.h>
+#include <irssip/src/irc/dcc/dcc-file.h>
+#include <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssip/src/irc/dcc/dcc-get.h>
+#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssip/src/irc/notifylist/notifylist.h>
 
-#include <irssi/src/irc/proxy/proxy.h>
+#include <irssip/src/irc/proxy/proxy.h>
 
 typedef IRC_SERVER_REC *Irssi__Irc__Server;
 typedef IRC_SERVER_CONNECT_REC *Irssi__Irc__Connect;
diff --git a/src/perl/module-formats.c b/src/perl/module-formats.c
index 0b8b7b4c..b51cb1c3 100644
--- a/src/perl/module-formats.c
+++ b/src/perl/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 FORMAT_REC feperl_formats[] = {
 	{ MODULE_NAME, "Core", 0 },
diff --git a/src/perl/module-formats.h b/src/perl/module-formats.h
index 43b2f4ae..0d346a66 100644
--- a/src/perl/module-formats.h
+++ b/src/perl/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/perl/module.h b/src/perl/module.h
index 0a4d78f6..2c7ddc13 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -1,4 +1,4 @@
-#include <irssi/src/common.h>
+#include <irssip/src/common.h>
 
 #ifdef NEED_PERL_H
 #  include <EXTERN.h>
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 58b56bb8..4001b78d 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -21,28 +21,28 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/ignore.h>
-#include <irssi/src/core/log.h>
-#include <irssi/src/core/rawlog.h>
-#include <irssi/src/core/servers-reconnect.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/ignore.h>
+#include <irssip/src/core/log.h>
+#include <irssip/src/core/rawlog.h>
+#include <irssip/src/core/servers-reconnect.h>
 
-#include <irssi/src/core/window-item-def.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/queries.h>
-#include <irssi/src/core/nicklist.h>
+#include <irssip/src/core/window-item-def.h>
+#include <irssip/src/core/chat-protocols.h>
+#include <irssip/src/core/chatnets.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/channels.h>
+#include <irssip/src/core/queries.h>
+#include <irssip/src/core/nicklist.h>
 
-#include <irssi/src/perl/perl-core.h>
-#include <irssi/src/perl/perl-common.h>
+#include <irssip/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-common.h>
 
 typedef struct {
 	char *stash;
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index fe2d2f62..a64b89de 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -26,16 +26,16 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/settings.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/settings.h>
 
-#include <irssi/src/perl/perl-core.h>
-#include <irssi/src/perl/perl-common.h>
-#include <irssi/src/perl/perl-signals.h>
-#include <irssi/src/perl/perl-sources.h>
+#include <irssip/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-common.h>
+#include <irssip/src/perl/perl-signals.h>
+#include <irssip/src/perl/perl-sources.h>
 
 #include "XSUB.h"
 #include "irssi-core.pl.h"
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index ac84d67a..ea262b7f 100644
--- a/src/perl/perl-fe.c
+++ b/src/perl/perl-fe.c
@@ -18,17 +18,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/perl/module-fe.h>
-#include <irssi/src/core/modules.h>
-#include <irssi/src/perl/module-formats.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/levels.h>
+#include <irssip/src/perl/module-fe.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/perl/module-formats.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/levels.h>
 
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/completion.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/completion.h>
 
-#include <irssi/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-core.h>
 
 static void cmd_script(const char *data, SERVER_REC *server, void *item)
 {
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 683b4c3f..c69b07e0 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -21,15 +21,15 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/commands.h>
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/servers.h>
-#include <irssi/src/core/signals.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/core/commands.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/servers.h>
+#include <irssip/src/core/signals.h>
+#include <irssip/src/fe-common/core/formats.h>
 
-#include <irssi/src/perl/perl-core.h>
-#include <irssi/src/perl/perl-common.h>
-#include <irssi/src/perl/perl-signals.h>
+#include <irssip/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-common.h>
+#include <irssip/src/perl/perl-signals.h>
 
 typedef struct {
         PERL_SCRIPT_REC *script;
diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c
index 9f9ec6b5..a456447c 100644
--- a/src/perl/perl-sources.c
+++ b/src/perl/perl-sources.c
@@ -21,12 +21,12 @@
 #define NEED_PERL_H
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
-#include <irssi/src/core/signals.h>
+#include <irssip/src/core/signals.h>
 
-#include <irssi/src/perl/perl-core.h>
-#include <irssi/src/perl/perl-common.h>
-#include <irssi/src/perl/perl-sources.h>
-#include <irssi/src/core/misc.h>
+#include <irssip/src/perl/perl-core.h>
+#include <irssip/src/perl/perl-common.h>
+#include <irssip/src/perl/perl-sources.h>
+#include <irssip/src/core/misc.h>
 
 typedef struct {
         PERL_SCRIPT_REC *script;
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index 655dbd3c..d68d3fd6 100644
--- a/src/perl/textui/TextBuffer.xs
+++ b/src/perl/textui/TextBuffer.xs
@@ -1,7 +1,7 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
 #include "wrapper_buffer_line.h"
-#include <irssi/src/fe-text/textbuffer-formats.h>
+#include <irssip/src/fe-text/textbuffer-formats.h>
 
 MODULE = Irssi::TextUI::TextBuffer  PACKAGE = Irssi
 PROTOTYPES: ENABLE
diff --git a/src/perl/textui/module.h b/src/perl/textui/module.h
index aba5bd77..7aeb6b80 100644
--- a/src/perl/textui/module.h
+++ b/src/perl/textui/module.h
@@ -1,12 +1,12 @@
-#include <irssi/src/perl/ui/module.h>
+#include <irssip/src/perl/ui/module.h>
 
-#include <irssi/src/fe-text/mainwindows.h>
-#include <irssi/src/fe-text/gui-windows.h>
-#include <irssi/src/fe-text/gui-printtext.h>
-#include <irssi/src/fe-text/statusbar.h>
-#include <irssi/src/fe-text/textbuffer.h>
-#include <irssi/src/fe-text/textbuffer-view.h>
-#include <irssi/src/fe-text/gui-entry.h>
+#include <irssip/src/fe-text/mainwindows.h>
+#include <irssip/src/fe-text/gui-windows.h>
+#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssip/src/fe-text/statusbar.h>
+#include <irssip/src/fe-text/textbuffer.h>
+#include <irssip/src/fe-text/textbuffer-view.h>
+#include <irssip/src/fe-text/gui-entry.h>
 
 typedef MAIN_WINDOW_REC *Irssi__TextUI__MainWindow;
 typedef TEXT_BUFFER_REC *Irssi__TextUI__TextBuffer;
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index d001f382..9cae44f0 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -1,7 +1,7 @@
 #define PERL_NO_GET_CONTEXT
 #include "module.h"
 
-#include <irssi/src/fe-common/core/window-activity.h>
+#include <irssip/src/fe-common/core/window-activity.h>
 
 MODULE = Irssi::UI::Window  PACKAGE = Irssi
 PROTOTYPES: ENABLE
diff --git a/src/perl/ui/module.h b/src/perl/ui/module.h
index 4106aec4..3a4acca5 100644
--- a/src/perl/ui/module.h
+++ b/src/perl/ui/module.h
@@ -1,12 +1,12 @@
-#include <irssi/src/perl/common/module.h>
+#include <irssip/src/perl/common/module.h>
 
-#include <irssi/src/fe-common/core/fe-windows.h>
-#include <irssi/src/fe-common/core/fe-exec.h>
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-common/core/printtext.h>
-#include <irssi/src/fe-common/core/window-items.h>
-#include <irssi/src/fe-common/core/themes.h>
-#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssip/src/fe-common/core/fe-windows.h>
+#include <irssip/src/fe-common/core/fe-exec.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/printtext.h>
+#include <irssip/src/fe-common/core/window-items.h>
+#include <irssip/src/fe-common/core/themes.h>
+#include <irssip/src/fe-common/core/keyboard.h>
 
 typedef WINDOW_REC *Irssi__UI__Window;
 typedef TEXT_DEST_REC *Irssi__UI__TextDest;
diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c
index d1164f91..ce5fc029 100644
--- a/tests/fe-common/core/test-formats.c
+++ b/tests/fe-common/core/test-formats.c
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/fe-common/core/formats.h>
+#include <irssip/src/common.h>
+#include <irssip/src/fe-common/core/formats.h>
 
 #define MAX_LENGTH 5
 
diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c
index 87669598..1d8e8ee9 100644
--- a/tests/fe-text/test-paste-join-multiline.c
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -1,5 +1,5 @@
-#include <irssi/src/common.h>
-#include <irssi/src/fe-text/gui-readline.c>
+#include <irssip/src/common.h>
+#include <irssip/src/fe-text/gui-readline.c>
 
 typedef struct {
 	char const *const description;
diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c
index c6490e6b..2a37014e 100644
--- a/tests/irc/core/test-channel-events.c
+++ b/tests/irc/core/test-channel-events.c
@@ -20,18 +20,18 @@
 
 #include <glib.h>
 
-#include <irssi/src/irc/core/channel-events.h>
-#include <irssi/src/common.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-channels.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/core/modules.h>
-#include <irssi/src/core/recode.h>
-#include <irssi/src/core/settings.h>
-#include <irssi/src/core/signals.h>
+#include <irssip/src/irc/core/channel-events.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/core/modules.h>
+#include <irssip/src/core/recode.h>
+#include <irssip/src/core/settings.h>
+#include <irssip/src/core/signals.h>
 #include <time.h>
-#include <irssi/src/core/args.h>
+#include <irssip/src/core/args.h>
 
 #define MODULE_NAME "test-channel-events"
 
diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c
index 4845d54c..53a41644 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -19,7 +19,7 @@
 */
 
 #include <glib.h>
-#include <irssi/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc.h>
 #include <string.h>
 
 typedef struct {
diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c
index a2864144..1b939620 100644
--- a/tests/irc/flood/test-796.c
+++ b/tests/irc/flood/test-796.c
@@ -18,18 +18,18 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <irssi/src/common.h>
-#include <irssi/src/core/args.h>
-#include <irssi/src/core/core.h>
-#include <irssi/src/core/misc.h>
-#include <irssi/src/core/servers-setup.h>
+#include <irssip/src/common.h>
+#include <irssip/src/core/args.h>
+#include <irssip/src/core/core.h>
+#include <irssip/src/core/misc.h>
+#include <irssip/src/core/servers-setup.h>
 
-#include <irssi/src/fe-common/core/formats.h>
-#include <irssi/src/fe-common/core/fe-common-core.h>
+#include <irssip/src/fe-common/core/formats.h>
+#include <irssip/src/fe-common/core/fe-common-core.h>
 
-#include <irssi/src/irc/core/irc.h>
-#include <irssi/src/irc/core/irc-servers.h>
-#include <irssi/src/irc/core/irc-channels.h>
+#include <irssip/src/irc/core/irc.h>
+#include <irssip/src/irc/core/irc-servers.h>
+#include <irssip/src/irc/core/irc-channels.h>
 
 /* flood.c */
 void irc_flood_init(void);