Headers are now in device specific