6 files changed, 7 insertions, 7 deletions
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index fe7da1bb8..8fca24afb 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 dd8477c69..609429884 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 0e8f63a91..d24f117ab 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 6885e059f..d82c2cb75 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 ec5aad128..cc114c64c 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 486753c0d..b71335b7d 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;