diff --git a/src/mesa/cso_cache/cso_cache.c b/src/mesa/pipe/cso_cache/cso_cache.c
similarity index 100%
rename from src/mesa/cso_cache/cso_cache.c
rename to src/mesa/pipe/cso_cache/cso_cache.c
diff --git a/src/mesa/cso_cache/cso_cache.h b/src/mesa/pipe/cso_cache/cso_cache.h
similarity index 100%
rename from src/mesa/cso_cache/cso_cache.h
rename to src/mesa/pipe/cso_cache/cso_cache.h
diff --git a/src/mesa/cso_cache/cso_hash.c b/src/mesa/pipe/cso_cache/cso_hash.c
similarity index 100%
rename from src/mesa/cso_cache/cso_hash.c
rename to src/mesa/pipe/cso_cache/cso_hash.c
diff --git a/src/mesa/cso_cache/cso_hash.h b/src/mesa/pipe/cso_cache/cso_hash.h
similarity index 100%
rename from src/mesa/cso_cache/cso_hash.h
rename to src/mesa/pipe/cso_cache/cso_hash.h
diff --git a/src/mesa/sources b/src/mesa/sources
index 22b592df09f..017a0167bdf 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -187,8 +187,8 @@ TGSIMESA_SOURCES = \
 	pipe/tgsi/mesa/mesa_to_tgsi.c
 
 STATECACHE_SOURCES = \
-	cso_cache/cso_hash.c \
-	cso_cache/cso_cache.c
+	pipe/cso_cache/cso_hash.c \
+	pipe/cso_cache/cso_cache.c
 
 STATETRACKER_SOURCES = \
 	state_tracker/st_atom.c \
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c
index a687c155874..e9c79634bd7 100644
--- a/src/mesa/state_tracker/st_cache.c
+++ b/src/mesa/state_tracker/st_cache.c
@@ -36,8 +36,8 @@
 
 #include "pipe/p_state.h"
 
-#include "cso_cache/cso_cache.h"
-#include "cso_cache/cso_hash.h"
+#include "pipe/cso_cache/cso_cache.h"
+#include "pipe/cso_cache/cso_hash.h"
 
 /* This function will either find the state of the given template
  * in the cache or it will create a new state state from the given
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index f9717465f4a..e0304dd22db 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -45,7 +45,7 @@
 #include "st_program.h"
 #include "pipe/p_context.h"
 #include "pipe/draw/draw_context.h"
-#include "cso_cache/cso_cache.h"
+#include "pipe/cso_cache/cso_cache.h"
 
 
 void st_invalidate_state(GLcontext * ctx, GLuint new_state)