diff --git a/include/boot/loaders_layout.h b/include/boot/loaders_layout.h
index 72aff0df..dd82ce17 100644
--- a/include/boot/loaders_layout.h
+++ b/include/boot/loaders_layout.h
@@ -26,6 +26,7 @@
 #define STAGE3_STACK_ADDRESS		_AC(0xF000, UL)
 #define STAGE3_PARAMS_ADDRESS		_AC(0x9000, UL)
 
+#define COMMAND_LINE_EXTRA		_AC(0xE000, UL)
 
 #ifndef __ASSEMBLER__
 #endif /* __ASSEMBLER__ */
diff --git a/zipl/boot/menu.c b/zipl/boot/menu.c
index de001c7e..1e40c088 100644
--- a/zipl/boot/menu.c
+++ b/zipl/boot/menu.c
@@ -13,6 +13,8 @@
 #include "menu.h"
 #include "sclp.h"
 #include "ebcdic.h"
+#include "boot/linux_layout.h"
+#include "boot/loaders_layout.h"
 
 static const char *msg_econfig = "Error: undefined configuration\n";
 
diff --git a/zipl/boot/menu.h b/zipl/boot/menu.h
index ee0f2c5f..c6d688c1 100644
--- a/zipl/boot/menu.h
+++ b/zipl/boot/menu.h
@@ -14,11 +14,6 @@
 
 #include "stage2.h"
 
-/* address of extra command line */
-#define COMMAND_LINE_EXTRA	        0xE000
-
-/* max command line length */
-#define COMMAND_LINE_SIZE	        896
 #define BOOT_MENU_ENTRIES		63
 #define PARAM_SIZE                      8
 #define TEXT_OFFSET                     4
diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c
index 1511e801..3185448c 100644
--- a/zipl/boot/stage3.c
+++ b/zipl/boot/stage3.c
@@ -13,6 +13,7 @@
 #include "boot/sigp.h"
 #include "boot/s390.h"
 #include "boot/sigp.h"
+#include "boot/linux_layout.h"
 #include "boot/loaders_layout.h"
 
 #include "stage3.h"
diff --git a/zipl/boot/stage3.h b/zipl/boot/stage3.h
index cb771150..5ac4623d 100644
--- a/zipl/boot/stage3.h
+++ b/zipl/boot/stage3.h
@@ -18,8 +18,6 @@
 #include "boot/linux_layout.h"
 
 
-#define COMMAND_LINE_EXTRA       0xE000
-
 #define STAGE3_FLAG_SCSI	 0x0001000000000000ULL
 #define STAGE3_FLAG_KDUMP	 0x0002000000000000ULL