Fixed issues with package dependencies and includes