Removed some unnecessary #include directives