[WIP] Start on current xkit development

Adaptions for the latest xkit C API changes