Removed superfluous includes from some header-files.