Fix dependency inclusion logic