Removed redundant includes and made sure that only critical includes are used.