Removed some unnecessary includes that redeclare functions