diff --git a/src/util/u_cpu_detect.h b/src/util/u_cpu_detect.h
index af05d5aadf6..bbc89f8d928 100644
--- a/src/util/u_cpu_detect.h
+++ b/src/util/u_cpu_detect.h
@@ -43,6 +43,9 @@
 #include "util/u_thread.h"
 
 
+/* Maximal cpu count for update affinity */
+#define UTIL_MAX_CPUS               1024  /* this should be enough */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index 179f926f14a..d2fddec7a4a 100644
--- a/src/util/u_thread.h
+++ b/src/util/u_thread.h
@@ -35,9 +35,6 @@
 #include "c11/threads.h"
 #include "detect_os.h"
 
-/* For util_set_thread_affinity to size the mask. */
-#define UTIL_MAX_CPUS               1024  /* this should be enough */
-
 /* Some highly performance-sensitive thread-local variables like the current GL
  * context are declared with the initial-exec model on Linux.  glibc allocates a
  * fixed number of extra slots for initial-exec TLS variables at startup, and