Remove unnecessary #include changes