diff --git a/src/vfs/tar/tar-internal.c b/src/vfs/tar/tar-internal.c
index aa8ed5359..bccc80b3c 100644
--- a/src/vfs/tar/tar-internal.c
+++ b/src/vfs/tar/tar-internal.c
@@ -33,11 +33,6 @@
 #include <config.h>
 
 #include <inttypes.h>           /* uintmax_t */
-#ifdef HAVE_STDCKDINT_H
-#include <stdckdint.h>
-#else
-#include "lib/stdckdint.h"
-#endif
 
 #include "lib/global.h"
 #include "lib/widget.h"         /* message() */
diff --git a/src/vfs/tar/tar-internal.h b/src/vfs/tar/tar-internal.h
index e0ce57716..0ce75afd8 100644
--- a/src/vfs/tar/tar-internal.h
+++ b/src/vfs/tar/tar-internal.h
@@ -7,6 +7,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifdef HAVE_STDCKDINT_H
+#include <stdckdint.h>
+#else
+#include "lib/stdckdint.h"
+#endif
+
 #include "lib/vfs/xdirentry.h"  /* vfs_s_super */
 
 /*** typedefs(not structures) and defined constants **********************************************/
diff --git a/src/vfs/tar/tar-sparse.c b/src/vfs/tar/tar-sparse.c
index 2e5f869b8..f4130d03b 100644
--- a/src/vfs/tar/tar-sparse.c
+++ b/src/vfs/tar/tar-sparse.c
@@ -44,11 +44,6 @@
 #include <ctype.h>              /* isdigit() */
 #include <errno.h>
 #include <inttypes.h>           /* uintmax_t */
-#ifdef HAVE_STDCKDINT_H
-#include <stdckdint.h>
-#else
-#include "lib/stdckdint.h"
-#endif
 
 #include "lib/global.h"
 
diff --git a/src/vfs/tar/tar-xheader.c b/src/vfs/tar/tar-xheader.c
index 01c666817..41fc02828 100644
--- a/src/vfs/tar/tar-xheader.c
+++ b/src/vfs/tar/tar-xheader.c
@@ -32,11 +32,6 @@
 
 #include <ctype.h>              /* isdigit() */
 #include <errno.h>
-#ifdef HAVE_STDCKDINT_H
-#include <stdckdint.h>
-#else
-#include "lib/stdckdint.h"
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/vfs/tar/tar.c b/src/vfs/tar/tar.c
index 36cccacc9..f28f7f6ff 100644
--- a/src/vfs/tar/tar.c
+++ b/src/vfs/tar/tar.c
@@ -36,11 +36,6 @@
 #include <config.h>
 
 #include <errno.h>
-#ifdef HAVE_STDCKDINT_H
-#include <stdckdint.h>
-#else
-#include "lib/stdckdint.h"
-#endif
 #include <string.h>             /* memset() */
 
 #ifdef hpux