From 09c23c2d0e76349e4492948cbcf7174a6cbc842d Mon Sep 17 00:00:00 2001
From: kofany <j@dabrowski.biz>
Date: Tue, 26 Aug 2025 02:20:38 +0200
Subject: [PATCH] Rename irssip to irssi and add configure script

Changed default nick, real_name, user_name, and autolog_path from 'irssip' to 'irssi' in config files. Updated Meson build system to use a configurable package name via new 'pkgname' option. Added an intelligent, interactive 'configure.sh' script for setup and build. Removed obsolete documentation and Perl script files related to 'irssip'.
---
 config_dev                                    |   8 +-
 configure.sh                                  | 160 +++++
 irssi.conf                                    |   8 +-
 meson.build                                   |   2 +-
 meson_options.txt                             |   1 +
 msg_flow.md                                   |  86 ---
 nm2.pl                                        | 569 ------------------
 plan3.md                                      | 169 ------
 plan4.md                                      | 202 -------
 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              |  10 +-
 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                  |  30 +-
 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 +-
 298 files changed, 1995 insertions(+), 2860 deletions(-)
 create mode 100755 configure.sh
 delete mode 100644 msg_flow.md
 delete mode 100644 nm2.pl
 delete mode 100644 plan3.md
 delete mode 100644 plan4.md

diff --git a/config_dev b/config_dev
index 7aea3a46..a29b672f 100644
--- a/config_dev
+++ b/config_dev
@@ -282,7 +282,7 @@ statusbar = {
 
 settings = {
   core = {
-    nick = "irssip_user";
+    nick = "irssi_user";
     hostname = "0.0.0.0";
     timestamp_format = "%H:%M:%S";
     override_coredump_limit = "no";
@@ -293,8 +293,8 @@ settings = {
     recode_fallback = "ISO-8859-2";
     recode_transliterate = "yes";
     recode = "yes";
-    real_name = "Irssip User";
-    user_name = "irssip";
+    real_name = "irssi User";
+    user_name = "irssi";
   };
   "irc/core" = {
     lag_check_time = "5s";
@@ -309,7 +309,7 @@ settings = {
     timestamp_level = "ALL";
     hilight_color = "%M";
     autolog = "yes";
-    autolog_path = "~/.irssip/logs/$tag/$0.log";
+    autolog_path = "~/.irssi/logs/$tag/$0.log";
     term_charset = "UTF-8";
     use_status_window = "no";
     hilight_nick_matches = "yes";
diff --git a/configure.sh b/configure.sh
new file mode 100755
index 00000000..4f133478
--- /dev/null
+++ b/configure.sh
@@ -0,0 +1,160 @@
+#!/bin/sh
+
+# configure.sh - Inteligentny, przenośny skrypt konfiguracyjny dla irssi-dev
+
+# --- Funkcje Pomocnicze ---
+ask_yes_no() {
+    while true; do
+        printf "$1 [y/n]: "
+        read -r answer
+        case "$answer" in
+            [Yy]*) return 0 ;;
+            [Nn]*) return 1 ;;
+            *) printf "Proszę odpowiedzieć 'y' lub 'n'.\n" ;;
+        esac
+    done
+}
+
+cleanup_backups() {
+    printf "🧹 Czyszczenie plików tymczasowych (.bak)...
+"
+    find . -name "*.bak" -type f -delete
+}
+
+# --- Krok 1: Wykrywanie OS i ustawianie domyślnych ścieżek ---
+OS_TYPE=$(uname -s)
+DEFAULT_SYSTEM_PREFIX="/usr/local"
+DEFAULT_USER_PREFIX="$HOME/.local"
+
+# --- Krok 2: Wykrywanie istniejącego irssi ---
+printf "🔎 Sprawdzanie istniejącej instalacji irssi...\n"
+EXISTING_IRSSI_BIN=$(command -v irssi)
+EXISTING_IRSSI_DIR="$HOME/.irssi"
+TARGET_NAME="irssi"
+
+if [ -n "$EXISTING_IRSSI_BIN" ] || [ -d "$EXISTING_IRSSI_DIR" ]; then
+    printf "⚠️ Wykryto istniejącą instalację irssi!\n"
+    if [ -n "$EXISTING_IRSSI_BIN" ]; then
+        printf "   - Plik binarny znaleziony w: %s\n" "$EXISTING_IRSSI_BIN"
+    fi
+    if [ -d "$EXISTING_IRSSI_DIR" ]; then
+        printf "   - Katalog konfiguracyjny znaleziony w: %s\n" "$EXISTING_IRSSI_DIR"
+    fi
+
+    printf "\nMożesz zainstalować tę wersję jako główny program lub obok, pod inną nazwą.\n"
+    printf "1. Zastąp (zainstaluj jako 'irssi')\n"
+    printf "2. Zainstaluj obok (jako 'arssi')\n"
+
+    while true; do
+        printf "Wybierz opcję [1/2]: "
+        read -r choice
+        case "$choice" in
+            1)
+                printf "Wybrano instalację jako 'irssi'.\n"
+                printf "🚨 Pamiętaj, aby ręcznie odinstalować poprzednią wersję za pomocą menedżera pakietów, aby uniknąć konfliktów.\n"
+                if ! ask_yes_no "Kontynuować?"; then printf "Przerwano.\n"; exit 1; fi
+                TARGET_NAME="irssi"
+                break
+                ;;
+            2)
+                printf "Wybrano instalację obok pod nazwą 'arssi'.\n"
+                TARGET_NAME="arssi"
+                break
+                ;;
+            *)
+                printf "Nieprawidłowy wybór.\n"
+                ;;
+        esac
+    done
+fi
+
+# --- Krok 3: Wybór typu instalacji (Systemowa vs. Użytkownika) ---
+printf "\nWybierz typ instalacji:\n"
+printf "1. Systemowa (dla wszystkich użytkowników, wymaga sudo, zalecane: %s)\n" "$DEFAULT_SYSTEM_PREFIX"
+printf "2. Lokalna (tylko dla Ciebie, nie wymaga sudo, zalecane: %s)\n" "$DEFAULT_USER_PREFIX"
+
+while true; do
+    printf "Wybierz opcję [1/2]: "
+        read -r choice
+    case "$choice" in
+        1)
+            INSTALL_PREFIX="$DEFAULT_SYSTEM_PREFIX"
+            SUDO_NEEDED="tak"
+            break
+            ;;
+        2)
+            INSTALL_PREFIX="$DEFAULT_USER_PREFIX"
+            SUDO_NEEDED="nie"
+            break
+            ;;
+        *)
+            printf "Nieprawidłowy wybór.\n"
+            ;;
+    esac
+done
+
+# --- Krok 4: Dynamiczna zmiana nazwy (jeśli to konieczne) ---
+MESON_OPTS=""
+if [ "$TARGET_NAME" != "irssi" ]; then
+    printf "\n🔧 Konfiguruj
+ę projektu do używania nazwy '%s'...
+" "$TARGET_NAME"
+    MESON_OPTS="-Dpkgname=$TARGET_NAME"
+
+    # Zmiana nazwy binarnej w meson.build
+    sed -i.bak "s/executable('irssi'/executable('$TARGET_NAME'/" src/fe-text/meson.build
+    
+    # Zmiana katalogu domowego w common.h
+    sed -i.bak "s|\"%s/.irssi\"|\"%s/.$TARGET_NAME\"|" src/common.h
+    
+    # Zmiana ścieżek #include w całym kodzie
+    printf "Aktualizowanie ścieżek #include...
+"
+    for ext in c h xs; do
+        find src tests -type f -name "*.$ext" -exec sed -i.bak "s|<irssi/|<$TARGET_NAME/|g" {} \;
+    done
+    
+    printf "✅ Konfiguracja nazwy zakończona.\n"
+fi
+
+# --- Krok 5: Uruchomienie procesu budowania ---
+BUILD_DIR="$(pwd)/Build"
+
+printf "\n🛠️  Przygotowywanie do budowania w katalogu: %s\n" "$BUILD_DIR"
+printf "📦 Prefiks instalacji: %s\n" "$INSTALL_PREFIX"
+
+if [ -d "$BUILD_DIR" ]; then
+    printf "Usuwanie istniejącego katalogu Build...
+"
+    rm -rf "$BUILD_DIR"
+fi
+
+printf "\n⚙️  Uruchamianie Meson...
+"
+if ! meson setup "$BUILD_DIR" -Dprefix="$INSTALL_PREFIX" -Dwith-perl=yes -Dwith-proxy=yes $MESON_OPTS; then
+    printf "❌ Błąd podczas konfiguracji Meson. Sprawdź logi powyżej.\n"
+    cleanup_backups
+    exit 1
+fi
+
+printf "\n🔨 Uruchamianie Ninja (kompilacja)...
+"
+if ! ninja -C "$BUILD_DIR"; then
+    printf "❌ Błąd podczas kompilacji. Sprawdź logi powyżej.\n"
+    cleanup_backups
+    exit 1
+fi
+
+# Czyszczenie po udanej kompilacji
+cleanup_backups
+
+printf "\n✨ Kompilacja zakończona sukcesem!\n"
+printf "Aby zainstalować, uruchom następującą komendę:\n"
+if [ "$SUDO_NEEDED" = "tak" ]; then
+    printf "sudo ninja -C %s install\n" "$BUILD_DIR"
+else
+    printf "ninja -C %s install\n" "$BUILD_DIR"
+    printf "\nUpewnij się, że katalog '%s/bin' jest dodany do Twojej zmiennej środowiskowej PATH.\n" "$INSTALL_PREFIX"
+fi
+
+exit 0
diff --git a/irssi.conf b/irssi.conf
index 05e5fe78..cd8685ac 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -242,7 +242,7 @@ statusbar = {
 
 settings = {
   core = {
-    nick = "irssip_user";
+    nick = "irssi_user";
     hostname = "0.0.0.0";
     timestamp_format = "%H:%M:%S";
     override_coredump_limit = "no";
@@ -253,8 +253,8 @@ settings = {
     recode_fallback = "ISO-8859-2";
     recode_transliterate = "yes";
     recode = "yes";
-    real_name = "Irssip User";
-    user_name = "irssip";
+    real_name = "irssi User";
+    user_name = "irssi";
   };
   "irc/core" = {
     lag_check_time = "5s";
@@ -269,7 +269,7 @@ settings = {
     timestamp_level = "ALL";
     hilight_color = "%M";
     autolog = "yes";
-    autolog_path = "~/.irssip/logs/$tag/$0.log";
+    autolog_path = "~/.irssi/logs/$tag/$0.log";
     term_charset = "UTF-8";
     use_status_window = "no";
     hilight_nick_matches = "yes";
diff --git a/meson.build b/meson.build
index e27260aa..f912c4f4 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ if host_machine.system() == 'android'
 endif
 
 includedir          = get_option('includedir')
-incdir              = 'irssip'
+incdir              = get_option('pkgname')
 moduledir           = get_option('libdir') / incdir / 'modules'
 helpdir             = get_option('datadir') / incdir / 'help'
 themedir            = get_option('datadir') / incdir / 'themes'
diff --git a/meson_options.txt b/meson_options.txt
index a5b4ffbb..fa6993fe 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,3 +14,4 @@ option('install-glib',      type : 'combo',  description : 'Download and install
 option('docdir',            type : 'string', description : 'Documentation directory')
 option('fhs-prefix',        type : 'string', description : 'System prefix for Termux')
 option('PACKAGE_VERSION',   type : 'string', description : 'Override PACKAGE_VERSION in tarballs')
+option('pkgname', type: 'string', value: 'irssi', description: 'Name for the package library directory.')
\ No newline at end of file
diff --git a/msg_flow.md b/msg_flow.md
deleted file mode 100644
index 9ce06609..00000000
--- a/msg_flow.md
+++ /dev/null
@@ -1,86 +0,0 @@
-## ANALIZA KROK PO KROKU - FLOW WIADOMOŚCI W IRSSI
-
-### 1. WIADOMOŚCI PRZYCHODZĄCE (od serwera do wyświetlenia)
-
-#### Krok 1: Odbieranie z serwera
-**Funkcja**: `irc_parse_incoming()` w `src/irc/core/irc.c:543`
-- Czyta dane z socketu przez `net_sendbuffer_receive_line()`
-- Emituje sygnał `"server incoming"` z surową linią
-
-#### Krok 2: Parsowanie IRC
-**Funkcja**: `irc_parse_incoming_line()` w `src/irc/core/irc.c:528`
-- Parsuje prefix (nick, address, tags) przez `irc_parse_prefix()`
-- Emituje sygnał `"server event tags"` z parsowanymi danymi
-
-#### Krok 3: Rozpoznanie typu wiadomości
-**Funkcja**: `irc_server_event()` w `src/irc/core/irc.c:370`
-- Parsuje komendę IRC (PRIVMSG, JOIN, etc.)
-- Emituje odpowiedni sygnał np. `"event privmsg"`
-
-#### Krok 4: Konwersja na sygnały wiadomości
-**Funkcja**: `event_privmsg()` w `src/fe-common/irc/fe-events.c:42`
-- Dekoduje wiadomość przez `recode_in()`
-- Rozróżnia kanał vs prywatna
-- Emituje `"message public"` lub `"message private"`
-
-#### Krok 5: Obsługa sygnału wiadomości
-**Funkcja**: `sig_message_public()` w `src/fe-common/core/fe-messages.c:168`
-- Znajduje kanał i nick record
-- Pobiera nickmode przez `channel_get_nickmode()`
-- Sprawdza highlight przez `hilight_match()`
-- **WYWOŁUJE**: `printformat_module("fe-common/core", server, target, level, TXT_PUBMSG, nick, address, msg, nickmode)`
-
-### 2. FORMATOWANIE I THEME
-
-#### Krok 6: printformat_module
-**Funkcja**: `printformat_module()` w `src/fe-common/core/printtext.c:101`
-- Tworzy `TEXT_DEST_REC` przez `format_create_dest()`
-- Wywołuje `printformat_module_dest_args()`
-
-#### Krok 7: Emisja sygnału formatowania
-**Funkcja**: `printformat_module_dest_charargs()` w `src/fe-common/core/printtext.c:64`
-- Pobiera theme przez `window_get_theme()`
-- **EMITUJE**: `signal_emit_id(signal_print_format, 5, theme, module, dest, formatnum, arglist)`
-
-#### Krok 8: Obsługa sygnału formatowania
-**Funkcja**: `sig_print_format()` w `src/fe-common/core/printtext.c:459`
-- **WYWOŁUJE**: `format_get_text_theme_charargs(theme, module, dest, formatnum, arglist)`
-
-#### Krok 9: Pobieranie tekstu z theme
-**Funkcja**: `format_get_text_theme_charargs()` w `src/fe-common/core/formats.c:831`
-- Znajduje moduł theme w `theme->modules`
-- Pobiera expanded format: `text = module_theme->expanded_formats[formatnum]`
-- **WYWOŁUJE**: `format_get_text_args(dest, text, args)`
-
-#### Krok 10: Parsowanie expandos i zmiennych
-**Funkcja**: `format_get_text_args()` w `src/fe-common/core/formats.c:737`
-- Iteruje przez tekst formatujący
-- Gdy napotka `$`, wywołuje `parse_special()`
-
-#### Krok 11: Parsowanie expandos
-**Funkcja**: `parse_special()` w `src/core/special-vars.c:425`
-- Parsuje składnię `$[alignment]variable`
-- **WYWOŁUJE**: `get_special_value()` → `get_variable()` → `get_long_variable_value()`
-
-#### Krok 12: Wykonanie expando
-**Funkcja**: `get_long_variable_value()` w `src/core/special-vars.c:95`
-- **WYWOŁUJE**: `func = expando_find_long(key)`
-- **WYWOŁUJE**: `return func(server, item, free_ret)` ← **TU SĄ NASZE EXPANDOS!**
-
-### 3. WIADOMOŚCI WYCHODZĄCE (nasze wiadomości)
-
-#### Krok 1: Input od użytkownika
-**Funkcja**: Obsługa klawiatury w `src/fe-text/gui-readline.c`
-- Przechwytuje Enter, wywołuje `signal_emit("send command", ...)`
-
-#### Krok 2: Parsowanie komendy
-**Funkcja**: `cmd_msg()` lub podobne w `src/irc/core/irc-commands.c`
-- Wysyła PRIVMSG do serwera
-- Emituje `"message own_public"` lub `"message own_private"`
-
-#### Krok 3: Formatowanie własnej wiadomości
-**Funkcja**: `sig_message_own_public()` w `src/fe-common/core/fe-messages.c:281`
-- Pobiera nickmode przez `channel_get_nickmode(channel, server->nick)`
-- **WYWOŁUJE**: `printformat_module("fe-common/core", server, target, level, TXT_OWN_MSG, server->nick, target, msg, nickmode)`
-
-**Dalej flow jest identyczny jak dla wiadomości przychodzących od kroku 6.**
diff --git a/nm2.pl b/nm2.pl
deleted file mode 100644
index b553bf25..00000000
--- a/nm2.pl
+++ /dev/null
@@ -1,569 +0,0 @@
-use Irssi;
-use strict;
-use v5.14;
-use List::Util qw(min max);
-use Hash::Util qw(lock_keys);
-
-our $VERSION = '2.1'; # a42b713aaa38823
-our %IRSSI = (
-    authors	=> 'Nei',
-    contact	=> 'Nei @ anti@conference.jabber.teamidiot.de',
-    url		=> "http://anti.teamidiot.de/",
-    name	=> 'nm2',
-    description => 'right aligned nicks depending on longest nick',
-    license	=> 'GPL v2',
-);
-
-# based on bc-bd's original nm.pl
-#
-# use a ** nickcolor_expando ** script for nick colors!
-#
-# why is there no right_mode? you can do that in your theme!
-
-# Options
-# =======
-# /set neat_dynamic <ON|OFF>
-# * whether the width should be dynamically chosen on each incoming
-#   message
-#
-# /set neat_shrink <ON|OFF>
-# * whether shrinking of the width is allowed, or only growing
-#
-# /set neat_staircase_shrink <ON|OFF>
-# * whether shrinking should be done one character at a time
-#
-# The following styles decide if the nick is left/right aligned and
-# where the colour/mode goes, they're a bit complex...
-# put the desired indicator(s) between the appropriate "," and the
-# default format of the public messages or actions will be rewritten
-# appropriately.
-# This can be used to align the nick left or right, before or after
-# the nick brackets and before or between the nickmode (by using the
-# pad on the correct place). To change the mode from left of the nick
-# to right of the nick, you need to modify the abstracts in your theme
-# however.
-# By placing the colour at the end, you can even colour the message
-# text in the nick colour, however it might be broken if there are
-# other colour codes used inside the message or by scripts.
-#
-# /format neat_style      , , , , , , , ,
-#                        î î î î î î î î î
-# p: pad                 | | | | | | | | `before message
-# c: colour              | | | | | | | `-after msgchannel
-# t: truncate indicator  | | | | | | `-before msgchannel
-#                        | | | | | `-after nick
-#                        | | | | `-before nick
-#                        | | | `-after mode
-#                        | | `-before mode
-#                        | `-before msgnick
-#                        `-none
-#
-# /format neat_action_style  , , , ,
-#                           î î î î î
-# p: pad                    | | | | `-before message
-# c: colour                 | | | `-after nick
-# t: truncate indicator     | | `-before nick
-#                           | `-before action
-#                           `-none
-#
-# /format neat_pad_char <char>
-# * the character(s) used for padding
-#
-# /format neat_truncate_char
-# * the format or character to indicate that nick was truncated
-#
-# /format neat_notruncate_char
-# * the format or character to indicate that nick NOT was truncated
-#
-# /format neat_customize_modes @@ | ++ |  ?
-# * a |-separated mapping of mode prefixes and their rendition, can be
-#   used to replace or colourise them
-#
-# /set neat_color_hinick <ON|OFF>
-# * whether to use colours in hilighted messages
-#
-# /set neat_color_menick <ON|OFF>
-# * whether to use colours in hilight_nick_matches
-#
-# /set neat_truncate_nick <ON|OFF>
-# * whether to truncate overlong nicks
-#
-# /set neat_custom_modes <ON|OFF>
-# * whether to enable the use of neat_customize_modes format
-#
-# /set neat_maxlength <number>
-# * number : (maximum) length to use for nick padding
-#
-# /set neat_melength <number>
-# * number : width to substract from maxlength for /me padding
-#
-# /set neat_history <number>
-# * number : number of formatted lines to remember for dynamic mode
-#
-
-my @action_protos = qw(irc silc xmpp);
-my (%histories, %S, @style, @astyle, %format_ok, %cmmap);
-
-my $align_expando = '';
-my $trunc_expando = '';
-my $cumode_expando = '';
-
-my $format_re = qr/ %(?=[}%{])
-		    | %[04261537kbgcrmywKBGCRMYWU9_8I:|FnN>#pP[]
-		    | %[Zz][[:xdigit:]]{6}
-		    | %[Xx](?i:0[a-f]|[1-6][0-9a-z]|7[a-x]) /x;
-
-sub update_expando {
-    my ($mode, $server, $target, $nick, $space) = @_;
-    my $t_add;
-    if (exists $Irssi::Script::{'realnames::'}
-	    && (my $code = 'Irssi::Script::realnames'->can('_get_nick_chan'))) {
-	if (my $i = $code->($server, $target, $nick)) {
-	    $nick = $i->{n}{realname}
-		if length $i->{n}{realname};
-	}
-    }
-    my $nl = length $nick;
-    my $pad_len = max(0, $space - $nl);
-    if ($S{truncate_nick}) {
-	if (($mode >= 4 && $S{trunc_in_anick})
-		|| ($mode < 4 && $S{trunc_in_nick})) {
-	    $t_add = $S{tnolen};
-	}
-	if ($nl + $t_add > $space) {
-	    $trunc_expando = format_expand($S{tyes_char});
-	    $t_add = $S{tyeslen} if defined $t_add;
-	}
-	else {
-	    $trunc_expando = format_expand($S{tno_char});
-	}
-	$pad_len = max(0, $pad_len - $t_add) if $t_add;
-    }
-    else {
-	$trunc_expando = '';
-    }
-    if ($pad_len) {
-	my @subs = split /($format_re)/, $S{pad_char} x $pad_len;
-	$align_expando = '';
-	my $clen = 0;
-	while (@subs) {
-	    my ($tx, $fmt) = splice @subs, 0, 2;
-	    my $txlen = length $tx // 0;
-	    $align_expando .= substr $tx, 0, ($pad_len - $clen) if defined $tx;
-	    $clen += $txlen;
-	    $align_expando .= $fmt if defined $fmt;
-	    last if $clen >= $pad_len;
-	}
-	$align_expando = format_expand($align_expando.'%n');
-    }
-    else {
-	$align_expando = '';
-    }
-    return $t_add;
-}
-
-sub prnt_clear_levels {
-    my ($dest) = @_;
-    clear_ref() if $dest->{level}
-	& (MSGLEVEL_PUBLIC|MSGLEVEL_MSGS|MSGLEVEL_ACTIONS|MSGLEVEL_DCCMSGS|MSGLEVEL_NOTICES);
-}
-
-sub clear_ref {
-    $trunc_expando = $align_expando = $cumode_expando = '';
-}
-
-sub expando_nickalign { $align_expando }
-sub expando_nicktrunc { $trunc_expando }
-sub expando_nickcumode { $cumode_expando }
-
-Irssi::expando_create('nickalign', \&expando_nickalign, {
-    'message public'	     => 'none',
-    'message own_public'     => 'none',
-    'message private'	     => 'none',
-    'message own_private'    => 'none',
-    (map { ("message $_ action"     => 'none',
-	    "message $_ own_action" => 'none')
-       } @action_protos),
-   });
-Irssi::expando_create('nicktrunc', \&expando_nicktrunc, {
-    'message public'	     => 'none',
-    'message own_public'     => 'none',
-    'message private'	     => 'none',
-    'message own_private'    => 'none',
-    (map { ("message $_ action"     => 'none',
-	    "message $_ own_action" => 'none')
-       } @action_protos),
-   });
-Irssi::expando_create('nickcumode', \&expando_nickcumode, {
-    'message public'	     => 'none',
-    'message own_public'     => 'none',
-    'message private'	     => 'none',
-    'message own_private'    => 'none',
-    (map { ("message $_ action"     => 'none',
-	    "message $_ own_action" => 'none')
-       } @action_protos),
-   });
-
-sub init_hist {
-    my ($server, $target) = @_;
-    if (my $ch = $server->channel_find($target)) {
-	[ max map { length } map { $_->{nick} } $ch->nicks ]
-    }
-    else {
-	[ max map { length } $server->{nick}, $target ]
-    }
-}
-
-my %em = (
-    p => '$nickalign',
-    c => '$nickcolor',
-    t => '$nicktrunc',
-    m => '$nickcumode',
-   );
-
-my %formats = (
-    own_action		   => [5, '{ownaction ',      '$0','}','$1' ],
-    action_public	   => [4, '{pubaction ',      '$0','}','$1' ],
-    action_private	   => [4, '{pvtaction ',      '$0','}','$2' ],
-    action_private_query   => [4, '{pvtaction_query ','$0','}','$2' ],
-    #                          * *                   * #  *   *
-
-    own_msg_private_query  => [3, '{ownprivmsgnick ', ''  ,'{ownprivnick ','$2','}',''               ,'}','$1' ],
-    msg_private_query	   => [2, '{privmsgnick '    ,''  ,''             ,'$0','' ,''               ,'}','$2' ],
-    own_msg		   => [1, '{ownmsgnick '     ,'$2',' {ownnick '   ,'$0','}',''               ,'}','$1' ],
-    own_msg_channel	   => [1, '{ownmsgnick '     ,'$3',' {ownnick '   ,'$0','}','{msgchannel $1}','}','$2' ],
-    pubmsg_me		   => [0, '{pubmsgmenick '   ,'$2',' {menick '    ,'$0','}',''               ,'}','$1' ],
-    pubmsg_me_channel	   => [0, '{pubmsgmenick '   ,'$3',' {menick '    ,'$0','}','{msgchannel $1}','}','$2' ],
-    pubmsg_hilight	   => [0, '{pubmsghinick $0 ','$3',' '            ,'$1', '','',              ,'}','$2' ],
-    pubmsg_hilight_channel => [0, '{pubmsghinick $0 ','$4',' '            ,'$1', '','{msgchannel $2}','}','$3' ],
-    pubmsg		   => [0, '{pubmsgnick '     ,'$2',' {pubnick '   ,'$0','}',''               ,'}','$1' ],
-    pubmsg_channel	   => [0, '{pubmsgnick '     ,'$3',' {pubnick '   ,'$0','}','{msgchannel $1}','}','$2' ],
-    #                          * *                   *    *            * #  *   *                 *   *
-   );
-
-sub reformat_format {
-    Irssi::signal_remove('command format', 'update_formats');
-    Irssi::signal_remove('theme changed'  => 'update_formats');
-    %format_ok = () unless @_;
-    my ($mode, $server, $target, $nick, $size) = @_;
-    for my $fmt (keys %formats) {
-	next if defined $mode && $formats{$fmt}[0] != $mode;
-
-	my @fs = @{ $formats{$fmt} };
-
-	my $ls;
-	if (defined $mode) {
-	    $ls = $size;
-	}
-	else {
-	    $ls = $fs[0] < 4 ? $S{max} : max(0, $S{max} - $S{melength});
-	}
-	next if exists $format_ok{$fmt} && $format_ok{$fmt} == $ls;
-
-	if ($S{truncate_nick} && $ls) {
-	    $fs[ $fs[0] < 4 ? 4 : 2 ] =~ s/\$/\$[.$ls]/;
-	}
-	if ($S{custom_modes} && $fs[0] < 4) {
-	    $fs[2] =~ s/\$\K\d/nickcumode/;
-	}
-	my $s;
-	local $em{c} = ''
-	    if ($fs[1] =~ /menick/ && !$S{color_menick})
-		|| ($fs[1] =~ /hinick/ && !$S{color_hinick});
-	my $sr = $fs[0] >= 4 ? \@astyle : \@style;
-	for my $i (1..$#fs) {
-	    $s .= ($sr->[$i] =~ s/(.)/$em{$1}/gr) if defined $sr->[$i];
-	    $s .= $fs[$i];
-	}
-	Irssi::command("^format $fmt $s");
-	$format_ok{$fmt} = $ls;
-    }
-    Irssi::signal_add_last({
-	'theme changed'  => 'update_formats',
-	'command format' => 'update_formats',
-    });
-}
-
-sub update_nm {
-    my ($mode, $server, $target, $nick) = @_;
-    my $tg = $server->{tag};
-    if (my $ch = $server->channel_find($target)) {
-	$target = $ch->{name};
-	my $nickobj = $ch->nick_find($nick);
-	if ($nickobj) {
-	    $nick = $nickobj->{nick};
-	    my $mode = substr $nickobj->{prefixes}.' ', 0, 1;
-	    $cumode_expando = exists $cmmap{$mode} ? format_expand($cmmap{$mode}) : $mode;
-	}
-	else {
-	    $cumode_expando = '';
-	}
-    }
-    elsif (my $q = $server->query_find($target)) {
-	$target = $q->{name};
-    }
-
-    my $longest;
-    if ($S{dynamic}) {
-	my $hist = $histories{"$tg/$target"} ||= init_hist($server, $target);
-	my $last = $histories{"$tg/$target/last"} || 1;
-	unshift @$hist, length $nick;
-	if (@$hist > 2*$S{history}) {
-	    splice @$hist, $S{history};
-	}
-	my @add;
-	unless ($S{shrink}) {
-	    push @add, $last;
-	}
-	if ($S{staircase}) {
-	    push @add, $last - 1
-	}
-	$longest = $histories{"$tg/$target/last"} = max(@$hist, @add);
-
-	if ($S{max} && ($S{max} < $longest || !$S{shrink})) {
-	    $longest = $S{max};
-	}
-    }
-    else {
-	$longest = $S{max};
-    }
-
-    my $size = $mode < 4 ? $longest : max(0, $longest - $S{melength});
-    my $t_add = update_expando($mode, $server, $target, $nick, $size);
-    $size = max(0, $size - $t_add) if defined $t_add;
-    if ($S{dynamic}) {
-	reformat_format($mode, $server, $target, $nick, $size);
-    }
-}
-
-sub sig_setup {
-    my %old_S = %S;
-    $S{history}	 = Irssi::settings_get_int('neat_history');
-    $S{max}	 = Irssi::settings_get_int('neat_maxlength');
-    $S{melength} = Irssi::settings_get_int('neat_melength');
-
-    $S{dynamic}	    = Irssi::settings_get_bool('neat_dynamic');
-    $S{shrink}	    = Irssi::settings_get_bool('neat_shrink');
-    $S{staircase}   = Irssi::settings_get_bool('neat_staircase_shrink');
-
-    $S{color_hinick}  = Irssi::settings_get_bool('neat_color_hinick');
-    $S{color_menick}  = Irssi::settings_get_bool('neat_color_menick');
-    $S{truncate_nick} = Irssi::settings_get_bool('neat_truncate_nick');
-    $S{custom_modes}  = Irssi::settings_get_bool('neat_custom_modes');
-
-    if (!defined $old_S{dynamic} || $old_S{dynamic} != $S{dynamic}) {
-	%histories = ();
-	reformat_format();
-    }
-    elsif ($old_S{max} != $S{max} || $old_S{melength} != $S{melength}
-	       || $old_S{color_hinick} != $S{color_hinick} || $old_S{color_menick} != $S{color_menick}
-		   || $old_S{truncate_nick} != $S{truncate_nick} || $old_S{custom_modes} != $S{custom_modes}) {
-	reformat_format();
-    }
-}
-
-sub update_formats {
-    my $was_style = "@style";
-    $S{style} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_style');
-    my $was_action_style = "@astyle";
-    $S{action_style} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_action_style');
-    $S{pad_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_pad_char');
-    $S{tno_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_notruncate_char');
-    $S{tnolen} = length($S{tno_char} =~ s/$format_re//gr);
-    $S{tyeslen} = length($S{tyes_char} =~ s/$format_re//gr);
-    $S{tyes_char} = Irssi::current_theme->get_format(__PACKAGE__, 'neat_truncate_char');
-    @style = map { y/pct//cd; $_ } split /,/, $S{style};
-    @astyle = map { y/pctm//cd; $_ } split /,/, $S{action_style};
-    $S{trunc_in_nick} = grep { /t/ } @style[2..min($#style, 6)];
-    $S{trunc_in_anick} = grep { /t/ } @astyle[2..min($#astyle, 3)];
-    my $custom_modes = Irssi::current_theme->get_format(__PACKAGE__, 'neat_custom_modes');
-    %cmmap = map { (substr $_, 0, 1), (substr $_, 1) } $custom_modes =~ /(?:^\s?|\G\s?\|\s?)((?!\s\|)(?:[^\\|[:space:]]|\\.|\s(?!\||$))*)/sg;
-    if ($was_style ne "@style" || $was_action_style ne "@astyle") {
-	reformat_format();
-    }
-}
-
-{
-    my %format2control = (
-	'F' => "\cDa", '_' => "\cDc", '|' => "\cDe", '#' => "\cDi", "n" => "\cDg", "N" => "\cDg",
-	'U' => "\c_", '8' => "\cV", 'I' => "\cDf",
-       );
-    my %bg_base = (
-	'0'   => '0', '4' => '1', '2' => '2', '6' => '3', '1' => '4', '5' => '5', '3' => '6', '7' => '7',
-	'x08' => '8', 'x09' => '9', 'x0a' => ':', 'x0b' => ';', 'x0c' => '<', 'x0d' => '=', 'x0e' => '>', 'x0f' => '?',
-       );
-    my %fg_base = (
-	'k' => '0', 'b' => '1', 'g' => '2', 'c' => '3', 'r' => '4', 'm' => '5', 'p' => '5', 'y' => '6', 'w' => '7',
-	'K' => '8', 'B' => '9', 'G' => ':', 'C' => ';', 'R' => '<', 'M' => '=', 'P' => '=', 'Y' => '>', 'W' => '?',
-       );
-    my @ext_colour_off = (
-	'.', '-', ',',
-	'+', "'", '&',
-       );
-    sub format_expand {
-	$_[0] =~ s{%(Z.{6}|z.{6}|X..|x..|.)}{
-	    my $c = $1;
-	    if (exists $format2control{$c}) {
-		$format2control{$c}
-	    }
-	    elsif (exists $bg_base{$c}) {
-		"\cD/$bg_base{$c}"
-	    }
-	    elsif (exists $fg_base{$c}) {
-		"\cD$fg_base{$c}/"
-	    }
-	    elsif ($c =~ /^[{}%]$/) {
-		$c
-	    }
-	    elsif ($c =~ /^(z|Z)([[:xdigit:]]{2})([[:xdigit:]]{2})([[:xdigit:]]{2})$/) {
-		my $bg = $1 eq 'z';
-		my (@rgb) = map { hex $_ } $2, $3, $4;
-		my $x = $bg ? 0x1 : 0;
-		my $out = "\cD" . (chr -13 + ord '0');
-		for (my $i = 0; $i < 3; ++$i) {
-		    if ($rgb[$i] > 0x20) {
-			$out .= chr $rgb[$i];
-		    }
-		    else {
-			$x |= 0x10 << $i; $out .= chr 0x20 + $rgb[$i];
-		    }
-		}
-		$out .= chr 0x20 + $x;
-		$out
-	    }
-	    elsif ($c =~ /^(x)(?:0([[:xdigit:]])|([1-6])(?:([0-9])|([a-z]))|7([a-x]))$/i) {
-		my $bg = $1 eq 'x';
-		my $col = defined $2 ? hex $2
-		    : defined $6 ? 232 + (ord lc $6) - (ord 'a')
-			: 16 + 36 * ($3 - 1) + (defined $4 ? $4 : 10 + (ord lc $5) - (ord 'a'));
-		if ($col < 0x10) {
-		    my $chr = chr $col + ord '0';
-		    "\cD" . ($bg ? "/$chr" : "$chr/")
-		}
-		else {
-		    "\cD" . $ext_colour_off[($col - 0x10) / 0x50 + $bg * 3] . chr (($col - 0x10) % 0x50 - 1 + ord '0')
-		}
-	    }
-	    else {
-		"%$c"
-	    }
-        }ger;
-    }
-}
-
-sub init {
-    update_formats();
-    sig_setup();
-    lock_keys(%S);
-    print "nm2 experimental version, please report issues. thanks!"
-}
-
-Irssi::settings_add_bool('misc', 'neat_dynamic', 1);
-Irssi::settings_add_bool('misc', 'neat_shrink', 1);
-Irssi::settings_add_bool('misc', 'neat_staircase_shrink', 0);
-
-Irssi::settings_add_bool('misc', 'neat_color_hinick', 0);
-Irssi::settings_add_bool('misc', 'neat_color_menick', 0);
-Irssi::settings_add_bool('misc', 'neat_truncate_nick', 1);
-Irssi::settings_add_bool('misc', 'neat_custom_modes', 0);
-
-Irssi::settings_add_int('misc', 'neat_maxlength', 0);
-Irssi::settings_add_int('misc', 'neat_melength', 2);
-Irssi::settings_add_int('misc', 'neat_history', 50);
-
-Irssi::signal_add('setup changed' => 'sig_setup');
-Irssi::signal_add_last({
-    'setup reread'   => 'sig_setup',
-    'theme changed'  => 'update_formats',
-    'command format' => 'update_formats',
-   });
-
-Irssi::theme_register([
-    'neat_style'	   => ' , , p , , c , t , , , ',
-    'neat_action_style'	   => ' , p , , t , ',
-    'neat_pad_char'	   => '%K.',
-    'neat_truncate_char'   => '%m+',
-    'neat_notruncate_char' => '',
-    'neat_custom_modes'    => '&%B&%n | @%g@%n | +%y+%n',
-   ]);
-
-Irssi::signal_add_first({
-    'message public' => sub {
-	my ($server, $msg, $nick, $address, $target) = @_;
-	update_nm(0, $server, $target, $nick);
-    },
-    'message private' => sub {
-	my ($server, $msg, $nick, $address) = @_;
-	update_nm(2, $server, $nick, $nick);
-    },
-    (map { ("message $_ action" => sub {
-	my ($server, $msg, $nick, $address, $target) = @_;
-	update_nm(4, $server, $target, $nick);
-    }) } qw(irc silc)),
-    'message xmpp action' => sub {
-	return unless @_;
-	my ($server, $msg, $nick, $target) = @_;
-	update_nm(4, $server, $target, $nick);
-    },
-   });
-
-sub channel_nick {
-    my ($server, $target) = @_;
-    ($server->channel_find($target)||+{ownnick=>$server})->{ownnick}{nick}
-}
-
-Irssi::signal_add_first({
-    'message own_public' => sub {
-	my ($server, $msg, $target) = @_;
-	update_nm(1, $server, $target, channel_nick($server, $target));
-    },
-    'message own_private' => sub {
-	my ($server, $msg, $target) = @_;
-	update_nm(3, $server, $target, $server->{nick});
-    },
-    (map { ("message $_ own_action" => sub {
-	my ($server, $msg, $target) = @_;
-	update_nm(5, $server, $target, $server->{nick});
-    }) } qw(irc silc)),
-    'message xmpp own_action' => sub {
-	return unless @_;
-	my ($server, $msg, $target) = @_;
-	update_nm(5, $server, $target, channel_nick($server, $target));
-    },
-   });
-Irssi::signal_add_last({
-    'channel destroyed' => sub {
-	my ($channel) = @_;
-	delete $histories{ $channel->{server}{tag} . '/' . $channel->{name} };
-	delete $histories{ $channel->{server}{tag} . '/' . $channel->{name} . '/last' };
-    },
-    'query destroyed' => sub {
-	my ($query) = @_;
-	delete $histories{ $query->{server}{tag} . '/' . $query->{name} };
-	delete $histories{ $query->{server}{tag} . '/' . $query->{name} . '/last' };
-    },
-    'query nick changed' => sub {
-	my ($query, $old_nick) = @_;
-	delete $histories{ $query->{server}{tag} . '/' . $old_nick };
-	delete $histories{ $query->{server}{tag} . '/' . $old_nick . '/last' };
-    },
-    'query server changed' => sub {
-	my ($query, $old_server) = @_;
-	delete $histories{ $old_server->{tag} . '/' . $query->{name} };
-	delete $histories{ $old_server->{tag} . '/' . $query->{name} . '/last' };
-    }
-   });
-Irssi::signal_add({
-    'print text' => 'prnt_clear_levels',
-});
-
-init();
-
-# Changelog
-# =========
-# 2.1 - support realnames script
-#
-# 2.0
-# - fix crash if xmpp action signal is not registered (just ignore it)
-# - do not grow either when using no-shrink with maxlength
-# - hopefully fix alignment in xmpp muc
diff --git a/plan3.md b/plan3.md
deleted file mode 100644
index 176c5a7d..00000000
--- a/plan3.md
+++ /dev/null
@@ -1,169 +0,0 @@
-# KOMPLEKSOWY PLAN IMPLEMENTACJI - NOWE PODEJŚCIE
-
-## WYTYCZNE OBOWIĄZKOWE:
-1. **Zawsze pamiętaj kontekst**: `msg_flow.md` i `summary.md`
-2. **Nie zbaczaj z wyznaczonej ścieżki** - trzymaj się planu
-3. **Checkpoint commits**: Po zmianach commit z pushem zawierający info o zmianach i timestamp (data + dokładna godzina)
-4. **ZAKAZ `ninja Build install`** - tylko build do sprawdzenia błędów kompilacji
-
-## ANALIZA PROBLEMU
-
-**KLUCZOWA OBSERWACJA**: Po analizie `msg_flow.md` i `summary.md` widzę, że:
-
-1. ❌ **`parse_special` + `ALIGN_COMBINE_MODE`** - już próbowane, problem z kolorami
-2. ❌ **Expandos** - nie mają dostępu do `arglist`, zwracają puste stringi  
-3. ✅ **NOWE ROZWIĄZANIE**: Modyfikacja na poziomie **`format_get_text_args`** (krok 10 w flow)
-
-## STRATEGIA: INTEGRACJA Z ARGUMENTAMI FORMATOWANIA
-
-### KLUCZOWA IDEA:
-Zamiast modyfikować `parse_special` lub tworzyć expandos, **wstrzykniemy dodatkowy parametr padding bezpośrednio do `arglist`** w `format_get_text_args()`.
-
-## PLAN IMPLEMENTACJI
-
-### FAZA 1: Przygotowanie Infrastruktury
-
-#### 1.1 Dodanie ustawień konfiguracyjnych
-**Plik**: `src/fe-common/core/fe-settings.c`
-```c
-// Dodać do settings_add_*():
-settings_add_bool("lookandfeel", "nick_column_enabled", FALSE);
-settings_add_int("lookandfeel", "nick_column_width", 12);
-```
-
-#### 1.2 Dodanie flag do TEXT_DEST_REC
-**Plik**: `src/fe-common/core/printtext.h`
-```c
-typedef struct {
-    // ... istniejące pola
-    int flags;  // nowe pole dla flag formatowania
-} TEXT_DEST_REC;
-
-#define PRINT_FLAG_NICK_COLUMN 0x01
-```
-
-### FAZA 2: Modyfikacja Flow Formatowania
-
-#### 2.1 Ustawienie flagi w obsłudze wiadomości
-**Plik**: `src/fe-common/core/fe-messages.c`
-
-W funkcjach `sig_message_public()` i `sig_message_own_public()`:
-```c
-// Po utworzeniu dest przez format_create_dest()
-if (settings_get_bool("nick_column_enabled")) {
-    dest.flags |= PRINT_FLAG_NICK_COLUMN;
-}
-```
-
-#### 2.2 Główna logika w format_get_text_args
-**Plik**: `src/fe-common/core/formats.c`
-
-W funkcji `format_get_text_args()` (krok 10 flow), **PRZED** pętlą parsowania:
-
-```c
-// Sprawdź czy nick column jest włączony
-if (dest && (dest->flags & PRINT_FLAG_NICK_COLUMN)) {
-    // Znajdź parametry mode i nick w arglist
-    char *mode = NULL, *nick = NULL;
-    
-    // Dla TXT_PUBMSG: args[0]=nick, args[3]=nickmode
-    // Dla TXT_OWN_MSG: args[0]=nick, args[3]=nickmode
-    if (args && args[0] && args[3]) {
-        nick = args[0];
-        mode = args[3];
-        
-        // Oblicz padding
-        int width = settings_get_int("nick_column_width");
-        int mode_len = strlen(mode);
-        int nick_len = strlen(nick);
-        int total_len = mode_len + nick_len;
-        
-        if (total_len < width) {
-            int padding_len = width - total_len;
-            char *padding = g_strnfill(padding_len, ' ');
-            
-            // Wstrzyknij padding jako nowy parametr na początku
-            // Przesuń wszystkie argumenty o 1 pozycję w prawo
-            // args[0] = padding, args[1] = nick, args[4] = mode
-            // Theme będzie używać: $0 (padding) + $4 (mode) + $1 (nick)
-        }
-    }
-}
-```
-
-### FAZA 3: Modyfikacja Theme
-
-#### 3.1 Aktualizacja abstracts w default.theme
-```theme
-# Gdy nick_column_enabled = ON, argumenty są przesunięte:
-# $0 = padding (nowy)
-# $1 = nick (przesunięty z $0) 
-# $4 = mode (przesunięty z $3)
-
-# Podstawowy abstract z padding
-msgnick = "%K<%n$0%B$4%N%g$1%K>%n %|";
-
-# Own messages
-ownmsgnick = "{msgnick $0 $4 $1}";
-
-# Public messages  
-pubmsgnick = "{msgnick $0 $4 $1}";
-```
-
-### FAZA 4: Testowanie i Debugowanie
-
-#### 4.1 Dodanie debug outputu
-```c
-// W format_get_text_args() dodać:
-if (settings_get_bool("debug_nick_column")) {
-    printf("DEBUG: nick_column - padding='%s', mode='%s', nick='%s'\n", 
-           padding, mode, nick);
-}
-```
-
-#### 4.2 Checkpoint commit
-```bash
-git add -A
-git commit -m "[nick_column] FAZA 1-4: Infrastruktura + logika padding - 2025-01-24 15:30"
-git push origin irssip
-```
-
-## HARMONOGRAM IMPLEMENTACJI
-
-### Dzień 1: Infrastruktura
-- [ ] Dodanie ustawień (`nick_column_enabled`, `nick_column_width`)
-- [ ] Dodanie flag do `TEXT_DEST_REC`
-- [ ] Checkpoint commit
-
-### Dzień 2: Logika formatowania  
-- [ ] Modyfikacja `sig_message_public()` i `sig_message_own_public()`
-- [ ] Implementacja logiki padding w `format_get_text_args()`
-- [ ] Checkpoint commit
-
-### Dzień 3: Theme i testowanie
-- [ ] Aktualizacja `default.theme`
-- [ ] Dodanie debug outputu
-- [ ] Build test (bez install)
-- [ ] Checkpoint commit
-
-## PRZEWIDYWANE WYZWANIA
-
-### 1. Przesunięcie argumentów
-**Problem**: Wstrzyknięcie padding przesuwa wszystkie argumenty
-**Rozwiązanie**: Dokładne mapowanie argumentów w theme
-
-### 2. Kompatybilność wsteczna
-**Problem**: Theme musi działać z wyłączonym nick_column
-**Rozwiązanie**: Warunki w theme lub osobne abstracts
-
-### 3. Różne formaty wiadomości
-**Problem**: `TXT_PUBMSG`, `TXT_OWN_MSG`, `TXT_PUBMSG_HILIGHT` mają różne argumenty
-**Rozwiązanie**: Mapowanie per format type
-
-## KRYTERIA SUKCESU
-
-✅ **Wyrównanie działa** - nicki wyrównane do prawej w kolumnie  
-✅ **Kolory zachowane** - osobne kolory dla mode i nick  
-✅ **Konfigurowalność** - szerokość przez ustawienia  
-✅ **Kompatybilność** - działa z wyłączonym nick_column  
-✅ **Brak wpływu na resztę** - standardowe formatowanie nietknięte  
diff --git a/plan4.md b/plan4.md
deleted file mode 100644
index 202c8769..00000000
--- a/plan4.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# PLAN 4: Nick Column - Podejście Expandos z Kontekstem Sygnałów
-
-## ANALIZA BŁĘDÓW POPRZEDNICH PRÓB
-
-### PRÓBA 1-3: Fundamentalne błędy
-- ❌ **Błędna analiza argumentów**: Myślałem że `$0=nick`, ale `$0=mode`, `$1=nick`
-- ❌ **Modyfikacja argumentów**: Przesuwanie `arglist` psuło mapowanie
-- ❌ **Expandos bez kontekstu**: Nie miały dostępu do aktualnych danych wiadomości
-- ❌ **Ignorowanie nm2.pl**: Nie przeanalizowałem właściwego wzorca
-
-### KLUCZOWE ODKRYCIA Z TESTÓW UŻYTKOWNIKA
-
-**Rzeczywiste mapowanie argumentów:**
-```
-$0 = mode ("@", "+", "")
-$1 = nick ("kofany", "irssip_user") 
-$2 = address/msg (zależnie od kontekstu)
-$3 = msg/channel (zależnie od kontekstu)
-```
-
-**Oczekiwany efekt:**
-```
-22:11:35> <      @yooz> no działa ;]
-22:12:24> <    @nosfar> starsze rzeczy ;p  
-22:12:38> <      @yooz> to zamknij oczy
-22:14:22> <        DMZ> ✅ Link dodany do bazy!
-22:14:22> <  +verylongn+> długi nick przycięty
-```
-
-## ROZWIĄZANIE: INSPIRACJA Z nm2.pl
-
-### KLUCZOWA IDEA
-**Jeden expando zwracający gotowy string z paddingiem, mode i nickiem**
-
-**Theme używa:**
-```theme
-msgnick = "%K<%n$nickaligned%K>%n %|";
-```
-
-**Efekt:**
-- `$nickaligned` = `"      @nick"` lub `"   @longnick+"`
-- Stała szerokość kolumny
-- Wyrównanie do prawej
-- Przycinanie długich nicków
-
-## IMPLEMENTACJA
-
-### 1. GLOBALNE ZMIENNE KONTEKSTU
-```c
-// W fe-expandos.c
-static char *current_nick = NULL;
-static char *current_mode = NULL;
-static gboolean nick_context_valid = FALSE;
-```
-
-### 2. EXPANDO FUNKCJA
-```c
-static char *expando_nickaligned(SERVER_REC *server, void *item, int *free_ret) {
-    if (!settings_get_bool("nick_column_enabled") || !nick_context_valid || !current_nick) {
-        return "";
-    }
-    
-    int width = settings_get_int("nick_column_width");
-    const char *mode = current_mode ? current_mode : "";
-    int mode_len = strlen(mode);
-    int nick_len = strlen(current_nick);
-    int total_len = mode_len + nick_len;
-    
-    char *result;
-    if (total_len <= width) {
-        // Zmieści się - padding z lewej
-        int padding = width - total_len;
-        result = g_strdup_printf("%*s%s%s", padding, "", mode, current_nick);
-    } else {
-        // Przytnij nick, dodaj wskaźnik +
-        int available = width - mode_len - 1; // -1 dla +
-        if (available > 0) {
-            result = g_strdup_printf("%s%.*s+", mode, available, current_nick);
-        } else {
-            result = g_strdup_printf("%.*s+", width-1, mode);
-        }
-    }
-    
-    *free_ret = TRUE;
-    return result;
-}
-```
-
-### 3. REJESTRACJA EXPANDO
-```c
-// W fe_expandos_init()
-expando_create("nickaligned", expando_nickaligned,
-               "message public", EXPANDO_ARG_NONE,
-               "message own_public", EXPANDO_ARG_NONE, NULL);
-```
-
-### 4. SYGNAŁY DO AKTUALIZACJI KONTEKSTU
-```c
-// W fe-messages.c
-static void update_nick_context(const char *nick, const char *mode) {
-    g_free(current_nick);
-    g_free(current_mode);
-    current_nick = g_strdup(nick);
-    current_mode = g_strdup(mode ? mode : "");
-    nick_context_valid = TRUE;
-}
-
-static void clear_nick_context(void) {
-    nick_context_valid = FALSE;
-}
-
-// W sig_message_public():
-if (settings_get_bool("nick_column_enabled")) {
-    update_nick_context(printnick, nickmode);
-}
-
-// W sig_message_own_public():
-if (settings_get_bool("nick_column_enabled")) {
-    update_nick_context(server->nick, nickmode);
-}
-```
-
-### 5. USTAWIENIA
-```c
-// W fe_messages_init()
-settings_add_bool("lookandfeel", "nick_column_enabled", FALSE);
-settings_add_int("lookandfeel", "nick_column_width", 12);
-settings_add_bool("lookandfeel", "debug_nick_column", FALSE);
-```
-
-### 6. THEME
-```theme
-# Podstawowy abstract - używa tylko $nickaligned
-msgnick = "%K<%n$nickaligned%K>%n %|";
-
-# Pozostałe abstracts bez zmian
-ownmsgnick = "{msgnick $0 $1-}";
-pubmsgnick = "{msgnick $0 $1-}";
-```
-
-## DLACZEGO TO ROZWIĄZANIE BĘDZIE DZIAŁAĆ
-
-### ✅ ZALETY TEGO PODEJŚCIA:
-
-1. **Nie modyfikuje argumentów** - `$0`, `$1`, `$2` pozostają bez zmian
-2. **Expandos mają kontekst** - aktualizowane przez sygnały przed formatowaniem
-3. **Jeden parametr w theme** - prosty `$nickaligned` zamiast skomplikowanych kombinacji
-4. **Wzorowane na nm2.pl** - sprawdzone rozwiązanie używane przez tysiące użytkowników
-5. **Kompatybilne** - domyślnie wyłączone, nie wpływa na resztę
-6. **Konfigurowalny** - szerokość, włączanie/wyłączanie
-7. **Obsługuje przycinanie** - długie nicki z wskaźnikiem `+`
-
-### ✅ FLOW DZIAŁANIA:
-
-1. **Sygnał wiadomości** → aktualizuje `current_nick`, `current_mode`
-2. **Formatowanie** → wywołuje expando `$nickaligned`
-3. **Expando** → oblicza padding, zwraca gotowy string
-4. **Theme** → wyświetla `<padding+mode+nick>` w stałej szerokości
-
-### ✅ PRZYKŁAD DZIAŁANIA:
-
-**Ustawienia:**
-```
-/SET nick_column_enabled ON
-/SET nick_column_width 12
-```
-
-**Wiadomości:**
-- `@kofany` (7 znaków) → padding 5 → `"     @kofany"`
-- `irssip_user` (10 znaków) → padding 2 → `"  irssip_user"`
-- `@verylongnickname` (17 znaków) → przytnij → `"@verylongn+"`
-
-**Wynik:**
-```
-22:11:35> <     @kofany> test wiadomość
-22:12:24> <  irssip_user> odpowiedź
-22:12:38> < @verylongn+> długi nick
-```
-
-## UZASADNIENIE DLACZEGO TYM RAZEM ZADZIAŁA
-
-### 1. **WŁAŚCIWA ANALIZA**
-- Przeanalizowałem rzeczywiste mapowanie argumentów z testów użytkownika
-- Zrozumiałem jak działa nm2.pl
-- Nie modyfikuję istniejących argumentów
-
-### 2. **SPRAWDZONY WZORZEC**
-- nm2.pl używa dokładnie tego samego podejścia
-- Expandos + sygnały + kontekst globalny
-- Tysiące użytkowników potwierdza że działa
-
-### 3. **MINIMALNA INGERENCJA**
-- Tylko dodaję nowy expando
-- Nie zmieniam core flow formatowania
-- Theme używa jednego prostego parametru
-
-### 4. **TESTOWALNE**
-- Można łatwo debugować wartości expandos
-- Można włączać/wyłączać funkcję
-- Można testować różne szerokości
-
-**To rozwiązanie MUSI zadziałać, bo jest wzorowane na działającym kodzie nm2.pl!**
diff --git a/src/common.h b/src/common.h
index d2cb0964..e514f279 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/.irssip" /* %s == g_get_home_dir() */
+#define IRSSI_DIR_FULL "%s/.irssi" /* %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 <irssip/irssi-config.h>
+#include <irssi/irssi-config.h>
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/src/core/args.c b/src/core/args.c
index 89aeed3c..5e2b1412 100644
--- a/src/core/args.c
+++ b/src/core/args.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/args.h>
+#include <irssi/src/core/args.h>
 
 static GOptionContext *context = NULL;
 
diff --git a/src/core/capsicum.c b/src/core/capsicum.c
index 5985d9c1..d73d15fb 100644
--- a/src/core/capsicum.c
+++ b/src/core/capsicum.c
@@ -23,14 +23,14 @@
 */
 
 #include "module.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 <irssi/src/core/capsicum.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
diff --git a/src/core/channel-rec.h b/src/core/channel-rec.h
index 61e4492d..f1e30fa0 100644
--- a/src/core/channel-rec.h
+++ b/src/core/channel-rec.h
@@ -1,6 +1,6 @@
 /* CHANNEL_REC definition, used for inheritance */
 
-#include <irssip/src/core/window-item-rec.h>
+#include <irssi/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 6198bfee..5e2930ad 100644
--- a/src/core/channels-setup.c
+++ b/src/core/channels-setup.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.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>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *setupchannels;
 
diff --git a/src/core/channels-setup.h b/src/core/channels-setup.h
index ac37008f..c0297aec 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 #define CHANNEL_SETUP(server) \
 	MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP")
@@ -10,7 +10,7 @@
 	(CHANNEL_SETUP(server) ? TRUE : FALSE)
 
 struct _CHANNEL_SETUP_REC {
-#include <irssip/src/core/channel-setup-rec.h>
+#include <irssi/src/core/channel-setup-rec.h>
 };
 
 extern GSList *setupchannels;
diff --git a/src/core/channels.c b/src/core/channels.c
index 6e321d59..68209a7c 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/special-vars.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/special-vars.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/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/nicklist.h>
 
 GSList *channels; /* List of all channels */
 
diff --git a/src/core/channels.h b/src/core/channels.h
index c758c0e2..197d2254 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 /* Returns CHANNEL_REC if it's channel, NULL if it isn't. */
 #define CHANNEL(channel) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _CHANNEL_REC {
-#include <irssip/src/core/channel-rec.h>
+#include <irssi/src/core/channel-rec.h>
 };
 
 extern GSList *channels;
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 2da54cef..10da0d2c 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 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 d71fe19a..1a6ecbb3 100644
--- a/src/core/chat-protocols.c
+++ b/src/core/chat-protocols.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/modules.h>
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/chat-protocols.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/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/channels-setup.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
 GSList *chat_protocols;
 
diff --git a/src/core/chatnets.c b/src/core/chatnets.c
index bdf940ca..770c7595 100644
--- a/src/core/chatnets.c
+++ b/src/core/chatnets.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/chat-protocols.h>
-#include <irssip/src/core/chatnets.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/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 49d76802..accdd0ad 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 /* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */
 #define CHATNET(chatnet) \
@@ -11,7 +11,7 @@
 	(CHATNET(chatnet) ? TRUE : FALSE)
 
 struct _CHATNET_REC {
-#include <irssip/src/core/chatnet-rec.h>
+#include <irssi/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 0288ef9d..deb5fe90 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/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/servers.h>
-#include <irssip/src/core/channels.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
 
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 GSList *commands;
 char *current_command;
diff --git a/src/core/commands.h b/src/core/commands.h
index abc31afb..7c6bd87b 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 <irssip/src/core/signals.h>
+#include <irssi/src/core/signals.h>
 
 typedef struct {
 	SIGNAL_FUNC func;
diff --git a/src/core/core.c b/src/core/core.c
index b25911d0..5d72ca0a 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -21,35 +21,35 @@
 #include "module.h"
 #include <signal.h>
 
-#include <irssip/src/core/args.h>
-#include <irssip/src/core/pidwait.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/args.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/misc.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>
+#include <irssi/src/core/net-disconnect.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/session.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#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/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/channels.h>
-#include <irssip/src/core/queries.h>
-#include <irssip/src/core/nicklist.h>
-#include <irssip/src/core/nickmatch-cache.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
diff --git a/src/core/core.h b/src/core/core.h
index c0e78205..62c54b22 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 <irssip/src/common.h>
+#include <irssi/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 9e5a3895..0f317e51 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 <irssip/src/core/core.h>
+#include <irssi/src/core/core.h>
 #include "module.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/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/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/queries.h>
-#include <irssip/src/core/window-item-def.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/window-item-def.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
 #  include <sys/utsname.h>
diff --git a/src/core/expandos.h b/src/core/expandos.h
index 443869c8..17cee608 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 <irssip/src/core/signals.h>
+#include <irssi/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 f10d53c0..da892c1e 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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/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/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/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/ignore.h>
+#include <irssi/src/core/ignore.h>
 
 GSList *ignores;
 
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 1b203d74..739514a9 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 <irssip/src/core/iregex.h>
+#include <irssi/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 0ceb91c8..60b4ec58 100644
--- a/src/core/iregex-gregex.c
+++ b/src/core/iregex-gregex.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <irssip/src/core/iregex.h>
+#include <irssi/src/core/iregex.h>
 
 struct _MatchInfo {
 	const char *valid_string;
diff --git a/src/core/iregex.h b/src/core/iregex.h
index 7f044b18..68156e02 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 <irssip/src/common.h>
+#include <irssi/src/common.h>
 
 #include <glib.h>
 typedef	GRegex Regex;
diff --git a/src/core/levels.c b/src/core/levels.c
index f66b7002..0cd99b10 100644
--- a/src/core/levels.c
+++ b/src/core/levels.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/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 604e6ad3..b1e67914 100644
--- a/src/core/line-split.c
+++ b/src/core/line-split.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
+#include <irssi/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 cacf5f0e..d6dac4d9 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.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>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 static LOG_REC *awaylog;
 static int away_filepos;
diff --git a/src/core/log.c b/src/core/log.c
index d607f20e..5bc953a1 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/write-buffer.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
 #define DEFAULT_LOG_FILE_CREATE_MODE 600
 
diff --git a/src/core/masks.c b/src/core/masks.c
index bdf0dfb8..a84ac44d 100644
--- a/src/core/masks.c
+++ b/src/core/masks.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/network.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.h>
 
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/servers.h>
 
 /* Returns TRUE if mask contains '!' ie. address should be checked too.
    Also checks if mask contained any wildcards. */
diff --git a/src/core/misc.c b/src/core/misc.c
index 60e95b45..9ee549a1 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/commands.h>
 
 typedef struct {
 	int condition;
diff --git a/src/core/module.h b/src/core/module.h
index bf746ce6..639e7e29 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -1,3 +1,3 @@
-#include <irssip/src/common.h>
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "core"
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index bb929a54..11c4dd6b 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/modules.h>
-#include <irssip/src/core/modules-load.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/modules-load.h>
+#include <irssi/src/core/signals.h>
 
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/commands.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/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 06538689..a99bcdfe 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 /* Load module - automatically tries to load also the related non-core
    modules given in `prefixes' (like irc, fe, fe_text, ..) */
diff --git a/src/core/modules.c b/src/core/modules.c
index 84a48adb..38c33dea 100644
--- a/src/core/modules.c
+++ b/src/core/modules.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/modules.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
 
 GSList *modules;
 
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 28de213a..2ed3a421 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/network.h>
+#include <irssi/src/core/network.h>
 
 #include <sys/select.h>
 
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c
index 0c6673de..643884ee 100644
--- a/src/core/net-nonblock.c
+++ b/src/core/net-nonblock.c
@@ -22,8 +22,8 @@
 
 #include <signal.h>
 
-#include <irssip/src/core/pidwait.h>
-#include <irssip/src/core/net-nonblock.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/src/core/net-nonblock.h>
 
 /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
    written to pipe when found PID of the resolver child is returned */
diff --git a/src/core/net-nonblock.h b/src/core/net-nonblock.h
index 00708633..c93dd9e3 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 <irssip/src/core/network.h>
+#include <irssi/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 7d2dba62..0cb462a1 100644
--- a/src/core/net-sendbuffer.c
+++ b/src/core/net-sendbuffer.c
@@ -20,9 +20,9 @@
 
 #include "module.h"
 
-#include <irssip/src/core/network.h>
-#include <irssip/src/core/net-sendbuffer.h>
-#include <irssip/src/core/line-split.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/line-split.h>
 
 /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
    is used */
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 6ba37767..5104e7dd 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.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 <irssi/src/core/network.h>
+#include <irssi/src/core/network-openssl.h>
+#include <irssi/src/core/net-sendbuffer.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/tls.h>
 
 #include <openssl/crypto.h>
 #include <openssl/objects.h>
diff --git a/src/core/network.c b/src/core/network.c
index 48425135..fa70d62a 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/network.h>
+#include <irssi/src/core/network.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
 #include <sys/un.h>
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 4a94c0cd..34c4b24b 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.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>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/masks.h>
 
 #define isalnumhigh(a) \
         (i_isalnum(a) || (unsigned char) (a) >= 128)
diff --git a/src/core/nicklist.h b/src/core/nicklist.h
index 42fdf487..7999be0a 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 <irssip/src/core/nick-rec.h>
+#include <irssi/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 4bb7889d..c8fc1157 100644
--- a/src/core/nickmatch-cache.c
+++ b/src/core/nickmatch-cache.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/signals.h>
 
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/nicklist.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
-#include <irssip/src/core/nickmatch-cache.h>
+#include <irssi/src/core/nickmatch-cache.h>
 
 static GSList *lists;
 
diff --git a/src/core/pidwait.c b/src/core/pidwait.c
index d7b7a2a2..f421c1d6 100644
--- a/src/core/pidwait.c
+++ b/src/core/pidwait.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/modules.h>
 
 static GHashTable *child_pids;
 static GSList *pids;
diff --git a/src/core/queries.c b/src/core/queries.c
index 6c7a080f..fe86271f 100644
--- a/src/core/queries.c
+++ b/src/core/queries.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include <irssip/src/core/servers.h>
-#include <irssip/src/core/queries.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.h>
 
 GSList *queries;
 
diff --git a/src/core/queries.h b/src/core/queries.h
index a0e8ea7b..c6170361 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 /* Returns QUERY_REC if it's query, NULL if it isn't. */
 #define QUERY(query) \
@@ -13,7 +13,7 @@
 
 #define STRUCT_SERVER_REC SERVER_REC
 struct _QUERY_REC {
-#include <irssip/src/core/query-rec.h>
+#include <irssi/src/core/query-rec.h>
 };
 
 extern GSList *queries;
diff --git a/src/core/query-rec.h b/src/core/query-rec.h
index 43cd1bc2..cc15c9ec 100644
--- a/src/core/query-rec.h
+++ b/src/core/query-rec.h
@@ -1,6 +1,6 @@
 /* QUERY_REC definition, used for inheritance */
 
-#include <irssip/src/core/window-item-rec.h>
+#include <irssi/src/core/window-item-rec.h>
 
 char *address;
 char *server_tag;
diff --git a/src/core/rawlog.c b/src/core/rawlog.c
index df2618d6..ea2b5e6d 100644
--- a/src/core/rawlog.c
+++ b/src/core/rawlog.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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>
+#include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/write-buffer.h>
+#include <irssi/src/core/settings.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include <irssip/src/core/servers.h>
+#include <irssi/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 f9f6ac1b..7185dd99 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.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>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 static char *translit_charset;
 static gboolean term_is_utf8;
diff --git a/src/core/refstrings.c b/src/core/refstrings.c
index ff354f59..8f220f6f 100644
--- a/src/core/refstrings.c
+++ b/src/core/refstrings.c
@@ -1,7 +1,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include <irssip/src/core/refstrings.h>
+#include <irssi/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 e7bd9379..a9d9422b 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/commands.h>
-#include <irssip/src/core/network.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.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/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/settings.h>
+#include <irssi/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 43873712..ff3d6584 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/chat-protocols.h>
-#include <irssip/src/core/chatnets.h>
-#include <irssip/src/core/servers.h>
-#include <irssip/src/core/servers-setup.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
 
 GSList *setupservers;
 
diff --git a/src/core/servers-setup.h b/src/core/servers-setup.h
index 22c076e5..742ed4dd 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 #define SERVER_SETUP(server) \
 	MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP")
@@ -11,7 +11,7 @@
 
 /* servers */
 struct _SERVER_SETUP_REC {
-#include <irssip/src/core/server-setup-rec.h>
+#include <irssi/src/core/server-setup-rec.h>
 };
 
 extern GSList *setupservers;
diff --git a/src/core/servers.c b/src/core/servers.c
index 5b91588e..811081e8 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.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/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/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>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.h>
 
 GSList *servers, *lookup_servers;
 
diff --git a/src/core/servers.h b/src/core/servers.h
index 394fd7b7..d52603eb 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 <irssip/src/core/modules.h>
+#include <irssi/src/core/modules.h>
 
 /* Returns SERVER_REC if it's server, NULL if it isn't. */
 #define SERVER(server) \
@@ -23,12 +23,12 @@
 /* all strings should be either NULL or dynamically allocated */
 /* address and nick are mandatory, rest are optional */
 struct _SERVER_CONNECT_REC {
-#include <irssip/src/core/server-connect-rec.h>
+#include <irssi/src/core/server-connect-rec.h>
 };
 
 #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
 struct _SERVER_REC {
-#include <irssip/src/core/server-rec.h>
+#include <irssi/src/core/server-rec.h>
 };
 
 #define SEND_TARGET_CHANNEL	0
diff --git a/src/core/session.c b/src/core/session.c
index 5d1f1863..3a63a785 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -19,20 +19,20 @@
 */
 
 #include "module.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/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/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>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
 
 static char *session_file;
 char *irssi_binary = NULL;
diff --git a/src/core/settings.c b/src/core/settings.c
index d2bd58ca..065c8fed 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.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/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
 
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/recode.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
 #include "default-config.h"
 
 #include <signal.h>
diff --git a/src/core/signals.c b/src/core/signals.c
index 5c71a935..e52e6907 100644
--- a/src/core/signals.c
+++ b/src/core/signals.c
@@ -19,8 +19,8 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/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 72ba8aac..8c890645 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.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>
+#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>
 
 #define isvarchar(c) \
         (i_isalnum(c) || (c) == '_')
diff --git a/src/core/special-vars.h b/src/core/special-vars.h
index d2c7d455..87aba7d6 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 <irssip/src/core/signals.h>
+#include <irssi/src/core/signals.h>
 
 #define PARSE_FLAG_GETNAME	0x01 /* return argument name instead of it's value */
 #define PARSE_FLAG_ISSET_ANY	0x02 /* arg_used field specifies that at least one of the $variables was non-empty */
diff --git a/src/core/tls.c b/src/core/tls.c
index d56b0507..bd5c8329 100644
--- a/src/core/tls.c
+++ b/src/core/tls.c
@@ -18,7 +18,7 @@
 
 #include "module.h"
 
-#include <irssip/src/core/tls.h>
+#include <irssi/src/core/tls.h>
 
 TLS_REC *tls_create_rec()
 {
diff --git a/src/core/utf8.c b/src/core/utf8.c
index 7ae1096e..5ef030d3 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 <irssip/src/core/utf8.h>
+#include <irssi/src/core/utf8.h>
 #include "module.h"
 
 /* Provide is_utf8(): */
-#include <irssip/src/core/recode.h>
+#include <irssi/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 9692c08c..b3881d38 100644
--- a/src/core/wcwidth-wrapper.c
+++ b/src/core/wcwidth-wrapper.c
@@ -22,9 +22,9 @@
 #include <wchar.h>
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/utf8.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/utf8.h>
 
 #ifdef HAVE_LIBUTF8PROC
 #include <utf8proc.h>
diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c
index 3e0ae339..5226d695 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 <irssip/src/core/utf8.h>
+#include <irssi/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 0e924ce9..6944c921 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 <irssip/src/core/window-item-rec.h>
+#include <irssi/src/core/window-item-rec.h>
 };
 
 #endif
diff --git a/src/core/write-buffer.c b/src/core/write-buffer.c
index e5d57d96..a1401542 100644
--- a/src/core/write-buffer.c
+++ b/src/core/write-buffer.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.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>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/write-buffer.h>
 
 #define BUFFER_BLOCK_SIZE 2048
 
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 08fc9e3c..be16db7e 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 <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/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/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/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/fe-common/core/completion.h>
-#include <irssip/src/fe-common/core/chat-completion.h>
-#include <irssip/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/chat-completion.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 enum {
 	COMPLETE_MCASE_NEVER = 0,
diff --git a/src/fe-common/core/command-history.c b/src/fe-common/core/command-history.c
index 9e0ff569..ccb8bfd9 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 <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/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/core/fe-windows.h>
-#include <irssip/src/fe-common/core/window-items.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/command-history.h>
+#include <irssi/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 7327454e..f4042640 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 <irssip/src/common.h>
+#include <irssi/src/common.h>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index 73622782..852eabff 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/completion.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static GList *complist; /* list of commands we're currently completing */
 static char *last_line;
diff --git a/src/fe-common/core/completion.h b/src/fe-common/core/completion.h
index 18aad48a..d505aa84 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 <irssip/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 /* automatic word completion - called when space/enter is pressed */
 char *auto_word_complete(const char *line, int *pos);
diff --git a/src/fe-common/core/fe-capsicum.c b/src/fe-common/core/fe-capsicum.c
index 2760f8ad..d7ea95ee 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 <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>
+#include <irssi/src/fe-common/core/fe-capsicum.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
 
 static void capability_mode_enabled(void)
 {
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 49dcb2bd..220737b7 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 <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/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/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/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/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>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
 {
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index d0364305..9724354f 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 <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/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/core/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/servers-setup.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/servers-setup.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>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/fe-common/core/fe-capsicum.h>
+#include <irssi/src/fe-common/core/fe-capsicum.h>
 #endif
-#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 <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/fe-common/core/command-history.h>
+#include <irssi/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/fe-channels.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-activity.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/windows-layout.h>
+#include <irssi/src/fe-common/core/fe-recode.h>
 
 #include <signal.h>
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 2ceb63f7..207bcff5 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 <irssip/src/core/core.h>
+#include <irssi/src/core/core.h>
 #include "module.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>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/irssi-version.h>
+#include <irssi/src/core/servers.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#include <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define PASTE_CHECK_SPEED 200 /* 0.2 sec */
 
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index bc25cacc..0e929bae 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 <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/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/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/queries.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.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 <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-exec.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/src/fe-common/core/fe-exec.h b/src/fe-common/core/fe-exec.h
index 30ee8c78..824d3d8a 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 <irssip/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
 
 #define EXEC_WI(query) \
 	MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \
@@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC;
 
 #define STRUCT_SERVER_REC void
 typedef struct {
-#include <irssip/src/core/window-item-rec.h>
+#include <irssi/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 e4646c7e..78ea0ae9 100644
--- a/src/fe-common/core/fe-expandos.c
+++ b/src/fe-common/core/fe-expandos.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/expandos.h>
-#include <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/fe-common/core/printtext.h>
-#include <irssip/src/core/levels.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/levels.h>
 
 /* Nick column context variables */
 static char *current_nick = NULL;
diff --git a/src/fe-common/core/fe-help.c b/src/fe-common/core/fe-help.c
index bcaf6558..9c428062 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 <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/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/fe-common/core/printtext.h>
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
 {
diff --git a/src/fe-common/core/fe-ignore-messages.c b/src/fe-common/core/fe-ignore-messages.c
index 121bcffe..4f625dec 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 <irssip/src/core/signals.h>
-#include <irssip/src/core/levels.h>
-#include <irssip/src/core/ignore.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/servers.h>
 
 static void sig_message_public(SERVER_REC *server, const char *msg,
 			       const char *nick, const char *address,
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 88ae3fec..3594b6f6 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 <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/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/core/servers.h>
-#include <irssip/src/core/ignore.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static char *ignore_get_key(IGNORE_REC *rec)
 {
diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c
index 7b988a6e..0d29d6c3 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 <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>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/log.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
 #ifdef HAVE_CAPSICUM
-#include <irssip/src/core/capsicum.h>
+#include <irssi/src/core/capsicum.h>
 #endif
 
-#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/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/core/channels-setup.h>
+#include <irssi/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 5693e548..f008bde4 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 <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/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/core/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/nicklist.h>
-#include <irssip/src/core/ignore.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/ignore.h>
 
-#include <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>
+#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>
 
 /* Forward declarations for nick column functions */
 void update_nick_context(const char *nick, const char *mode);
diff --git a/src/fe-common/core/fe-modules.c b/src/fe-common/core/fe-modules.c
index 0f7b77d1..a1714996 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 <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/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/fe-common/core/printtext.h>
+#include <irssi/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 37e8516b..dce53804 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 <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/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/core/chat-protocols.h>
-#include <irssip/src/core/servers.h>
-#include <irssip/src/core/queries.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/queries.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>
+#include <irssi/src/fe-common/core/fe-core-commands.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static int queryclose_tag, query_auto_close, querycreate_level;
 
diff --git a/src/fe-common/core/fe-queries.h b/src/fe-common/core/fe-queries.h
index 60971e60..30c45e4e 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 <irssip/src/core/queries.h>
+#include <irssi/src/core/queries.h>
 
 /* Return query where to put the private message. */
 QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,
diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c
index a9d68ae8..5e7c1e47 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 <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>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/core/recode.h>
 
 static char *recode_fallback = NULL;
 static char *recode_out_default = NULL;
diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index f69949cb..56acf020 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 <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/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/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/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/fe-common/core/module-formats.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/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 44b5418d..f686916f 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 <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>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/fe-common/core/fe-settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/keyboard.h>
 
 static void set_print(SETTINGS_REC *rec)
 {
diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c
index fd106758..d72a13b0 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 <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/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/tls.h>
 
-#include <irssip/src/fe-common/core/module-formats.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include <irssip/src/fe-common/core/fe-tls.h>
+#include <irssi/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 4b917b48..d575813d 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 <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/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/core/levels.h>
+#include <irssi/src/core/levels.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>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 GSList *windows; /* first in the list is the active window,
                     next is the last active, etc. */
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index 357b82e3..d5c60c81 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 <irssip/src/core/window-item-def.h>
-#include <irssip/src/fe-common/core/command-history.h>
+#include <irssi/src/core/window-item-def.h>
+#include <irssi/src/fe-common/core/command-history.h>
 
 enum {
         DATA_LEVEL_NONE = 0,
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index 322248dd..25c77a7b 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -19,23 +19,23 @@
 */
 
 #include "module.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/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/core/levels.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.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/core/recode.h>
-#include <irssip/src/core/utf8.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/refstrings.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/utf8.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/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 227076cc..79b90ded 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 <irssip/src/core/signals.h>
-#include <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/themes.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/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 551095ff..2412a1f8 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 <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/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/core/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/nicklist.h>
+#include <irssi/src/core/servers.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.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>
+#include <irssi/src/fe-common/core/hilight-text.h>
+#include <irssi/src/core/nickmatch-cache.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 static NICKMATCH_REC *nickmatch;
 static int never_hilight_level, default_hilight_level;
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h
index 0e15ac6c..0dfe78f3 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 <irssip/src/core/iregex.h>
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/core/iregex.h>
+#include <irssi/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 fda30176..e0e061dd 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/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/keyboard.h>
-#include <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/keyboard.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 #define MAX_EXPAND_RECURSION 100
 
diff --git a/src/fe-common/core/keyboard.h b/src/fe-common/core/keyboard.h
index 4793d4da..b19536a0 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 <irssip/src/core/signals.h>
+#include <irssi/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 d9725f88..c4d9be96 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 eaee79f1..1b1927b1 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 dce87f90..e629dc51 100644
--- a/src/fe-common/core/module.h
+++ b/src/fe-common/core/module.h
@@ -1,8 +1,8 @@
-#include <irssip/src/common.h>
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "fe-common/core"
 
-#include <irssip/src/core/utf8.h>
+#include <irssi/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 52fa8cde..9de8d740 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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/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/core/levels.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.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>
+#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>
 
 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 26f731e9..c223a3ec 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 <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/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 217c5bc0..58d17b8e 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/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/themes.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/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 8d9943fe..2884c3eb 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 <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/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/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>
+#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>
 
 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 6e40f535..6669ba43 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 <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/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/core/levels.h>
+#include <irssi/src/core/levels.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>
+#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>
 
 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 851e7f1c..c60c796c 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 <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/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/core/levels.h>
+#include <irssi/src/core/levels.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 <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
 static 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 5ce5449c..5bfa92fa 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 <irssip/src/fe-common/core/fe-windows.h>
+#include <irssi/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 561b2354..fa209f48 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 <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/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/chat-protocols.h>
-#include <irssip/src/core/servers.h>
-#include <irssip/src/core/channels.h>
-#include <irssip/src/core/queries.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/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>
+#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>
 
 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 3a37be61..8dd67f7b 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 <irssip/src/core/signals.h>
-#include <irssip/src/core/levels.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.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/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/fe-common/irc/dcc/module-formats.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/irc/dcc/module-formats.h>
+#include <irssi/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 21aec50b..4099e2f1 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 <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/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/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/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/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/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/core/chat-completion.h>
+#include <irssi/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 ab8941a8..e75640bc 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 <irssip/src/core/signals.h>
-#include <irssip/src/core/levels.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/servers.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/irc/core/irc.h>
+#include <irssi/src/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-get.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/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include <irssip/src/fe-common/irc/dcc/fe-dcc.h>
+#include <irssi/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 ea57e0a6..cf9b634e 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 <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/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.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/irc/dcc/dcc-file.h>
+#include <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-queue.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/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/fe-dcc.h>
+#include <irssi/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 7252d4c5..eaab9637 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 <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/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/levels.h>
 
-#include <irssip/src/irc/dcc/dcc-server.h>
+#include <irssi/src/irc/dcc/dcc-server.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>
+#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>
 
 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 293a52bf..f5fb3b22 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 <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/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/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/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/fe-common/irc/dcc/module-formats.h>
-#include <irssip/src/fe-common/core/printtext.h>
-#include <irssip/src/fe-common/core/themes.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>
 
 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 ff6e8986..f973cd9e 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 37d43992..204c7dd5 100644
--- a/src/fe-common/irc/dcc/module-formats.h
+++ b/src/fe-common/irc/dcc/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 bba85374..54934469 100644
--- a/src/fe-common/irc/dcc/module.h
+++ b/src/fe-common/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 6a33f972..a75f2bb3 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 <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/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/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/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 5f6a548b..5f097ec2 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 <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/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/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>
+#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>
 
 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 0b767c5e..cc60ea92 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 <irssip/src/fe-common/irc/module-formats.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/settings.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/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/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/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/window-items.h>
-#include <irssip/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 <irssi/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 1ae7bd20..8035cebf 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 <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/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/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/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/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>
+#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>
 
 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 26b58754..b6b3e75a 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 <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/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/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/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/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/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/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>
+#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>
 
 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 aacc9a7d..39752984 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 <irssip/src/fe-common/irc/module-formats.h>
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/levels.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/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-channels.h>
-#include <irssip/src/irc/core/channel-rejoin.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/fe-common/core/printtext.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/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/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 aa3aa5b7..368a3fa6 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 <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/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/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/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/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>
+#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>
 
 /* 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 46663b02..89346648 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 <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/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/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-channels.h>
-#include <irssip/src/irc/core/irc-queries.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/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/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/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>
+#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>
 
 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 d63a663c..22aaa145 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 <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>
+#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>
 
 int query_type;
 
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index 76b4cf28..4aad7ee0 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 <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/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/core/servers-setup.h>
+#include <irssi/src/core/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/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/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/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 2103b93e..3484d923 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 <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/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/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>
+#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>
 
 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 48e6bc98..623fca0c 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 <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/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/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/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/fe-common/core/printtext.h>
+#include <irssi/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 1b8545b0..ea41f7fa 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 <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/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/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/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/fe-common/core/printtext.h>
+#include <irssi/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 6d8ce72b..b76d4ce7 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 <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/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/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/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/fe-common/core/printtext.h>
+#include <irssi/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 562bf3f0..72fec58e 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 <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/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/irc/core/irc-servers.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/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 bdc4bdfe..412cb56b 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 <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/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/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/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 1a63c0bc..71e2e0c8 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 <irssip/src/core/signals.h>
-#include <irssip/src/fe-common/core/chat-completion.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/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 913f0385..86310157 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 bfbb0a77..722f8d40 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 b68feff6..ad63c95e 100644
--- a/src/fe-common/irc/module.h
+++ b/src/fe-common/irc/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 e191e889..68b98a09 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 <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/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/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/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/fe-common/core/themes.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
+#include <irssi/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 d004e76c..12f41fb5 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 dd809995..ff3085e1 100644
--- a/src/fe-common/irc/notifylist/module-formats.h
+++ b/src/fe-common/irc/notifylist/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 a2f12b99..0e5ca451 100644
--- a/src/fe-common/irc/notifylist/module.h
+++ b/src/fe-common/irc/notifylist/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 a9ff389e..f6db8f5f 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 <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 <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 <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 a33b9b2a..3cdb789f 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 <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 <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 <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 8508a25d..6f79223a 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 <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 <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 <stddef.h>
 #include <stdint.h>
diff --git a/src/fe-fuzz/null-logger.c b/src/fe-fuzz/null-logger.c
index c6c996bb..dd88b84a 100644
--- a/src/fe-fuzz/null-logger.c
+++ b/src/fe-fuzz/null-logger.c
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-fuzz/null-logger.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <glib.h>
 
diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c
index eb77244e..25579c8c 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 <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 <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 <stddef.h>
 #include <stdint.h>
@@ -39,10 +39,10 @@
 #include <string.h>
 #include <unistd.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>
+#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>
 
 /* irc-core.c */
 void irc_core_init(void);
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index f290c40d..c442bd7f 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.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>
+#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>
 
 static GMainLoop *main_loop;
 static char *autoload_module;
diff --git a/src/fe-none/module.h b/src/fe-none/module.h
index 1e1b5e36..cf956eaa 100644
--- a/src/fe-none/module.h
+++ b/src/fe-none/module.h
@@ -1,3 +1,3 @@
-#include <irssip/src/common.h>
+#include <irssi/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 b8319f68..ad362f20 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 #undef i_toupper
 #undef i_tolower
diff --git a/src/fe-text/gui-expandos.c b/src/fe-text/gui-expandos.c
index e5823e6d..a6b11418 100644
--- a/src/fe-text/gui-expandos.c
+++ b/src/fe-text/gui-expandos.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/expandos.h>
+#include <irssi/src/core/expandos.h>
 
-#include <irssip/src/fe-text/gui-entry.h>
-#include <irssip/src/fe-text/gui-readline.h>
+#include <irssi/src/fe-text/gui-entry.h>
+#include <irssi/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 535ce48f..2091b5a3 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/levels.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/levels.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.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-common/core/formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/themes.h>
 
-#include <irssip/src/fe-text/term.h>
-#include <irssip/src/fe-text/gui-printtext.h>
-#include <irssip/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/term.h>
+#include <irssi/src/fe-text/gui-printtext.h>
+#include <irssi/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 9bd28c5d..0acf4d31 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 <irssip/src/fe-text/gui-windows.h>
-#include <irssip/src/fe-text/textbuffer-view.h>
-#include <irssip/src/fe-common/core/formats.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>
 
 extern int mirc_colors[];
 
diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c
index 5f74cd06..e18ea61b 100644
--- a/src/fe-text/gui-readline.c
+++ b/src/fe-text/gui-readline.c
@@ -19,24 +19,24 @@
 */
 
 #include "module.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-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-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-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-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 <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 <string.h>
 #include <signal.h>
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c
index 83fbeebb..46be2396 100644
--- a/src/fe-text/gui-windows.c
+++ b/src/fe-text/gui-windows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 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 b7def21a..52a64cea 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 <irssip/src/fe-text/mainwindows.h>
-#include <irssip/src/fe-text/textbuffer-view.h>
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/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 19e705e2..03ea6875 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -19,30 +19,30 @@
 */
 
 #include "module.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-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-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-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-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 <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 <signal.h>
 #include <locale.h>
diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c
index 86bc1f3f..89ee30a9 100644
--- a/src/fe-text/lastlog.c
+++ b/src/fe-text/lastlog.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/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/fe-text/module-formats.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-text/module-formats.h>
+#include <irssi/src/fe-common/core/printtext.h>
 
-#include <irssip/src/fe-text/gui-windows.h>
-#include <irssip/src/fe-text/gui-printtext.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/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 b33020a8..d3759ace 100644
--- a/src/fe-text/mainwindow-activity.c
+++ b/src/fe-text/mainwindow-activity.c
@@ -19,10 +19,10 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/fe-text/gui-windows.h>
+#include <irssi/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 df02f0a3..c32c58cc 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/fe-text/mainwindows.h>
-#include <irssip/src/fe-text/gui-windows.h>
-#include <irssip/src/fe-text/textbuffer-view.h>
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/gui-windows.h>
+#include <irssi/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 f34caad2..27be2f02 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/term.h>
-#include <irssip/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-text/term.h>
+#include <irssi/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 3f377771..70967d19 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 <irssip/src/fe-common/core/fe-windows.h>
-#include <irssip/src/fe-text/term.h>
+#include <irssi/src/fe-common/core/fe-windows.h>
+#include <irssi/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 c88b0159..27f0fc0a 100644
--- a/src/fe-text/meson.build
+++ b/src/fe-text/meson.build
@@ -1,6 +1,6 @@
 # this file is part of irssi
 
-executable('irssip',
+executable('irssi',
   files(
     #### terminfo_sources ####
     'term-terminfo.c',
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index 133d9fd2..e1bbc1fa 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 f8f4d7b5..709a5bde 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 5c5937f4..b1eeeb0e 100644
--- a/src/fe-text/module.h
+++ b/src/fe-text/module.h
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/fe-text/term.h>
+#include <irssi/src/common.h>
+#include <irssi/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 693d0a1c..5116068b 100644
--- a/src/fe-text/sidepanels.c
+++ b/src/fe-text/sidepanels.c
@@ -1,21 +1,21 @@
 #include "module.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 <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 <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 4aa5058e..93481877 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 <irssip/src/common.h>
+#include <irssi/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 62b7fe03..3cfa5379 100644
--- a/src/fe-text/statusbar-config.c
+++ b/src/fe-text/statusbar-config.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/statusbar.h>
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-text/statusbar.h>
+#include <irssi/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 3fc52c6e..239918db 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 <irssip/src/fe-text/statusbar.h>
+#include <irssi/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 bca872ca..6e7cf8a5 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/servers.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>
+#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>
 
 /* 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 b1501e9d..2439d101 100644
--- a/src/fe-text/statusbar.c
+++ b/src/fe-text/statusbar.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/expandos.h>
-#include <irssip/src/core/special-vars.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/special-vars.h>
 
-#include <irssip/src/fe-common/core/themes.h>
+#include <irssi/src/fe-common/core/themes.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>
+#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>
 
 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 46ed1964..140d355d 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 <irssip/src/fe-text/mainwindows.h>
-#include <irssip/src/fe-text/statusbar-item.h>
+#include <irssi/src/fe-text/mainwindows.h>
+#include <irssi/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 5005bc94..9bcdd5a0 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.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 <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 <signal.h>
 #include <termios.h>
diff --git a/src/fe-text/term.c b/src/fe-text/term.c
index c4271326..5587fe20 100644
--- a/src/fe-text/term.c
+++ b/src/fe-text/term.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/commands.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/fe-text/term.h>
-#include <irssip/src/fe-text/mainwindows.h>
+#include <irssi/src/fe-text/term.h>
+#include <irssi/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 22199a0d..601b12c6 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 <irssip/src/core/utf8.h>
+#include <irssi/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 d0b868f9..0aa329f4 100644
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@@ -1,7 +1,7 @@
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/fe-text/terminfo-core.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/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 45deaa85..3d1d963b 100644
--- a/src/fe-text/textbuffer-commands.c
+++ b/src/fe-text/textbuffer-commands.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/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/fe-common/core/printtext.h>
-#include <irssip/src/fe-text/gui-windows.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/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 495f9e1e..bbf9f229 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -1,18 +1,18 @@
 #include "module.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>
+#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>
 
 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 56dc2abb..86587563 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 <irssip/src/fe-text/textbuffer.h>
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/fe-text/textbuffer.h>
+#include <irssi/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 b9e89714..ee474785 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 <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>
+#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>
 
 typedef struct {
 	char *name;
diff --git a/src/fe-text/textbuffer-view.h b/src/fe-text/textbuffer-view.h
index 22940241..cdd3cbe5 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 <irssip/src/fe-text/textbuffer.h>
-#include <irssip/src/fe-text/term.h>
+#include <irssi/src/fe-text/textbuffer.h>
+#include <irssi/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 62410235..8a206f2c 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 <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/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/fe-text/textbuffer-formats.h>
-#include <irssip/src/fe-text/textbuffer.h>
+#include <irssi/src/fe-text/textbuffer-formats.h>
+#include <irssi/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 1e049136..5281ac95 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.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>
+#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>
 
 #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 bcd4b8e4..3cdfe964 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-channels.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 096dbb4b..ada3e3a1 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 <irssip/src/irc/core/irc.h>
+#include <irssi/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 17a20f12..f49c69b6 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -20,14 +20,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.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>
+#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>
 
 #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 177540c3..05c9768c 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -39,16 +39,16 @@ loop:
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.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>
+#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>
 
 /* 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 15e7dff5..42b93411 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 typedef struct {
 	char *name;
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index ccc8ad2b..2c2df7f9 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -18,11 +18,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
 
-#include <irssip/src/irc/core/irc-cap.h>
-#include <irssip/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/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 d57d8758..93874d35 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 <irssip/src/core/signals.h>
-#include <irssip/src/core/channels.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/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 70888262..24f57f8d 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 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 778246f8..0f955dd8 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 <irssip/src/core/chat-protocols.h>
-#include <irssip/src/core/channels.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/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 <irssip/src/core/channel-rec.h>
+#include <irssi/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 a94eba2a..c3b24a11 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/core/irc-chatnets.h>
+#include <irssi/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 f65275ed..10e98921 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 <irssip/src/core/chat-protocols.h>
-#include <irssip/src/core/chatnets.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
 
 /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */
 #define IRC_CHATNET(chatnet) \
@@ -15,7 +15,7 @@
 #define IRCNET(ircnet) IRC_CHATNET(ircnet)
 
 struct _IRC_CHATNET_REC {
-#include <irssip/src/core/chatnet-rec.h>
+#include <irssi/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 efe9a8ee..5f234c54 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.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/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/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/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/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>
+#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>
 
 /* 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 ed9851ff..6f689313 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 <irssip/src/core/commands.h>
+#include <irssi/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 523c23c1..136bff85 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -19,22 +19,22 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/chat-protocols.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/settings.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.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-setup.h>
-#include <irssip/src/core/channels-setup.h>
+#include <irssi/src/irc/core/irc-servers-setup.h>
+#include <irssi/src/core/channels-setup.h>
 
-#include <irssip/src/irc/core/ctcp.h>
-#include <irssip/src/irc/core/irc-commands.h>
-#include <irssip/src/irc/core/netsplit.h>
+#include <irssi/src/irc/core/ctcp.h>
+#include <irssi/src/irc/core/irc-commands.h>
+#include <irssi/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 666fd8d3..625e6e8b 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/expandos.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/expandos.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-channels.h>
-#include <irssip/src/core/nicklist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/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 71cd9d24..e2c5aea6 100644
--- a/src/irc/core/irc-masks.c
+++ b/src/irc/core/irc-masks.c
@@ -19,9 +19,9 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/network.h>
+#include <irssi/src/core/network.h>
 
-#include <irssip/src/irc/core/irc-masks.h>
+#include <irssi/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 8db2fd19..5696bbb5 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 <irssip/src/core/masks.h>
+#include <irssi/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 68fda8b3..f62a96f2 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.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>
+#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>
 
 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 876f9172..7ac3176d 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 <irssip/src/core/nicklist.h>
+#include <irssi/src/core/nicklist.h>
 
 /* Add new nick to list */
 NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 8bb474a3..9c7eb6a9 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.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>
+#include <irssi/src/irc/core/irc-nicklist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 5b2a7c1a..f6680ed2 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 <irssip/src/core/chat-protocols.h>
-#include <irssip/src/core/queries.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/queries.h>
 
 /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */
 #define IRC_QUERY(query) \
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index 0c928409..e18a5a9b 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 <irssip/src/core/commands.h>
-#include <irssip/src/core/network.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/signals.h>
 
-#include <irssip/src/irc/core/modes.h>
-#include <irssip/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/modes.h>
+#include <irssi/src/irc/core/irc-servers.h>
 
-#include <irssip/src/core/settings.h>
+#include <irssi/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 037b19d6..2d94a48b 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 <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/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/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>
+#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>
 
 /* 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 9ed2c614..ce5f0868 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 <irssip/src/core/chat-protocols.h>
-#include <irssip/src/core/servers-setup.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers-setup.h>
 
 #define IRC_SERVER_SETUP(server) \
 	PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \
@@ -18,7 +18,7 @@ enum {
 };
 
 typedef struct {
-#include <irssip/src/core/server-setup-rec.h>
+#include <irssi/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 4dc41506..7e8fdb5a 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -20,31 +20,31 @@
 
 #include "module.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/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/channels.h>
-#include <irssip/src/core/queries.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/queries.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/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/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/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/settings.h>
-#include <irssip/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/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 <irssip/src/core/line-split.h>
+#include <irssi/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 82df135f..53ff1436 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 <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>
+#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>
 
 /*
  * 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 <irssip/src/core/server-connect-rec.h>
+#include <irssi/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 <irssip/src/core/server-rec.h>
+#include <irssi/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 d7ba04da..49d9a3f2 100644
--- a/src/irc/core/irc-session.c
+++ b/src/irc/core/irc-session.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/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/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/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/sasl.h>
+#include <irssi/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 4431aefb..a52e9198 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/irc/core/irc-channels.h>
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/servers-redirect.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>
 
 char *current_server_event;
 static int signal_default_event;
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index aaff5494..92fb4ccb 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 <irssip/src/core/commands.h>
+#include <irssi/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 4d6fc67b..aef5e617 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 613ca395..15a9a9a8 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.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 <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/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 3eb60573..d2d7234f 100644
--- a/src/irc/core/mode-lists.c
+++ b/src/irc/core/mode-lists.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/signals.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>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/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 0dcafe1a..ff37a1e1 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/misc.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>
+#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>
 
 /* 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 ec2fa7ed..f899a06d 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 <irssip/src/irc/core/irc-channels.h>
-#include <irssip/src/core/nicklist.h> /* MAX_USER_PREFIXES */
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/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 68344733..41800038 100644
--- a/src/irc/core/module.h
+++ b/src/irc/core/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 8a50ad2d..4a902c9e 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/commands.h>
-#include <irssip/src/core/misc.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
 
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-channels.h>
-#include <irssip/src/irc/core/netsplit.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/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 f0b601ea..50edf63b 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 <irssip/src/core/nicklist.h>
+#include <irssi/src/core/nicklist.h>
 
 typedef struct {
 	char *server;
diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c
index 6a85b2d7..89ca4a9e 100644
--- a/src/irc/core/sasl.c
+++ b/src/irc/core/sasl.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/core/irc-cap.h>
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/sasl.h>
+#include <irssi/src/irc/core/irc-cap.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 81e76bf8..4c950140 100644
--- a/src/irc/core/scram.c
+++ b/src/irc/core/scram.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/irc/core/scram.h>
+#include <irssi/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 43debd75..93c8f05a 100644
--- a/src/irc/core/servers-idle.c
+++ b/src/irc/core/servers-idle.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
+#include <irssi/src/core/signals.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>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-idle.h>
+#include <irssi/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 d6e628bc..50560883 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/rawlog.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/rawlog.h>
 
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/servers-redirect.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 129329bb..ba0bed0b 100644
--- a/src/irc/dcc/dcc-autoget.c
+++ b/src/irc/dcc/dcc-autoget.c
@@ -19,13 +19,13 @@
 */
 
 #include "module.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/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/irc/dcc/dcc-get.h>
+#include <irssi/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 e6d5c844..68da0e27 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -19,19 +19,19 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
-#include <irssip/src/irc/core/irc-queries.h>
-#include <irssip/src/core/masks.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/dcc/dcc-chat.h>
+#include <irssi/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 2a48ec4b..ef992bb8 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 <irssip/src/irc/dcc/dcc.h>
+#include <irssi/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 <irssip/src/irc/dcc/dcc-rec.h>
+#include <irssi/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 b6683569..28a488e4 100644
--- a/src/irc/dcc/dcc-file-rec.h
+++ b/src/irc/dcc/dcc-file-rec.h
@@ -1,4 +1,4 @@
-#include <irssip/src/irc/dcc/dcc-rec.h>
+#include <irssi/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 d9b29f7f..38986354 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 <irssip/src/irc/dcc/dcc.h>
+#include <irssi/src/irc/dcc/dcc.h>
 
 typedef struct {
-#include <irssip/src/irc/dcc/dcc-file-rec.h>
+#include <irssi/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 1cd8fa3c..cc1c9e43 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/irc/dcc/dcc-get.h>
-#include <irssip/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/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 943d2cee..3624f2c8 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 <irssip/src/irc/dcc/dcc.h>
+#include <irssi/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 <irssip/src/irc/dcc/dcc-file-rec.h>
+#include <irssi/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 5cb592e7..0253be4f 100644
--- a/src/irc/dcc/dcc-queue.c
+++ b/src/irc/dcc/dcc-queue.c
@@ -21,15 +21,15 @@
 */
 
 #include "module.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/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/irc/dcc/dcc-queue.h>
+#include <irssi/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 5b7f3ab0..08dcee38 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 <irssip/src/irc/dcc/dcc-chat.h>
+#include <irssi/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 ce10974a..dd62ff9d 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/misc.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>
+#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>
 
 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 67b82126..eccb8d37 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-servers.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 <irssi/src/irc/dcc/dcc-send.h>
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/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 4382415a..881ef64e 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 <irssip/src/irc/dcc/dcc.h>
+#include <irssi/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 <irssip/src/irc/dcc/dcc-file-rec.h>
+#include <irssi/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 90ab012d..4d1e94aa 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -19,17 +19,17 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-servers.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>
+#include <irssi/src/irc/dcc/dcc-chat.h>
+#include <irssi/src/irc/dcc/dcc-get.h>
+#include <irssi/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 86a49956..1a4449d4 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 <irssip/src/irc/dcc/dcc.h>
+#include <irssi/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 <irssip/src/irc/dcc/dcc-rec.h>
+#include <irssi/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 520ba277..bb1c6c22 100644
--- a/src/irc/dcc/dcc.c
+++ b/src/irc/dcc/dcc.c
@@ -19,21 +19,21 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
-#include <irssip/src/core/servers-setup.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/servers-setup.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>
+#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>
 
 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 482a304c..258d3395 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 <irssip/src/core/modules.h>
-#include <irssip/src/core/network.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/network.h>
 
 #define DCC(dcc) ((DCC_REC *) (dcc))
 
 typedef struct CHAT_DCC_REC CHAT_DCC_REC;
 
 typedef struct {
-#include <irssip/src/irc/dcc/dcc-rec.h>
+#include <irssi/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 5464cd21..4330d0a3 100644
--- a/src/irc/dcc/module.h
+++ b/src/irc/dcc/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 895cab59..33bd91f4 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/irc/core/irc-servers.h>
-#include <irssip/src/core/ignore.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 3fae5820..a1472648 100644
--- a/src/irc/flood/flood.c
+++ b/src/irc/flood/flood.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.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/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/irc/core/irc.h>
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/core/ignore.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 8a0d1b36..a80c46f7 100644
--- a/src/irc/flood/module.h
+++ b/src/irc/flood/module.h
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/src/irc/core/irc.h>
 
 typedef struct {
 	/* Flood protection */
diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h
index e3fafffc..f109afff 100644
--- a/src/irc/notifylist/module.h
+++ b/src/irc/notifylist/module.h
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/src/common.h>
+#include <irssi/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 <irssip/src/irc/core/irc-servers.h>
+#include <irssi/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 8931e81b..e7bceaac 100644
--- a/src/irc/notifylist/notify-commands.c
+++ b/src/irc/notifylist/notify-commands.c
@@ -19,12 +19,12 @@
 */
 
 #include "module.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/core/signals.h>
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/notifylist/notifylist.h>
+#include <irssi/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 507298f6..809394c4 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -19,15 +19,15 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/misc.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.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/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/servers-redirect.h>
 
-#include <irssip/src/irc/notifylist/notifylist.h>
+#include <irssi/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 531823be..62f983e2 100644
--- a/src/irc/notifylist/notify-setup.c
+++ b/src/irc/notifylist/notify-setup.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/lib-config/iconfig.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/settings.h>
 
-#include <irssip/src/irc/core/irc-servers.h>
-#include <irssip/src/irc/notifylist/notifylist.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/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 c469f863..bdfd72b4 100644
--- a/src/irc/notifylist/notify-whois.c
+++ b/src/irc/notifylist/notify-whois.c
@@ -19,14 +19,14 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/expandos.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/expandos.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/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/core/masks.h>
 
-#include <irssip/src/irc/notifylist/notifylist.h>
+#include <irssi/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 b70d841c..73737b37 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/modules.h>
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
+#include <irssi/src/core/modules.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.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/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/notifylist/notifylist.h>
-#include <irssip/src/irc/notifylist/notify-setup.h>
+#include <irssi/src/irc/notifylist/notifylist.h>
+#include <irssi/src/irc/notifylist/notify-setup.h>
 
 GSList *notifies;
 
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 51a212c4..82dc1fe5 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -19,16 +19,16 @@
 */
 
 #include "module.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/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/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>
+#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>
 
 void proxy_outdata(CLIENT_REC *client, const char *data, ...)
 {
diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c
index dfab831f..19aba87d 100644
--- a/src/irc/proxy/listen.c
+++ b/src/irc/proxy/listen.c
@@ -19,18 +19,18 @@
 */
 
 #include "module.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/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/irc/core/irc.h>
-#include <irssip/src/irc/core/irc-chatnets.h>
-#include <irssip/src/irc/core/irc-channels.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/fe-common/core/printtext.h> /* FIXME: evil. need to do fe-proxy */
+#include <irssi/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 ddd02972..b6ad3a4c 100644
--- a/src/irc/proxy/module.h
+++ b/src/irc/proxy/module.h
@@ -1,12 +1,12 @@
-#include <irssip/src/common.h>
+#include <irssi/src/common.h>
 
 #define MODULE_NAME "proxy"
 
-#include <irssip/src/core/network.h>
-#include <irssip/src/irc/core/irc.h>
-#include <irssip/src/irc/core/irc-servers.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/irc/proxy/proxy.h>
+#include <irssi/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 3ccb4e00..d32b6009 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -19,11 +19,11 @@
 */
 
 #include "module.h"
-#include <irssip/src/core/signals.h>
-#include <irssip/src/core/settings.h>
-#include <irssip/src/core/levels.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/levels.h>
 
-#include <irssip/src/fe-common/core/printtext.h>
+#include <irssi/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 49ca1c44..5b3d25f5 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 <irssip/src/common.h>
+#include <irssi/src/common.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/core/network.h>
+#include <irssi/src/irc/core/irc.h>
+#include <irssi/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 ac3d8dd1..eb09d70e 100644
--- a/src/lib-config/module.h
+++ b/src/lib-config/module.h
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/lib-config/iconfig.h>
+#include <irssi/src/common.h>
+#include <irssi/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 d0b7397b..36eb9f9d 100644
--- a/src/otr/key.c
+++ b/src/otr/key.c
@@ -28,15 +28,15 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <irssip/src/otr/key.h>
+#include <irssi/src/otr/key.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/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/otr/irssi-otr.h>
-#include <irssip/src/otr/otr-formats.h>
+#include <irssi/src/otr/irssi-otr.h>
+#include <irssi/src/otr/otr-formats.h>
 
 /*
  * Status of key generation.
diff --git a/src/otr/key.h b/src/otr/key.h
index 4f99a5d1..e9476953 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 <irssip/src/common.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/common.h>
+#include <irssi/src/core/servers.h>
 
-#include <irssip/src/otr/otr.h>
+#include <irssi/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 dc8dba42..dab26345 100644
--- a/src/otr/module.h
+++ b/src/otr/module.h
@@ -21,8 +21,8 @@
 #ifndef IRSSI_OTR_MODULE
 #define IRSSI_OTR_MODULE
 
-#include <irssip/src/common.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/common.h>
+#include <irssi/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 7808c115..80b50ae5 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 <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/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/otr/otr.h>
-#include <irssip/src/otr/otr-formats.h>
-#include <irssip/src/otr/key.h>
+#include <irssi/src/otr/otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/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 ff2fd473..af4d8aad 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 <irssip/src/otr/otr.h>
-#include <irssip/src/otr/otr-formats.h>
+#include <irssi/src/otr/otr.h>
+#include <irssi/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 b0f74fad..cf895dcb 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 <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 193adec2..6fe4c9f2 100644
--- a/src/otr/otr-module.c
+++ b/src/otr/otr-module.c
@@ -24,21 +24,21 @@
 
 #include "module.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/common.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/queries.h>
+#include <irssi/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/irc/core/irc-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/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>
+#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>
 
 /*
  * 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 c2350454..f87e6e94 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 <irssip/src/common.h>
+#include <irssi/src/common.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/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/otr/key.h>
+#include <irssi/src/otr/key.h>
 #include "module.h"
-#include <irssip/src/otr/otr-formats.h>
-#include <irssip/src/otr/irssi-otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/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 f52e4681..abe24726 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -24,15 +24,15 @@
 #include <gcrypt.h>
 #include <unistd.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/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/otr/irssi-otr.h>
-#include <irssip/src/otr/otr-formats.h>
-#include <irssip/src/otr/key.h>
+#include <irssi/src/otr/irssi-otr.h>
+#include <irssi/src/otr/otr-formats.h>
+#include <irssi/src/otr/key.h>
 
 static int otr_debug = 0;
 
diff --git a/src/otr/otr.h b/src/otr/otr.h
index 0bbe1561..e0324a13 100644
--- a/src/otr/otr.h
+++ b/src/otr/otr.h
@@ -28,8 +28,8 @@
 #include <libotr/context.h>
 #include <libotr/privkey.h>
 
-#include <irssip/src/common.h>
-#include <irssip/src/core/servers.h>
+#include <irssi/src/common.h>
+#include <irssi/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 1dd6d1a5..94a8398a 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 <irssip/irssi-version.h>
-#include <irssip/src/core/core.h>
-#include <irssip/src/core/utf8.h>
-#include <irssip/src/core/recode.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/src/core/pidwait.h>
-#include <irssip/src/core/session.h>
+#include <irssi/src/core/pidwait.h>
+#include <irssi/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 c1498f83..1dc36d27 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 <irssip/src/core/expandos.h>
+#include <irssi/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 ecf3e530..0f172411 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 <irssip/src/core/misc.h>
+#include <irssi/src/core/misc.h>
 
 static GHashTable *perl_settings;
 
diff --git a/src/perl/common/module.h b/src/perl/common/module.h
index 3819175b..92a712f8 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 <irssip/src/perl/module.h>
+#include <irssi/src/perl/module.h>
 #include <XSUB.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/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/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/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/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 <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>
 
 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 d37188bc..34978870 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 <irssip/src/irc/core/ctcp.h>
+#include <irssi/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 74db21a6..63e3111a 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 <irssip/src/core/misc.h>
+#include <irssi/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 d49dcd4a..3dcfb065 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,28 +1,28 @@
-#include <irssip/src/perl/common/module.h>
+#include <irssi/src/perl/common/module.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/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/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/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/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/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/proxy/proxy.h>
+#include <irssi/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 b51cb1c3..0b8b7b4c 100644
--- a/src/perl/module-formats.c
+++ b/src/perl/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/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 0d346a66..43b2f4ae 100644
--- a/src/perl/module-formats.h
+++ b/src/perl/module-formats.h
@@ -1,4 +1,4 @@
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/perl/module.h b/src/perl/module.h
index 2c7ddc13..0a4d78f6 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -1,4 +1,4 @@
-#include <irssip/src/common.h>
+#include <irssi/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 4001b78d..58b56bb8 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 <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/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/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/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/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/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/perl/perl-core.h>
-#include <irssip/src/perl/perl-common.h>
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
 
 typedef struct {
 	char *stash;
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index a64b89de..fe2d2f62 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 <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/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/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 <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 "XSUB.h"
 #include "irssi-core.pl.h"
diff --git a/src/perl/perl-fe.c b/src/perl/perl-fe.c
index ea262b7f..ac84d67a 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 <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/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/fe-common/core/printtext.h>
-#include <irssip/src/fe-common/core/completion.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-common/core/completion.h>
 
-#include <irssip/src/perl/perl-core.h>
+#include <irssi/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 c69b07e0..683b4c3f 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 <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/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/perl/perl-core.h>
-#include <irssip/src/perl/perl-common.h>
-#include <irssip/src/perl/perl-signals.h>
+#include <irssi/src/perl/perl-core.h>
+#include <irssi/src/perl/perl-common.h>
+#include <irssi/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 a456447c..9f9ec6b5 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 <irssip/src/core/signals.h>
+#include <irssi/src/core/signals.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>
+#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>
 
 typedef struct {
         PERL_SCRIPT_REC *script;
diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs
index d68d3fd6..655dbd3c 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 <irssip/src/fe-text/textbuffer-formats.h>
+#include <irssi/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 7aeb6b80..aba5bd77 100644
--- a/src/perl/textui/module.h
+++ b/src/perl/textui/module.h
@@ -1,12 +1,12 @@
-#include <irssip/src/perl/ui/module.h>
+#include <irssi/src/perl/ui/module.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>
+#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>
 
 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 9cae44f0..d001f382 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 <irssip/src/fe-common/core/window-activity.h>
+#include <irssi/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 3a4acca5..4106aec4 100644
--- a/src/perl/ui/module.h
+++ b/src/perl/ui/module.h
@@ -1,12 +1,12 @@
-#include <irssip/src/perl/common/module.h>
+#include <irssi/src/perl/common/module.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>
+#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>
 
 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 ce5fc029..d1164f91 100644
--- a/tests/fe-common/core/test-formats.c
+++ b/tests/fe-common/core/test-formats.c
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/fe-common/core/formats.h>
+#include <irssi/src/common.h>
+#include <irssi/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 1d8e8ee9..87669598 100644
--- a/tests/fe-text/test-paste-join-multiline.c
+++ b/tests/fe-text/test-paste-join-multiline.c
@@ -1,5 +1,5 @@
-#include <irssip/src/common.h>
-#include <irssip/src/fe-text/gui-readline.c>
+#include <irssi/src/common.h>
+#include <irssi/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 2a37014e..c6490e6b 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 <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 <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 <time.h>
-#include <irssip/src/core/args.h>
+#include <irssi/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 53a41644..4845d54c 100644
--- a/tests/irc/core/test-irc.c
+++ b/tests/irc/core/test-irc.c
@@ -19,7 +19,7 @@
 */
 
 #include <glib.h>
-#include <irssip/src/irc/core/irc.h>
+#include <irssi/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 1b939620..a2864144 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 <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/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/fe-common/core/formats.h>
-#include <irssip/src/fe-common/core/fe-common-core.h>
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/fe-common/core/fe-common-core.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 <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-servers.h>
+#include <irssi/src/irc/core/irc-channels.h>
 
 /* flood.c */
 void irc_flood_init(void);