diff --git a/hw/xbox/mcpx/apu_int.h b/hw/xbox/mcpx/apu_int.h
index e4f4658a46..eff951263b 100644
--- a/hw/xbox/mcpx/apu_int.h
+++ b/hw/xbox/mcpx/apu_int.h
@@ -42,7 +42,7 @@
 #include "apu_debug.h"
 #include "fpconv.h"
 #include "vp/vp.h"
-#include "dsp.h"
+#include "dsp/gp_ep.h"
 
 #define GET_MASK(v, mask) (((v) & (mask)) >> ctz32(mask))
 
diff --git a/hw/xbox/mcpx/dsp.c b/hw/xbox/mcpx/dsp/gp_ep.c
similarity index 99%
rename from hw/xbox/mcpx/dsp.c
rename to hw/xbox/mcpx/dsp/gp_ep.c
index f2e2760efc..897c1cb1b9 100644
--- a/hw/xbox/mcpx/dsp.c
+++ b/hw/xbox/mcpx/dsp/gp_ep.c
@@ -19,7 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "apu_int.h"
+#include "hw/xbox/mcpx/apu_int.h"
 
 static const int16_t ep_silence[256][2] = { 0 };
 
diff --git a/hw/xbox/mcpx/dsp.h b/hw/xbox/mcpx/dsp/gp_ep.h
similarity index 90%
rename from hw/xbox/mcpx/dsp.h
rename to hw/xbox/mcpx/dsp/gp_ep.h
index 7bf49f4f11..772aba5054 100644
--- a/hw/xbox/mcpx/dsp.h
+++ b/hw/xbox/mcpx/dsp/gp_ep.h
@@ -18,18 +18,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef HW_XBOX_MCPX_APU_DSP_H
-#define HW_XBOX_MCPX_APU_DSP_H
+#ifndef HW_XBOX_MCPX_APU_GP_EP_H
+#define HW_XBOX_MCPX_APU_GP_EP_H
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/xbox/mcpx/apu_regs.h"
 
-#include "dsp/dsp.h"
-#include "dsp/dsp_dma.h"
-#include "dsp/dsp_cpu.h"
-#include "dsp/dsp_state.h"
+#include "dsp.h"
+#include "dsp_dma.h"
+#include "dsp_cpu.h"
+#include "dsp_state.h"
 
 typedef struct MCPXAPUState MCPXAPUState;
 
diff --git a/hw/xbox/mcpx/dsp/meson.build b/hw/xbox/mcpx/dsp/meson.build
index 4e06c59496..4d973c6797 100644
--- a/hw/xbox/mcpx/dsp/meson.build
+++ b/hw/xbox/mcpx/dsp/meson.build
@@ -1,2 +1,4 @@
 libdsp = static_library('dsp', files(['debug.c', 'dsp.c', 'dsp_cpu.c', 'dsp_dma.c']) + genh)
 dsp = declare_dependency(objects: libdsp.extract_all_objects(recursive: false))
+
+mcpx_ss.add(dsp, files('gp_ep.c'))
diff --git a/hw/xbox/mcpx/meson.build b/hw/xbox/mcpx/meson.build
index 2cf8916f92..7393d30e56 100644
--- a/hw/xbox/mcpx/meson.build
+++ b/hw/xbox/mcpx/meson.build
@@ -1,13 +1,12 @@
-subdir('dsp')
 
 mcpx_ss = ss.source_set()
-mcpx_ss.add(sdl, dsp, files(
+mcpx_ss.add(sdl, files(
 	'apu.c',
 	'aci.c',
 	'debug.c',
-	'dsp.c',
 	))
 
 subdir('vp')
+subdir('dsp')
 
-specific_ss.add_all(mcpx_ss)
\ No newline at end of file
+specific_ss.add_all(mcpx_ss)