diff --git a/hw/xbox/mcpx/apu.c b/hw/xbox/mcpx/apu.c
index ecace96ce3..d5eec18f40 100644
--- a/hw/xbox/mcpx/apu.c
+++ b/hw/xbox/mcpx/apu.c
@@ -154,6 +154,14 @@ typedef struct MCPXAPUState {
     int16_t apu_fifo_output[256][2]; // 1 EP frame (0x400 bytes), 8 buffered
 } MCPXAPUState;
 
+static const struct {
+    hwaddr top, current, next;
+} voice_list_regs[] = {
+    { NV_PAPU_TVL2D, NV_PAPU_CVL2D, NV_PAPU_NVL2D }, // 2D
+    { NV_PAPU_TVL3D, NV_PAPU_CVL3D, NV_PAPU_NVL3D }, // 3D
+    { NV_PAPU_TVLMP, NV_PAPU_CVLMP, NV_PAPU_NVLMP }, // MP
+};
+
 static MCPXAPUState *g_state; // Used via debug handlers
 static struct McpxApuDebug g_dbg, g_dbg_cache;
 static int g_dbg_voice_monitor = -1;
diff --git a/hw/xbox/mcpx/apu_regs.h b/hw/xbox/mcpx/apu_regs.h
index 2fa71593ae..d745a69354 100644
--- a/hw/xbox/mcpx/apu_regs.h
+++ b/hw/xbox/mcpx/apu_regs.h
@@ -124,15 +124,6 @@
 #define NV_PAPU_EPPMEM                                   0x0000A000
 #define NV_PAPU_EPRST                                    0x0000FFFC
 
-static const struct {
-    hwaddr top, current, next;
-} voice_list_regs[] = {
-    {NV_PAPU_TVL2D, NV_PAPU_CVL2D, NV_PAPU_NVL2D}, //2D
-    {NV_PAPU_TVL3D, NV_PAPU_CVL3D, NV_PAPU_NVL3D}, //3D
-    {NV_PAPU_TVLMP, NV_PAPU_CVLMP, NV_PAPU_NVLMP}, //MP
-};
-
-
 /* audio processor object / front-end messages */
 #define NV1BA0_PIO_FREE                                  0x00000010
 #define NV1BA0_PIO_SET_ANTECEDENT_VOICE                  0x00000120