diff --git a/src/mesa/main/texcompress_bptc_tmp.h b/src/mesa/main/texcompress_bptc_tmp.h
index e5deac2f0d1..dae6a57de84 100644
--- a/src/mesa/main/texcompress_bptc_tmp.h
+++ b/src/mesa/main/texcompress_bptc_tmp.h
@@ -28,9 +28,10 @@
 #ifndef TEXCOMPRESS_BPTC_TMP_H
 #define TEXCOMPRESS_BPTC_TMP_H
 
+#include "util/bitscan.h"
 #include "util/format_srgb.h"
 #include "util/half_float.h"
-#include "macros.h"
+#include "util/u_math.h"
 
 #define BLOCK_SIZE 4
 #define N_PARTITIONS 64