diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c
index 800e202d29..8e2d5432e8 100644
--- a/hw/xbox/nv2a.c
+++ b/hw/xbox/nv2a.c
@@ -1269,6 +1269,24 @@ static const SurfaceColorFormatInfo kelvin_surface_color_format_map[] = {
         {4, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
 };
 
+#define NV2A_VERTEX_ATTR_POSITION       0
+#define NV2A_VERTEX_ATTR_WEIGHT         1
+#define NV2A_VERTEX_ATTR_NORMAL         2
+#define NV2A_VERTEX_ATTR_DIFFUSE        3
+#define NV2A_VERTEX_ATTR_SPECULAR       4
+#define NV2A_VERTEX_ATTR_FOG            5
+#define NV2A_VERTEX_ATTR_POINT_SIZE     6
+#define NV2A_VERTEX_ATTR_BACK_DIFFUSE   7
+#define NV2A_VERTEX_ATTR_BACK_SPECULAR  8
+#define NV2A_VERTEX_ATTR_TEXTURE0       9
+#define NV2A_VERTEX_ATTR_TEXTURE1       10
+#define NV2A_VERTEX_ATTR_TEXTURE2       11
+#define NV2A_VERTEX_ATTR_TEXTURE3       12
+#define NV2A_VERTEX_ATTR_RESERVED1      13
+#define NV2A_VERTEX_ATTR_RESERVED2      14
+#define NV2A_VERTEX_ATTR_RESERVED3      15
+
+
 #define NV2A_CRYSTAL_FREQ 13500000
 #define NV2A_NUM_CHANNELS 32
 #define NV2A_NUM_SUBCHANNELS 8
diff --git a/hw/xbox/nv2a_shaders.h b/hw/xbox/nv2a_shaders.h
index 54d40fb4cc..56f82b8707 100644
--- a/hw/xbox/nv2a_shaders.h
+++ b/hw/xbox/nv2a_shaders.h
@@ -27,23 +27,6 @@
 #include "nv2a_vsh.h"
 #include "nv2a_psh.h"
 
-#define NV2A_VERTEX_ATTR_POSITION       0
-#define NV2A_VERTEX_ATTR_WEIGHT         1
-#define NV2A_VERTEX_ATTR_NORMAL         2
-#define NV2A_VERTEX_ATTR_DIFFUSE        3
-#define NV2A_VERTEX_ATTR_SPECULAR       4
-#define NV2A_VERTEX_ATTR_FOG            5
-#define NV2A_VERTEX_ATTR_POINT_SIZE     6
-#define NV2A_VERTEX_ATTR_BACK_DIFFUSE   7
-#define NV2A_VERTEX_ATTR_BACK_SPECULAR  8
-#define NV2A_VERTEX_ATTR_TEXTURE0       9
-#define NV2A_VERTEX_ATTR_TEXTURE1       10
-#define NV2A_VERTEX_ATTR_TEXTURE2       11
-#define NV2A_VERTEX_ATTR_TEXTURE3       12
-#define NV2A_VERTEX_ATTR_RESERVED1      13
-#define NV2A_VERTEX_ATTR_RESERVED2      14
-#define NV2A_VERTEX_ATTR_RESERVED3      15
-
 #define NV2A_MAX_TRANSFORM_PROGRAM_LENGTH 136
 #define NV2A_VERTEXSHADER_CONSTANTS 192