diff --git a/hw/xbox/Makefile.objs b/hw/xbox/Makefile.objs
index d33e89902b..6938798715 100644
--- a/hw/xbox/Makefile.objs
+++ b/hw/xbox/Makefile.objs
@@ -1,12 +1,12 @@
-obj-y += xbox.o chihiro.o
+obj-y += xbox.o
+obj-y += chihiro.o
 obj-y += xbox_pci.o acpi_xbox.o
 obj-y += amd_smbus.o smbus_xbox_smc.o smbus_cx25871.o smbus_adm1032.o
 obj-y += nvnet.o
-obj-y += nv2a.o nv2a_vsh.o nv2a_psh.o nv2a_shaders.o nv2a_debug.o
-obj-y += swizzle.o g-lru-cache.o
 obj-y += mcpx_apu.o mcpx_aci.o
 obj-y += lpc47m157.o
-obj-y += xid.o
+obj-y += xid.o xid-sdl.o
 obj-y += chihiro-usb.o
 
 obj-y += dsp/
+obj-y += nv2a/