Removing unnecessary #include directives