5 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 69c9dba675..72d859c468 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -15,8 +15,8 @@
 	struct nv50_screen *ctx = nv50->screen
 #include "nouveau/nouveau_push.h"
 
-#include "nv50_state.h"
 #include "nv50_screen.h"
+#include "nv50_program.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
 	fprintf(stderr, "%s:%d -  "fmt, __func__, __LINE__, ##args);
diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index b73003123d..2118d8ef85 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -8,7 +8,6 @@
 #include "tgsi/util/tgsi_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 #define NV50_SU_MAX_TEMP 64
 
diff --git a/src/gallium/drivers/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_program.h
index d568bf610d..dd5aed799a 100644
--- a/src/gallium/drivers/nv50/nv50_state.h
+++ b/src/gallium/drivers/nv50/nv50_program.h
@@ -1,5 +1,5 @@
-#ifndef __NV50_STATE_H__
-#define __NV50_STATE_H__
+#ifndef __NV50_PROGRAM_H__
+#define __NV50_PROGRAM_H__
 
 #include "pipe/p_state.h"
 #include "tgsi/util/tgsi_scan.h"
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 774117326a..ed6cca9a0d 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 #include "nouveau/nouveau_stateobj.h"
 
diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index badbef53df..140d60cc9a 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 static INLINE unsigned
 nv50_prim(unsigned mode)