5 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/sources b/src/mesa/sources
index 9bcb07c6b40..be81e102edb 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -196,11 +196,11 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_drawpixels.c \
 	state_tracker/st_cb_fbo.c \
 	state_tracker/st_cb_program.c \
-	state_tracker/st_cb_teximage.c \
 	state_tracker/st_cb_texture.c \
 	state_tracker/st_cb_bufferobjects.c \
-	state_tracker/st_draw.c \
 	state_tracker/st_context.c \
+	state_tracker/st_draw.c \
+	state_tracker/st_format.c \
 	state_tracker/st_mipmap_tree.c
 
 SHADER_SOURCES = \
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6b7cef2b2a4..20990fe80a6 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -38,7 +38,7 @@
 #include "st_program.h"
 #include "st_cb_drawpixels.h"
 #include "st_cb_texture.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 8443c9ea1b1..bee7474e388 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -43,7 +43,7 @@
 #include "pipe/p_defines.h"
 #include "st_context.h"
 #include "st_cb_fbo.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"
 
 
 
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 6850d602e24..22c1b4baffc 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -38,7 +38,7 @@
 
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_cb_texture.h"
-#include "state_tracker/st_cb_teximage.h"
+#include "state_tracker/st_format.h"
 #include "state_tracker/st_mipmap_tree.h"
 
 #include "pipe/p_context.h"
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index c54602db5d3..4f36c84d4e5 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -40,7 +40,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "st_context.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"