Going forward all files should have @kind (see: gh-4805)