1 files changed, 4 insertions, 0 deletions
diff --git a/g13/g13.c b/g13/g13.c
index 6265b9f24..385ba0f9b 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -18,6 +18,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>
 #include <string.h>
@@ -47,6 +50,7 @@
 #include "mountinfo.h"
 #include "backend.h"
 #include "call-syshelp.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 enum cmd_and_opt_values {