Some general cleanup of header imports