Remove unneeded header inclusions