@@ -25,10 +25,11 @@
 #endif
 #ifndef __STDC_CONSTANT_MACROS
 # define __STDC_CONSTANT_MACROS
 #endif
 
+#include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -822,23 +823,23 @@
 	}
 
 static OF_INLINE bool
 of_bitset_isset(unsigned char *_Nonnull storage, size_t idx)
 {
-	return storage[idx / 8] & (1u << (idx % 8));
+	return storage[idx / CHAR_BIT] & (1u << (idx % CHAR_BIT));
 }
 
 static OF_INLINE void
 of_bitset_set(unsigned char *_Nonnull storage, size_t idx)
 {
-	storage[idx / 8] |= (1u << (idx % 8));
+	storage[idx / CHAR_BIT] |= (1u << (idx % CHAR_BIT));
 }
 
 static OF_INLINE void
 of_bitset_clear(unsigned char *_Nonnull storage, size_t idx)
 {
-	storage[idx / 8] &= ~(1u << (idx % 8));
+	storage[idx / CHAR_BIT] &= ~(1u << (idx % CHAR_BIT));
 }
 
 static OF_INLINE char *_Nullable
 of_strdup(const char *_Nonnull string)
 {