Merge branch 'ep/guard-kset-tar-headers'

Code clean-up. * ep/guard-kset-tar-headers: kset.h, tar.h: add missing header guard to prevent multiple inclusion