diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 9063b5134c3..c3a3af9fbca 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -276,8 +276,6 @@ C_SOURCES := \
 	util/u_pstipple.c \
 	util/u_pstipple.h \
 	util/u_pwr8.h \
-	util/u_queue.c \
-	util/u_queue.h \
 	util/u_range.h \
 	util/u_rect.h \
 	util/u_resource.c \
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 8b5ee2d0c71..e6c1c7690f1 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -44,6 +44,8 @@ MESA_UTIL_FILES :=	\
 	texcompress_rgtc_tmp.h \
 	u_atomic.h \
 	u_endian.h \
+	u_queue.c \
+	u_queue.h \
 	u_string.h \
 	u_thread.h \
 	u_vector.c \
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/util/u_queue.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_queue.c
rename to src/util/u_queue.c
diff --git a/src/gallium/auxiliary/util/u_queue.h b/src/util/u_queue.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_queue.h
rename to src/util/u_queue.h