Clean up dependencies inclusions [Fixes #72246792 #72247514]