diff --git a/include/osmocore/msgb.h b/include/osmocore/msgb.h
index 962ba4e..354c5d8 100644
--- a/include/osmocore/msgb.h
+++ b/include/osmocore/msgb.h
@@ -61,12 +61,10 @@
 extern void msgb_reset(struct msgb *m);
 
 #ifdef MSGB_DEBUG
-#include <stdio.h>
-#include <stdlib.h>
+#include <osmocore/panic.h>
 static inline void msgb_abort(struct msgb *msg, const char *text)
 {
-	fprintf(stderr, "%s", text);
-	abort();
+	osmo_panic("%s", text);
 }
 #endif