Remove generic headers with inline kernel conflicts