diff --git a/src/lib-sieve/plugins/imap4flags/Makefile.am b/src/lib-sieve/plugins/imap4flags/Makefile.am
index 1f8bbad6c65e0e145cbb7980aee4e4262bac3693..3debfd022a0150b93378565d93c13afdb53e6e35 100644
--- a/src/lib-sieve/plugins/imap4flags/Makefile.am
+++ b/src/lib-sieve/plugins/imap4flags/Makefile.am
@@ -3,10 +3,7 @@ noinst_LTLIBRARIES = libsieve_ext_imap4flags.la
 AM_CPPFLAGS = \
 	-I../../ \
     -I../variables \
-	-I$(dovecot_incdir) \
-	-I$(dovecot_incdir)/src/lib \
-	-I$(dovecot_incdir)/src/lib-mail \
-	-I$(dovecot_incdir)/src/lib-storage 
+	$(SIEVE_LIB_DOVECOT_INCLUDE)
 
 commands = \
 	cmd-flag.c
diff --git a/src/sieve-tools/debug/Makefile.am b/src/sieve-tools/debug/Makefile.am
index d8c8576adbef7b9c61b03a3d1ece6a538d239637..e621b9919ad5e0257e0665f6130347883d6d4195 100644
--- a/src/sieve-tools/debug/Makefile.am
+++ b/src/sieve-tools/debug/Makefile.am
@@ -2,10 +2,7 @@ noinst_LTLIBRARIES = libsieve_ext_debug.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-sieve \
-	-I$(dovecot_incdir) \
-	-I$(dovecot_incdir)/src/lib \
-	-I$(dovecot_incdir)/src/lib-mail \
-	-I$(dovecot_incdir)/src/lib-storage 
+	$(SIEVE_LIB_DOVECOT_INCLUDE)
 
 commands = \
 	cmd-debug-print.c