6 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/trace/Makefile b/src/gallium/drivers/trace/Makefile
index e087db169aa..188998d5793 100644
--- a/src/gallium/drivers/trace/Makefile
+++ b/src/gallium/drivers/trace/Makefile
@@ -7,8 +7,8 @@ C_SOURCES = \
 	tr_buffer.c \
 	tr_context.c \
 	tr_dump.c \
+	tr_dump_state.c \
 	tr_screen.c \
-	tr_state.c \
 	tr_texture.c
 
 include ../../Makefile.template
diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript
index 4215215d1a1..4ab829a3a8e 100644
--- a/src/gallium/drivers/trace/SConscript
+++ b/src/gallium/drivers/trace/SConscript
@@ -8,8 +8,8 @@ trace = env.ConvenienceLibrary(
         'tr_buffer.c',
         'tr_context.c',
         'tr_dump.c',
+        'tr_dump_state.c',
         'tr_screen.c',
-        'tr_state.c',
         'tr_texture.c',
     ])
 
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 47280459a75..6a19233a9ae 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -31,7 +31,7 @@
 #include "pipe/p_screen.h"
 
 #include "tr_dump.h"
-#include "tr_state.h"
+#include "tr_dump_state.h"
 #include "tr_buffer.h"
 #include "tr_screen.h"
 #include "tr_texture.h"
diff --git a/src/gallium/drivers/trace/tr_state.c b/src/gallium/drivers/trace/tr_dump_state.c
index a9570c1aebd..1b2b3493a6c 100644
--- a/src/gallium/drivers/trace/tr_state.c
+++ b/src/gallium/drivers/trace/tr_dump_state.c
@@ -31,7 +31,7 @@
 #include "tgsi/tgsi_dump.h"
 
 #include "tr_dump.h"
-#include "tr_state.h"
+#include "tr_dump_state.h"
 
 
 void trace_dump_format(enum pipe_format format)
diff --git a/src/gallium/drivers/trace/tr_state.h b/src/gallium/drivers/trace/tr_dump_state.h
index 513ed0ac98d..05b821adb64 100644
--- a/src/gallium/drivers/trace/tr_state.h
+++ b/src/gallium/drivers/trace/tr_dump_state.h
@@ -25,8 +25,8 @@
  *
  **************************************************************************/
 
-#ifndef TR_STATE_H
-#define TR_STATE_H
+#ifndef TR_DUMP_STATE_H_
+#define TR_DUMP_STATE_H_
 
 #include "pipe/p_format.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 12a85353428..e659416aba2 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -30,7 +30,7 @@
 
 #include "tr_buffer.h"
 #include "tr_dump.h"
-#include "tr_state.h"
+#include "tr_dump_state.h"
 #include "tr_texture.h"
 #include "tr_screen.h"