diff --git a/modules/count-one-bits-tests b/modules/count-one-bits-tests
index bf0a543212..c0432d082f 100644
--- a/modules/count-one-bits-tests
+++ b/modules/count-one-bits-tests
@@ -3,6 +3,7 @@ tests/test-count-one-bits.c
 tests/macros.h
 
 Depends-on:
+limits-h
 
 configure.ac:
 
diff --git a/tests/test-count-one-bits.c b/tests/test-count-one-bits.c
index fef087edbd..0215e77100 100644
--- a/tests/test-count-one-bits.c
+++ b/tests/test-count-one-bits.c
@@ -29,11 +29,6 @@
 #define ULONG_BIT (sizeof (unsigned long int) * CHAR_BIT)
 #define ULLONG_BIT (sizeof (unsigned long long int) * CHAR_BIT)
 
-#ifndef ULLONG_MAX
-# define HALF (1ULL << (sizeof (unsigned long long int) * CHAR_BIT - 1))
-# define ULLONG_MAX (HALF - 1 + HALF)
-#endif
-
 int
 main (int argc, char *argv[])
 {