diff --git a/include/boot/s390.h b/include/boot/s390.h
index 53fc4a21..ea1493e5 100644
--- a/include/boot/s390.h
+++ b/include/boot/s390.h
@@ -201,15 +201,6 @@ struct _lowcore {
 #define S390_lowcore (*((struct _lowcore *) 0))
 
 
-void panic_notify(unsigned long reason);
-
-#define panic(reason, x...) \
-do { \
-	printf(x); \
-	panic_notify(reason); \
-	libc_stop(reason); \
-} while (0)
-
 static __always_inline int page_is_valid(unsigned long addr)
 {
 	unsigned long tmp;
diff --git a/zipl/boot/libc.h b/zipl/boot/libc.h
index 83ff82bc..f5112d60 100644
--- a/zipl/boot/libc.h
+++ b/zipl/boot/libc.h
@@ -61,6 +61,14 @@ void libc_stop(unsigned long);
 void start(void);
 void pgm_check_handler(void);
 void pgm_check_handler_fn(void);
+void panic_notify(unsigned long reason);
+
+#define panic(reason, ...)			\
+	do {					\
+		printf(__VA_ARGS__);		\
+		panic_notify(reason);		\
+		libc_stop(reason);		\
+	} while (0)
 
 static inline int isdigit(int c)
 {