diff --git a/c/include/debug.h b/c/include/debug.h
index db65aba..3619f24 100644
--- a/c/include/debug.h
+++ b/c/include/debug.h
@@ -14,45 +14,29 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <stdio.h>
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <br.h>
-
-#define NANOSEC  1000000000                       /* nano sec in sec */
-#define MILLISEC 1000000                          /* milli sec in sec */
+#include <bits.h>
 
+#define _unused __attribute__((__unused__))
 #define _printf __attribute__ ((format (printf, 6, 7)))
 
 #ifdef DEBUG_DEBUG
-
-void debug_init(int level, FILE *stream, bool flush);
-void debug_level_set(int level);
-int debug_level_get(void);
-void debug_stream_set(FILE *stream);
-long long debug_timer_elapsed(void);
-void debug_flush_set(bool flush);
-void _printf debug(int level, bool timestamp,
-                   int indent, const char *src,
-                   int line, const char *fmt, ...);
-
+void debug_init(u32 level);
+void debug_level_set(u32 level);
+u32  debug_level_get(void);
+void _printf debug(u32 level, bool timestamp,
+                   u32 indent, const char *src,
+                   u32 line, const char *fmt, ...);
 #else  /* DEBUG_DEBUG */
-
-static inline void debug_init(__unused int level,
-                              __unused FILE *stream,
-                              __unused bool flush) {}
-static inline void debug_level_set(__unused int level) {}
-static inline int debug_level_get(void) {return 0;}
-static inline void debug_stream_set(__unused FILE *stream) {}
-static inline long long debug_timer_elapsed(void) {return 0LL;}
-static inline void debug_flush_set(__unused bool level) {}
-static inline void _printf debug(__unused int level, __unused bool timestamp,
-                                 __unused int indent, __unused const char *src,
-                                 __unused int line, __unused const char *fmt, ...) {}
-
+static inline void debug_init(_unused u32 level) {}
+static inline void debug_level_set(_unused u32 level) {}
+static inline void _printf debug(_unused u32 level, _unused bool timestamp,
+                                 _unused u32 indent, _unused const char *src,
+                                 _unused u32 line, _unused const char *fmt, ...) {}
 #endif  /* DEBUG_DEBUG */
-
+#undef _unused
 #undef _printf
 
 /**