Removed unnecessary dependencies and corrected an include bug