Splits one-file dependencies
Fixed warnings