diff --git a/agent/Makefile.am b/agent/Makefile.am
index ee7c38d9d..d5998c71c 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -94,6 +94,7 @@ gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
 
 gpg_preset_passphrase_SOURCES = \
 	preset-passphrase.c
+gpg_preset_passphrase_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 
 # Needs $(NETLIBS) for libsimple-pwquery.la.
 gpg_preset_passphrase_LDADD = \
@@ -121,3 +122,4 @@ t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 
 t_protect_SOURCES = t-protect.c protect.c
 t_protect_LDADD = $(t_common_ldadd)
+t_protect_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index fe72860e9..dd727e1e0 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -65,8 +65,8 @@ client_sources = \
 libkeybox_a_SOURCES = $(common_sources) $(client_sources)
 libkeybox509_a_SOURCES = $(common_sources) $(client_sources)
 
-libkeybox_a_CFLAGS = $(AM_CFLAGS)
-libkeybox509_a_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
+libkeybox_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
+libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DKEYBOX_WITH_X509=1
 
 
 # We need W32SOCKLIBS because the init subsystem code in libcommon