Some unnecessary #include and messages removed.

8 files changed