[kodi] (3 commits) ...Fix build