delos3geur: kill the device headers, again

Change-Id: I962f8bff946af266b954db4ce15d666125e0d690