Fix dependency declarations in between files, should help with #19.