Adding dependencies and removing unused includes