Removed unnecessary #include's (yes, another one of these).