diff --git a/Makefile.am b/Makefile.am
index 5b436195..1ea6ed78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@ conf_DATA = irssi.conf
 themedir = $(datadir)/irssi/themes
 theme_DATA = default.theme colorless.theme
 
+pkginclude_HEADERS = config.h irssi-version.h
+
 noinst_HEADERS = irssi-version.h.in
 
 EXTRA_DIST = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 0288811f..91ed1398 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,8 @@ if HAVE_PERL
 PERLDIR=perl
 endif
 
-noinst_HEADERS = \
+pkginc_srcdir=$(pkgincludedir)/src
+pkginc_src_HEADERS = \
 	common.h
 
 SUBDIRS = lib-popt lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI)
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index beee1098..707f8b86 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -55,7 +55,8 @@ structure_headers = \
 	server-connect-rec.h \
 	window-item-rec.h
 
-noinst_HEADERS = \
+pkginc_coredir=$(pkgincludedir)/src/core
+pkginc_core_HEADERS = \
 	args.h \
 	channels.h \
 	channels-setup.h \
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 98f220c7..b7c57414 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -38,7 +38,8 @@ libfe_common_core_a_SOURCES = \
 	windows-layout.c \
 	fe-windows.c
 
-noinst_HEADERS = \
+pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core
+pkginc_fe_common_core_HEADERS = \
 	autorun.h \
 	command-history.h \
 	chat-completion.h \
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 99e3aa44..fa69e940 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -32,7 +32,8 @@ libfe_common_irc_a_SOURCES = \
 	$(real_sources) \
         irc-modules.c
 
-noinst_HEADERS = \
+pkginc_fe_common_ircdir=$(pkgincludedir)/src/fe-common/irc
+pkginc_fe_common_irc_HEADERS = \
 	fe-irc-server.h \
 	module.h \
 	module-formats.h
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 84813cfb..7161f262 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -19,7 +19,8 @@ libfe_irc_dcc_a_SOURCES = \
 	module-formats.c \
 	fe-dcc-server.c
 
-noinst_HEADERS = \
+pkginc_fe_common_irc_dccdir=$(pkgincludedir)/src/fe-common/irc/dcc
+pkginc_fe_common_irc_dcc_HEADERS = \
 	module.h \
 	module-formats.h \
 	fe-dcc.h
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 17523f75..94f5a791 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -13,6 +13,7 @@ libfe_irc_notifylist_a_SOURCES = \
 	fe-notifylist.c \
 	module-formats.c
 
-noinst_HEADERS = \
+pkginc_fe_common_irc_notifylistdir=$(pkgincludedir)/src/fe-common/irc/notifylist
+pkginc_fe_common_irc_notifylist_HEADERS = \
 	module.h \
 	module-formats.h
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index fb84a0b5..fa4ca3f9 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -34,7 +34,8 @@ libirc_core_a_SOURCES = \
         servers-idle.c \
         servers-redirect.c
 
-noinst_HEADERS = \
+pkginc_irc_coredir=$(pkgincludedir)/src/irc/core
+pkginc_irc_core_HEADERS = \
 	bans.h \
         ctcp.h \
         channel-rejoin.h \
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index d2b1cf02..a2ca19e2 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -16,7 +16,8 @@ libirc_dcc_a_SOURCES = \
 	dcc-queue.c \
 	dcc-server.c
 
-noinst_HEADERS = \
+pkginc_irc_dccdir=$(pkgincludedir)/src/irc/dcc
+pkginc_irc_dcc_HEADERS = \
 	dcc-rec.h \
 	dcc-file-rec.h \
 	dcc.h \
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index 066da565..a5ba65b0 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -10,5 +10,6 @@ libirc_flood_a_SOURCES = \
 	autoignore.c \
 	flood.c
 
-noinst_HEADERS = \
+pkginc_irc_flooddir=$(pkgincludedir)/src/irc/flood
+pkginc_irc_flood_HEADERS = \
 	module.h
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 5734f9a7..c4a7f4a0 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -13,7 +13,8 @@ libirc_notifylist_a_SOURCES = \
 	notify-setup.c \
 	notify-whois.c
 
-noinst_HEADERS = \
+pkginc_irc_notifylistdir=$(pkgincludedir)/src/irc/notifylist
+pkginc_irc_notifylist_HEADERS = \
 	notifylist.h \
 	notify-setup.h \
 	module.h
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index f8acdbd9..4831ae66 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -10,6 +10,7 @@ libirssi_config_a_SOURCES = \
 	parse.c \
 	write.c
 
-noinst_HEADERS = \
+pkginc_lib_configdir=$(pkgincludedir)/src/lib-config
+pkginc_lib_config_HEADERS = \
 	iconfig.h \
 	module.h
diff --git a/src/lib-popt/Makefile.am b/src/lib-popt/Makefile.am
index 01163b79..0d974e14 100644
--- a/src/lib-popt/Makefile.am
+++ b/src/lib-popt/Makefile.am
@@ -7,5 +7,6 @@ INCLUDES = \
 libpopt_a_SOURCES = \
 	findme.c popt.c poptconfig.c popthelp.c poptparse.c
 
-noinst_HEADERS = \
+pkginc_libpoptdir=$(pkgincludedir)/src/lib-popt
+pkginc_libpopt_HEADERS = \
 	findme.h popt.h poptint.h