Removed unneeded hard-included dependencies
47 files changed