diff --git a/zdump/dfi.h b/zdump/dfi.h
index fec42f71..1a0e87e1 100644
--- a/zdump/dfi.h
+++ b/zdump/dfi.h
@@ -18,8 +18,6 @@
 #include "lib/zt_common.h"
 #include "lib/util_list.h"
 
-#include "dfi_mem_chunk.h"
-
 /*
  * CPU info functions and definitions
  */
diff --git a/zdump/dfi_devmem.c b/zdump/dfi_devmem.c
index 61600859..9737b810 100644
--- a/zdump/dfi_devmem.c
+++ b/zdump/dfi_devmem.c
@@ -23,6 +23,7 @@
 #include "zgetdump.h"
 #include "df_s390.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 
 /*
  * Add live dump magic to buffer
diff --git a/zdump/dfi_elf.c b/zdump/dfi_elf.c
index 10f86e48..53ae6d20 100644
--- a/zdump/dfi_elf.c
+++ b/zdump/dfi_elf.c
@@ -23,6 +23,7 @@
 #include "zg.h"
 #include "df_elf.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 
 /*
  * Read memory for given memory chunk
diff --git a/zdump/dfi_kdump.c b/zdump/dfi_kdump.c
index 9f2adea7..da41f5ac 100644
--- a/zdump/dfi_kdump.c
+++ b/zdump/dfi_kdump.c
@@ -14,6 +14,7 @@
 #include "zgetdump.h"
 #include "zg.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 
 struct df_kdump_hdr {
 	char			signature[8];
diff --git a/zdump/dfi_lkcd.c b/zdump/dfi_lkcd.c
index aac79a3f..f8126a64 100644
--- a/zdump/dfi_lkcd.c
+++ b/zdump/dfi_lkcd.c
@@ -17,6 +17,7 @@
 #include "zg.h"
 #include "df_lkcd.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 
 #define MEM_HOLE_SIZE_MIN	(1024 * 1024)
 #define IDX_KIB		64	/* One index entry per IDX_KIB */
diff --git a/zdump/dfi_s390mv.c b/zdump/dfi_s390mv.c
index fb13a98f..bc910096 100644
--- a/zdump/dfi_s390mv.c
+++ b/zdump/dfi_s390mv.c
@@ -30,6 +30,7 @@
 #include "df_s390.h"
 #include "dfi.h"
 #include "dfi_s390mv.h"
+#include "dfi_mem_chunk.h"
 
 /*
  * Volume information
diff --git a/zdump/dfi_s390tape.c b/zdump/dfi_s390tape.c
index 975e4d01..6b8f4638 100644
--- a/zdump/dfi_s390tape.c
+++ b/zdump/dfi_s390tape.c
@@ -22,6 +22,7 @@
 #include "zgetdump.h"
 #include "df_s390.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 
 #define TAPE_BLK_SIZE	32768	/* Defined by zipl tape dumper */
 
diff --git a/zdump/dfo_elf.c b/zdump/dfo_elf.c
index 8263237c..3fe0570e 100644
--- a/zdump/dfo_elf.c
+++ b/zdump/dfo_elf.c
@@ -18,6 +18,7 @@
 
 #include "df_elf.h"
 #include "dfi.h"
+#include "dfi_mem_chunk.h"
 #include "dfi_vmcoreinfo.h"
 #include "dfo.h"
 
diff --git a/zdump/dfo_s390.c b/zdump/dfo_s390.c
index 50fc75fd..d1fefdb9 100644
--- a/zdump/dfo_s390.c
+++ b/zdump/dfo_s390.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 
 #include "df_s390.h"
+#include "dfi_mem_chunk.h"
 #include "dfo.h"
 
 /*