From d6c7bf1f8ab8899faba2fb81a35b096921c38f3c Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 7 Mar 2017 20:32:09 +0900
Subject: [PATCH] More change for common.

* g10, scd, test, tools: Follow the change of removal of -Icommon.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 g10/seckey-cert.c    | 6 +++---
 scd/iso7816.c        | 4 ++--
 tests/gpgscm/main.c  | 2 +-
 tools/no-libgcrypt.c | 2 +-
 tools/symcryptrun.c  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 61cc2ea87..a7a873986 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -26,14 +26,14 @@
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "keydb.h"
 #include "cipher.h"
 #include "main.h"
 #include "options.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 #include "pkglue.h"
 
 static int
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 8f796981f..d146bd00a 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -32,8 +32,8 @@
 #include "options.h"
 #include "errors.h"
 #include "memory.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #else /* GNUPG_MAJOR_VERSION != 1 */
 #include "scdaemon.h"
 #endif /* GNUPG_MAJOR_VERSION != 1 */
diff --git a/tests/gpgscm/main.c b/tests/gpgscm/main.c
index 3191e0597..65929f007 100644
--- a/tests/gpgscm/main.c
+++ b/tests/gpgscm/main.c
@@ -34,7 +34,7 @@
 #include "scheme.h"
 #include "scheme-private.h"
 #include "ffi.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../../common/argparse.h"
 #include "../../common/init.h"
 #include "../../common/logging.h"
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index b56cc385d..873996889 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -18,7 +18,7 @@
 #include <errno.h>
 
 #include "../common/util.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Replace libgcrypt's malloc functions which are used by
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index b32d43ac8..563e56bc3 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -98,7 +98,7 @@
 #endif
 #include <gpg-error.h>
 
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"
 #include "../common/sysutils.h"