remove some unnecessary #includes from headers