3 files changed, 12 insertions, 0 deletions
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 53b405ea2..e0bc80fcf 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +44,7 @@
 #include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 /* Constants for the options.  */
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 9b80a20ba..9838b1c7b 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -22,6 +22,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -76,6 +79,7 @@
 #include "../common/gc-opt-flags.h"
 #include "dns-stuff.h"
 #include "http-common.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 #ifndef ENAMETOOLONG
 # define ENAMETOOLONG EINVAL
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index 82d4a6ebc..a96722619 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -55,6 +58,7 @@
 #include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 /* There is no need for the npth_unprotect and leave functions here;
  * thus we redefine them to nops.  We keep them in the code just for