diff --git a/src/lib/bit/bit.c b/src/lib/bit/bit.c
index b880cecce2abd06b6da5c77ae9fcc33b0979a4af..f3f9e286a907d4208dd9f513e8b0cdb1d50b3ffe 100644
--- a/src/lib/bit/bit.c
+++ b/src/lib/bit/bit.c
@@ -163,11 +163,11 @@ bit_index_u32(uint32_t x, int *indexes, int offset)
 
 int *
 bit_index_u64(uint64_t x, int *indexes, int offset) {
-#if  defined(HAVE_CTZLL)
+#if  defined(HAVE_BUILTIN_CTZLL)
 	int prev_pos = 0;
 	int i = 0;
 
-#if defined(HAVE_POPCOUNTLL)
+#if defined(HAVE_BUILTIN_POPCOUNTLL)
 	/* fast implementation using built-in popcount function */
 	const int count = bit_count_u64(x);
 	while (i < count) {