diff --git a/src/util/debug.h b/src/util/debug.h
index adc9fc6b7..e0ceb9a64 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -90,14 +90,7 @@ bool is_debug_enabled(const char * tag);
         exit(-1);                                           \
     }
 
-#define MAKE_NAME2(LINE) zofty_ ## LINE 
-#define MAKE_NAME(LINE) MAKE_NAME2(LINE)
-#define DBG_UNIQUE_NAME MAKE_NAME(__LINE__)
-#ifdef __GNUC__
-#define COMPILE_TIME_ASSERT(expr) extern __attribute__((unused)) char DBG_UNIQUE_NAME[expr]
-#else
-#define COMPILE_TIME_ASSERT(expr) extern char DBG_UNIQUE_NAME[expr]
-#endif
+#define COMPILE_TIME_ASSERT(expr) static_assert(expr, "")
 
 void finalize_debug();
 /*