diff --git a/configure.ac b/configure.ac
index 453fcd33..cafd2970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects nostdinc])
 
 AM_SILENT_RULES([yes])
 
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b49dad18..493c42b2 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libcore.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DMODULEDIR=\""$(libdir)/irssi/modules"\"
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index 7e76d3a0..01e934e0 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_common_core.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index 401720f6..8a04bee4 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = dcc notifylist
 noinst_LIBRARIES = libfe_common_irc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am
index 0be3cffa..feee349d 100644
--- a/src/fe-common/irc/dcc/Makefile.am
+++ b/src/fe-common/irc/dcc/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_irc_dcc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am
index 6fca7676..5eecb5fb 100644
--- a/src/fe-common/irc/notifylist/Makefile.am
+++ b/src/fe-common/irc/notifylist/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libfe_irc_notifylist.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index d54c3291..3efa83b6 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -6,6 +6,7 @@ bin_PROGRAMS = irssi-fuzz server-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 irssi_fuzz_DEPENDENCIES = @COMMON_LIBS@
diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am
index 8fcd59b3..8f6ae477 100644
--- a/src/fe-fuzz/fe-common/core/Makefile.am
+++ b/src/fe-fuzz/fe-common/core/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = theme-load-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am
index 33f7664d..9221e29e 100644
--- a/src/fe-fuzz/irc/core/Makefile.am
+++ b/src/fe-fuzz/irc/core/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = event-get-params-fuzz
 CCLD=$(CXX) $(CXXFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 LDADD = \
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index 44c23d6e..bbcd63f8 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = botti
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index c7044ba9..d97cbfa5 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = irssi
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 irssi_DEPENDENCIES = \
diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am
index 858d7fcb..5881481b 100644
--- a/src/irc/core/Makefile.am
+++ b/src/irc/core/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_core.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am
index 887a65d2..c5592f7f 100644
--- a/src/irc/dcc/Makefile.am
+++ b/src/irc/dcc/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_dcc.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_dcc_a_SOURCES = \
diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am
index 7a49001d..4b37cede 100644
--- a/src/irc/flood/Makefile.am
+++ b/src/irc/flood/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_flood.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_flood_a_SOURCES = \
diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am
index 9bc0fd8b..3f913d58 100644
--- a/src/irc/notifylist/Makefile.am
+++ b/src/irc/notifylist/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirc_notifylist.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_notifylist_a_SOURCES = \
diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am
index 2e7259ad..437a6dc0 100644
--- a/src/irc/proxy/Makefile.am
+++ b/src/irc/proxy/Makefile.am
@@ -2,6 +2,7 @@ moduledir = $(libdir)/irssi/modules
 module_LTLIBRARIES = libirc_proxy.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirc_proxy.a:
diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am
index 4912aa9b..cd319edb 100644
--- a/src/lib-config/Makefile.am
+++ b/src/lib-config/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libirssi_config.a
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 libirssi_config_a_SOURCES = \
diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am
index 149b952d..b9b82d9a 100644
--- a/src/otr/Makefile.am
+++ b/src/otr/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_LTLIBRARIES = \
 	libotr_core_static.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS) \
 	$(OTR_CFLAGS)
 
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index ad937457..ca81d3c6 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -15,6 +15,8 @@ perl-core.lo: irssi-core.pl.h
 perl-signals.lo: perl-signals-list.h
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	-I$(builddir) \
 	$(GLIB_CFLAGS) \
 	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am
index eb7e2c7f..15287601 100644
--- a/tests/fe-common/core/Makefile.am
+++ b/tests/fe-common/core/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-common/core
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 test_programs = test-formats
diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am
index 8f44dded..a0e1d0f5 100644
--- a/tests/fe-text/Makefile.am
+++ b/tests/fe-text/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=fe-text
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	$(GLIB_CFLAGS)
 
 test_programs = test-paste-join-multiline
diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am
index fbf001da..503989a9 100644
--- a/tests/irc/core/Makefile.am
+++ b/tests/irc/core/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/core
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)
 
diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am
index f815504d..6c4eec84 100644
--- a/tests/irc/flood/Makefile.am
+++ b/tests/irc/flood/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/utils/glib-tap.mk
 PACKAGE_STRING=irc/flood
 
 AM_CPPFLAGS = \
+	-I$(top_builddir) \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	$(GLIB_CFLAGS)