2 files changed, 3 insertions, 18 deletions
diff --git a/libddekit/include/ddekit/panic.h b/libddekit/include/ddekit/panic.h
index f036ab3e..1468675f 100644
--- a/libddekit/include/ddekit/panic.h
+++ b/libddekit/include/ddekit/panic.h
@@ -3,29 +3,14 @@
 
 /** \defgroup DDEKit_util */
 
-#include "c_headers.h"
-
 /** Panic - print error message and enter the kernel debugger.
  * \ingroup DDEKit_util
  */
-#define ddekit_panic(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "%s", format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-  abort ();			    \
-} while (0)
+void ddekit_panic(char *fmt, ...) __attribute__((noreturn));
 
 /** Print a debug message.
  * \ingroup DDEKit_util
  */
-#define ddekit_debug(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "%s: %s\n", __func__, format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-} while (0)
+void ddekit_debug(char *fmt, ...);
 
 #endif
diff --git a/libddekit/include/ddekit/printf.h b/libddekit/include/ddekit/printf.h
index aa086c71..35b0dfa1 100644
--- a/libddekit/include/ddekit/printf.h
+++ b/libddekit/include/ddekit/printf.h
@@ -1,7 +1,7 @@
 #ifndef _ddekit_print_h
 #define _ddekit_print_h
 
-#include "c_headers.h"
+#include <stdarg.h>
 
 /** Print message.
  * \ingroup DDEKit_util