Adding packages dependencies and removing unused includes