Fixed some extra includes in the wrong place.