diff --git a/configure.ac b/configure.ac
index 5d133c3..3ef8ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AC_ARG_ENABLE([static-bin],
 	)
 AM_CONDITIONAL([STATIC], [test "x$static" = "xyes"])
 
-AC_ARG_ENABLE([debug],
+AC_ARG_ENABLE([debug-build],
 	[AC_HELP_STRING([--enable-debug],[Build debugging code in @<:@default=no@:>@])],
 	[debugbuild=$enableval]
 	)
diff --git a/lrzip_private.h b/lrzip_private.h
index 8cde7bb..3e51443 100644
--- a/lrzip_private.h
+++ b/lrzip_private.h
@@ -117,13 +117,8 @@ extern char *sys_errlist[];
 extern int errno;
 #endif
 
-#ifdef DEBUG_BUILD
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
-#else
-#define likely(x)	(x)) {}; if (true
-#define unlikely(x)	(x)) {}; if (false
-#endif
 #define __maybe_unused	__attribute__((unused))
 
 typedef long long int i64;