Removed some superfluous header inclusions