Mark dependency shims, fixes #6