Removed redundant header inclusions