12 files changed, 30 insertions, 30 deletions
diff --git a/scd/Makefile.am b/scd/Makefile.am
index db096f6e0..cbd1f9f0f 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 c8ce68473..147bf7382 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 f7ecc4bd2..bea285687 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 c2771719d..510beb550 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 85bcc6646..842a73d5a 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 98dd5884f..9e720f0b0 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 af81dce65..66b235d81 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 4072fb715..68e8c4faa 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 dddc8dcfe..8094b2463 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 e1c4e100d..472adc70f 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 b1d5539cb..56fdf7489 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 13cf2e6e0..26e89dd8d 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