Removed some extra includes, which would probably increase build time.