diff --git a/src/core/window-item-def.h b/src/core/window-item-def.h
index 6944c921..c93b031b 100644
--- a/src/core/window-item-def.h
+++ b/src/core/window-item-def.h
@@ -1,6 +1,9 @@
 #ifndef IRSSI_CORE_WINDOW_ITEM_DEF_H
 #define IRSSI_CORE_WINDOW_ITEM_DEF_H
 
+#include <irssi/src/common.h>
+#include <irssi/src/core/servers.h>
+
 #define STRUCT_SERVER_REC SERVER_REC
 struct _WI_ITEM_REC {
 #include <irssi/src/core/window-item-rec.h>
diff --git a/src/fe-text/terminfo-core.h b/src/fe-text/terminfo-core.h
index cb0e41e2..4ba66957 100644
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@@ -1,6 +1,7 @@
 #ifndef IRSSI_FE_TEXT_TERMINFO_CORE_H
 #define IRSSI_FE_TEXT_TERMINFO_CORE_H
 
+#include <irssi/src/common.h>
 #include <termios.h>
 
 #define terminfo_move(x, y) current_term->tr_move(current_term, x, y)
diff --git a/src/fe-text/textbuffer.h b/src/fe-text/textbuffer.h
index 6c72a569..de010d3a 100644
--- a/src/fe-text/textbuffer.h
+++ b/src/fe-text/textbuffer.h
@@ -1,6 +1,8 @@
 #ifndef IRSSI_FE_TEXT_TEXTBUFFER_H
 #define IRSSI_FE_TEXT_TEXTBUFFER_H
 
+#include <irssi/src/common.h>
+
 /* Make sure TEXT_CHUNK_REC is not slightly more than a page, as that
    wastes a lot of memory. */
 #define LINE_TEXT_CHUNK_SIZE (16384 - 16)