Removed redundant header includes.