diff --git a/include/boot/loaders_layout.h b/include/boot/loaders_layout.h
index 0f07ca4e..6426e555 100644
--- a/include/boot/loaders_layout.h
+++ b/include/boot/loaders_layout.h
@@ -30,6 +30,10 @@
 #define ECKD2DUMP_SV_STACK_SIZE		_AC(0x2000, UL)
 #define STAGE2_MAX_SIZE			_AC(0x3000, UL)
 
+#define STAGE2_DUMPER_SIZE_V1		_AC(0x1000, UL)
+#define STAGE2_DUMPER_SIZE_V2		_AC(0x2000, UL)
+#define STAGE2_DUMPER_SIZE_V3		_AC(0x3000, UL)
+
 #define STAGE3_ENTRY			_AC(0xa000, UL)
 
 #define STAGE2_LOAD_ADDRESS		_AC(0x2000, UL)
diff --git a/zdump/df_s390.c b/zdump/df_s390.c
index 65077c7c..d2831464 100644
--- a/zdump/df_s390.c
+++ b/zdump/df_s390.c
@@ -155,16 +155,16 @@ void df_s390_dumper_read(struct zg_fh *fh, int blk_size,
 	case 1:
 		if (strncmp(dumper->magic, DF_S390_DUMPER_MAGIC_EXT, 7) == 0 ||
 		    strncmp(dumper->magic, DF_S390_DUMPER_MAGIC_MV_EXT, 7) == 0)
-			dumper->size = DF_S390_DUMPER_SIZE_V3;
+			dumper->size = STAGE2_DUMPER_SIZE_V3;
 		else
-			dumper->size = DF_S390_DUMPER_SIZE_V1;
+			dumper->size = STAGE2_DUMPER_SIZE_V1;
 		break;
 	case 2:
-		dumper->size = DF_S390_DUMPER_SIZE_V2;
+		dumper->size = STAGE2_DUMPER_SIZE_V2;
 		break;
 	case 3:
 	default:
-		dumper->size = DF_S390_DUMPER_SIZE_V3;
+		dumper->size = STAGE2_DUMPER_SIZE_V3;
 	}
 	/* Read force and mem fields in the end of the dumper */
 	bytes_to_read = sizeof(dumper->force) + sizeof(dumper->mem);
diff --git a/zdump/df_s390.h b/zdump/df_s390.h
index f0ce0329..8a637816 100644
--- a/zdump/df_s390.h
+++ b/zdump/df_s390.h
@@ -14,6 +14,7 @@
 
 #include "lib/zt_common.h"
 #include "dump/s390_dump.h"
+#include "boot/loaders_layout.h"
 
 #include "dt.h"
 #include "zg.h"
@@ -34,9 +35,6 @@ static inline enum dfi_arch df_s390_to_dfi_arch(enum df_s390_arch df_s390_arch)
 	return df_s390_arch == DF_S390_ARCH_64 ? DFI_ARCH_64 : DFI_ARCH_32;
 }
 
-#define DF_S390_DUMPER_SIZE_V1		0x1000
-#define DF_S390_DUMPER_SIZE_V2		0x2000
-#define DF_S390_DUMPER_SIZE_V3		0x3000
 #define DF_S390_DUMPER_MAGIC32		"ZECKD31"
 #define DF_S390_DUMPER_MAGIC64		"ZECKD64"
 #define DF_S390_DUMPER_MAGIC_EXT	"XECKD64"
diff --git a/zdump/dt_s390sv.c b/zdump/dt_s390sv.c
index 71b6addf..7694700e 100644
--- a/zdump/dt_s390sv.c
+++ b/zdump/dt_s390sv.c
@@ -109,11 +109,11 @@ static int dumper_read_validate_fba(int size, struct df_s390_dumper *dumper)
  */
 static int dumper_read_fba(void)
 {
-	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V3, &l.dumper) == 0)
+	if (dumper_read_validate_fba(STAGE2_DUMPER_SIZE_V3, &l.dumper) == 0)
 		return 0;
-	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V2, &l.dumper) == 0)
+	if (dumper_read_validate_fba(STAGE2_DUMPER_SIZE_V2, &l.dumper) == 0)
 		return 0;
-	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V1, &l.dumper) == 0)
+	if (dumper_read_validate_fba(STAGE2_DUMPER_SIZE_V1, &l.dumper) == 0)
 		return 0;
 	return -ENODEV;
 }