diff --git a/Makefile.am b/Makefile.am
index 8027c8fb250c8d8ee2aa857d043dacca4f08b3a6..6a6ac629776f1a931f838bb7414efb110cabedd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,8 @@ EXTRA_DIST = \
 	COPYING.LGPL \
 	ChangeLog
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
-  nodist_pkginc_lib_HEADERS = pigeonhole-config.h
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+nodist_pkginc_lib_HEADERS = pigeonhole-config.h
 
 if MAINTAINER_MODE
 ChangeLog: .hg/dirstate
diff --git a/configure.in b/configure.in
index 6859b7afdbbf79289792320dcc90daf9e622496a..81eeb53071a9c4d80b07a5088f6b1658f6ff4958 100644
--- a/configure.in
+++ b/configure.in
@@ -59,16 +59,6 @@ fi
 #
 #
 
-AC_ARG_ENABLE(header-install,
-[  --enable-header-install Install development headers],
-    if test x$enableval = xno; then
-        want_headers=no
-    else
-        want_headers=yes
-    fi,
-    want_headers=no)
-AM_CONDITIONAL(INSTALL_HEADERS, test "$want_headers" = "yes")
-
 AC_ARG_WITH(docs,
 [  --with-docs             Install documentation (default)],
     if test x$withval = xno; then
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 509efffdac6b7ce77ee35a89bd4b58e05a14e368..5c539082edb73c6be9a71abf51d3f9326760ce56 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -149,9 +149,5 @@ headers = \
 	sieve-plugins.h \
 	sieve.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
-  pkginc_lib_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/enotify/Makefile.am b/src/lib-sieve/plugins/enotify/Makefile.am
index a3fc8acef9307e834515e6908369ab547cb43bf7..22a0cd5bf8ecaeea3d3f855a66adc09725d467a5 100644
--- a/src/lib-sieve/plugins/enotify/Makefile.am
+++ b/src/lib-sieve/plugins/enotify/Makefile.am
@@ -39,10 +39,6 @@ headers = \
 	ext-enotify-limits.h \
 	ext-enotify-common.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
-  pkginc_lib_HEADERS = $(public_headers)
-  noinst_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)
diff --git a/src/lib-sieve/plugins/environment/Makefile.am b/src/lib-sieve/plugins/environment/Makefile.am
index a19012863397ada732a89ecf4c4e4f89342fe3b5..916362ebc4210d1b4856ec269558b3533dee6b35 100644
--- a/src/lib-sieve/plugins/environment/Makefile.am
+++ b/src/lib-sieve/plugins/environment/Makefile.am
@@ -18,11 +18,7 @@ public_headers = \
 headers = \
 	ext-environment-common.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
-  pkginc_lib_HEADERS = $(public_headers)
-  noinst_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)
 
diff --git a/src/lib-sieve/plugins/variables/Makefile.am b/src/lib-sieve/plugins/variables/Makefile.am
index bb9e44efd1c4bcb8de450de90725453c70ea6432..59fb0142ba0b81917cc39a1c233eb08ecc5cd7d5 100644
--- a/src/lib-sieve/plugins/variables/Makefile.am
+++ b/src/lib-sieve/plugins/variables/Makefile.am
@@ -35,11 +35,7 @@ headers = \
 	ext-variables-modifiers.h \
 	ext-variables-dump.h
 
-if INSTALL_HEADERS
-  pkginc_libdir=$(dovecot_pkgincludedir)/sieve
-  pkginc_lib_HEADERS = $(public_headers)
-  noinst_HEADERS = $(headers)
-else
-  noinst_HEADERS = $(headers) $(public_headers)
-endif
+pkginc_libdir=$(dovecot_pkgincludedir)/sieve
+pkginc_lib_HEADERS = $(public_headers)
+noinst_HEADERS = $(headers)