diff --git a/zdump/df_s390.c b/zdump/df_s390.c
index 4c767486..4af74f95 100644
--- a/zdump/df_s390.c
+++ b/zdump/df_s390.c
@@ -17,7 +17,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "zgetdump.h"
+#include "df_s390.h"
 
 /*
  * Check, if we can access the lowcore information in the dump
diff --git a/zdump/dfi.c b/zdump/dfi.c
index 9ef55ee5..5564c43e 100644
--- a/zdump/dfi.c
+++ b/zdump/dfi.c
@@ -9,13 +9,12 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include <time.h>
-
 #include "lib/util_log.h"
 
 #include "zgetdump.h"
 #include "dfi_mem_chunk.h"
 #include "dfi_vmcoreinfo.h"
+#include "dfi.h"
 
 #define TIME_FMT_STR "%a, %d %b %Y %H:%M:%S %z"
 #define PROGRESS_HASH_CNT 50
diff --git a/zdump/dfi.h b/zdump/dfi.h
index 519c2b58..fec42f71 100644
--- a/zdump/dfi.h
+++ b/zdump/dfi.h
@@ -12,6 +12,7 @@
 #ifndef DFI_H
 #define DFI_H
 
+#include <time.h>
 #include <linux/utsname.h>
 
 #include "lib/zt_common.h"
diff --git a/zdump/dfi_devmem.c b/zdump/dfi_devmem.c
index ac204435..61600859 100644
--- a/zdump/dfi_devmem.c
+++ b/zdump/dfi_devmem.c
@@ -21,6 +21,8 @@
 #include <unistd.h>
 
 #include "zgetdump.h"
+#include "df_s390.h"
+#include "dfi.h"
 
 /*
  * Add live dump magic to buffer
diff --git a/zdump/dfi_elf.c b/zdump/dfi_elf.c
index 2ebbfe49..10f86e48 100644
--- a/zdump/dfi_elf.c
+++ b/zdump/dfi_elf.c
@@ -18,7 +18,11 @@
 
 #include "lib/util_libc.h"
 #include "lib/util_log.h"
+
 #include "zgetdump.h"
+#include "zg.h"
+#include "df_elf.h"
+#include "dfi.h"
 
 /*
  * Read memory for given memory chunk
diff --git a/zdump/dfi_kdump.c b/zdump/dfi_kdump.c
index 3b95d925..9f2adea7 100644
--- a/zdump/dfi_kdump.c
+++ b/zdump/dfi_kdump.c
@@ -9,7 +9,11 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include <errno.h>
+
 #include "zgetdump.h"
+#include "zg.h"
+#include "dfi.h"
 
 struct df_kdump_hdr {
 	char			signature[8];
diff --git a/zdump/dfi_lkcd.c b/zdump/dfi_lkcd.c
index 45de1787..aac79a3f 100644
--- a/zdump/dfi_lkcd.c
+++ b/zdump/dfi_lkcd.c
@@ -9,8 +9,14 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include <string.h>
+#include <errno.h>
 #include <zlib.h>
+
 #include "zgetdump.h"
+#include "zg.h"
+#include "df_lkcd.h"
+#include "dfi.h"
 
 #define MEM_HOLE_SIZE_MIN	(1024 * 1024)
 #define IDX_KIB		64	/* One index entry per IDX_KIB */
diff --git a/zdump/dfi_s390.c b/zdump/dfi_s390.c
index c6e8e3b7..7539b7ce 100644
--- a/zdump/dfi_s390.c
+++ b/zdump/dfi_s390.c
@@ -17,9 +17,16 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "lib/util_log.h"
+
 #include "zgetdump.h"
+#include "zg.h"
+#include "dfi.h"
+#include "dfi_mem_chunk.h"
+#include "df_elf.h"
+#include "df_s390.h"
 
 /*
  * File local static data
diff --git a/zdump/dfi_s390_ext.c b/zdump/dfi_s390_ext.c
index 5794f04c..18c4b23c 100644
--- a/zdump/dfi_s390_ext.c
+++ b/zdump/dfi_s390_ext.c
@@ -9,7 +9,9 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "zgetdump.h"
+#include "dt.h"
+#include "df_s390.h"
+#include "dfi.h"
 
 /*
  * Initialize s390 input dump format (extended)
diff --git a/zdump/dfi_s390mv.c b/zdump/dfi_s390mv.c
index d936fd1e..fb13a98f 100644
--- a/zdump/dfi_s390mv.c
+++ b/zdump/dfi_s390mv.c
@@ -20,11 +20,15 @@
 #include <sys/sysmacros.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "lib/util_file.h"
 #include "lib/util_path.h"
 
 #include "zgetdump.h"
+#include "dt.h"
+#include "df_s390.h"
+#include "dfi.h"
 #include "dfi_s390mv.h"
 
 /*
diff --git a/zdump/dfi_s390mv_ext.c b/zdump/dfi_s390mv_ext.c
index ccc9724a..4f5fad69 100644
--- a/zdump/dfi_s390mv_ext.c
+++ b/zdump/dfi_s390mv_ext.c
@@ -10,6 +10,9 @@
  */
 
 #include "zgetdump.h"
+#include "dt.h"
+#include "df_s390.h"
+#include "dfi.h"
 
 /*
  * Initialize s390 multi-volume input dump format (extedend)
diff --git a/zdump/dfi_s390tape.c b/zdump/dfi_s390tape.c
index c1a4c060..975e4d01 100644
--- a/zdump/dfi_s390tape.c
+++ b/zdump/dfi_s390tape.c
@@ -17,8 +17,11 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "zgetdump.h"
+#include "df_s390.h"
+#include "dfi.h"
 
 #define TAPE_BLK_SIZE	32768	/* Defined by zipl tape dumper */
 
diff --git a/zdump/dfo.c b/zdump/dfo.c
index d84445ea..fd85cc50 100644
--- a/zdump/dfo.c
+++ b/zdump/dfo.c
@@ -10,7 +10,11 @@
  */
 
 #include <time.h>
-#include "zgetdump.h"
+
+#include "lib/util_list.h"
+
+#include "dfi_mem_chunk.h"
+#include "dfo.h"
 
 #define dfo_chunk_iterate(dfo_chunk) \
 	util_list_iterate(&l.dump.chunk_list, dfo_chunk)
diff --git a/zdump/dfo_s390.c b/zdump/dfo_s390.c
index 3bb5d62f..50fc75fd 100644
--- a/zdump/dfo_s390.c
+++ b/zdump/dfo_s390.c
@@ -17,7 +17,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "zgetdump.h"
+#include "df_s390.h"
+#include "dfo.h"
 
 /*
  * File local static data
diff --git a/zdump/dt_s390mv.c b/zdump/dt_s390mv.c
index d2e2bbb8..95de89ab 100644
--- a/zdump/dt_s390mv.c
+++ b/zdump/dt_s390mv.c
@@ -9,7 +9,8 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "zgetdump.h"
+#include "dt.h"
+#include "df_s390.h"
 
 /*
  * Initialize s390 multi-volume dump tool (for -d option)
diff --git a/zdump/dt_s390mv_ext.c b/zdump/dt_s390mv_ext.c
index 737b98ef..61b79ec1 100644
--- a/zdump/dt_s390mv_ext.c
+++ b/zdump/dt_s390mv_ext.c
@@ -9,7 +9,8 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "zgetdump.h"
+#include "dt.h"
+#include "df_s390.h"
 
 /*
  * Initialize s390 multi-volume dump tool (extedend) for -d option
diff --git a/zdump/dt_s390sv.c b/zdump/dt_s390sv.c
index c74100ce..71b6addf 100644
--- a/zdump/dt_s390sv.c
+++ b/zdump/dt_s390sv.c
@@ -9,8 +9,13 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include <errno.h>
 #include <linux/fs.h>
+
 #include "zgetdump.h"
+#include "zg.h"
+#include "dt.h"
+#include "df_s390.h"
 
 /*
  * File local static data
diff --git a/zdump/dt_s390sv_ext.c b/zdump/dt_s390sv_ext.c
index 42827d76..f892aa6d 100644
--- a/zdump/dt_s390sv_ext.c
+++ b/zdump/dt_s390sv_ext.c
@@ -10,7 +10,9 @@
  */
 
 #include <linux/fs.h>
-#include "zgetdump.h"
+
+#include "dt.h"
+#include "df_s390.h"
 
 /*
  * Initialize s390 single-volume extended dump tool (for -d option)
diff --git a/zdump/dt_scsi.c b/zdump/dt_scsi.c
index ce030582..e6c2cc9f 100644
--- a/zdump/dt_scsi.c
+++ b/zdump/dt_scsi.c
@@ -9,13 +9,16 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include <linux/fs.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <linux/fs.h>
 
 #include "lib/zt_common.h"
 #include "lib/util_part.h"
 
 #include "zgetdump.h"
+#include "zg.h"
+#include "dt.h"
 
 /*
  * Single volume SCSI dump superblock
diff --git a/zdump/opts.c b/zdump/opts.c
index 0bedb44a..253ba550 100644
--- a/zdump/opts.c
+++ b/zdump/opts.c
@@ -16,7 +16,9 @@
 
 #include "lib/zt_common.h"
 #include "lib/util_log.h"
+
 #include "zgetdump.h"
+#include "dfo.h"
 
 /*
  * Text for --help option
diff --git a/zdump/stdout.c b/zdump/stdout.c
index b4184fcb..77c5d295 100644
--- a/zdump/stdout.c
+++ b/zdump/stdout.c
@@ -9,7 +9,9 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "zgetdump.h"
+#include "zg.h"
+#include "dfi.h"
+#include "dfo.h"
 
 int stdout_write_dump(void)
 {
diff --git a/zdump/zgetdump.c b/zdump/zgetdump.c
index bc8befe7..a61e851d 100644
--- a/zdump/zgetdump.c
+++ b/zdump/zgetdump.c
@@ -27,6 +27,9 @@
 #include <unistd.h>
 
 #include "zgetdump.h"
+#include "dt.h"
+#include "dfi.h"
+#include "dfo.h"
 #include "zfuse.h"
 
 /*
diff --git a/zdump/zgetdump.h b/zdump/zgetdump.h
index 776431bd..ed71396b 100644
--- a/zdump/zgetdump.h
+++ b/zdump/zgetdump.h
@@ -12,12 +12,6 @@
 #ifndef ZGETDUMP_H
 #define ZGETDUMP_H
 
-#include "df_elf.h"
-#include "df_lkcd.h"
-#include "df_s390.h"
-#include "dfi.h"
-#include "dfo.h"
-#include "dt.h"
 #include "zg.h"
 
 /*