diff --git a/configure.in b/configure.in
index ff495a54276bfc86e074cff2c6f76edaedf2679e..2bfc9724003bf2f6407699f99fb958a69cfc8fca 100644
--- a/configure.in
+++ b/configure.in
@@ -102,24 +102,9 @@ if test $have_dovecot_sources = yes; then
   LIBDOVECOT='$(dovecot_libdir)/src/lib-dovecot/libdovecot.la'
   LIBDOVECOT_STORAGE='$(dovecot_libdir)/src/lib-storage/libdovecot-storage.la'
 
-  LIBDOVECOT_INCLUDE=' \
-    -I$(dovecot_incdir) \
-    -I$(dovecot_incdir)/src/lib \
-    -I$(dovecot_incdir)/src/lib-dict \
-    -I$(dovecot_incdir)/src/lib-mail \
-    -I$(dovecot_incdir)/src/lib-storage \
-    -I$(dovecot_incdir)/src/lib-imap \
-    -I$(dovecot_incdir)/src/lib-master'
-
-  LIBDOVECOT_LDA_INCLUDE=' \
-    -I$(dovecot_incdir)/src/lib-lda \
-    -I$(dovecot_incdir)/src/lda'
-
-  LIBDOVECOT_STORAGE_INCLUDE=' \
-    -I$(dovecot_incdir)/src/lib-settings \
-    -I$(dovecot_incdir)/src/lib-index \
-    -I$(dovecot_incdir)/src/lib-storage/index \
-    -I$(dovecot_incdir)/src/lib-storage/index/raw'
+  LIBDOVECOT_INCLUDE='-I$(dovecot_incdir) -I$(dovecot_incdir)/src/lib -I$(dovecot_incdir)/src/lib-dict -I$(dovecot_incdir)/src/lib-mail -I$(dovecot_incdir)/src/lib-storage -I$(dovecot_incdir)/src/lib-imap -I$(dovecot_incdir)/src/lib-master'
+  LIBDOVECOT_LDA_INCLUDE='-I$(dovecot_incdir)/src/lib-lda -I$(dovecot_incdir)/src/lda'
+  LIBDOVECOT_STORAGE_INCLUDE='-I$(dovecot_incdir)/src/lib-settings  -I$(dovecot_incdir)/src/lib-index -I$(dovecot_incdir)/src/lib-storage/index -I$(dovecot_incdir)/src/lib-storage/index/raw'
 else
   dovecot_libdir="$dovecotdir"