diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
index 76c198e165b..c63bde3224d 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
@@ -22,9 +22,10 @@
  */
 
 #include "st_glsl_to_tgsi_temprename.h"
-#include <tgsi/tgsi_info.h>
-#include <tgsi/tgsi_strings.h>
-#include <program/prog_instruction.h>
+#include "tgsi/tgsi_info.h"
+#include "tgsi/tgsi_strings.h"
+#include "program/prog_instruction.h"
+#include "util/bitscan.h"
 #include <limits>
 #include <cstdlib>
 
@@ -37,8 +38,8 @@
 #ifndef NDEBUG
 #include <iostream>
 #include <iomanip>
-#include <program/prog_print.h>
-#include <util/debug.h>
+#include "program/prog_print.h"
+#include "util/debug.h"
 using std::cerr;
 using std::setw;
 #endif