Remove extra includes