[Pkg-gnupg-commit] [gnupg2] 33/124: Remove -I option to common.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Apr 5 15:55:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 70aca95d6816082b289fceca8eabfcf718a6b701
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Tue Mar 7 20:21:23 2017 +0900
Remove -I option to common.
* dirmngr/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* g10/Makefile.am (AM_CPPFLAGS): Ditto.
* g13/Makefile.am (AM_CPPFLAGS): Ditto.
* kbx/Makefile.am (AM_CPPFLAGS): Ditto.
* scd/Makefile.am (AM_CPPFLAGS): Ditto.
* sm/Makefile.am (AM_CPPFLAGS): Ditto.
* tools/Makefile.am (AM_CPPFLAGS): Ditto.
* Throughout: Follow the change.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
dirmngr/Makefile.am | 2 +-
dirmngr/dirmngr-client.c | 6 +++---
dirmngr/dirmngr.c | 4 ++--
dirmngr/dirmngr_ldap.c | 4 ++--
dirmngr/dns-stuff.c | 4 ++--
dirmngr/http.c | 4 ++--
dirmngr/ks-engine-finger.c | 2 +-
dirmngr/ks-engine-hkp.c | 2 +-
dirmngr/ks-engine-kdns.c | 2 +-
dirmngr/ks-engine-ldap.c | 2 +-
dirmngr/ldap-parse-uri.c | 2 +-
dirmngr/ldap-parse-uri.h | 2 +-
dirmngr/ldap-wrapper.c | 2 +-
dirmngr/ldap.c | 4 ++--
dirmngr/misc.c | 2 +-
dirmngr/server.c | 6 +++---
dirmngr/t-dns-stuff.c | 2 +-
dirmngr/t-http.c | 4 ++--
g10/Makefile.am | 2 +-
g10/armor.c | 9 ++++-----
g10/build-packet.c | 10 +++++-----
g10/call-agent.c | 14 +++++++-------
g10/call-dirmngr.c | 12 ++++++------
g10/card-util.c | 8 ++++----
g10/cipher.c | 8 ++++----
g10/compress-bz2.c | 2 +-
g10/compress.c | 2 +-
g10/cpr.c | 8 ++++----
g10/dearmor.c | 8 ++++----
g10/decrypt-data.c | 6 +++---
g10/decrypt.c | 10 +++++-----
g10/delkey.c | 11 +++++------
g10/ecdh.c | 2 +-
g10/encrypt.c | 10 +++++-----
g10/exec.c | 10 +++++-----
g10/export.c | 18 +++++++++---------
g10/filter.h | 2 +-
g10/free-packet.c | 2 +-
g10/getkey.c | 12 ++++++------
g10/gpg.c | 16 ++++++++--------
g10/gpgsql.c | 4 ++--
g10/gpgv.c | 12 ++++++------
g10/helptext.c | 6 +++---
g10/import.c | 11 +++++------
g10/kbnode.c | 2 +-
g10/keydb.c | 4 ++--
g10/keydb.h | 4 ++--
g10/keyedit.c | 14 +++++++-------
g10/keygen.c | 12 ++++++------
g10/keyid.c | 6 +++---
g10/keylist.c | 14 +++++++-------
g10/keyring.c | 4 ++--
g10/keyserver-internal.h | 2 +-
g10/keyserver.c | 14 +++++++-------
g10/main.h | 6 +++---
g10/mainproc.c | 10 +++++-----
g10/mdfilter.c | 6 +++---
g10/migrate.c | 2 +-
g10/misc.c | 8 ++++----
g10/openfile.c | 8 ++++----
g10/options.h | 2 +-
g10/packet.h | 4 ++--
g10/parse-packet.c | 8 ++++----
g10/passphrase.c | 8 ++++----
g10/photoid.c | 10 +++++-----
g10/pkclist.c | 10 +++++-----
g10/pkglue.c | 2 +-
g10/plaintext.c | 8 ++++----
g10/progress.c | 6 +++---
g10/pubkey-enc.c | 8 ++++----
g10/revoke.c | 9 ++++-----
g10/server.c | 6 +++---
g10/seskey.c | 4 ++--
g10/sig-check.c | 6 +++---
g10/sign.c | 16 ++++++++--------
g10/skclist.c | 6 +++---
g10/t-stutter.c | 2 +-
g10/tdbdump.c | 8 ++++----
g10/tdbio.c | 8 ++++----
g10/tdbio.h | 2 +-
g10/test-stubs.c | 12 ++++++------
g10/textfilter.c | 10 +++++-----
g10/tofu.c | 16 ++++++++--------
g10/trust.c | 6 +++---
g10/trustdb.c | 10 +++++-----
g10/verify.c | 11 +++++------
g13/Makefile.am | 2 +-
g13/backend.c | 2 +-
g13/be-dmcrypt.c | 2 +-
g13/be-encfs.c | 2 +-
g13/be-truecrypt.c | 2 +-
g13/call-syshelp.c | 4 ++--
g13/create.c | 2 +-
g13/g13-common.c | 4 ++--
g13/g13-syshelp.c | 6 +++---
g13/g13.c | 8 ++++----
g13/keyblob.c | 2 +-
g13/mount.c | 4 ++--
g13/mountinfo.c | 2 +-
g13/runner.c | 2 +-
g13/server.c | 2 +-
g13/sh-blockdev.c | 4 ++--
g13/sh-cmd.c | 2 +-
g13/sh-dmcrypt.c | 4 ++--
g13/suspend.c | 2 +-
g13/t-g13tuple.c | 2 +-
kbx/Makefile.am | 2 +-
kbx/kbxutil.c | 2 +-
kbx/keybox-dump.c | 2 +-
kbx/keybox-openpgp.c | 2 +-
kbx/keybox-search.c | 4 ++--
kbx/keybox-util.c | 2 +-
scd/Makefile.am | 2 +-
scd/apdu.c | 10 +++++-----
scd/app-dinsig.c | 4 ++--
scd/app-geldkarte.c | 4 ++--
scd/app-help.c | 2 +-
scd/app-nks.c | 6 +++---
scd/app-openpgp.c | 10 +++++-----
scd/app-p15.c | 2 +-
scd/app-sc-hsm.c | 2 +-
scd/app.c | 4 ++--
scd/command.c | 4 ++--
scd/scdaemon.c | 10 +++++-----
sm/Makefile.am | 2 +-
sm/call-agent.c | 8 ++++----
sm/call-dirmngr.c | 4 ++--
sm/certchain.c | 4 ++--
sm/certcheck.c | 2 +-
sm/certdump.c | 2 +-
sm/certlist.c | 2 +-
sm/certreqgen-ui.c | 6 +++---
sm/certreqgen.c | 2 +-
sm/decrypt.c | 2 +-
sm/delete.c | 2 +-
sm/encrypt.c | 2 +-
sm/export.c | 6 +++---
sm/fingerprint.c | 2 +-
sm/gpgsm.c | 8 ++++----
sm/import.c | 6 +++---
sm/keydb.c | 2 +-
sm/keylist.c | 4 ++--
sm/misc.c | 4 ++--
sm/qualified.c | 2 +-
sm/server.c | 4 ++--
sm/sign.c | 2 +-
sm/verify.c | 2 +-
tools/Makefile.am | 2 +-
tools/call-dirmngr.c | 8 ++++----
tools/gpg-check-pattern.c | 6 +++---
tools/gpg-connect-agent.c | 2 +-
tools/gpg-wks-client.c | 22 +++++++++++-----------
tools/gpgconf-comp.c | 10 +++++-----
tools/gpgconf.c | 4 ++--
tools/gpgsplit.c | 4 ++--
tools/gpgtar-create.c | 2 +-
tools/gpgtar-extract.c | 2 +-
tools/gpgtar-list.c | 2 +-
tools/gpgtar.c | 6 +++---
tools/mime-maker.c | 4 ++--
tools/mime-parser.c | 2 +-
tools/send-mail.c | 6 +++---
tools/wks-receive.c | 6 +++---
tools/wks-util.c | 10 +++++-----
164 files changed, 446 insertions(+), 451 deletions(-)
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 93880f8..34f2c5d 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -31,7 +31,7 @@ endif
noinst_PROGRAMS = $(module_tests) $(module_net_tests) $(module_maint_tests)
TESTS = $(module_tests) $(module_net_tests)
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 01cface..c1ff635 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -38,9 +38,9 @@
#include "../common/strlist.h"
#include "../common/asshelp.h"
-#include "i18n.h"
-#include "util.h"
-#include "init.h"
+#include "../common/i18n.h"
+#include "../common/util.h"
+#include "../common/init.h"
/* Constants for the options. */
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index f05bdd1..e3e02fe 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -65,12 +65,12 @@
#if USE_LDAP
# include "ldapserver.h"
#endif
-#include "asshelp.h"
+#include "../common/asshelp.h"
#if USE_LDAP
# include "ldap-wrapper.h"
#endif
#include "../common/init.h"
-#include "gc-opt-flags.h"
+#include "../common/gc-opt-flags.h"
#include "dns-stuff.h"
#include "http-common.h"
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index a0acb8e..836ced0 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -56,8 +56,8 @@
#include "../common/mischelp.h"
#include "../common/strlist.h"
-#include "i18n.h"
-#include "util.h"
+#include "../common/i18n.h"
+#include "../common/util.h"
#include "../common/init.h"
/* With the ldap wrapper, there is no need for the npth_unprotect and leave
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 57b3b7e..ec9a095 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -68,8 +68,8 @@
#endif
#include "./dirmngr-err.h"
-#include "util.h"
-#include "host2net.h"
+#include "../common/util.h"
+#include "../common/host2net.h"
#include "dns-stuff.h"
#ifdef USE_NPTH
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 0f11af7..3adf6e5 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -96,8 +96,8 @@
#include <assuan.h> /* We need the socket wrapper. */
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
#include "dns-stuff.h"
#include "http.h"
#include "http-common.h"
diff --git a/dirmngr/ks-engine-finger.c b/dirmngr/ks-engine-finger.c
index 811b72d..82ef7a5 100644
--- a/dirmngr/ks-engine-finger.c
+++ b/dirmngr/ks-engine-finger.c
@@ -26,7 +26,7 @@
#include "dirmngr.h"
#include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
#include "ks-engine.h"
/* Print a help output for the schemata supported by this module. */
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index b6a0675..ee7d506 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -37,7 +37,7 @@
#include "dirmngr.h"
#include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
#include "dns-stuff.h"
#include "ks-engine.h"
diff --git a/dirmngr/ks-engine-kdns.c b/dirmngr/ks-engine-kdns.c
index 9bb0d42..71463fe 100644
--- a/dirmngr/ks-engine-kdns.c
+++ b/dirmngr/ks-engine-kdns.c
@@ -26,7 +26,7 @@
#include "dirmngr.h"
#include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
#include "ks-engine.h"
/* Print a help output for the schemata supported by this module. */
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index f664655..f50ba50 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -45,7 +45,7 @@
#include "dirmngr.h"
#include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
#include "ks-engine.h"
#include "ldap-parse-uri.h"
diff --git a/dirmngr/ldap-parse-uri.c b/dirmngr/ldap-parse-uri.c
index 9671496..94d4efd 100644
--- a/dirmngr/ldap-parse-uri.c
+++ b/dirmngr/ldap-parse-uri.c
@@ -27,7 +27,7 @@
# include <ldap.h>
#endif
-#include "util.h"
+#include "../common/util.h"
#include "http.h"
/* Returns 1 if the string is an LDAP URL (begins with ldap:, ldaps:
diff --git a/dirmngr/ldap-parse-uri.h b/dirmngr/ldap-parse-uri.h
index bdbb6c3..e9a3f95 100644
--- a/dirmngr/ldap-parse-uri.h
+++ b/dirmngr/ldap-parse-uri.h
@@ -20,7 +20,7 @@
#ifndef DIRMNGR_LDAP_PARSE_URI_H
#define DIRMNGR_LDAP_PARSE_URI_H
-#include "util.h"
+#include "../common/util.h"
#include "http.h"
extern int ldap_uri_p (const char *url);
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index b313848..ac4964a 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -58,7 +58,7 @@
#include <npth.h>
#include "dirmngr.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
#include "misc.h"
#include "ldap-wrapper.h"
diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c
index a037f5d..d661a68 100644
--- a/dirmngr/ldap.c
+++ b/dirmngr/ldap.c
@@ -31,12 +31,12 @@
#include <npth.h>
#include "dirmngr.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
#include "crlfetch.h"
#include "ldapserver.h"
#include "misc.h"
#include "ldap-wrapper.h"
-#include "host2net.h"
+#include "../common/host2net.h"
#define UNENCODED_URL_CHARS "abcdefghijklmnopqrstuvwxyz" \
diff --git a/dirmngr/misc.c b/dirmngr/misc.c
index 6d7c963..1716141 100644
--- a/dirmngr/misc.c
+++ b/dirmngr/misc.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include "dirmngr.h"
-#include "util.h"
+#include "../common/util.h"
#include "misc.h"
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 9fa8229..f4aeadb 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -51,9 +51,9 @@
# include "ldap-parse-uri.h"
#endif
#include "dns-stuff.h"
-#include "mbox-util.h"
-#include "zb32.h"
-#include "server-help.h"
+#include "../common/mbox-util.h"
+#include "../common/zb32.h"
+#include "../common/server-help.h"
/* To avoid DoS attacks we limit the size of a certificate to
something reasonable. The DoS was actually only an issue back when
diff --git a/dirmngr/t-dns-stuff.c b/dirmngr/t-dns-stuff.c
index 23c0c6a..5a3ede1 100644
--- a/dirmngr/t-dns-stuff.c
+++ b/dirmngr/t-dns-stuff.c
@@ -24,7 +24,7 @@
#include <assert.h>
-#include "util.h"
+#include "../common/util.h"
#include "dns-stuff.h"
#define PGM "t-dns-stuff"
diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c
index 35f5947..622dce5 100644
--- a/dirmngr/t-http.c
+++ b/dirmngr/t-http.c
@@ -38,8 +38,8 @@
#include <unistd.h>
#include <assuan.h>
-#include "util.h"
-#include "logging.h"
+#include "../common/util.h"
+#include "../common/logging.h"
#include "http.h"
#include <ksba.h>
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 604be93..f1d2d17 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
t-keydb-get-keyblock.gpg t-stutter-data.asc
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
diff --git a/g10/armor.c b/g10/armor.c
index 6b7c3f7..7fb9a89 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -26,15 +26,14 @@
#include <ctype.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#define MAX_LINELEN 20000
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 489fadd..c81c1ab 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -25,13 +25,13 @@
#include <ctype.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/i18n.h"
#include "options.h"
-#include "host2net.h"
+#include "../common/host2net.h"
static int do_user_id( IOBUF out, int ctb, PKT_user_id *uid );
static int do_key (iobuf_t out, int ctb, PKT_public_key *pk);
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 7c30bdb..7d627bb 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -31,16 +31,16 @@
#include "gpg.h"
#include <assuan.h>
-#include "util.h"
-#include "membuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
#include "options.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/sysutils.h"
#include "call-agent.h"
-#include "status.h"
+#include "../common/status.h"
#include "../common/shareddefs.h"
-#include "host2net.h"
+#include "../common/host2net.h"
#define CONTROL_D ('D' - 'A' + 1)
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index 2f2ba98..a33cdc7 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -31,13 +31,13 @@
#include "gpg.h"
#include <assuan.h>
-#include "util.h"
-#include "membuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
#include "options.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "keyserver.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/keyserver.h"
+#include "../common/status.h"
#include "call-dirmngr.h"
diff --git a/g10/card-util.c b/g10/card-util.c
index 969f6c9..9bc3e25 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -31,10 +31,10 @@
#if GNUPG_MAJOR_VERSION != 1
# include "gpg.h"
#endif /*GNUPG_MAJOR_VERSION != 1*/
-#include "util.h"
-#include "i18n.h"
-#include "ttyio.h"
-#include "status.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
#include "options.h"
#include "main.h"
#include "keyserver-internal.h"
diff --git a/g10/cipher.c b/g10/cipher.c
index 98f398e..655937f 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -25,14 +25,14 @@
#include <errno.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
-#include "status.h"
+#include "../common/status.h"
#define MIN_PARTIAL_SIZE 512
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index 22cefd9..4adca9b 100644
--- a/g10/compress-bz2.c
+++ b/g10/compress-bz2.c
@@ -23,7 +23,7 @@
#include <bzlib.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "filter.h"
#include "main.h"
diff --git a/g10/compress.c b/g10/compress.c
index a14d107..61bb756 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -38,7 +38,7 @@
#endif
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "filter.h"
#include "main.h"
diff --git a/g10/cpr.c b/g10/cpr.c
index 4984e89..3391071 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -29,12 +29,12 @@
#endif
#include "gpg.h"
-#include "util.h"
-#include "status.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/ttyio.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#define CONTROL_D ('D' - 'A' + 1)
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 6217dda..92239cc 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -24,14 +24,14 @@
#include <errno.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/****************
* Take an armor file and write it out without armor
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 585b150..11a253f 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -24,11 +24,11 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "options.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
static int mdc_decode_filter ( void *opaque, int control, IOBUF a,
diff --git a/g10/decrypt.c b/g10/decrypt.c
index c99f064..4d6734d 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -27,13 +27,13 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
/* Assume that the input is an encrypted message and decrypt
* (and if signed, verify the signature on) it.
diff --git a/g10/delkey.c b/g10/delkey.c
index 06aca9e..547b40d 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -29,16 +29,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
#include "filter.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
#include "call-agent.h"
diff --git a/g10/ecdh.c b/g10/ecdh.c
index 89e8cf1..6c2a56b 100644
--- a/g10/ecdh.c
+++ b/g10/ecdh.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "pkglue.h"
#include "main.h"
#include "options.h"
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 6130ba0..0a892c2 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -28,15 +28,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "filter.h"
#include "trustdb.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
#include "pkglue.h"
diff --git a/g10/exec.c b/g10/exec.c
index b868a1f..74a8397 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -45,11 +45,11 @@
#include "gpg.h"
#include "options.h"
-#include "i18n.h"
-#include "iobuf.h"
-#include "util.h"
-#include "membuf.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
+#include "../common/sysutils.h"
#include "exec.h"
#ifdef NO_EXEC
diff --git a/g10/export.c b/g10/export.c
index 323bf17..2da5309 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -28,17 +28,17 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
-#include "i18n.h"
-#include "membuf.h"
-#include "host2net.h"
-#include "zb32.h"
-#include "recsel.h"
-#include "mbox-util.h"
-#include "init.h"
+#include "../common/i18n.h"
+#include "../common/membuf.h"
+#include "../common/host2net.h"
+#include "../common/zb32.h"
+#include "../common/recsel.h"
+#include "../common/mbox-util.h"
+#include "../common/init.h"
#include "trustdb.h"
#include "call-agent.h"
diff --git a/g10/filter.h b/g10/filter.h
index 7accd7d..275608d 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -20,7 +20,7 @@
#ifndef G10_FILTER_H
#define G10_FILTER_H
-#include "types.h"
+#include "../common/types.h"
#include "dek.h"
typedef struct {
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 6038d26..01db2a0 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -24,7 +24,7 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "../common/iobuf.h"
#include "options.h"
diff --git a/g10/getkey.c b/g10/getkey.c
index be7367f..548f8bf 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -26,19 +26,19 @@
#include <ctype.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "keydb.h"
#include "options.h"
#include "main.h"
#include "trustdb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
-#include "host2net.h"
-#include "mbox-util.h"
-#include "status.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
+#include "../common/status.h"
#define MAX_PK_CACHE_ENTRIES PK_UID_CACHE_SIZE
#define MAX_UID_CACHE_ENTRIES PK_UID_CACHE_SIZE
diff --git a/g10/gpg.c b/g10/gpg.c
index 654dcb9..eeda60f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -41,22 +41,22 @@
#include "gpg.h"
#include <assuan.h>
#include "../common/iobuf.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "membuf.h"
+#include "../common/membuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
#include "keyserver-internal.h"
#include "exec.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
#include "call-dirmngr.h"
#include "tofu.h"
#include "../common/init.h"
diff --git a/g10/gpgsql.c b/g10/gpgsql.c
index 661bd35..5b75569 100644
--- a/g10/gpgsql.c
+++ b/g10/gpgsql.c
@@ -23,8 +23,8 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
-#include "logging.h"
+#include "../common/util.h"
+#include "../common/logging.h"
#include "gpgsql.h"
diff --git a/g10/gpgv.c b/g10/gpgv.c
index a6d1add..5ee26b4 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -35,18 +35,18 @@
#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
#include "call-agent.h"
#include "../common/init.h"
diff --git a/g10/helptext.c b/g10/helptext.c
index 730f699..8b85101 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -24,10 +24,10 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
diff --git a/g10/import.c b/g10/import.c
index 6383d70..640618a 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -27,15 +27,14 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "trustdb.h"
#include "main.h"
-#include "i18n.h"
-#include "ttyio.h"
-#include "status.h"
-#include "recsel.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/recsel.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "../common/membuf.h"
diff --git a/g10/kbnode.c b/g10/kbnode.c
index 6700dc0..153dce2 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -24,7 +24,7 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "../common/init.h"
#include "packet.h"
#include "keydb.h"
diff --git a/g10/keydb.c b/g10/keydb.c
index 4c5149d..27dacf2 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -28,14 +28,14 @@
#include <unistd.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
#include "main.h" /*try_make_homedir ()*/
#include "packet.h"
#include "keyring.h"
#include "../kbx/keybox.h"
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
static int active_handles;
diff --git a/g10/keydb.h b/g10/keydb.h
index c9f5b1c..6f57583 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -22,8 +22,8 @@
#ifndef G10_KEYDB_H
#define G10_KEYDB_H
-#include "types.h"
-#include "util.h"
+#include "../common/types.h"
+#include "../common/util.h"
#include "packet.h"
/* What qualifies as a certification (rather than a signature?) */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index c591600..c10a011 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -33,20 +33,20 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
#include "photoid.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
#include "filter.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
-#include "host2net.h"
+#include "../common/host2net.h"
#include "tofu.h"
static void show_prefs (PKT_user_id * uid, PKT_signature * selfsig,
diff --git a/g10/keygen.c b/g10/keygen.c
index 201ebaa..44f139a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -29,21 +29,21 @@
#include <unistd.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "packet.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "pkglue.h"
#include "../common/shareddefs.h"
-#include "host2net.h"
-#include "mbox-util.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
/* The default algorithms. If you change them remember to change them
diff --git a/g10/keyid.c b/g10/keyid.c
index 6e8d97f..1d3f46c 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -28,14 +28,14 @@
#include <time.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "packet.h"
#include "options.h"
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "rmd160.h"
-#include "host2net.h"
+#include "../common/host2net.h"
#define KEYID_STR_SIZE 19
diff --git a/g10/keylist.c b/g10/keylist.c
index 2684f59..93b5ee6 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -31,18 +31,18 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
#include "photoid.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
#include "trustdb.h"
#include "main.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
#include "call-agent.h"
-#include "mbox-util.h"
-#include "zb32.h"
+#include "../common/mbox-util.h"
+#include "../common/zb32.h"
#include "tofu.h"
diff --git a/g10/keyring.c b/g10/keyring.c
index 9b7b5fd..31f60f9 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -28,13 +28,13 @@
#include <sys/stat.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "keyring.h"
#include "packet.h"
#include "keydb.h"
#include "options.h"
#include "main.h" /*for check_key_signature()*/
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../kbx/keybox.h"
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 77b362e..02452e8 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -23,7 +23,7 @@
#include <time.h>
#include "../common/keyserver.h"
#include "../common/iobuf.h"
-#include "types.h"
+#include "../common/types.h"
int parse_keyserver_options(char *options);
void free_keyserver_spec(struct keyserver_spec *keyserver);
diff --git a/g10/keyserver.c b/g10/keyserver.c
index c7363c9..0794527 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -27,21 +27,21 @@
#include <errno.h>
#include "gpg.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "filter.h"
#include "keydb.h"
-#include "status.h"
+#include "../common/status.h"
#include "exec.h"
#include "main.h"
-#include "i18n.h"
-#include "ttyio.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
#include "options.h"
#include "packet.h"
#include "trustdb.h"
#include "keyserver-internal.h"
-#include "util.h"
-#include "membuf.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
+#include "../common/mbox-util.h"
#include "call-dirmngr.h"
#ifdef HAVE_W32_SYSTEM
diff --git a/g10/main.h b/g10/main.h
index 6837e98..f58f041 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -20,10 +20,10 @@
#ifndef G10_MAIN_H
#define G10_MAIN_H
-#include "types.h"
-#include "iobuf.h"
+#include "../common/types.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
/* It could be argued that the default cipher should be 3DES rather
than AES128, and the default compression should be 0
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 4f8d0be..2acd51e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -25,19 +25,19 @@
#include <time.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "options.h"
#include "keydb.h"
#include "filter.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#include "trustdb.h"
#include "keyserver-internal.h"
#include "photoid.h"
-#include "mbox-util.h"
+#include "../common/mbox-util.h"
#include "call-dirmngr.h"
/* Put an upper limit on nested packets. The 32 is an arbitrary
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 69b226c..f3318f1 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -24,9 +24,9 @@
#include <errno.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "filter.h"
diff --git a/g10/migrate.c b/g10/migrate.c
index 6ff1014..c52c67a 100644
--- a/g10/migrate.c
+++ b/g10/migrate.c
@@ -27,7 +27,7 @@
#include "gpg.h"
#include "options.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "call-agent.h"
diff --git a/g10/misc.c b/g10/misc.c
index ac00009..c69f994 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -59,15 +59,15 @@
#include "gpg.h"
#ifdef HAVE_W32_SYSTEM
-# include "status.h"
+# include "../common/status.h"
#endif /*HAVE_W32_SYSTEM*/
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "photoid.h"
#include "options.h"
#include "call-agent.h"
-#include "i18n.h"
-#include "zb32.h"
+#include "../common/i18n.h"
+#include "../common/zb32.h"
#ifdef ENABLE_SELINUX_HACKS
diff --git a/g10/openfile.c b/g10/openfile.c
index f62deec..2257107 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -29,12 +29,12 @@
#include <unistd.h>
#include "gpg.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
#include "options.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#ifdef USE_ONLY_8DOT3
#define SKELEXT ".skl"
diff --git a/g10/options.h b/g10/options.h
index 88a8f32..def6385 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -22,7 +22,7 @@
#define G10_OPTIONS_H
#include <sys/types.h>
-#include <types.h>
+#include "../common/types.h"
#include <stdint.h>
#include "main.h"
#include "packet.h"
diff --git a/g10/packet.h b/g10/packet.h
index 9780d93..3457f53 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -22,14 +22,14 @@
#ifndef G10_PACKET_H
#define G10_PACKET_H
-#include "types.h"
+#include "../common/types.h"
#include "../common/iobuf.h"
#include "../common/strlist.h"
#include "dek.h"
#include "filter.h"
#include "../common/openpgpdefs.h"
#include "../common/userids.h"
-#include "util.h"
+#include "../common/util.h"
#define DEBUG_PARSE_PACKET 1
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 7f44ce5..06b286b 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -26,15 +26,15 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "filter.h"
#include "photoid.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
-#include "host2net.h"
+#include "../common/i18n.h"
+#include "../common/host2net.h"
/* Maximum length of packets to avoid excessive memory allocation. */
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 37abc0f..02371fe 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -33,13 +33,13 @@
#endif
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
#include "keydb.h"
#include "main.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
#include "call-agent.h"
#include "../common/shareddefs.h"
diff --git a/g10/photoid.c b/g10/photoid.c
index 8b193b3..bcea64f 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -32,17 +32,17 @@
#endif
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "exec.h"
#include "keydb.h"
-#include "i18n.h"
-#include "iobuf.h"
+#include "../common/i18n.h"
+#include "../common/iobuf.h"
#include "options.h"
#include "main.h"
#include "photoid.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
#include "trustdb.h"
/* Generate a new photo id packet, or return NULL if canceled.
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 012f751..698794e 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -27,15 +27,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
-#include "ttyio.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
#include "photoid.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "tofu.h"
#define CONTROL_D ('D' - 'A' + 1)
diff --git a/g10/pkglue.c b/g10/pkglue.c
index ce24a2e..8021a94 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -25,7 +25,7 @@
#include <errno.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "pkglue.h"
#include "main.h"
#include "options.h"
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 40ce603..c5d1ddb 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -29,14 +29,14 @@
#endif
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
#include "packet.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
#include "filter.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
/* Get the output filename. On success, the actual filename that is
diff --git a/g10/progress.c b/g10/progress.c
index feb639e..7e777d4 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -21,10 +21,10 @@
#include <stdio.h>
#include "gpg.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "filter.h"
-#include "status.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/util.h"
#include "options.h"
/* Create a new context for use with the progress filter. We need to
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index e037c12..cc962cf 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -24,17 +24,17 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "keydb.h"
#include "trustdb.h"
-#include "status.h"
+#include "../common/status.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "pkglue.h"
#include "call-agent.h"
-#include "host2net.h"
+#include "../common/host2net.h"
static gpg_error_t get_it (PKT_pubkey_enc *k,
diff --git a/g10/revoke.c b/g10/revoke.c
index 3a2b068..122699f 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -28,13 +28,12 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
#include "call-agent.h"
struct revocation_reason_info {
diff --git a/g10/server.c b/g10/server.c
index e3a3bad..60b447c 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -29,12 +29,12 @@
#include "gpg.h"
#include <assuan.h>
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
#include "options.h"
#include "../common/server-help.h"
#include "../common/sysutils.h"
-#include "status.h"
+#include "../common/status.h"
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
diff --git a/g10/seskey.c b/g10/seskey.c
index b2f7169..8617938 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -24,10 +24,10 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/* Generate a new session key in *DEK that is appropriate for the
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 4df29af..4e6ca43 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -25,12 +25,12 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "keydb.h"
#include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#include "options.h"
#include "pkglue.h"
diff --git a/g10/sign.c b/g10/sign.c
index ff099b3..801c809 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -27,20 +27,20 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
#include "filter.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
#include "trustdb.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
#include "pkglue.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
#include "call-agent.h"
-#include "mbox-util.h"
+#include "../common/mbox-util.h"
#ifdef HAVE_DOSISH_SYSTEM
#define LF "\r\n"
diff --git a/g10/skclist.c b/g10/skclist.c
index cedbce7..7a791b3 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -27,10 +27,10 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
+#include "../common/status.h"
#include "keydb.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
/* Return true if Libgcrypt's RNG is in faked mode. */
diff --git a/g10/t-stutter.c b/g10/t-stutter.c
index 359cdf6..f4a9a59 100644
--- a/g10/t-stutter.c
+++ b/g10/t-stutter.c
@@ -54,7 +54,7 @@
#include "gpg.h"
#include "main.h"
#include "../common/types.h"
-#include "util.h"
+#include "../common/util.h"
#include "dek.h"
#include "../common/logging.h"
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index ab2f072..a5ad32d 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -29,15 +29,15 @@
#include <unistd.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "trustdb.h"
#include "options.h"
#include "packet.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "tdbio.h"
diff --git a/g10/tdbio.c b/g10/tdbio.c
index c1cb312..a7b7412 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -29,12 +29,12 @@
#include <unistd.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "options.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "trustdb.h"
#include "tdbio.h"
diff --git a/g10/tdbio.h b/g10/tdbio.h
index 1f66b03..e2cbbff 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -20,7 +20,7 @@
#ifndef G10_TDBIO_H
#define G10_TDBIO_H
-#include "host2net.h"
+#include "../common/host2net.h"
#define TRUST_RECORD_LEN 40
#define SIGS_PER_RECORD ((TRUST_RECORD_LEN-10)/5)
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index a74df20..d541e0d 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -28,18 +28,18 @@
#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
#include "call-agent.h"
int g10_errors_seen;
diff --git a/g10/textfilter.c b/g10/textfilter.c
index cb5d444..96666cf 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -24,13 +24,13 @@
#include <errno.h>
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
#include "filter.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "options.h"
-#include "status.h"
+#include "../common/status.h"
#ifdef HAVE_DOSISH_SYSTEM
#define LF "\r\n"
diff --git a/g10/tofu.c b/g10/tofu.c
index 8c41ad7..9d6a457 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -31,17 +31,17 @@
#include <time.h>
#include "gpg.h"
-#include "types.h"
-#include "logging.h"
-#include "stringhelp.h"
+#include "../common/types.h"
+#include "../common/logging.h"
+#include "../common/stringhelp.h"
#include "options.h"
-#include "mbox-util.h"
-#include "i18n.h"
-#include "ttyio.h"
+#include "../common/mbox-util.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
#include "trustdb.h"
-#include "mkdir_p.h"
+#include "../common/mkdir_p.h"
#include "gpgsql.h"
-#include "status.h"
+#include "../common/status.h"
#include "sqrtu32.h"
#include "tofu.h"
diff --git a/g10/trust.c b/g10/trust.c
index d0ea77e..77fde4c 100644
--- a/g10/trust.c
+++ b/g10/trust.c
@@ -26,13 +26,13 @@
#include "gpg.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
#include "packet.h"
#include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "trustdb.h"
-#include "host2net.h"
+#include "../common/host2net.h"
/* Return true if key is disabled. Note that this is usually used via
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 7443051..a0b9d5f 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -29,15 +29,15 @@
#endif /* !DISABLE_REGEX */
#include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "options.h"
#include "packet.h"
#include "main.h"
-#include "mbox-util.h"
-#include "i18n.h"
+#include "../common/mbox-util.h"
+#include "../common/i18n.h"
#include "tdbio.h"
#include "trustdb.h"
#include "tofu.h"
diff --git a/g10/verify.c b/g10/verify.c
index 7327e85..4399f71 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -27,15 +27,14 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
#include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
#include "main.h"
-#include "status.h"
#include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
/****************
diff --git a/g13/Makefile.am b/g13/Makefile.am
index cc0e6a8..dfacc99 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -26,7 +26,7 @@ sbin_PROGRAMS = g13-syshelp
noinst_PROGRAMS = $(module_tests)
TESTS = $(module_tests)
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
diff --git a/g13/backend.c b/g13/backend.c
index a495f8a..0123b45 100644
--- a/g13/backend.c
+++ b/g13/backend.c
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
#include "backend.h"
#include "be-encfs.h"
diff --git a/g13/be-dmcrypt.c b/g13/be-dmcrypt.c
index e048b99..59b586d 100644
--- a/g13/be-dmcrypt.c
+++ b/g13/be-dmcrypt.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
#include "call-syshelp.h"
#include "be-dmcrypt.h"
diff --git a/g13/be-encfs.c b/g13/be-encfs.c
index 6c648ab..0e2c68b 100644
--- a/g13/be-encfs.c
+++ b/g13/be-encfs.c
@@ -26,7 +26,7 @@
#include <assert.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
#include "be-encfs.h"
#include "runner.h"
diff --git a/g13/be-truecrypt.c b/g13/be-truecrypt.c
index e75b936..1ce992f 100644
--- a/g13/be-truecrypt.c
+++ b/g13/be-truecrypt.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "be-truecrypt.h"
diff --git a/g13/call-syshelp.c b/g13/call-syshelp.c
index adffc6e..8a50c3f 100644
--- a/g13/call-syshelp.c
+++ b/g13/call-syshelp.c
@@ -28,10 +28,10 @@
#include "g13.h"
#include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "g13tuple.h"
#include "keyblob.h"
-#include "membuf.h"
+#include "../common/membuf.h"
#include "create.h"
#include "call-syshelp.h"
diff --git a/g13/create.c b/g13/create.c
index 573039d..d55b859 100644
--- a/g13/create.c
+++ b/g13/create.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "create.h"
#include "keyblob.h"
diff --git a/g13/g13-common.c b/g13/g13-common.c
index 8370907..35cb131 100644
--- a/g13/g13-common.c
+++ b/g13/g13-common.c
@@ -29,8 +29,8 @@
#include "g13-common.h"
#include <gcrypt.h>
#include <assuan.h>
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c
index 8b8a4a7..bf71ac2 100644
--- a/g13/g13-syshelp.c
+++ b/g13/g13-syshelp.c
@@ -36,9 +36,9 @@
#include <gcrypt.h>
#include <assuan.h>
-#include "i18n.h"
-#include "sysutils.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/asshelp.h"
#include "../common/init.h"
#include "keyblob.h"
diff --git a/g13/g13.c b/g13/g13.c
index 0553c85..4b925ed 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -32,10 +32,10 @@
#include <gcrypt.h>
#include <assuan.h>
-#include "i18n.h"
-#include "sysutils.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
#include "../common/init.h"
#include "keyblob.h"
#include "server.h"
diff --git a/g13/keyblob.c b/g13/keyblob.c
index 81863bb..1fb9be7 100644
--- a/g13/keyblob.c
+++ b/g13/keyblob.c
@@ -32,7 +32,7 @@
#include "keyblob.h"
#include "../common/sysutils.h"
-#include "host2net.h"
+#include "../common/host2net.h"
/* Parse the header prefix and return the length of the entire header. */
diff --git a/g13/mount.c b/g13/mount.c
index 7814d5c..dc415b1 100644
--- a/g13/mount.c
+++ b/g13/mount.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "mount.h"
#include "keyblob.h"
@@ -35,7 +35,7 @@
#include "g13tuple.h"
#include "mountinfo.h"
#include "runner.h"
-#include "host2net.h"
+#include "../common/host2net.h"
#include "server.h" /*(g13_keyblob_decrypt)*/
#include "../common/sysutils.h"
#include "call-syshelp.h"
diff --git a/g13/mountinfo.c b/g13/mountinfo.c
index 26eca0c..ed898b8 100644
--- a/g13/mountinfo.c
+++ b/g13/mountinfo.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "mountinfo.h"
#include "keyblob.h"
diff --git a/g13/runner.c b/g13/runner.c
index af2e836..138269d 100644
--- a/g13/runner.c
+++ b/g13/runner.c
@@ -27,7 +27,7 @@
#include <npth.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
#include "runner.h"
#include "../common/exechelp.h"
diff --git a/g13/server.c b/g13/server.c
index e3cb313..bbe42d4 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -27,7 +27,7 @@
#include "g13.h"
#include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
#include "server.h"
#include "create.h"
diff --git a/g13/sh-blockdev.c b/g13/sh-blockdev.c
index 6c12dde..a477a67 100644
--- a/g13/sh-blockdev.c
+++ b/g13/sh-blockdev.c
@@ -28,8 +28,8 @@
#include "g13-syshelp.h"
#include <assuan.h>
-#include "i18n.h"
-#include "exectool.h"
+#include "../common/i18n.h"
+#include "../common/exectool.h"
#include "keyblob.h"
#ifndef HAVE_STRTOULL
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index 523ec56..b57369d 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -27,7 +27,7 @@
#include "g13-syshelp.h"
#include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keyblob.h"
diff --git a/g13/sh-dmcrypt.c b/g13/sh-dmcrypt.c
index bbeab65..f7ec797 100644
--- a/g13/sh-dmcrypt.c
+++ b/g13/sh-dmcrypt.c
@@ -32,9 +32,9 @@
#include "g13-syshelp.h"
#include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "g13tuple.h"
-#include "exectool.h"
+#include "../common/exectool.h"
#include "keyblob.h"
/* The standard disk block size (logical). */
diff --git a/g13/suspend.c b/g13/suspend.c
index 7bdf738..0aa20f0 100644
--- a/g13/suspend.c
+++ b/g13/suspend.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "suspend.h"
#include "keyblob.h"
diff --git a/g13/t-g13tuple.c b/g13/t-g13tuple.c
index bbd9898..2809d23 100644
--- a/g13/t-g13tuple.c
+++ b/g13/t-g13tuple.c
@@ -23,7 +23,7 @@
#include <assert.h>
-#include "util.h"
+#include "../common/util.h"
#include "keyblob.h"
#include "g13tuple.h"
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index fe7da1b..8fca24a 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -20,7 +20,7 @@
EXTRA_DIST = mkerrors
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index dd8477c..6094298 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -33,7 +33,7 @@
#include "../common/argparse.h"
#include "../common/stringhelp.h"
#include "../common/utf8conv.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keybox-defs.h"
#include "../common/init.h"
#include <gcrypt.h>
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
index 0e8f63a..d24f117 100644
--- a/kbx/keybox-dump.c
+++ b/kbx/keybox-dump.c
@@ -25,7 +25,7 @@
#include "keybox-defs.h"
#include <gcrypt.h>
-#include "host2net.h"
+#include "../common/host2net.h"
/* Argg, we can't include ../common/util.h */
char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c
index 6885e05..d82c2cb 100644
--- a/kbx/keybox-openpgp.c
+++ b/kbx/keybox-openpgp.c
@@ -36,7 +36,7 @@
#include <gcrypt.h>
#include "../common/openpgpdefs.h"
-#include "host2net.h"
+#include "../common/host2net.h"
/* Assume a valid OpenPGP packet at the address pointed to by BUFBTR
which has a maximum length as stored at BUFLEN. Return the header
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
index ec5aad1..cc114c6 100644
--- a/kbx/keybox-search.c
+++ b/kbx/keybox-search.c
@@ -27,8 +27,8 @@
#include "keybox-defs.h"
#include <gcrypt.h>
-#include "host2net.h"
-#include "mbox-util.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
*(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
diff --git a/kbx/keybox-util.c b/kbx/keybox-util.c
index 486753c..b71335b 100644
--- a/kbx/keybox-util.c
+++ b/kbx/keybox-util.c
@@ -27,7 +27,7 @@
#endif
#include "keybox-defs.h"
-#include "utilproto.h"
+#include "../common/utilproto.h"
static void *(*alloc_func)(size_t n) = malloc;
diff --git a/scd/Makefile.am b/scd/Makefile.am
index db096f6..cbd1f9f 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
libexec_PROGRAMS = scdaemon
-AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBUSB_CPPFLAGS)
+AM_CPPFLAGS = $(LIBUSB_CPPFLAGS)
include $(top_srcdir)/am/cmacros.am
diff --git a/scd/apdu.c b/scd/apdu.c
index c8ce684..147bf73 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -48,18 +48,18 @@
/* This is used with GnuPG version < 1.9. The code has been source
copied from the current GnuPG >= 1.9 and is maintained over
there. */
-#include "options.h"
+#include "../common/options.h"
#include "errors.h"
#include "memory.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
#include "dynload.h"
#include "cardglue.h"
#else /* GNUPG_MAJOR_VERSION != 1 */
#include "scdaemon.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
#endif /* GNUPG_MAJOR_VERSION != 1 */
-#include "host2net.h"
+#include "../common/host2net.h"
#include "iso7816.h"
#include "apdu.h"
diff --git a/scd/app-dinsig.c b/scd/app-dinsig.c
index f7ecc4b..bea2856 100644
--- a/scd/app-dinsig.c
+++ b/scd/app-dinsig.c
@@ -79,10 +79,10 @@
#include "scdaemon.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
static gpg_error_t
diff --git a/scd/app-geldkarte.c b/scd/app-geldkarte.c
index c277171..510beb5 100644
--- a/scd/app-geldkarte.c
+++ b/scd/app-geldkarte.c
@@ -37,10 +37,10 @@
#include "scdaemon.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
diff --git a/scd/app-help.c b/scd/app-help.c
index 85bcc66..842a73d 100644
--- a/scd/app-help.c
+++ b/scd/app-help.c
@@ -26,7 +26,7 @@
#include "scdaemon.h"
#include "app-common.h"
#include "iso7816.h"
-#include "tlv.h"
+#include "../common/tlv.h"
/* Count the number of bits, assuming the A represents an unsigned big
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 98dd588..9e720f0 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -51,12 +51,12 @@
#include <time.h>
#include "scdaemon.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
#include "apdu.h"
-#include "host2net.h"
+#include "../common/host2net.h"
static char const aid_nks[] = { 0xD2, 0x76, 0x00, 0x00, 0x03, 0x01, 0x02 };
static char const aid_sigg[] = { 0xD2, 0x76, 0x00, 0x00, 0x66, 0x01 };
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index af81dce..66b235d 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -62,13 +62,13 @@
#include "scdaemon.h"
#endif /* GNUPG_MAJOR_VERSION != 1 */
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
-#include "host2net.h"
-#include "openpgpdefs.h"
+#include "../common/tlv.h"
+#include "../common/host2net.h"
+#include "../common/openpgpdefs.h"
/* A table describing the DOs of the card. */
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 4072fb7..68e8c4f 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -39,7 +39,7 @@
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
#include "apdu.h" /* fixme: we should move the card detection to a
separate file */
diff --git a/scd/app-sc-hsm.c b/scd/app-sc-hsm.c
index dddc8dc..8094b24 100644
--- a/scd/app-sc-hsm.c
+++ b/scd/app-sc-hsm.c
@@ -34,7 +34,7 @@
#include "iso7816.h"
#include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
#include "apdu.h"
diff --git a/scd/app.c b/scd/app.c
index e1c4e10..472adc7 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -25,11 +25,11 @@
#include <npth.h>
#include "scdaemon.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
#include "app-common.h"
#include "iso7816.h"
#include "apdu.h"
-#include "tlv.h"
+#include "../common/tlv.h"
static npth_mutex_t app_list_lock;
static app_t app_top;
diff --git a/scd/command.c b/scd/command.c
index b1d5539..56fdf74 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -40,8 +40,8 @@
#ifdef HAVE_LIBUSB
#include "ccid-driver.h"
#endif
-#include "asshelp.h"
-#include "server-help.h"
+#include "../common/asshelp.h"
+#include "../common/server-help.h"
/* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN */
#define MAXLEN_PIN 100
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 13cf2e6..26e89dd 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -44,15 +44,15 @@
#include <assuan.h> /* malloc hooks */
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "app-common.h"
#include "iso7816.h"
#include "apdu.h"
#include "ccid-driver.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
-#include "exechelp.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
+#include "../common/exechelp.h"
#include "../common/init.h"
#ifndef ENAMETOOLONG
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 4cfb246..ddc2e22 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = gpgsm
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/common -DKEYBOX_WITH_X509=1
+AM_CPPFLAGS = -DKEYBOX_WITH_X509=1
include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 16a2497..0e47c14 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -33,11 +33,11 @@
#include "gpgsm.h"
#include <gcrypt.h>
#include <assuan.h>
-#include "i18n.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
#include "keydb.h" /* fixme: Move this to import.c */
-#include "membuf.h"
-#include "shareddefs.h"
+#include "../common/membuf.h"
+#include "../common/shareddefs.h"
#include "passphrase.h"
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 45303e8..5ee15b7 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -32,9 +32,9 @@
#include <gcrypt.h>
#include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keydb.h"
-#include "asshelp.h"
+#include "../common/asshelp.h"
struct membuf {
diff --git a/sm/certchain.c b/sm/certchain.c
index b3e8656..a361aca 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -34,8 +34,8 @@
#include "keydb.h"
#include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
-#include "i18n.h"
-#include "tlv.h"
+#include "../common/i18n.h"
+#include "../common/tlv.h"
/* Object to keep track of certain root certificates. */
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 04b3917..1102bcc 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -31,7 +31,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/* Return the number of bits of the Q parameter from the DSA key
diff --git a/sm/certdump.c b/sm/certdump.c
index bd37da4..edee76f 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -37,7 +37,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
struct dn_array_s {
diff --git a/sm/certlist.c b/sm/certlist.c
index bfc35ce..e493cda 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -32,7 +32,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
static const char oid_kp_serverAuth[] = "1.3.6.1.5.5.7.3.1";
diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index b50d338..9772a3b 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -29,9 +29,9 @@
#include "gpgsm.h"
#include <gcrypt.h>
-#include "i18n.h"
-#include "ttyio.h"
-#include "membuf.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/membuf.h"
/* Prompt for lines and append them to MB. */
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index fe35ea8..4431870 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -66,7 +66,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
enum para_name
diff --git a/sm/decrypt.c b/sm/decrypt.c
index cda4d29..976bd12 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -31,7 +31,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
struct decrypt_filter_parm_s
{
diff --git a/sm/delete.c b/sm/delete.c
index 3536968..56d5b1f 100644
--- a/sm/delete.c
+++ b/sm/delete.c
@@ -31,7 +31,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/* Delete a certificate or an secret key from a key database. */
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 3a7d4bb..c43a9e6 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -32,7 +32,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
struct dek_s {
diff --git a/sm/export.c b/sm/export.c
index d721d52..29a5ac3 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -31,9 +31,9 @@
#include <ksba.h>
#include "keydb.h"
-#include "exechelp.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/exechelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "minip12.h"
/* A table to store a fingerprint as used in a duplicates table. We
diff --git a/sm/fingerprint.c b/sm/fingerprint.c
index d8e8405..fbcec58 100644
--- a/sm/fingerprint.c
+++ b/sm/fingerprint.c
@@ -31,7 +31,7 @@
#include <gcrypt.h>
#include <ksba.h>
-#include "host2net.h"
+#include "../common/host2net.h"
/* Return the fingerprint of the certificate (we can't put this into
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 34a9b96..bcf479a 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -35,11 +35,11 @@
#include "passphrase.h"
#include "../common/shareddefs.h"
#include "../kbx/keybox.h" /* malloc hooks */
-#include "i18n.h"
+#include "../common/i18n.h"
#include "keydb.h"
-#include "sysutils.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/sysutils.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
#include "../common/init.h"
diff --git a/sm/import.c b/sm/import.c
index b284b51..c7b65ad 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -31,9 +31,9 @@
#include <ksba.h>
#include "keydb.h"
-#include "exechelp.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/exechelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
#include "../common/membuf.h"
#include "minip12.h"
diff --git a/sm/keydb.c b/sm/keydb.c
index 75f83ee..87fc12d 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -31,7 +31,7 @@
#include "gpgsm.h"
#include "../kbx/keybox.h"
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
static int active_handles;
diff --git a/sm/keylist.c b/sm/keylist.c
index 6db42e3..d27d4f4 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -34,8 +34,8 @@
#include "keydb.h"
#include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
-#include "i18n.h"
-#include "tlv.h"
+#include "../common/i18n.h"
+#include "../common/tlv.h"
struct list_external_parm_s
{
diff --git a/sm/misc.c b/sm/misc.c
index 40e989f..1e2465f 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -29,8 +29,8 @@
#endif
#include "gpgsm.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/tlv.h"
#include "../common/sexp-parse.h"
diff --git a/sm/qualified.c b/sm/qualified.c
index 61b071c..718141e 100644
--- a/sm/qualified.c
+++ b/sm/qualified.c
@@ -26,7 +26,7 @@
#include <errno.h>
#include "gpgsm.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include <ksba.h>
diff --git a/sm/server.c b/sm/server.c
index 0fadcad..37d66e2 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -29,8 +29,8 @@
#include "gpgsm.h"
#include <assuan.h>
-#include "sysutils.h"
-#include "server-help.h"
+#include "../common/sysutils.h"
+#include "../common/server-help.h"
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
diff --git a/sm/sign.c b/sm/sign.c
index 0ca575b..a153b51 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -32,7 +32,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/* Hash the data and return if something was hashed. Return -1 on error. */
diff --git a/sm/verify.c b/sm/verify.c
index 1ac97cb..6c034e6 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -32,7 +32,7 @@
#include <ksba.h>
#include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
static char *
strtimestamp_r (ksba_isotime_t atime)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 38abd7c..0c828a7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
diff --git a/tools/call-dirmngr.c b/tools/call-dirmngr.c
index 51f1fa1..9e3e493 100644
--- a/tools/call-dirmngr.c
+++ b/tools/call-dirmngr.c
@@ -29,10 +29,10 @@
#endif
#include <assuan.h>
-#include "util.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/mbox-util.h"
#include "./call-dirmngr.h"
static struct
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index a3224ab..7197340 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -40,9 +40,9 @@
#include <regex.h>
#include <ctype.h>
-#include "util.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/init.h"
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 59e2192..ef71d27 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/util.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index c31e3a1..c578105 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -22,17 +22,17 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "status.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "init.h"
-#include "asshelp.h"
-#include "userids.h"
-#include "ccparray.h"
-#include "exectool.h"
-#include "mbox-util.h"
-#include "name-value.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/init.h"
+#include "../common/asshelp.h"
+#include "../common/userids.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
+#include "../common/mbox-util.h"
+#include "../common/name-value.h"
#include "call-dirmngr.h"
#include "mime-maker.h"
#include "send-mail.h"
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 0c939e5..1055212 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -44,12 +44,12 @@
#endif
/* For log_logv(), asctimestamp(), gnupg_get_time (). */
-#include "util.h"
-#include "i18n.h"
-#include "exechelp.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/exechelp.h"
+#include "../common/sysutils.h"
-#include "gc-opt-flags.h"
+#include "../common/gc-opt-flags.h"
#include "gpgconf.h"
/* There is a problem with gpg 1.4 under Windows: --gpgconf-list
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index a9f4607..c6fb24e 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -26,8 +26,8 @@
#include <unistd.h>
#include "gpgconf.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/init.h"
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 3b4bb15..ce2777d 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -40,8 +40,8 @@
#endif
#define INCLUDED_BY_MAIN_MODULE 1
-#include "util.h"
-#include "openpgpdefs.h"
+#include "../common/util.h"
+#include "../common/openpgpdefs.h"
static int opt_verbose;
static const char *opt_prefix = "";
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index ffd239f..c622a66 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -35,7 +35,7 @@
#endif /*!HAVE_W32_SYSTEM*/
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index f9a50e7..b0e17cb 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 8286d08..0e10be8 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "gpgtar.h"
#include "../common/exectool.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index 3dff176..2757ab0 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -34,9 +34,9 @@
#include <string.h>
#include <assert.h>
-#include "util.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/openpgpdefs.h"
#include "../common/init.h"
#include "../common/strlist.h"
diff --git a/tools/mime-maker.c b/tools/mime-maker.c
index 2e32069..0332f31 100644
--- a/tools/mime-maker.c
+++ b/tools/mime-maker.c
@@ -22,8 +22,8 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "zb32.h"
+#include "../common/util.h"
+#include "../common/zb32.h"
#include "mime-maker.h"
diff --git a/tools/mime-parser.c b/tools/mime-parser.c
index 169ea2b..08b0219 100644
--- a/tools/mime-parser.c
+++ b/tools/mime-parser.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
+#include "../common/util.h"
#include "rfc822parse.h"
#include "mime-parser.h"
diff --git a/tools/send-mail.c b/tools/send-mail.c
index 56f2500..34d47c1 100644
--- a/tools/send-mail.c
+++ b/tools/send-mail.c
@@ -22,9 +22,9 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "exectool.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/exectool.h"
+#include "../common/sysutils.h"
#include "send-mail.h"
diff --git a/tools/wks-receive.c b/tools/wks-receive.c
index 94f8bc6..49a1517 100644
--- a/tools/wks-receive.c
+++ b/tools/wks-receive.c
@@ -22,9 +22,9 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "ccparray.h"
-#include "exectool.h"
+#include "../common/util.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
#include "gpg-wks.h"
#include "rfc822parse.h"
#include "mime-parser.h"
diff --git a/tools/wks-util.c b/tools/wks-util.c
index e6f6b7a..389d4a4 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -22,11 +22,11 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "status.h"
-#include "ccparray.h"
-#include "exectool.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
+#include "../common/mbox-util.h"
#include "mime-maker.h"
#include "send-mail.h"
#include "gpg-wks.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list