Fix files to reflect device.mk