158 files changed, 20262 insertions, 11847 deletions

diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake
index 7fb5aba..11cf190 100644
--- a/xbmc/addons/AddonBindings.cmake
+++ b/xbmc/addons/AddonBindings.cmake
@@ -1,15 +1,12 @@
 # List contains only add-on related headers not present in
-# ./addons/kodi-addon-dev-kit/include/kodi
+# ./addons/kodi-dev-kit/include/kodi
 #
 
 # Keep this in alphabetical order
 set(CORE_ADDON_BINDINGS_FILES
-    ${CORE_SOURCE_DIR}/xbmc/cores/AudioEngine/Utils/AEChannelData.h
-    ${CORE_SOURCE_DIR}/xbmc/input/actions/ActionIDs.h
-    ${CORE_SOURCE_DIR}/xbmc/input/XBMC_vkeys.h
 )
 
 set(CORE_ADDON_BINDINGS_DIRS
-    ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/
+    ${CORE_SOURCE_DIR}/xbmc/addons/kodi-dev-kit/include/kodi/
     ${CORE_SOURCE_DIR}/xbmc/cores/VideoPlayer/Interface/Addon
 )
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
deleted file mode 100644
index 25e39e2..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-#ifdef BUILD_KODI_ADDON
-#include "../AEChannelData.h"
-#else
-#include "cores/AudioEngine/Utils/AEChannelData.h"
-#endif
-#include <stdint.h>
-
-namespace kodi
-{
-namespace addon
-{
-  class CInstanceAudioDecoder;
-} /* namespace addon */
-} /* namespace kodi */
-
-extern "C"
-{
-
-typedef struct AddonProps_AudioDecoder
-{
-  int dummy;
-} AddonProps_AudioDecoder;
-
-typedef struct AddonToKodiFuncTable_AudioDecoder
-{
-  void* kodiInstance;
-} AddonToKodiFuncTable_AudioDecoder;
-
-struct AddonInstance_AudioDecoder;
-typedef struct KodiToAddonFuncTable_AudioDecoder
-{
-  kodi::addon::CInstanceAudioDecoder* addonInstance;
-  bool (__cdecl* init)(const AddonInstance_AudioDecoder* instance,
-                       const char* file, unsigned int filecache,
-                       int* channels, int* samplerate,
-                       int* bitspersample, int64_t* totaltime,
-                       int* bitrate, AEDataFormat* format,
-                       const AEChannel** info);
-  int  (__cdecl* read_pcm)(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize);
-  int64_t  (__cdecl* seek)(const AddonInstance_AudioDecoder* instance, int64_t time);
-  bool (__cdecl* read_tag)(const AddonInstance_AudioDecoder* instance,
-                           const char* file, char* title,
-                           char* artist, int* length);
-  int  (__cdecl* track_count)(const AddonInstance_AudioDecoder* instance, const char* file);
-} KodiToAddonFuncTable_AudioDecoder;
-
-typedef struct AddonInstance_AudioDecoder
-{
-  AddonProps_AudioDecoder props;
-  AddonToKodiFuncTable_AudioDecoder toKodi;
-  KodiToAddonFuncTable_AudioDecoder toAddon;
-} AddonInstance_AudioDecoder;
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-//==============================================================================
-///
-/// \addtogroup cpp_kodi_addon_audiodecoder
-/// @brief \cpp_class{ kodi::addon::CInstanceAudioDecoder }
-/// **Audio decoder add-on instance**
-///
-/// For audio decoders as binary add-ons. This class implements a way to handle
-/// special types of audio files.
-///
-/// The add-on handles loading of the source file and outputting the audio stream
-/// for consumption by the player.
-///
-/// The addon.xml defines the capabilities of this add-on.
-///
-/// @note The option to have multiple instances is possible with audio-decoder
-/// add-ons. This is useful, since some playback engines are riddled by global
-/// variables, making decoding of multiple streams using the same instance
-/// impossible.
-///
-///
-/// ----------------------------------------------------------------------------
-///
-/// **Here's an example on addon.xml:**
-/// ~~~~~~~~~~~~~{.xml}
-///   <extension
-///     point="kodi.audiodecoder"
-///     name="2sf"
-///     extension=".2sf|.mini2sf"
-///     tags="true"
-///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
-/// ~~~~~~~~~~~~~
-///
-/// Description to audio decoder related addon.xml values:
-/// | Name                          | Description
-/// |:------------------------------|----------------------------------------
-/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.audiodecoder"</b>.
-/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
-/// | <b>`name`</b>                 | The name of the decoder used in Kodi for display.
-/// | <b>`extension`</b>            | The file extensions / styles supported by this addon.
-/// | <b>`tags`</b>                 | Boolean to point out that addon can bring own information to replayed file, if <b>`false`</b> only the file name is used as info.<br>If <b>`true`</b>, \ref CInstanceAudioDecoder::ReadTag is used and must be implemented.
-///
-/// --------------------------------------------------------------------------
-///
-/// **Here is a code example how this addon is used:**
-///
-/// ~~~~~~~~~~~~~{.cpp}
-/// #include <kodi/addon-instance/AudioDecoder.h>
-///
-/// class CMyAudioDecoder : public ::kodi::addon::CInstanceAudioDecoder
-/// {
-/// public:
-///   CMyAudioDecoder(KODI_HANDLE instance);
-///
-///   bool Init(const std::string& filename, unsigned int filecache,
-///             int& channels, int& samplerate,
-///             int& bitspersample, int64_t& totaltime,
-///             int& bitrate, AEDataFormat& format,
-///             std::vector<AEChannel>& channellist) override;
-///   int ReadPCM(uint8_t* buffer, int size, int& actualsize) override;
-/// };
-///
-/// CMyAudioDecoder::CMyAudioDecoder(KODI_HANDLE instance)
-///   : CInstanceAudioDecoder(instance)
-/// {
-///   ...
-/// }
-///
-/// bool CMyAudioDecoder::Init(const std::string& filename, unsigned int filecache,
-///                            int& channels, int& samplerate,
-///                            int& bitspersample, int64_t& totaltime,
-///                            int& bitrate, AEDataFormat& format,
-///                            std::vector<AEChannel>& channellist)
-/// {
-///   ...
-///   return true;
-/// }
-///
-/// int CMyAudioDecoder::ReadPCM(uint8_t* buffer, int size, int& actualsize)
-/// {
-///   ...
-///   return 0;
-/// }
-///
-///
-/// /*----------------------------------------------------------------------*/
-///
-/// class CMyAddon : public ::kodi::addon::CAddonBase
-/// {
-/// public:
-///   CMyAddon() { }
-///   ADDON_STATUS CreateInstance(int instanceType,
-///                               std::string instanceID,
-///                               KODI_HANDLE instance,
-///                               KODI_HANDLE& addonInstance) override;
-/// };
-///
-/// /* If you use only one instance in your add-on, can be instanceType and
-///  * instanceID ignored */
-/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
-///                                       std::string instanceID,
-///                                       KODI_HANDLE instance,
-///                                       KODI_HANDLE& addonInstance)
-/// {
-///   if (instanceType == ADDON_INSTANCE_AUDIODECODER)
-///   {
-///     kodi::Log(ADDON_LOG_NOTICE, "Creating my audio decoder");
-///     addonInstance = new CMyAudioDecoder(instance);
-///     return ADDON_STATUS_OK;
-///   }
-///   else if (...)
-///   {
-///     ...
-///   }
-///   return ADDON_STATUS_UNKNOWN;
-/// }
-///
-/// ADDONCREATOR(CMyAddon)
-/// ~~~~~~~~~~~~~
-///
-/// The destruction of the example class `CMyAudioDecoder` is called from
-/// Kodi's header. Manually deleting the add-on instance is not required.
-///
-class ATTRIBUTE_HIDDEN CInstanceAudioDecoder : public IAddonInstance
-{
-public:
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Class constructor
-  ///
-  /// @param[in] instance The addon instance class handler given by Kodi
-  ///                     at \ref kodi::addon::CAddonBase::CreateInstance(...)
-  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
-  ///                        allow compatibility to older Kodi versions.
-  ///                        @note Recommended to set.
-  ///
-  explicit CInstanceAudioDecoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
-    : IAddonInstance(ADDON_INSTANCE_AUDIODECODER,
-                     !kodiVersion.empty() ? kodiVersion
-                                          : GetKodiTypeVersion(ADDON_INSTANCE_AUDIODECODER))
-  {
-    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation of multiple together with single instance way is not allowed!");
-
-    SetAddonStruct(instance);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Initialize a decoder
-  ///
-  /// @param[in] filename             The file to read
-  /// @param[in] filecache            The file cache size
-  /// @param[out] channels            Number of channels in output stream
-  /// @param[out] samplerate          Samplerate of output stream
-  /// @param[out] bitspersample       Bits per sample in output stream
-  /// @param[out] totaltime           Total time for stream
-  /// @param[out] bitrate             Average bitrate of input stream
-  /// @param[out] format              Data format for output stream
-  /// @param[out] channellist         Channel mapping for output stream
-  /// @return                         true if successfully done, otherwise
-  ///                                 false
-  ///
-  virtual bool Init(const std::string& filename, unsigned int filecache,
-                    int& channels, int& samplerate,
-                    int& bitspersample, int64_t& totaltime,
-                    int& bitrate, AEDataFormat& format,
-                    std::vector<AEChannel>& channellist) = 0;
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Produce some noise
-  ///
-  /// @param[in] buffer               Output buffer
-  /// @param[in] size                 Size of output buffer
-  /// @param[out] actualsize          Actual number of bytes written to output buffer
-  /// @return                         Return with following possible values:
-  ///                                 | Value | Description                  |
-  ///                                 |:-----:|:-----------------------------|
-  ///                                 |   0   | on success
-  ///                                 |  -1   | on end of stream
-  ///                                 |   1   | on failure
-  ///
-  virtual int ReadPCM(uint8_t* buffer, int size, int& actualsize) = 0;
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Seek in output stream
-  ///
-  /// @param[in] time                 Time position to seek to in milliseconds
-  /// @return                         Time position seek ended up on
-  ///
-  virtual int64_t Seek(int64_t time) { return time; }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Read tag of a file
-  ///
-  /// @param[in] file                 File to read tag for
-  /// @param[out] title               Title of file
-  /// @param[out] artist              Artist of file
-  /// @param[out] length              Length of file
-  /// @return                         True on success, false on failure
-  ///
-  virtual bool ReadTag(const std::string& file, std::string& title, std::string& artist, int& length) { return false; }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  /// @ingroup cpp_kodi_addon_audiodecoder
-  /// @brief Get number of tracks in a file
-  ///
-  /// @param[in] file                 File to read tag for
-  /// @return                         Number of tracks in file
-  ///
-  virtual int TrackCount(const std::string& file) { return 1; }
-  //--------------------------------------------------------------------------
-
-private:
-  void SetAddonStruct(KODI_HANDLE instance)
-  {
-    if (instance == nullptr)
-      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-    m_instanceData = static_cast<AddonInstance_AudioDecoder*>(instance);
-
-    m_instanceData->toAddon.addonInstance = this;
-    m_instanceData->toAddon.init = ADDON_Init;
-    m_instanceData->toAddon.read_pcm = ADDON_ReadPCM;
-    m_instanceData->toAddon.seek = ADDON_Seek;
-    m_instanceData->toAddon.read_tag = ADDON_ReadTag;
-    m_instanceData->toAddon.track_count = ADDON_TrackCount;
-  }
-
-  inline static bool ADDON_Init(const AddonInstance_AudioDecoder* instance, const char* file, unsigned int filecache,
-                                int* channels, int* samplerate,
-                                int* bitspersample, int64_t* totaltime,
-                                int* bitrate, AEDataFormat* format,
-                                const AEChannel** info)
-  {
-    instance->toAddon.addonInstance->m_channelList.clear();
-    bool ret = instance->toAddon.addonInstance->Init(file, filecache, *channels,
-                                                          *samplerate, *bitspersample,
-                                                          *totaltime, *bitrate, *format,
-                                                          instance->toAddon.addonInstance->m_channelList);
-    if (!instance->toAddon.addonInstance->m_channelList.empty())
-    {
-      if (instance->toAddon.addonInstance->m_channelList.back() != AE_CH_NULL)
-        instance->toAddon.addonInstance->m_channelList.push_back(AE_CH_NULL);
-      *info = instance->toAddon.addonInstance->m_channelList.data();
-    }
-    else
-      *info = nullptr;
-    return ret;
-  }
-
-  inline static int ADDON_ReadPCM(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize)
-  {
-    return instance->toAddon.addonInstance->ReadPCM(buffer, size, *actualsize);
-  }
-
-  inline static int64_t ADDON_Seek(const AddonInstance_AudioDecoder* instance, int64_t time)
-  {
-    return instance->toAddon.addonInstance->Seek(time);
-  }
-
-  inline static bool ADDON_ReadTag(const AddonInstance_AudioDecoder* instance, const char* file, char* title, char* artist, int* length)
-  {
-    std::string intTitle;
-    std::string intArtist;
-    bool ret = instance->toAddon.addonInstance->ReadTag(file, intTitle, intArtist, *length);
-    if (ret)
-    {
-      strncpy(title, intTitle.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
-      strncpy(artist, intArtist.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
-    }
-    return ret;
-  }
-
-  inline static int ADDON_TrackCount(const AddonInstance_AudioDecoder* instance, const char* file)
-  {
-    return instance->toAddon.addonInstance->TrackCount(file);
-  }
-
-  std::vector<AEChannel> m_channelList;
-  AddonInstance_AudioDecoder* m_instanceData;
-};
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
deleted file mode 100644
index 36257e1..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-
-namespace kodi { namespace addon { class CInstanceAudioEncoder; }}
-
-extern "C"
-{
-
-  typedef struct AddonProps_AudioEncoder
-  {
-    int dummy;
-  } AddonProps_AudioEncoder;
-
-  typedef struct AddonToKodiFuncTable_AudioEncoder
-  {
-    void* kodiInstance;
-    int (*write) (void* kodiInstance, const uint8_t* data, int len);
-    int64_t (*seek)(void* kodiInstance, int64_t pos, int whence);
-  } AddonToKodiFuncTable_AudioEncoder;
-
-  struct AddonInstance_AudioEncoder;
-  typedef struct KodiToAddonFuncTable_AudioEncoder
-  {
-    kodi::addon::CInstanceAudioEncoder* addonInstance;
-    bool (__cdecl* start) (const AddonInstance_AudioEncoder* instance, int in_channels, int in_rate, int in_bits,
-                           const char* title, const char* artist,
-                           const char* albumartist, const char* album,
-                           const char* year, const char* track,
-                           const char* genre, const char* comment,
-                           int track_length);
-    int  (__cdecl* encode) (const AddonInstance_AudioEncoder* instance, int num_bytes_read, const uint8_t* pbt_stream);
-    bool (__cdecl* finish) (const AddonInstance_AudioEncoder* instance);
-  } KodiToAddonFuncTable_AudioEncoder;
-
-  typedef struct AddonInstance_AudioEncoder
-  {
-    AddonProps_AudioEncoder props;
-    AddonToKodiFuncTable_AudioEncoder toKodi;
-    KodiToAddonFuncTable_AudioEncoder toAddon;
-  } AddonInstance_AudioEncoder;
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-  class ATTRIBUTE_HIDDEN CInstanceAudioEncoder : public IAddonInstance
-  {
-  public:
-    //==========================================================================
-    /// @brief Class constructor
-    ///
-    /// @param[in] instance             The from Kodi given instance given be
-    ///                                 add-on CreateInstance call with instance
-    ///                                 id ADDON_INSTANCE_AUDIOENCODER.
-    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
-    ///                        allow compatibility to older Kodi versions.
-    ///                        @note Recommended to set.
-    ///
-    explicit CInstanceAudioEncoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
-      : IAddonInstance(ADDON_INSTANCE_AUDIOENCODER,
-                       !kodiVersion.empty() ? kodiVersion
-                                            : GetKodiTypeVersion(ADDON_INSTANCE_AUDIOENCODER))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// \brief Start encoder (**required**)
-    ///
-    /// \param[in] inChannels           Number of channels
-    /// \param[in] inRate               Sample rate of input data
-    /// \param[in] inBits               Bits per sample in input data
-    /// \param[in] title                The title of the song
-    /// \param[in] artist               The artist of the song
-    /// \param[in] albumartist          The albumartist of the song
-    /// \param[in] year                 The year of the song
-    /// \param[in] track                The track number of the song
-    /// \param[in] genre                The genre of the song
-    /// \param[in] comment              A comment to attach to the song
-    /// \param[in] trackLength          Total track length in seconds
-    /// \return                         True on success, false on failure.
-    ///
-    virtual bool Start(int inChannels,
-                       int inRate,
-                       int inBits,
-                       const std::string& title,
-                       const std::string& artist,
-                       const std::string& albumartist,
-                       const std::string& album,
-                       const std::string& year,
-                       const std::string& track,
-                       const std::string& genre,
-                       const std::string& comment,
-                       int trackLength) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// \brief Encode a chunk of audio (**required**)
-    ///
-    /// \param[in] numBytesRead         Number of bytes in input buffer
-    /// \param[in] pbtStream            the input buffer
-    /// \return                         Number of bytes consumed
-    ///
-    virtual int Encode(int numBytesRead, const uint8_t* pbtStream) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// \brief Finalize encoding (**optional**)
-    ///
-    /// \return                         True on success, false on failure.
-    ///
-    virtual bool Finish() { return true; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// \brief Write block of data
-    ///
-    /// \param[in] data                 Pointer to the array of elements to be
-    ///                                 written
-    /// \param[in] length               Size in bytes to be written.
-    /// \return                         The total number of bytes
-    ///                                 successfully written is returned.
-    int Write(const uint8_t* data, int length)
-    {
-      return m_instanceData->toKodi.write(m_instanceData->toKodi.kodiInstance, data, length);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// \brief Set the file's current position.
-    ///
-    /// The whence argument is optional and defaults to SEEK_SET (0)
-    ///
-    /// \param[in] position             the position that you want to seek to
-    /// \param[in] whence               [optional] offset relative to
-    ///                                 You can set the value of whence to one
-    ///                                 of three things:
-    ///  |   Value  | int | Description                                        |
-    ///  |:--------:|:---:|:---------------------------------------------------|
-    ///  | SEEK_SET |  0  | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
-    ///  | SEEK_CUR |  1  | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
-    ///  | SEEK_END |  2  | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
-    ///
-    /// \return                         Returns the resulting offset location as
-    ///                                 measured in bytes from the beginning of
-    ///                                 the file. On error, the value -1 is
-    ///                                 returned.
-    int64_t Seek(int64_t position, int whence = SEEK_SET)
-    {
-      return m_instanceData->toKodi.seek(m_instanceData->toKodi.kodiInstance, position, whence);
-    }
-    //--------------------------------------------------------------------------
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_AudioEncoder*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.start = ADDON_Start;
-      m_instanceData->toAddon.encode = ADDON_Encode;
-      m_instanceData->toAddon.finish = ADDON_Finish;
-    }
-
-    inline static bool ADDON_Start(const AddonInstance_AudioEncoder* instance, int inChannels, int inRate, int inBits,
-                                   const char* title, const char* artist,
-                                   const char* albumartist, const char* album,
-                                   const char* year, const char* track,
-                                   const char* genre, const char* comment,
-                                   int trackLength)
-    {
-      return instance->toAddon.addonInstance->Start(inChannels,
-                                                    inRate,
-                                                    inBits,
-                                                    title,
-                                                    artist,
-                                                    albumartist,
-                                                    album,
-                                                    year,
-                                                    track,
-                                                    genre,
-                                                    comment,
-                                                    trackLength);
-    }
-
-    inline static int ADDON_Encode(const AddonInstance_AudioEncoder* instance, int numBytesRead, const uint8_t* pbtStream)
-    {
-      return instance->toAddon.addonInstance->Encode(numBytesRead, pbtStream);
-    }
-
-    inline static bool ADDON_Finish(const AddonInstance_AudioEncoder* instance)
-    {
-      return instance->toAddon.addonInstance->Finish();
-    }
-
-    AddonInstance_AudioEncoder* m_instanceData;
-  };
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h
deleted file mode 100644
index a53f1e7..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h
+++ /dev/null
@@ -1,2360 +0,0 @@
-/*
- *  Copyright (C) 2014-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-
-#ifdef BUILD_KODI_ADDON
-#include "XBMC_vkeys.h"
-#else
-#include "input/XBMC_vkeys.h"
-#endif
-
-//==============================================================================
-/// @addtogroup cpp_kodi_addon_game
-///
-/// To use on Libretro and for stand-alone games or emulators that does not use
-/// the Libretro API.
-///
-/// Possible examples could be, Nvidia GameStream via Limelight or WINE capture
-/// could possible through the Game API.
-///
-
-namespace kodi
-{
-namespace addon
-{
-class CInstanceGame;
-}
-} // namespace kodi
-
-extern "C"
-{
-
-//==============================================================================
-/// \defgroup cpp_kodi_addon_game_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_addon_game
-/// @brief **Game add-on instance definition values**
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Port ID used when topology is unknown**
-#define DEFAULT_PORT_ID "1"
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Game add-on error codes**
-///
-/// Used as return values on most Game related functions.
-///
-typedef enum GAME_ERROR
-{
-  /// @brief no error occurred
-  GAME_ERROR_NO_ERROR,
-
-  /// @brief an unknown error occurred
-  GAME_ERROR_UNKNOWN,
-
-  /// @brief the method that the frontend called is not implemented
-  GAME_ERROR_NOT_IMPLEMENTED,
-
-  /// @brief the command was rejected by the game client
-  GAME_ERROR_REJECTED,
-
-  /// @brief the parameters of the method that was called are invalid for this operation
-  GAME_ERROR_INVALID_PARAMETERS,
-
-  /// @brief the command failed
-  GAME_ERROR_FAILED,
-
-  /// @brief no game is loaded
-  GAME_ERROR_NOT_LOADED,
-
-  /// @brief game requires restricted resources
-  GAME_ERROR_RESTRICTED,
-} GAME_ERROR;
-//------------------------------------------------------------------------------
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_AudioStream 1. Audio stream
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **The for Audio stream used data system**
-///
-/// Used to give Addon currently used audio stream configuration on Kodi and
-/// arrays to give related data to Kodi on callbacks.
-///
-//@{
-
-//==============================================================================
-/// @brief **Stream Format**
-///
-/// From Kodi requested specified audio sample format.
-///
-typedef enum GAME_PCM_FORMAT
-{
-  GAME_PCM_FORMAT_UNKNOWN,
-
-  /// @brief S16NE sample format
-  GAME_PCM_FORMAT_S16NE,
-} GAME_PCM_FORMAT;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Audio channel**
-///
-/// Channel identification flags.
-///
-typedef enum GAME_AUDIO_CHANNEL
-{
-  /// @brief Channel list terminator
-  GAME_CH_NULL,
-
-  /// @brief Channel front left
-  GAME_CH_FL,
-
-  /// @brief Channel front right
-  GAME_CH_FR,
-
-  /// @brief Channel front center
-  GAME_CH_FC,
-
-  /// @brief Channel Low Frequency Effects / Subwoofer
-  GAME_CH_LFE,
-
-  /// @brief Channel back left
-  GAME_CH_BL,
-
-  /// @brief Channel back right
-  GAME_CH_BR,
-
-  /// @brief Channel front left over center
-  GAME_CH_FLOC,
-
-  /// @brief Channel front right over center
-  GAME_CH_FROC,
-
-  /// @brief Channel back center
-  GAME_CH_BC,
-
-  /// @brief Channel surround/side left
-  GAME_CH_SL,
-
-  /// @brief Channel surround/side right
-  GAME_CH_SR,
-
-  /// @brief Channel top front left
-  GAME_CH_TFL,
-
-  /// @brief Channel top front right
-  GAME_CH_TFR,
-
-  /// @brief Channel top front center
-  GAME_CH_TFC,
-
-  /// @brief Channel top center
-  GAME_CH_TC,
-
-  /// @brief Channel top back left
-  GAME_CH_TBL,
-
-  /// @brief Channel top back right
-  GAME_CH_TBR,
-
-  /// @brief Channel top back center
-  GAME_CH_TBC,
-
-  /// @brief Channel bacl left over center
-  GAME_CH_BLOC,
-
-  /// @brief Channel back right over center
-  GAME_CH_BROC,
-} GAME_AUDIO_CHANNEL;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Game audio stream properties**
-///
-/// Used by Kodi to pass the currently required audio stream settings to the addon
-///
-typedef struct game_stream_audio_properties
-{
-  GAME_PCM_FORMAT format;
-  const GAME_AUDIO_CHANNEL* channel_map;
-} ATTRIBUTE_PACKED game_stream_audio_properties;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Audio stream packet**
-///
-/// This packet contains audio stream data passed to Kodi.
-///
-typedef struct game_stream_audio_packet
-{
-  /// @brief Pointer for audio stream data given to Kodi
-  const uint8_t *data;
-
-  /// @brief Size of data array
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_audio_packet;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_VideoStream 2. Video stream
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **The for Video stream used data system**
-///
-/// Used to give Addon currently used video stream configuration on Kodi and
-/// arrays to give related data to Kodi on callbacks.
-///
-//@{
-
-//==============================================================================
-/// @brief **Pixel format**
-///
-/// From Kodi requested specified video RGB color model format.
-///
-typedef enum GAME_PIXEL_FORMAT
-{
-  GAME_PIXEL_FORMAT_UNKNOWN,
-
-  /// @brief 0RGB8888 Format
-  GAME_PIXEL_FORMAT_0RGB8888,
-
-  /// @brief RGB565 Format
-  GAME_PIXEL_FORMAT_RGB565,
-
-  /// @brief 0RGB1555 Format
-  GAME_PIXEL_FORMAT_0RGB1555,
-} GAME_PIXEL_FORMAT;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Video rotation position**
-///
-/// To define position how video becomes shown.
-///
-typedef enum GAME_VIDEO_ROTATION
-{
-  /// @brief 0° and Without rotation
-  GAME_VIDEO_ROTATION_0,
-
-  /// @brief rotate 90° counterclockwise
-  GAME_VIDEO_ROTATION_90_CCW,
-
-  /// @brief rotate 180° counterclockwise
-  GAME_VIDEO_ROTATION_180_CCW,
-
-  /// @brief rotate 270° counterclockwise
-  GAME_VIDEO_ROTATION_270_CCW,
-} GAME_VIDEO_ROTATION;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Game video stream properties**
-///
-/// Used by Kodi to pass the currently required video stream settings to the addon
-///
-typedef struct game_stream_video_properties
-{
-  /// @brief The to used pixel format
-  GAME_PIXEL_FORMAT format;
-
-  /// @brief The nominal used width
-  unsigned int nominal_width;
-
-  /// @brief The nominal used height
-  unsigned int nominal_height;
-
-  /// @brief The maximal used width
-  unsigned int max_width;
-
-  /// @brief The maximal used height
-  unsigned int max_height;
-
-  /// @brief On video stream used aspect ration
-  ///
-  /// @note If aspect_ratio is <= 0.0, an aspect ratio of nominal_width / nominal_height is assumed
-  float aspect_ratio;
-} ATTRIBUTE_PACKED game_stream_video_properties;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Video stream packet**
-///
-/// This packet contains video stream data passed to Kodi.
-///
-typedef struct game_stream_video_packet
-{
-  /// @brief Video height
-  unsigned int width;
-
-  /// @brief Video width
-  unsigned int height;
-
-  /// @brief Width @ref GAME_VIDEO_ROTATION defined rotation angle.
-  GAME_VIDEO_ROTATION rotation;
-
-  /// @brief Pointer for video stream data given to Kodi
-  const uint8_t *data;
-
-  /// @brief Size of data array
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_video_packet;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_HardwareFramebuffer 3. Hardware framebuffer stream
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Hardware framebuffer stream data**
-///
-//@{
-
-//==============================================================================
-/// @brief **Hardware framebuffer type**
-///
-typedef enum GAME_HW_CONTEXT_TYPE
-{
-  /// @brief None context
-  GAME_HW_CONTEXT_NONE,
-
-  /// @brief OpenGL 2.x. Driver can choose to use latest compatibility context
-  GAME_HW_CONTEXT_OPENGL,
-
-  /// @brief OpenGL ES 2.0
-  GAME_HW_CONTEXT_OPENGLES2,
-
-  /// @brief Modern desktop core GL context. Use major/minor fields to set GL version
-  GAME_HW_CONTEXT_OPENGL_CORE,
-
-  /// @brief OpenGL ES 3.0
-  GAME_HW_CONTEXT_OPENGLES3,
-
-  /// @brief OpenGL ES 3.1+. Set major/minor fields.
-  GAME_HW_CONTEXT_OPENGLES_VERSION,
-
-  /// @brief Vulkan
-  GAME_HW_CONTEXT_VULKAN
-} GAME_HW_CONTEXT_TYPE;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Hardware framebuffer properties**
-///
-typedef struct game_stream_hw_framebuffer_properties
-{
-  /// @brief The API to use.
-  ///
-  GAME_HW_CONTEXT_TYPE context_type;
-
-  /// @brief Set if render buffers should have depth component attached.
-  ///
-  /// @todo: Obsolete
-  ///
-  bool depth;
-
-  /// @brief Set if stencil buffers should be attached.
-  ///
-  /// If depth and stencil are true, a packed 24/8 buffer will be added.
-  /// Only attaching stencil is invalid and will be ignored.
-  ///
-  /// @todo: Obsolete.
-  ///
-  bool stencil;
-
-  /// @brief Use conventional bottom-left origin convention.
-  ///
-  /// If false, standard top-left origin semantics are used.
-  ///
-  /// @todo: Move to GL specific interface
-  ///
-  bool bottom_left_origin;
-
-  /// @brief Major version number for core GL context or GLES 3.1+.
-  unsigned int version_major;
-
-  /// @brief Minor version number for core GL context or GLES 3.1+.
-  unsigned int version_minor;
-
-  /// @brief If this is true, the frontend will go very far to avoid resetting context
-  /// in scenarios like toggling fullscreen, etc.
-  ///
-  /// @todo: Obsolete? Maybe frontend should just always assume this...
-  ///
-  /// The reset callback might still be called in extreme situations such as if
-  /// the context is lost beyond recovery.
-  ///
-  /// For optimal stability, set this to false, and allow context to be reset at
-  /// any time.
-  ///
-  bool cache_context;
-
-  /// @brief Creates a debug context.
-  bool debug_context;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_properties;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Hardware framebuffer buffer**
-///
-typedef struct game_stream_hw_framebuffer_buffer
-{
-  /// @brief
-  uintptr_t framebuffer;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_buffer;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Hardware framebuffer packet**
-///
-typedef struct game_stream_hw_framebuffer_packet
-{
-  /// @brief
-  uintptr_t framebuffer;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_packet;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Hardware framebuffer process function address**
-///
-typedef void (*game_proc_address_t)(void);
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_SoftwareFramebuffer 4. Software framebuffer stream
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Software framebuffer stream data**
-///
-//@{
-
-//==============================================================================
-/// @brief **Game video stream properties**
-///
-/// Used by Kodi to pass the currently required video stream settings to the addon
-///
-typedef game_stream_video_properties game_stream_sw_framebuffer_properties;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Hardware framebuffer type**
-///
-typedef struct game_stream_sw_framebuffer_buffer
-{
-  GAME_PIXEL_FORMAT format;
-  uint8_t *data;
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_sw_framebuffer_buffer;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Video stream packet**
-///
-/// This packet contains video stream data passed to Kodi.
-///
-typedef game_stream_video_packet game_stream_sw_framebuffer_packet;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_StreamTypes 5. Stream types
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Stream types data**
-///
-//@{
-
-//==============================================================================
-/// @brief **Game stream types**
-///
-typedef enum GAME_STREAM_TYPE
-{
-  /// @brief Unknown
-  GAME_STREAM_UNKNOWN,
-
-  /// @brief Audio stream
-  GAME_STREAM_AUDIO,
-
-  /// @brief Video stream
-  GAME_STREAM_VIDEO,
-
-  /// @brief Hardware framebuffer
-  GAME_STREAM_HW_FRAMEBUFFER,
-
-  /// @brief Software framebuffer
-  GAME_STREAM_SW_FRAMEBUFFER,
-} GAME_STREAM_TYPE;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Immutable stream metadata**
-///
-/// This metadata is provided when the stream is opened. If any stream
-/// properties change, a new stream must be opened.
-///
-typedef struct game_stream_properties
-{
-  /// @brief
-  GAME_STREAM_TYPE type;
-  union
-  {
-    /// @brief
-    game_stream_audio_properties audio;
-
-    /// @brief
-    game_stream_video_properties video;
-
-    /// @brief
-    game_stream_hw_framebuffer_properties hw_framebuffer;
-
-    /// @brief
-    game_stream_sw_framebuffer_properties sw_framebuffer;
-  };
-} ATTRIBUTE_PACKED game_stream_properties;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Stream buffers for hardware rendering and zero-copy support**
-///
-typedef struct game_stream_buffer
-{
-  /// @brief
-  GAME_STREAM_TYPE type;
-  union
-  {
-    /// @brief
-    game_stream_hw_framebuffer_buffer hw_framebuffer;
-
-    /// @brief
-    game_stream_sw_framebuffer_buffer sw_framebuffer;
-  };
-} ATTRIBUTE_PACKED game_stream_buffer;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Stream packet and ephemeral metadata**
-///
-/// This packet contains stream data and accompanying metadata. The metadata
-/// is ephemeral, meaning it only applies to the current packet and can change
-/// from packet to packet in the same stream.
-///
-typedef struct game_stream_packet
-{
-  /// @brief
-  GAME_STREAM_TYPE type;
-  union
-  {
-    /// @brief
-    game_stream_audio_packet audio;
-
-    /// @brief
-    game_stream_video_packet video;
-
-    /// @brief
-    game_stream_hw_framebuffer_packet hw_framebuffer;
-
-    /// @brief
-    game_stream_sw_framebuffer_packet sw_framebuffer;
-  };
-} ATTRIBUTE_PACKED game_stream_packet;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_GameTypes 6. Game types
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Game types data**
-///
-//@{
-
-//==============================================================================
-/// @brief **Game reguin definition**
-///
-/// Returned from game_get_region()
-typedef enum GAME_REGION
-{
-  /// @brief Game region unknown
-  GAME_REGION_UNKNOWN,
-
-  /// @brief Game region NTSC
-  GAME_REGION_NTSC,
-
-  /// @brief Game region PAL
-  GAME_REGION_PAL,
-} GAME_REGION;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Special game types passed into game_load_game_special().**
-///
-/// @remark Only used when multiple ROMs are required.
-///
-typedef enum SPECIAL_GAME_TYPE
-{
-  /// @brief Game Type BSX
-  SPECIAL_GAME_TYPE_BSX,
-
-  /// @brief Game Type BSX slotted
-  SPECIAL_GAME_TYPE_BSX_SLOTTED,
-
-  /// @brief Game Type sufami turbo
-  SPECIAL_GAME_TYPE_SUFAMI_TURBO,
-
-  /// @brief Game Type super game boy
-  SPECIAL_GAME_TYPE_SUPER_GAME_BOY,
-} SPECIAL_GAME_TYPE;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **Game Memory**
-///
-typedef enum GAME_MEMORY
-{
-  /// @brief Passed to game_get_memory_data/size(). If the memory type doesn't apply
-  /// to the implementation NULL/0 can be returned.
-  GAME_MEMORY_MASK = 0xff,
-
-  /// @brief Regular save ram.
-  ///
-  /// This ram is usually found on a game cartridge, backed
-  /// up by a battery. If save game data is too complex for a single memory
-  /// buffer, the SYSTEM_DIRECTORY environment callback can be used.
-  GAME_MEMORY_SAVE_RAM = 0,
-
-  /// @brief Some games have a built-in clock to keep track of time.
-  ///
-  /// This memory is usually just a couple of bytes to keep track of time.
-  GAME_MEMORY_RTC = 1,
-
-  /// @brief System ram lets a frontend peek into a game systems main RAM
-  GAME_MEMORY_SYSTEM_RAM = 2,
-
-  /// @brief Video ram lets a frontend peek into a game systems video RAM (VRAM)
-  GAME_MEMORY_VIDEO_RAM = 3,
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_BSX_RAM = ((1 << 8) | GAME_MEMORY_SAVE_RAM),
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_BSX_PRAM = ((2 << 8) | GAME_MEMORY_SAVE_RAM),
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_SUFAMI_TURBO_A_RAM = ((3 << 8) | GAME_MEMORY_SAVE_RAM),
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_SUFAMI_TURBO_B_RAM = ((4 << 8) | GAME_MEMORY_SAVE_RAM),
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_GAME_BOY_RAM = ((5 << 8) | GAME_MEMORY_SAVE_RAM),
-
-  /// @brief Special memory type
-  GAME_MEMORY_SNES_GAME_BOY_RTC = ((6 << 8) | GAME_MEMORY_RTC),
-} GAME_MEMORY;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief **ID values for SIMD CPU features**
-typedef enum GAME_SIMD
-{
-  /// @brief SIMD CPU SSE
-  GAME_SIMD_SSE = (1 << 0),
-
-  /// @brief SIMD CPU SSE2
-  GAME_SIMD_SSE2 = (1 << 1),
-
-  /// @brief SIMD CPU VMX
-  GAME_SIMD_VMX = (1 << 2),
-
-  /// @brief SIMD CPU VMX128
-  GAME_SIMD_VMX128 = (1 << 3),
-
-  /// @brief SIMD CPU AVX
-  GAME_SIMD_AVX = (1 << 4),
-
-  /// @brief SIMD CPU NEON
-  GAME_SIMD_NEON = (1 << 5),
-
-  /// @brief SIMD CPU SSE3
-  GAME_SIMD_SSE3 = (1 << 6),
-
-  /// @brief SIMD CPU SSSE3
-  GAME_SIMD_SSSE3 = (1 << 7),
-
-  /// @brief SIMD CPU MMX
-  GAME_SIMD_MMX = (1 << 8),
-
-  /// @brief SIMD CPU MMXEXT
-  GAME_SIMD_MMXEXT = (1 << 9),
-
-  /// @brief SIMD CPU SSE4
-  GAME_SIMD_SSE4 = (1 << 10),
-
-  /// @brief SIMD CPU SSE42
-  GAME_SIMD_SSE42 = (1 << 11),
-
-  /// @brief SIMD CPU AVX2
-  GAME_SIMD_AVX2 = (1 << 12),
-
-  /// @brief SIMD CPU VFPU
-  GAME_SIMD_VFPU = (1 << 13),
-} GAME_SIMD;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_InputTypes 7. Input types
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Input types**
-///
-//@{
-
-//==============================================================================
-/// @brief
-typedef enum GAME_INPUT_EVENT_SOURCE
-{
-  /// @brief
-  GAME_INPUT_EVENT_DIGITAL_BUTTON,
-
-  /// @brief
-  GAME_INPUT_EVENT_ANALOG_BUTTON,
-
-  /// @brief
-  GAME_INPUT_EVENT_AXIS,
-
-  /// @brief
-  GAME_INPUT_EVENT_ANALOG_STICK,
-
-  /// @brief
-  GAME_INPUT_EVENT_ACCELEROMETER,
-
-  /// @brief
-  GAME_INPUT_EVENT_KEY,
-
-  /// @brief
-  GAME_INPUT_EVENT_RELATIVE_POINTER,
-
-  /// @brief
-  GAME_INPUT_EVENT_ABSOLUTE_POINTER,
-
-  /// @brief
-  GAME_INPUT_EVENT_MOTOR,
-} GAME_INPUT_EVENT_SOURCE;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef enum GAME_KEY_MOD
-{
-  /// @brief
-  GAME_KEY_MOD_NONE = 0x0000,
-
-  /// @brief
-  GAME_KEY_MOD_SHIFT = 0x0001,
-
-  /// @brief
-  GAME_KEY_MOD_CTRL = 0x0002,
-
-  /// @brief
-  GAME_KEY_MOD_ALT = 0x0004,
-
-  /// @brief
-  GAME_KEY_MOD_META = 0x0008,
-
-  /// @brief
-  GAME_KEY_MOD_SUPER = 0x0010,
-
-  /// @brief
-  GAME_KEY_MOD_NUMLOCK = 0x0100,
-
-  /// @brief
-  GAME_KEY_MOD_CAPSLOCK = 0x0200,
-
-  /// @brief
-  GAME_KEY_MOD_SCROLLOCK = 0x0400,
-} GAME_KEY_MOD;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief Type of port on the virtual game console
-typedef enum GAME_PORT_TYPE
-{
-  /// @brief Game port unknown
-  GAME_PORT_UNKNOWN,
-
-  /// @brief Game port Keyboard
-  GAME_PORT_KEYBOARD,
-
-  /// @brief Game port mouse
-  GAME_PORT_MOUSE,
-
-  /// @brief Game port controller
-  GAME_PORT_CONTROLLER,
-} GAME_PORT_TYPE;
-//------------------------------------------------------------------------------
-
-/*! \cond PRIVATE */
-/*!
-  * @brief "C" Game add-on controller layout.
-  *
-  * Structure used to interface in "C" between Kodi and Addon.
-  *
-  * See @ref AddonGameControllerLayout for description of values.
-  */
-typedef struct game_controller_layout
-{
-  char* controller_id;
-  bool provides_input; // False for multitaps
-  char** digital_buttons;
-  unsigned int digital_button_count;
-  char** analog_buttons;
-  unsigned int analog_button_count;
-  char** analog_sticks;
-  unsigned int analog_stick_count;
-  char** accelerometers;
-  unsigned int accelerometer_count;
-  char** keys;
-  unsigned int key_count;
-  char** rel_pointers;
-  unsigned int rel_pointer_count;
-  char** abs_pointers;
-  unsigned int abs_pointer_count;
-  char** motors;
-  unsigned int motor_count;
-} ATTRIBUTE_PACKED game_controller_layout;
- /*! \endcond */
-
-//==============================================================================
-/// @brief
-struct AddonGameControllerLayout
-{
-  /*! \cond PRIVATE */
-  explicit AddonGameControllerLayout() = default;
-  AddonGameControllerLayout(const game_controller_layout& layout)
-  {
-    controller_id = layout.controller_id;
-    provides_input = layout.provides_input;
-    for (unsigned int i = 0; i < layout.digital_button_count; ++i)
-      digital_buttons.push_back(layout.digital_buttons[i]);
-    for (unsigned int i = 0; i < layout.analog_button_count; ++i)
-      analog_buttons.push_back(layout.analog_buttons[i]);
-    for (unsigned int i = 0; i < layout.analog_stick_count; ++i)
-      analog_sticks.push_back(layout.analog_sticks[i]);
-    for (unsigned int i = 0; i < layout.accelerometer_count; ++i)
-      accelerometers.push_back(layout.accelerometers[i]);
-    for (unsigned int i = 0; i < layout.key_count; ++i)
-      keys.push_back(layout.keys[i]);
-    for (unsigned int i = 0; i < layout.rel_pointer_count; ++i)
-      rel_pointers.push_back(layout.rel_pointers[i]);
-    for (unsigned int i = 0; i < layout.abs_pointer_count; ++i)
-      abs_pointers.push_back(layout.abs_pointers[i]);
-    for (unsigned int i = 0; i < layout.motor_count; ++i)
-      motors.push_back(layout.motors[i]);
-  }
-  /*! \endcond */
-
-  /// @brief
-  std::string controller_id;
-
-  /// @brief False for multitaps
-  bool provides_input;
-
-  /// @brief
-  std::vector<std::string> digital_buttons;
-
-  /// @brief
-  std::vector<std::string> analog_buttons;
-
-  /// @brief
-  std::vector<std::string> analog_sticks;
-
-  /// @brief
-  std::vector<std::string> accelerometers;
-
-  /// @brief
-  std::vector<std::string> keys;
-
-  /// @brief
-  std::vector<std::string> rel_pointers;
-
-  /// @brief
-  std::vector<std::string> abs_pointers;
-
-  /// @brief
-  std::vector<std::string> motors;
-};
-//------------------------------------------------------------------------------
-
-struct game_input_port;
-
-//==============================================================================
-/// @brief Device that can provide input
-typedef struct game_input_device
-{
-  /// @brief ID used in the Kodi controller API
-  const char* controller_id;
-
-  /// @brief
-  const char* port_address;
-
-  /// @brief
-  game_input_port* available_ports;
-
-  /// @brief
-  unsigned int port_count;
-} ATTRIBUTE_PACKED game_input_device;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief Port that can provide input
-///
-/// Ports can accept multiple devices and devices can have multiple ports, so
-/// the topology of possible configurations is a tree structure of alternating
-/// port and device nodes.
-///
-typedef struct game_input_port
-{
-  /// @brief
-  GAME_PORT_TYPE type;
-
-  /// @brief Required for GAME_PORT_CONTROLLER type
-  const char* port_id;
-
-  /// @brief
-  game_input_device* accepted_devices;
-
-  /// @brief
-  unsigned int device_count;
-} ATTRIBUTE_PACKED game_input_port;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief The input topology is the possible ways to connect input devices
-///
-/// This represents the logical topology, which is the possible connections that
-/// the game client's logic can handle. It is strictly a subset of the physical
-/// topology. Loops are not allowed.
-///
-typedef struct game_input_topology
-{
-  /// @brief The list of ports on the virtual game console
-  game_input_port *ports;
-
-  /// @brief The number of ports
-  unsigned int port_count;
-
-  /// @brief A limit on the number of input-providing devices, or -1 for no limit
-  int player_limit;
-} ATTRIBUTE_PACKED game_input_topology;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_digital_button_event
-{
-  /// @brief
-  bool pressed;
-} ATTRIBUTE_PACKED game_digital_button_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_analog_button_event
-{
-  /// @brief
-  float magnitude;
-} ATTRIBUTE_PACKED game_analog_button_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_axis_event
-{
-  /// @brief
-  float position;
-} ATTRIBUTE_PACKED game_axis_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_analog_stick_event
-{
-  /// @brief
-  float x;
-
-  /// @brief
-  float y;
-} ATTRIBUTE_PACKED game_analog_stick_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_accelerometer_event
-{
-  /// @brief
-  float x;
-
-  /// @brief
-  float y;
-
-  /// @brief
-  float z;
-} ATTRIBUTE_PACKED game_accelerometer_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_key_event
-{
-  /// @brief
-  bool pressed;
-
-  /// @brief If the keypress generates a printing character
-  ///
-  /// The unicode value contains the character generated. If the key is a
-  /// non-printing character, e.g. a function or arrow key, the unicode value
-  /// is zero.
-  uint32_t unicode;
-
-  /// @brief
-  GAME_KEY_MOD modifiers;
-} ATTRIBUTE_PACKED game_key_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_rel_pointer_event
-{
-  /// @brief
-  int x;
-
-  /// @brief
-  int y;
-} ATTRIBUTE_PACKED game_rel_pointer_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_abs_pointer_event
-{
-  /// @brief
-  bool pressed;
-
-  /// @brief
-  float x;
-
-  /// @brief
-  float y;
-} ATTRIBUTE_PACKED game_abs_pointer_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_motor_event
-{
-  /// @brief
-  float magnitude;
-} ATTRIBUTE_PACKED game_motor_event;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// @brief
-typedef struct game_input_event
-{
-  /// @brief
-  GAME_INPUT_EVENT_SOURCE type;
-
-  /// @brief
-  const char* controller_id;
-
-  /// @brief
-  GAME_PORT_TYPE port_type;
-
-  /// @brief
-  const char* port_address;
-
-  /// @brief
-  const char* feature_name;
-  union {
-    /// @brief
-    struct game_digital_button_event digital_button;
-
-    /// @brief
-    struct game_analog_button_event analog_button;
-
-    /// @brief
-    struct game_axis_event axis;
-
-    /// @brief
-    struct game_analog_stick_event analog_stick;
-
-    /// @brief
-    struct game_accelerometer_event accelerometer;
-
-    /// @brief
-    struct game_key_event key;
-
-    /// @brief
-    struct game_rel_pointer_event rel_pointer;
-
-    /// @brief
-    struct game_abs_pointer_event abs_pointer;
-
-    /// @brief
-    struct game_motor_event motor;
-  };
-} ATTRIBUTE_PACKED game_input_event;
-//------------------------------------------------------------------------------
-
-//@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-/// \defgroup cpp_kodi_addon_game_Defs_EnvironmentTypes 8. Environment types
-/// \ingroup cpp_kodi_addon_game_Defs
-/// @brief **Environment types**
-///
-//@{
-
-//==============================================================================
-/// @brief Game system timing
-///
-struct game_system_timing
-{
-  /// @brief FPS of video content.
-  double fps;
-
-  /// @brief Sampling rate of audio.
-  double sample_rate;
-};
-//------------------------------------------------------------------------------
-
-//@}
-
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-/*!
- * @brief Game properties
- *
-  * Not to be used outside this header.
- */
-typedef struct AddonProps_Game
-{
-  /*!
-    * The path of the game client being loaded.
-    */
-  const char* game_client_dll_path;
-
-  /*!
-    * Paths to proxy DLLs used to load the game client.
-    */
-  const char** proxy_dll_paths;
-
-  /*!
-    * Number of proxy DLL paths provided.
-    */
-  unsigned int proxy_dll_count;
-
-  /*!
-  * The "system" directories of the frontend. These directories can be used to
-  * store system-specific ROMs such as BIOSes, configuration data, etc.
-  */
-  const char** resource_directories;
-
-  /*!
-   * Number of resource directories provided
-   */
-  unsigned int resource_directory_count;
-
-  /*!
-   * The writable directory of the frontend. This directory can be used to store
-   * SRAM, memory cards, high scores, etc, if the game client cannot use the
-   * regular memory interface, GetMemoryData().
-   */
-  const char* profile_directory;
-
-  /*!
-   * The value of the <supports_vfs> property from addon.xml
-   */
-  bool supports_vfs;
-
-  /*!
-   * The extensions in the <extensions> property from addon.xml
-   */
-  const char** extensions;
-
-  /*!
-   * Number of extensions provided
-   */
-  unsigned int extension_count;
-} AddonProps_Game;
-
-typedef AddonProps_Game game_client_properties;
-
-/*! Structure to transfer the methods from kodi_game_dll.h to Kodi */
-
-struct AddonInstance_Game;
-
-/*!
- * @brief Game callbacks
- *
- * Not to be used outside this header.
- */
-typedef struct AddonToKodiFuncTable_Game
-{
-  KODI_HANDLE kodiInstance;
-
-  void (*CloseGame)(void* kodiInstance);
-  void* (*OpenStream)(void*, const game_stream_properties*);
-  bool (*GetStreamBuffer)(void*, void*, unsigned int, unsigned int, game_stream_buffer*);
-  void (*AddStreamData)(void*, void*, const game_stream_packet*);
-  void (*ReleaseStreamBuffer)(void*, void*, game_stream_buffer*);
-  void (*CloseStream)(void*, void*);
-  game_proc_address_t (*HwGetProcAddress)(void* kodiInstance, const char* symbol);
-  bool (*InputEvent)(void* kodiInstance, const game_input_event* event);
-} AddonToKodiFuncTable_Game;
-
-/*!
- * @brief Game function hooks
- *
- * Not to be used outside this header.
- */
-typedef struct KodiToAddonFuncTable_Game
-{
-  kodi::addon::CInstanceGame* addonInstance;
-
-  GAME_ERROR(__cdecl* LoadGame)(const AddonInstance_Game*, const char*);
-  GAME_ERROR(__cdecl* LoadGameSpecial)
-  (const AddonInstance_Game*, SPECIAL_GAME_TYPE, const char**, size_t);
-  GAME_ERROR(__cdecl* LoadStandalone)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* UnloadGame)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* GetGameTiming)(const AddonInstance_Game*, game_system_timing*);
-  GAME_REGION(__cdecl* GetRegion)(const AddonInstance_Game*);
-  bool(__cdecl* RequiresGameLoop)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* RunFrame)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* Reset)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* HwContextReset)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* HwContextDestroy)(const AddonInstance_Game*);
-  bool(__cdecl* HasFeature)(const AddonInstance_Game*, const char*, const char*);
-  game_input_topology*(__cdecl* GetTopology)(const AddonInstance_Game*);
-  void(__cdecl* FreeTopology)(const AddonInstance_Game*, game_input_topology*);
-  void(__cdecl* SetControllerLayouts)(const AddonInstance_Game*,
-                                      const game_controller_layout*,
-                                      unsigned int);
-  bool(__cdecl* EnableKeyboard)(const AddonInstance_Game*, bool, const char*);
-  bool(__cdecl* EnableMouse)(const AddonInstance_Game*, bool, const char*);
-  bool(__cdecl* ConnectController)(const AddonInstance_Game*, bool, const char*, const char*);
-  bool(__cdecl* InputEvent)(const AddonInstance_Game*, const game_input_event*);
-  size_t(__cdecl* SerializeSize)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* Serialize)(const AddonInstance_Game*, uint8_t*, size_t);
-  GAME_ERROR(__cdecl* Deserialize)(const AddonInstance_Game*, const uint8_t*, size_t);
-  GAME_ERROR(__cdecl* CheatReset)(const AddonInstance_Game*);
-  GAME_ERROR(__cdecl* GetMemory)(const AddonInstance_Game*, GAME_MEMORY, uint8_t**, size_t*);
-  GAME_ERROR(__cdecl* SetCheat)(const AddonInstance_Game*, unsigned int, bool, const char*);
-} KodiToAddonFuncTable_Game;
-
-/*!
- * @brief Game instance
- *
- * Not to be used outside this header.
- */
-typedef struct AddonInstance_Game
-{
-  AddonProps_Game props;
-  AddonToKodiFuncTable_Game toKodi;
-  KodiToAddonFuncTable_Game toAddon;
-} AddonInstance_Game;
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-//==============================================================================
-///
-/// \addtogroup cpp_kodi_addon_game
-/// @brief \cpp_class{ kodi::addon::CInstanceGame }
-/// **Game add-on instance**
-///
-/// This class is created at addon by Kodi.
-///
-//------------------------------------------------------------------------------
-class ATTRIBUTE_HIDDEN CInstanceGame : public IAddonInstance
-{
-public:
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_Base 1. Basic functions
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Functions to manage the addon and get basic information about it**
-  ///
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Game class constructor
-  ///
-  /// Used by an add-on that only supports only Game and only in one instance.
-  ///
-  /// This class is created at addon by Kodi.
-  ///
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  ///
-  /// **Here's example about the use of this:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/addon-instance/Game.h>
-  /// ...
-  ///
-  /// class ATTRIBUTE_HIDDEN CGameExample
-  ///   : public kodi::addon::CAddonBase,
-  ///     public kodi::addon::CInstanceGame
-  /// {
-  /// public:
-  ///   CGameExample()
-  ///   {
-  ///   }
-  ///
-  ///   virtual ~CGameExample();
-  ///   {
-  ///   }
-  ///
-  ///   ...
-  /// };
-  ///
-  /// ADDONCREATOR(CGameExample)
-  /// ~~~~~~~~~~~~~
-  ///
-  CInstanceGame() : IAddonInstance(ADDON_INSTANCE_GAME, GetKodiTypeVersion(ADDON_INSTANCE_GAME))
-  {
-    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-      throw std::logic_error("kodi::addon::CInstanceGame: Creation of more as one in single "
-                             "instance way is not allowed!");
-
-    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
-    CAddonBase::m_interface->globalSingleInstance = this;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Destructor
-  ///
-  ~CInstanceGame() override = default;
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>The path of the game client being loaded.
-  ///
-  /// @return the used game client Dll path
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  std::string GameClientDllPath() const
-  {
-    return m_instanceData->props.game_client_dll_path;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>Paths to proxy DLLs used to load the game client.
-  ///
-  /// @param[out] paths vector list to store available dll paths
-  /// @return true if success and dll paths present
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  bool ProxyDllPaths(std::vector<std::string>& paths)
-  {
-    for (unsigned int i = 0; i < m_instanceData->props.proxy_dll_count; ++i)
-    {
-      if (m_instanceData->props.proxy_dll_paths[i] != nullptr)
-        paths.push_back(m_instanceData->props.proxy_dll_paths[i]);
-    }
-    return !paths.empty();
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>The "system" directories of the frontend
-  ///
-  /// These directories can be used to store system-specific ROMs such as
-  /// BIOSes, configuration data, etc.
-  ///
-  /// @return the used resource directory
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  bool ResourceDirectories(std::vector<std::string>& dirs)
-  {
-    for (unsigned int i = 0; i < m_instanceData->props.resource_directory_count; ++i)
-    {
-      if (m_instanceData->props.resource_directories[i] != nullptr)
-        dirs.push_back(m_instanceData->props.resource_directories[i]);
-    }
-    return !dirs.empty();
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>The writable directory of the frontend
-  ///
-  /// This directory can be used to store SRAM, memory cards, high scores,
-  /// etc, if the game client cannot use the regular memory interface,
-  /// GetMemoryData().
-  ///
-  /// @return the used profile directory
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  std::string ProfileDirectory() const
-  {
-    return m_instanceData->props.profile_directory;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>The value of the <supports_vfs> property from addon.xml
-  ///
-  /// @return true if VFS is supported
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  bool SupportsVFS() const
-  {
-    return m_instanceData->props.supports_vfs;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>The extensions in the <extensions> property from addon.xml
-  ///
-  /// @param[out] extensions vector list to store available extension
-  /// @return true if success and extensions present
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  bool Extensions(std::vector<std::string>& extensions)
-  {
-    for (unsigned int i = 0; i < m_instanceData->props.extension_count; ++i)
-    {
-      if (m_instanceData->props.extensions[i] != nullptr)
-        extensions.push_back(m_instanceData->props.extensions[i]);
-    }
-    return !extensions.empty();
-  }
-  //----------------------------------------------------------------------------
-
-  //@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_Operation 2. Game operations
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Game operations**
-  ///
-  /// These are mandatory functions for using this addon to get the available
-  /// channels.
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Load a game
-  ///
-  /// @param[in] url The URL to load
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
-  ///
-  virtual GAME_ERROR LoadGame(const std::string& url)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Load a game that requires multiple files
-  ///
-  /// @param[in] type The game type
-  /// @param[in] urls An array of urls
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
-  ///
-  virtual GAME_ERROR LoadGameSpecial(SPECIAL_GAME_TYPE type, const std::vector<std::string>& urls)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Begin playing without a game file
-  ///
-  /// If the add-on supports standalone mode, it must add the <supports_standalone>
-  /// tag to the extension point in addon.xml:
-  ///
-  ///     <supports_no_game>false</supports_no_game>
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game add-on was loaded
-  ///
-  virtual GAME_ERROR LoadStandalone()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Unload the current game
-  ///
-  /// Unloads a currently loaded game
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was unloaded
-  ///
-  virtual GAME_ERROR UnloadGame()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Get timing information about the loaded game
-  ///
-  /// @param[out] timing_info The info structure to fill
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if info was filled
-  ///
-  virtual GAME_ERROR GetGameTiming(game_system_timing& timing_info)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Get region of the loaded game
-  ///
-  /// @return the region, or @ref GAME_REGION_UNKNOWN if unknown or no game is loaded
-  ///
-  virtual GAME_REGION GetRegion()
-  {
-    return GAME_REGION_UNKNOWN;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Return true if the client requires the frontend to provide a game loop
-  ///
-  /// The game loop is a thread that calls RunFrame() in a loop at a rate
-  /// determined by the playback speed and the client's FPS.
-  ///
-  /// @return true if the frontend should provide a game loop, false otherwise
-  ///
-  virtual bool RequiresGameLoop()
-  {
-    return false;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Run a single frame for add-ons that use a game loop
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if there was no error
-  ///
-  virtual GAME_ERROR RunFrame()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Reset the current game
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was reset
-  ///
-  virtual GAME_ERROR Reset()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>Requests the frontend to stop the current game
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  void CloseGame(void) { m_instanceData->toKodi.CloseGame(m_instanceData->toKodi.kodiInstance); }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_Operation_CStream Class: CStream
-  /// @ingroup cpp_kodi_addon_game_Operation
-  /// @brief \cpp_class{ kodi::addon::CInstanceGame::CStream }
-  /// **Game stream handler**
-  ///
-  /// This class will be integrated into the addon, which can then open it if
-  /// necessary for the processing of an audio or video stream.
-  ///
-  ///
-  /// @note Callback to Kodi class
-  //@{
-  class CStream
-  {
-  public:
-    CStream() = default;
-
-    CStream(const game_stream_properties& properties)
-    {
-      Open(properties);
-    }
-
-    ~CStream()
-    {
-      Close();
-    }
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief Create a stream for gameplay data
-    ///
-    /// @param[in] properties The stream properties
-    /// @return A stream handle, or `nullptr` on failure
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    bool Open(const game_stream_properties& properties)
-    {
-      if (!CAddonBase::m_interface->globalSingleInstance)
-        return false;
-
-      if (m_handle)
-      {
-        kodi::Log(ADDON_LOG_INFO, "kodi::addon::CInstanceGame::CStream already becomes reopened");
-        Close();
-      }
-
-      AddonToKodiFuncTable_Game& cb =
-          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
-              ->m_instanceData->toKodi;
-      m_handle = cb.OpenStream(cb.kodiInstance, &properties);
-      return m_handle != nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief Free the specified stream
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    void Close()
-    {
-      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
-        return;
-
-      AddonToKodiFuncTable_Game& cb =
-          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
-              ->m_instanceData->toKodi;
-      cb.CloseStream(cb.kodiInstance, m_handle);
-      m_handle = nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief Get a buffer for zero-copy stream data
-    ///
-    /// @param[in] width The framebuffer width, or 0 for no width specified
-    /// @param[in] height The framebuffer height, or 0 for no height specified
-    /// @param[out] buffer The buffer, or unmodified if false is returned
-    /// @return True if buffer was set, false otherwise
-    ///
-    /// @note If this returns true, buffer must be freed using \ref ReleaseBuffer().
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    bool GetBuffer(unsigned int width, unsigned int height, game_stream_buffer& buffer)
-    {
-      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
-        return false;
-
-      AddonToKodiFuncTable_Game& cb =
-          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
-              ->m_instanceData->toKodi;
-      return cb.GetStreamBuffer(cb.kodiInstance, m_handle, width, height, &buffer);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief Add a data packet to a stream
-    ///
-    /// @param[in] packet The data packet
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    void AddData(const game_stream_packet& packet)
-    {
-      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
-        return;
-
-      AddonToKodiFuncTable_Game& cb =
-          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
-              ->m_instanceData->toKodi;
-      cb.AddStreamData(cb.kodiInstance, m_handle, &packet);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief Free an allocated buffer
-    ///
-    /// @param[in] buffer The buffer returned from GetStreamBuffer()
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    void ReleaseBuffer(game_stream_buffer& buffer)
-    {
-      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
-        return;
-
-      AddonToKodiFuncTable_Game& cb =
-          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
-              ->m_instanceData->toKodi;
-      cb.ReleaseStreamBuffer(cb.kodiInstance, m_handle, &buffer);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_game_Operation_CStream
-    /// @brief To check stream open was OK, e.g. after use of constructor
-    ///
-    /// @return true if stream was successfully opened
-    ///
-    /// @remarks Only called from addon itself
-    ///
-    bool IsOpen() const { return m_handle != nullptr; }
-    //--------------------------------------------------------------------------
-
-  private:
-    void* m_handle = nullptr;
-  };
-  //@}
-
-  //@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_HardwareRendering 3. Hardware rendering operations
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Hardware rendering operations**
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Invalidates the current HW context and reinitializes GPU resources
-  ///
-  /// Any GL state is lost, and must not be deinitialized explicitly.
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was reset
-  ///
-  virtual GAME_ERROR HwContextReset()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Called before the context is destroyed
-  ///
-  /// Resources can be deinitialized at this step.
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was destroyed
-  ///
-  virtual GAME_ERROR HwContextDestroy()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>Get a symbol from the hardware context
-  ///
-  /// @param[in] sym The symbol's name
-  ///
-  /// @return A function pointer for the specified symbol
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  game_proc_address_t HwGetProcAddress(const char* sym)
-  {
-    return m_instanceData->toKodi.HwGetProcAddress(m_instanceData->toKodi.kodiInstance, sym);
-  }
-  //----------------------------------------------------------------------------
-
-  //@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_InputOperations 4. Input operations
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Input operations**
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Check if input is accepted for a feature on the controller
-  ///
-  /// If only a subset of the controller profile is used, this can return false
-  /// for unsupported features to not absorb their input.
-  ///
-  /// If the entire controller profile is used, this should always return true.
-  ///
-  /// @param[in] controller_id The ID of the controller profile
-  /// @param[in] feature_name The name of a feature in that profile
-  /// @return true if input is accepted for the feature, false otherwise
-  ///
-  virtual bool HasFeature(const std::string& controller_id, const std::string& feature_name)
-  {
-    return false;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Get the input topology that specifies which controllers can be connected
-  ///
-  /// @return The input topology, or null to use the default
-  ///
-  /// If this returns non-null, topology must be freed using FreeTopology().
-  ///
-  /// If this returns null, the topology will default to a single port that can
-  /// accept all controllers imported by addon.xml. The port ID is set to
-  /// the @ref DEFAULT_PORT_ID constant.
-  ///
-  virtual game_input_topology* GetTopology()
-  {
-    return nullptr;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Free the topology's resources
-  ///
-  /// @param[in] topology The topology returned by GetTopology()
-    ///
-  virtual void FreeTopology(game_input_topology* topology)
-  {
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Set the layouts for known controllers
-  ///
-  /// @param[in] controllers The controller layouts
-  ///
-  /// After loading the input topology, the frontend will call this with
-  /// controller layouts for all controllers discovered in the topology.
-  ///
-  virtual void SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers)
-  {
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Enable/disable keyboard input using the specified controller
-  ///
-  /// @param[in] enable True to enable input, false otherwise
-  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
-  ///
-  /// @return True if keyboard input was enabled, false otherwise
-  ///
-  virtual bool EnableKeyboard(bool enable, const std::string& controller_id)
-  {
-    return false;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Enable/disable mouse input using the specified controller
-  ///
-  /// @param[in] enable True to enable input, false otherwise
-  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
-  ///
-  /// @return True if mouse input was enabled, false otherwise
-  ///
-  virtual bool EnableMouse(bool enable, const std::string& controller_id)
-  {
-    return false;
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// @brief Connect/disconnect a controller to a port on the virtual game console
-  ///
-  /// @param[in] connect True to connect a controller, false to disconnect
-  /// @param[in] port_address The address of the port
-  /// @param[in] controller_id The controller ID if connecting, or unused if disconnecting
-  /// @return True if the \p controller was (dis-)connected to the port, false otherwise
-  ///
-  /// The address is a string that allows traversal of the controller topology.
-  /// It is formed by alternating port IDs and controller IDs separated by "/".
-  ///
-  /// For example, assume that the topology represented in XML for Snes9x is:
-  ///
-  /// ~~~~~~~~~~~~~{.xml}
-  ///     <logicaltopology>
-  ///       <port type="controller" id="1">
-  ///         <accepts controller="game.controller.snes"/>
-  ///         <accepts controller="game.controller.snes.multitap">
-  ///           <port type="controller" id="1">
-  ///             <accepts controller="game.controller.snes"/>
-  ///           </port>
-  ///           <port type="controller" id="2">
-  ///             <accepts controller="game.controller.snes"/>
-  ///           </port>
-  ///           ...
-  ///         </accepts>
-  ///       </port>
-  ///     </logicaltopology>
-  /// ~~~~~~~~~~~~~
-  ///
-  /// To connect a multitap to the console's first port, the multitap's controller
-  /// info is set using the port address:
-  ///
-  ///     1
-  ///
-  /// To connect a SNES controller to the second port of the multitap, the
-  /// controller info is next set using the address:
-  ///
-  ///     1/game.controller.multitap/2
-  ///
-  /// Any attempts to connect a controller to a port on a disconnected multitap
-  /// will return false.
-  ///
-  virtual bool ConnectController(bool connect,
-                                 const std::string& port_address,
-                                 const std::string& controller_id)
-  {
-    return false;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Notify the add-on of an input event
-  ///
-  /// @param[in] event The input event
-  ///
-  /// @return true if the event was handled, false otherwise
-  ///
-  virtual bool InputEvent(const game_input_event& event)
-  {
-    return false;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief **Callback to Kodi Function**<br>Notify the port of an input event
-  ///
-  /// @param[in] event The input event
-  /// @return true if the event was handled, false otherwise
-  ///
-  /// @note Input events can arrive for the following sources:
-  ///   - \ref GAME_INPUT_EVENT_MOTOR
-  ///
-  /// @remarks Only called from addon itself
-  ///
-  bool KodiInputEvent(const game_input_event& event)
-  {
-    return m_instanceData->toKodi.InputEvent(m_instanceData->toKodi.kodiInstance, &event);
-  }
-  //----------------------------------------------------------------------------
-
-  //@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_SerializationOperations 5. Serialization operations
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Serialization operations**
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Get the number of bytes required to serialize the game
-  ///
-  /// @return the number of bytes, or 0 if serialization is not supported
-  ///
-  virtual size_t SerializeSize()
-  {
-    return 0;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Serialize the state of the game
-  ///
-  /// @param[in] data The buffer receiving the serialized game data
-  /// @param[in] size The size of the buffer
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was serialized into the buffer
-  ///
-  virtual GAME_ERROR Serialize(uint8_t* data, size_t size)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Deserialize the game from the given state
-  ///
-  /// @param[in] data A buffer containing the game's new state
-  /// @param[in] size The size of the buffer
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game deserialized
-  ///
-  virtual GAME_ERROR Deserialize(const uint8_t* data, size_t size)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //@}
-
-//--==----==----==----==----==----==----==----==----==----==----==----==----==--
-
-  //============================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_game_CheatOperations 6. Cheat operations
-  /// @ingroup cpp_kodi_addon_game
-  /// @brief **Cheat operations**
-  ///
-  //@{
-
-  //============================================================================
-  ///
-  /// @brief Reset the cheat system
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat system was reset
-  ///
-  virtual GAME_ERROR CheatReset()
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Get a region of memory
-  ///
-  /// @param[in] type The type of memory to retrieve
-  /// @param[in] data Set to the region of memory; must remain valid until UnloadGame() is called
-  /// @param[in] size Set to the size of the region of memory
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if data was set to a valid buffer
-  ///
-  virtual GAME_ERROR GetMemory(GAME_MEMORY type, uint8_t*& data, size_t& size)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// @brief Set a cheat code
-  ///
-  /// @param[in] index
-  /// @param[in] enabled
-  /// @param[in] code
-  ///
-  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat was set
-  ///
-  virtual GAME_ERROR SetCheat(unsigned int index, bool enabled, const std::string& code)
-  {
-    return GAME_ERROR_NOT_IMPLEMENTED;
-  }
-  //----------------------------------------------------------------------------
-
-  //@}
-
-private:
-  void SetAddonStruct(KODI_HANDLE instance)
-  {
-    if (instance == nullptr)
-      throw std::logic_error("kodi::addon::CInstanceGame: Creation with empty addon structure not"
-                             "allowed, table must be given from Kodi!");
-
-    m_instanceData = static_cast<AddonInstance_Game*>(instance);
-    m_instanceData->toAddon.addonInstance = this;
-
-    m_instanceData->toAddon.LoadGame = ADDON_LoadGame;
-    m_instanceData->toAddon.LoadGameSpecial = ADDON_LoadGameSpecial;
-    m_instanceData->toAddon.LoadStandalone = ADDON_LoadStandalone;
-    m_instanceData->toAddon.UnloadGame = ADDON_UnloadGame;
-    m_instanceData->toAddon.GetGameTiming = ADDON_GetGameTiming;
-    m_instanceData->toAddon.GetRegion = ADDON_GetRegion;
-    m_instanceData->toAddon.RequiresGameLoop = ADDON_RequiresGameLoop;
-    m_instanceData->toAddon.RunFrame = ADDON_RunFrame;
-    m_instanceData->toAddon.Reset = ADDON_Reset;
-
-    m_instanceData->toAddon.HwContextReset = ADDON_HwContextReset;
-    m_instanceData->toAddon.HwContextDestroy = ADDON_HwContextDestroy;
-
-    m_instanceData->toAddon.HasFeature = ADDON_HasFeature;
-    m_instanceData->toAddon.GetTopology = ADDON_GetTopology;
-    m_instanceData->toAddon.FreeTopology = ADDON_FreeTopology;
-    m_instanceData->toAddon.SetControllerLayouts = ADDON_SetControllerLayouts;
-    m_instanceData->toAddon.EnableKeyboard = ADDON_EnableKeyboard;
-    m_instanceData->toAddon.EnableMouse = ADDON_EnableMouse;
-    m_instanceData->toAddon.ConnectController = ADDON_ConnectController;
-    m_instanceData->toAddon.InputEvent = ADDON_InputEvent;
-
-    m_instanceData->toAddon.SerializeSize = ADDON_SerializeSize;
-    m_instanceData->toAddon.Serialize = ADDON_Serialize;
-    m_instanceData->toAddon.Deserialize = ADDON_Deserialize;
-
-    m_instanceData->toAddon.CheatReset = ADDON_CheatReset;
-    m_instanceData->toAddon.GetMemory = ADDON_GetMemory;
-    m_instanceData->toAddon.SetCheat = ADDON_SetCheat;
-  }
-
-  // --- Game operations ---------------------------------------------------------
-
-  inline static GAME_ERROR ADDON_LoadGame(const AddonInstance_Game* instance, const char* url)
-  {
-    return instance->toAddon.addonInstance->LoadGame(url);
-  }
-
-  inline static GAME_ERROR ADDON_LoadGameSpecial(const AddonInstance_Game* instance,
-                                                 SPECIAL_GAME_TYPE type,
-                                                 const char** urls,
-                                                 size_t urlCount)
-  {
-    std::vector<std::string> urlList;
-    for (size_t i = 0; i < urlCount; ++i)
-    {
-      if (urls[i] != nullptr)
-        urlList.push_back(urls[i]);
-    }
-
-    return instance->toAddon.addonInstance->LoadGameSpecial(type, urlList);
-  }
-
-  inline static GAME_ERROR ADDON_LoadStandalone(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->LoadStandalone();
-  }
-
-  inline static GAME_ERROR ADDON_UnloadGame(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->UnloadGame();
-  }
-
-  inline static GAME_ERROR ADDON_GetGameTiming(const AddonInstance_Game* instance,
-                                               game_system_timing* timing_info)
-  {
-    return instance->toAddon.addonInstance->GetGameTiming(*timing_info);
-  }
-
-  inline static GAME_REGION ADDON_GetRegion(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->GetRegion();
-  }
-
-  inline static bool ADDON_RequiresGameLoop(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->RequiresGameLoop();
-  }
-
-  inline static GAME_ERROR ADDON_RunFrame(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->RunFrame();
-  }
-
-  inline static GAME_ERROR ADDON_Reset(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->Reset();
-  }
-
-
-  // --- Hardware rendering operations -------------------------------------------
-
-  inline static GAME_ERROR ADDON_HwContextReset(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->HwContextReset();
-  }
-
-  inline static GAME_ERROR ADDON_HwContextDestroy(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->HwContextDestroy();
-  }
-
-
-  // --- Input operations --------------------------------------------------------
-
-  inline static bool ADDON_HasFeature(const AddonInstance_Game* instance,
-                                      const char* controller_id,
-                                      const char* feature_name)
-  {
-    return instance->toAddon.addonInstance->HasFeature(controller_id, feature_name);
-  }
-
-  inline static game_input_topology* ADDON_GetTopology(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->GetTopology();
-  }
-
-  inline static void ADDON_FreeTopology(const AddonInstance_Game* instance,
-                                        game_input_topology* topology)
-  {
-    instance->toAddon.addonInstance->FreeTopology(topology);
-  }
-
-  inline static void ADDON_SetControllerLayouts(const AddonInstance_Game* instance,
-                                                const game_controller_layout* controllers,
-                                                unsigned int controller_count)
-  {
-    if (controllers == nullptr)
-      return;
-
-    std::vector<AddonGameControllerLayout> controllerList;
-    for (unsigned int i = 0; i < controller_count; ++i)
-      controllerList.push_back(controllers[i]);
-
-    instance->toAddon.addonInstance->SetControllerLayouts(controllerList);
-  }
-
-  inline static bool ADDON_EnableKeyboard(const AddonInstance_Game* instance,
-                                          bool enable,
-                                          const char* controller_id)
-  {
-    return instance->toAddon.addonInstance->EnableKeyboard(enable, controller_id);
-  }
-
-  inline static bool ADDON_EnableMouse(const AddonInstance_Game* instance,
-                                       bool enable,
-                                       const char* controller_id)
-  {
-    return instance->toAddon.addonInstance->EnableMouse(enable, controller_id);
-  }
-
-  inline static bool ADDON_ConnectController(const AddonInstance_Game* instance,
-                                             bool connect,
-                                             const char* port_address,
-                                             const char* controller_id)
-  {
-    return instance->toAddon.addonInstance->ConnectController(connect, port_address, controller_id);
-  }
-
-  inline static bool ADDON_InputEvent(const AddonInstance_Game* instance,
-                                      const game_input_event* event)
-  {
-    return instance->toAddon.addonInstance->InputEvent(*event);
-  }
-
-
-  // --- Serialization operations ------------------------------------------------
-
-  inline static size_t ADDON_SerializeSize(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->SerializeSize();
-  }
-
-  inline static GAME_ERROR ADDON_Serialize(const AddonInstance_Game* instance,
-                                           uint8_t* data,
-                                           size_t size)
-  {
-    return instance->toAddon.addonInstance->Serialize(data, size);
-  }
-
-  inline static GAME_ERROR ADDON_Deserialize(const AddonInstance_Game* instance,
-                                             const uint8_t* data,
-                                             size_t size)
-  {
-    return instance->toAddon.addonInstance->Deserialize(data, size);
-  }
-
-
-  // --- Cheat operations --------------------------------------------------------
-
-  inline static GAME_ERROR ADDON_CheatReset(const AddonInstance_Game* instance)
-  {
-    return instance->toAddon.addonInstance->CheatReset();
-  }
-
-  inline static GAME_ERROR ADDON_GetMemory(const AddonInstance_Game* instance,
-                                           GAME_MEMORY type,
-                                           uint8_t** data,
-                                           size_t* size)
-  {
-    return instance->toAddon.addonInstance->GetMemory(type, *data, *size);
-  }
-
-  inline static GAME_ERROR ADDON_SetCheat(const AddonInstance_Game* instance,
-                                          unsigned int index,
-                                          bool enabled,
-                                          const char* code)
-  {
-    return instance->toAddon.addonInstance->SetCheat(index, enabled, code);
-  }
-
-  AddonInstance_Game* m_instanceData;
-};
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
deleted file mode 100644
index 2067d51..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- *  Copyright (C) 2014-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-
-namespace kodi { namespace addon { class CInstancePeripheral; }}
-
-/* indicates a joystick has no preference for port number */
-#define NO_PORT_REQUESTED     (-1)
-
-/* joystick's driver button/hat/axis index is unknown */
-#define DRIVER_INDEX_UNKNOWN  (-1)
-
-extern "C"
-{
-
-  /// @name Peripheral types
-  ///{
-
-  /*!
-   * @brief API error codes
-   */
-  typedef enum PERIPHERAL_ERROR
-  {
-    PERIPHERAL_NO_ERROR                      =  0, // no error occurred
-    PERIPHERAL_ERROR_UNKNOWN                 = -1, // an unknown error occurred
-    PERIPHERAL_ERROR_FAILED                  = -2, // the command failed
-    PERIPHERAL_ERROR_INVALID_PARAMETERS      = -3, // the parameters of the method are invalid for this operation
-    PERIPHERAL_ERROR_NOT_IMPLEMENTED         = -4, // the method that the frontend called is not implemented
-    PERIPHERAL_ERROR_NOT_CONNECTED           = -5, // no peripherals are connected
-    PERIPHERAL_ERROR_CONNECTION_FAILED       = -6, // peripherals are connected, but command was interrupted
-  } PERIPHERAL_ERROR;
-
-  /*!
-   * @brief Peripheral types
-   */
-  typedef enum PERIPHERAL_TYPE
-  {
-    PERIPHERAL_TYPE_UNKNOWN,
-    PERIPHERAL_TYPE_JOYSTICK,
-    PERIPHERAL_TYPE_KEYBOARD,
-  } PERIPHERAL_TYPE;
-
-  /*!
-   * @brief Information shared between peripherals
-   */
-  typedef struct PERIPHERAL_INFO
-  {
-    PERIPHERAL_TYPE type;           /*!< @brief type of peripheral */
-    char*           name;           /*!< @brief name of peripheral */
-    uint16_t        vendor_id;      /*!< @brief vendor ID of peripheral, 0x0000 if unknown */
-    uint16_t        product_id;     /*!< @brief product ID of peripheral, 0x0000 if unknown */
-    unsigned int    index;          /*!< @brief the order in which the add-on identified this peripheral */
-  } ATTRIBUTE_PACKED PERIPHERAL_INFO;
-
-  /*!
-   * @brief Peripheral add-on capabilities.
-   */
-  typedef struct PERIPHERAL_CAPABILITIES
-  {
-    bool provides_joysticks;            /*!< @brief true if the add-on provides joysticks */
-    bool provides_joystick_rumble;
-    bool provides_joystick_power_off;
-    bool provides_buttonmaps;           /*!< @brief true if the add-on provides button maps */
-  } ATTRIBUTE_PACKED PERIPHERAL_CAPABILITIES;
-  ///}
-
-  /// @name Event types
-  ///{
-
-  /*!
-   * @brief Types of events that can be sent and received
-   */
-  typedef enum PERIPHERAL_EVENT_TYPE
-  {
-    PERIPHERAL_EVENT_TYPE_NONE,           /*!< @brief unknown event */
-    PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON,  /*!< @brief state changed for joystick driver button */
-    PERIPHERAL_EVENT_TYPE_DRIVER_HAT,     /*!< @brief state changed for joystick driver hat */
-    PERIPHERAL_EVENT_TYPE_DRIVER_AXIS,    /*!< @brief state changed for joystick driver axis */
-    PERIPHERAL_EVENT_TYPE_SET_MOTOR,      /*!< @brief set the state for joystick rumble motor */
-  } PERIPHERAL_EVENT_TYPE;
-
-  /*!
-   * @brief States a button can have
-   */
-  typedef enum JOYSTICK_STATE_BUTTON
-  {
-    JOYSTICK_STATE_BUTTON_UNPRESSED = 0x0,    /*!< @brief button is released */
-    JOYSTICK_STATE_BUTTON_PRESSED   = 0x1,    /*!< @brief button is pressed */
-  } JOYSTICK_STATE_BUTTON;
-
-  /*!
-   * @brief States a D-pad (also called a hat) can have
-   */
-  typedef enum JOYSTICK_STATE_HAT
-  {
-    JOYSTICK_STATE_HAT_UNPRESSED  = 0x0,    /*!< @brief no directions are pressed */
-    JOYSTICK_STATE_HAT_LEFT       = 0x1,    /*!< @brief only left is pressed */
-    JOYSTICK_STATE_HAT_RIGHT      = 0x2,    /*!< @brief only right is pressed */
-    JOYSTICK_STATE_HAT_UP         = 0x4,    /*!< @brief only up is pressed */
-    JOYSTICK_STATE_HAT_DOWN       = 0x8,    /*!< @brief only down is pressed */
-    JOYSTICK_STATE_HAT_LEFT_UP    = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_UP,
-    JOYSTICK_STATE_HAT_LEFT_DOWN  = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_DOWN,
-    JOYSTICK_STATE_HAT_RIGHT_UP   = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_UP,
-    JOYSTICK_STATE_HAT_RIGHT_DOWN = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_DOWN,
-  } JOYSTICK_STATE_HAT;
-
-  /*!
-   * @brief Axis value in the closed interval [-1.0, 1.0]
-   *
-   * The axis state uses the XInput coordinate system:
-   *   - Negative values signify down or to the left
-   *   - Positive values signify up or to the right
-   */
-  typedef float JOYSTICK_STATE_AXIS;
-
-  /*!
-   * @brief Motor value in the closed interval [0.0, 1.0]
-   */
-  typedef float JOYSTICK_STATE_MOTOR;
-
-  /*!
-   * @brief Event information
-   */
-  typedef struct PERIPHERAL_EVENT
-  {
-    /*! @brief Index of the peripheral handling/receiving the event */
-    unsigned int peripheral_index;
-
-    /*! @brief Type of the event used to determine which enum field to access below */
-    PERIPHERAL_EVENT_TYPE type;
-
-    /*! @brief The index of the event source */
-    unsigned int driver_index;
-
-    JOYSTICK_STATE_BUTTON    driver_button_state;
-    JOYSTICK_STATE_HAT       driver_hat_state;
-    JOYSTICK_STATE_AXIS      driver_axis_state;
-    JOYSTICK_STATE_MOTOR     motor_state;
-  } ATTRIBUTE_PACKED PERIPHERAL_EVENT;
-  ///}
-
-  /// @name Joystick types
-  ///{
-
-  /*!
-   * @brief Info specific to joystick peripherals
-   */
-  typedef struct JOYSTICK_INFO
-  {
-    PERIPHERAL_INFO peripheral;         /*!< @brief peripheral info for this joystick */
-    char*           provider;           /*!< @brief name of the driver or interface providing the joystick */
-    int             requested_port;     /*!< @brief requested port number (such as for 360 controllers), or NO_PORT_REQUESTED */
-    unsigned int    button_count;       /*!< @brief number of buttons reported by the driver */
-    unsigned int    hat_count;          /*!< @brief number of hats reported by the driver */
-    unsigned int    axis_count;         /*!< @brief number of axes reported by the driver */
-    unsigned int    motor_count;        /*!< @brief number of motors reported by the driver */
-    bool            supports_poweroff;  /*!< @brief whether the joystick supports being powered off */
-  } ATTRIBUTE_PACKED JOYSTICK_INFO;
-
-  /*!
-   * @brief Driver input primitives
-   *
-   * Mapping lower-level driver values to higher-level controller features is
-   * non-injective; two triggers can share a single axis.
-   *
-   * To handle this, driver values are subdivided into "primitives" that map
-   * injectively to higher-level features.
-   */
-  typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
-  {
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION,
-  } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
-
-  /*!
-   * @brief Button primitive
-   */
-  typedef struct JOYSTICK_DRIVER_BUTTON
-  {
-    int              index;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
-
-  /*!
-   * @brief Hat direction
-   */
-  typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
-  {
-    JOYSTICK_DRIVER_HAT_UNKNOWN,
-    JOYSTICK_DRIVER_HAT_LEFT,
-    JOYSTICK_DRIVER_HAT_RIGHT,
-    JOYSTICK_DRIVER_HAT_UP,
-    JOYSTICK_DRIVER_HAT_DOWN,
-  } JOYSTICK_DRIVER_HAT_DIRECTION;
-
-  /*!
-   * @brief Hat direction primitive
-   */
-  typedef struct JOYSTICK_DRIVER_HAT
-  {
-    int                           index;
-    JOYSTICK_DRIVER_HAT_DIRECTION direction;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
-
-  /*!
-   * @brief Semiaxis direction
-   */
-  typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
-  {
-    JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1, /*!< @brief negative half of the axis */
-    JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN  =  0, /*!< @brief unknown direction */
-    JOYSTICK_DRIVER_SEMIAXIS_POSITIVE =  1, /*!< @brief positive half of the axis */
-  } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
-
-  /*!
-   * @brief Semiaxis primitive
-   */
-  typedef struct JOYSTICK_DRIVER_SEMIAXIS
-  {
-    int                                index;
-    int                                center;
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
-    unsigned int                       range;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
-
-  /*!
-   * @brief Motor primitive
-   */
-  typedef struct JOYSTICK_DRIVER_MOTOR
-  {
-    int              index;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOTOR;
-
-  /*!
-   * @brief Keyboard key primitive
-   */
-  typedef struct JOYSTICK_DRIVER_KEY
-  {
-    char keycode[16];
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_KEY;
-
-  /*!
-   * @brief Mouse buttons
-   */
-  typedef enum JOYSTICK_DRIVER_MOUSE_INDEX
-  {
-    JOYSTICK_DRIVER_MOUSE_INDEX_UNKNOWN,
-    JOYSTICK_DRIVER_MOUSE_INDEX_LEFT,
-    JOYSTICK_DRIVER_MOUSE_INDEX_RIGHT,
-    JOYSTICK_DRIVER_MOUSE_INDEX_MIDDLE,
-    JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON4,
-    JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON5,
-    JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_UP,
-    JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_DOWN,
-    JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_LEFT,
-    JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_RIGHT,
-  } JOYSTICK_DRIVER_MOUSE_INDEX;
-
-  /*!
-   * @brief Mouse button primitive
-   */
-  typedef struct JOYSTICK_DRIVER_MOUSE_BUTTON
-  {
-    JOYSTICK_DRIVER_MOUSE_INDEX button;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOUSE_BUTTON;
-
-  /*!
-   * @brief Relative pointer direction
-   */
-  typedef enum JOYSTICK_DRIVER_RELPOINTER_DIRECTION
-  {
-    JOYSTICK_DRIVER_RELPOINTER_UNKNOWN,
-    JOYSTICK_DRIVER_RELPOINTER_LEFT,
-    JOYSTICK_DRIVER_RELPOINTER_RIGHT,
-    JOYSTICK_DRIVER_RELPOINTER_UP,
-    JOYSTICK_DRIVER_RELPOINTER_DOWN,
-  } JOYSTICK_DRIVER_RELPOINTER_DIRECTION;
-
-  /*!
-   * @brief Relative pointer direction primitive
-   */
-  typedef struct JOYSTICK_DRIVER_RELPOINTER
-  {
-    JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_RELPOINTER;
-
-  /*!
-   * @brief Driver primitive struct
-   */
-  typedef struct JOYSTICK_DRIVER_PRIMITIVE
-  {
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE    type;
-    union
-    {
-      struct JOYSTICK_DRIVER_BUTTON   button;
-      struct JOYSTICK_DRIVER_HAT      hat;
-      struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
-      struct JOYSTICK_DRIVER_MOTOR    motor;
-      struct JOYSTICK_DRIVER_KEY      key;
-      struct JOYSTICK_DRIVER_MOUSE_BUTTON mouse;
-      struct JOYSTICK_DRIVER_RELPOINTER relpointer;
-    };
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
-
-  /*!
-   * @brief Controller feature
-   *
-   * Controller features are an abstraction over driver values. Each feature
-   * maps to one or more driver primitives.
-   */
-  typedef enum JOYSTICK_FEATURE_TYPE
-  {
-    JOYSTICK_FEATURE_TYPE_UNKNOWN,
-    JOYSTICK_FEATURE_TYPE_SCALAR,
-    JOYSTICK_FEATURE_TYPE_ANALOG_STICK,
-    JOYSTICK_FEATURE_TYPE_ACCELEROMETER,
-    JOYSTICK_FEATURE_TYPE_MOTOR,
-    JOYSTICK_FEATURE_TYPE_RELPOINTER,
-    JOYSTICK_FEATURE_TYPE_ABSPOINTER,
-    JOYSTICK_FEATURE_TYPE_WHEEL,
-    JOYSTICK_FEATURE_TYPE_THROTTLE,
-    JOYSTICK_FEATURE_TYPE_KEY,
-  } JOYSTICK_FEATURE_TYPE;
-
-  /*!
-   * @brief Indices used to access a feature's driver primitives
-   */
-  typedef enum JOYSTICK_FEATURE_PRIMITIVE
-  {
-    // Scalar feature (a button, hat direction or semiaxis)
-    JOYSTICK_SCALAR_PRIMITIVE = 0,
-
-    // Analog stick
-    JOYSTICK_ANALOG_STICK_UP = 0,
-    JOYSTICK_ANALOG_STICK_DOWN = 1,
-    JOYSTICK_ANALOG_STICK_RIGHT = 2,
-    JOYSTICK_ANALOG_STICK_LEFT = 3,
-
-    // Accelerometer
-    JOYSTICK_ACCELEROMETER_POSITIVE_X = 0,
-    JOYSTICK_ACCELEROMETER_POSITIVE_Y = 1,
-    JOYSTICK_ACCELEROMETER_POSITIVE_Z = 2,
-
-    // Motor
-    JOYSTICK_MOTOR_PRIMITIVE = 0,
-
-    // Wheel
-    JOYSTICK_WHEEL_LEFT = 0,
-    JOYSTICK_WHEEL_RIGHT = 1,
-
-    // Throttle
-    JOYSTICK_THROTTLE_UP = 0,
-    JOYSTICK_THROTTLE_DOWN = 1,
-
-    // Key
-    JOYSTICK_KEY_PRIMITIVE = 0,
-
-    // Mouse button
-    JOYSTICK_MOUSE_BUTTON = 0,
-
-    // Relative pointer direction
-    JOYSTICK_RELPOINTER_UP = 0,
-    JOYSTICK_RELPOINTER_DOWN = 1,
-    JOYSTICK_RELPOINTER_RIGHT = 2,
-    JOYSTICK_RELPOINTER_LEFT = 3,
-
-    // Maximum number of primitives
-    JOYSTICK_PRIMITIVE_MAX = 4,
-  } JOYSTICK_FEATURE_PRIMITIVE;
-
-  /*!
-   * @brief Mapping between higher-level controller feature and its driver primitives
-   */
-  typedef struct JOYSTICK_FEATURE
-  {
-    char*                                   name;
-    JOYSTICK_FEATURE_TYPE                   type;
-    struct JOYSTICK_DRIVER_PRIMITIVE        primitives[JOYSTICK_PRIMITIVE_MAX];
-  } ATTRIBUTE_PACKED JOYSTICK_FEATURE;
-  ///}
-
-  typedef struct AddonProps_Peripheral
-  {
-    const char* user_path;              /*!< @brief path to the user profile */
-    const char* addon_path;             /*!< @brief path to this add-on */
-  } ATTRIBUTE_PACKED AddonProps_Peripheral;
-
-  struct AddonInstance_Peripheral;
-
-  typedef struct AddonToKodiFuncTable_Peripheral
-  {
-    KODI_HANDLE kodiInstance;
-    void (*trigger_scan)(void* kodiInstance);
-    void (*refresh_button_maps)(void* kodiInstance, const char* device_name, const char* controller_id);
-    unsigned int (*feature_count)(void* kodiInstance, const char* controller_id, JOYSTICK_FEATURE_TYPE type);
-    JOYSTICK_FEATURE_TYPE (*feature_type)(void* kodiInstance, const char* controller_id, const char* feature_name);
-  } AddonToKodiFuncTable_Peripheral;
-
-  //! @todo Mouse, light gun, multitouch
-
-  typedef struct KodiToAddonFuncTable_Peripheral
-  {
-    kodi::addon::CInstancePeripheral* addonInstance;
-
-    void (__cdecl* get_capabilities)(const AddonInstance_Peripheral* addonInstance, PERIPHERAL_CAPABILITIES* capabilities);
-    PERIPHERAL_ERROR (__cdecl* perform_device_scan)(const AddonInstance_Peripheral* addonInstance, unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results);
-    void (__cdecl* free_scan_results)(const AddonInstance_Peripheral* addonInstance, unsigned int peripheral_count, PERIPHERAL_INFO* scan_results);
-    PERIPHERAL_ERROR (__cdecl* get_events)(const AddonInstance_Peripheral* addonInstance, unsigned int* event_count, PERIPHERAL_EVENT** events);
-    void (__cdecl* free_events)(const AddonInstance_Peripheral* addonInstance, unsigned int event_count, PERIPHERAL_EVENT* events);
-    bool (__cdecl* send_event)(const AddonInstance_Peripheral* addonInstance, const PERIPHERAL_EVENT* event);
-
-    /// @name Joystick operations
-    ///{
-    PERIPHERAL_ERROR (__cdecl* get_joystick_info)(const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info);
-    void (__cdecl* free_joystick_info)(const AddonInstance_Peripheral* addonInstance, JOYSTICK_INFO* info);
-    PERIPHERAL_ERROR (__cdecl* get_features)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id, unsigned int* feature_count, JOYSTICK_FEATURE** features);
-    void (__cdecl* free_features)(const AddonInstance_Peripheral* addonInstance, unsigned int feature_count, JOYSTICK_FEATURE* features);
-    PERIPHERAL_ERROR (__cdecl* map_features)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id, unsigned int feature_count, const JOYSTICK_FEATURE* features);
-    PERIPHERAL_ERROR (__cdecl* get_ignored_primitives)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, unsigned int* feature_count, JOYSTICK_DRIVER_PRIMITIVE** primitives);
-    void (__cdecl* free_primitives)(const AddonInstance_Peripheral* addonInstance, unsigned int, JOYSTICK_DRIVER_PRIMITIVE* primitives);
-    PERIPHERAL_ERROR (__cdecl* set_ignored_primitives)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, unsigned int primitive_count, const JOYSTICK_DRIVER_PRIMITIVE* primitives);
-    void (__cdecl* save_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick);
-    void (__cdecl* revert_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick);
-    void (__cdecl* reset_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id);
-    void (__cdecl* power_off_joystick)(const AddonInstance_Peripheral* addonInstance, unsigned int index);
-    ///}
-  } KodiToAddonFuncTable_Peripheral;
-
-  typedef struct AddonInstance_Peripheral
-  {
-    AddonProps_Peripheral props;
-    AddonToKodiFuncTable_Peripheral toKodi;
-    KodiToAddonFuncTable_Peripheral toAddon;
-  } AddonInstance_Peripheral;
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-  class ATTRIBUTE_HIDDEN CInstancePeripheral : public IAddonInstance
-  {
-  public:
-    CInstancePeripheral()
-      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL, GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of more as one in single instance way is not allowed!");
-
-      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
-      CAddonBase::m_interface->globalSingleInstance = this;
-    }
-
-    explicit CInstancePeripheral(KODI_HANDLE instance, const std::string& kodiVersion = "")
-      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL,
-                       !kodiVersion.empty() ? kodiVersion
-                                            : GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-
-    ~CInstancePeripheral() override = default;
-
-    /// @name Peripheral operations
-    ///{
-    /*!
-     * @brief Get the list of features that this add-on provides
-     * @param capabilities The add-on's capabilities.
-     * @remarks Valid implementation required.
-     *
-     * Called by the frontend to query the add-on's capabilities and supported
-     * peripherals. All capabilities that the add-on supports should be set to true.
-     *
-     */
-    virtual void GetCapabilities(PERIPHERAL_CAPABILITIES &capabilities) { }
-
-    /*!
-     * @brief Perform a scan for joysticks
-     * @param peripheral_count  Assigned to the number of peripherals allocated
-     * @param scan_results      Assigned to allocated memory
-     * @return PERIPHERAL_NO_ERROR if successful; peripherals must be freed using
-     * FreeScanResults() in this case
-     *
-     * The frontend calls this when a hardware change is detected. If an add-on
-     * detects a hardware change, it can trigger this function using the
-     * TriggerScan() callback.
-     */
-    virtual PERIPHERAL_ERROR PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Free the memory allocated in PerformDeviceScan()
-     *
-     * Must be called if PerformDeviceScan() returns PERIPHERAL_NO_ERROR.
-     *
-     * @param peripheral_count  The number of events allocated for the events array
-     * @param scan_results      The array of allocated peripherals
-     */
-    virtual void FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results) { }
-
-    /*!
-     * @brief Get all events that have occurred since the last call to GetEvents()
-     * @return PERIPHERAL_NO_ERROR if successful; events must be freed using
-     * FreeEvents() in this case
-     */
-    virtual PERIPHERAL_ERROR GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Free the memory allocated in GetEvents()
-     *
-     * Must be called if GetEvents() returns PERIPHERAL_NO_ERROR.
-     *
-     * @param event_count  The number of events allocated for the events array
-     * @param events       The array of allocated events
-     */
-    virtual void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events) { }
-
-    /*!
-     * @brief Send an input event to the peripheral
-     * @param event The input event
-     * @return true if the event was handled, false otherwise
-     */
-    virtual bool SendEvent(const PERIPHERAL_EVENT* event) { return false; }
-    ///}
-
-    /// @name Joystick operations
-    /*!
-     * @note #define PERIPHERAL_ADDON_JOYSTICKS before including kodi_peripheral_dll.h
-     * in the add-on if the add-on provides joysticks and add provides_joysticks="true"
-     * to the kodi.peripheral extension point node in addon.xml.
-     */
-    ///{
-    /*!
-     * @brief Get extended info about an attached joystick
-     * @param index  The joystick's driver index
-     * @param info   The container for the allocated joystick info
-     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-     *         FreeJoystickInfo() in this case
-     */
-    virtual PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Free the memory allocated in GetJoystickInfo()
-     */
-    virtual void FreeJoystickInfo(JOYSTICK_INFO* info) { }
-
-    /*!
-     * @brief Get the features that allow translating the joystick into the controller profile
-     * @param joystick      The device's joystick properties; unknown values may be left at their default
-     * @param controller_id The controller profile being requested, e.g. game.controller.default
-     * @param feature_count The number of features allocated for the features array
-     * @param features      The array of allocated features
-     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-     *         FreeButtonMap() in this case
-     */
-    virtual PERIPHERAL_ERROR GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                                         unsigned int* feature_count, JOYSTICK_FEATURE** features) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Free the memory allocated in GetFeatures()
-     *
-     * Must be called if GetFeatures() returns PERIPHERAL_NO_ERROR.
-     *
-     * @param feature_count  The number of features allocated for the features array
-     * @param features       The array of allocated features
-     */
-    virtual void FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features) { }
-
-    /*!
-     * @brief Add or update joystick features
-     * @param joystick      The device's joystick properties; unknown values may be left at their default
-     * @param controller_id The game controller profile being updated
-     * @param feature_count The number of features in the features array
-     * @param features      The array of features
-     * @return PERIPHERAL_NO_ERROR if successful
-     */
-    virtual PERIPHERAL_ERROR MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                                         unsigned int feature_count, const JOYSTICK_FEATURE* features) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Get the driver primitives that should be ignored while mapping the device
-     * @param joystick        The device's joystick properties; unknown values may be left at their default
-     * @param primitive_count The number of features allocated for the primitives array
-     * @param primitives      The array of allocated driver primitives to be ignored
-     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-     *         FreePrimitives() in this case
-     */
-    virtual PERIPHERAL_ERROR GetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                                  unsigned int* primitive_count,
-                                                  JOYSTICK_DRIVER_PRIMITIVE** primitives) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Free the memory allocated in GetIgnoredPrimitives()
-     *
-     * Must be called if GetIgnoredPrimitives() returns PERIPHERAL_NO_ERROR.
-     *
-     * @param primitive_count  The number of driver primitives allocated for the primitives array
-     * @param primitives       The array of allocated driver primitives
-     */
-    virtual void FreePrimitives(unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives) { }
-
-    /*!
-     * @brief Set the list of driver primitives that are ignored for the device
-     * @param joystick         The device's joystick properties; unknown values may be left at their default
-     * @param primitive_count  The number of driver features in the primitives array
-     * @param primitives       The array of driver primitives to ignore
-     * @return PERIPHERAL_NO_ERROR if successful
-     */
-    virtual PERIPHERAL_ERROR SetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                                  unsigned int primitive_count,
-                                                  const JOYSTICK_DRIVER_PRIMITIVE* primitives) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
-
-    /*!
-     * @brief Save the button map for the given joystick
-     * @param joystick      The device's joystick properties
-     */
-    virtual void SaveButtonMap(const JOYSTICK_INFO* joystick) { }
-
-    /*!
-     * @brief Revert the button map to the last time it was loaded or committed to disk
-     * @param joystick      The device's joystick properties
-     */
-    virtual void RevertButtonMap(const JOYSTICK_INFO* joystick) { }
-
-    /*!
-     * @brief Reset the button map for the given joystick and controller profile ID
-     * @param joystick      The device's joystick properties
-     * @param controller_id The game controller profile being reset
-     */
-    virtual void ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id) { }
-
-    /*!
-     * @brief Powers off the given joystick if supported
-     * @param index  The joystick's driver index
-     */
-    virtual void PowerOffJoystick(unsigned int index) { }
-
-    const std::string AddonPath() const
-    {
-      return m_instanceData->props.addon_path;
-    }
-
-    const std::string UserPath() const
-    {
-      return m_instanceData->props.user_path;
-    }
-
-    /*!
-     * @brief Trigger a scan for peripherals
-     *
-     * The add-on calls this if a change in hardware is detected.
-     */
-    void TriggerScan(void)
-    {
-      return m_instanceData->toKodi.trigger_scan(m_instanceData->toKodi.kodiInstance);
-    }
-
-    /*!
-     * @brief Notify the frontend that button maps have changed
-     *
-     * @param[optional] deviceName The name of the device to refresh, or empty/null for all devices
-     * @param[optional] controllerId The controller ID to refresh, or empty/null for all controllers
-     */
-    void RefreshButtonMaps(const std::string& deviceName = "", const std::string& controllerId = "")
-    {
-      return m_instanceData->toKodi.refresh_button_maps(m_instanceData->toKodi.kodiInstance, deviceName.c_str(), controllerId.c_str());
-    }
-
-    /*!
-     * @brief Return the number of features belonging to the specified controller
-     *
-     * @param controllerId    The controller ID to enumerate
-     * @param type[optional]  Type to filter by, or JOYSTICK_FEATURE_TYPE_UNKNOWN for all features
-     *
-     * @return The number of features matching the request parameters
-     */
-    unsigned int FeatureCount(const std::string& controllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
-    {
-      return m_instanceData->toKodi.feature_count(m_instanceData->toKodi.kodiInstance, controllerId.c_str(), type);
-    }
-
-    /*!
-     * @brief Return the type of the feature
-     *
-     * @param controllerId    The controller ID to check
-     * @param featureName     The feature to check
-     *
-     * @return The type of the specified feature, or JOYSTICK_FEATURE_TYPE_UNKNOWN
-     * if unknown
-     */
-    JOYSTICK_FEATURE_TYPE FeatureType(const std::string& controllerId, const std::string &featureName)
-    {
-      return m_instanceData->toKodi.feature_type(m_instanceData->toKodi.kodiInstance, controllerId.c_str(), featureName.c_str());
-    }
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstancePeripheral: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_Peripheral*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-
-      m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
-      m_instanceData->toAddon.perform_device_scan = ADDON_PerformDeviceScan;
-      m_instanceData->toAddon.free_scan_results = ADDON_FreeScanResults;
-      m_instanceData->toAddon.get_events = ADDON_GetEvents;
-      m_instanceData->toAddon.free_events = ADDON_FreeEvents;
-      m_instanceData->toAddon.send_event = ADDON_SendEvent;
-
-      m_instanceData->toAddon.get_joystick_info = ADDON_GetJoystickInfo;
-      m_instanceData->toAddon.free_joystick_info = ADDON_FreeJoystickInfo;
-      m_instanceData->toAddon.get_features = ADDON_GetFeatures;
-      m_instanceData->toAddon.free_features = ADDON_FreeFeatures;
-      m_instanceData->toAddon.map_features = ADDON_MapFeatures;
-      m_instanceData->toAddon.get_ignored_primitives = ADDON_GetIgnoredPrimitives;
-      m_instanceData->toAddon.free_primitives = ADDON_FreePrimitives;
-      m_instanceData->toAddon.set_ignored_primitives = ADDON_SetIgnoredPrimitives;
-      m_instanceData->toAddon.save_button_map = ADDON_SaveButtonMap;
-      m_instanceData->toAddon.revert_button_map = ADDON_RevertButtonMap;
-      m_instanceData->toAddon.reset_button_map = ADDON_ResetButtonMap;
-      m_instanceData->toAddon.power_off_joystick = ADDON_PowerOffJoystick;
-    }
-
-    inline static void ADDON_GetCapabilities(const AddonInstance_Peripheral* addonInstance, PERIPHERAL_CAPABILITIES *capabilities)
-    {
-      addonInstance->toAddon.addonInstance->GetCapabilities(*capabilities);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_PerformDeviceScan(const AddonInstance_Peripheral* addonInstance, unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results)
-    {
-      return addonInstance->toAddon.addonInstance->PerformDeviceScan(peripheral_count, scan_results);
-    }
-
-    inline static void ADDON_FreeScanResults(const AddonInstance_Peripheral* addonInstance, unsigned int peripheral_count, PERIPHERAL_INFO* scan_results)
-    {
-      addonInstance->toAddon.addonInstance->FreeScanResults(peripheral_count, scan_results);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_GetEvents(const AddonInstance_Peripheral* addonInstance, unsigned int* event_count, PERIPHERAL_EVENT** events)
-    {
-      return addonInstance->toAddon.addonInstance->GetEvents(event_count, events);
-    }
-
-    inline static void ADDON_FreeEvents(const AddonInstance_Peripheral* addonInstance, unsigned int event_count, PERIPHERAL_EVENT* events)
-    {
-      addonInstance->toAddon.addonInstance->FreeEvents(event_count, events);
-    }
-
-    inline static bool ADDON_SendEvent(const AddonInstance_Peripheral* addonInstance, const PERIPHERAL_EVENT* event)
-    {
-      return addonInstance->toAddon.addonInstance->SendEvent(event);
-    }
-
-
-    inline static PERIPHERAL_ERROR ADDON_GetJoystickInfo(const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info)
-    {
-      return addonInstance->toAddon.addonInstance->GetJoystickInfo(index, info);
-    }
-
-    inline static void ADDON_FreeJoystickInfo(const AddonInstance_Peripheral* addonInstance, JOYSTICK_INFO* info)
-    {
-      addonInstance->toAddon.addonInstance->FreeJoystickInfo(info);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_GetFeatures(const AddonInstance_Peripheral* addonInstance,
-                                                     const JOYSTICK_INFO* joystick, const char* controller_id,
-                                                     unsigned int* feature_count, JOYSTICK_FEATURE** features)
-    {
-      return addonInstance->toAddon.addonInstance->GetFeatures(joystick, controller_id, feature_count, features);
-    }
-
-    inline static void ADDON_FreeFeatures(const AddonInstance_Peripheral* addonInstance, unsigned int feature_count, JOYSTICK_FEATURE* features)
-    {
-      addonInstance->toAddon.addonInstance->FreeFeatures(feature_count, features);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_MapFeatures(const AddonInstance_Peripheral* addonInstance,
-                                                     const JOYSTICK_INFO* joystick, const char* controller_id,
-                                                     unsigned int feature_count, const JOYSTICK_FEATURE* features)
-    {
-      return addonInstance->toAddon.addonInstance->MapFeatures(joystick, controller_id, feature_count, features);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_GetIgnoredPrimitives(const AddonInstance_Peripheral* addonInstance,
-                                                              const JOYSTICK_INFO* joystick, unsigned int* primitive_count,
-                                                              JOYSTICK_DRIVER_PRIMITIVE** primitives)
-    {
-      return addonInstance->toAddon.addonInstance->GetIgnoredPrimitives(joystick, primitive_count, primitives);
-    }
-
-    inline static void ADDON_FreePrimitives(const AddonInstance_Peripheral* addonInstance,
-                                            unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives)
-    {
-      addonInstance->toAddon.addonInstance->FreePrimitives(primitive_count, primitives);
-    }
-
-    inline static PERIPHERAL_ERROR ADDON_SetIgnoredPrimitives(const AddonInstance_Peripheral* addonInstance,
-                                                              const JOYSTICK_INFO* joystick, unsigned int primitive_count,
-                                                              const JOYSTICK_DRIVER_PRIMITIVE* primitives)
-    {
-      return addonInstance->toAddon.addonInstance->SetIgnoredPrimitives(joystick, primitive_count, primitives);
-    }
-
-    inline static void ADDON_SaveButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick)
-    {
-      addonInstance->toAddon.addonInstance->SaveButtonMap(joystick);
-    }
-
-    inline static void ADDON_RevertButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick)
-    {
-      addonInstance->toAddon.addonInstance->RevertButtonMap(joystick);
-    }
-
-    inline static void ADDON_ResetButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id)
-    {
-      addonInstance->toAddon.addonInstance->ResetButtonMap(joystick, controller_id);
-    }
-
-    inline static void ADDON_PowerOffJoystick(const AddonInstance_Peripheral* addonInstance, unsigned int index)
-    {
-      addonInstance->toAddon.addonInstance->PowerOffJoystick(index);
-    }
-
-    AddonInstance_Peripheral* m_instanceData;
-  };
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
deleted file mode 100644
index 62e5a93..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- *  Copyright (C) 2014-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "Peripheral.h"
-
-#include <array> // Requires c++11
-#include <cstring>
-#include <string>
-#include <utility>
-#include <vector>
-
-#define PERIPHERAL_SAFE_DELETE(x)        do { delete   (x); (x) = NULL; } while (0)
-#define PERIPHERAL_SAFE_DELETE_ARRAY(x)  do { delete[] (x); (x) = NULL; } while (0)
-
-namespace kodi
-{
-namespace addon
-{
-  /*!
-   * Utility class to manipulate arrays of peripheral types.
-   */
-  template <class THE_CLASS, typename THE_STRUCT>
-  class PeripheralVector
-  {
-  public:
-    static void ToStructs(const std::vector<THE_CLASS>& vecObjects, THE_STRUCT** pStructs)
-    {
-      if (!pStructs)
-        return;
-
-      if (vecObjects.empty())
-      {
-        *pStructs = NULL;
-      }
-      else
-      {
-        (*pStructs) = new THE_STRUCT[vecObjects.size()];
-        for (unsigned int i = 0; i < vecObjects.size(); i++)
-          vecObjects.at(i).ToStruct((*pStructs)[i]);
-      }
-    }
-
-    static void ToStructs(const std::vector<THE_CLASS*>& vecObjects, THE_STRUCT** pStructs)
-    {
-      if (!pStructs)
-        return;
-
-      if (vecObjects.empty())
-      {
-        *pStructs = NULL;
-      }
-      else
-      {
-        *pStructs = new THE_STRUCT[vecObjects.size()];
-        for (unsigned int i = 0; i < vecObjects.size(); i++)
-          vecObjects.at(i)->ToStruct((*pStructs)[i]);
-      }
-    }
-
-    static void FreeStructs(unsigned int structCount, THE_STRUCT* structs)
-    {
-      if (structs)
-      {
-        for (unsigned int i = 0; i < structCount; i++)
-          THE_CLASS::FreeStruct(structs[i]);
-      }
-      PERIPHERAL_SAFE_DELETE_ARRAY(structs);
-    }
-  };
-
-  /*!
-   * ADDON::Peripheral
-   *
-   * Wrapper class providing peripheral information. Classes can extend
-   * Peripheral to inherit peripheral properties.
-   */
-  class Peripheral
-  {
-  public:
-    Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = "") :
-      m_type(type),
-      m_strName(strName)
-    {
-    }
-
-    explicit Peripheral(const PERIPHERAL_INFO& info) :
-      m_type(info.type),
-      m_strName(info.name ? info.name : ""),
-      m_vendorId(info.vendor_id),
-      m_productId(info.product_id),
-      m_index(info.index)
-    {
-    }
-
-    virtual ~Peripheral(void) = default;
-
-    PERIPHERAL_TYPE    Type(void) const      { return m_type; }
-    const std::string& Name(void) const      { return m_strName; }
-    uint16_t           VendorID(void) const  { return m_vendorId; }
-    uint16_t           ProductID(void) const { return m_productId; }
-    unsigned int       Index(void) const     { return m_index; }
-
-    // Derived property: VID and PID are 0x0000 if unknown
-    bool IsVidPidKnown(void) const { return m_vendorId != 0 || m_productId != 0; }
-
-    void SetType(PERIPHERAL_TYPE type)       { m_type      = type; }
-    void SetName(const std::string& strName) { m_strName   = strName; }
-    void SetVendorID(uint16_t vendorId)      { m_vendorId  = vendorId; }
-    void SetProductID(uint16_t productId)    { m_productId = productId; }
-    void SetIndex(unsigned int index)        { m_index     = index; }
-
-    void ToStruct(PERIPHERAL_INFO& info) const
-    {
-      info.type       = m_type;
-      info.name       = new char[m_strName.size() + 1];
-      info.vendor_id  = m_vendorId;
-      info.product_id = m_productId;
-      info.index      = m_index;
-
-      std::strcpy(info.name, m_strName.c_str());
-    }
-
-    static void FreeStruct(PERIPHERAL_INFO& info)
-    {
-      PERIPHERAL_SAFE_DELETE_ARRAY(info.name);
-    }
-
-  private:
-    PERIPHERAL_TYPE  m_type;
-    std::string      m_strName;
-    uint16_t         m_vendorId = 0;
-    uint16_t         m_productId = 0;
-    unsigned int     m_index = 0;
-  };
-
-  typedef PeripheralVector<Peripheral, PERIPHERAL_INFO> Peripherals;
-
-  /*!
-   * ADDON::PeripheralEvent
-   *
-   * Wrapper class for peripheral events.
-   */
-  class PeripheralEvent
-  {
-  public:
-    PeripheralEvent() = default;
-
-    PeripheralEvent(unsigned int peripheralIndex, unsigned int buttonIndex, JOYSTICK_STATE_BUTTON state) :
-      m_type(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON),
-      m_peripheralIndex(peripheralIndex),
-      m_driverIndex(buttonIndex),
-      m_buttonState(state)
-    {
-    }
-
-    PeripheralEvent(unsigned int peripheralIndex, unsigned int hatIndex, JOYSTICK_STATE_HAT state) :
-      m_type(PERIPHERAL_EVENT_TYPE_DRIVER_HAT),
-      m_peripheralIndex(peripheralIndex),
-      m_driverIndex(hatIndex),
-      m_hatState(state)
-    {
-    }
-
-    PeripheralEvent(unsigned int peripheralIndex, unsigned int axisIndex, JOYSTICK_STATE_AXIS state) :
-      m_type(PERIPHERAL_EVENT_TYPE_DRIVER_AXIS),
-      m_peripheralIndex(peripheralIndex),
-      m_driverIndex(axisIndex),
-      m_axisState(state)
-    {
-    }
-
-    explicit PeripheralEvent(const PERIPHERAL_EVENT& event) :
-      m_type(event.type),
-      m_peripheralIndex(event.peripheral_index),
-      m_driverIndex(event.driver_index),
-      m_buttonState(event.driver_button_state),
-      m_hatState(event.driver_hat_state),
-      m_axisState(event.driver_axis_state),
-      m_motorState(event.motor_state)
-    {
-    }
-
-    PERIPHERAL_EVENT_TYPE Type(void) const            { return m_type; }
-    unsigned int          PeripheralIndex(void) const { return m_peripheralIndex; }
-    unsigned int          DriverIndex(void) const     { return m_driverIndex; }
-    JOYSTICK_STATE_BUTTON ButtonState(void) const     { return m_buttonState; }
-    JOYSTICK_STATE_HAT    HatState(void) const        { return m_hatState; }
-    JOYSTICK_STATE_AXIS   AxisState(void) const       { return m_axisState; }
-    JOYSTICK_STATE_MOTOR  MotorState(void) const      { return m_motorState; }
-
-    void SetType(PERIPHERAL_EVENT_TYPE type)         { m_type            = type; }
-    void SetPeripheralIndex(unsigned int index)      { m_peripheralIndex = index; }
-    void SetDriverIndex(unsigned int index)          { m_driverIndex     = index; }
-    void SetButtonState(JOYSTICK_STATE_BUTTON state) { m_buttonState     = state; }
-    void SetHatState(JOYSTICK_STATE_HAT state)       { m_hatState        = state; }
-    void SetAxisState(JOYSTICK_STATE_AXIS state)     { m_axisState       = state; }
-    void SetMotorState(JOYSTICK_STATE_MOTOR state)   { m_motorState      = state; }
-
-    void ToStruct(PERIPHERAL_EVENT& event) const
-    {
-      event.type                = m_type;
-      event.peripheral_index    = m_peripheralIndex;
-      event.driver_index        = m_driverIndex;
-      event.driver_button_state = m_buttonState;
-      event.driver_hat_state    = m_hatState;
-      event.driver_axis_state   = m_axisState;
-      event.motor_state         = m_motorState;
-    }
-
-    static void FreeStruct(PERIPHERAL_EVENT& event)
-    {
-      (void)event;
-    }
-
-  private:
-    PERIPHERAL_EVENT_TYPE m_type = PERIPHERAL_EVENT_TYPE_NONE;
-    unsigned int          m_peripheralIndex = 0;
-    unsigned int          m_driverIndex = 0;
-    JOYSTICK_STATE_BUTTON m_buttonState = JOYSTICK_STATE_BUTTON_UNPRESSED;
-    JOYSTICK_STATE_HAT    m_hatState = JOYSTICK_STATE_HAT_UNPRESSED;
-    JOYSTICK_STATE_AXIS   m_axisState = 0.0f;
-    JOYSTICK_STATE_MOTOR  m_motorState = 0.0f;
-  };
-
-  typedef PeripheralVector<PeripheralEvent, PERIPHERAL_EVENT> PeripheralEvents;
-
-  /*!
-   * kodi::addon::Joystick
-   *
-   * Wrapper class providing additional joystick information not provided by
-   * ADDON::Peripheral.
-   */
-  class Joystick : public Peripheral
-  {
-  public:
-    Joystick(const std::string& provider = "", const std::string& strName = "") :
-      Peripheral(PERIPHERAL_TYPE_JOYSTICK, strName),
-      m_provider(provider),
-      m_requestedPort(NO_PORT_REQUESTED)
-    {
-    }
-
-    Joystick(const Joystick& other)
-    {
-      *this = other;
-    }
-
-    explicit Joystick(const JOYSTICK_INFO& info) :
-      Peripheral(info.peripheral),
-      m_provider(info.provider ? info.provider : ""),
-      m_requestedPort(info.requested_port),
-      m_buttonCount(info.button_count),
-      m_hatCount(info.hat_count),
-      m_axisCount(info.axis_count),
-      m_motorCount(info.motor_count),
-      m_supportsPowerOff(info.supports_poweroff)
-    {
-    }
-
-    ~Joystick(void) override = default;
-
-    Joystick& operator=(const Joystick& rhs)
-    {
-      if (this != &rhs)
-      {
-        Peripheral::operator=(rhs);
-
-        m_provider      = rhs.m_provider;
-        m_requestedPort = rhs.m_requestedPort;
-        m_buttonCount   = rhs.m_buttonCount;
-        m_hatCount      = rhs.m_hatCount;
-        m_axisCount     = rhs.m_axisCount;
-        m_motorCount    = rhs.m_motorCount;
-        m_supportsPowerOff = rhs.m_supportsPowerOff;
-      }
-      return *this;
-    }
-
-    const std::string& Provider(void) const      { return m_provider; }
-    int                RequestedPort(void) const { return m_requestedPort; }
-    unsigned int       ButtonCount(void) const   { return m_buttonCount; }
-    unsigned int       HatCount(void) const      { return m_hatCount; }
-    unsigned int       AxisCount(void) const     { return m_axisCount; }
-    unsigned int       MotorCount(void) const    { return m_motorCount; }
-    bool               SupportsPowerOff(void) const { return m_supportsPowerOff; }
-
-    void SetProvider(const std::string& provider)     { m_provider      = provider; }
-    void SetRequestedPort(int requestedPort)          { m_requestedPort = requestedPort; }
-    void SetButtonCount(unsigned int buttonCount)     { m_buttonCount   = buttonCount; }
-    void SetHatCount(unsigned int hatCount)           { m_hatCount      = hatCount; }
-    void SetAxisCount(unsigned int axisCount)         { m_axisCount     = axisCount; }
-    void SetMotorCount(unsigned int motorCount)       { m_motorCount    = motorCount; }
-    void SetSupportsPowerOff(bool supportsPowerOff)   { m_supportsPowerOff = supportsPowerOff; }
-
-    void ToStruct(JOYSTICK_INFO& info) const
-    {
-      Peripheral::ToStruct(info.peripheral);
-
-      info.provider       = new char[m_provider.size() + 1];
-      info.requested_port = m_requestedPort;
-      info.button_count   = m_buttonCount;
-      info.hat_count      = m_hatCount;
-      info.axis_count     = m_axisCount;
-      info.motor_count    = m_motorCount;
-      info.supports_poweroff = m_supportsPowerOff;
-
-      std::strcpy(info.provider, m_provider.c_str());
-    }
-
-    static void FreeStruct(JOYSTICK_INFO& info)
-    {
-      Peripheral::FreeStruct(info.peripheral);
-
-      PERIPHERAL_SAFE_DELETE_ARRAY(info.provider);
-    }
-
-  private:
-    std::string                   m_provider;
-    int                           m_requestedPort;
-    unsigned int                  m_buttonCount = 0;
-    unsigned int                  m_hatCount = 0;
-    unsigned int                  m_axisCount = 0;
-    unsigned int                  m_motorCount = 0;
-    bool                          m_supportsPowerOff = false;
-  };
-
-  typedef PeripheralVector<Joystick, JOYSTICK_INFO> Joysticks;
-
-  /*!
-   * ADDON::DriverPrimitive
-   *
-   * Base class for joystick driver primitives. A driver primitive can be:
-   *
-   *   1) a button
-   *   2) a hat direction
-   *   3) a semiaxis (either the positive or negative half of an axis)
-   *   4) a motor
-   *   5) a keyboard key
-   *   6) a mouse button
-   *   7) a relative pointer direction
-   *
-   * The type determines the fields in use:
-   *
-   *    Button:
-   *       - driver index
-   *
-   *    Hat direction:
-   *       - driver index
-   *       - hat direction
-   *
-   *    Semiaxis:
-   *       - driver index
-   *       - center
-   *       - semiaxis direction
-   *       - range
-   *
-   *    Motor:
-   *       - driver index
-   *
-   *    Key:
-   *       - key code
-   *
-   *    Mouse button:
-   *       - driver index
-   *
-   *    Relative pointer direction:
-   *       - relative pointer direction
-   */
-  struct DriverPrimitive
-  {
-  protected:
-    /*!
-     * \brief Construct a driver primitive of the specified type
-     */
-    DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE type, unsigned int driverIndex) :
-      m_type(type),
-      m_driverIndex(driverIndex)
-    {
-    }
-
-  public:
-    /*!
-     * \brief Construct an invalid driver primitive
-     */
-    DriverPrimitive(void) = default;
-
-    /*!
-     * \brief Construct a driver primitive representing a joystick button
-     */
-    static DriverPrimitive CreateButton(unsigned int buttonIndex)
-    {
-      return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON, buttonIndex);
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing one of the four direction
-     *        arrows on a dpad
-     */
-    DriverPrimitive(unsigned int hatIndex, JOYSTICK_DRIVER_HAT_DIRECTION direction) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
-      m_driverIndex(hatIndex),
-      m_hatDirection(direction)
-    {
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing the positive or negative
-     *        half of an axis
-     */
-    DriverPrimitive(unsigned int axisIndex, int center, JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction, unsigned int range) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS),
-      m_driverIndex(axisIndex),
-      m_center(center),
-      m_semiAxisDirection(direction),
-      m_range(range)
-    {
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing a motor
-     */
-    static DriverPrimitive CreateMotor(unsigned int motorIndex)
-    {
-      return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR, motorIndex);
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing a key on a keyboard
-     */
-    DriverPrimitive(std::string keycode) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY),
-      m_keycode(std::move(keycode))
-    {
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing a mouse button
-     */
-    static DriverPrimitive CreateMouseButton(JOYSTICK_DRIVER_MOUSE_INDEX buttonIndex)
-    {
-      return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON, static_cast<unsigned int>(buttonIndex));
-    }
-
-    /*!
-     * \brief Construct a driver primitive representing one of the four
-     *        direction in which a relative pointer can move
-     */
-    DriverPrimitive(JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION),
-      m_relPointerDirection(direction)
-    {
-    }
-
-    explicit DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) :
-      m_type(primitive.type)
-    {
-      switch (m_type)
-      {
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
-        {
-          m_driverIndex = primitive.button.index;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
-        {
-          m_driverIndex  = primitive.hat.index;
-          m_hatDirection = primitive.hat.direction;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
-        {
-          m_driverIndex       = primitive.semiaxis.index;
-          m_center            = primitive.semiaxis.center;
-          m_semiAxisDirection = primitive.semiaxis.direction;
-          m_range             = primitive.semiaxis.range;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
-        {
-          m_driverIndex = primitive.motor.index;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
-        {
-          m_keycode = primitive.key.keycode;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
-        {
-          m_driverIndex = primitive.mouse.button;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
-        {
-          m_relPointerDirection = primitive.relpointer.direction;
-          break;
-        }
-        default:
-          break;
-      }
-    }
-
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE     Type(void) const { return m_type; }
-    unsigned int                       DriverIndex(void) const { return m_driverIndex; }
-    JOYSTICK_DRIVER_HAT_DIRECTION      HatDirection(void) const { return m_hatDirection; }
-    int                                Center(void) const { return m_center; }
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION SemiAxisDirection(void) const { return m_semiAxisDirection; }
-    unsigned int                       Range(void) const { return m_range; }
-    const std::string&                 Keycode(void) const { return m_keycode; }
-    JOYSTICK_DRIVER_MOUSE_INDEX        MouseIndex(void) const { return static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex); }
-    JOYSTICK_DRIVER_RELPOINTER_DIRECTION RelPointerDirection(void) const { return m_relPointerDirection; }
-
-    bool operator==(const DriverPrimitive& other) const
-    {
-      if (m_type == other.m_type)
-      {
-        switch (m_type)
-        {
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
-          {
-            return m_driverIndex == other.m_driverIndex;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
-          {
-            return m_driverIndex  == other.m_driverIndex &&
-                   m_hatDirection == other.m_hatDirection;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
-          {
-            return m_driverIndex       == other.m_driverIndex &&
-                   m_center            == other.m_center &&
-                   m_semiAxisDirection == other.m_semiAxisDirection &&
-                   m_range             == other.m_range;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
-          {
-            return m_keycode == other.m_keycode;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
-          {
-            return m_driverIndex == other.m_driverIndex;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
-          {
-            return m_driverIndex == other.m_driverIndex;
-          }
-          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
-          {
-            return m_relPointerDirection == other.m_relPointerDirection;
-          }
-          default:
-            break;
-        }
-      }
-      return false;
-    }
-
-    void ToStruct(JOYSTICK_DRIVER_PRIMITIVE& driver_primitive) const
-    {
-      driver_primitive.type = m_type;
-      switch (m_type)
-      {
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
-        {
-          driver_primitive.button.index = m_driverIndex;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
-        {
-          driver_primitive.hat.index     = m_driverIndex;
-          driver_primitive.hat.direction = m_hatDirection;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
-        {
-          driver_primitive.semiaxis.index     = m_driverIndex;
-          driver_primitive.semiaxis.center    = m_center;
-          driver_primitive.semiaxis.direction = m_semiAxisDirection;
-          driver_primitive.semiaxis.range     = m_range;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
-        {
-          driver_primitive.motor.index = m_driverIndex;
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
-        {
-          const size_t size = sizeof(driver_primitive.key.keycode);
-          std::strncpy(driver_primitive.key.keycode, m_keycode.c_str(), size - 1);
-          driver_primitive.key.keycode[size - 1] = '\0';
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
-        {
-          driver_primitive.mouse.button = static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex);
-          break;
-        }
-        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
-        {
-          driver_primitive.relpointer.direction = m_relPointerDirection;
-          break;
-        }
-        default:
-          break;
-      }
-    }
-
-    static void FreeStruct(JOYSTICK_DRIVER_PRIMITIVE& primitive)
-    {
-      (void)primitive;
-    }
-
-  private:
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type = JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN;
-    unsigned int                       m_driverIndex = 0;
-    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection = JOYSTICK_DRIVER_HAT_UNKNOWN;
-    int                                m_center = 0;
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection = JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
-    unsigned int                       m_range = 1;
-    std::string                        m_keycode;
-    JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection = JOYSTICK_DRIVER_RELPOINTER_UNKNOWN;
-  };
-
-  typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
-
-  /*!
-   * kodi::addon::JoystickFeature
-   *
-   * Class for joystick features. A feature can be:
-   *
-   *   1) scalar[1]
-   *   2) analog stick
-   *   3) accelerometer
-   *   4) motor
-   *   5) relative pointer[2]
-   *   6) absolute pointer
-   *   7) wheel
-   *   8) throttle
-   *   9) keyboard key
-   *
-   * [1] All three driver primitives (buttons, hats and axes) have a state that
-   *     can be represented using a single scalar value. For this reason,
-   *     features that map to a single primitive are called "scalar features".
-   *
-   * [2] Relative pointers are similar to analog sticks, but they use
-   *     relative distances instead of positions.
-   */
-  class JoystickFeature
-  {
-  public:
-    JoystickFeature(const std::string& name = "", JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN) :
-      m_name(name),
-      m_type(type),
-      m_primitives{}
-    {
-    }
-
-    JoystickFeature(const JoystickFeature& other)
-    {
-      *this = other;
-    }
-
-    explicit JoystickFeature(const JOYSTICK_FEATURE& feature) :
-      m_name(feature.name ? feature.name : ""),
-      m_type(feature.type)
-    {
-      for (unsigned int i = 0; i < JOYSTICK_PRIMITIVE_MAX; i++)
-        m_primitives[i] = DriverPrimitive(feature.primitives[i]);
-    }
-
-    JoystickFeature& operator=(const JoystickFeature& rhs)
-    {
-      if (this != &rhs)
-      {
-        m_name = rhs.m_name;
-        m_type = rhs.m_type;
-        m_primitives = rhs.m_primitives;
-      }
-      return *this;
-    }
-
-    bool operator==(const JoystickFeature& other) const
-    {
-      return m_name == other.m_name &&
-             m_type == other.m_type &&
-             m_primitives == other.m_primitives;
-    }
-
-    const std::string& Name(void) const { return m_name; }
-    JOYSTICK_FEATURE_TYPE Type(void) const { return m_type; }
-    bool IsValid() const { return m_type != JOYSTICK_FEATURE_TYPE_UNKNOWN; }
-
-    void SetName(const std::string& name) { m_name = name; }
-    void SetType(JOYSTICK_FEATURE_TYPE type) { m_type = type; }
-    void SetInvalid(void) { m_type = JOYSTICK_FEATURE_TYPE_UNKNOWN; }
-
-    const DriverPrimitive& Primitive(JOYSTICK_FEATURE_PRIMITIVE which) const { return m_primitives[which]; }
-    void SetPrimitive(JOYSTICK_FEATURE_PRIMITIVE which, const DriverPrimitive& primitive) { m_primitives[which] = primitive; }
-
-    std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX>& Primitives() { return m_primitives; }
-    const std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX>& Primitives() const { return m_primitives; }
-
-    void ToStruct(JOYSTICK_FEATURE& feature) const
-    {
-      feature.name = new char[m_name.length() + 1];
-      feature.type = m_type;
-      for (unsigned int i = 0; i < JOYSTICK_PRIMITIVE_MAX; i++)
-        m_primitives[i].ToStruct(feature.primitives[i]);
-
-      std::strcpy(feature.name, m_name.c_str());
-    }
-
-    static void FreeStruct(JOYSTICK_FEATURE& feature)
-    {
-      PERIPHERAL_SAFE_DELETE_ARRAY(feature.name);
-    }
-
-  private:
-    std::string                  m_name;
-    JOYSTICK_FEATURE_TYPE        m_type;
-    std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX> m_primitives;
-  };
-
-  typedef PeripheralVector<JoystickFeature, JOYSTICK_FEATURE> JoystickFeatures;
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
deleted file mode 100644
index f8a7380..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-#include "../gui/renderHelper.h"
-
-namespace kodi { namespace addon { class CInstanceScreensaver; }}
-
-extern "C"
-{
-
-struct AddonInstance_Screensaver;
-
-/*!
- * @brief Screensaver properties
- *
- * Not to be used outside this header.
- */
-typedef struct AddonProps_Screensaver
-{
-  void *device;
-  int x;
-  int y;
-  int width;
-  int height;
-  float pixelRatio;
-  const char *name;
-  const char *presets;
-  const char *profile;
-} AddonProps_Screensaver;
-
-/*!
- * @brief Screensaver callbacks
- *
- * Not to be used outside this header.
- */
-typedef struct AddonToKodiFuncTable_Screensaver
-{
-  KODI_HANDLE kodiInstance;
-} AddonToKodiFuncTable_Screensaver;
-
-/*!
- * @brief Screensaver function hooks
- *
- * Not to be used outside this header.
- */
-typedef struct KodiToAddonFuncTable_Screensaver
-{
-  kodi::addon::CInstanceScreensaver* addonInstance;
-  bool (__cdecl* Start) (AddonInstance_Screensaver* instance);
-  void (__cdecl* Stop) (AddonInstance_Screensaver* instance);
-  void (__cdecl* Render) (AddonInstance_Screensaver* instance);
-} KodiToAddonFuncTable_Screensaver;
-
-/*!
- * @brief Screensaver instance
- *
- * Not to be used outside this header.
- */
-typedef struct AddonInstance_Screensaver
-{
-  AddonProps_Screensaver props;
-  AddonToKodiFuncTable_Screensaver toKodi;
-  KodiToAddonFuncTable_Screensaver toAddon;
-} AddonInstance_Screensaver;
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-  //============================================================================
-  ///
-  /// \addtogroup cpp_kodi_addon_screensaver
-  /// @brief \cpp_class{ kodi::addon::CInstanceScreensaver }
-  /// **Screensaver add-on instance**
-  ///
-  /// A screensaver is a Kodi addon that fills the screen with moving images or
-  /// patterns when the computer is not in use. Initially designed to prevent
-  /// phosphor burn-in on CRT and plasma computer monitors (hence the name),
-  /// screensavers are now used primarily for entertainment, security or to
-  /// display system status information.
-  ///
-  /// Include the header \ref ScreenSaver.h "#include <kodi/addon-instance/ScreenSaver.h>"
-  /// to use this class.
-  ///
-  /// This interface allows the creating of screensavers for Kodi, based upon
-  /// **DirectX** or/and **OpenGL** rendering with `C++` code.
-  ///
-  /// The interface is small and easy usable. It has three functions:
-  ///
-  /// * <b><c>Start()</c></b> - Called on creation
-  /// * <b><c>Render()</c></b> - Called at render time
-  /// * <b><c>Stop()</c></b> - Called when the screensaver has no work
-  ///
-  /// Additionally, there are several \ref cpp_kodi_addon_screensaver_CB "other functions"
-  /// available in which the child class can ask about the current hardware,
-  /// including the device, display and several other parts.
-  ///
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  ///
-  /// **Here is an example of the minimum required code to start a screensaver:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/addon-instance/Screensaver.h>
-  ///
-  /// class CMyScreenSaver : public kodi::addon::CAddonBase,
-  ///                        public kodi::addon::CInstanceScreensaver
-  /// {
-  /// public:
-  ///   CMyScreenSaver();
-  ///
-  ///   bool Start() override;
-  ///   void Render() override;
-  /// };
-  ///
-  /// CMyScreenSaver::CMyScreenSaver()
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// bool CMyScreenSaver::Start()
-  /// {
-  ///   ...
-  ///   return true;
-  /// }
-  ///
-  /// void CMyScreenSaver::Render()
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// ADDONCREATOR(CMyScreenSaver)
-  /// ~~~~~~~~~~~~~
-  ///
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  ///
-  /// **Here is another example where the screensaver is used together with
-  /// other instance types:**
-  ///
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/addon-instance/Screensaver.h>
-  ///
-  /// class CMyScreenSaver : public ::kodi::addon::CInstanceScreensaver
-  /// {
-  /// public:
-  ///   CMyScreenSaver(KODI_HANDLE instance);
-  ///
-  ///   bool Start() override;
-  ///   void Render() override;
-  /// };
-  ///
-  /// CMyScreenSaver::CMyScreenSaver(KODI_HANDLE instance)
-  ///   : CInstanceScreensaver(instance)
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// bool CMyScreenSaver::Start()
-  /// {
-  ///   ...
-  ///   return true;
-  /// }
-  ///
-  /// void CMyScreenSaver::Render()
-  /// {
-  ///   ...
-  /// }
-  ///
-  ///
-  /// /*----------------------------------------------------------------------*/
-  ///
-  /// class CMyAddon : public ::kodi::addon::CAddonBase
-  /// {
-  /// public:
-  ///   CMyAddon() { }
-  ///   ADDON_STATUS CreateInstance(int instanceType,
-  ///                               std::string instanceID,
-  ///                               KODI_HANDLE instance,
-  ///                               KODI_HANDLE& addonInstance) override;
-  /// };
-  ///
-  /// /* If you use only one instance in your add-on, can be instanceType and
-  ///  * instanceID ignored */
-  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
-  ///                                       std::string instanceID,
-  ///                                       KODI_HANDLE instance,
-  ///                                       KODI_HANDLE& addonInstance)
-  /// {
-  ///   if (instanceType == ADDON_INSTANCE_SCREENSAVER)
-  ///   {
-  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Screensaver");
-  ///     addonInstance = new CMyScreenSaver(instance);
-  ///     return ADDON_STATUS_OK;
-  ///   }
-  ///   else if (...)
-  ///   {
-  ///     ...
-  ///   }
-  ///   return ADDON_STATUS_UNKNOWN;
-  /// }
-  ///
-  /// ADDONCREATOR(CMyAddon)
-  /// ~~~~~~~~~~~~~
-  ///
-  /// The destruction of the example class `CMyScreenSaver` is called from
-  /// Kodi's header. Manually deleting the add-on instance is not required.
-  ///
-  //----------------------------------------------------------------------------
-  class ATTRIBUTE_HIDDEN CInstanceScreensaver : public IAddonInstance
-  {
-  public:
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Screensaver class constructor
-    ///
-    /// Used by an add-on that only supports screensavers.
-    ///
-    CInstanceScreensaver()
-      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER, GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of more as one in single instance way is not allowed!");
-
-      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
-      CAddonBase::m_interface->globalSingleInstance = this;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Screensaver class constructor used to support multiple instance
-    /// types
-    ///
-    /// @param[in] instance               The instance value given to
-    ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
-    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
-    ///                        allow compatibility to older Kodi versions.
-    ///                        @note Recommended to set.
-    ///
-    /// @warning Only use `instance` from the CreateInstance call
-    ///
-    explicit CInstanceScreensaver(KODI_HANDLE instance, const std::string& kodiVersion = "")
-      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER,
-                       !kodiVersion.empty() ? kodiVersion
-                                            : GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Destructor
-    ///
-    ~CInstanceScreensaver() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Used to notify the screensaver that it has been started
-    ///
-    /// @return                         true if the screensaver was started
-    ///                                 successfully, false otherwise
-    ///
-    virtual bool Start() { return true; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Used to inform the screensaver that the rendering control was
-    /// stopped
-    ///
-    virtual void Stop() {}
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver
-    /// @brief Used to indicate when the add-on should render
-    ///
-    virtual void Render() {}
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \defgroup cpp_kodi_addon_screensaver_CB Information functions
-    /// \ingroup cpp_kodi_addon_screensaver
-    /// @brief **To get info about the device, display and several other parts**
-    ///
-    //@{
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Device that represents the display adapter
-    ///
-    /// @return A pointer to the device
-    ///
-    /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
-    /// **OpenGL**
-    ///
-    inline void* Device() { return m_instanceData->props.device; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Returns the X position of the rendering window
-    ///
-    /// @return The X position, in pixels
-    ///
-    inline int X() { return m_instanceData->props.x; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Returns the Y position of the rendering window
-    ///
-    /// @return The Y position, in pixels
-    ///
-    inline int Y() { return m_instanceData->props.y; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Returns the width of the rendering window
-    ///
-    /// @return The width, in pixels
-    ///
-    inline int Width() { return m_instanceData->props.width; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Returns the height of the rendering window
-    ///
-    /// @return The height, in pixels
-    ///
-    inline int Height() { return m_instanceData->props.height; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
-    /// describes how the width of a pixel compares to the height of that pixel.
-    ///
-    /// @return The pixel aspect ratio used by the display
-    ///
-    inline float PixelRatio() { return m_instanceData->props.pixelRatio; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Used to get the name of the add-on defined in `addon.xml`
-    ///
-    /// @return The add-on name
-    ///
-    inline std::string Name() { return m_instanceData->props.name; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Used to get the full path where the add-on is installed
-    ///
-    /// @return The add-on installation path
-    ///
-    inline std::string Presets() { return m_instanceData->props.presets; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_screensaver_CB
-    /// @brief Used to get the full path to the add-on's user profile
-    ///
-    /// @note The trailing folder (consisting of the add-on's ID) is not created
-    /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
-    /// to create the folder.
-    ///
-    /// @return Path to the user profile
-    ///
-    inline std::string Profile() { return m_instanceData->props.profile; }
-    //--------------------------------------------------------------------------
-    //@}
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_Screensaver*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.Start = ADDON_Start;
-      m_instanceData->toAddon.Stop = ADDON_Stop;
-      m_instanceData->toAddon.Render = ADDON_Render;
-    }
-
-    inline static bool ADDON_Start(AddonInstance_Screensaver* instance)
-    {
-      instance->toAddon.addonInstance->m_renderHelper = kodi::gui::GetRenderHelper();
-      return instance->toAddon.addonInstance->Start();
-    }
-
-    inline static void ADDON_Stop(AddonInstance_Screensaver* instance)
-    {
-      instance->toAddon.addonInstance->Stop();
-      instance->toAddon.addonInstance->m_renderHelper = nullptr;
-    }
-
-    inline static void ADDON_Render(AddonInstance_Screensaver* instance)
-    {
-      if (!instance->toAddon.addonInstance->m_renderHelper)
-        return;
-      instance->toAddon.addonInstance->m_renderHelper->Begin();
-      instance->toAddon.addonInstance->Render();
-      instance->toAddon.addonInstance->m_renderHelper->End();
-    }
-
-    /*
-     * Background render helper holds here and in addon base.
-     * In addon base also to have for the others, and stored here for the worst
-     * case where this class is independent from base and base becomes closed
-     * before.
-     *
-     * This is on Kodi with GL unused and the calls to there are empty (no work)
-     * On Kodi with Direct X where angle is present becomes this used.
-     */
-    std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
-    AddonInstance_Screensaver* m_instanceData;
-  };
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
deleted file mode 100644
index 4be785d..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-/*
- * Parts with a comment named "internal" are only used inside header and not
- * used or accessed direct during add-on development!
- */
-
-#include "../AddonBase.h"
-#include "../gui/renderHelper.h"
-
-namespace kodi { namespace addon { class CInstanceVisualization; }}
-
-extern "C"
-{
-
-struct AddonInstance_Visualization;
-
-typedef enum VIS_ACTION : unsigned int /* internal */
-{
-  VIS_ACTION_NONE = 0,
-  VIS_ACTION_NEXT_PRESET,
-  VIS_ACTION_PREV_PRESET,
-  VIS_ACTION_LOAD_PRESET,
-  VIS_ACTION_RANDOM_PRESET,
-  VIS_ACTION_LOCK_PRESET,
-  VIS_ACTION_RATE_PRESET_PLUS,
-  VIS_ACTION_RATE_PRESET_MINUS,
-  VIS_ACTION_UPDATE_ALBUMART,
-  VIS_ACTION_UPDATE_TRACK
-} VIS_ACTION;
-
-struct VIS_INFO /* internal */
-{
-  bool bWantsFreq;
-  int iSyncDelay;
-};
-
-typedef struct AddonProps_Visualization /* internal */
-{
-  void *device;
-  int x;
-  int y;
-  int width;
-  int height;
-  float pixelRatio;
-  const char *name;
-  const char *presets;
-  const char *profile;
-} AddonProps_Visualization;
-
-typedef struct AddonToKodiFuncTable_Visualization /* internal */
-{
-  KODI_HANDLE kodiInstance;
-  void (__cdecl* transfer_preset) (void* kodiInstance, const char* preset);
-  void (__cdecl* clear_presets) (void* kodiInstance);
-} AddonToKodiFuncTable_Visualization;
-
-typedef struct KodiToAddonFuncTable_Visualization /* internal */
-{
-  kodi::addon::CInstanceVisualization* addonInstance;
-  bool (__cdecl* start)(const AddonInstance_Visualization* instance, int channels, int samples_per_sec, int bits_per_sample, const char* song_name);
-  void (__cdecl* stop)(const AddonInstance_Visualization* instance);
-  void (__cdecl* audio_data)(const AddonInstance_Visualization* instance, const float* audio_data, int audio_data_length, float *freq_data, int freq_data_length);
-  bool (__cdecl* is_dirty)(const AddonInstance_Visualization* instance);
-  void (__cdecl* render)(const AddonInstance_Visualization* instance);
-  void (__cdecl* get_info)(const AddonInstance_Visualization* instance, VIS_INFO *info);
-  bool (__cdecl* on_action)(const AddonInstance_Visualization* instance, VIS_ACTION action, const void *param);
-  unsigned int (__cdecl *get_presets)(const AddonInstance_Visualization* instance);
-  int (__cdecl *get_active_preset)(const AddonInstance_Visualization* instance);
-  bool (__cdecl* is_locked)(const AddonInstance_Visualization* instance);
-} KodiToAddonFuncTable_Visualization;
-
-typedef struct AddonInstance_Visualization /* internal */
-{
-  AddonProps_Visualization* props;
-  AddonToKodiFuncTable_Visualization* toKodi;
-  KodiToAddonFuncTable_Visualization* toAddon;
-} AddonInstance_Visualization;
-
-//============================================================================
-/// \defgroup cpp_kodi_addon_visualization_VisTrack class VisTrack
-/// \ingroup cpp_kodi_addon_visualization
-/// @brief **Visualization track information structure**
-///
-/// Called from kodi::addon::CInstanceVisualization::UpdateTrack() with the
-/// information of the currently-playing song.
-///
-//@{
-struct VisTrack
-{
-  /// @brief Title of the current song.
-  const char *title;
-
-  /// @brief Artist names, as a single string
-  const char *artist;
-
-  /// @brief Album that the current song is from.
-  const char *album;
-
-  /// @brief Album artist names, as a single string
-  const char *albumArtist;
-
-  /// @brief The genre name from the music tag, if present.
-  const char *genre;
-
-  /// @brief Comment of the current song stored in the ID tag info.
-  const char *comment;
-
-  /// @brief Lyrics of the current song, if available.
-  const char *lyrics;
-
-  const char *reserved1;
-  const char *reserved2;
-
-  /// @brief Track number of the current song.
-  int trackNumber;
-
-  /// @brief Disc number of the current song stored in the ID tag info.
-  int discNumber;
-
-  /// @brief Duration of the current song, in seconds.
-  int duration;
-
-  /// @brief Year that the current song was released.
-  int year;
-
-  /// @brief The user-defined rating of the current song.
-  int rating;
-
-  int reserved3;
-  int reserved4;
-};
-//@}
-//----------------------------------------------------------------------------
-
-} /* extern "C" */
-
-namespace kodi
-{
-namespace addon
-{
-
-  //============================================================================
-  ///
-  /// \addtogroup cpp_kodi_addon_visualization
-  /// @brief \cpp_class{ kodi::addon::CInstanceVisualization }
-  /// **Visualization add-on instance**
-  ///
-  /// [Music visualization](https://en.wikipedia.org/wiki/Music_visualization),
-  /// or music visualisation, is a feature in Kodi that generates animated
-  /// imagery based on a piece of music. The imagery is usually generated and
-  /// rendered in real time synchronized to the music.
-  ///
-  /// Visualization techniques range from simple ones (e.g., a simulation of an
-  /// oscilloscope display) to elaborate ones, which often include a plurality
-  /// of composited effects. The changes in the music's loudness and frequency
-  /// spectrum are among the properties used as input to the visualization.
-  ///
-  /// Include the header \ref Visualization.h "#include <kodi/addon-instance/Visualization.h>"
-  /// to use this class.
-  ///
-  /// This interface allows the creation of visualizations for Kodi, based upon
-  /// **DirectX** or/and **OpenGL** rendering with `C++` code.
-  ///
-  /// Additionally, there are several \ref cpp_kodi_addon_visualization_CB "other functions"
-  /// available in which the child class can ask about the current hardware,
-  /// including the device, display and several other parts.
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  ///
-  /// **Here is an example of the minimum required code to start a visualization:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/addon-instance/Visualization.h>
-  ///
-  /// class CMyVisualization : public kodi::addon::CAddonBase,
-  ///                          public kodi::addon::CInstanceVisualization
-  /// {
-  /// public:
-  ///   CMyVisualization();
-  ///
-  ///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
-  ///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
-  ///   void Render() override;
-  /// };
-  ///
-  /// CMyVisualization::CMyVisualization()
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
-  /// {
-  ///   ...
-  ///   return true;
-  /// }
-  ///
-  /// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// void CMyVisualization::Render()
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// ADDONCREATOR(CMyVisualization)
-  /// ~~~~~~~~~~~~~
-  ///
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  ///
-  /// **Here is another example where the visualization is used together with
-  /// other instance types:**
-  ///
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/addon-instance/Visualization.h>
-  ///
-  /// class CMyVisualization : public ::kodi::addon::CInstanceVisualization
-  /// {
-  /// public:
-  ///   CMyVisualization(KODI_HANDLE instance);
-  ///
-  ///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
-  ///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
-  ///   void Render() override;
-  /// };
-  ///
-  /// CMyVisualization::CMyVisualization(KODI_HANDLE instance)
-  ///   : CInstanceVisualization(instance)
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
-  /// {
-  ///   ...
-  ///   return true;
-  /// }
-  ///
-  /// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
-  /// {
-  ///   ...
-  /// }
-  ///
-  /// void CMyVisualization::Render()
-  /// {
-  ///   ...
-  /// }
-  ///
-  ///
-  /// /*----------------------------------------------------------------------*/
-  ///
-  /// class CMyAddon : public ::kodi::addon::CAddonBase
-  /// {
-  /// public:
-  ///   CMyAddon() { }
-  ///   ADDON_STATUS CreateInstance(int instanceType,
-  ///                               std::string instanceID,
-  ///                               KODI_HANDLE instance,
-  ///                               KODI_HANDLE& addonInstance) override;
-  /// };
-  ///
-  /// /* If you use only one instance in your add-on, can be instanceType and
-  ///  * instanceID ignored */
-  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
-  ///                                       std::string instanceID,
-  ///                                       KODI_HANDLE instance,
-  ///                                       KODI_HANDLE& addonInstance)
-  /// {
-  ///   if (instanceType == ADDON_INSTANCE_VISUALIZATION)
-  ///   {
-  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Visualization");
-  ///     addonInstance = new CMyVisualization(instance);
-  ///     return ADDON_STATUS_OK;
-  ///   }
-  ///   else if (...)
-  ///   {
-  ///     ...
-  ///   }
-  ///   return ADDON_STATUS_UNKNOWN;
-  /// }
-  ///
-  /// ADDONCREATOR(CMyAddon)
-  /// ~~~~~~~~~~~~~
-  ///
-  /// The destruction of the example class `CMyVisualization` is called from
-  /// Kodi's header. Manually deleting the add-on instance is not required.
-  ///
-  //----------------------------------------------------------------------------
-  class ATTRIBUTE_HIDDEN CInstanceVisualization : public IAddonInstance
-  {
-  public:
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Visualization class constructor
-    ///
-    /// Used by an add-on that only supports visualizations.
-    ///
-    CInstanceVisualization()
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION,
-                       GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceVisualization: Cannot create multiple instances of add-on.");
-
-      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
-      CAddonBase::m_interface->globalSingleInstance = this;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Visualization class constructor used to support multiple instance
-    /// types
-    ///
-    /// @param[in] instance               The instance value given to
-    ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
-    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
-    ///                        allow compatibility to older Kodi versions.
-    ///                        @note Recommended to set.
-    ///
-    /// @warning Only use `instance` from the CreateInstance call
-    ///
-    explicit CInstanceVisualization(KODI_HANDLE instance, const std::string& kodiVersion = "")
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION,
-                       !kodiVersion.empty() ? kodiVersion
-                                            : GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceVisualization: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Destructor
-    ///
-    ~CInstanceVisualization() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to notify the visualization that a new song has been started
-    ///
-    /// @param[in] channels             Number of channels in the stream
-    /// @param[in] samplesPerSec        Samples per second of stream
-    /// @param[in] bitsPerSample        Number of bits in one sample
-    /// @param[in] songName             The name of the currently-playing song
-    /// @return                         true if start successful done
-    ///
-    virtual bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) { return true; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to inform the visualization that the rendering control was
-    /// stopped
-    ///
-    virtual void Stop() {}
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Pass audio data to the visualization
-    ///
-    /// @param[in] audioData            The raw audio data
-    /// @param[in] audioDataLength      Length of the audioData array
-    /// @param[in] freqData             The [FFT](https://en.wikipedia.org/wiki/Fast_Fourier_transform)
-    ///                                 of the audio data
-    /// @param[in] freqDataLength       Length of frequency data array
-    ///
-    /// Values **freqData** and **freqDataLength** are used if GetInfo() returns
-    /// true for the `wantsFreq` parameter. Otherwise, **freqData** is set to
-    /// `nullptr` and **freqDataLength** is `0`.
-    ///
-    virtual void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) {}
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to inform Kodi that the rendered region is dirty and need an
-    /// update
-    ///
-    /// @return True if dirty
-    ///
-    virtual bool IsDirty() { return true; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to indicate when the add-on should render
-    ///
-    virtual void Render() {}
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to get the number of buffers from the current visualization
-    ///
-    /// @param[out] wantsFreq           Indicates whether the add-on wants FFT
-    ///                                 data. If set to true, the **freqData**
-    ///                                 and **freqDataLength** parameters of
-    ///                                 AudioData() are used
-    /// @param[out] syncDelay           The number of buffers to delay before
-    ///                                 calling AudioData()
-    ///
-    /// @note If this function is not implemented, it will default to
-    /// `wantsFreq` = false and `syncDelay` = 0.
-    ///
-    virtual void GetInfo(bool& wantsFreq, int& syncDelay) { wantsFreq = false; syncDelay = 0; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to get a list of visualization presets the user can select
-    /// from
-    ///
-    /// @param[out] presets             The vector list containing the names of
-    ///                                 presets that the user can select
-    /// @return                         Return true if successful, or false if
-    ///                                 there are no presets to choose from
-    ///
-    virtual bool GetPresets(std::vector<std::string>& presets) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Get the index of the current preset
-    ///
-    /// @return                         Index number of the current preset
-    ///
-    virtual int GetActivePreset() { return -1; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Check if the add-on is locked to the current preset
-    ///
-    /// @return                         True if locked to the current preset
-    ///
-    virtual bool IsLocked() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Load the previous visualization preset
-    ///
-    /// @return                 Return true if the previous preset was loaded
-    virtual bool PrevPreset() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Load the next visualization preset
-    ///
-    /// @return                 Return true if the next preset was loaded
-    virtual bool NextPreset() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Load a visualization preset
-    ///
-    /// This function is called after a new preset is selected.
-    ///
-    /// @param[in] select       Preset index to use
-    /// @return                 Return true if the preset is loaded
-    virtual bool LoadPreset(int select) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Switch to a new random preset
-    ///
-    /// @return                 Return true if a random preset was loaded
-    virtual bool RandomPreset() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Lock the current visualization preset, preventing it from changing
-    ///
-    /// @param[in] lockUnlock   If set to true, the preset should be locked
-    /// @return                 Return true if the current preset is locked
-    virtual bool LockPreset(bool lockUnlock) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Used to increase/decrease the visualization preset rating
-    ///
-    /// @param[in] plusMinus    If set to true the rating is increased, otherwise
-    ///                         decreased
-    /// @return                 Return true if the rating is modified
-    virtual bool RatePreset(bool plusMinus) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Inform the visualization of the current album art image
-    ///
-    /// @param[in] albumart     Path to the current album art image
-    /// @return                 Return true if the image is used
-    virtual bool UpdateAlbumart(std::string albumart) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization
-    /// @brief Inform the visualization of the current track's tag information
-    ///
-    /// @param[in] track        Visualization track information structure
-    /// @return                 Return true if the track information is used
-    virtual bool UpdateTrack(const VisTrack &track) { return false; }
-
-    //==========================================================================
-    ///
-    /// \defgroup cpp_kodi_addon_visualization_CB Information functions
-    /// \ingroup cpp_kodi_addon_visualization
-    /// @brief **To get info about the device, display and several other parts**
-    ///
-    //@{
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief To transfer available presets on addon
-    ///
-    /// Used if @ref GetPresets not possible to use, e.g. where available presets
-    /// are only known during @ref Start call.
-    ///
-    /// @param[in] presets List to store available presets.
-    ///
-    /// @note The function should only be called once, if possible
-    ///
-    inline void TransferPresets(const std::vector<std::string>& presets)
-    {
-      m_instanceData->toKodi->clear_presets(m_instanceData->toKodi->kodiInstance);
-      for (auto it : presets)
-        m_instanceData->toKodi->transfer_preset(m_instanceData->toKodi->kodiInstance, it.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Device that represents the display adapter
-    ///
-    /// @return A pointer to the used device
-    ///
-    /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
-    /// **OpenGL**
-    ///
-    inline void* Device() { return m_instanceData->props->device; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Returns the X position of the rendering window
-    ///
-    /// @return The X position, in pixels
-    ///
-    inline int X() { return m_instanceData->props->x; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Returns the Y position of the rendering window
-    ///
-    /// @return The Y position, in pixels
-    ///
-    inline int Y() { return m_instanceData->props->y; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Returns the width of the rendering window
-    ///
-    /// @return The width, in pixels
-    ///
-    inline int Width() { return m_instanceData->props->width; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Returns the height of the rendering window
-    ///
-    /// @return The height, in pixels
-    ///
-    inline int Height() { return m_instanceData->props->height; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
-    /// describes how the width of a pixel compares to the height of that pixel.
-    ///
-    /// @return The pixel aspect ratio used by the display
-    ///
-    inline float PixelRatio() { return m_instanceData->props->pixelRatio; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Used to get the name of the add-on defined in `addon.xml`
-    ///
-    /// @return The add-on name
-    ///
-    inline std::string Name() { return m_instanceData->props->name; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Used to get the full path where the add-on is installed
-    ///
-    /// @return The add-on installation path
-    ///
-    inline std::string Presets() { return m_instanceData->props->presets; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_addon_visualization_CB
-    /// @brief Used to get the full path to the add-on's user profile
-    ///
-    /// @note The trailing folder (consisting of the add-on's ID) is not created
-    /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
-    /// to create the folder.
-    ///
-    /// @return Path to the user profile
-    ///
-    inline std::string Profile() { return m_instanceData->props->profile; }
-    //--------------------------------------------------------------------------
-    //@}
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceVisualization: Null pointer instance passed.");
-
-      m_instanceData = static_cast<AddonInstance_Visualization*>(instance);
-      m_instanceData->toAddon->addonInstance = this;
-      m_instanceData->toAddon->start = ADDON_Start;
-      m_instanceData->toAddon->stop = ADDON_Stop;
-      m_instanceData->toAddon->audio_data = ADDON_AudioData;
-      m_instanceData->toAddon->is_dirty = ADDON_IsDirty;
-      m_instanceData->toAddon->render = ADDON_Render;
-      m_instanceData->toAddon->get_info = ADDON_GetInfo;
-      m_instanceData->toAddon->on_action = ADDON_OnAction;
-      m_instanceData->toAddon->get_presets = ADDON_GetPresets;
-      m_instanceData->toAddon->get_active_preset = ADDON_GetActivePreset;
-      m_instanceData->toAddon->is_locked = ADDON_IsLocked;
-    }
-
-    inline static bool ADDON_Start(const AddonInstance_Visualization* addon, int channels, int samplesPerSec, int bitsPerSample, const char* songName)
-    {
-      addon->toAddon->addonInstance->m_renderHelper = kodi::gui::GetRenderHelper();
-      return addon->toAddon->addonInstance->Start(channels, samplesPerSec, bitsPerSample, songName);
-    }
-
-    inline static void ADDON_Stop(const AddonInstance_Visualization* addon)
-    {
-      addon->toAddon->addonInstance->Stop();
-      addon->toAddon->addonInstance->m_renderHelper = nullptr;
-    }
-
-    inline static void ADDON_AudioData(const AddonInstance_Visualization* addon, const float* audioData, int audioDataLength, float *freqData, int freqDataLength)
-    {
-      addon->toAddon->addonInstance->AudioData(audioData, audioDataLength, freqData, freqDataLength);
-    }
-
-    inline static bool ADDON_IsDirty(const AddonInstance_Visualization* addon)
-    {
-      return addon->toAddon->addonInstance->IsDirty();
-    }
-
-    inline static void ADDON_Render(const AddonInstance_Visualization* addon)
-    {
-      if (!addon->toAddon->addonInstance->m_renderHelper)
-        return;
-      addon->toAddon->addonInstance->m_renderHelper->Begin();
-      addon->toAddon->addonInstance->Render();
-      addon->toAddon->addonInstance->m_renderHelper->End();
-    }
-
-    inline static void ADDON_GetInfo(const AddonInstance_Visualization* addon, VIS_INFO *info)
-    {
-      addon->toAddon->addonInstance->GetInfo(info->bWantsFreq, info->iSyncDelay);
-    }
-
-    inline static bool ADDON_OnAction(const AddonInstance_Visualization* addon, VIS_ACTION action, const void *param)
-    {
-      switch (action)
-      {
-        case VIS_ACTION_NEXT_PRESET:
-          return addon->toAddon->addonInstance->NextPreset();
-        case VIS_ACTION_PREV_PRESET:
-          return addon->toAddon->addonInstance->PrevPreset();
-        case VIS_ACTION_LOAD_PRESET:
-          return addon->toAddon->addonInstance->LoadPreset(*static_cast<const int*>(param));
-        case VIS_ACTION_RANDOM_PRESET:
-          return addon->toAddon->addonInstance->RandomPreset();
-        case VIS_ACTION_LOCK_PRESET:
-          addon->toAddon->addonInstance->m_presetLockedByUser = !addon->toAddon->addonInstance->m_presetLockedByUser;
-          return addon->toAddon->addonInstance->LockPreset(addon->toAddon->addonInstance->m_presetLockedByUser);
-        case VIS_ACTION_RATE_PRESET_PLUS:
-          return addon->toAddon->addonInstance->RatePreset(true);
-        case VIS_ACTION_RATE_PRESET_MINUS:
-          return addon->toAddon->addonInstance->RatePreset(false);
-        case VIS_ACTION_UPDATE_ALBUMART:
-          return addon->toAddon->addonInstance->UpdateAlbumart(static_cast<const char*>(param));
-        case VIS_ACTION_UPDATE_TRACK:
-          return addon->toAddon->addonInstance->UpdateTrack(*static_cast<const VisTrack*>(param));
-        case VIS_ACTION_NONE:
-        default:
-          break;
-      }
-      return false;
-    }
-
-    inline static unsigned int ADDON_GetPresets(const AddonInstance_Visualization* addon)
-    {
-      std::vector<std::string> presets;
-      if (addon->toAddon->addonInstance->GetPresets(presets))
-      {
-        for (auto it : presets)
-          addon->toAddon->addonInstance->m_instanceData->toKodi->transfer_preset(addon->toKodi->kodiInstance, it.c_str());
-      }
-
-      return static_cast<unsigned int>(presets.size());
-    }
-
-    inline static int ADDON_GetActivePreset(const AddonInstance_Visualization* addon)
-    {
-      return addon->toAddon->addonInstance->GetActivePreset();
-    }
-
-    inline static bool ADDON_IsLocked(const AddonInstance_Visualization* addon)
-    {
-      return addon->toAddon->addonInstance->IsLocked();
-    }
-
-    std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
-    bool m_presetLockedByUser = false;
-    AddonInstance_Visualization* m_instanceData;
-  };
-
-} /* namespace addon */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
deleted file mode 100644
index dfcfe66..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(HEADERS image_decoder.h
-            pvr.h)
-
-if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance)
-endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
deleted file mode 100644
index b5a6393..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-#include "definitions.h"
-
-namespace kodi
-{
-namespace gui
-{
-
-  //============================================================================
-  ///
-  // \defgroup cpp_kodi_gui ::general
-  /// \addtogroup cpp_kodi_gui
-  /// @{
-  /// @brief **Allow use of binary classes and function to use on add-on's**
-  ///
-  /// Permits the use of the required functions of the add-on to Kodi. This class
-  /// also contains some functions to the control.
-  ///
-  /// These are pure functions them no other initialization need.
-  ///
-  /// It has the header \ref kodi/gui/General.h "#include <kodi/gui/General.h>" be included
-  /// to enjoy it.
-  ///
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Performs a graphical lock of rendering engine
-  ///
-  inline void ATTRIBUTE_HIDDEN Lock()
-  {
-    using namespace ::kodi::addon;
-    CAddonBase::m_interface->toKodi->kodi_gui->general->lock();
-  }
-
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Performs a graphical unlock of previous locked rendering engine
-  ///
-  inline void ATTRIBUTE_HIDDEN Unlock()
-  {
-    using namespace ::kodi::addon;
-    CAddonBase::m_interface->toKodi->kodi_gui->general->unlock();
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Return the the current screen height with pixel
-  ///
-  inline int ATTRIBUTE_HIDDEN GetScreenHeight()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_height(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Return the the current screen width with pixel
-  ///
-  inline int ATTRIBUTE_HIDDEN GetScreenWidth()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_width(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Return the the current screen rendering resolution
-  ///
-  inline int ATTRIBUTE_HIDDEN GetVideoResolution()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_video_resolution(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Returns the id for the current 'active' dialog as an integer.
-  ///
-  /// @return                        The currently active dialog Id
-  ///
-  ///
-  ///-------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// ..
-  /// int wid = kodi::gui::GetCurrentWindowDialogId();
-  /// ..
-  /// ~~~~~~~~~~~~~
-  ///
-  inline int ATTRIBUTE_HIDDEN GetCurrentWindowDialogId()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_dialog_id(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// @brief Returns the id for the current 'active' window as an integer.
-  ///
-  /// @return                        The currently active window Id
-  ///
-  ///
-  ///-------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// ..
-  /// int wid = kodi::gui::GetCurrentWindowId();
-  /// ..
-  /// ~~~~~~~~~~~~~
-  ///
-  inline int ATTRIBUTE_HIDDEN GetCurrentWindowId()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_id(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui
-  /// \brief To get hardware specific device context interface
-  ///
-  /// \return                        The currently active device context
-  ///
-  /// \warning This function is only be supported under Windows, on all other
-  /// OS it return `nullptr`!
-  ///
-  /// \note Returned Windows class pointer is `ID3D11DeviceContext1`.
-  ///
-  ///
-  ///-------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <d3d11_1.h>
-  /// ..
-  /// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::gui::GetHWContext());
-  /// ..
-  /// ~~~~~~~~~~~~~
-  ///
-  inline void* GetHWContext()
-  {
-    using namespace ::kodi::addon;
-    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_hw_context(CAddonBase::m_interface->toKodi->kodiBase);
-  }
-  //--------------------------------------------------------------------------
-
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
deleted file mode 100644
index 1af4863..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-#include "definitions.h"
-
-#include <memory>
-
-namespace kodi
-{
-namespace gui
-{
-
-  class CWindow;
-
-  class ATTRIBUTE_HIDDEN CAddonGUIControlBase
-  {
-  public:
-    GUIHANDLE GetControlHandle() const { return m_controlHandle; }
-
-  protected:
-    explicit CAddonGUIControlBase(CAddonGUIControlBase* window)
-    : m_controlHandle(nullptr),
-      m_interface(::kodi::addon::CAddonBase::m_interface->toKodi),
-      m_Window(window) {}
-
-    virtual ~CAddonGUIControlBase() = default;
-
-    friend class CWindow;
-
-    GUIHANDLE m_controlHandle;
-    AddonToKodiFuncTable_Addon* m_interface;
-    CAddonGUIControlBase* m_Window;
-
-  private:
-    CAddonGUIControlBase() = delete;
-    CAddonGUIControlBase(const CAddonGUIControlBase&) = delete;
-    CAddonGUIControlBase &operator=(const CAddonGUIControlBase&) = delete;
-  };
-
-  class CListItem;
-  typedef std::shared_ptr<CListItem> ListItemPtr;
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_CListItem List Item
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CListItem }
-  /// **Selectable window list item**
-  ///
-  /// The list item control is used for creating item lists in Kodi
-  ///
-  /// The with \ref ListItem.h "#include <kodi/gui/ListItem.h>" given
-  /// class is used to create a item entry for a list on window and to support it's
-  /// control.
-  ///
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_CListItem_Defs Definitions, structures and enumerators
-  /// \ingroup cpp_kodi_gui_CListItem
-  /// @brief **Library definition values**
-  ///
-
-  class ATTRIBUTE_HIDDEN CListItem : public CAddonGUIControlBase
-  {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Class constructor with parameters
-    ///
-    /// @param[in] label                Item label
-    /// @param[in] label2               Second Item label (if needed)
-    /// @param[in] iconImage            Item icon image (if needed)
-    /// @param[in] path                 Path to where item is defined
-    ///
-    CListItem(
-      const std::string& label = "",
-      const std::string& label2 = "",
-      const std::string& iconImage = "",
-      const std::string& path = "")
-      : CAddonGUIControlBase(nullptr)
-    {
-      m_controlHandle = m_interface->kodi_gui->listItem->create(m_interface->kodiBase, label.c_str(),
-                                                                label2.c_str(), iconImage.c_str(),
-                                                                path.c_str());
-    }
-
-    /*
-     * Constructor used for parts given by list items from addon window
-     *
-     * Related to call of "ListItemPtr kodi::gui::CWindow::GetListItem(int listPos)"
-     * Not needed for addon development itself
-     */
-    explicit CListItem(GUIHANDLE listItemHandle)
-      : CAddonGUIControlBase(nullptr)
-    {
-      m_controlHandle = listItemHandle;
-    }
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Class destructor
-    ///
-    ~CListItem() override
-    {
-      m_interface->kodi_gui->listItem->destroy(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Returns the listitem label.
-    ///
-    /// @return                       Label of item
-    ///
-    std::string GetLabel()
-    {
-      std::string label;
-      char* ret = m_interface->kodi_gui->listItem->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets the listitem label.
-    ///
-    /// @param[in] label              string or unicode - text string.
-    ///
-    void SetLabel(const std::string& label)
-    {
-      m_interface->kodi_gui->listItem->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Returns the second listitem label.
-    ///
-    /// @return                       Second label of item
-    ///
-    std::string GetLabel2()
-    {
-      std::string label;
-      char* ret = m_interface->kodi_gui->listItem->get_label2(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets the listitem's label2.
-    ///
-    /// @param[in] label              string or unicode - text string.
-    ///
-    void SetLabel2(const std::string& label)
-    {
-      m_interface->kodi_gui->listItem->set_label2(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets the listitem's art
-    ///
-    /// @param[in] type                 Type of Art to set
-    ///  - Some default art values (any string possible):
-    ///  | value (type)  | Type                                              |
-    ///  |:-------------:|:--------------------------------------------------|
-    ///  | thumb         | string - image filename
-    ///  | poster        | string - image filename
-    ///  | banner        | string - image filename
-    ///  | fanart        | string - image filename
-    ///  | clearart      | string - image filename
-    ///  | clearlogo     | string - image filename
-    ///  | landscape     | string - image filename
-    ///  | icon          | string - image filename
-    /// @return                         The url to use for Art
-    ///
-    std::string GetArt(const std::string& type)
-    {
-      std::string strReturn;
-      char* ret = m_interface->kodi_gui->listItem->get_art(m_interface->kodiBase, m_controlHandle, type.c_str());
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          strReturn = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return strReturn;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets the listitem's art
-    ///
-    /// @param[in] type                 Type of Art to set
-    /// @param[in] url                  The url to use for Art
-    ///  - Some default art values (any string possible):
-    ///  | value (type)  | Type                                              |
-    ///  |:-------------:|:--------------------------------------------------|
-    ///  | thumb         | string - image filename
-    ///  | poster        | string - image filename
-    ///  | banner        | string - image filename
-    ///  | fanart        | string - image filename
-    ///  | clearart      | string - image filename
-    ///  | clearlogo     | string - image filename
-    ///  | landscape     | string - image filename
-    ///  | icon          | string - image filename
-    ///
-    void SetArt(const std::string& type, const std::string& url)
-    {
-      m_interface->kodi_gui->listItem->set_art(m_interface->kodiBase, m_controlHandle, type.c_str(), url.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Returns the path / filename of this listitem.
-    ///
-    /// @return                       Path string
-    ///
-    std::string GetPath()
-    {
-      std::string strReturn;
-      char* ret = m_interface->kodi_gui->listItem->get_path(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          strReturn = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return strReturn;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets the listitem's path.
-    ///
-    /// @param[in] path               string or unicode - path, activated when
-    ///                               item is clicked.
-    ///
-    /// @note You can use the above as keywords for arguments.
-    ///
-    void SetPath(const std::string& path)
-    {
-      m_interface->kodi_gui->listItem->set_path(m_interface->kodiBase, m_controlHandle, path.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Sets a listitem property, similar to an infolabel.
-    ///
-    /// @param[in] key            string - property name.
-    /// @param[in] value          string or unicode - value of property.
-    ///
-    /// @note Key is NOT case sensitive.
-    ///       You can use the above as keywords for arguments and skip certain\n
-    ///       optional arguments.\n
-    ///       Once you use a keyword, all following arguments require the
-    ///       keyword.
-    ///
-    /// Some of these are treated internally by Kodi, such as the
-    /// <b>'StartOffset'</b> property, which is the offset in seconds at which to
-    /// start playback of an item.  Others may be used in the skin to add
-    /// extra information, such as <b>'WatchedCount'</b> for tvshow items
-    ///
-    void SetProperty(const std::string& key, const std::string& value)
-    {
-      m_interface->kodi_gui->listItem->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Returns a listitem property as a string, similar to an infolabel.
-    ///
-    /// @param[in] key                string - property name.
-    /// @return                       string - List item property
-    ///
-    /// @note Key is NOT case sensitive.\n
-    ///       You can use the above as keywords for arguments and skip certain
-    ///       optional arguments.\n
-    ///       Once you use a keyword, all following arguments require the
-    ///       keyword.
-    ///
-    std::string GetProperty(const std::string& key)
-    {
-      std::string label;
-      char* ret = m_interface->kodi_gui->listItem->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief To control selection of item in list (also multiple selection,
-    /// in list on serveral items possible).
-    ///
-    /// @param[in] selected             if true becomes set as selected
-    ///
-    void Select(bool selected)
-    {
-      m_interface->kodi_gui->listItem->select(m_interface->kodiBase, m_controlHandle, selected);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief Returns the listitem's selected status.
-    ///
-    /// @return                         true if selected, otherwise false
-    ///
-    bool IsSelected()
-    {
-      return m_interface->kodi_gui->listItem->is_selected(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-  };
-
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
deleted file mode 100644
index 5011374..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ /dev/null
@@ -1,909 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../AddonBase.h"
-#include "ListItem.h"
-
-#ifdef BUILD_KODI_ADDON
-#include "../ActionIDs.h"
-#else
-#include "input/actions/ActionIDs.h"
-#endif
-
-namespace kodi
-{
-namespace gui
-{
-
-  class CListItem;
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_CWindow Window
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CWindow }
-  /// **Main window control class**
-  ///
-  /// The with  \ref Window.h "#include <kodi/gui/Window.h>"
-  /// included file brings support to create a window or dialog on Kodi.
-  ///
-  /// --------------------------------------------------------------------------
-  ///
-  /// On functions defined input variable <b><tt>controlId</tt> (GUI control identifier)</b>
-  /// is the on window.xml defined value behind type added with <tt><b>id="..."</b></tt> and
-  /// used to identify for changes there and on callbacks.
-  ///
-  /// ~~~~~~~~~~~~~{.xml}
-  ///  <control type="label" id="31">
-  ///    <description>Title Label</description>
-  ///    ...
-  ///  </control>
-  ///  <control type="progress" id="32">
-  ///    <description>progress control</description>
-  ///    ...
-  ///  </control>
-  /// ~~~~~~~~~~~~~
-  ///
-  ///
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_CWindow_Defs Definitions, structures and enumerators
-  /// \ingroup cpp_kodi_gui_CWindow
-  /// @brief <b>Library definition values</b>
-  ///
-
-  class ATTRIBUTE_HIDDEN CWindow : public CAddonGUIControlBase
-  {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Class constructor with needed values for window / dialog.
-    ///
-    /// Creates a new Window class.
-    ///
-    /// @param[in] xmlFilename          XML file for the skin
-    /// @param[in] defaultSkin          default skin to use if needed not available
-    /// @param[in] asDialog             Use window as dialog if set
-    /// @param[in] isMedia              [opt] bool - if False, create a regular window.
-    ///                                 if True, create a mediawindow.
-    ///                                 (default=false)
-    ///                                 @note only usable for windows not for dialogs.
-    ///
-    ///
-    CWindow(const std::string& xmlFilename, const std::string& defaultSkin, bool asDialog, bool isMedia = false)
-      : CAddonGUIControlBase(nullptr)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->create(m_interface->kodiBase, xmlFilename.c_str(),
-                                                              defaultSkin.c_str(), asDialog, isMedia);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow can't create window class from Kodi !!!");
-      m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
-                                                   CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
-                                                   CBGetContextButtons, CBOnContextButton);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup CWindow
-    /// @brief Class destructor
-    ///
-    ///
-    ///
-    ~CWindow() override
-    {
-      if (m_controlHandle)
-        m_interface->kodi_gui->window->destroy(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Show this window.
-    ///
-    /// Shows this window by activating it, calling close() after it wil activate the
-    /// current window again.
-    ///
-    /// @note If your Add-On ends this window will be closed to. To show it forever,
-    /// make a loop at the end of your Add-On or use doModal() instead.
-    ///
-    /// @warning If used must be the class be global present until Kodi becomes
-    /// closed. The creation can be done after before "Show" becomes called, but
-    /// not delete class after them.
-    ///
-    /// @return                         Return true if call and show is successed,
-    ///                                 if false was something failed to get needed
-    ///                                 skin parts.
-    ///
-    bool Show()
-    {
-      return m_interface->kodi_gui->window->show(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Closes this window.
-    ///
-    /// Closes this window by activating the old window.
-    /// @note The window is not deleted with this method.
-    ///
-    void Close()
-    {
-      m_interface->kodi_gui->window->close(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Display this window until close() is called.
-    ///
-    void DoModal()
-    {
-      m_interface->kodi_gui->window->do_modal(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Gives the control with the supplied focus.
-    ///
-    /// @param[in] iControlId           On skin defined id of control
-    /// @return                         Return true if call and focus is successed,
-    ///                                 if false was something failed to get needed
-    ///                                 skin parts.
-    ///
-    ///
-    bool SetFocusId(int iControlId)
-    {
-      return m_interface->kodi_gui->window->set_focus_id(m_interface->kodiBase, m_controlHandle, iControlId);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Returns the id of the control which is focused.
-    ///
-    /// @return                         Focused control id
-    ///
-    ///
-    int GetFocusId()
-    {
-      return m_interface->kodi_gui->window->get_focus_id(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To set the used label on given control id
-    ///
-    /// @param[in] controlId            Control id where label need to set
-    /// @param[in] label                Label to use
-    ///
-    ///
-    void SetControlLabel(int controlId, const std::string& label)
-    {
-      m_interface->kodi_gui->window->set_control_label(m_interface->kodiBase, m_controlHandle, controlId, label.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To set the visibility on given control id
-    ///
-    /// @param[in] controlId            Control id where visibility is changed
-    /// @param[in] visible              Boolean value with `true` for visible, `false` for hidden
-    ///
-    ///
-    void SetControlVisible(int controlId, bool visible)
-    {
-      m_interface->kodi_gui->window->set_control_visible(m_interface->kodiBase, m_controlHandle, controlId, visible);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To set the selection on given control id
-    ///
-    /// @param[in] controlId            Control id where selection is changed
-    /// @param[in] selected             Boolean value with `true` for selected, `false` for not
-    ///
-    ///
-    void SetControlSelected(int controlId, bool selected)
-    {
-      m_interface->kodi_gui->window->set_control_selected(m_interface->kodiBase, m_controlHandle, controlId, selected);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets a window property, similar to an infolabel.
-    ///
-    /// @param[in] key                  string - property name.
-    /// @param[in] value                string or unicode - value of property.
-    ///
-    /// @note  Key is NOT case sensitive. Setting value to an empty string is
-    ///        equivalent to clearProperty(key).\n
-    ///        You can use the above as keywords for arguments and skip certain
-    ///        optional arguments.\n
-    ///        Once you use a keyword, all following arguments require the keyword.
-    ///
-    void SetProperty(const std::string& key, const std::string& value)
-    {
-      m_interface->kodi_gui->window->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Returns a window property as a string, similar to an infolabel.
-    ///
-    /// @param[in] key                  string - property name.
-    /// @return                         The property as strin (if present)
-    ///
-    /// @note  Key is NOT case sensitive. Setting value to an empty string is
-    ///        equivalent to clearProperty(key).\n
-    ///        You can use the above as keywords for arguments and skip certain
-    ///        optional arguments.\n
-    ///        Once you use a keyword, all following arguments require the keyword.
-    ///
-    ///
-    std::string GetProperty(const std::string& key) const
-    {
-      std::string label;
-      char* ret = m_interface->kodi_gui->window->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets a window property with integer value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @param[in] value                integer value to set
-    ///
-    ///
-    void SetPropertyInt(const std::string& key, int value)
-    {
-      m_interface->kodi_gui->window->set_property_int(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Returns a window property with integer value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @return                         integer value of property
-    ///
-    int GetPropertyInt(const std::string& key) const
-    {
-      return m_interface->kodi_gui->window->get_property_int(m_interface->kodiBase, m_controlHandle, key.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets a window property with boolean value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @param[in] value                boolean value to set
-    ///
-    ///
-    void SetPropertyBool(const std::string& key, bool value)
-    {
-      m_interface->kodi_gui->window->set_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Returns a window property with boolean value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @return                         boolean value of property
-    ///
-    bool GetPropertyBool(const std::string& key) const
-    {
-      return m_interface->kodi_gui->window->get_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets a window property with double value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @param[in] value                double value to set
-    ///
-    ///
-    void SetPropertyDouble(const std::string& key, double value)
-    {
-      m_interface->kodi_gui->window->set_property_double(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Returns a window property with double value
-    ///
-    /// @param[in] key                  string - property name.
-    /// @return                         double value of property
-    ///
-    ///
-    double GetPropertyDouble(const std::string& key) const
-    {
-      return m_interface->kodi_gui->window->get_property_double(m_interface->kodiBase, m_controlHandle, key.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Remove all present properties from window
-    ///
-    ///
-    ///
-    void ClearProperties()
-    {
-      m_interface->kodi_gui->window->clear_properties(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Clears the specific window property.
-    ///
-    /// @param[in] key                string - property name.
-    ///
-    /// @note Key is NOT case sensitive. Equivalent to SetProperty(key, "")
-    ///       You can use the above as keywords for arguments and skip certain
-    ///       optional arguments.
-    ///       Once you use a keyword, all following arguments require the
-    ///       keyword.
-    ///
-    ///
-    ///-----------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// ..
-    /// ClearProperty('Category')
-    /// ..
-    /// ~~~~~~~~~~~~~
-    ///
-    void ClearProperty(const std::string& key)
-    {
-      m_interface->kodi_gui->window->clear_property(m_interface->kodiBase, m_controlHandle, key.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //@{
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Function delete all entries in integrated list.
-    ///
-    ///
-    ///
-    void ClearList()
-    {
-      m_interface->kodi_gui->window->clear_item_list(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To add a list item in the on window integrated list.
-    ///
-    /// @param[in] item                 List item to add
-    /// @param[in] itemPosition         [opt] The position for item, default is on end
-    ///
-    ///
-    void AddListItem(ListItemPtr item, int itemPosition = -1)
-    {
-      m_interface->kodi_gui->window->add_list_item(m_interface->kodiBase, m_controlHandle, item->m_controlHandle, itemPosition);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To add a list item based upon string in the on window integrated list.
-    ///
-    /// @param[in] item                 List item to add
-    /// @param[in] itemPosition         [opt] The position for item, default is on end
-    ///
-    ///
-    void AddListItem(const std::string item, int itemPosition = -1)
-    {
-      m_interface->kodi_gui->window->add_list_item(m_interface->kodiBase, m_controlHandle, std::make_shared<kodi::gui::CListItem>(item)->m_controlHandle, itemPosition);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Remove list item on position.
-    ///
-    /// @param[in] itemPosition         List position to remove
-    ///
-    ///
-    void RemoveListItem(int itemPosition)
-    {
-      m_interface->kodi_gui->window->remove_list_item_from_position(m_interface->kodiBase, m_controlHandle, itemPosition);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Remove item with given control class from list.
-    ///
-    /// @param[in] item                 List item control class to remove
-    ///
-    ///
-    void RemoveListItem(ListItemPtr item)
-    {
-      m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle, item->m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To get list item control class on wanted position.
-    ///
-    /// @param[in] listPos              Position from where control is needed
-    /// @return                         The list item control class or null if not found
-    ///
-    /// @warning Function returns a new generated **CListItem** class!
-    ///
-    ListItemPtr GetListItem(int listPos)
-    {
-      GUIHANDLE handle = m_interface->kodi_gui->window->get_list_item(m_interface->kodiBase, m_controlHandle, listPos);
-      if (!handle)
-        return ListItemPtr();
-
-      return std::make_shared<kodi::gui::CListItem>(handle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To set position of selected part in list.
-    ///
-    /// @param[in] listPos              Position to use
-    ///
-    ///
-    void SetCurrentListPosition(int listPos)
-    {
-      m_interface->kodi_gui->window->set_current_list_position(m_interface->kodiBase, m_controlHandle, listPos);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To get current selected position in list
-    ///
-    /// @return                         Current list position
-    ///
-    ///
-    int GetCurrentListPosition()
-    {
-      return m_interface->kodi_gui->window->get_current_list_position(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To get the amount of entries in the list.
-    ///
-    /// @return                         Size of in window integrated control class
-    ///
-    ///
-    int GetListSize()
-    {
-      return m_interface->kodi_gui->window->get_list_size(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets a container property, similar to an infolabel.
-    ///
-    /// @param[in] key        string - property name.
-    /// @param[in] value      string or unicode - value of property.
-    ///
-    /// @note Key is NOT case sensitive.\n
-    /// You can use the above as keywords for arguments and skip certain
-    /// optional arguments.\n
-    /// Once you use a keyword, all following arguments require the keyword.
-    ///
-    ///
-    void SetContainerProperty(const std::string& key, const std::string& value)
-    {
-      m_interface->kodi_gui->window->set_container_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Sets the content type of the container.
-    ///
-    /// @param[in] value      string or unicode - content value.
-    ///
-    /// __Available content types__
-    /// | Name        | Media                                    |
-    /// |:-----------:|:-----------------------------------------|
-    /// | actors      | Videos
-    /// | addons      | Addons, Music, Pictures, Programs, Videos
-    /// | albums      | Music, Videos
-    /// | artists     | Music, Videos
-    /// | countries   | Music, Videos
-    /// | directors   | Videos
-    /// | files       | Music, Videos
-    /// | games       | Games
-    /// | genres      | Music, Videos
-    /// | images      | Pictures
-    /// | mixed       | Music, Videos
-    /// | movies      | Videos
-    /// | Musicvideos | Music, Videos
-    /// | playlists   | Music, Videos
-    /// | seasons     | Videos
-    /// | sets        | Videos
-    /// | songs       | Music
-    /// | studios     | Music, Videos
-    /// | tags        | Music, Videos
-    /// | tvshows     | Videos
-    /// | videos      | Videos
-    /// | years       | Music, Videos
-    ///
-    ///
-    void SetContainerContent(const std::string& value)
-    {
-      m_interface->kodi_gui->window->set_container_content(m_interface->kodiBase, m_controlHandle, value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief Get the id of the currently visible container.
-    ///
-    /// @return               currently visible container id
-    ///
-    ///
-    int GetCurrentContainerId()
-    {
-      return m_interface->kodi_gui->window->get_current_container_id(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-    //@}
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow
-    /// @brief To inform Kodi that it need to render region new.
-    ///
-    ///
-    void MarkDirtyRegion()
-    {
-      return m_interface->kodi_gui->window->mark_dirty_region(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    //
-    /// @defgroup cpp_kodi_gui_CWindow_callbacks Callback functions from Kodi to add-on
-    /// \ingroup cpp_kodi_gui_CWindow
-    //@{
-    /// @brief <b>GUI window callback functions.</b>
-    ///
-    /// Functions to handle control callbacks from Kodi
-    ///
-    /// ------------------------------------------------------------------------
-    ///
-    /// @link cpp_kodi_gui_CWindow Go back to normal functions from CWindow@endlink
-    //
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief OnInit method.
-    ///
-    /// @return                         Return true if initialize was done successful
-    ///
-    ///
-    virtual bool OnInit() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief OnFocus method.
-    ///
-    /// @param[in] controlId            GUI control identifier
-    /// @return                         Return true if focus condition was handled there or false to handle them by Kodi itself
-    ///
-    ///
-    virtual bool OnFocus(int controlId) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief OnClick method.
-    ///
-    /// @param[in] controlId            GUI control identifier
-    /// @return                         Return true if click was handled there
-    ///                                 or false to handle them by Kodi itself
-    ///
-    ///
-    virtual bool OnClick(int controlId) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief OnAction method.
-    ///
-    /// @param[in] actionId             The action id to perform, see
-    ///                                 \ref kodi_key_action_ids to get list of
-    ///                                 them
-    /// @return                         Return true if action was handled there
-    ///                                 or false to handle them by Kodi itself
-    ///
-    ///
-    /// This method will receive all actions that the main program will send
-    /// to this window.
-    ///
-    /// @note
-    /// - By default, only the \c PREVIOUS_MENU and \c NAV_BACK actions are handled.
-    /// - Overwrite this method to let your code handle all actions.
-    /// - Don't forget to capture \c ACTION_PREVIOUS_MENU or \c ACTION_NAV_BACK, else the user can't close this window.
-    ///
-    ///
-    ///--------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// ..
-    /// /* Window used with parent / child way */
-    /// bool cYOUR_CLASS::OnAction(int actionId)
-    /// {
-    ///   switch (action)
-    ///   {
-    ///     case ACTION_PREVIOUS_MENU:
-    ///     case ACTION_NAV_BACK:
-    ///       printf("action recieved: previous");
-    ///       Close();
-    ///       return true;
-    ///     case ACTION_SHOW_INFO:
-    ///       printf("action recieved: show info");
-    ///       break;
-    ///     case ACTION_STOP:
-    ///       printf("action recieved: stop");
-    ///       break;
-    ///     case ACTION_PAUSE:
-    ///       printf("action recieved: pause");
-    ///       break;
-    ///     default:
-    ///       break;
-    ///   }
-    ///   return false;
-    /// }
-    /// ..
-    /// ~~~~~~~~~~~~~
-    ///
-    virtual bool OnAction(int actionId, uint32_t buttoncode, wchar_t unicode)
-    {
-      switch (actionId)
-      {
-        case ACTION_PREVIOUS_MENU:
-        case ACTION_NAV_BACK:
-          Close();
-          return true;
-         default:
-          break;
-      }
-      return false;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief Get context menu buttons for list entry
-    ///
-    /// @param[in] itemNumber   selected list item entry
-    /// @param[in] buttons      list where context menus becomes added with his
-    ///                         identifier and name.
-    ///
-    virtual void GetContextButtons(int itemNumber, std::vector< std::pair<unsigned int, std::string> > &buttons)
-    {
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief Called after selection in context menu
-    ///
-    /// @param[in] itemNumber   selected list item entry
-    /// @param[in] button       the pressed button id
-    /// @return                 true if handled, otherwise false
-    ///
-    virtual bool OnContextButton(int itemNumber, unsigned int button)
-    {
-      return false;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CWindow_callbacks
-    /// @brief **Set independent callbacks**
-    ///
-    /// If the class is used independent (with "new CWindow") and
-    /// not as parent (with "cCLASS_own : CWindow") from own must be the
-    /// callback from Kodi to add-on overdriven with own functions!
-    ///
-    /// @param[in] cbhdl                The pointer to own handle data
-    ///                                 structure / class
-    /// @param[in] CBOnInit             Own defined window init function
-    /// @param[in] CBOnFocus            Own defined focus function
-    /// @param[in] CBOnClick            Own defined click function
-    /// @param[in] CBOnAction           Own defined action function
-    /// @param[in] CBGetContextButtons  [opt] To get context menu entries for
-    ///                                 lists function
-    /// @param[in] CBOnContextButton    [opt] Used context menu entry function
-    ///
-    ///
-    ///--------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// ...
-    ///
-    /// bool OnInit(GUIHANDLE cbhdl)
-    /// {
-    ///   ...
-    ///   return true;
-    /// }
-    ///
-    /// bool OnFocus(GUIHANDLE cbhdl, int controlId)
-    /// {
-    ///   ...
-    ///   return true;
-    /// }
-    ///
-    /// bool OnClick(GUIHANDLE cbhdl, int controlId)
-    /// {
-    ///   ...
-    ///   return true;
-    /// }
-    ///
-    /// bool OnAction(GUIHANDLE cbhdl, int actionId)
-    /// {
-    ///   ...
-    ///   return true;
-    /// }
-    ///
-    /// ...
-    /// /* Somewhere where you create the window */
-    /// CWindow myWindow = new CWindow;
-    /// myWindow->SetIndependentCallbacks(myWindow, OnInit, OnFocus, OnClick, OnAction);
-    /// ...
-    /// ~~~~~~~~~~~~~
-    ///
-    void SetIndependentCallbacks(
-      GUIHANDLE                 cbhdl,
-      bool (*CBOnInit)            (GUIHANDLE cbhdl),
-      bool (*CBOnFocus)           (GUIHANDLE cbhdl, int controlId),
-      bool (*CBOnClick)           (GUIHANDLE cbhdl, int controlId),
-      bool (*CBOnAction)          (GUIHANDLE cbhdl, int actionId, uint32_t buttoncode, wchar_t unicode),
-      void (*CBGetContextButtons) (GUIHANDLE cbhdl, int itemNumber, gui_context_menu_pair* buttons, unsigned int* size) = nullptr,
-      bool (*CBOnContextButton)   (GUIHANDLE cbhdl, int itemNumber, unsigned int button) = nullptr)
-    {
-      if (!cbhdl ||
-          !CBOnInit || !CBOnFocus || !CBOnClick || !CBOnAction)
-      {
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow::%s called with nullptr !!!", __FUNCTION__);
-        return;
-      }
-
-      m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, cbhdl,
-                                                   CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
-                                                   CBGetContextButtons, CBOnContextButton);
-    }
-    //--------------------------------------------------------------------------
-    //@}
-
-  private:
-    static bool CBOnInit(GUIHANDLE cbhdl)
-    {
-      return static_cast<CWindow*>(cbhdl)->OnInit();
-    }
-
-    static bool CBOnFocus(GUIHANDLE cbhdl, int controlId)
-    {
-      return static_cast<CWindow*>(cbhdl)->OnFocus(controlId);
-    }
-
-    static bool CBOnClick(GUIHANDLE cbhdl, int controlId)
-    {
-      return static_cast<CWindow*>(cbhdl)->OnClick(controlId);
-    }
-
-    static bool CBOnAction(GUIHANDLE cbhdl, int actionId, uint32_t buttoncode, wchar_t unicode)
-    {
-      return static_cast<CWindow*>(cbhdl)->OnAction(actionId, buttoncode, unicode);
-    }
-
-    static void CBGetContextButtons(GUIHANDLE cbhdl, int itemNumber, gui_context_menu_pair* buttons, unsigned int* size)
-    {
-      std::vector< std::pair<unsigned int, std::string> > buttonList;
-      static_cast<CWindow*>(cbhdl)->GetContextButtons(itemNumber, buttonList);
-      if (!buttonList.empty())
-      {
-        unsigned int presentSize = static_cast<unsigned int>(buttonList.size());
-        if (presentSize > *size)
-          kodi::Log(ADDON_LOG_WARNING, "GetContextButtons: More as allowed '%i' entries present!", *size);
-        else
-          *size = presentSize;
-        for (unsigned int i = 0; i < *size; ++i)
-        {
-          buttons[i].id = buttonList[i].first;
-          strncpy(buttons[i].name, buttonList[i].second.c_str(), ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH);
-        }
-      }
-    }
-
-    static bool CBOnContextButton(GUIHANDLE cbhdl, int itemNumber, unsigned int button)
-    {
-      return static_cast<CWindow*>(cbhdl)->OnContextButton(itemNumber, button);
-    }
-  };
-
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
deleted file mode 100644
index 7cc9b24..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../../AddonBase.h"
-#include "../Window.h"
-#include "../renderHelper.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace controls
-{
-
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CRendering Control Rendering
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CRendering }
-/// **Window control for rendering own parts**
-///
-/// This rendering control is used  when own parts are needed.  You  have  the
-/// control  over them  to render direct  OpenGL or  DirectX  content  to  the
-/// screen set by the size of them.
-///
-/// Alternative  can be  the virtual  functions from t his been ignored if the
-/// callbacks are  defined  by the  \ref CRendering_SetIndependentCallbacks function  and
-/// class is used as single and not as a parent class.
-///
-/// It has the header \ref Rendering.h "#include <kodi/gui/controls/Rendering.h>"
-/// be included to enjoy it.
-///
-/// Here you find the needed skin part for a \ref Addon_Rendering_control "rendering control"
-///
-/// @note The  call of  the control is only  possible  from  the corresponding
-/// window as its class and identification number is required.
-///
-
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CRendering_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_gui_controls_CRendering
-/// @brief **Library definition values**
-///
-
-class ATTRIBUTE_HIDDEN CRendering : public CAddonGUIControlBase
-{
-public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief Construct a new control
-  ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
-  ///
-  CRendering(CWindow* window, int controlId) : CAddonGUIControlBase(window)
-  {
-    m_controlHandle = m_interface->kodi_gui->window->get_control_render_addon(
-        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-    if (m_controlHandle)
-      m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase,
-                                                              m_controlHandle, this, OnCreateCB,
-                                                              OnRenderCB, OnStopCB, OnDirtyCB);
-    else
-      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::%s can't create control class from Kodi !!!",
-                __FUNCTION__);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief Destructor
-  ///
-  ~CRendering() override
-  {
-    m_interface->kodi_gui->control_rendering->destroy(m_interface->kodiBase, m_controlHandle);
-  }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief To create rendering control on Add-on
-  ///
-  /// Function  creates the  needed rendering  control for Kodi  which becomes
-  /// handled and processed from Add-on
-  ///
-  /// @note This is  callback  function  from Kodi  to  Add-on and  not to use
-  /// for calls from add-on to this function.
-  ///
-  /// @param[in] x                    Horizontal position
-  /// @param[in] y                    Vertical position
-  /// @param[in] w                    Width of control
-  /// @param[in] h                    Height of control
-  /// @param[in] device               The device to use.  For OpenGL  is empty
-  ///                                 on Direct X is the needed device send.
-  /// @return                         Add-on needs to return true if successed,
-  ///                                 otherwise false.
-  ///
-  virtual bool Create(int x, int y, int w, int h, void* device) { return false; }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief Render process call from Kodi
-  ///
-  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-  /// for calls from add-on to this function.
-  ///
-  virtual void Render() {}
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief Call from Kodi to stop rendering process
-  ///
-  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-  /// for calls from add-on to this function.
-  ///
-  virtual void Stop() {}
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief Call from Kodi where add-on  becomes asked about  dirty rendering
-  /// region.
-  ///
-  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-  /// for calls from add-on to this function.
-  ///
-  virtual bool Dirty() { return false; }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// \anchor CRendering_SetIndependentCallbacks
-  /// @brief If the  class is used  independent (with "new CRendering")
-  /// and not as  parent (with "cCLASS_own : CRendering") from own must
-  /// be the callback from Kodi to add-on overdriven with own functions!
-  ///
-  void SetIndependentCallbacks(
-      GUIHANDLE cbhdl,
-      bool (*CBCreate)(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device),
-      void (*CBRender)(GUIHANDLE cbhdl),
-      void (*CBStop)(GUIHANDLE cbhdl),
-      bool (*CBDirty)(GUIHANDLE cbhdl))
-  {
-    if (!cbhdl || !CBCreate || !CBRender || !CBStop || !CBDirty)
-    {
-      kodi::Log(ADDON_LOG_ERROR, "kodi::gui::controls::%s called with nullptr !!!", __FUNCTION__);
-      return;
-    }
-
-    m_interface->kodi_gui->control_rendering->set_callbacks(
-        m_interface->kodiBase, m_controlHandle, cbhdl, CBCreate, CBRender, CBStop, CBDirty);
-  }
-  //--------------------------------------------------------------------------
-
-private:
-  /*
-   * Defined callback functions from Kodi to add-on, for use in parent / child system
-   * (is private)!
-   */
-  static bool OnCreateCB(void* cbhdl, int x, int y, int w, int h, void* device)
-  {
-    static_cast<CRendering*>(cbhdl)->m_renderHelper = kodi::gui::GetRenderHelper();
-    return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
-  }
-
-  static void OnRenderCB(void* cbhdl)
-  {
-    if (!static_cast<CRendering*>(cbhdl)->m_renderHelper)
-      return;
-    static_cast<CRendering*>(cbhdl)->m_renderHelper->Begin();
-    static_cast<CRendering*>(cbhdl)->Render();
-    static_cast<CRendering*>(cbhdl)->m_renderHelper->End();
-  }
-
-  static void OnStopCB(void* cbhdl)
-  {
-    static_cast<CRendering*>(cbhdl)->Stop();
-    static_cast<CRendering*>(cbhdl)->m_renderHelper = nullptr;
-  }
-
-  static bool OnDirtyCB(void* cbhdl) { return static_cast<CRendering*>(cbhdl)->Dirty(); }
-
-  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
-};
-
-} /* namespace controls */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
deleted file mode 100644
index db8d491..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../../AddonBase.h"
-#include "../Window.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace controls
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_controls_CSpin Control Spin
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CSpin }
-  /// **Window control used for cycling up/down controls**
-  ///
-  /// The settings spin control is used in the settings  screens for when a list
-  /// of options  can be chosen  from using  up/down arrows.  You can choose the
-  /// position,  size,  and look of  the spin control.  It is basically  a cross
-  /// between  the button  control and a spin control.  It has a label and focus
-  /// and non focus textures, as well as a spin control on the right.
-  ///
-  /// It has the header \ref Spin.h "#include <kodi/gui/controls/Spin.h>"
-  /// be included to enjoy it.
-  ///
-  /// Here you find the needed skin part for a \ref Spin_Control "spin control"
-  ///
-  /// @note The  call of  the  control is  only possible from  the corresponding
-  /// window as its class and identification number is required.
-  ///
-
-
-  //============================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSpin
-  /// @anchor AddonGUISpinControlType
-  /// @brief The values here defines the used value format for steps on
-  /// spin control.
-  ///
-  typedef enum AddonGUISpinControlType
-  {
-    /// One spin step interpreted as integer
-    ADDON_SPIN_CONTROL_TYPE_INT    = 1,
-    /// One spin step interpreted as floating point value
-    ADDON_SPIN_CONTROL_TYPE_FLOAT  = 2,
-    /// One spin step interpreted as text string
-    ADDON_SPIN_CONTROL_TYPE_TEXT   = 3,
-    /// One spin step interpreted as a page change value
-    ADDON_SPIN_CONTROL_TYPE_PAGE   = 4
-  } AddonGUISpinControlType;
-  //----------------------------------------------------------------------------
-
-  class ATTRIBUTE_HIDDEN CSpin : public CAddonGUIControlBase
-  {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CSpin(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_spin(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSpin can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Destructor
-    ///
-    ~CSpin() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_spin->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled              If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_spin->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To set the text string on spin control
-    ///
-    /// @param[in] text                Text to show as name for spin
-    ///
-    void SetText(const std::string& text)
-    {
-      m_interface->kodi_gui->control_spin->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To reset spin control to defaults
-    ///
-    void Reset()
-    {
-      m_interface->kodi_gui->control_spin->reset(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To set the with SpinControlType defined types of spin.
-    ///
-    /// @param[in] type                 The type to use
-    ///
-    /// @note See description of \ref AddonGUISpinControlType for available types.
-    ///
-    void SetType(AddonGUISpinControlType type)
-    {
-      m_interface->kodi_gui->control_spin->set_type(m_interface->kodiBase, m_controlHandle, (int)type);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To add a label entry in spin defined with a value as string.
-    ///
-    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
-    ///
-    /// @param[in] label                Label string to view on skin
-    /// @param[in] value                String value to use for selection
-    ///                                 of them.
-    ///
-    void AddLabel(const std::string& label, const std::string& value)
-    {
-      m_interface->kodi_gui->control_spin->add_string_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To add a label entry in spin defined with a value as integer.
-    ///
-    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_INT to use this function.
-    ///
-    /// @param[in] label                Label string to view on skin
-    /// @param[in] value                Integer value to use for selection
-    ///                                 of them.
-    ///
-    void AddLabel(const std::string& label, int value)
-    {
-      m_interface->kodi_gui->control_spin->add_int_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To change the spin to position with them string as value.
-    ///
-    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
-    ///
-    /// @param[in] value                 String value to change to
-    ///
-    void SetStringValue(const std::string& value)
-    {
-      m_interface->kodi_gui->control_spin->set_string_value(m_interface->kodiBase, m_controlHandle, value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To get the current spin control position with text string value.
-    ///
-    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
-    ///
-    /// @return                         Currently selected string value
-    ///
-    std::string GetStringValue() const
-    {
-      std::string value;
-      char* ret = m_interface->kodi_gui->control_spin->get_string_value(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          value = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return value;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
-    /// start and e.g. +10 is the from here defined position where it reach  the
-    /// end.
-    ///
-    /// Ad default is the range from 0 to 100.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent, floating point or  integer are alone possible.  Combining
-    /// these  different  values  can be not together and can,  therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    void SetIntRange(int start, int end)
-    {
-      m_interface->kodi_gui->control_spin->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Set the slider  position with the given integer value.  The Range
-    /// must be defined with a call from \ref SetIntRange before.
-    ///
-    /// @param[in] value                Position in range to set with integer
-    ///
-    /// @note Percent, floating point or  integer are alone possible.  Combining
-    /// these different  values can  be not  together  and can, therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    void SetIntValue(int value)
-    {
-      m_interface->kodi_gui->control_spin->set_int_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To get the current position as integer value.
-    ///
-    /// @return                         The position as integer
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different values  can be not  together  and can,  therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    int GetIntValue() const
-    {
-      return m_interface->kodi_gui->control_spin->get_int_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To set the  the range as  float of spin,  e.g. -25.0 is  the spin
-    /// start and e.g. +25.0 is the from  here defined  position where  it reach
-    /// the end.
-    ///
-    /// As default is the range 0.0 to 1.0.
-    ///
-    /// The float interval is as default 0.1 and can be changed with
-    /// @ref SetFloatInterval.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent, floating point  or integer are alone possible.  Combining
-    /// these different  values can be  not together  and can,  therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    void SetFloatRange(float start, float end)
-    {
-      m_interface->kodi_gui->control_spin->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief Set  the spin  position with  the given float  value.  The  Range
-    /// can be defined with a call from  \ref SetIntRange before, as  default it
-    /// is 0.0 to 1.0.
-    ///
-    /// @param[in] value                Position in range to set with float
-    ///
-    /// @note Percent, floating point or integer are  alone possible.  Combining
-    /// these different  values can  be not together  and can,  therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    void SetFloatValue(float value)
-    {
-      m_interface->kodi_gui->control_spin->set_float_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To get the current position as float value.
-    ///
-    /// @return                         The position as float
-    ///
-    float GetFloatValue() const
-    {
-      return m_interface->kodi_gui->control_spin->get_float_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSpin
-    /// @brief To set the  interval steps of spin,  as default  is it 0.1  If it
-    /// becomes  changed  with this  function will  a step of the  user with the
-    /// value fixed here be executed.
-    ///
-    /// @param[in] interval             Intervall step to set.
-    ///
-    /// @note Percent, floating point  or integer are alone possible.  Combining
-    /// these  different values  can  be not together and can,  therefore,  only
-    /// one each can be used and must be defined with \ref SetType before.
-    ///
-    void SetFloatInterval(float interval)
-    {
-      m_interface->kodi_gui->control_spin->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
-    }
-    //--------------------------------------------------------------------------
-  };
-
-} /* namespace controls */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
deleted file mode 100644
index 4eb64c7..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include <string>
-#include <time.h>
-
-/*
- * Internal Structures to have "C"-Style data transfer
- */
-extern "C"
-{
-
-typedef struct AddonToKodiFuncTable_kodi_gui_general
-{
-  void (*lock)();
-  void (*unlock)();
-  int (*get_screen_height)(void* kodiBase);
-  int (*get_screen_width)(void* kodiBase);
-  int (*get_video_resolution)(void* kodiBase);
-  int (*get_current_window_dialog_id)(void* kodiBase);
-  int (*get_current_window_id)(void* kodiBase);
-  void* (*get_hw_context)(void* kodiBase);
-} AddonToKodiFuncTable_kodi_gui_general;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_button
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*set_label)(void* kodiBase, void* handle, const char* label);
-  char* (*get_label)(void* kodiBase, void* handle);
-  void (*set_label2)(void* kodiBase, void* handle, const char *label);
-  char* (*get_label2)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_button;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_edit
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*set_label)(void* kodiBase, void* handle, const char* label);
-  char* (*get_label)(void* kodiBase, void* handle);
-  void (*set_text)(void* kodiBase, void* handle, const char* text);
-  char* (*get_text)(void* kodiBase, void* handle);
-  void (*set_cursor_position)(void* kodiBase, void* handle, unsigned int position);
-  unsigned int (*get_cursor_position)(void* kodiBase, void* handle);
-  void (*set_input_type)(void* kodiBase, void* handle, int type, const char* heading);
-} AddonToKodiFuncTable_kodi_gui_control_edit;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_fade_label
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*add_label)(void* kodiBase, void* handle, const char* text);
-  char* (*get_label)(void* kodiBase, void* handle);
-  void (*set_scrolling)(void* kodiBase, void* handle, bool scroll);
-  void (*reset)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_fade_label;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_image
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_filename)(void* kodiBase, void* handle, const char* filename, bool use_cache);
-  void (*set_color_diffuse)(void* kodiBase, void* handle, uint32_t color_diffuse);
-} AddonToKodiFuncTable_kodi_gui_control_image;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_label
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_label)(void* kodiBase, void* handle, const char* text);
-  char* (*get_label)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_label;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_progress
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_percentage)(void* kodiBase, void* handle, float percent);
-  float (*get_percentage)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_progress;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_radio_button
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*set_label)(void* kodiBase, void* handle, const char* text);
-  char* (*get_label)(void* kodiBase, void* handle);
-  void (*set_selected)(void* kodiBase, void* handle, bool selected);
-  bool (*is_selected)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_radio_button;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_rendering
-{
-  void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
-      bool    (*createCB)(void*,int,int,int,int,void*),
-      void    (*renderCB)(void*),
-      void    (*stopCB)(void*),
-      bool    (*dirtyCB)(void*));
-  void (*destroy)(void *kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_control_rendering;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_settings_slider
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*set_text)(void* kodiBase, void* handle, const char* label);
-  void (*reset)(void* kodiBase, void* handle);
-  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
-  void (*set_int_value)(void* kodiBase, void* handle, int value);
-  int (*get_int_value)(void* kodiBase, void* handle);
-  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
-  void (*set_percentage)(void* kodiBase, void* handle, float percent);
-  float (*get_percentage)(void* kodiBase, void* handle);
-  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
-  void (*set_float_value)(void* kodiBase, void* handle, float value);
-  float (*get_float_value)(void* kodiBase, void* handle);
-  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
-} AddonToKodiFuncTable_kodi_gui_control_settings_slider;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_slider
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*reset)(void* kodiBase, void* handle);
-  char* (*get_description)(void* kodiBase, void* handle);
-  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
-  void (*set_int_value)(void* kodiBase, void* handle, int value);
-  int (*get_int_value)(void* kodiBase, void* handle);
-  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
-  void (*set_percentage)(void* kodiBase, void* handle, float percent);
-  float (*get_percentage)(void* kodiBase, void* handle);
-  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
-  void (*set_float_value)(void* kodiBase, void* handle, float value);
-  float (*get_float_value)(void* kodiBase, void* handle);
-  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
-} AddonToKodiFuncTable_kodi_gui_control_slider;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_spin
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
-  void (*set_text)(void* kodiBase, void* handle, const char* text);
-  void (*reset)(void* kodiBase, void* handle);
-  void (*set_type)(void* kodiBase, void* handle, int type);
-  void (*add_string_label)(void* kodiBase, void* handle, const char* label, const char* value);
-  void (*set_string_value)(void* kodiBase, void* handle, const char* value);
-  char* (*get_string_value)(void* kodiBase, void* handle);
-  void (*add_int_label)(void* kodiBase, void* handle, const char* label, int value);
-  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
-  void (*set_int_value)(void* kodiBase, void* handle, int value);
-  int (*get_int_value)(void* kodiBase, void* handle);
-  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
-  void (*set_float_value)(void* kodiBase, void* handle, float value);
-  float (*get_float_value)(void* kodiBase, void* handle);
-  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
-} AddonToKodiFuncTable_kodi_gui_control_spin;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_control_text_box
-{
-  void (*set_visible)(void* kodiBase, void* handle, bool visible);
-  void (*reset)(void* kodiBase, void* handle);
-  void (*set_text)(void* kodiBase, void* handle, const char* text);
-  char* (*get_text)(void* kodiBase, void* handle);
-  void (*scroll)(void* kodiBase, void* handle, unsigned int scroll);
-  void (*set_auto_scrolling)(void* kodiBase, void* handle, int delay, int time, int repeat);
-} AddonToKodiFuncTable_kodi_gui_control_text_box;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu
-{
-  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size);
-} AddonToKodiFuncTable_kodi_gui_dialogContextMenu;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress
-{
-  void* (*new_dialog)(void* kodiBase, const char *title);
-  void (*delete_dialog)(void* kodiBase, void* handle);
-  char* (*get_title)(void* kodiBase, void* handle);
-  void (*set_title)(void* kodiBase, void* handle, const char *title);
-  char* (*get_text)(void* kodiBase, void* handle);
-  void (*set_text)(void* kodiBase, void* handle, const char *text);
-  bool (*is_finished)(void* kodiBase, void* handle);
-  void (*mark_finished)(void* kodiBase, void* handle);
-  float (*get_percentage)(void* kodiBase, void* handle);
-  void (*set_percentage)(void* kodiBase, void* handle, float percentage);
-  void (*set_progress)(void* kodiBase, void* handle, int currentItem, int itemCount);
-} AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser
-{
-  bool (*show_and_get_directory)(void* kodiBase, const char* shares, const char* heading, const char* path_in, char** path_out, bool writeOnly);
-  bool (*show_and_get_file)(void* kodiBase, const char* shares, const char* mask, const char* heading, const char* path_in, char** path_out, bool use_thumbs, bool use_file_directories);
-  bool (*show_and_get_file_from_dir)(void* kodiBase, const char* directory, const char* mask, const char* heading, const char* path_in, char** path_out, bool use_thumbs, bool use_file_directories, bool singleList);
-  bool (*show_and_get_file_list)(void* kodiBase, const char* shares, const char* mask, const char* heading, char*** file_list, unsigned int* entries, bool use_thumbs, bool use_file_directories);
-  bool (*show_and_get_source)(void* kodiBase, const char* path_in, char** path_out, bool allow_network_shares, const char* additional_share, const char* type);
-  bool (*show_and_get_image)(void* kodiBase, const char* shares, const char* heading, const char* path_in, char** path_out);
-  bool (*show_and_get_image_list)(void* kodiBase,  const char* shares, const char* heading, char*** file_list, unsigned int* entries);
-  void (*clear_file_list)(void* kodiBase, char*** file_list, unsigned int entries);
-} AddonToKodiFuncTable_kodi_gui_dialogFileBrowser;
-
-// typedef void (*char_callback_t) (CGUIKeyboard *ref, const std::string &typedString);
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard
-{
-  bool (*show_and_get_input_with_head)(void* kodiBase, const char* text_in, char** text_out, const char* heading, bool allow_empty_result, bool hiddenInput, unsigned int auto_close_ms);
-  bool (*show_and_get_input)(void* kodiBase, const char* text_in, char** text_out, bool allow_empty_result, unsigned int auto_close_ms);
-  bool (*show_and_get_new_password_with_head)(void* kodiBase, const char* password_in, char** password_out, const char* heading, bool allow_empty_result, unsigned int auto_close_ms);
-  bool (*show_and_get_new_password)(void* kodiBase, const char* password_in, char** password_out, unsigned int auto_close_ms);
-  bool (*show_and_verify_new_password_with_head)(void* kodiBase, char** password_out, const char* heading, bool allow_empty_result, unsigned int auto_close_ms);
-  bool (*show_and_verify_new_password)(void* kodiBase, char** password_out, unsigned int auto_close_ms);
-  int (*show_and_verify_password)(void* kodiBase, const char* password_in, char** password_out, const char* heading, int retries, unsigned int auto_close_ms);
-  bool (*show_and_get_filter)(void* kodiBase, const char* text_in, char** text_out, bool searching, unsigned int auto_close_ms);
-  bool (*send_text_to_active_keyboard)(void* kodiBase, const char* text, bool close_keyboard);
-  bool (*is_keyboard_activated)(void* kodiBase);
-} AddonToKodiFuncTable_kodi_gui_dialogKeyboard;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogNumeric
-{
-  bool (*show_and_verify_new_password)(void* kodiBase, char** password);
-  int (*show_and_verify_password)(void* kodiBase, const char* password, const char *heading, int retries);
-  bool (*show_and_verify_input)(void* kodiBase, const char* verify_in, char** verify_out, const char* heading, bool verify_input);
-  bool (*show_and_get_time)(void* kodiBase, tm *time, const char *heading);
-  bool (*show_and_get_date)(void* kodiBase, tm *date, const char *heading);
-  bool (*show_and_get_ip_address)(void* kodiBase, const char* ip_address_in, char** ip_address_out, const char *heading);
-  bool (*show_and_get_number)(void* kodiBase, const char* input_in, char** input_out, const char *heading, unsigned int auto_close_ms);
-  bool (*show_and_get_seconds)(void* kodiBase, const char* time_in, char** time_out, const char *heading);
-} AddonToKodiFuncTable_kodi_gui_dialogNumeric;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogOK
-{
-  void (*show_and_get_input_single_text)(void* kodiBase, const char *heading, const char *text);
-  void (*show_and_get_input_line_text)(void* kodiBase, const char *heading, const char *line0, const char *line1, const char *line2);
-} AddonToKodiFuncTable_kodi_gui_dialogOK;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogProgress
-{
-  void* (*new_dialog)(void* kodiBase);
-  void (*delete_dialog)(void* kodiBase, void* handle);
-  void (*open)(void* kodiBase, void* handle);
-  void (*set_heading)(void* kodiBase, void* handle, const char* heading);
-  void (*set_line)(void* kodiBase, void* handle, unsigned int lineNo, const char* line);
-  void (*set_can_cancel)(void* kodiBase, void* handle, bool canCancel);
-  bool (*is_canceled)(void* kodiBase, void* handle);
-  void (*set_percentage)(void* kodiBase, void* handle, int percentage);
-  int (*get_percentage)(void* kodiBase, void* handle);
-  void (*show_progress_bar)(void* kodiBase, void* handle, bool pnOff);
-  void (*set_progress_max)(void* kodiBase, void* handle, int max);
-  void (*set_progress_advance)(void* kodiBase, void* handle, int nSteps);
-  bool (*abort)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_dialogProgress;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogSelect
-{
-  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size, int selected, unsigned int autoclose);
-  bool (*open_multi_select)(void* kodiBase, const char* heading, const char* entryIDs[], const char* entryNames[],
-                            bool entriesSelected[], unsigned int size, unsigned int autoclose);
-} AddonToKodiFuncTable_kodi_gui_dialogSelect;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer
-{
-  void (*open)(void* kodiBase, const char *heading, const char *text);
-} AddonToKodiFuncTable_kodi_gui_dialogTextViewer;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_dialogYesNo
-{
-  bool (*show_and_get_input_single_text)(void* kodiBase, const char *heading, const char *text, bool *canceled, const char *noLabel, const char *yesLabel);
-  bool (*show_and_get_input_line_text)(void* kodiBase, const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel);
-  bool (*show_and_get_input_line_button_text)(void* kodiBase, const char *heading, const char *line0, const char *line1, const char *line2, bool *canceled, const char *noLabel, const char *yesLabel);
-} AddonToKodiFuncTable_kodi_gui_dialogYesNo;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_listItem
-{
-  void* (*create)(void* kodiBase, const char* label, const char* label2, const char* icon_image, const char* path);
-  void (*destroy)(void* kodiBase, void* handle);
-  char* (*get_label)(void* kodiBase, void* handle);
-  void (*set_label)(void* kodiBase, void* handle, const char* label);
-  char* (*get_label2)(void* kodiBase, void* handle);
-  void (*set_label2)(void* kodiBase, void* handle, const char* label);
-  char* (*get_art)(void* kodiBase, void* handle, const char* type);
-  void (*set_art)(void* kodiBase, void* handle, const char* type, const char* image);
-  char* (*get_path)(void* kodiBase, void* handle);
-  void (*set_path)(void* kodiBase, void* handle, const char* path);
-  char* (*get_property)(void* kodiBase, void* handle, const char* key);
-  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
-  void (*select)(void* kodiBase, void* handle, bool select);
-  bool (*is_selected)(void* kodiBase, void* handle);
-} AddonToKodiFuncTable_kodi_gui_listItem;
-
-#define ADDON_MAX_CONTEXT_ENTRIES 20
-#define ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH 80
-typedef struct gui_context_menu_pair
-{
-  unsigned int id;
-  char name[ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH];
-} gui_context_menu_pair;
-
-typedef struct AddonToKodiFuncTable_kodi_gui_window
-{
-  /* Window creation functions */
-  void* (*create)(void* kodiBase, const char* xml_filename, const char* default_skin, bool as_dialog, bool is_media);
-  void (*destroy)(void* kodiBase, void* handle);
-  void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
-        bool (*CBInit)(void*),
-        bool (*CBFocus)(void*, int),
-        bool (*CBClick)(void*, int),
-        bool (*CBOnAction)(void*, int, uint32_t, wchar_t),
-        void (*CBGetContextButtons)(void*, int, gui_context_menu_pair*, unsigned int*),
-        bool (*CBOnContextButton)(void*, int, unsigned int));
-  bool (*show)(void* kodiBase, void* handle);
-  bool (*close)(void* kodiBase, void* handle);
-  bool (*do_modal)(void* kodiBase, void* handle);
-
-  /* Window control functions */
-  bool (*set_focus_id)(void* kodiBase, void* handle, int control_id);
-  int (*get_focus_id)(void* kodiBase, void* handle);
-  void (*set_control_label)(void* kodiBase, void* handle, int control_id, const char* label);
-  void (*set_control_visible)(void* kodiBase, void* handle, int control_id, bool visible);
-  void (*set_control_selected)(void* kodiBase, void* handle, int control_id, bool selected);
-
-  /* Window property functions */
-  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
-  void (*set_property_int)(void* kodiBase, void* handle, const char* key, int value);
-  void (*set_property_bool)(void* kodiBase, void* handle, const char* key, bool value);
-  void (*set_property_double)(void* kodiBase, void* handle, const char* key, double value);
-  char* (*get_property)(void* kodiBase, void* handle, const char* key);
-  int (*get_property_int)(void* kodiBase, void* handle, const char* key);
-  bool (*get_property_bool)(void* kodiBase, void* handle, const char* key);
-  double (*get_property_double)(void* kodiBase, void* handle, const char* key);
-  void (*clear_properties)(void* kodiBase, void* handle);
-  void (*clear_property)(void* kodiBase, void* handle, const char* key);
-
-  /* List item functions */
-  void (*clear_item_list)(void* kodiBase, void* handle);
-  void (*add_list_item)(void* kodiBase, void* handle, void* item, int list_position);
-  void (*remove_list_item_from_position)(void* kodiBase, void* handle, int list_position);
-  void (*remove_list_item)(void* kodiBase, void* handle, void* item);
-  void* (*get_list_item)(void* kodiBase, void* handle, int list_position);
-  void (*set_current_list_position)(void* kodiBase, void* handle, int list_position);
-  int (*get_current_list_position)(void* kodiBase, void* handle);
-  int (*get_list_size)(void* kodiBase, void* handle);
-  void (*set_container_property)(void* kodiBase, void* handle, const char* key, const char* value);
-  void (*set_container_content)(void* kodiBase, void* handle, const char* value);
-  int (*get_current_container_id)(void* kodiBase, void* handle);
-
-  /* Various functions */
-  void (*mark_dirty_region)(void* kodiBase, void* handle);
-
-  /* GUI control access functions */
-  void* (*get_control_button)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_edit)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_fade_label)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_image)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_label)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_progress)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_radio_button)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_render_addon)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_settings_slider)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_slider)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_spin)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_text_box)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy1)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy2)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy3)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy4)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy5)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy6)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy7)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy8)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy9)(void* kodiBase, void* handle, int control_id);
-  void* (*get_control_dummy10)(void* kodiBase, void* handle, int control_id); /* This and above used to add new get_control_* functions */
-} AddonToKodiFuncTable_kodi_gui_window;
-
-typedef struct AddonToKodiFuncTable_kodi_gui
-{
-  AddonToKodiFuncTable_kodi_gui_general* general;
-  AddonToKodiFuncTable_kodi_gui_control_button* control_button;
-  AddonToKodiFuncTable_kodi_gui_control_edit* control_edit;
-  AddonToKodiFuncTable_kodi_gui_control_fade_label* control_fade_label;
-  AddonToKodiFuncTable_kodi_gui_control_label* control_label;
-  AddonToKodiFuncTable_kodi_gui_control_image* control_image;
-  AddonToKodiFuncTable_kodi_gui_control_progress* control_progress;
-  AddonToKodiFuncTable_kodi_gui_control_radio_button* control_radio_button;
-  AddonToKodiFuncTable_kodi_gui_control_rendering* control_rendering;
-  AddonToKodiFuncTable_kodi_gui_control_settings_slider* control_settings_slider;
-  AddonToKodiFuncTable_kodi_gui_control_slider* control_slider;
-  AddonToKodiFuncTable_kodi_gui_control_spin* control_spin;
-  AddonToKodiFuncTable_kodi_gui_control_text_box* control_text_box;
-  void* control_dummy1;
-  void* control_dummy2;
-  void* control_dummy3;
-  void* control_dummy4;
-  void* control_dummy5;
-  void* control_dummy6;
-  void* control_dummy7;
-  void* control_dummy8;
-  void* control_dummy9;
-  void* control_dummy10; /* This and above used to add new controls */
-  AddonToKodiFuncTable_kodi_gui_dialogContextMenu* dialogContextMenu;
-  AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress* dialogExtendedProgress;
-  AddonToKodiFuncTable_kodi_gui_dialogFileBrowser* dialogFileBrowser;
-  AddonToKodiFuncTable_kodi_gui_dialogKeyboard* dialogKeyboard;
-  AddonToKodiFuncTable_kodi_gui_dialogNumeric* dialogNumeric;
-  AddonToKodiFuncTable_kodi_gui_dialogOK* dialogOK;
-  AddonToKodiFuncTable_kodi_gui_dialogProgress* dialogProgress;
-  AddonToKodiFuncTable_kodi_gui_dialogSelect* dialogSelect;
-  AddonToKodiFuncTable_kodi_gui_dialogTextViewer* dialogTextViewer;
-  AddonToKodiFuncTable_kodi_gui_dialogYesNo* dialogYesNo;
-  void* dialog_dummy1;
-  void* dialog_dummy2;
-  void* dialog_dummy3;
-  void* dialog_dummy4;
-  void* dialog_dummy5;
-  void* dialog_dummy6;
-  void* dialog_dummy7;
-  void* dialog_dummy8;
-  void* dialog_dummy9;
-  void* dialog_dummy10; /* This and above used to add new dialogs */
-  AddonToKodiFuncTable_kodi_gui_listItem* listItem;
-  AddonToKodiFuncTable_kodi_gui_window* window;
-} AddonToKodiFuncTable_kodi_gui;
-
-} /* extern "C" */
-
-//============================================================================
-///
-/// \ingroup cpp_kodi_gui_CControlRendering_Defs cpp_kodi_gui_CWindow_Defs
-/// @{
-/// @brief Handle to use as independent pointer for GUI
-typedef void* GUIHANDLE;
-/// @}
-//----------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
deleted file mode 100644
index d545030..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_ContextMenu Dialog Context Menu
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::ContextMenu }
-  /// **Context menu dialog**
-  ///
-  /// The function listed below permits the call of a dialogue as context menu to
-  /// select of an entry as a key
-  ///
-  /// It has the header \ref ContextMenu.h "#include <kodi/gui/dialogs/ContextMenu.h>"
-  /// be included to enjoy it.
-  ///
-  ///
-  namespace ContextMenu
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_ContextMenu
-    /// @brief Show a context menu dialog about given parts.
-    ///
-    /// @param[in] heading   Dialog heading name
-    /// @param[in] entries   String list about entries
-    /// @return          The selected entry, if return <tt>-1</tt> was nothing selected or canceled
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/ContextMenu.h>
-    ///
-    /// const std::vector<std::string> entries
-    /// {
-    ///   "Test 1",
-    ///   "Test 2",
-    ///   "Test 3",
-    ///   "Test 4",
-    ///   "Test 5"
-    /// };
-    ///
-    /// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
-    /// if (selected < 0)
-    ///   fprintf(stderr, "Item selection canceled\n");
-    /// else
-    ///   fprintf(stderr, "Selected item is: %i\n", selected);
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
-                                     const std::vector<std::string>& entries)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntries[i] = entries[i].c_str();
-      }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
-          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
-      free(cEntries);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_ContextMenu
-    /// @brief Show a context menu dialog about given parts.
-    ///
-    /// @param[in] heading   Dialog heading name
-    /// @param[in] entries   String list about entries
-    /// @return          The selected entry, if return <tt>-1</tt> was nothing selected or canceled
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/ContextMenu.h>
-    ///
-    /// const std::vector<std::pair<std::string, std::string>> entries
-    /// {
-    ///   { "ID 1", "Test 1" },
-    ///   { "ID 2", "Test 2" },
-    ///   { "ID 3", "Test 3" },
-    ///   { "ID 4", "Test 4" },
-    ///   { "ID 5", "Test 5" }
-    /// };
-    ///
-    /// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
-    /// if (selected < 0)
-    ///   fprintf(stderr, "Item selection canceled\n");
-    /// else
-    ///   fprintf(stderr, "Selected item is: %i\n", selected);
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN Show(
-        const std::string& heading, const std::vector<std::pair<std::string, std::string>>& entries)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntries[i] = entries[i].second.c_str();
-      }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
-      free(cEntries);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_ContextMenu
-    /// @brief Show a context menu dialog about given parts.
-    ///
-    /// @param[in] heading   Dialog heading name
-    /// @param[in] entries   String list about entries
-    /// @return          The selected entry, if return <tt>-1</tt> was nothing selected or canceled
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/ContextMenu.h>
-    ///
-    /// const std::vector<std::pair<int, std::string>> entries
-    /// {
-    ///   { 1, "Test 1" },
-    ///   { 2, "Test 2" },
-    ///   { 3, "Test 3" },
-    ///   { 4, "Test 4" },
-    ///   { 5, "Test 5" }
-    /// };
-    ///
-    /// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
-    /// if (selected < 0)
-    ///   fprintf(stderr, "Item selection canceled\n");
-    /// else
-    ///   fprintf(stderr, "Selected item is: %i\n", selected);
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
-                                     const std::vector<std::pair<int, std::string>>& entries)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntries[i] = entries[i].second.c_str();
-      }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
-      free(cEntries);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-  };
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
deleted file mode 100644
index 90da063..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_FileBrowser Dialog File Browser
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::FileBrowser }
-  /// **File browser dialog**
-  ///
-  /// The functions listed below of the class "FileBrowser" offer
-  /// the possibility to select to a file by the user of the add-on.
-  ///
-  /// It allows all the options that are possible in Kodi itself and offers all
-  /// support file types.
-  ///
-  /// It has the header \ref FileBrowser.h "#include <kodi/gui/dialogs/FileBrowser.h>"
-  /// be included to enjoy it.
-  ///
-  namespace FileBrowser
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief Directory selection dialog
-    ///
-    /// @param[in] shares       With Shares becomes the available start folders
-    ///                         be set.
-    /// @param[in] heading      Dialog header name
-    /// @param[in,out] path     As in the path to start and return value about
-    ///                         selected directory
-    /// @param[in] writeOnly    If set only writeable folders are shown.
-    /// @return                 False if selection becomes canceled.
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/FileBrowser.h>
-    ///
-    /// /*
-    ///  * Example show directory selection dialog with on 'share' (first value)
-    ///  * defined directory types.
-    ///  *
-    ///  * If this becomes leaved empty and 'directory' is empty goes it to the
-    ///  * base path of the hard disk.
-    ///  *
-    ///  * Also can be with path written to 'directory' before the dialog forced
-    ///  * to a start place.
-    ///  */
-    /// std::string directory;
-    /// bool ret = kodi::gui::dialogs::FileBrowser::ShowAndGetDirectory("local|network|removable",
-    ///                                                    "Test directory selection",
-    ///                                                    directory,
-    ///                                                    false);
-    /// fprintf(stderr, "Selected directory is : %s and was %s\n", directory.c_str(), ret ? "OK" : "Canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetDirectory(const std::string& shares,
-                                                     const std::string& heading,
-                                                     std::string& path,
-                                                     bool writeOnly = false)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_directory(
-          CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), heading.c_str(), path.c_str(),
-          &retString, writeOnly);
-      if (retString != nullptr)
-      {
-        if (std::strlen(retString))
-          path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
-                                                     retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief File selection dialog
-    ///
-    /// @param[in] shares               With Shares becomes the available  start
-    ///                                 folders be set.
-    /// @param[in] mask                 The mask to filter visible  files,  e.g.
-    ///                                 ".m3u|.pls|.b4s|.wpl".
-    /// @param[in] heading              Dialog header name
-    /// @param[in,out] path             As in the path to start and Return value
-    ///                                 about selected file
-    /// @param[in] useThumbs            If set show thumbs if possible on dialog.
-    /// @param[in] useFileDirectories   If set also  packages  (e.g. *.zip)  are
-    ///                                 handled as directories.
-    /// @return                         False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetFile(const std::string& shares,
-                                                const std::string& mask,
-                                                const std::string& heading,
-                                                std::string& path,
-                                                bool useThumbs = false,
-                                                bool useFileDirectories = false)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                 shares.c_str(), mask.c_str(), heading.c_str(), path.c_str(), &retString,
-                                                                                                 useThumbs, useFileDirectories);
-      if (retString != nullptr)
-      {
-        if (std::strlen(retString))
-          path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief File selection from a directory
-    ///
-    /// @param[in] directory            The  directory  name  where  the  dialog
-    ///                                 start, possible  are  normal  names  and
-    ///                                 kodi's special names.
-    /// @param[in] mask                 The mask to filter visible  files,  e.g.
-    ///                                 ".m3u|.pls|.b4s|.wpl".
-    /// @param[in] heading              Dialog header name
-    /// @param[in,out] path             As in the path to start and Return value
-    ///                                 about selected file
-    /// @param[in] useThumbs            If set show thumbs if possible on dialog.
-    /// @param[in] useFileDirectories   If set also  packages  (e.g. *.zip)  are
-    ///                                 handled as directories.
-    /// @param[in] singleList
-    /// @return                         False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetFileFromDir(const std::string& directory,
-                                                       const std::string& mask,
-                                                       const std::string& heading,
-                                                       std::string& path,
-                                                       bool useThumbs = false,
-                                                       bool useFileDirectories = false,
-                                                       bool singleList = false)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file_from_dir(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                          directory.c_str(), mask.c_str(), heading.c_str(),
-                                                                                                          path.c_str(), &retString, useThumbs,
-                                                                                                          useFileDirectories, singleList);
-      if (retString != nullptr)
-      {
-        if (std::strlen(retString))
-          path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief File selection dialog to get several in to a list
-    ///
-    /// @param[in] shares             With Shares becomes  the  available  start
-    ///                               folders be set.
-    /// @param[in] mask               The mask to  filter  visible  files,  e.g.
-    ///                               ".m3u|.pls|.b4s|.wpl".
-    /// @param[in] heading            Dialog header name
-    /// @param[out] fileList          Return value about selected files
-    /// @param[in] useThumbs          If set show thumbs if possible on dialog.
-    /// @param[in] useFileDirectories If  set  also  packages  (e.g. *.zip)  are
-    ///                               handled as directories.
-    /// @return False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetFileList(const std::string& shares,
-                                                    const std::string& mask,
-                                                    const std::string& heading,
-                                                    std::vector<std::string>& fileList,
-                                                    bool useThumbs = false,
-                                                    bool useFileDirectories = false)
-    {
-      using namespace ::kodi::addon;
-      char** list = nullptr;
-      unsigned int listSize = 0;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file_list(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                      shares.c_str(), mask.c_str(), heading.c_str(), &list, &listSize,
-                                                                                                      useThumbs, useFileDirectories);
-      if (ret)
-      {
-        for (unsigned int i = 0; i < listSize; ++i)
-          fileList.emplace_back(list[i]);
-        CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief Source selection dialog
-    ///
-    /// @param[in,out] path           As in the path to start and Return value
-    ///                               about selected source
-    /// @param[in] allowNetworkShares Allow also access to network
-    /// @param[in] additionalShare    With additionalShare becomes the available
-    ///                               start folders be set (optional).
-    /// @param[in] type
-    /// @return                       False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetSource(std::string& path,
-                                                  bool allowNetworkShares,
-                                                  const std::string& additionalShare = "",
-                                                  const std::string& type = "")
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_source(CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), &retString,
-                                                                                                   allowNetworkShares, additionalShare.c_str(), type.c_str());
-      if (retString != nullptr)
-      {
-        if (std::strlen(retString))
-          path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief Image selection dialog
-    ///
-    /// @param[in] shares     With Shares becomes the available start folders be
-    ///                       set.
-    /// @param[in] heading    Dialog header name
-    /// @param[out] path      Return value about selected image
-    /// @return               False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetImage(const std::string& shares,
-                                                 const std::string& heading,
-                                                 std::string& path)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_image(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                  shares.c_str(), heading.c_str(), path.c_str(), &retString);
-      if (retString != nullptr)
-      {
-        if (std::strlen(retString))
-          path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
-    /// @brief Image selection dialog to get several in to a list
-    ///
-    /// @param[in] shares       With Shares becomes the available  start folders
-    ///                         be set.
-    /// @param[in] heading      Dialog header name
-    /// @param[out] file_list   Return value about selected images
-    /// @return                 False if selection becomes canceled.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetImageList(const std::string& shares,
-                                                     const std::string& heading,
-                                                     std::vector<std::string>& file_list)
-    {
-      using namespace ::kodi::addon;
-      char** list = nullptr;
-      unsigned int listSize = 0;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_image_list(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                       shares.c_str(), heading.c_str(), &list, &listSize);
-      if (ret)
-      {
-        for (unsigned int i = 0; i < listSize; ++i)
-          file_list.emplace_back(list[i]);
-        CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-  };
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
deleted file mode 100644
index 843bdfa..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_Keyboard Dialog Keyboard
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::Keyboard }
-  /// **Keyboard dialogs**
-  ///
-  /// The functions listed below have to be permitted by the user for the
-  /// representation of a keyboard around an input.
-  ///
-  /// The class supports several kinds, from an easy text choice up to the
-  /// passport Word production and their confirmation for add-on.
-  ///
-  /// It has the header \ref Keyboard.h "#include <kodi/gui/dialogs/Keyboard.h>"
-  /// be included to enjoy it.
-  ///
-  namespace Keyboard
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Show keyboard with initial value `text` and replace with  result
-    /// string.
-    ///
-    /// @param[in,out] text          Overwritten with user input if return=true.
-    /// @param[in] heading           String shown on dialog title.
-    /// @param[in] allowEmptyResult  Whether a blank password is valid or not.
-    /// @param[in] hiddenInput       The inserted input is not shown as text.
-    /// @param[in] autoCloseMs       To  close  the  dialog  after  a  specified
-    ///                              time, in milliseconds, default is  0  which
-    ///                              keeps the dialog open indefinitely.
-    /// @return                      true if successful display and user  input.
-    ///                              false  if  unsuccessful  display,  no  user
-    ///                              input, or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/Keyboard.h>
-    ///
-    /// /*
-    ///  * The example shows the display of keyboard call dialog at Kodi from the add-on.
-    ///  * Below all values are set, however, can last two (hidden input = false and autoCloseMs = 0)
-    ///  * to be released if not needed.
-    ///  */
-    /// std::string text = "Please change me to them want you want"; /*< It can be leaved empty or a
-    ///                                                                  entry text added */
-    /// bool bRet = ::kodi::gui::dialogs::Keyboard::ShowAndGetInput(text,
-    ///                                                      "Demonstration text entry",
-    ///                                                      true,
-    ///                                                      false,
-    ///                                                      0);
-    /// fprintf(stderr, "Written keyboard input is : '%s' and was %s\n",
-    ///                   text.c_str(), bRet ? "OK" : "Canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
-                                                 const std::string& heading,
-                                                 bool allowEmptyResult,
-                                                 bool hiddenInput = false,
-                                                 unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret =
-          CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head(
-              CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, heading.c_str(),
-              allowEmptyResult, hiddenInput, autoCloseMs);
-      if (retString != nullptr)
-      {
-        text = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
-                                                     retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief The example shows the display of keyboard  call dialog  at  Kodi
-    /// from the add-on.
-    ///
-    /// @param[out] text            Overwritten with user input if return=true.
-    /// @param[in] allowEmptyResult If  set  to true  keyboard can  also  exited
-    ///                             without entered text.
-    /// @param[in] autoCloseMs      To close the dialog after a specified  time,
-    ///                             in milliseconds,  default is  0 which  keeps
-    ///                             the dialog open indefinitely.
-    /// @return                     true if successful display and user input.
-    ///                             false  if  unsuccessful   display,  no  user
-    ///                             input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
-                                                 bool allowEmptyResult,
-                                                 unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                               text.c_str(), &retString,
-                                                                                               allowEmptyResult, autoCloseMs);
-      if (retString != nullptr)
-      {
-        text = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Shows  keyboard  and  prompts  for  a  password.   Differs  from
-    /// `ShowAndVerifyNewPassword()` in that no second verification
-    ///
-    /// @param[in,out] newPassword   Overwritten with user input if return=true.
-    /// @param[in] heading           String shown on dialog title.
-    /// @param[in] allowEmptyResult  Whether a blank password is valid or not.
-    /// @param[in] autoCloseMs       To close the dialog after a specified time,
-    ///                              in milliseconds, default is  0  which keeps
-    ///                              the dialog open indefinitely.
-    /// @return                      true if successful display  and user input.
-    ///                              false  if  unsuccessful  display,  no  user
-    ///                              input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
-                                                       const std::string& heading,
-                                                       bool allowEmptyResult,
-                                                       unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_new_password_with_head(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                                newPassword.c_str(), &retString, heading.c_str(),
-                                                                                                                allowEmptyResult, autoCloseMs);
-      if (retString != nullptr)
-      {
-        newPassword = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Shows keyboard and prompts for a password. Differs from
-    /// `ShowAndVerifyNewPassword()` in that no second verification
-    ///
-    /// @param[in,out] newPassword    Overwritten with user input if return=true.
-    /// @param[in] autoCloseMs        To close the dialog after a specified time,
-    ///                               in milliseconds, default is 0 which  keeps
-    ///                               the dialog open indefinitely.
-    /// @return                       true if successful display  and user input.
-    ///                               false  if  unsuccessful  display,  no  user
-    ///                               input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
-                                                       unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_new_password(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                      newPassword.c_str(), &retString, autoCloseMs);
-      if (retString != nullptr)
-      {
-        newPassword = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Show keyboard twice to  get and confirm a  user-entered  password
-    /// string.
-    ///
-    /// @param[out] newPassword    Overwritten with user input if return=true.
-    /// @param[in] heading         String shown on dialog title.
-    /// @param[in] allowEmptyResult
-    /// @param[in] autoCloseMs     To close the dialog after a  specified  time,
-    ///                            in milliseconds,  default  is 0  which  keeps
-    ///                            the dialog open indefinitely.
-    /// @return                    true if successful display  and  user  input.
-    ///                            false  if  unsuccessful   display,   no  user
-    ///                            input, or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/General.h>
-    /// #include <kodi/gui/dialogs/Keyboard.h>
-    ///
-    /// /*
-    ///  * The example below shows the complete use of keyboard dialog for password
-    ///  * check. If only one check from add-on needed can be function with retries
-    ///  * set to '0' called alone.
-    ///  *
-    ///  * The use of MD5 translated password is always required for the check on Kodi!
-    ///  */
-    ///
-    /// int maxretries = 3;
-    /// /*
-    ///  * Password names need to be send as md5 sum to kodi.
-    ///  */
-    /// std::string password;
-    /// kodi::GetMD5("kodi", password);
-    ///
-    /// /*
-    ///  * To the loop about password checks.
-    ///  */
-    /// int ret;
-    /// for (unsigned int i = 0; i < maxretries; i++)
-    /// {
-    ///   /*
-    ///    * Ask the user about the password.
-    ///    */
-    ///   ret = ::kodi::gui::dialogs::Keyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
-    ///   if (ret == 0)
-    ///   {
-    ///     fprintf(stderr, "Password successfull confirmed after '%i' tries\n", i+1);
-    ///     break;
-    ///   }
-    ///   else if (ret < 0)
-    ///   {
-    ///     fprintf(stderr, "Canceled editing on try '%i'\n", i+1);
-    ///     break;
-    ///   }
-    ///   else /* if (ret > 0) */
-    ///   {
-    ///     fprintf(stderr, "Wrong password entered on try '%i'\n", i+1);
-    ///   }
-    /// }
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
-                                                          const std::string& heading,
-                                                          bool allowEmptyResult,
-                                                          unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_verify_new_password_with_head(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                                   &retString, heading.c_str(), allowEmptyResult,
-                                                                                                                   autoCloseMs);
-      if (retString != nullptr)
-      {
-        newPassword = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Show keyboard twice to get and confirm  a user-entered  password
-    /// string.
-    ///
-    /// @param[out] newPassword    Overwritten with user input if return=true.
-    /// @param[in] autoCloseMs     To close the dialog after a specified   time,
-    ///                            in milliseconds, default  is  0  which  keeps
-    ///                            the dialog open indefinitely.
-    /// @return                    true if successful display  and  user  input.
-    ///                            false  if  unsuccessful   display,   no  user
-    ///                            input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
-                                                          unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_verify_new_password(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                         &retString, autoCloseMs);
-      if (retString != nullptr)
-      {
-        newPassword = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Show keyboard and verify user input against `password`.
-    ///
-    /// @param[in,out] password    Value to compare against user input.
-    /// @param[in] heading         String shown on dialog title.
-    /// @param[in] retries         If   greater   than   0,   shows   "Incorrect
-    ///                            password,  %d retries left" on dialog line 2,
-    ///                            else line 2 is blank.
-    /// @param[in] autoCloseMs     To close the dialog  after a specified  time,
-    ///                            in milliseconds,  default is  0  which  keeps
-    ///                            the dialog open indefinitely.
-    /// @return                    0 if successful display  and user input. 1 if
-    ///                            unsuccessful input. -1 if no user  input  or
-    ///                            canceled editing.
-    ///
-    inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(std::string& password,
-                                                      const std::string& heading,
-                                                      int retries,
-                                                      unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_verify_password(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                    password.c_str(), &retString, heading.c_str(),
-                                                                                                    retries, autoCloseMs);
-      if (retString != nullptr)
-      {
-        password = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Shows a filter related keyboard
-    ///
-    /// @param[in,out] text        Overwritten with user input if  return=true.
-    /// @param[in] searching       Use dialog for  search and  send  our  search
-    ///                            message in safe way (only  the active  window
-    ///                            needs it)
-    ///  - header name if true is "Enter search string"
-    ///  - header name if false is "Enter value"
-    /// @param autoCloseMs         To close the dialog after  a specified  time,
-    ///                            in milliseconds, default  is  0  which  keeps
-    ///                            the dialog open indefinitely.
-    /// @return                    true if successful display  and  user  input.
-    ///                            false   if  unsuccessful  display,   no  user
-    ///                            input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetFilter(std::string& text,
-                                                  bool searching,
-                                                  unsigned int autoCloseMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_filter(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                text.c_str(), &retString, searching, autoCloseMs);
-      if (retString != nullptr)
-      {
-        text = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Send a text to a visible keyboard
-    ///
-    /// @param[in] text            Overwritten with user input if  return=true.
-    /// @param[in] closeKeyboard   The open dialog is if also closed on 'true'.
-    /// @return                    true   if    successful   done,    false   if
-    ///                            unsuccessful or keyboard not present.
-    ///
-    inline bool ATTRIBUTE_HIDDEN SendTextToActiveKeyboard(const std::string& text,
-                                                          bool closeKeyboard = false)
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->send_text_to_active_keyboard(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                     text.c_str(), closeKeyboard);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
-    /// @brief Check for visible keyboard on GUI
-    ///
-    /// @return  true if keyboard present, false if not present
-    ///
-    inline bool ATTRIBUTE_HIDDEN IsKeyboardActivated()
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->is_keyboard_activated(CAddonBase::m_interface->toKodi->kodiBase);
-    }
-    //--------------------------------------------------------------------------
-  };
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
deleted file mode 100644
index bff7683..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_Numeric Dialog Numeric
-  /// \ingroup cpp_kodi_gui
-  /// @{
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::Numeric }
-  /// **Numeric dialogs**
-  ///
-  /// The functions listed below have to be permitted by the user for the
-  /// representation of a numeric keyboard around an input.
-  ///
-  /// The class supports several kinds, from an easy number choice up to the
-  /// passport Word production and their confirmation for add-on.
-  ///
-  /// It has the header \ref Numeric.h "#include <kodi/gui/dialogs/Numeric.h>"
-  /// be included to enjoy it.
-  ///
-  namespace Numeric
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to get numeric new password
-    ///
-    /// @param[out] newPassword        String to preload into the keyboard
-    ///                                accumulator. Overwritten with user input
-    ///                                if return=true. Returned in MD5 format.
-    /// @return                        true if successful display and user
-    ///                                input entry/re-entry.
-    ///                                false if unsuccessful display, no user
-    ///                                input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword)
-    {
-      using namespace ::kodi::addon;
-      char* pw = nullptr;
-      bool ret =
-          CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password(
-              CAddonBase::m_interface->toKodi->kodiBase, &pw);
-      if (pw != nullptr)
-      {
-        newPassword = pw;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, pw);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to verify numeric password.
-    ///
-    /// @param[in] password             Password to compare with user input, need
-    ///                                 in MD5 format.
-    /// @param[in] heading              Heading to display
-    /// @param[in] retries              If greater than 0, shows "Incorrect
-    ///                                 password, %d retries left" on dialog
-    ///                                 line 2, else line 2 is blank.
-    /// @return                         Possible values:
-    ///                                 - 0 if successful display and user input.
-    ///                                 - 1 if unsuccessful input.
-    ///                                 - -1 if no user input or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <stdio.h>      /* fprintf */
-    /// #include <kodi/General.h>
-    /// #include <kodi/gui/dialogs/Numeric.h>
-    ///
-    /// /*
-    ///  * The example below shows the complete use of keyboard dialog for password
-    ///  * check. If only one check from add-on needed can be function with retries
-    ///  * set to '0' called alone.
-    ///  *
-    ///  * The use of MD5 translated password is always required for the check on Kodi!
-    ///  */
-    ///
-    /// int maxretries = 3;
-    ///
-    /// /*
-    ///  * Password names need to be send as md5 sum to kodi.
-    ///  */
-    /// std::string password = kodi::GetMD5("1234");
-    ///
-    /// /*
-    ///  * To the loop about password checks.
-    ///  */
-    /// int ret;
-    /// for (unsigned int i = 0; i < maxretries; i++)
-    /// {
-    ///   /*
-    ///    * Ask the user about the password.
-    ///    */
-    ///   ret = kodi::gui::dialogs::Numeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
-    ///   if (ret == 0)
-    ///   {
-    ///     fprintf(stderr, "Numeric password successfull confirmed after '%i' tries\n", i+1);
-    ///     break;
-    ///   }
-    ///   else if (ret < 0)
-    ///   {
-    ///     fprintf(stderr, "Canceled editing on try '%i'\n", i+1);
-    ///     break;
-    ///   }
-    ///   else /* if (ret > 0) */
-    ///   {
-    ///     fprintf(stderr, "Wrong numeric password entered on try '%i'\n", i+1);
-    ///   }
-    /// }
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(const std::string& password,
-                                                      const std::string& heading,
-                                                      int retries)
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_password(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                password.c_str(), heading.c_str(), retries);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to verify numeric password
-    ///
-    /// @param[in,out] toVerify         Value to compare against user input.
-    /// @param[in] heading              Heading to display
-    /// @param[in] verifyInput          If set as true we verify the users input
-    ///                                 versus toVerify.
-    /// @return                         true if successful display and user
-    ///                                 input. false if unsuccessful display, no
-    ///                                 user input, or canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyInput(std::string& toVerify,
-                                                    const std::string& heading,
-                                                    bool verifyInput)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_input(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                 toVerify.c_str(), &retString, heading.c_str(), verifyInput);
-      if (retString != nullptr)
-      {
-        toVerify = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to get time value.
-    ///
-    /// @param[out] time                Overwritten with user input if
-    ///                                 return=true and time inserted.
-    /// @param[in] heading              Heading to display.
-    /// @return                         true if successful display and user
-    ///                                 input. false if unsuccessful display, no
-    ///                                 user input, or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <stdio.h>      /* printf */
-    /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/dialogs/Numeric.h>
-    ///
-    /// time_t rawtime;
-    /// struct tm * timeinfo;
-    /// char buffer [10];
-    ///
-    /// time (&rawtime);
-    /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetTime(*timeinfo, "Selected time test call");
-    /// strftime(buffer, sizeof(buffer), "%H:%M.", timeinfo);
-    /// printf("Selected time it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetTime(tm& time, const std::string& heading)
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_time(CAddonBase::m_interface->toKodi->kodiBase, &time, heading.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to get date value.
-    ///
-    /// @param[in,out] date             Overwritten with user input if
-    ///                                 return=true and date inserted.
-    /// @param[in] heading              Heading to display
-    /// @return                         true if successful display and user
-    ///                                 input. false if unsuccessful display, no
-    ///                                 user input, or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <stdio.h>      /* printf */
-    /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/dialogs/Numeric.h>
-    ///
-    /// time_t rawtime;
-    /// struct tm * timeinfo;
-    /// char buffer [20];
-    ///
-    /// time (&rawtime);
-    /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetDate(*timeinfo, "Selected date test call");
-    /// strftime(buffer, sizeof(buffer), "%Y-%m-%d", timeinfo);
-    /// printf("Selected date it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetDate(tm& date, const std::string& heading)
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_date(CAddonBase::m_interface->toKodi->kodiBase, &date, heading.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to get a IP
-    ///
-    /// @param[in,out] ipAddress        Overwritten with user input if
-    ///                                 return=true and IP address inserted.
-    /// @param[in] heading              Heading to display.
-    /// @return                         true if successful display and
-    ///                                 user input. false if unsuccessful
-    ///                                 display, no user input, or canceled
-    ///                                 editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetIPAddress(std::string& ipAddress,
-                                                     const std::string& heading)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_ip_address(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                   ipAddress.c_str(), &retString, heading.c_str());
-      if (retString != nullptr)
-      {
-        ipAddress = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Use dialog to get normal number.
-    ///
-    /// @param[in,out] input            Overwritten with user input if
-    ///                                 return=true and time in seconds inserted
-    /// @param[in] heading              Heading to display
-    /// @param[in] autoCloseTimeoutMs   To close the dialog after a specified
-    ///                                 time, in milliseconds, default is 0
-    ///                                 which keeps the dialog open
-    ///                                 indefinitely.
-    /// @return                         true if successful display and user
-    ///                                 input. false if unsuccessful display, no
-    ///                                 user input, or canceled editing.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    ///   #include <stdio.h>      /* printf */
-    ///   #include <stdlib.h>     /* strtoull (C++11) */
-    ///   #include <kodi/gui/dialogs/Numeric.h>
-    ///
-    ///   std::string number;
-    ///   bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetNumber(number, "Number test call");
-    ///   printf("Written number input is : %llu and was %s\n",
-    ///                  strtoull(number.c_str(), nullptr, 0), bRet ? "OK" : "Canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetNumber(std::string& input,
-                                                  const std::string& heading,
-                                                  unsigned int autoCloseTimeoutMs = 0)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_number(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                               input.c_str(), &retString, heading.c_str(), autoCloseTimeoutMs);
-      if (retString != nullptr)
-      {
-        input = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Numeric
-    /// @brief Show numeric keypad to get seconds.
-    ///
-    /// @param[in,out] time     Overwritten with user input if return=true and
-    ///                         time in seconds inserted.
-    /// @param[in] heading      Heading to display
-    /// @return                 true if successful display and user input. false
-    ///                         if unsuccessful display, no user input, or
-    ///                         canceled editing.
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetSeconds(std::string& time, const std::string& heading)
-    {
-      using namespace ::kodi::addon;
-      char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_seconds(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                time.c_str(), &retString, heading.c_str());
-      if (retString != nullptr)
-      {
-        time = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
-      }
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-  };
-  /// @}
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
deleted file mode 100644
index b9a3a0d..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../../AddonBase.h"
-#include "../definitions.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_OK Dialog OK
-  /// \ingroup cpp_kodi_gui
-  /// @{
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::OK }
-  /// **OK dialog**
-  ///
-  /// The functions listed below permit the call of a dialogue of information, a
-  /// confirmation of the user by press from OK required.
-  ///
-  /// It has the header \ref OK.h "#include <kodi/gui/dialogs/OK.h>"
-  /// be included to enjoy it.
-  ///
-  namespace OK
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_OK
-    /// @brief Use dialog to inform user with text and confirmation with OK with continued string.
-    ///
-    /// @param[in] heading Dialog heading.
-    /// @param[in] text Multi-line text.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/OK.h>
-    /// ...
-    /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading, const std::string& text)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_single_text(
-          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_OK
-    /// @brief Use dialog to inform user with text and confirmation with OK with strings separated to the lines.
-    ///
-    /// @param[in] heading Dialog heading.
-    /// @param[in] line0 Line #1 text.
-    /// @param[in] line1 Line #2 text.
-    /// @param[in] line2 Line #3 text.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/OK.h>
-    /// ...
-    /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
-                                                 const std::string& line0,
-                                                 const std::string& line1,
-                                                 const std::string& line2)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_line_text(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                        heading.c_str(), line0.c_str(), line1.c_str(),
-                                                                                        line2.c_str());
-    }
-    //--------------------------------------------------------------------------
-  }
-  /// @}
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
deleted file mode 100644
index 39a98fe..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-//==============================================================================
-/// \defgroup cpp_kodi_vfs_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_gui_dialogs_Select
-/// @brief **Dialog Select definition values**
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// \ingroup cpp_kodi_vfs_Defs
-/// @brief **Selection entry structure**
-///
-typedef struct SSelectionEntry
-{
-  //============================================================================
-  /// Structure constructor
-  ///
-  /// There becomes selected always set to false.
-  ///
-  SSelectionEntry() = default;
-  //----------------------------------------------------------------------------
-
-  /// Entry identfication string
-  std::string id;
-
-  /// Entry name to show on GUI dialog
-  std::string name;
-
-  /// Place where entry can be preselected and after return the from user
-  /// selected is set.
-  bool selected = false;
-} SSelectionEntry;
-//------------------------------------------------------------------------------
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_Select Dialog Select
-  /// \ingroup cpp_kodi_gui
-  /// @{
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::Select }
-  /// **Selection dialog**
-  ///
-  /// The function listed below permits the call of a dialogue to select of an
-  /// entry as a key
-  ///
-  /// It has the header \ref Select.h "#include <kodi/gui/dialogs/Select.h>"
-  /// be included to enjoy it.
-  ///
-  ///
-  namespace Select
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Select
-    /// @brief Show a selection dialog about given parts.
-    ///
-    /// @param[in] heading      Dialog heading name
-    /// @param[in] entries      String list about entries
-    /// @param[in] selected     [opt] Predefined selection (default is
-    ///                         <tt>-1</tt> for the first)
-    /// @param[in] autoclose    [opt] To close dialog automatic after the given
-    ///                         time in ms. As '0' it stays open.
-    /// @return                 The selected entry, if return <tt>-1</tt> was
-    ///                         nothing selected or canceled
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/Select.h>
-    ///
-    /// const std::vector<std::string> entries
-    /// {
-    ///   "Test 1",
-    ///   "Test 2",
-    ///   "Test 3",
-    ///   "Test 4",
-    ///   "Test 5"
-    /// };
-    ///
-    /// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
-    /// if (selected < 0)
-    ///   fprintf(stderr, "Item selection canceled\n");
-    /// else
-    ///   fprintf(stderr, "Selected item is: %i\n", selected);
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
-                                     const std::vector<std::string>& entries,
-                                     int selected = -1,
-                                     unsigned int autoclose = 0)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntries = (const char**)malloc(size * sizeof(const char**));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntries[i] = entries[i].c_str();
-      }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(
-          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected,
-          autoclose);
-      free(cEntries);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Select
-    /// @brief Show a selection dialog about given parts.
-    ///
-    /// This function is mostly equal to the other, only becomes the string list
-    /// here done by a SSelectionEntry, where a ID string can be defined.
-    ///
-    /// @param[in] heading      Dialog heading name
-    /// @param[in] entries      SSelectionEntry list about entries
-    /// @param[in] selected     [opt] Predefined selection (default is
-    ///                         <tt>-1</tt> for the first)
-    /// @param[in] autoclose    [opt] To close dialog automatic after the given
-    ///                         time in ms. As '0' it stays open.
-    /// @return                 The selected entry, if return <tt>-1</tt> was
-    ///                         nothing selected or canceled
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/Select.h>
-    ///
-    /// std::vector<SSelectionEntry> entries
-    /// {
-    ///   { "ID 1", "Test 1", false },
-    ///   { "ID 2", "Test 2", false },
-    ///   { "ID 3", "Test 3", false },
-    ///   { "ID 4", "Test 4", false },
-    ///   { "ID 5", "Test 5", false }
-    /// };
-    ///
-    /// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
-    /// if (selected < 0)
-    ///   fprintf(stderr, "Item selection canceled\n");
-    /// else
-    ///   fprintf(stderr, "Selected item is: %i\n", selected);
-    /// ~~~~~~~~~~~~~
-    ///
-    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
-                                     std::vector<SSelectionEntry>& entries,
-                                     int selected = -1,
-                                     unsigned int autoclose = 0)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char*)));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntries[i] = entries[i].name.c_str();
-        if (selected == -1 && entries[i].selected)
-          selected = i;
-      }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(),
-                                                                              cEntries, size, selected, autoclose);
-      if (ret >= 0)
-      {
-        entries[ret].selected = true;
-      }
-      free(cEntries);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_Select
-    /// @brief Show a multiple selection dialog about given parts.
-    ///
-    /// @param[in] heading      Dialog heading name
-    /// @param[in] entries      SSelectionEntry list about entries
-    /// @param[in] autoclose    [opt] To close dialog automatic after the given
-    ///                         time in ms. As '0' it stays open.
-    /// @return                 The selected entries, if return <tt>empty</tt> was
-    ///                         nothing selected or canceled
-    ///
-    /// With selected on SSelectionEntry can be a pre selection defined.
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/Select.h>
-    ///
-    /// std::vector<SSelectionEntry> entries
-    /// {
-    ///   { "ID 1", "Test 1", false },
-    ///   { "ID 2", "Test 2", false },
-    ///   { "ID 3", "Test 3", false },
-    ///   { "ID 4", "Test 4", false },
-    ///   { "ID 5", "Test 5", false }
-    /// };
-    ///
-    /// bool ret = kodi::gui::dialogs::Select::ShowMultiSelect("Test selection", entries);
-    /// if (!ret)
-    ///   fprintf(stderr, "Selection canceled\n");
-    /// else
-    /// {
-    ///   fprintf(stderr, "Selected items:\n");
-    ///   for (const auto& entry : entries)
-    ///   {
-    ///     if (entry.selected)
-    ///       fprintf(stderr, " - %s\n", entry.selected.id.c_str());
-    ///   }
-    /// }
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowMultiSelect(const std::string& heading,
-                                                 std::vector<SSelectionEntry>& entries,
-                                                 int autoclose = 0)
-    {
-      using namespace ::kodi::addon;
-      unsigned int size = static_cast<unsigned int>(entries.size());
-      const char** cEntryIDs = static_cast<const char**>(malloc(size*sizeof(const char*)));
-      const char** cEntryNames = static_cast<const char**>(malloc(size*sizeof(const char*)));
-      bool* cEntriesSelected = static_cast<bool*>(malloc(size*sizeof(bool)));
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        cEntryIDs[i] = entries[i].id.c_str();
-        cEntryNames[i] = entries[i].name.c_str();
-        cEntriesSelected[i] = entries[i].selected;
-      }
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open_multi_select(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                            heading.c_str(), cEntryIDs, cEntryNames,
-                                                                                            cEntriesSelected, size, autoclose);
-      if (ret)
-      {
-        for (unsigned int i = 0; i < size; ++i)
-          entries[i].selected = cEntriesSelected[i];
-       }
-      free(cEntryNames);
-      free(cEntryIDs);
-      free(cEntriesSelected);
-      return ret;
-    }
-    //--------------------------------------------------------------------------
-  };
-  /// @}
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
deleted file mode 100644
index 5c81837..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (C) 2015-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_TextViewer Dialog Text Viewer
-  /// \ingroup cpp_kodi_gui
-  /// @{
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::TextViewer }
-  /// **Text viewer dialog**
-  ///
-  /// The text viewer dialog can be used to display descriptions, help texts or
-  /// other larger texts.
-  ///
-  /// In order to achieve a line break is a <b>\\n</b> directly in the text or
-  /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
-  /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
-  ///
-  /// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
-  /// be included to enjoy it.
-  ///
-  namespace TextViewer
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_TextViewer
-    /// @brief Show info text dialog
-    ///
-    /// @param[in] heading  Small heading text
-    /// @param[in] text     Showed text on dialog
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/TextViewer.h>
-    ///
-    /// kodi::gui::dialogs::TextViewer::Show("The Wizard of Oz (1939 film)",
-    ///  "The Wizard of Oz is a 1939 American musical comedy-drama fantasy film "
-    ///  "produced by Metro-Goldwyn-Mayer, and the most well-known and commercially "
-    ///  "successful adaptation based on the 1900 novel The Wonderful Wizard of Oz "
-    ///  "by L. Frank Baum. The film stars Judy Garland as Dorothy Gale. The film"
-    ///  "co-stars Terry the dog, billed as Toto; Ray Bolger, Jack Haley, Bert Lahr, "
-    ///  "Frank Morgan, Billie Burke, Margaret Hamilton, with Charley Grapewin and "
-    ///  "Clara Blandick, and the Singer Midgets as the Munchkins.\n"
-    ///  "\n"
-    ///  "Notable for its use of Technicolor, fantasy storytelling, musical score and "
-    ///  "unusual characters, over the years it has become an icon of American popular "
-    ///  "culture. It was nominated for six Academy Awards, including Best Picture but "
-    ///  "lost to Gone with the Wind. It did win in two other categories including Best "
-    ///  "Original Song for \"Over the Rainbow\". However, the film was a box office "
-    ///  "disappointment on its initial release, earning only $3,017,000 on a $2,777,000 "
-    ///  "budget, despite receiving largely positive reviews. It was MGM's most "
-    ///  "expensive production at that time, and did not completely recoup the studio's "
-    ///  "investment and turn a profit until theatrical re-releases starting in 1949.\n"
-    ///  "\n"
-    ///  "The 1956 broadcast television premiere of the film on CBS re-introduced the "
-    ///  "film to the wider public and eventually made the presentation an annual "
-    ///  "tradition, making it one of the most known films in cinema history. The "
-    ///  "film was named the most-viewed motion picture on television syndication by "
-    ///  "the Library of Congress who also included the film in its National Film "
-    ///  "Registry in its inaugural year in 1989. Designation on the registry calls "
-    ///  "for efforts to preserve it for being \"culturally, historically, and "
-    ///  "aesthetically significant\". It is also one of the few films on UNESCO's "
-    ///  "Memory of the World Register.\n"
-    ///  "\n"
-    ///  "The Wizard of Oz is often ranked on best-movie lists in critics' and public "
-    ///  "polls. It is the source of many quotes referenced in modern popular culture. "
-    ///  "It was directed primarily by Victor Fleming (who left production to take "
-    ///  "over direction on the troubled Gone with the Wind production). Noel Langley, "
-    ///  "Florence Ryerson and Edgar Allan Woolf received credit for the screenplay, "
-    ///  "but there were uncredited contributions by others. The songs were written "
-    ///  "by Edgar \"Yip\" Harburg (lyrics) and Harold Arlen (music). The incidental "
-    ///  "music, based largely on the songs, was composed by Herbert Stothart, with "
-    ///  "interspersed renderings from classical composers.\n");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline void ATTRIBUTE_HIDDEN Show(const std::string& heading, const std::string& text)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogTextViewer->open(
-          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
-    }
-    //--------------------------------------------------------------------------
-  };
-  /// @}
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
deleted file mode 100644
index 67c2fc4..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "../definitions.h"
-#include "../../AddonBase.h"
-
-namespace kodi
-{
-namespace gui
-{
-namespace dialogs
-{
-
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_YesNo Dialog Yes/No
-  /// \ingroup cpp_kodi_gui
-  /// @{
-  /// @brief \cpp_namespace{ kodi::gui::dialogs::YesNo }
-  /// **Yes / No dialog**
-  ///
-  /// The Yes / No dialog can be used to inform the user about questions and get
-  /// the answer.
-  ///
-  /// In order to achieve a line break is a <b>\\n</b> directly in the text or
-  /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
-  /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
-  ///
-  /// It has the header \ref YesNo.h "#include <kodi/gui/dialogs/YesNo.h>"
-  /// be included to enjoy it.
-  ///
-  ///
-  namespace YesNo
-  {
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_YesNo
-    /// @brief Use dialog to get numeric new password with one text string shown
-    /// everywhere and cancel return field
-    ///
-    /// @param[in] heading    Dialog heading
-    /// @param[in] text       Multi-line text
-    /// @param[out] canceled  Return value about cancel button
-    /// @param[in] noLabel    [opt] label to put on the no button
-    /// @param[in] yesLabel   [opt] label to put on the yes button
-    /// @return           Returns True if 'Yes' was pressed, else False
-    ///
-    /// @note It is preferred to only use this as it is actually a multi-line text.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/YesNo.h>
-    ///
-    /// bool canceled;
-    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
-    ///    "Yes / No test call",   /* The Header */
-    ///    "You has opened Yes / No dialog for test\n\nIs this OK for you?",
-    ///    canceled,               /* return value about cancel button */
-    ///    "Not really",           /* No label, is optional and if empty "No" */
-    ///    "Ohhh yes");            /* Yes label, also optional and if empty "Yes" */
-    /// fprintf(stderr, "You has called Yes/No, returned '%s' and was %s\n",
-    ///          ret ? "yes" : "no",
-    ///          canceled ? "canceled" : "not canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
-                                                 const std::string& text,
-                                                 bool& canceled,
-                                                 const std::string& noLabel = "",
-                                                 const std::string& yesLabel = "")
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_single_text(
-          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str(), &canceled,
-          noLabel.c_str(), yesLabel.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_YesNo
-    /// @brief Use dialog to get numeric new password with separated line strings
-    ///
-    /// @param[in] heading      Dialog heading
-    /// @param[in] line0        Line #0 text
-    /// @param[in] line1        Line #1 text
-    /// @param[in] line2        Line #2 text
-    /// @param[in] noLabel      [opt] label to put on the no button.
-    /// @param[in] yesLabel     [opt] label to put on the yes button.
-    /// @return                 Returns True if 'Yes' was pressed, else False.
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/YesNo.h>
-    ///
-    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
-    ///    "Yes / No test call",   // The Header
-    ///    "You has opened Yes / No dialog for test",
-    ///    "",
-    ///    "Is this OK for you?",
-    ///    "Not really",           // No label, is optional and if empty "No"
-    ///    "Ohhh yes");            // Yes label, also optional and if empty "Yes"
-    /// fprintf(stderr, "You has called Yes/No, returned '%s'\n",
-    ///          ret ? "yes" : "no");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
-                                                 const std::string& line0,
-                                                 const std::string& line1,
-                                                 const std::string& line2,
-                                                 const std::string& noLabel = "",
-                                                 const std::string& yesLabel = "")
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_line_text(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                  heading.c_str(), line0.c_str(), line1.c_str(), line2.c_str(),
-                                                                                                  noLabel.c_str(), yesLabel.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_YesNo
-    /// @brief Use dialog to get numeric new password with separated line strings and cancel return field
-    ///
-    /// @param[in] heading      Dialog heading
-    /// @param[in] line0        Line #0 text
-    /// @param[in] line1        Line #1 text
-    /// @param[in] line2        Line #2 text
-    /// @param[out] canceled    Return value about cancel button
-    /// @param[in] noLabel      [opt] label to put on the no button
-    /// @param[in] yesLabel     [opt] label to put on the yes button
-    /// @return                 Returns True if 'Yes' was pressed, else False
-    ///
-    ///
-    ///-------------------------------------------------------------------------
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/dialogs/YesNo.h>
-    ///
-    /// bool canceled;
-    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
-    ///    "Yes / No test call",   // The Header
-    ///    "You has opened Yes / No dialog for test",
-    ///    "",
-    ///    "Is this OK for you?",
-    ///    canceled,               // return value about cancel button
-    ///    "Not really",           // No label, is optional and if empty "No"
-    ///    "Ohhh yes");            // Yes label, also optional and if empty "Yes"
-    /// fprintf(stderr, "You has called Yes/No, returned '%s' and was %s\n",
-    ///          ret ? "yes" : "no",
-    ///          canceled ? "canceled" : "not canceled");
-    /// ~~~~~~~~~~~~~
-    ///
-    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
-                                                 const std::string& line0,
-                                                 const std::string& line1,
-                                                 const std::string& line2,
-                                                 bool& canceled,
-                                                 const std::string& noLabel = "",
-                                                 const std::string& yesLabel = "")
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_line_button_text(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                         heading.c_str(), line0.c_str(), line1.c_str(), line2.c_str(),
-                                                                                                         &canceled, noLabel.c_str(), yesLabel.c_str());
-    }
-    //--------------------------------------------------------------------------
-  };
-  /// @}
-
-} /* namespace dialogs */
-} /* namespace gui */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt
deleted file mode 100644
index 939585c..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(HEADERS DllHelper.h )
-
-if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_tools)
-endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h
index b0fddda..6ab4159 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h
@@ -12,15 +12,20 @@
 #include "versions.h"
 
 #include <assert.h> /* assert */
+#include <stdarg.h> /* va_list, va_start, va_arg, va_end */
+
+#ifdef __cplusplus
+
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 #include <memory>
-#include <stdarg.h> /* va_list, va_start, va_arg, va_end */
 #include <stdexcept>
 #include <string>
 #include <vector>
 
+#include "tools/StringUtils.h"
+
 namespace kodi
 {
 
@@ -30,6 +35,34 @@ struct IRenderHelper;
 } // namespace gui
 
 //==============================================================================
+/// @ingroup cpp_kodi_Defs
+/// @defgroup cpp_kodi_Defs_HardwareContext using HardwareContext
+/// @brief **Hardware specific device context**\n
+/// This defines an independent value which is used for hardware and OS specific
+/// values.
+///
+/// This is basically a simple pointer which has to be changed to the desired
+/// format at the corresponding places using <b>`static_cast<...>(...)`</b>.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <d3d11_1.h>
+/// ..
+/// // Note: Device() there is used inside addon child class about
+/// // kodi::addon::CInstanceVisualization
+/// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::addon::CInstanceVisualization::Device());
+/// ..
+/// ~~~~~~~~~~~~~
+///
+///@{
+using HardwareContext = ADDON_HARDWARE_CONTEXT;
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
 /// @ingroup cpp_kodi_addon_addonbase_Defs
 /// @defgroup cpp_kodi_addon_addonbase_Defs_CSettingValue class CSettingValue
 /// @brief Inside addon main instance used helper class to give settings value.
@@ -391,13 +424,13 @@ public:
   /// {
   ///   if (instanceType == ADDON_INSTANCE_SCREENSAVER)
   ///   {
-  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Screensaver");
+  ///     kodi::Log(ADDON_LOG_INFO, "Creating my Screensaver");
   ///     addonInstance = new CMyScreensaver(instance);
   ///     return ADDON_STATUS_OK;
   ///   }
   ///   else if (instanceType == ADDON_INSTANCE_VISUALIZATION)
   ///   {
-  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Visualization");
+  ///     kodi::Log(ADDON_LOG_INFO, "Creating my Visualization");
   ///     addonInstance = new CMyVisualization(instance);
   ///     return ADDON_STATUS_OK;
   ///   }
@@ -664,13 +697,12 @@ inline void ATTRIBUTE_HIDDEN Log(const AddonLog loglevel, const char* format, ..
 {
   using namespace kodi::addon;
 
-  char buffer[16384];
   va_list args;
   va_start(args, format);
-  vsnprintf(buffer, sizeof(buffer), format, args);
+  const std::string str = kodi::tools::StringUtils::FormatV(format, args);
   va_end(args);
   CAddonBase::m_interface->toKodi->addon_log_msg(CAddonBase::m_interface->toKodi->kodiBase,
-                                                 loglevel, buffer);
+                                                 loglevel, str.c_str());
 }
 //------------------------------------------------------------------------------
 
@@ -1286,3 +1318,5 @@ inline void* GetInterface(const std::string& name, const std::string& version)
     return kodi::addon::GetTypeMinVersion(type); \
   } \
   AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr;
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h b/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h
index 0cfefac..36d1dd1 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h
@@ -98,7 +98,7 @@ namespace audioengine
 /// With the help of this format information, Kodi adjusts its processing
 /// accordingly.
 ///
-//@{
+///@{
 class ATTRIBUTE_HIDDEN AudioEngineFormat
   : public addon::CStructHdl<AudioEngineFormat, AUDIO_ENGINE_FORMAT>
 {
@@ -139,7 +139,7 @@ public:
 
   /// @addtogroup cpp_kodi_audioengine_Defs_AudioEngineFormat
   /// @copydetails cpp_kodi_audioengine_Defs_AudioEngineFormat_Help
-  //@{
+  ///@{
 
   /// @brief The stream's data format (eg, AUDIOENGINE_FMT_S16LE)
   void SetDataFormat(enum AudioEngineDataFormat format) { m_cStructure->m_dataFormat = format; }
@@ -228,8 +228,9 @@ public:
 
     return true;
   }
+  ///@}
 };
-//@}
+///@}
 //----------------------------------------------------------------------------
 
 //}}}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt
index de7cb3e..d37078a 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt
@@ -12,5 +12,5 @@ if(CORE_SYSTEM_NAME STREQUAL android)
 endif()
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi)
+  core_add_library(addons_kodi-dev-kit_include_kodi)
 endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h
index 2054ce6..1cf05fe 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h
@@ -110,12 +110,18 @@ public:
   /// | Name | Type | Set call | Get call
   /// |------|------|----------|----------
   /// | **ID of device containing file** | `uint32_t` | @ref FileStatus::SetDeviceId "SetDeviceId" | @ref FileStatus::GetDeviceId "GetDeviceId"
+  /// | **Represent file serial numbers** | `uint64_t` | @ref FileStatus::SetFileSerialNumber "SetFileSerialNumber" | @ref FileStatus::GetFileSerialNumber "GetFileSerialNumber"
   /// | **Total size, in bytes** | `uint64_t` | @ref FileStatus::SetSize "SetSize" | @ref FileStatus::GetSize "GetSize"
   /// | **Time of last access** | `time_t` | @ref FileStatus::SetAccessTime "SetAccessTime" | @ref FileStatus::GetAccessTime "GetAccessTime"
   /// | **Time of last modification** | `time_t` | @ref FileStatus::SetModificationTime "SetModificationTime" | @ref FileStatus::GetModificationTime "GetModificationTime"
   /// | **Time of last status change** | `time_t` | @ref FileStatus::SetStatusTime "SetStatusTime" | @ref FileStatus::GetStatusTime "GetStatusTime"
   /// | **Stat url is a directory** | `bool` | @ref FileStatus::SetIsDirectory "SetIsDirectory" | @ref FileStatus::GetIsDirectory "GetIsDirectory"
   /// | **Stat url as a symbolic link** | `bool` | @ref FileStatus::SetIsSymLink "SetIsSymLink" | @ref FileStatus::GetIsSymLink "GetIsSymLink"
+  /// | **Stat url as a block special** | `bool` | @ref FileStatus::SetIsBlock "SetIsBlock" | @ref FileStatus::GetIsBlock "GetIsBlock"
+  /// | **Stat url as a character special** | `bool` | @ref FileStatus::SetIsCharacter "SetIsCharacter" | @ref FileStatus::GetIsCharacter "GetIsCharacter"
+  /// | **Stat url as a FIFO special** | `bool` | @ref FileStatus::SetIsFifo "SetIsFifo" | @ref FileStatus::GetIsFifo "GetIsFifo"
+  /// | **Stat url as a regular** | `bool` | @ref FileStatus::SetIsRegular "SetIsRegular" | @ref FileStatus::GetIsRegular "GetIsRegular"
+  /// | **Stat url as a socket** | `bool` | @ref FileStatus::SetIsSocket "SetIsSocket" | @ref FileStatus::GetIsSocket "GetIsSocket"
   ///
 
   /// @addtogroup cpp_kodi_vfs_Defs_FileStatus
@@ -128,6 +134,12 @@ public:
   /// @brief Get ID of device containing file.
   uint32_t GetDeviceId() const { return m_cStructure->deviceId; }
 
+  /// @brief Set the file serial number, which distinguishes this file from all other files on the same device.
+  void SetFileSerialNumber(uint64_t fileSerialNumber) { m_cStructure->fileSerialNumber = fileSerialNumber; }
+
+  /// @brief Get the file serial number, which distinguishes this file from all other files on the same device.
+  uint64_t GetFileSerialNumber() const { return m_cStructure->fileSerialNumber; }
+
   /// @brief Set total size, in bytes.
   void SetSize(uint64_t size) { m_cStructure->size = size; }
 
@@ -167,6 +179,35 @@ public:
   /// @brief Get stat url is a symbolic link.
   bool GetIsSymLink() const { return m_cStructure->isSymLink; }
 
+  /// @brief Set stat url as a block special.
+  void SetIsBlock(bool isBlock) { m_cStructure->isBlock = isBlock; }
+
+  /// @brief Get stat url is a block special.
+  bool GetIsBlock() const { return m_cStructure->isBlock; }
+
+  /// @brief Set stat url as a character special.
+  void SetIsCharacter(bool isCharacter) { m_cStructure->isCharacter = isCharacter; }
+
+  /// @brief Get stat url is a character special.
+  bool GetIsCharacter() const { return m_cStructure->isCharacter; }
+
+  /// @brief Set stat url as a FIFO special.
+  void SetIsFifo(bool isFifo) { m_cStructure->isFifo = isFifo; }
+
+  /// @brief Get stat url is a FIFO special.
+  bool GetIsFifo() const { return m_cStructure->isFifo; }
+
+  /// @brief Set stat url as a regular.
+  void SetIsRegular(bool isRegular) { m_cStructure->isRegular = isRegular; }
+
+  /// @brief Get stat url is a regular.
+  bool GetIsRegular() const { return m_cStructure->isRegular; }
+
+  /// @brief Set stat url is a socket.
+  void SetIsSocket(bool isSocket) { m_cStructure->isSocket = isSocket; }
+
+  /// @brief Get stat url is a regular.
+  bool GetIsSocket() const { return m_cStructure->isSocket; }
   //@}
 };
 //@}
@@ -777,6 +818,7 @@ inline bool ATTRIBUTE_HIDDEN DirectoryExists(const std::string& path)
 /// directory whose name is given by path.
 ///
 /// @param[in] path Path to the directory.
+/// @param[in] recursive [opt] Remove directory recursive (default is false)
 /// @return Upon successful completion, the function RemoveDirectory() shall
 ///         return true. Otherwise, false shall be returned, and errno set
 ///         to indicate the error. If false is returned, the named directory
@@ -793,12 +835,16 @@ inline bool ATTRIBUTE_HIDDEN DirectoryExists(const std::string& path)
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline bool ATTRIBUTE_HIDDEN RemoveDirectory(const std::string& path)
+inline bool ATTRIBUTE_HIDDEN RemoveDirectory(const std::string& path, bool recursive = false)
 {
   using namespace kodi::addon;
 
-  return CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory(
-      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  if (!recursive)
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory(
+        CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  else
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory_recursive(
+        CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
 }
 //------------------------------------------------------------------------------
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h b/xbmc/addons/kodi-dev-kit/include/kodi/General.h
index 878eaa4..3fad5a0 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/General.h
@@ -10,6 +10,7 @@
 
 #include "AddonBase.h"
 #include "c-api/general.h"
+#include "tools/StringUtils.h"
 
 #ifdef __cplusplus
 
@@ -317,12 +318,11 @@ inline void ATTRIBUTE_HIDDEN QueueFormattedNotification(QueueMsg type, const cha
   using namespace kodi::addon;
 
   va_list args;
-  char buffer[16384];
   va_start(args, format);
-  vsprintf(buffer, format, args);
+  const std::string str = kodi::tools::StringUtils::FormatV(format, args);
   va_end(args);
   CAddonBase::m_interface->toKodi->kodi->queue_notification(
-      CAddonBase::m_interface->toKodi->kodiBase, type, "", buffer, "", 5000, false, 1000);
+      CAddonBase::m_interface->toKodi->kodiBase, type, "", str.c_str(), "", 5000, false, 1000);
 }
 //------------------------------------------------------------------------------
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h b/xbmc/addons/kodi-dev-kit/include/kodi/Network.h
index 910385f..910385f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/Network.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h b/xbmc/addons/kodi-dev-kit/include/kodi/StreamCodec.h
index e030371..e030371 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/StreamCodec.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-dev-kit/include/kodi/StreamCrypto.h
index 8008aa1..8008aa1 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/StreamCrypto.h
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h
new file mode 100644
index 0000000..a6bea7d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h
@@ -0,0 +1,595 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../AudioEngine.h"
+#include "../c-api/addon-instance/audio_decoder.h"
+
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
+{
+
+class CInstanceAudioDecoder;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag class AudioDecoderInfoTag
+/// @ingroup cpp_kodi_addon_audiodecoder_Defs
+/// @brief **Info tag data structure**\n
+/// Representation of available information of processed audio file.
+///
+/// This is used to store all the necessary data of audio stream and to have on
+/// e.g. GUI for information.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag_Help
+///
+///@{
+class AudioDecoderInfoTag : public CStructHdl<AudioDecoderInfoTag, AUDIO_DECODER_INFO_TAG>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceAudioDecoder;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  AudioDecoderInfoTag() { memset(m_cStructure, 0, sizeof(AUDIO_DECODER_INFO_TAG)); }
+  AudioDecoderInfoTag(const AudioDecoderInfoTag& tag) : CStructHdl(tag) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag_Help Value Help
+  /// @ingroup cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Title** | `std::string` | @ref AudioDecoderInfoTag::SetTitle "SetTitle" | @ref AudioDecoderInfoTag::GetTitle "GetTitle"
+  /// | **Artist** | `std::string` | @ref AudioDecoderInfoTag::SetArtist "SetArtist" | @ref AudioDecoderInfoTag::GetArtist "GetArtist"
+  /// | **Album** | `std::string` | @ref AudioDecoderInfoTag::SetAlbum "SetAlbum" | @ref AudioDecoderInfoTag::GetAlbum "GetAlbum"
+  /// | **Album artist** | `std::string` | @ref AudioDecoderInfoTag::SetAlbumArtist "SetAlbumArtist" | @ref AudioDecoderInfoTag::GetAlbumArtist "GetAlbumArtist"
+  /// | **Media type** | `std::string` | @ref AudioDecoderInfoTag::SetMediaType "SetMediaType" | @ref AudioDecoderInfoTag::GetMediaType "GetMediaType"
+  /// | **Genre** | `std::string` | @ref AudioDecoderInfoTag::SetGenre "SetGenre" | @ref AudioDecoderInfoTag::GetGenre "GetGenre"
+  /// | **Duration** | `int` | @ref AudioDecoderInfoTag::SetDuration "SetDuration" | @ref AudioDecoderInfoTag::GetDuration "GetDuration"
+  /// | **Track number** | `int` | @ref AudioDecoderInfoTag::SetTrack "SetTrack" | @ref AudioDecoderInfoTag::GetTrack "GetTrack"
+  /// | **Disc number** | `int` | @ref AudioDecoderInfoTag::SetDisc "SetDisc" | @ref AudioDecoderInfoTag::GetDisc "GetDisc"
+  /// | **Disc subtitle name** | `std::string` | @ref AudioDecoderInfoTag::SetDiscSubtitle "SetDiscSubtitle" | @ref AudioDecoderInfoTag::GetDiscSubtitle "GetDiscSubtitle"
+  /// | **Disc total amount** | `int` | @ref AudioDecoderInfoTag::SetDiscTotal "SetDiscTotal" | @ref AudioDecoderInfoTag::GetDiscTotal "GetDiscTotal"
+  /// | **Release date** | `std::string` | @ref AudioDecoderInfoTag::SetReleaseDate "SetReleaseDate" | @ref AudioDecoderInfoTag::GetReleaseDate "GetReleaseDate"
+  /// | **Lyrics** | `std::string` | @ref AudioDecoderInfoTag::SetLyrics "SetLyrics" | @ref AudioDecoderInfoTag::GetLyrics "GetLyrics"
+  /// | **Samplerate** | `int` | @ref AudioDecoderInfoTag::SetSamplerate "SetSamplerate" | @ref AudioDecoderInfoTag::GetSamplerate "GetSamplerate"
+  /// | **Channels amount** | `int` | @ref AudioDecoderInfoTag::SetChannels "SetChannels" | @ref AudioDecoderInfoTag::GetChannels "GetChannels"
+  /// | **Bitrate** | `int` | @ref AudioDecoderInfoTag::SetBitrate "SetBitrate" | @ref AudioDecoderInfoTag::GetBitrate "GetBitrate"
+  /// | **Comment text** | `std::string` | @ref AudioDecoderInfoTag::SetComment "SetComment" | @ref AudioDecoderInfoTag::GetComment "GetComment"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag
+  ///@{
+
+  /// @brief Set the title from music as string on info tag.
+  void SetTitle(const std::string& title)
+  {
+    strncpy(m_cStructure->title, title.c_str(), sizeof(m_cStructure->title) - 1);
+  }
+
+  /// @brief Get title name
+  std::string GetTitle() const { return m_cStructure->title; }
+
+  /// @brief Set artist name
+  void SetArtist(const std::string& artist)
+  {
+    strncpy(m_cStructure->artist, artist.c_str(), sizeof(m_cStructure->artist) - 1);
+  }
+
+  /// @brief Get artist name
+  std::string GetArtist() const { return m_cStructure->artist; }
+
+  /// @brief Set album name
+  void SetAlbum(const std::string& album)
+  {
+    strncpy(m_cStructure->album, album.c_str(), sizeof(m_cStructure->album) - 1);
+  }
+
+  /// @brief Set album name
+  std::string GetAlbum() const { return m_cStructure->album; }
+
+  /// @brief Set album artist name
+  void SetAlbumArtist(const std::string& albumArtist)
+  {
+    strncpy(m_cStructure->album_artist, albumArtist.c_str(),
+            sizeof(m_cStructure->album_artist) - 1);
+  }
+
+  /// @brief Get album artist name
+  std::string GetAlbumArtist() const { return m_cStructure->album_artist; }
+
+  /// @brief Set the media type of the music item.
+  ///
+  /// Available strings about media type for music:
+  /// | String         | Description                                       |
+  /// |---------------:|:--------------------------------------------------|
+  /// | artist         | If it is defined as an artist
+  /// | album          | If it is defined as an album
+  /// | music          | If it is defined as an music
+  /// | song           | If it is defined as a song
+  ///
+  void SetMediaType(const std::string& mediaType)
+  {
+    strncpy(m_cStructure->media_type, mediaType.c_str(), sizeof(m_cStructure->media_type) - 1);
+  }
+
+  /// @brief Get the media type of the music item.
+  std::string GetMediaType() const { return m_cStructure->media_type; }
+
+  /// @brief Set genre name from music as string if present.
+  void SetGenre(const std::string& genre)
+  {
+    strncpy(m_cStructure->genre, genre.c_str(), sizeof(m_cStructure->genre) - 1);
+  }
+
+  /// @brief Get genre name from music as string if present.
+  std::string GetGenre() const { return m_cStructure->genre; }
+
+  /// @brief Set the duration of music as integer from info.
+  void SetDuration(int duration) { m_cStructure->duration = duration; }
+
+  /// @brief Get the duration of music as integer from info.
+  int GetDuration() const { return m_cStructure->duration; }
+
+  /// @brief Set track number (if present) from music info as integer.
+  void SetTrack(int track) { m_cStructure->track = track; }
+
+  /// @brief Get track number (if present).
+  int GetTrack() const { return m_cStructure->track; }
+
+  /// @brief Set disk number (if present) from music info as integer.
+  void SetDisc(int disc) { m_cStructure->disc = disc; }
+
+  /// @brief Get disk number (if present)
+  int GetDisc() const { return m_cStructure->disc; }
+
+  /// @brief Set disk subtitle name (if present) from music info.
+  void SetDiscSubtitle(const std::string& discSubtitle)
+  {
+    strncpy(m_cStructure->disc_subtitle, discSubtitle.c_str(),
+            sizeof(m_cStructure->disc_subtitle) - 1);
+  }
+
+  /// @brief Get disk subtitle name (if present) from music info.
+  std::string GetDiscSubtitle() const { return m_cStructure->disc_subtitle; }
+
+  /// @brief Set disks amount quantity (if present) from music info as integer.
+  void SetDiscTotal(int discTotal) { m_cStructure->disc_total = discTotal; }
+
+  /// @brief Get disks amount quantity (if present)
+  int GetDiscTotal() const { return m_cStructure->disc_total; }
+
+  /// @brief Set release date as string from music info (if present).\n
+  /// [ISO8601](https://en.wikipedia.org/wiki/ISO_8601) date YYYY, YYYY-MM or YYYY-MM-DD
+  void SetReleaseDate(const std::string& releaseDate)
+  {
+    strncpy(m_cStructure->release_date, releaseDate.c_str(),
+            sizeof(m_cStructure->release_date) - 1);
+  }
+
+  /// @brief Get release date as string from music info (if present).
+  std::string GetReleaseDate() const { return m_cStructure->release_date; }
+
+  /// @brief Set string from lyrics.
+  void SetLyrics(const std::string& lyrics)
+  {
+    strncpy(m_cStructure->lyrics, lyrics.c_str(), sizeof(m_cStructure->lyrics) - 1);
+  }
+
+  /// @brief Get string from lyrics.
+  std::string GetLyrics() const { return m_cStructure->lyrics; }
+
+  /// @brief Set related stream samplerate.
+  void SetSamplerate(int samplerate) { m_cStructure->samplerate = samplerate; }
+
+  /// @brief Get related stream samplerate.
+  int GetSamplerate() const { return m_cStructure->samplerate; }
+
+  /// @brief Set related stream channels amount.
+  void SetChannels(int channels) { m_cStructure->channels = channels; }
+
+  /// @brief Get related stream channels amount.
+  int GetChannels() const { return m_cStructure->channels; }
+
+  /// @brief Set related stream bitrate.
+  void SetBitrate(int bitrate) { m_cStructure->bitrate = bitrate; }
+
+  /// @brief Get related stream bitrate.
+  int GetBitrate() const { return m_cStructure->bitrate; }
+
+  /// @brief Set additional information comment (if present).
+  void SetComment(const std::string& comment)
+  {
+    strncpy(m_cStructure->comment, comment.c_str(), sizeof(m_cStructure->comment) - 1);
+  }
+
+  /// @brief Get additional information comment (if present).
+  std::string GetComment() const { return m_cStructure->comment; }
+
+  ///@}
+
+private:
+  AudioDecoderInfoTag(const AUDIO_DECODER_INFO_TAG* tag) : CStructHdl(tag) {}
+  AudioDecoderInfoTag(AUDIO_DECODER_INFO_TAG* tag) : CStructHdl(tag) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_audiodecoder_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_audiodecoder
+/// @brief **Audio decoder add-on instance definition values**\n
+/// All audio decoder functions associated data structures.
+///
+/// Used to exchange the available options between Kodi and addon.\n
+/// The groups described here correspond to the groups of functions on audio
+/// decoder instance class.
+///
+
+//==============================================================================
+///
+/// \addtogroup cpp_kodi_addon_audiodecoder
+/// @brief \cpp_class{ kodi::addon::CInstanceAudioDecoder }
+/// **Audio decoder add-on instance**
+///
+/// For audio decoders as binary add-ons. This class implements a way to handle
+/// special types of audio files.
+///
+/// The add-on handles loading of the source file and outputting the audio stream
+/// for consumption by the player.
+///
+/// The addon.xml defines the capabilities of this add-on.
+///
+/// @note The option to have multiple instances is possible with audio-decoder
+/// add-ons. This is useful, since some playback engines are riddled by global
+/// variables, making decoding of multiple streams using the same instance
+/// impossible.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Here's an example on addon.xml:**
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="audiodecoder.myspecialnamefor"
+///   version="1.0.0"
+///   name="My special audio decoder addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.audiodecoder"
+///     name="2sf"
+///     extension=".2sf|.mini2sf"
+///     tags="true"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My audio decoder addon addon</summary>
+///     <description lang="en_GB">My audio decoder addon description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// Description to audio decoder related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.audiodecoder"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+/// | <b>`name`</b>                 | The name of the decoder used in Kodi for display.
+/// | <b>`extension`</b>            | The file extensions / styles supported by this addon.
+/// | <b>`tags`</b>                 | Boolean to point out that addon can bring own information to replayed file, if <b>`false`</b> only the file name is used as info.<br>If <b>`true`</b>, \ref CInstanceAudioDecoder::ReadTag is used and must be implemented.
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is a code example how this addon is used:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/AudioDecoder.h>
+///
+/// class CMyAudioDecoder : public kodi::addon::CInstanceAudioDecoder
+/// {
+/// public:
+///   CMyAudioDecoder(KODI_HANDLE instance, const std::string& version);
+///
+///   bool Init(const std::string& filename, unsigned int filecache,
+///             int& channels, int& samplerate,
+///             int& bitspersample, int64_t& totaltime,
+///             int& bitrate, AudioEngineDataFormat& format,
+///             std::vector<AudioEngineChannel>& channellist) override;
+///   int ReadPCM(uint8_t* buffer, int size, int& actualsize) override;
+/// };
+///
+/// CMyAudioDecoder::CMyAudioDecoder(KODI_HANDLE instance, const std::string& version)
+///   : kodi::addon::CInstanceAudioDecoder(instance, version)
+/// {
+///   ...
+/// }
+///
+/// bool CMyAudioDecoder::Init(const std::string& filename, unsigned int filecache,
+///                            int& channels, int& samplerate,
+///                            int& bitspersample, int64_t& totaltime,
+///                            int& bitrate, AudioEngineDataFormat& format,
+///                            std::vector<AudioEngineChannel>& channellist)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// int CMyAudioDecoder::ReadPCM(uint8_t* buffer, int size, int& actualsize)
+/// {
+///   ...
+///   return 0;
+/// }
+///
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() { }
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_AUDIODECODER)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Creating my audio decoder");
+///     addonInstance = new CMyAudioDecoder(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyAudioDecoder` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstanceAudioDecoder : public IAddonInstance
+{
+public:
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Audio decoder class constructor used to support multiple instance
+  /// types.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyAudioDecoder : public kodi::addon::CInstanceAudioDecoder
+  /// {
+  /// public:
+  ///   CMyAudioDecoder(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : kodi::addon::CInstanceAudioDecoder(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my audio decoder");
+  ///   addonInstance = new CMyAudioDecoder(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstanceAudioDecoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_AUDIODECODER,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_AUDIODECODER))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation of multiple together with single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Initialize a decoder.
+  ///
+  /// @param[in] filename The file to read
+  /// @param[in] filecache The file cache size
+  /// @param[out] channels Number of channels in output stream
+  /// @param[out] samplerate Samplerate of output stream
+  /// @param[out] bitspersample Bits per sample in output stream
+  /// @param[out] totaltime Total time for stream
+  /// @param[out] bitrate Average bitrate of input stream
+  /// @param[out] format Data format for output stream, see
+  ///                    @ref cpp_kodi_audioengine_Defs_AudioEngineFormat for
+  ///                    available values
+  /// @param[out] channellist Channel mapping for output streamm, see
+  ///                         @ref cpp_kodi_audioengine_Defs_AudioEngineChannel
+  ///                         for available values
+  /// @return true if successfully done, otherwise false
+  ///
+  virtual bool Init(const std::string& filename,
+                    unsigned int filecache,
+                    int& channels,
+                    int& samplerate,
+                    int& bitspersample,
+                    int64_t& totaltime,
+                    int& bitrate,
+                    AudioEngineDataFormat& format,
+                    std::vector<AudioEngineChannel>& channellist) = 0;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Produce some noise.
+  ///
+  /// @param[in] buffer Output buffer
+  /// @param[in] size Size of output buffer
+  /// @param[out] actualsize Actual number of bytes written to output buffer
+  /// @return Return with following possible values:
+  /// | Value | Description
+  /// |:-----:|:------------
+  /// |   0   | on success
+  /// |  -1   | on end of stream
+  /// |   1   | on failure
+  ///
+  virtual int ReadPCM(uint8_t* buffer, int size, int& actualsize) = 0;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Seek in output stream.
+  ///
+  /// @param[in] time Time position to seek to in milliseconds
+  /// @return Time position seek ended up on
+  ///
+  virtual int64_t Seek(int64_t time) { return time; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Read tag of a file.
+  ///
+  /// @param[in] file File to read tag for
+  /// @param[out] tag Information tag about
+  /// @return True on success, false on failure
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_audiodecoder_Defs_AudioDecoderInfoTag_Help
+  ///
+  virtual bool ReadTag(const std::string& file, kodi::addon::AudioDecoderInfoTag& tag)
+  {
+    return false;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Get number of tracks in a file.
+  ///
+  /// @param[in] file File to read tag for
+  /// @return Number of tracks in file
+  ///
+  virtual int TrackCount(const std::string& file) { return 1; }
+  //--------------------------------------------------------------------------
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_AudioDecoder*>(instance);
+
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->init = ADDON_Init;
+    m_instanceData->toAddon->read_pcm = ADDON_ReadPCM;
+    m_instanceData->toAddon->seek = ADDON_Seek;
+    m_instanceData->toAddon->read_tag = ADDON_ReadTag;
+    m_instanceData->toAddon->track_count = ADDON_TrackCount;
+  }
+
+  inline static bool ADDON_Init(const AddonInstance_AudioDecoder* instance,
+                                const char* file,
+                                unsigned int filecache,
+                                int* channels,
+                                int* samplerate,
+                                int* bitspersample,
+                                int64_t* totaltime,
+                                int* bitrate,
+                                AudioEngineDataFormat* format,
+                                const AudioEngineChannel** info)
+  {
+    CInstanceAudioDecoder* thisClass =
+        static_cast<CInstanceAudioDecoder*>(instance->toAddon->addonInstance);
+
+    thisClass->m_channelList.clear();
+    bool ret = thisClass->Init(file, filecache, *channels, *samplerate, *bitspersample, *totaltime,
+                               *bitrate, *format, thisClass->m_channelList);
+    if (!thisClass->m_channelList.empty())
+    {
+      if (thisClass->m_channelList.back() != AUDIOENGINE_CH_NULL)
+        thisClass->m_channelList.push_back(AUDIOENGINE_CH_NULL);
+      *info = thisClass->m_channelList.data();
+    }
+    else
+      *info = nullptr;
+    return ret;
+  }
+
+  inline static int ADDON_ReadPCM(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize)
+  {
+    return static_cast<CInstanceAudioDecoder*>(instance->toAddon->addonInstance)
+        ->ReadPCM(buffer, size, *actualsize);
+  }
+
+  inline static int64_t ADDON_Seek(const AddonInstance_AudioDecoder* instance, int64_t time)
+  {
+    return static_cast<CInstanceAudioDecoder*>(instance->toAddon->addonInstance)->Seek(time);
+  }
+
+  inline static bool ADDON_ReadTag(const AddonInstance_AudioDecoder* instance,
+                                   const char* file,
+                                   struct AUDIO_DECODER_INFO_TAG* tag)
+  {
+    kodi::addon::AudioDecoderInfoTag cppTag(tag);
+    return static_cast<CInstanceAudioDecoder*>(instance->toAddon->addonInstance)
+        ->ReadTag(file, cppTag);
+  }
+
+  inline static int ADDON_TrackCount(const AddonInstance_AudioDecoder* instance, const char* file)
+  {
+    return static_cast<CInstanceAudioDecoder*>(instance->toAddon->addonInstance)->TrackCount(file);
+  }
+
+  std::vector<AudioEngineChannel> m_channelList;
+  AddonInstance_AudioDecoder* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioEncoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioEncoder.h
new file mode 100644
index 0000000..9a869c1
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioEncoder.h
@@ -0,0 +1,353 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/addon-instance/audio_encoder.h"
+
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_audioencoder
+/// @brief \cpp_class{ kodi::addon::CInstanceAudioEncoder }
+/// **Audio encoder add-on instance.**\n
+/// For audio encoders as binary add-ons. This class implements a way to handle
+/// the encode of given stream to a new format.
+///
+/// The addon.xml defines the capabilities of this add-on.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Here's an example on addon.xml:**
+/// ~~~~~~~~~~~~~{.xml}
+///   <extension
+///     point="kodi.audioencoder"
+///     extension=".flac"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+/// ~~~~~~~~~~~~~
+///
+/// Description to audio encoder related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.audioencoder"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+/// | <b>`extension`</b>            | The file extensions / styles supported by this addon.
+///
+/// --------------------------------------------------------------------------
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is a code example how this addon is used:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/AudioEncoder.h>
+///
+/// class ATTRIBUTE_HIDDEN CMyAudioEncoder : public kodi::addon::CInstanceAudioEncoder
+/// {
+/// public:
+///   CMyAudioEncoder(KODI_HANDLE instance, const std::string& kodiVersion)
+///     : kodi::addon::CInstanceAudioEncoder(instance, kodiVersion)
+///
+///   bool Init(const std::string& filename, unsigned int filecache,
+///             int& channels, int& samplerate,
+///             int& bitspersample, int64_t& totaltime,
+///             int& bitrate, AEDataFormat& format,
+///             std::vector<AEChannel>& channellist) override;
+///   int Encode(int numBytesRead, const uint8_t* pbtStream) override;
+///   bool Finish() override; // Optional
+/// };
+///
+/// CMyAudioEncoder::CMyAudioEncoder(KODI_HANDLE instance)
+///   : kodi::addon::CInstanceAudioEncoder(instance)
+/// {
+///   ...
+/// }
+///
+/// bool CMyAudioEncoder::Start(int inChannels,
+///                             int inRate,
+///                             int inBits,
+///                             const std::string& title,
+///                             const std::string& artist,
+///                             const std::string& albumartist,
+///                             const std::string& album,
+///                             const std::string& year,
+///                             const std::string& track,
+///                             const std::string& genre,
+///                             const std::string& comment,
+///                             int trackLength)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// int CMyAudioEncoder::Encode(int numBytesRead, const uint8_t* pbtStream)
+/// {
+///   uint8_t* data = nullptr;
+///   int length = 0;
+///   ...
+///   kodi::addon::CInstanceAudioEncoder::Write(data, length);
+///
+///   return 0;
+/// }
+///
+///
+/// bool CMyAudioEncoder::Finish()
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_AUDIOENCODER)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Creating my audio encoder instance");
+///     addonInstance = new CMyAudioEncoder(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyAudioEncoder` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstanceAudioEncoder : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Audio encoder class constructor used to support multiple instances.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyAudioEncoder : public kodi::addon::CInstanceAudioEncoder
+  /// {
+  /// public:
+  ///   CMyAudioEncoder(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : kodi::addon::CInstanceAudioEncoder(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my audio encoder instance");
+  ///   addonInstance = new CMyAudioEncoder(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstanceAudioEncoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_AUDIOENCODER,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_AUDIOENCODER))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation of multiple together "
+                             "with single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Start encoder (**required**)
+  ///
+  /// @param[in] inChannels Number of channels
+  /// @param[in] inRate Sample rate of input data
+  /// @param[in] inBits Bits per sample in input data
+  /// @param[in] title The title of the song
+  /// @param[in] artist The artist of the song
+  /// @param[in] albumartist The albumartist of the song
+  /// @param[in] year The year of the song
+  /// @param[in] track The track number of the song
+  /// @param[in] genre The genre of the song
+  /// @param[in] comment A comment to attach to the song
+  /// @param[in] trackLength Total track length in seconds
+  /// @return True on success, false on failure.
+  ///
+  virtual bool Start(int inChannels,
+                     int inRate,
+                     int inBits,
+                     const std::string& title,
+                     const std::string& artist,
+                     const std::string& albumartist,
+                     const std::string& album,
+                     const std::string& year,
+                     const std::string& track,
+                     const std::string& genre,
+                     const std::string& comment,
+                     int trackLength) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Encode a chunk of audio (**required**)
+  ///
+  /// @param[in] numBytesRead Number of bytes in input buffer
+  /// @param[in] pbtStream The input buffer
+  /// @return Number of bytes consumed
+  ///
+  virtual int Encode(int numBytesRead, const uint8_t* pbtStream) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Finalize encoding (**optional**)
+  ///
+  /// @return True on success, false on failure.
+  ///
+  virtual bool Finish() { return true; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Write block of data
+  ///
+  /// @param[in] data Pointer to the array of elements to be written
+  /// @param[in] length Size in bytes to be written.
+  /// @return The total number of bytes successfully written is returned.
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  int Write(const uint8_t* data, int length)
+  {
+    return m_instanceData->toKodi->write(m_instanceData->toKodi->kodiInstance, data, length);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_audioencoder
+  /// @brief Set the file's current position.
+  ///
+  /// The whence argument is optional and defaults to SEEK_SET (0)
+  ///
+  /// @param[in] position The position that you want to seek to
+  /// @param[in] whence [optional] offset relative to\n
+  ///                              You can set the value of whence to one
+  ///                              of three things:
+  ///  |   Value  | int | Description                                        |
+  ///  |:--------:|:---:|:---------------------------------------------------|
+  ///  | SEEK_SET |  0  | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
+  ///  | SEEK_CUR |  1  | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
+  ///  | SEEK_END |  2  | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
+  ///
+  /// @return Returns the resulting offset location as measured in bytes from
+  ///         the beginning of the file. On error, the value -1 is returned.
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  int64_t Seek(int64_t position, int whence = SEEK_SET)
+  {
+    return m_instanceData->toKodi->seek(m_instanceData->toKodi->kodiInstance, position, whence);
+  }
+  //----------------------------------------------------------------------------
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_AudioEncoder*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->start = ADDON_Start;
+    m_instanceData->toAddon->encode = ADDON_Encode;
+    m_instanceData->toAddon->finish = ADDON_Finish;
+  }
+
+  inline static bool ADDON_Start(const AddonInstance_AudioEncoder* instance,
+                                 int inChannels,
+                                 int inRate,
+                                 int inBits,
+                                 const char* title,
+                                 const char* artist,
+                                 const char* albumartist,
+                                 const char* album,
+                                 const char* year,
+                                 const char* track,
+                                 const char* genre,
+                                 const char* comment,
+                                 int trackLength)
+  {
+    return static_cast<CInstanceAudioEncoder*>(instance->toAddon->addonInstance)
+        ->Start(inChannels, inRate, inBits, title, artist, albumartist, album, year, track, genre,
+                comment, trackLength);
+  }
+
+  inline static int ADDON_Encode(const AddonInstance_AudioEncoder* instance,
+                                 int numBytesRead,
+                                 const uint8_t* pbtStream)
+  {
+    return static_cast<CInstanceAudioEncoder*>(instance->toAddon->addonInstance)
+        ->Encode(numBytesRead, pbtStream);
+  }
+
+  inline static bool ADDON_Finish(const AddonInstance_AudioEncoder* instance)
+  {
+    return static_cast<CInstanceAudioEncoder*>(instance->toAddon->addonInstance)->Finish();
+  }
+
+  AddonInstance_AudioEncoder* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/CMakeLists.txt
index 8fa6e05..a57def3 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/CMakeLists.txt
@@ -4,7 +4,6 @@ set(HEADERS AudioDecoder.h
             ImageDecoder.h
             Inputstream.h
             Peripheral.h
-            PeripheralUtils.h
             PVR.h
             Screensaver.h
             VFS.h
@@ -12,5 +11,5 @@ set(HEADERS AudioDecoder.h
             Visualization.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_addon-instance)
+  core_add_library(addons_kodi-dev-kit_include_kodi_addon-instance)
 endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Game.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Game.h
new file mode 100644
index 0000000..3dca94d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Game.h
@@ -0,0 +1,1190 @@
+/*
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/addon-instance/game.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_game
+///
+/// To use on Libretro and for stand-alone games or emulators that does not use
+/// the Libretro API.
+///
+/// Possible examples could be, Nvidia GameStream via Limelight or WINE capture
+/// could possible through the Game API.
+///
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_game_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_game
+/// @brief **Game add-on instance definition values**
+///
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_game_Defs_InputTypes_GameControllerLayout class GameControllerLayout
+/// @ingroup cpp_kodi_addon_game_Defs_InputTypes
+/// @brief Data of layouts for known controllers.
+///
+/// Used on @ref kodi::addon::CInstanceGame::SetControllerLayouts().
+///@{
+class GameControllerLayout
+{
+public:
+  /*! @cond PRIVATE */
+  explicit GameControllerLayout() = default;
+  GameControllerLayout(const game_controller_layout& layout)
+  {
+    controller_id = layout.controller_id;
+    provides_input = layout.provides_input;
+    for (unsigned int i = 0; i < layout.digital_button_count; ++i)
+      digital_buttons.push_back(layout.digital_buttons[i]);
+    for (unsigned int i = 0; i < layout.analog_button_count; ++i)
+      analog_buttons.push_back(layout.analog_buttons[i]);
+    for (unsigned int i = 0; i < layout.analog_stick_count; ++i)
+      analog_sticks.push_back(layout.analog_sticks[i]);
+    for (unsigned int i = 0; i < layout.accelerometer_count; ++i)
+      accelerometers.push_back(layout.accelerometers[i]);
+    for (unsigned int i = 0; i < layout.key_count; ++i)
+      keys.push_back(layout.keys[i]);
+    for (unsigned int i = 0; i < layout.rel_pointer_count; ++i)
+      rel_pointers.push_back(layout.rel_pointers[i]);
+    for (unsigned int i = 0; i < layout.abs_pointer_count; ++i)
+      abs_pointers.push_back(layout.abs_pointers[i]);
+    for (unsigned int i = 0; i < layout.motor_count; ++i)
+      motors.push_back(layout.motors[i]);
+  }
+  /*! @endcond */
+
+  /// @brief Controller identifier.
+  std::string controller_id;
+
+  /// @brief Provides input.
+  ///
+  /// False for multitaps
+  bool provides_input;
+
+  /// @brief Digital buttons.
+  std::vector<std::string> digital_buttons;
+
+  /// @brief Analog buttons.
+  std::vector<std::string> analog_buttons;
+
+  /// @brief Analog sticks.
+  std::vector<std::string> analog_sticks;
+
+  /// @brief Accelerometers.
+  std::vector<std::string> accelerometers;
+
+  /// @brief Keys.
+  std::vector<std::string> keys;
+
+  /// @brief Relative pointers.
+  std::vector<std::string> rel_pointers;
+
+  /// @brief Absolute pointers.
+  std::vector<std::string> abs_pointers;
+
+  /// @brief Motors.
+  std::vector<std::string> motors;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_game
+/// @brief @cpp_class{ kodi::addon::CInstanceGame }
+/// **Game add-on instance**\n
+/// This class provides the basic game processing system for use as an add-on in
+/// Kodi.
+///
+/// This class is created at addon by Kodi.
+///
+class ATTRIBUTE_HIDDEN CInstanceGame : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_game_Base 1. Basic functions
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Functions to manage the addon and get basic information about it**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Game class constructor
+  ///
+  /// Used by an add-on that only supports only Game and only in one instance.
+  ///
+  /// This class is created at addon by Kodi.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Game.h>
+  /// ...
+  ///
+  /// class ATTRIBUTE_HIDDEN CGameExample
+  ///   : public kodi::addon::CAddonBase,
+  ///     public kodi::addon::CInstanceGame
+  /// {
+  /// public:
+  ///   CGameExample()
+  ///   {
+  ///   }
+  ///
+  ///   virtual ~CGameExample();
+  ///   {
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDONCREATOR(CGameExample)
+  /// ~~~~~~~~~~~~~
+  ///
+  CInstanceGame() : IAddonInstance(ADDON_INSTANCE_GAME, GetKodiTypeVersion(ADDON_INSTANCE_GAME))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceGame: Creation of more as one in single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Destructor
+  ///
+  ~CInstanceGame() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// The path of the game client being loaded.
+  ///
+  /// @return the used game client Dll path
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  std::string GameClientDllPath() const { return m_instanceData->props->game_client_dll_path; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Paths to proxy DLLs used to load the game client.
+  ///
+  /// @param[out] paths vector list to store available dll paths
+  /// @return true if success and dll paths present
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool ProxyDllPaths(std::vector<std::string>& paths)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props->proxy_dll_count; ++i)
+    {
+      if (m_instanceData->props->proxy_dll_paths[i] != nullptr)
+        paths.push_back(m_instanceData->props->proxy_dll_paths[i]);
+    }
+    return !paths.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// The "system" directories of the frontend.
+  ///
+  /// These directories can be used to store system-specific ROMs such as
+  /// BIOSes, configuration data, etc.
+  ///
+  /// @return the used resource directory
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool ResourceDirectories(std::vector<std::string>& dirs)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props->resource_directory_count; ++i)
+    {
+      if (m_instanceData->props->resource_directories[i] != nullptr)
+        dirs.push_back(m_instanceData->props->resource_directories[i]);
+    }
+    return !dirs.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// The writable directory of the frontend.
+  ///
+  /// This directory can be used to store SRAM, memory cards, high scores,
+  /// etc, if the game client cannot use the regular memory interface,
+  /// GetMemoryData().
+  ///
+  /// @return the used profile directory
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  std::string ProfileDirectory() const { return m_instanceData->props->profile_directory; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// The value of the <supports_vfs> property from addon.xml.
+  ///
+  /// @return true if VFS is supported
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool SupportsVFS() const { return m_instanceData->props->supports_vfs; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// The extensions in the <extensions> property from addon.xml.
+  ///
+  /// @param[out] extensions vector list to store available extension
+  /// @return true if success and extensions present
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool Extensions(std::vector<std::string>& extensions)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props->extension_count; ++i)
+    {
+      if (m_instanceData->props->extensions[i] != nullptr)
+        extensions.push_back(m_instanceData->props->extensions[i]);
+    }
+    return !extensions.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_Operation 2. Game operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Game operations**
+  ///
+  /// These are mandatory functions for using this addon to get the available
+  /// channels.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Game operation parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_game_Operation_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_game_Operation_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Load a game
+  ///
+  /// @param[in] url The URL to load
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
+  ///
+  virtual GAME_ERROR LoadGame(const std::string& url)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Load a game that requires multiple files
+  ///
+  /// @param[in] type The game type
+  /// @param[in] urls An array of urls
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
+  ///
+  virtual GAME_ERROR LoadGameSpecial(SPECIAL_GAME_TYPE type, const std::vector<std::string>& urls)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Begin playing without a game file
+  ///
+  /// If the add-on supports standalone mode, it must add the <supports_standalone>
+  /// tag to the extension point in addon.xml:
+  ///
+  ///     <supports_no_game>false</supports_no_game>
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game add-on was loaded
+  ///
+  virtual GAME_ERROR LoadStandalone()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Unload the current game
+  ///
+  /// Unloads a currently loaded game
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was unloaded
+  ///
+  virtual GAME_ERROR UnloadGame()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get timing information about the loaded game
+  ///
+  /// @param[out] timing_info The info structure to fill
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if info was filled
+  ///
+  virtual GAME_ERROR GetGameTiming(game_system_timing& timing_info)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get region of the loaded game
+  ///
+  /// @return the region, or @ref GAME_REGION_UNKNOWN if unknown or no game is loaded
+  ///
+  virtual GAME_REGION GetRegion()
+  {
+    return GAME_REGION_UNKNOWN;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Return true if the client requires the frontend to provide a game loop
+  ///
+  /// The game loop is a thread that calls RunFrame() in a loop at a rate
+  /// determined by the playback speed and the client's FPS.
+  ///
+  /// @return true if the frontend should provide a game loop, false otherwise
+  ///
+  virtual bool RequiresGameLoop()
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Run a single frame for add-ons that use a game loop
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if there was no error
+  ///
+  virtual GAME_ERROR RunFrame()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Reset the current game
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was reset
+  ///
+  virtual GAME_ERROR Reset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Requests the frontend to stop the current game
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  void CloseGame(void) { m_instanceData->toKodi->CloseGame(m_instanceData->toKodi->kodiInstance); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_game_Operation_CStream Class: CStream
+  /// @ingroup cpp_kodi_addon_game_Operation
+  /// @brief @cpp_class{ kodi::addon::CInstanceGame::CStream }
+  /// **Game stream handler**
+  ///
+  /// This class will be integrated into the addon, which can then open it if
+  /// necessary for the processing of an audio or video stream.
+  ///
+  ///
+  /// @note Callback to Kodi class
+  ///@{
+  class CStream
+  {
+  public:
+    CStream() = default;
+
+    CStream(const game_stream_properties& properties)
+    {
+      Open(properties);
+    }
+
+    ~CStream()
+    {
+      Close();
+    }
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Create a stream for gameplay data
+    ///
+    /// @param[in] properties The stream properties
+    /// @return A stream handle, or `nullptr` on failure
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool Open(const game_stream_properties& properties)
+    {
+      if (!CAddonBase::m_interface->globalSingleInstance)
+        return false;
+
+      if (m_handle)
+      {
+        kodi::Log(ADDON_LOG_INFO, "kodi::addon::CInstanceGame::CStream already becomes reopened");
+        Close();
+      }
+
+      AddonToKodiFuncTable_Game& cb =
+          *static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+               ->m_instanceData->toKodi;
+      m_handle = cb.OpenStream(cb.kodiInstance, &properties);
+      return m_handle != nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Free the specified stream
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void Close()
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          *static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+               ->m_instanceData->toKodi;
+      cb.CloseStream(cb.kodiInstance, m_handle);
+      m_handle = nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Get a buffer for zero-copy stream data
+    ///
+    /// @param[in] width The framebuffer width, or 0 for no width specified
+    /// @param[in] height The framebuffer height, or 0 for no height specified
+    /// @param[out] buffer The buffer, or unmodified if false is returned
+    /// @return True if buffer was set, false otherwise
+    ///
+    /// @note If this returns true, buffer must be freed using @ref ReleaseBuffer().
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool GetBuffer(unsigned int width, unsigned int height, game_stream_buffer& buffer)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return false;
+
+      AddonToKodiFuncTable_Game& cb =
+          *static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+               ->m_instanceData->toKodi;
+      return cb.GetStreamBuffer(cb.kodiInstance, m_handle, width, height, &buffer);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Add a data packet to a stream
+    ///
+    /// @param[in] packet The data packet
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void AddData(const game_stream_packet& packet)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          *static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+               ->m_instanceData->toKodi;
+      cb.AddStreamData(cb.kodiInstance, m_handle, &packet);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Free an allocated buffer
+    ///
+    /// @param[in] buffer The buffer returned from GetStreamBuffer()
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void ReleaseBuffer(game_stream_buffer& buffer)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          *static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+               ->m_instanceData->toKodi;
+      cb.ReleaseStreamBuffer(cb.kodiInstance, m_handle, &buffer);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief To check stream open was OK, e.g. after use of constructor
+    ///
+    /// @return true if stream was successfully opened
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool IsOpen() const { return m_handle != nullptr; }
+    //--------------------------------------------------------------------------
+
+  private:
+    KODI_GAME_STREAM_HANDLE m_handle = nullptr;
+  };
+  ///@}
+
+  ///@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_HardwareRendering 3. Hardware rendering operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Hardware rendering operations**
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Hardware rendering operation parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_game_HardwareRendering_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_game_HardwareRendering_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Invalidates the current HW context and reinitializes GPU resources
+  ///
+  /// Any GL state is lost, and must not be deinitialized explicitly.
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was reset
+  ///
+  virtual GAME_ERROR HwContextReset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Called before the context is destroyed
+  ///
+  /// Resources can be deinitialized at this step.
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was destroyed
+  ///
+  virtual GAME_ERROR HwContextDestroy()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**<br>Get a symbol from the hardware context
+  ///
+  /// @param[in] sym The symbol's name
+  ///
+  /// @return A function pointer for the specified symbol
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  game_proc_address_t HwGetProcAddress(const char* sym)
+  {
+    return m_instanceData->toKodi->HwGetProcAddress(m_instanceData->toKodi->kodiInstance, sym);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_game_InputOperations 4. Input operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Input operations**
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Hardware rendering operation parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_game_InputOperations_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_game_InputOperations_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Check if input is accepted for a feature on the controller
+  ///
+  /// If only a subset of the controller profile is used, this can return false
+  /// for unsupported features to not absorb their input.
+  ///
+  /// If the entire controller profile is used, this should always return true.
+  ///
+  /// @param[in] controller_id The ID of the controller profile
+  /// @param[in] feature_name The name of a feature in that profile
+  /// @return true if input is accepted for the feature, false otherwise
+  ///
+  virtual bool HasFeature(const std::string& controller_id, const std::string& feature_name)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the input topology that specifies which controllers can be connected
+  ///
+  /// @return The input topology, or null to use the default
+  ///
+  /// If this returns non-null, topology must be freed using FreeTopology().
+  ///
+  /// If this returns null, the topology will default to a single port that can
+  /// accept all controllers imported by addon.xml. The port ID is set to
+  /// the @ref DEFAULT_PORT_ID constant.
+  ///
+  virtual game_input_topology* GetTopology()
+  {
+    return nullptr;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Free the topology's resources
+  ///
+  /// @param[in] topology The topology returned by GetTopology()
+  ///
+  virtual void FreeTopology(game_input_topology* topology)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the layouts for known controllers
+  ///
+  /// @param[in] controllers The controller layouts
+  ///
+  /// After loading the input topology, the frontend will call this with
+  /// controller layouts for all controllers discovered in the topology.
+  ///
+  virtual void SetControllerLayouts(const std::vector<kodi::addon::GameControllerLayout>& controllers)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Enable/disable keyboard input using the specified controller
+  ///
+  /// @param[in] enable True to enable input, false otherwise
+  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
+  ///
+  /// @return True if keyboard input was enabled, false otherwise
+  ///
+  virtual bool EnableKeyboard(bool enable, const std::string& controller_id)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Enable/disable mouse input using the specified controller
+  ///
+  /// @param[in] enable True to enable input, false otherwise
+  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
+  ///
+  /// @return True if mouse input was enabled, false otherwise
+  ///
+  virtual bool EnableMouse(bool enable, const std::string& controller_id)
+  {
+    return false;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Connect/disconnect a controller to a port on the virtual game console
+  ///
+  /// @param[in] connect True to connect a controller, false to disconnect
+  /// @param[in] port_address The address of the port
+  /// @param[in] controller_id The controller ID if connecting, or unused if disconnecting
+  /// @return True if the \p controller was (dis-)connected to the port, false otherwise
+  ///
+  /// The address is a string that allows traversal of the controller topology.
+  /// It is formed by alternating port IDs and controller IDs separated by "/".
+  ///
+  /// For example, assume that the topology represented in XML for Snes9x is:
+  ///
+  /// ~~~~~~~~~~~~~{.xml}
+  ///     <logicaltopology>
+  ///       <port type="controller" id="1">
+  ///         <accepts controller="game.controller.snes"/>
+  ///         <accepts controller="game.controller.snes.multitap">
+  ///           <port type="controller" id="1">
+  ///             <accepts controller="game.controller.snes"/>
+  ///           </port>
+  ///           <port type="controller" id="2">
+  ///             <accepts controller="game.controller.snes"/>
+  ///           </port>
+  ///           ...
+  ///         </accepts>
+  ///       </port>
+  ///     </logicaltopology>
+  /// ~~~~~~~~~~~~~
+  ///
+  /// To connect a multitap to the console's first port, the multitap's controller
+  /// info is set using the port address:
+  ///
+  ///     1
+  ///
+  /// To connect a SNES controller to the second port of the multitap, the
+  /// controller info is next set using the address:
+  ///
+  ///     1/game.controller.multitap/2
+  ///
+  /// Any attempts to connect a controller to a port on a disconnected multitap
+  /// will return false.
+  ///
+  virtual bool ConnectController(bool connect,
+                                 const std::string& port_address,
+                                 const std::string& controller_id)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the add-on of an input event
+  ///
+  /// @param[in] event The input event
+  ///
+  /// @return true if the event was handled, false otherwise
+  ///
+  virtual bool InputEvent(const game_input_event& event)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**<br>Notify the port of an input event
+  ///
+  /// @param[in] event The input event
+  /// @return true if the event was handled, false otherwise
+  ///
+  /// @note Input events can arrive for the following sources:
+  ///   - @ref GAME_INPUT_EVENT_MOTOR
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool KodiInputEvent(const game_input_event& event)
+  {
+    return m_instanceData->toKodi->InputEvent(m_instanceData->toKodi->kodiInstance, &event);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_game_SerializationOperations 5. Serialization operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Serialization operations**
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Serialization operation parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_game_SerializationOperations_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_game_SerializationOperations_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Get the number of bytes required to serialize the game
+  ///
+  /// @return the number of bytes, or 0 if serialization is not supported
+  ///
+  virtual size_t SerializeSize()
+  {
+    return 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Serialize the state of the game
+  ///
+  /// @param[in] data The buffer receiving the serialized game data
+  /// @param[in] size The size of the buffer
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was serialized into the buffer
+  ///
+  virtual GAME_ERROR Serialize(uint8_t* data, size_t size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Deserialize the game from the given state
+  ///
+  /// @param[in] data A buffer containing the game's new state
+  /// @param[in] size The size of the buffer
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game deserialized
+  ///
+  virtual GAME_ERROR Deserialize(const uint8_t* data, size_t size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_game_CheatOperations 6. Cheat operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Cheat operations**
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Cheat operation parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_game_CheatOperations_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_game_CheatOperations_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Reset the cheat system
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat system was reset
+  ///
+  virtual GAME_ERROR CheatReset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get a region of memory
+  ///
+  /// @param[in] type The type of memory to retrieve
+  /// @param[in] data Set to the region of memory; must remain valid until UnloadGame() is called
+  /// @param[in] size Set to the size of the region of memory
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if data was set to a valid buffer
+  ///
+  virtual GAME_ERROR GetMemory(GAME_MEMORY type, uint8_t*& data, size_t& size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set a cheat code
+  ///
+  /// @param[in] index
+  /// @param[in] enabled
+  /// @param[in] code
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat was set
+  ///
+  virtual GAME_ERROR SetCheat(unsigned int index, bool enabled, const std::string& code)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceGame: Creation with empty addon structure not"
+                             "allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_Game*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+
+    m_instanceData->toAddon->LoadGame = ADDON_LoadGame;
+    m_instanceData->toAddon->LoadGameSpecial = ADDON_LoadGameSpecial;
+    m_instanceData->toAddon->LoadStandalone = ADDON_LoadStandalone;
+    m_instanceData->toAddon->UnloadGame = ADDON_UnloadGame;
+    m_instanceData->toAddon->GetGameTiming = ADDON_GetGameTiming;
+    m_instanceData->toAddon->GetRegion = ADDON_GetRegion;
+    m_instanceData->toAddon->RequiresGameLoop = ADDON_RequiresGameLoop;
+    m_instanceData->toAddon->RunFrame = ADDON_RunFrame;
+    m_instanceData->toAddon->Reset = ADDON_Reset;
+
+    m_instanceData->toAddon->HwContextReset = ADDON_HwContextReset;
+    m_instanceData->toAddon->HwContextDestroy = ADDON_HwContextDestroy;
+
+    m_instanceData->toAddon->HasFeature = ADDON_HasFeature;
+    m_instanceData->toAddon->GetTopology = ADDON_GetTopology;
+    m_instanceData->toAddon->FreeTopology = ADDON_FreeTopology;
+    m_instanceData->toAddon->SetControllerLayouts = ADDON_SetControllerLayouts;
+    m_instanceData->toAddon->EnableKeyboard = ADDON_EnableKeyboard;
+    m_instanceData->toAddon->EnableMouse = ADDON_EnableMouse;
+    m_instanceData->toAddon->ConnectController = ADDON_ConnectController;
+    m_instanceData->toAddon->InputEvent = ADDON_InputEvent;
+
+    m_instanceData->toAddon->SerializeSize = ADDON_SerializeSize;
+    m_instanceData->toAddon->Serialize = ADDON_Serialize;
+    m_instanceData->toAddon->Deserialize = ADDON_Deserialize;
+
+    m_instanceData->toAddon->CheatReset = ADDON_CheatReset;
+    m_instanceData->toAddon->GetMemory = ADDON_GetMemory;
+    m_instanceData->toAddon->SetCheat = ADDON_SetCheat;
+  }
+
+  // --- Game operations ---------------------------------------------------------
+
+  inline static GAME_ERROR ADDON_LoadGame(const AddonInstance_Game* instance, const char* url)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->LoadGame(url);
+  }
+
+  inline static GAME_ERROR ADDON_LoadGameSpecial(const AddonInstance_Game* instance,
+                                                 SPECIAL_GAME_TYPE type,
+                                                 const char** urls,
+                                                 size_t urlCount)
+  {
+    std::vector<std::string> urlList;
+    for (size_t i = 0; i < urlCount; ++i)
+    {
+      if (urls[i] != nullptr)
+        urlList.push_back(urls[i]);
+    }
+
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->LoadGameSpecial(type, urlList);
+  }
+
+  inline static GAME_ERROR ADDON_LoadStandalone(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->LoadStandalone();
+  }
+
+  inline static GAME_ERROR ADDON_UnloadGame(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->UnloadGame();
+  }
+
+  inline static GAME_ERROR ADDON_GetGameTiming(const AddonInstance_Game* instance,
+                                               game_system_timing* timing_info)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->GetGameTiming(*timing_info);
+  }
+
+  inline static GAME_REGION ADDON_GetRegion(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->GetRegion();
+  }
+
+  inline static bool ADDON_RequiresGameLoop(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->RequiresGameLoop();
+  }
+
+  inline static GAME_ERROR ADDON_RunFrame(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->RunFrame();
+  }
+
+  inline static GAME_ERROR ADDON_Reset(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->Reset();
+  }
+
+
+  // --- Hardware rendering operations -------------------------------------------
+
+  inline static GAME_ERROR ADDON_HwContextReset(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->HwContextReset();
+  }
+
+  inline static GAME_ERROR ADDON_HwContextDestroy(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->HwContextDestroy();
+  }
+
+
+  // --- Input operations --------------------------------------------------------
+
+  inline static bool ADDON_HasFeature(const AddonInstance_Game* instance,
+                                      const char* controller_id,
+                                      const char* feature_name)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->HasFeature(controller_id, feature_name);
+  }
+
+  inline static game_input_topology* ADDON_GetTopology(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->GetTopology();
+  }
+
+  inline static void ADDON_FreeTopology(const AddonInstance_Game* instance,
+                                        game_input_topology* topology)
+  {
+    static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->FreeTopology(topology);
+  }
+
+  inline static void ADDON_SetControllerLayouts(const AddonInstance_Game* instance,
+                                                const game_controller_layout* controllers,
+                                                unsigned int controller_count)
+  {
+    if (controllers == nullptr)
+      return;
+
+    std::vector<GameControllerLayout> controllerList;
+    for (unsigned int i = 0; i < controller_count; ++i)
+      controllerList.push_back(controllers[i]);
+
+    static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->SetControllerLayouts(controllerList);
+  }
+
+  inline static bool ADDON_EnableKeyboard(const AddonInstance_Game* instance,
+                                          bool enable,
+                                          const char* controller_id)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->EnableKeyboard(enable, controller_id);
+  }
+
+  inline static bool ADDON_EnableMouse(const AddonInstance_Game* instance,
+                                       bool enable,
+                                       const char* controller_id)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->EnableMouse(enable, controller_id);
+  }
+
+  inline static bool ADDON_ConnectController(const AddonInstance_Game* instance,
+                                             bool connect,
+                                             const char* port_address,
+                                             const char* controller_id)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->ConnectController(connect, port_address, controller_id);
+  }
+
+  inline static bool ADDON_InputEvent(const AddonInstance_Game* instance,
+                                      const game_input_event* event)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->InputEvent(*event);
+  }
+
+
+  // --- Serialization operations ------------------------------------------------
+
+  inline static size_t ADDON_SerializeSize(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->SerializeSize();
+  }
+
+  inline static GAME_ERROR ADDON_Serialize(const AddonInstance_Game* instance,
+                                           uint8_t* data,
+                                           size_t size)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->Serialize(data, size);
+  }
+
+  inline static GAME_ERROR ADDON_Deserialize(const AddonInstance_Game* instance,
+                                             const uint8_t* data,
+                                             size_t size)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->Deserialize(data, size);
+  }
+
+
+  // --- Cheat operations --------------------------------------------------------
+
+  inline static GAME_ERROR ADDON_CheatReset(const AddonInstance_Game* instance)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)->CheatReset();
+  }
+
+  inline static GAME_ERROR ADDON_GetMemory(const AddonInstance_Game* instance,
+                                           GAME_MEMORY type,
+                                           uint8_t** data,
+                                           size_t* size)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->GetMemory(type, *data, *size);
+  }
+
+  inline static GAME_ERROR ADDON_SetCheat(const AddonInstance_Game* instance,
+                                          unsigned int index,
+                                          bool enabled,
+                                          const char* code)
+  {
+    return static_cast<CInstanceGame*>(instance->toAddon->addonInstance)
+        ->SetCheat(index, enabled, code);
+  }
+
+  AddonInstance_Game* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/ImageDecoder.h
index e41e5ef..7aeef7b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/ImageDecoder.h
@@ -177,7 +177,7 @@ namespace addon
 /// {
 ///   if (instanceType == ADDON_INSTANCE_IMAGEDECODER)
 ///   {
-///     kodi::Log(ADDON_LOG_NOTICE, "Creating my image decoder instance");
+///     kodi::Log(ADDON_LOG_INFO, "Creating my image decoder instance");
 ///     addonInstance = new CMyImageDecoder(instance, version);
 ///     return ADDON_STATUS_OK;
 ///   }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h
index 354806e..396b92e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -28,6 +28,11 @@
 //Increment this level always if you add features which can lead to compile failures in the addon
 #define INPUTSTREAM_VERSION_LEVEL 2
 
+#define INPUTSTREAM_MAX_STREAM_COUNT 256
+#define INPUTSTREAM_MAX_STRING_NAME_SIZE 256
+#define INPUTSTREAM_MAX_STRING_CODEC_SIZE 32
+#define INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE 64
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -90,9 +95,8 @@ extern "C"
    */
   struct INPUTSTREAM_IDS
   {
-    static const unsigned int MAX_STREAM_COUNT = 256;
     unsigned int m_streamCount;
-    unsigned int m_streamIds[MAX_STREAM_COUNT];
+    unsigned int m_streamIds[INPUTSTREAM_MAX_STREAM_COUNT];
   };
 
   /*!
@@ -238,45 +242,90 @@ extern "C"
 
     uint32_t m_flags;
 
-    char m_name[256]; /*!< @brief (optinal) name of the stream, \0 for default handling */
-    char m_codecName[32]; /*!< @brief (required) name of codec according to ffmpeg */
-    char m_codecInternalName
-        [32]; /*!< @brief (optional) internal name of codec (selectionstream info) */
-    STREAMCODEC_PROFILE m_codecProfile; /*!< @brief (optional) the profile of the codec */
-    unsigned int m_pID; /*!< @brief (required) physical index */
+    //! @brief (optional) name of the stream, \0 for default handling
+    char m_name[INPUTSTREAM_MAX_STRING_NAME_SIZE];
+
+    //! @brief (required) name of codec according to ffmpeg
+    char m_codecName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+
+    //! @brief (optional) internal name of codec (selectionstream info)
+    char m_codecInternalName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+
+    //! @brief (optional) the profile of the codec
+    STREAMCODEC_PROFILE m_codecProfile;
+
+    //! @brief (required) physical index
+    unsigned int m_pID;
 
     const uint8_t* m_ExtraData;
     unsigned int m_ExtraSize;
 
-    char m_language[64]; /*!< @brief RFC 5646 language code (empty string if undefined) */
+    //! @brief RFC 5646 language code (empty string if undefined)
+    char m_language[INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE];
+
+    //! Video stream related data
+    //@{
+
+    //! @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps
+    unsigned int m_FpsScale;
 
-    unsigned int
-        m_FpsScale; /*!< @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps */
     unsigned int m_FpsRate;
-    unsigned int m_Height; /*!< @brief height of the stream reported by the demuxer */
-    unsigned int m_Width; /*!< @brief width of the stream reported by the demuxer */
-    float m_Aspect; /*!< @brief display aspect of stream */
 
+    //! @brief height of the stream reported by the demuxer
+    unsigned int m_Height;
+
+    //! @brief width of the stream reported by the demuxer
+    unsigned int m_Width;
+
+    //! @brief display aspect of stream
+    float m_Aspect;
+
+    //@}
+
+    //! Audio stream related data
+    //@{
+
+    //! @brief (required) amount of channels
+    unsigned int m_Channels;
+
+    //! @brief (required) sample rate
+    unsigned int m_SampleRate;
+
+    //! @brief (required) bit rate
+    unsigned int m_BitRate;
+
+    //! @brief (required) bits per sample
+    unsigned int m_BitsPerSample;
 
-    unsigned int m_Channels; /*!< @brief (required) amount of channels */
-    unsigned int m_SampleRate; /*!< @brief (required) sample rate */
-    unsigned int m_BitRate; /*!< @brief (required) bit rate */
-    unsigned int m_BitsPerSample; /*!< @brief (required) bits per sample */
     unsigned int m_BlockAlign;
 
+    //@}
+
     CRYPTO_INFO m_cryptoInfo;
 
     // new in API version 2.0.8
-    unsigned int m_codecFourCC; /*!< @brief Codec If available, the fourcc code codec */
-    COLORSPACE m_colorSpace; /*!< @brief definition of colorspace */
-    COLORRANGE m_colorRange; /*!< @brief color range if available */
+    //@{
+    //! @brief Codec If available, the fourcc code codec
+    unsigned int m_codecFourCC;
+
+    //! @brief definition of colorspace
+    COLORSPACE m_colorSpace;
+
+    //! @brief color range if available
+    COLORRANGE m_colorRange;
+    //@}
 
     //new in API 2.0.9 / INPUTSTREAM_VERSION_LEVEL 1
+    //@{
     COLORPRIMARIES m_colorPrimaries;
     COLORTRC m_colorTransferCharacteristic;
-    INPUTSTREAM_MASTERING_METADATA* m_masteringMetadata; /*!< @brief mastering static Metadata */
-    INPUTSTREAM_CONTENTLIGHT_METADATA*
-        m_contentLightMetadata; /*!< @brief content light static Metadata */
+    //@}
+
+    //! @brief mastering static Metadata
+    INPUTSTREAM_MASTERING_METADATA* m_masteringMetadata;
+
+    //! @brief content light static Metadata
+    INPUTSTREAM_CONTENTLIGHT_METADATA* m_contentLightMetadata;
   };
 
   struct INPUTSTREAM_TIMES
@@ -372,9 +421,9 @@ extern "C"
 
   typedef struct AddonInstance_InputStream /* internal */
   {
-    AddonProps_InputStream props;
-    AddonToKodiFuncTable_InputStream toKodi;
-    KodiToAddonFuncTable_InputStream toAddon;
+    AddonProps_InputStream* props;
+    AddonToKodiFuncTable_InputStream* toKodi;
+    KodiToAddonFuncTable_InputStream* toAddon;
   } AddonInstance_InputStream;
 
 #ifdef __cplusplus
@@ -612,8 +661,8 @@ public:
      */
   DemuxPacket* AllocateDemuxPacket(int dataSize)
   {
-    return m_instanceData->toKodi.allocate_demux_packet(m_instanceData->toKodi.kodiInstance,
-                                                        dataSize);
+    return m_instanceData->toKodi->allocate_demux_packet(m_instanceData->toKodi->kodiInstance,
+                                                         dataSize);
   }
 
   /*!
@@ -623,8 +672,8 @@ public:
      */
   DemuxPacket* AllocateEncryptedDemuxPacket(int dataSize, unsigned int encryptedSubsampleCount)
   {
-    return m_instanceData->toKodi.allocate_encrypted_demux_packet(
-        m_instanceData->toKodi.kodiInstance, dataSize, encryptedSubsampleCount);
+    return m_instanceData->toKodi->allocate_encrypted_demux_packet(
+        m_instanceData->toKodi->kodiInstance, dataSize, encryptedSubsampleCount);
   }
 
   /*!
@@ -633,7 +682,7 @@ public:
      */
   void FreeDemuxPacket(DemuxPacket* packet)
   {
-    return m_instanceData->toKodi.free_demux_packet(m_instanceData->toKodi.kodiInstance, packet);
+    return m_instanceData->toKodi->free_demux_packet(m_instanceData->toKodi->kodiInstance, packet);
   }
 
 private:
@@ -654,66 +703,69 @@ private:
     sscanf(kodiVersion.c_str(), "%d.%d.%d", &api[0], &api[1], &api[2]);
 
     m_instanceData = static_cast<AddonInstance_InputStream*>(instance);
-    m_instanceData->toAddon.addonInstance = this;
-    m_instanceData->toAddon.open = ADDON_Open;
-    m_instanceData->toAddon.close = ADDON_Close;
-    m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
-
-    m_instanceData->toAddon.get_stream_ids = ADDON_GetStreamIds;
-    m_instanceData->toAddon.get_stream = ADDON_GetStream;
-    m_instanceData->toAddon.enable_stream = ADDON_EnableStream;
-    m_instanceData->toAddon.open_stream = ADDON_OpenStream;
-    m_instanceData->toAddon.demux_reset = ADDON_DemuxReset;
-    m_instanceData->toAddon.demux_abort = ADDON_DemuxAbort;
-    m_instanceData->toAddon.demux_flush = ADDON_DemuxFlush;
-    m_instanceData->toAddon.demux_read = ADDON_DemuxRead;
-    m_instanceData->toAddon.demux_seek_time = ADDON_DemuxSeekTime;
-    m_instanceData->toAddon.demux_set_speed = ADDON_DemuxSetSpeed;
-    m_instanceData->toAddon.set_video_resolution = ADDON_SetVideoResolution;
-
-    m_instanceData->toAddon.get_total_time = ADDON_GetTotalTime;
-    m_instanceData->toAddon.get_time = ADDON_GetTime;
-
-    m_instanceData->toAddon.get_times = ADDON_GetTimes;
-    m_instanceData->toAddon.pos_time = ADDON_PosTime;
-
-    m_instanceData->toAddon.read_stream = ADDON_ReadStream;
-    m_instanceData->toAddon.seek_stream = ADDON_SeekStream;
-    m_instanceData->toAddon.position_stream = ADDON_PositionStream;
-    m_instanceData->toAddon.length_stream = ADDON_LengthStream;
-    m_instanceData->toAddon.is_real_time_stream = ADDON_IsRealTimeStream;
-
-    int minChapterVersion[3] = { 2, 0, 10 };
-    if (compareVersion(api, minChapterVersion) >= 0)
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->open = ADDON_Open;
+    m_instanceData->toAddon->close = ADDON_Close;
+    m_instanceData->toAddon->get_capabilities = ADDON_GetCapabilities;
+
+    m_instanceData->toAddon->get_stream_ids = ADDON_GetStreamIds;
+    m_instanceData->toAddon->get_stream = ADDON_GetStream;
+    m_instanceData->toAddon->enable_stream = ADDON_EnableStream;
+    m_instanceData->toAddon->open_stream = ADDON_OpenStream;
+    m_instanceData->toAddon->demux_reset = ADDON_DemuxReset;
+    m_instanceData->toAddon->demux_abort = ADDON_DemuxAbort;
+    m_instanceData->toAddon->demux_flush = ADDON_DemuxFlush;
+    m_instanceData->toAddon->demux_read = ADDON_DemuxRead;
+    m_instanceData->toAddon->demux_seek_time = ADDON_DemuxSeekTime;
+    m_instanceData->toAddon->demux_set_speed = ADDON_DemuxSetSpeed;
+    m_instanceData->toAddon->set_video_resolution = ADDON_SetVideoResolution;
+
+    m_instanceData->toAddon->get_total_time = ADDON_GetTotalTime;
+    m_instanceData->toAddon->get_time = ADDON_GetTime;
+
+    m_instanceData->toAddon->get_times = ADDON_GetTimes;
+    m_instanceData->toAddon->pos_time = ADDON_PosTime;
+
+    m_instanceData->toAddon->read_stream = ADDON_ReadStream;
+    m_instanceData->toAddon->seek_stream = ADDON_SeekStream;
+    m_instanceData->toAddon->position_stream = ADDON_PositionStream;
+    m_instanceData->toAddon->length_stream = ADDON_LengthStream;
+    m_instanceData->toAddon->is_real_time_stream = ADDON_IsRealTimeStream;
+
+    // Added on 2.0.10
+    m_instanceData->toAddon->get_chapter = ADDON_GetChapter;
+    m_instanceData->toAddon->get_chapter_count = ADDON_GetChapterCount;
+    m_instanceData->toAddon->get_chapter_name = ADDON_GetChapterName;
+    m_instanceData->toAddon->get_chapter_pos = ADDON_GetChapterPos;
+    m_instanceData->toAddon->seek_chapter = ADDON_SeekChapter;
+
+    // Added on 2.0.12
+    m_instanceData->toAddon->block_size_stream = ADDON_GetBlockSize;
+
+    /*
+    // Way to include part on new API version
+    int minPartVersion[3] = { 3, 0, 0 };
+    if (compareVersion(api, minPartVersion) >= 0)
     {
-      m_instanceData->toAddon.get_chapter = ADDON_GetChapter;
-      m_instanceData->toAddon.get_chapter_count = ADDON_GetChapterCount;
-      m_instanceData->toAddon.get_chapter_name = ADDON_GetChapterName;
-      m_instanceData->toAddon.get_chapter_pos = ADDON_GetChapterPos;
-      m_instanceData->toAddon.seek_chapter = ADDON_SeekChapter;
-    }
 
-    int minBlockSizeVersion[3] = {2, 0, 12};
-    if (compareVersion(api, minBlockSizeVersion) >= 0)
-    {
-      m_instanceData->toAddon.block_size_stream = ADDON_GetBlockSize;
     }
+    */
   }
 
   inline static bool ADDON_Open(const AddonInstance_InputStream* instance, INPUTSTREAM* props)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->Open(*props);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->Open(*props);
   }
 
   inline static void ADDON_Close(const AddonInstance_InputStream* instance)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->Close();
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->Close();
   }
 
   inline static void ADDON_GetCapabilities(const AddonInstance_InputStream* instance,
                                            INPUTSTREAM_CAPABILITIES* capabilities)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->GetCapabilities(*capabilities);
   }
 
@@ -721,47 +773,48 @@ private:
   // IDemux
   inline static struct INPUTSTREAM_IDS ADDON_GetStreamIds(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetStreamIds();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetStreamIds();
   }
 
   inline static struct INPUTSTREAM_INFO ADDON_GetStream(const AddonInstance_InputStream* instance,
                                                         int streamid)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetStream(streamid);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
+        ->GetStream(streamid);
   }
 
   inline static void ADDON_EnableStream(const AddonInstance_InputStream* instance,
                                         int streamid,
                                         bool enable)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->EnableStream(streamid, enable);
   }
 
   inline static bool ADDON_OpenStream(const AddonInstance_InputStream* instance, int streamid)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->OpenStream(streamid);
   }
 
   inline static void ADDON_DemuxReset(const AddonInstance_InputStream* instance)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxReset();
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxReset();
   }
 
   inline static void ADDON_DemuxAbort(const AddonInstance_InputStream* instance)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxAbort();
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxAbort();
   }
 
   inline static void ADDON_DemuxFlush(const AddonInstance_InputStream* instance)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxFlush();
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxFlush();
   }
 
   inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxRead();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxRead();
   }
 
   inline static bool ADDON_DemuxSeekTime(const AddonInstance_InputStream* instance,
@@ -769,20 +822,20 @@ private:
                                          bool backwards,
                                          double* startpts)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->DemuxSeekTime(time, backwards, *startpts);
   }
 
   inline static void ADDON_DemuxSetSpeed(const AddonInstance_InputStream* instance, int speed)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxSetSpeed(speed);
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxSetSpeed(speed);
   }
 
   inline static void ADDON_SetVideoResolution(const AddonInstance_InputStream* instance,
                                               int width,
                                               int height)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->SetVideoResolution(width, height);
   }
 
@@ -790,57 +843,57 @@ private:
   // IDisplayTime
   inline static int ADDON_GetTotalTime(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTotalTime();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetTotalTime();
   }
 
   inline static int ADDON_GetTime(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTime();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetTime();
   }
 
   // ITime
   inline static bool ADDON_GetTimes(const AddonInstance_InputStream* instance,
                                     INPUTSTREAM_TIMES* times)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTimes(*times);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetTimes(*times);
   }
 
   // IPosTime
   inline static bool ADDON_PosTime(const AddonInstance_InputStream* instance, int ms)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->PosTime(ms);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->PosTime(ms);
   }
 
   inline static int ADDON_GetChapter(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapter();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetChapter();
   }
 
   inline static int ADDON_GetChapterCount(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterCount();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetChapterCount();
   }
 
   inline static const char* ADDON_GetChapterName(const AddonInstance_InputStream* instance, int ch)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterName(ch);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetChapterName(ch);
   }
 
   inline static int64_t ADDON_GetChapterPos(const AddonInstance_InputStream* instance, int ch)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterPos(ch);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetChapterPos(ch);
   }
 
   inline static bool ADDON_SeekChapter(const AddonInstance_InputStream* instance, int ch)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->SeekChapter(ch);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->SeekChapter(ch);
   }
 
   inline static int ADDON_ReadStream(const AddonInstance_InputStream* instance,
                                      uint8_t* buffer,
                                      unsigned int bufferSize)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->ReadStream(buffer, bufferSize);
   }
 
@@ -848,28 +901,28 @@ private:
                                          int64_t position,
                                          int whence)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
         ->SeekStream(position, whence);
   }
 
   inline static int64_t ADDON_PositionStream(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->PositionStream();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->PositionStream();
   }
 
   inline static int64_t ADDON_LengthStream(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->LengthStream();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->LengthStream();
   }
 
   inline static int ADDON_GetBlockSize(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetBlockSize();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetBlockSize();
   }
 
   inline static bool ADDON_IsRealTimeStream(const AddonInstance_InputStream* instance)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->IsRealTimeStream();
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->IsRealTimeStream();
   }
 
   AddonInstance_InputStream* m_instanceData;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h
index 0bca8e2..d5977a7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h
@@ -364,7 +364,7 @@ namespace addon
 /// {
 ///   if (instanceType == ADDON_INSTANCE_PVR)
 ///   {
-///     kodi::Log(ADDON_LOG_NOTICE, "Creating my PVR client instance");
+///     kodi::Log(ADDON_LOG_INFO, "Creating my PVR client instance");
 ///     addonInstance = new CMyPVRClient(instance, version);
 ///     return ADDON_STATUS_OK;
 ///   }
@@ -484,7 +484,7 @@ public:
   ///                                       const std::string& version,
   ///                                       KODI_HANDLE& addonInstance)
   /// {
-  ///   kodi::Log(ADDON_LOG_NOTICE, "Creating my PVR client instance");
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my PVR client instance");
   ///   addonInstance = new CMyPVRClient(instance, version);
   ///   return ADDON_STATUS_OK;
   /// }
@@ -623,8 +623,8 @@ public:
   //============================================================================
   /// @brief Get the disk space reported by the backend (if supported).
   ///
-  /// @param[in] total The total disk space in bytes.
-  /// @param[in] used The used disk space in bytes.
+  /// @param[in] total The total disk space in KiB.
+  /// @param[in] used The used disk space in KiB.
   /// @return @ref PVR_ERROR_NO_ERROR if the drive space has been fetched
   ///         successfully.
   ///
@@ -635,8 +635,8 @@ public:
   /// ~~~~~~~~~~~~~{.cpp}
   /// PVR_ERROR CMyPVRClient::GetDriveSpace(uint64_t& total, uint64_t& used)
   /// {
-  ///   total = 10 * 1024 * 1024 * 1024; // To set complete size of drive in bytes
-  ///   used =  122324243; // To set the used amount
+  ///   total = 100 * 1024 * 1024; // To set complete size of drive in KiB (100GB)
+  ///   used =  12232424; // To set the used amount
   ///   return PVR_ERROR_NO_ERROR;
   /// }
   /// ~~~~~~~~~~~~~
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Peripheral.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Peripheral.h
new file mode 100644
index 0000000..46060a8
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Peripheral.h
@@ -0,0 +1,907 @@
+/*
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "peripheral/PeripheralUtils.h"
+
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
+{
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_peripheral_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_peripheral
+/// @brief %Peripheral add-on general variables
+///
+/// Used to exchange the available options between Kodi and addon.
+///
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_peripheral_Defs_General 1. General
+/// @ingroup cpp_kodi_addon_peripheral_Defs
+/// @brief **%Peripheral add-on general variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+/// This group also includes @ref cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities
+/// with which Kodi an @ref kodi::addon::CInstancePeripheral::GetCapabilities()
+/// queries the supported **modules** of the addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral 2. Peripheral
+/// @ingroup cpp_kodi_addon_peripheral_Defs
+/// @brief **%Peripheral add-on operation variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Event 3. Event
+/// @ingroup cpp_kodi_addon_peripheral_Defs
+/// @brief **%Event add-on operation variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick 4. Joystick
+/// @ingroup cpp_kodi_addon_peripheral_Defs
+/// @brief **%Joystick add-on operation variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_peripheral
+/// @brief \cpp_class{ kodi::addon::CInstancePeripheral }
+/// **%Peripheral add-on instance**
+///
+/// The peripheral add-ons provides access to many joystick and gamepad
+/// interfaces across various platforms. An input addon is used to map the
+/// buttons/axis on your physical input device, to the buttons/axis of your
+/// virtual system. This is necessary because different retro systems usually
+/// have different button layouts. A controller configuration utility is also
+/// in the works.
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an
+/// peripheral addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="peripheral.myspecialnamefor"
+///   version="1.0.0"
+///   name="My special peripheral addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.peripheral"
+///     provides_joysticks="true"
+///     provides_buttonmaps="true"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My peripheral addon</summary>
+///     <description lang="en_GB">My peripheral addon description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// Description to peripheral related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`provides_joysticks`</b>   | Set to "true" if addon provides joystick support.
+/// | <b>`provides_buttonmaps`</b>  | Set to "true" if button map is used and supported by addon.
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.peripheral"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is an example of how addon can be used as a single:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Peripheral.h>
+///
+/// class CMyPeripheralAddon : public kodi::addon::CAddonBase,
+///                            public kodi::addon::CInstancePeripheral
+/// {
+/// public:
+///   CMyPeripheralAddon();
+///
+///   void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override;
+///   ...
+/// };
+///
+/// CMyPeripheralAddon::CMyPeripheralAddon()
+/// {
+///   ...
+/// }
+///
+/// void CMyPeripheralAddon::GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities)
+/// {
+///   capabilities.SetProvidesJoysticks(true);
+///   capabilities.SetProvidesButtonmaps(true);
+///   ...
+/// }
+///
+/// ADDONCREATOR(CMyPeripheralAddon)
+/// ~~~~~~~~~~~~~
+///
+/// @note It is imperative to use the necessary functions of this class in the
+/// addon.
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Here is another example where the peripheral is used together with
+/// other instance types:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Peripheral.h>
+///
+/// class CMyPeripheralAddon : public kodi::addon::CInstancePeripheral
+/// {
+/// public:
+///   CMyPeripheralAddon(KODI_HANDLE instance, const std::string& version);
+///
+///   void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override;
+///   ...
+/// };
+///
+/// CMyPeripheralAddon::CMyPeripheralAddon(KODI_HANDLE instance, const std::string& version)
+///   : CInstancePeripheral(instance, version)
+/// {
+///   ...
+/// }
+///
+/// void CMyPeripheralAddon::GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities)
+/// {
+///   capabilities.SetProvidesJoysticks(true);
+///   capabilities.SetProvidesButtonmaps(true);
+///   ...
+/// }
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_PERIPHERAL)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Creating my peripheral addon");
+///     addonInstance = new CMyPeripheralAddon(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyPeripheralAddon` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstancePeripheral : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief %Peripheral class constructor.
+  ///
+  /// Used by an add-on that only supports peripheral.
+  ///
+  CInstancePeripheral()
+    : IAddonInstance(ADDON_INSTANCE_PERIPHERAL, GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of more as one in single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief %Peripheral addon class constructor used to support multiple
+  /// instance types.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  //////*Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyPeripheralAddon : public kodi::addon::CInstancePeripheral
+  /// {
+  /// public:
+  ///   CMyPeripheralAddon(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : kodi::addon::CInstancePeripheral(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my peripheral");
+  ///   addonInstance = new CMyPeripheralAddon(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstancePeripheral(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_PERIPHERAL,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of multiple together with "
+                             "single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief Destructor.
+  ///
+  ~CInstancePeripheral() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_peripheralOp 1. Peripheral operations
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief %Peripheral operations to handle control about.
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **%Peripheral parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_peripheralOp_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_peripheral_peripheralOp_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Get the list of features that this add-on provides.
+  ///
+  /// Called by the frontend to query the add-on's capabilities and supported
+  /// peripherals. All capabilities that the add-on supports should be set to true.
+  ///
+  /// @param[out] capabilities The add-on's capabilities
+  ///
+  /// @remarks Valid implementation required.
+  ///
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities_Help
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// void CMyPeripheralAddon::GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities)
+  /// {
+  ///   capabilities.SetProvidesJoysticks(true);
+  ///   capabilities.SetProvidesButtonmaps(true);
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Perform a scan for joysticks
+  ///
+  /// The frontend calls this when a hardware change is detected. If an add-on
+  /// detects a hardware change, it can trigger this function using the
+  /// @ref TriggerScan() callback.
+  ///
+  /// @param[in] scan_results Assigned to allocated memory
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral_Help
+  ///
+  virtual PERIPHERAL_ERROR PerformDeviceScan(
+      std::vector<std::shared_ptr<kodi::addon::Peripheral>>& scan_results)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get all events that have occurred since the last call to
+  /// @ref GetEvents().
+  ///
+  /// @param[out] events List of available events within addon
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent_Help
+  ///
+  virtual PERIPHERAL_ERROR GetEvents(std::vector<kodi::addon::PeripheralEvent>& events)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Send an input event to the peripheral.
+  ///
+  /// @param[in] event The input event
+  /// @return true if the event was handled, false otherwise
+  ///
+  virtual bool SendEvent(const kodi::addon::PeripheralEvent& event) { return false; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_joystickOp 2. Joystick operations
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief %Joystick operations to handle control about.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **%Joystick parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_joystickOp_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_peripheral_joystickOp_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Get extended info about an attached joystick.
+  ///
+  /// @param[in] index The joystick's driver index
+  /// @param[out] info The container for the allocated joystick info
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_peripheral_Defs_Joystick_Joystick_Help
+  ///
+  virtual PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, kodi::addon::Joystick& info)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the features that allow translating the joystick into the
+  /// controller profile.
+  ///
+  /// @param[in] joystick The device's joystick properties; unknown values may
+  ///                     be left at their default
+  /// @param[in] controller_id The controller profile being requested, e.g.
+  ///                          `game.controller.default`
+  /// @param[out] features The array of allocated features
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  virtual PERIPHERAL_ERROR GetFeatures(const kodi::addon::Joystick& joystick,
+                                       const std::string& controller_id,
+                                       std::vector<kodi::addon::JoystickFeature>& features)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Add or update joystick features.
+  ///
+  /// @param[in] joystick The device's joystick properties; unknown values may be
+  ///                 left at their default
+  /// @param[in] controller_id The game controller profile being updated
+  /// @param[in] features The array of features
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  virtual PERIPHERAL_ERROR MapFeatures(const kodi::addon::Joystick& joystick,
+                                       const std::string& controller_id,
+                                       const std::vector<kodi::addon::JoystickFeature>& features)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the driver primitives that should be ignored while mapping the
+  /// device.
+  ///
+  /// @param[in] joystick The device's joystick properties; unknown values may
+  ///                     be left at their default
+  /// @param[out] primitives The array of allocated driver primitives to be
+  ///                        ignored
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  virtual PERIPHERAL_ERROR GetIgnoredPrimitives(
+      const kodi::addon::Joystick& joystick, std::vector<kodi::addon::DriverPrimitive>& primitives)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the list of driver primitives that are ignored for the device.
+  ///
+  /// @param[in] joystick The device's joystick properties; unknown values may be left at their default
+  /// @param[in] primitives The array of driver primitives to ignore
+  /// @return @ref PERIPHERAL_NO_ERROR if successful
+  ///
+  virtual PERIPHERAL_ERROR SetIgnoredPrimitives(
+      const kodi::addon::Joystick& joystick,
+      const std::vector<kodi::addon::DriverPrimitive>& primitives)
+  {
+    return PERIPHERAL_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Save the button map for the given joystick.
+  ///
+  /// @param[in] joystick The device's joystick properties
+  ///
+  virtual void SaveButtonMap(const kodi::addon::Joystick& joystick) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Revert the button map to the last time it was loaded or committed to disk
+  /// @param[in] joystick The device's joystick properties
+  ///
+  virtual void RevertButtonMap(const kodi::addon::Joystick& joystick) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Reset the button map for the given joystick and controller profile ID
+  /// @param[in] joystick      The device's joystick properties
+  /// @param[in] controller_id The game controller profile being reset
+  ///
+  virtual void ResetButtonMap(const kodi::addon::Joystick& joystick,
+                              const std::string& controller_id)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Powers off the given joystick if supported
+  /// @param[in] index The joystick's driver index
+  ///
+  virtual void PowerOffJoystick(unsigned int index) {}
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_callbacks 3. Callback functions
+  /// @ingroup cpp_kodi_addon_peripheral
+  /// @brief Callback to Kodi functions.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Used to get the full path where the add-on is installed.
+  ///
+  /// @return The add-on installation path
+  ///
+  const std::string AddonPath() const { return m_instanceData->props->addon_path; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Used to get the full path to the add-on's user profile.
+  ///
+  /// @note The trailing folder (consisting of the add-on's ID) is not created
+  /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
+  /// to create the folder.
+  ///
+  /// @return Path to the user profile
+  ///
+  const std::string UserPath() const { return m_instanceData->props->user_path; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trigger a scan for peripherals
+  ///
+  /// The add-on calls this if a change in hardware is detected.
+  ///
+  void TriggerScan(void)
+  {
+    return m_instanceData->toKodi->trigger_scan(m_instanceData->toKodi->kodiInstance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the frontend that button maps have changed.
+  ///
+  /// @param[in] deviceName [optional] The name of the device to refresh, or
+  ///                        empty/null for all devices
+  /// @param[in] controllerId [optional] The controller ID to refresh, or
+  ///                         empty/null for all controllers
+  ///
+  void RefreshButtonMaps(const std::string& deviceName = "", const std::string& controllerId = "")
+  {
+    return m_instanceData->toKodi->refresh_button_maps(m_instanceData->toKodi->kodiInstance,
+                                                       deviceName.c_str(), controllerId.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Return the number of features belonging to the specified
+  /// controller.
+  ///
+  /// @param[in] controllerId The controller ID to enumerate
+  /// @param[in] type [optional] Type to filter by, or @ref JOYSTICK_FEATURE_TYPE_UNKNOWN
+  ///                 for all features
+  /// @return The number of features matching the request parameters
+  ///
+  unsigned int FeatureCount(const std::string& controllerId,
+                            JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
+  {
+    return m_instanceData->toKodi->feature_count(m_instanceData->toKodi->kodiInstance,
+                                                 controllerId.c_str(), type);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Return the type of the feature.
+  ///
+  /// @param[in] controllerId The controller ID to check
+  /// @param[in] featureName The feature to check
+  /// @return The type of the specified feature, or @ref JOYSTICK_FEATURE_TYPE_UNKNOWN
+  /// if unknown
+  ///
+  JOYSTICK_FEATURE_TYPE FeatureType(const std::string& controllerId, const std::string& featureName)
+  {
+    return m_instanceData->toKodi->feature_type(m_instanceData->toKodi->kodiInstance,
+                                                controllerId.c_str(), featureName.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstancePeripheral: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_Peripheral*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+
+    m_instanceData->toAddon->get_capabilities = ADDON_GetCapabilities;
+    m_instanceData->toAddon->perform_device_scan = ADDON_PerformDeviceScan;
+    m_instanceData->toAddon->free_scan_results = ADDON_FreeScanResults;
+    m_instanceData->toAddon->get_events = ADDON_GetEvents;
+    m_instanceData->toAddon->free_events = ADDON_FreeEvents;
+    m_instanceData->toAddon->send_event = ADDON_SendEvent;
+
+    m_instanceData->toAddon->get_joystick_info = ADDON_GetJoystickInfo;
+    m_instanceData->toAddon->free_joystick_info = ADDON_FreeJoystickInfo;
+    m_instanceData->toAddon->get_features = ADDON_GetFeatures;
+    m_instanceData->toAddon->free_features = ADDON_FreeFeatures;
+    m_instanceData->toAddon->map_features = ADDON_MapFeatures;
+    m_instanceData->toAddon->get_ignored_primitives = ADDON_GetIgnoredPrimitives;
+    m_instanceData->toAddon->free_primitives = ADDON_FreePrimitives;
+    m_instanceData->toAddon->set_ignored_primitives = ADDON_SetIgnoredPrimitives;
+    m_instanceData->toAddon->save_button_map = ADDON_SaveButtonMap;
+    m_instanceData->toAddon->revert_button_map = ADDON_RevertButtonMap;
+    m_instanceData->toAddon->reset_button_map = ADDON_ResetButtonMap;
+    m_instanceData->toAddon->power_off_joystick = ADDON_PowerOffJoystick;
+  }
+
+  inline static void ADDON_GetCapabilities(const AddonInstance_Peripheral* addonInstance,
+                                           PERIPHERAL_CAPABILITIES* capabilities)
+  {
+    if (!addonInstance || !capabilities)
+      return;
+
+    kodi::addon::PeripheralCapabilities peripheralCapabilities(capabilities);
+    static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->GetCapabilities(peripheralCapabilities);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_PerformDeviceScan(
+      const AddonInstance_Peripheral* addonInstance,
+      unsigned int* peripheral_count,
+      PERIPHERAL_INFO** scan_results)
+  {
+    if (!addonInstance || !peripheral_count || !scan_results)
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    std::vector<std::shared_ptr<kodi::addon::Peripheral>> peripherals;
+    PERIPHERAL_ERROR err = static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+                               ->PerformDeviceScan(peripherals);
+    if (err == PERIPHERAL_NO_ERROR)
+    {
+      *peripheral_count = static_cast<unsigned int>(peripherals.size());
+      kodi::addon::Peripherals::ToStructs(peripherals, scan_results);
+    }
+
+    return err;
+  }
+
+  inline static void ADDON_FreeScanResults(const AddonInstance_Peripheral* addonInstance,
+                                           unsigned int peripheral_count,
+                                           PERIPHERAL_INFO* scan_results)
+  {
+    if (!addonInstance)
+      return;
+
+    kodi::addon::Peripherals::FreeStructs(peripheral_count, scan_results);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_GetEvents(const AddonInstance_Peripheral* addonInstance,
+                                                 unsigned int* event_count,
+                                                 PERIPHERAL_EVENT** events)
+  {
+    if (!addonInstance || !event_count || !events)
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    std::vector<kodi::addon::PeripheralEvent> peripheralEvents;
+    PERIPHERAL_ERROR err = static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+                               ->GetEvents(peripheralEvents);
+    if (err == PERIPHERAL_NO_ERROR)
+    {
+      *event_count = static_cast<unsigned int>(peripheralEvents.size());
+      kodi::addon::PeripheralEvents::ToStructs(peripheralEvents, events);
+    }
+
+    return err;
+  }
+
+  inline static void ADDON_FreeEvents(const AddonInstance_Peripheral* addonInstance,
+                                      unsigned int event_count,
+                                      PERIPHERAL_EVENT* events)
+  {
+    if (!addonInstance)
+      return;
+
+    kodi::addon::PeripheralEvents::FreeStructs(event_count, events);
+  }
+
+  inline static bool ADDON_SendEvent(const AddonInstance_Peripheral* addonInstance,
+                                     const PERIPHERAL_EVENT* event)
+  {
+    if (!addonInstance || !event)
+      return false;
+    return static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->SendEvent(kodi::addon::PeripheralEvent(*event));
+  }
+
+
+  inline static PERIPHERAL_ERROR ADDON_GetJoystickInfo(
+      const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info)
+  {
+    if (!addonInstance || !info)
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    kodi::addon::Joystick addonInfo;
+    PERIPHERAL_ERROR err = static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+                               ->GetJoystickInfo(index, addonInfo);
+    if (err == PERIPHERAL_NO_ERROR)
+    {
+      addonInfo.ToStruct(*info);
+    }
+
+    return err;
+  }
+
+  inline static void ADDON_FreeJoystickInfo(const AddonInstance_Peripheral* addonInstance,
+                                            JOYSTICK_INFO* info)
+  {
+    if (!addonInstance)
+      return;
+
+    kodi::addon::Joystick::FreeStruct(*info);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_GetFeatures(const AddonInstance_Peripheral* addonInstance,
+                                                   const JOYSTICK_INFO* joystick,
+                                                   const char* controller_id,
+                                                   unsigned int* feature_count,
+                                                   JOYSTICK_FEATURE** features)
+  {
+    if (!addonInstance || !joystick || !controller_id || !feature_count || !features)
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    std::vector<kodi::addon::JoystickFeature> featuresVector;
+
+    PERIPHERAL_ERROR err = static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+                               ->GetFeatures(addonJoystick, controller_id, featuresVector);
+    if (err == PERIPHERAL_NO_ERROR)
+    {
+      *feature_count = static_cast<unsigned int>(featuresVector.size());
+      kodi::addon::JoystickFeatures::ToStructs(featuresVector, features);
+    }
+
+    return err;
+  }
+
+  inline static void ADDON_FreeFeatures(const AddonInstance_Peripheral* addonInstance,
+                                        unsigned int feature_count,
+                                        JOYSTICK_FEATURE* features)
+  {
+    if (!addonInstance)
+      return;
+
+    kodi::addon::JoystickFeatures::FreeStructs(feature_count, features);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_MapFeatures(const AddonInstance_Peripheral* addonInstance,
+                                                   const JOYSTICK_INFO* joystick,
+                                                   const char* controller_id,
+                                                   unsigned int feature_count,
+                                                   const JOYSTICK_FEATURE* features)
+  {
+    if (!addonInstance || !joystick || !controller_id || (feature_count > 0 && !features))
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    std::vector<kodi::addon::JoystickFeature> primitiveVector;
+
+    for (unsigned int i = 0; i < feature_count; i++)
+      primitiveVector.emplace_back(*(features + i));
+
+    return static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->MapFeatures(addonJoystick, controller_id, primitiveVector);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_GetIgnoredPrimitives(
+      const AddonInstance_Peripheral* addonInstance,
+      const JOYSTICK_INFO* joystick,
+      unsigned int* primitive_count,
+      JOYSTICK_DRIVER_PRIMITIVE** primitives)
+  {
+    if (!addonInstance || !joystick || !primitive_count || !primitives)
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    std::vector<kodi::addon::DriverPrimitive> primitiveVector;
+
+    PERIPHERAL_ERROR err = static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+                               ->GetIgnoredPrimitives(addonJoystick, primitiveVector);
+    if (err == PERIPHERAL_NO_ERROR)
+    {
+      *primitive_count = static_cast<unsigned int>(primitiveVector.size());
+      kodi::addon::DriverPrimitives::ToStructs(primitiveVector, primitives);
+    }
+
+    return err;
+  }
+
+  inline static void ADDON_FreePrimitives(const AddonInstance_Peripheral* addonInstance,
+                                          unsigned int primitive_count,
+                                          JOYSTICK_DRIVER_PRIMITIVE* primitives)
+  {
+    if (!addonInstance)
+      return;
+
+    kodi::addon::DriverPrimitives::FreeStructs(primitive_count, primitives);
+  }
+
+  inline static PERIPHERAL_ERROR ADDON_SetIgnoredPrimitives(
+      const AddonInstance_Peripheral* addonInstance,
+      const JOYSTICK_INFO* joystick,
+      unsigned int primitive_count,
+      const JOYSTICK_DRIVER_PRIMITIVE* primitives)
+  {
+    if (!addonInstance || !joystick || (primitive_count > 0 && !primitives))
+      return PERIPHERAL_ERROR_INVALID_PARAMETERS;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    std::vector<kodi::addon::DriverPrimitive> primitiveVector;
+
+    for (unsigned int i = 0; i < primitive_count; i++)
+      primitiveVector.emplace_back(*(primitives + i));
+
+    return static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->SetIgnoredPrimitives(addonJoystick, primitiveVector);
+  }
+
+  inline static void ADDON_SaveButtonMap(const AddonInstance_Peripheral* addonInstance,
+                                         const JOYSTICK_INFO* joystick)
+  {
+    if (!addonInstance || !joystick)
+      return;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->SaveButtonMap(addonJoystick);
+  }
+
+  inline static void ADDON_RevertButtonMap(const AddonInstance_Peripheral* addonInstance,
+                                           const JOYSTICK_INFO* joystick)
+  {
+    if (!addonInstance || !joystick)
+      return;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->RevertButtonMap(addonJoystick);
+  }
+
+  inline static void ADDON_ResetButtonMap(const AddonInstance_Peripheral* addonInstance,
+                                          const JOYSTICK_INFO* joystick,
+                                          const char* controller_id)
+  {
+    if (!addonInstance || !joystick || !controller_id)
+      return;
+
+    kodi::addon::Joystick addonJoystick(*joystick);
+    static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->ResetButtonMap(addonJoystick, controller_id);
+  }
+
+  inline static void ADDON_PowerOffJoystick(const AddonInstance_Peripheral* addonInstance,
+                                            unsigned int index)
+  {
+    if (!addonInstance)
+      return;
+
+    static_cast<CInstancePeripheral*>(addonInstance->toAddon->addonInstance)
+        ->PowerOffJoystick(index);
+  }
+
+  AddonInstance_Peripheral* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h
new file mode 100644
index 0000000..4902fcb
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h
@@ -0,0 +1,470 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/addon-instance/screensaver.h"
+#include "../gui/renderHelper.h"
+
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_screensaver
+/// @brief \cpp_class{ kodi::addon::CInstanceScreensaver }
+/// **Screensaver add-on instance**
+///
+/// A screensaver is a Kodi addon that fills the screen with moving images or
+/// patterns when the computer is not in use. Initially designed to prevent
+/// phosphor burn-in on CRT and plasma computer monitors (hence the name),
+/// screensavers are now used primarily for entertainment, security or to
+/// display system status information.
+///
+/// Include the header @ref Screensaver.h "#include <kodi/addon-instance/ScreenSaver.h>"
+/// to use this class.
+///
+/// This interface allows the creating of screensavers for Kodi, based upon
+/// **DirectX** or/and **OpenGL** rendering with `C++` code.
+///
+/// The interface is small and easy usable. It has three functions:
+///
+/// * <b><c>Start()</c></b> - Called on creation
+/// * <b><c>Render()</c></b> - Called at render time
+/// * <b><c>Stop()</c></b> - Called when the screensaver has no work
+///
+/// Additionally, there are several \ref cpp_kodi_addon_screensaver_CB "other functions"
+/// available in which the child class can ask about the current hardware,
+/// including the device, display and several other parts.
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an
+/// screensaver addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="screensaver.myspecialnamefor"
+///   version="1.0.0"
+///   name="My special screensaver addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="xbmc.ui.screensaver"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My screensaver addon</summary>
+///     <description lang="en_GB">My screensaver addon description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// Description to screensaver related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"xbmc.ui.screensaver"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is an example of the minimum required code to start a screensaver:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Screensaver.h>
+///
+/// class CMyScreenSaver : public kodi::addon::CAddonBase,
+///                        public kodi::addon::CInstanceScreensaver
+/// {
+/// public:
+///   CMyScreenSaver();
+///
+///   bool Start() override;
+///   void Render() override;
+/// };
+///
+/// CMyScreenSaver::CMyScreenSaver()
+/// {
+///   ...
+/// }
+///
+/// bool CMyScreenSaver::Start()
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// void CMyScreenSaver::Render()
+/// {
+///   ...
+/// }
+///
+/// ADDONCREATOR(CMyScreenSaver)
+/// ~~~~~~~~~~~~~
+///
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Here is another example where the screensaver is used together with
+/// other instance types:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Screensaver.h>
+///
+/// class CMyScreenSaver : public kodi::addon::CInstanceScreensaver
+/// {
+/// public:
+///   CMyScreenSaver(KODI_HANDLE instance, const std::string& version);
+///
+///   bool Start() override;
+///   void Render() override;
+/// };
+///
+/// CMyScreenSaver::CMyScreenSaver(KODI_HANDLE instance, const std::string& version)
+///   : CInstanceScreensaver(instance, version)
+/// {
+///   ...
+/// }
+///
+/// bool CMyScreenSaver::Start()
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// void CMyScreenSaver::Render()
+/// {
+///   ...
+/// }
+///
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_SCREENSAVER)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Creating my Screensaver");
+///     addonInstance = new CMyScreenSaver(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyScreenSaver` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstanceScreensaver : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Screensaver class constructor.
+  ///
+  /// Used by an add-on that only supports screensavers.
+  ///
+  CInstanceScreensaver()
+    : IAddonInstance(ADDON_INSTANCE_SCREENSAVER, GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of more as one in single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Screensaver class constructor used to support multiple instance
+  /// types.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyScreenSaver : public kodi::addon::CInstanceScreensaver
+  /// {
+  /// public:
+  ///   CMyScreenSaver(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : kodi::addon::CInstanceScreensaver(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my screensaver");
+  ///   addonInstance = new CMyScreenSaver(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstanceScreensaver(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_SCREENSAVER,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of multiple together "
+                             "with single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Destructor.
+  ///
+  ~CInstanceScreensaver() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Used to notify the screensaver that it has been started.
+  ///
+  /// @return true if the screensaver was started successfully, false otherwise
+  ///
+  virtual bool Start() { return true; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Used to inform the screensaver that the rendering control was
+  /// stopped.
+  ///
+  virtual void Stop() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief Used to indicate when the add-on should render
+  ///
+  virtual void Render() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_screensaver_CB Information functions
+  /// @ingroup cpp_kodi_addon_screensaver
+  /// @brief **To get info about the device, display and several other parts**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Device that represents the display adapter.
+  ///
+  /// @return A pointer to the device
+  ///
+  /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
+  /// **OpenGL**
+  ///
+  /// This value can also be becomed by @ref kodi::gui::GetHWContext() and is
+  /// recommended to use.
+  ///
+  ///-------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <d3d11_1.h>
+  /// ..
+  /// // Note: Device() there is used inside addon child class about
+  /// // kodi::addon::CInstanceVisualization
+  /// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::addon::CInstanceVisualization::Device());
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  inline kodi::HardwareContext Device() { return m_instanceData->props->device; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Returns the X position of the rendering window.
+  ///
+  /// @return The X position, in pixels
+  ///
+  inline int X() { return m_instanceData->props->x; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Returns the Y position of the rendering window.
+  ///
+  /// @return The Y position, in pixels
+  ///
+  inline int Y() { return m_instanceData->props->y; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Returns the width of the rendering window.
+  ///
+  /// @return The width, in pixels
+  ///
+  inline int Width() { return m_instanceData->props->width; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Returns the height of the rendering window.
+  ///
+  /// @return The height, in pixels
+  ///
+  inline int Height() { return m_instanceData->props->height; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
+  /// describes how the width of a pixel compares to the height of that pixel.
+  ///
+  /// @return The pixel aspect ratio used by the display
+  ///
+  inline float PixelRatio() { return m_instanceData->props->pixelRatio; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Used to get the name of the add-on defined in `addon.xml`.
+  ///
+  /// @return The add-on name
+  ///
+  inline std::string Name() { return m_instanceData->props->name; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Used to get the full path where the add-on is installed.
+  ///
+  /// @return The add-on installation path
+  ///
+  inline std::string Presets() { return m_instanceData->props->presets; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_screensaver_CB
+  /// @brief Used to get the full path to the add-on's user profile.
+  ///
+  /// @note The trailing folder (consisting of the add-on's ID) is not created
+  /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
+  /// to create the folder.
+  ///
+  /// @return Path to the user profile
+  ///
+  inline std::string Profile() { return m_instanceData->props->profile; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_Screensaver*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->Start = ADDON_Start;
+    m_instanceData->toAddon->Stop = ADDON_Stop;
+    m_instanceData->toAddon->Render = ADDON_Render;
+  }
+
+  inline static bool ADDON_Start(AddonInstance_Screensaver* instance)
+  {
+    CInstanceScreensaver* thisClass =
+        static_cast<CInstanceScreensaver*>(instance->toAddon->addonInstance);
+    thisClass->m_renderHelper = kodi::gui::GetRenderHelper();
+    return thisClass->Start();
+  }
+
+  inline static void ADDON_Stop(AddonInstance_Screensaver* instance)
+  {
+    CInstanceScreensaver* thisClass =
+        static_cast<CInstanceScreensaver*>(instance->toAddon->addonInstance);
+    thisClass->Stop();
+    thisClass->m_renderHelper = nullptr;
+  }
+
+  inline static void ADDON_Render(AddonInstance_Screensaver* instance)
+  {
+    CInstanceScreensaver* thisClass =
+        static_cast<CInstanceScreensaver*>(instance->toAddon->addonInstance);
+
+    if (!thisClass->m_renderHelper)
+      return;
+    thisClass->m_renderHelper->Begin();
+    thisClass->Render();
+    thisClass->m_renderHelper->End();
+  }
+
+  /*
+   * Background render helper holds here and in addon base.
+   * In addon base also to have for the others, and stored here for the worst
+   * case where this class is independent from base and base becomes closed
+   * before.
+   *
+   * This is on Kodi with GL unused and the calls to there are empty (no work)
+   * On Kodi with Direct X where angle is present becomes this used.
+   */
+  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
+  AddonInstance_Screensaver* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h
index efd5de2..177bf72 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h
@@ -9,260 +9,146 @@
 
 #include "../AddonBase.h"
 #include "../Filesystem.h"
-
-#if !defined(_WIN32)
-#include <sys/stat.h>
-#if !defined(__stat64)
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-#define __stat64 stat
-#else
-#define __stat64 stat64
-#endif
-#endif
-#endif
+#include "../c-api/addon-instance/vfs.h"
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-  //============================================================================
-  /// @ingroup cpp_kodi_addon_vfs_Defs
-  /// @brief **VFS add-on URL data**\n
-  /// This class is used to inform the addon of the desired wanted connection.
-  ///
-  /// Used on mostly all addon functions to identify related target.
-  ///
-  struct VFSURL
-  {
-    /// @brief Desired URL of the file system to be edited
-    ///
-    /// This includes all available parts of the access and is structured as
-    /// follows:
-    /// - <b>`<PROTOCOL>`://`<USERNAME>`:`<PASSWORD>``@``<HOSTNAME>`:`<PORT>`/`<FILENAME>`?`<OPTIONS>`</b>
-    const char* url;
-
-    /// @brief The associated domain name, which is optional and not available
-    /// in all cases.
-    const char* domain;
-
-    /// @brief This includes the network address (e.g. `192.168.0.123`) or if
-    /// the addon refers to file packages the path to it
-    /// (e.g. `/home/by_me/MyPacket.rar`).
-    const char* hostname;
-
-    /// @brief With this variable the desired path to a folder or file within
-    /// the hostname is given (e.g. `storage/videos/00001.ts`).
-    const char* filename;
-
-    /// @brief [Networking port](https://en.wikipedia.org/wiki/Port_(computer_networking))
-    /// to use for protocol.
-    unsigned int port;
-
-    /// @brief Special options on opened URL, this can e.g. on RAR packages
-    /// <b>`?flags=8&nextvalue=123`</b> to inform about to not cache a read.
-    ///
-    /// Available options from Kodi:
-    /// | Value:    | Description:
-    /// |-----------|-------------------
-    /// | flags=8   | Used on RAR packages so that no data is cached from the requested source.
-    /// | cache=no  | Used on ZIP packages so that no data from the requested source is stored in the cache. However, this is currently not available from addons!
-    ///
-    /// In addition, other addons can use the URLs given by them to give options
-    /// that fit the respective VFS addon and allow special operations.
-    ///
-    /// @note This procedure is not yet standardized and is currently not
-    /// exactly available which are handed over.
-    const char* options;
-
-    /// @brief Desired username.
-    const char* username;
 
-    /// @brief Desired password.
-    const char* password;
-
-    /// @brief The complete URL is passed on here, but the user name and
-    /// password are not shown and only appear to there as `USERNAME:PASSWORD`.
-    ///
-    /// As example <b>`sftp://USERNAME:PASSWORD@192.168.178.123/storage/videos/00001.ts`</b>.
-    const char* redacted;
-
-    /// @brief The name which is taken as the basis by source and would be first
-    /// in folder view.
-    ///
-    /// As example on <b>`sftp://dudu:isprivate@192.168.178.123/storage/videos/00001.ts`</b>
-    /// becomes then <b>`storage`</b> used here.
-    const char* sharename;
+namespace kodi
+{
+namespace addon
+{
 
-    /// @brief Protocol name used on this stream, e.g. <b>`sftp`</b>.
-    const char* protocol;
-  };
-  //----------------------------------------------------------------------------
+class CInstanceVFS;
 
-  //============================================================================
-  /// @ingroup cpp_kodi_addon_vfs_Defs
-  /// @brief <b>In/out value which is queried at @ref kodi::addon::CInstanceVFS::IoControl.</b>\n
-  /// This declares the requested value on the addon, this gets or has to
-  /// transfer data depending on the value.
-  enum VFS_IOCTRL
-  {
-    /// @brief For cases where not supported control becomes asked.
-    ///
-    /// @note Should normally not given to addon.
-    VFS_IOCTRL_INVALID = 0,
+//==============================================================================
+/// @ingroup cpp_kodi_addon_vfs_Defs
+/// @brief **VFS add-on file handle**\n
+/// This used to handle opened files of addon with related memory pointer about
+/// class or structure and to have on further file control functions available.
+///
+/// See @ref cpp_kodi_addon_vfs_filecontrol "file editing functions" for used
+/// places.
+///
+///@{
+using VFSFileHandle = VFS_FILE_HANDLE;
+///@}
+//------------------------------------------------------------------------------
 
-    /// @brief @ref VFS_IOCTRL_NATIVE_DATA structure, containing what should be
-    /// passed to native ioctrl.
-    VFS_IOCTRL_NATIVE = 1,
+//==============================================================================
+/// @defgroup cpp_kodi_addon_vfs_Defs_VFSUrl class VFSUrl
+/// @ingroup cpp_kodi_addon_vfs_Defs
+/// @brief **VFS add-on URL data**\n
+/// This class is used to inform the addon of the desired wanted connection.
+///
+/// Used on mostly all addon functions to identify related target.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_vfs_Defs_VFSUrl_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN VFSUrl : public CStructHdl<VFSUrl, VFSURL>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceVFS;
+  /*! \endcond */
 
-    /// @brief To check seek is possible.
-    ///
-    //// Return 0 if known not to work, 1 if it should work on related calls.
-    VFS_IOCTRL_SEEK_POSSIBLE = 2,
+public:
+  /// @defgroup cpp_kodi_addon_vfs_Defs_VFSUrl_Help Value Help
+  /// @ingroup cpp_kodi_addon_vfs_Defs_VFSUrl
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_vfs_Defs_VFSUrl :</b>
+  /// | Name | Type | Get call
+  /// |------|------|----------
+  /// | **URL** | `std::string` | @ref VFSUrl::GetURL "GetURL"
+  /// | **Domain name** | `std::string` | @ref VFSUrl::GetDomain "GetDomain"
+  /// | **Hostname** | `std::string` | @ref VFSUrl::GetHostname "GetHostname"
+  /// | **Filename** | `std::string` | @ref VFSUrl::GetFilename "GetFilename"
+  /// | **Network port** | `unsigned int` | @ref VFSUrl::GetPort "GetPort"
+  /// | **Special options** | `std::string` | @ref VFSUrl::GetOptions "GetOptions"
+  /// | **Username** | `std::string` | @ref VFSUrl::GetUsername "GetUsername"
+  /// | **Password** | `std::string` | @ref VFSUrl::GetPassword "GetPassword"
+  /// | **Get URL with user and password hidden** | `std::string` | @ref VFSUrl::GetRedacted "GetRedacted"
+  /// | **Sharename** | `std::string` | @ref VFSUrl::GetSharename "GetSharename"
+  /// | **Network protocol** | `std::string` | @ref VFSUrl::GetProtocol "GetProtocol"
+  ///
 
-    /// @brief @ref VFS_IOCTRL_CACHE_STATUS_DATA structure structure on related call
-    VFS_IOCTRL_CACHE_STATUS = 3,
+  /// @addtogroup cpp_kodi_addon_vfs_Defs_VFSUrl
+  ///@{
 
-    /// @brief Unsigned int with speed limit for caching in bytes per second
-    VFS_IOCTRL_CACHE_SETRATE = 4,
+  /// @brief Desired URL of the file system to be edited
+  ///
+  /// This includes all available parts of the access and is structured as
+  /// follows:
+  /// -
+  /// <b>`<PROTOCOL>`://`<USERNAME>`:`<PASSWORD>``@``<HOSTNAME>`:`<PORT>`/`<FILENAME>`?`<OPTIONS>`</b>
+  std::string GetURL() const { return m_cStructure->url; }
 
-    /// @brief Enable/disable retry within the protocol handler (if supported)
-    VFS_IOCTRL_SET_RETRY = 16,
-  };
-  //----------------------------------------------------------------------------
+  /// @brief The associated domain name, which is optional and not available
+  /// in all cases.
+  std::string GetDomain() const { return m_cStructure->domain; }
 
-  //============================================================================
-  /// @ingroup cpp_kodi_addon_vfs_Defs
-  /// @brief <b>Structure used in @ref kodi::addon::CInstanceVFS::IoControl
-  /// if question value for @ref VFS_IOCTRL_NATIVE is set</b>\n
-  /// With this structure, data is transmitted to the Kodi addon.
-  ///
-  /// This corresponds to POSIX systems with regard to [ioctl](https://en.wikipedia.org/wiki/Ioctl)
-  /// data (emulated with Windows).
-  struct VFS_IOCTRL_NATIVE_DATA
-  {
-    unsigned long int request;
-    void* param;
-  };
-  //----------------------------------------------------------------------------
+  /// @brief This includes the network address (e.g. `192.168.0.123`) or if
+  /// the addon refers to file packages the path to it
+  /// (e.g. `/home/by_me/MyPacket.rar`).
+  std::string GetHostname() const { return m_cStructure->hostname; }
 
-  //============================================================================
-  /// @ingroup cpp_kodi_addon_vfs_Defs
-  /// @brief <b>Structure used in @ref kodi::addon::CInstanceVFS::IoControl
-  /// if question value for @ref VFS_IOCTRL_CACHE_STATUS is set</b>\n
-  /// This data is filled by the addon and returned to Kodi
-  struct VFS_IOCTRL_CACHE_STATUS_DATA
-  {
-    /// @brief Number of bytes cached forward of current position.
-    uint64_t forward;
+  /// @brief With this variable the desired path to a folder or file within
+  /// the hostname is given (e.g. `storage/videos/00001.ts`).
+  std::string GetFilename() const { return m_cStructure->filename; }
 
-    /// @brief Maximum number of bytes per second cache is allowed to fill.
-    unsigned int maxrate;
+  /// @brief [Networking port](https://en.wikipedia.org/wiki/Port_(computer_networking))
+  /// to use for protocol.
+  unsigned int GetPort() const { return m_cStructure->port; }
 
-    /// @brief Average read rate from source file since last position change.
-    unsigned int currate;
+  /// @brief Special options on opened URL, this can e.g. on RAR packages
+  /// <b>`?flags=8&nextvalue=123`</b> to inform about to not cache a read.
+  ///
+  /// Available options from Kodi:
+  /// | Value:    | Description:
+  /// |-----------|-------------------
+  /// | flags=8   | Used on RAR packages so that no data is cached from the requested source.
+  /// | cache=no  | Used on ZIP packages so that no data from the requested source is stored in the cache. However, this is currently not available from addons!
+  ///
+  /// In addition, other addons can use the URLs given by them to give options
+  /// that fit the respective VFS addon and allow special operations.
+  ///
+  /// @note This procedure is not yet standardized and is currently not
+  /// exactly available which are handed over.
+  std::string GetOptions() const { return m_cStructure->options; }
 
-    /// @brief Cache low speed condition detected?
-    bool lowspeed;
-  };
-  //----------------------------------------------------------------------------
+  /// @brief Desired username.
+  std::string GetUsername() const { return m_cStructure->username; }
 
-  typedef struct VFSGetDirectoryCallbacks /* internal */
-  {
-    bool (__cdecl* get_keyboard_input)(void* ctx, const char* heading, char** input, bool hidden_input);
-    void (__cdecl* set_error_dialog)(void* ctx, const char* heading, const char* line1, const char* line2, const char* line3);
-    void (__cdecl* require_authentication)(void* ctx, const char* url);
-    void* ctx;
-  } VFSGetDirectoryCallbacks;
+  /// @brief Desired password.
+  std::string GetPassword() const { return m_cStructure->password; }
 
-  typedef struct AddonProps_VFSEntry /* internal */
-  {
-    int dummy;
-  } AddonProps_VFSEntry;
+  /// @brief The complete URL is passed on here, but the user name and
+  /// password are not shown and only appear to there as `USERNAME:PASSWORD`.
+  ///
+  /// As example <b>`sftp://USERNAME:PASSWORD@192.168.178.123/storage/videos/00001.ts`</b>.
+  std::string GetRedacted() const { return m_cStructure->redacted; }
 
-  typedef struct AddonToKodiFuncTable_VFSEntry /* internal */
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_VFSEntry;
+  /// @brief The name which is taken as the basis by source and would be first
+  /// in folder view.
+  ///
+  /// As example on <b>`sftp://dudu:isprivate@192.168.178.123/storage/videos/00001.ts`</b>
+  /// becomes then <b>`storage`</b> used here.
+  std::string GetSharename() const { return m_cStructure->sharename; }
 
-  struct AddonInstance_VFSEntry;
-  typedef struct KodiToAddonFuncTable_VFSEntry /* internal */
-  {
-    KODI_HANDLE addonInstance;
-
-    void*(__cdecl* open)(const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
-    void*(__cdecl* open_for_write)(const struct AddonInstance_VFSEntry* instance,
-                                   const struct VFSURL* url,
-                                   bool overwrite);
-    ssize_t(__cdecl* read)(const struct AddonInstance_VFSEntry* instance,
-                           void* context,
-                           void* buffer,
-                           size_t buf_size);
-    ssize_t(__cdecl* write)(const struct AddonInstance_VFSEntry* instance,
-                            void* context,
-                            const void* buffer,
-                            size_t buf_size);
-    int64_t(__cdecl* seek)(const struct AddonInstance_VFSEntry* instance,
-                           void* context,
-                           int64_t position,
-                           int whence);
-    int(__cdecl* truncate)(const struct AddonInstance_VFSEntry* instance,
-                           void* context,
-                           int64_t size);
-    int64_t(__cdecl* get_length)(const struct AddonInstance_VFSEntry* instance, void* context);
-    int64_t(__cdecl* get_position)(const struct AddonInstance_VFSEntry* instance, void* context);
-    int(__cdecl* get_chunk_size)(const struct AddonInstance_VFSEntry* instance, void* context);
-    int(__cdecl* io_control)(const struct AddonInstance_VFSEntry* instance,
-                             void* context,
-                             enum VFS_IOCTRL request,
-                             void* param);
-    int(__cdecl* stat)(const struct AddonInstance_VFSEntry* instance,
-                       const struct VFSURL* url,
-                       struct __stat64* buffer);
-    bool(__cdecl* close)(const struct AddonInstance_VFSEntry* instance, void* context);
-    bool(__cdecl* exists)(const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
-    void(__cdecl* clear_out_idle)(const struct AddonInstance_VFSEntry* instance);
-    void(__cdecl* disconnect_all)(const struct AddonInstance_VFSEntry* instance);
-    bool(__cdecl* delete_it)(const struct AddonInstance_VFSEntry* instance,
-                             const struct VFSURL* url);
-    bool(__cdecl* rename)(const struct AddonInstance_VFSEntry* instance,
-                          const struct VFSURL* url,
-                          const struct VFSURL* url2);
-    bool(__cdecl* directory_exists)(const struct AddonInstance_VFSEntry* instance,
-                                    const struct VFSURL* url);
-    bool(__cdecl* remove_directory)(const struct AddonInstance_VFSEntry* instance,
-                                    const struct VFSURL* url);
-    bool(__cdecl* create_directory)(const struct AddonInstance_VFSEntry* instance,
-                                    const struct VFSURL* url);
-    bool(__cdecl* get_directory)(const struct AddonInstance_VFSEntry* instance,
-                                 const struct VFSURL* url,
-                                 struct VFSDirEntry** entries,
-                                 int* num_entries,
-                                 VFSGetDirectoryCallbacks* callbacks);
-    bool(__cdecl* contains_files)(const struct AddonInstance_VFSEntry* instance,
-                                  const struct VFSURL* url,
-                                  struct VFSDirEntry** entries,
-                                  int* num_entries,
-                                  char* rootpath);
-    void(__cdecl* free_directory)(const struct AddonInstance_VFSEntry* instance,
-                                  struct VFSDirEntry* entries,
-                                  int num_entries);
-  } KodiToAddonFuncTable_VFSEntry;
-
-  typedef struct AddonInstance_VFSEntry /* internal */
-  {
-    AddonProps_VFSEntry* props;
-    AddonToKodiFuncTable_VFSEntry* toKodi;
-    KodiToAddonFuncTable_VFSEntry* toAddon;
-  } AddonInstance_VFSEntry;
+  /// @brief Protocol name used on this stream, e.g. <b>`sftp`</b>.
+  std::string GetProtocol() const { return m_cStructure->protocol; }
 
-#ifdef __cplusplus
-} /* extern "C" */
+  ///@}
 
-namespace kodi
-{
-namespace addon
-{
+private:
+  VFSUrl() = delete;
+  VFSUrl(const VFSUrl& channel) = delete;
+  VFSUrl(const VFSURL* channel) : CStructHdl(channel) {}
+  VFSUrl(VFSURL* channel) : CStructHdl(channel) {}
+};
+///@}
+//------------------------------------------------------------------------------
 
 //##############################################################################
 /// @defgroup cpp_kodi_addon_vfs_Defs Definitions, structures and enumerators
@@ -499,14 +385,14 @@ namespace addon
 /// };
 ///
 /// CMyVFS::CMyVFS(KODI_HANDLE instance, const std::string& kodiVersion)
-///   : CInstanceVFS(instance, kodiVersion)
+///   : kodi::addon::CInstanceVFS(instance, kodiVersion)
 /// {
 ///   ...
 /// }
 ///
 /// ...
 ///
-/// /*----------------------------------------------------------------------*/
+/// //----------------------------------------------------------------------
 ///
 /// class CMyAddon : public kodi::addon::CAddonBase
 /// {
@@ -529,7 +415,7 @@ namespace addon
 /// {
 ///   if (instanceType == ADDON_INSTANCE_VFS)
 ///   {
-///     kodi::Log(ADDON_LOG_NOTICE, "Creating my VFS instance");
+///     kodi::Log(ADDON_LOG_INFO, "Creating my VFS instance");
 ///     addonInstance = new CMyVFS(instance, version);
 ///     return ADDON_STATUS_OK;
 ///   }
@@ -546,12 +432,11 @@ namespace addon
 /// The destruction of the example class `CMyVFS` is called from
 /// Kodi's header. Manually deleting the add-on instance is not required.
 ///
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 class ATTRIBUTE_HIDDEN CInstanceVFS : public IAddonInstance
 {
 public:
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs
   /// @brief VFS class constructor used to support multiple instance
   /// types
@@ -577,18 +462,16 @@ public:
 
     SetAddonStruct(instance);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs
   /// @brief Destructor
   ///
   ~CInstanceVFS() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @defgroup cpp_kodi_addon_vfs_general 1. General access functions
   /// @ingroup cpp_kodi_addon_vfs
   /// @brief **General access functions**
@@ -597,8 +480,7 @@ public:
   /// locations and file system queries.
   ///
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @defgroup cpp_kodi_addon_vfs_filecontrol 2. File editing functions
   /// @ingroup cpp_kodi_addon_vfs
   /// @brief **File editing functions.**
@@ -608,17 +490,22 @@ public:
   ///
 
   //@{
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Open a file for input
   ///
   /// @param[in] url The URL of the file
   /// @return Context for the opened file
-  virtual void* Open(const VFSURL& url) { return nullptr; }
-
-  //==========================================================================
   ///
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_vfs_Defs_VFSUrl_Help
+  ///
+  virtual kodi::addon::VFSFileHandle Open(const kodi::addon::VFSUrl& url) { return nullptr; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Open a file for output
   ///
@@ -626,22 +513,23 @@ public:
   /// @param[in] overWrite Whether or not to overwrite an existing file
   /// @return Context for the opened file
   ///
-  virtual void* OpenForWrite(const VFSURL& url, bool overWrite) { return nullptr; }
-  //--------------------------------------------------------------------------
+  virtual kodi::addon::VFSFileHandle OpenForWrite(const kodi::addon::VFSUrl& url, bool overWrite)
+  {
+    return nullptr;
+  }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Close a file
   ///
   /// @param[in] context The context of the file
   /// @return True on success, false on failure
   ///
-  virtual bool Close(void* context) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool Close(kodi::addon::VFSFileHandle context) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Read from a file
   ///
@@ -650,11 +538,13 @@ public:
   /// @param[in] uiBufSize Number of bytes to read
   /// @return Number of bytes read
   ///
-  virtual ssize_t Read(void* context, void* buffer, size_t uiBufSize) { return -1; }
-  //--------------------------------------------------------------------------
+  virtual ssize_t Read(kodi::addon::VFSFileHandle context, uint8_t* buffer, size_t uiBufSize)
+  {
+    return -1;
+  }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Write to a file
   ///
@@ -663,24 +553,33 @@ public:
   /// @param[in] uiBufSize Number of bytes to write
   /// @return Number of bytes written
   ///
-  virtual ssize_t Write(void* context, const void* buffer, size_t uiBufSize) { return -1; }
-  //--------------------------------------------------------------------------
+  virtual ssize_t Write(kodi::addon::VFSFileHandle context, const uint8_t* buffer, size_t uiBufSize)
+  {
+    return -1;
+  }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Seek in a file
   ///
   /// @param[in] context The context of the file
   /// @param[in] position The position to seek to
-  /// @param[in] whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END)
+  /// @param[in] whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END):
+  /// |   Value  | int | Description                                         |
+  /// |:--------:|:---:|:----------------------------------------------------|
+  /// | SEEK_SET |  0  | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
+  /// | SEEK_CUR |  1  | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
+  /// | SEEK_END |  2  | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
   /// @return Offset in file after seek
   ///
-  virtual int64_t Seek(void* context, int64_t position, int whence) { return -1; }
-  //--------------------------------------------------------------------------
+  virtual int64_t Seek(kodi::addon::VFSFileHandle context, int64_t position, int whence)
+  {
+    return -1;
+  }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Truncate a file
   ///
@@ -688,59 +587,91 @@ public:
   /// @param[in] size The size to truncate the file to
   /// @return 0 on success, -1 on error
   ///
-  virtual int Truncate(void* context, int64_t size) { return -1; }
-  //--------------------------------------------------------------------------
+  virtual int Truncate(kodi::addon::VFSFileHandle context, int64_t size) { return -1; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Get total size of a file
   ///
   /// @param[in] context The context of the file
   /// @return Total file size
   ///
-  virtual int64_t GetLength(void* context) { return 0; }
-  //--------------------------------------------------------------------------
+  virtual int64_t GetLength(kodi::addon::VFSFileHandle context) { return 0; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Get current position in a file
   ///
   /// @param[in] context The context of the file
   /// @return Current position
   ///
-  virtual int64_t GetPosition(void* context) { return 0; }
-  //--------------------------------------------------------------------------
+  virtual int64_t GetPosition(kodi::addon::VFSFileHandle context) { return 0; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
   /// @brief Get chunk size of a file
   ///
   /// @param[in] context The context of the file
   /// @return Chunk size
   ///
-  virtual int GetChunkSize(void* context) { return 1; }
-  //--------------------------------------------------------------------------
+  virtual int GetChunkSize(kodi::addon::VFSFileHandle context) { return 1; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief To check seek possible on current stream by file.
   ///
+  /// @return true if seek possible, false if not
+  ///
+  virtual bool IoControlGetSeekPossible(kodi::addon::VFSFileHandle context) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_filecontrol
-  /// @brief Perform an IO-control on the file
+  /// @brief To check a running stream on file for state of his cache.
+  ///
+  /// @param[in] status Information about current cache status
+  /// @return true if successfull done, false otherwise
   ///
-  /// @param[in] context The context of the file
-  /// @param[in] request The requested IO-control
-  /// @param[in] param Parameter attached to the IO-control
-  /// @return -1 on error, >= 0 on success
   ///
-  virtual int IoControl(void* context, VFS_IOCTRL request, void* param) { return -1; }
-  //--------------------------------------------------------------------------
+  /// @copydetails cpp_kodi_vfs_Defs_CacheStatus_Help
+  ///
+  virtual bool IoControlGetCacheStatus(kodi::addon::VFSFileHandle context,
+                                       kodi::vfs::CacheStatus& status)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Unsigned int with speed limit for caching in bytes per second.
+  ///
+  /// @param[in] rate Cache rate size to use
+  /// @return true if successfull done, false otherwise
+  ///
+  virtual bool IoControlSetCacheRate(kodi::addon::VFSFileHandle context, unsigned int rate)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Enable/disable retry within the protocol handler (if supported).
+  ///
+  /// @param[in] retry To set the retry, true for use, false for not
+  /// @return true if successfull done, false otherwise
+  ///
+  virtual bool IoControlSetRetry(kodi::addon::VFSFileHandle context, bool retry) { return false; }
+  //----------------------------------------------------------------------------
   //@}
 
   //@{
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Stat a file
   ///
@@ -748,49 +679,49 @@ public:
   /// @param[in] buffer The buffer to store results in
   /// @return -1 on error, 0 otherwise
   ///
-  virtual int Stat(const VFSURL& url, struct __stat64* buffer) { return 0; }
-  //--------------------------------------------------------------------------
-
-  //==========================================================================
   ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_vfs_Defs_VFSUrl_Help
+  ///
+  virtual int Stat(const kodi::addon::VFSUrl& url, kodi::vfs::FileStatus& buffer) { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Check for file existence
   ///
   /// @param[in] url The URL of the file
   /// @return True if file exists, false otherwise
   ///
-  virtual bool Exists(const VFSURL& url) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool Exists(const kodi::addon::VFSUrl& url) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Clear out any idle connections
   ///
   virtual void ClearOutIdle() {}
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Disconnect all connections
   ///
   virtual void DisconnectAll() {}
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Delete a file
   ///
   /// @param[in] url The URL of the file
   /// @return True if deletion was successful, false otherwise
   ///
-  virtual bool Delete(const VFSURL& url) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool Delete(const kodi::addon::VFSUrl& url) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Rename a file
   ///
@@ -798,45 +729,44 @@ public:
   /// @param[in] url2 The URL of the destination file
   /// @return True if deletion was successful, false otherwise
   ///
-  virtual bool Rename(const VFSURL& url, const VFSURL& url2) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool Rename(const kodi::addon::VFSUrl& url, const kodi::addon::VFSUrl& url2)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Check for directory existence
   ///
   /// @param[in] url The URL of the file
   /// @return True if directory exists, false otherwise
   ///
-  virtual bool DirectoryExists(const VFSURL& url) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool DirectoryExists(const kodi::addon::VFSUrl& url) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Remove a directory
   ///
   /// @param[in] url The URL of the directory
   /// @return True if removal was successful, false otherwise
   ///
-  virtual bool RemoveDirectory(const VFSURL& url) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool RemoveDirectory(const kodi::addon::VFSUrl& url) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Create a directory
   ///
   /// @param[in] url The URL of the file
   /// @return True if creation was successful, false otherwise
   ///
-  virtual bool CreateDirectory(const VFSURL& url) { return false; }
-  //--------------------------------------------------------------------------
+  virtual bool CreateDirectory(const kodi::addon::VFSUrl& url) { return false; }
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @defgroup cpp_kodi_addon_vfs_general_cb_GetDirectory **Callbacks GetDirectory()**
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_vfs_general_cb_GetDirectory Callbacks GetDirectory()
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Callback functions on GetDirectory()
   ///
@@ -853,7 +783,9 @@ public:
   ///
   /// ...
   ///
-  /// bool CMyVFS::GetDirectory(const VFSURL& url, std::vector<kodi::vfs::CDirEntry>& items, CVFSCallbacks callbacks)
+  /// bool CMyVFS::GetDirectory(const kodi::addon::VFSUrl& url,
+  ///                           std::vector<kodi::vfs::CDirEntry>& items,
+  ///                           CVFSCallbacks callbacks)
   /// {
   ///   std::string neededString;
   ///   callbacks.GetKeyboardInput("Test", neededString, true);
@@ -925,10 +857,9 @@ public:
   private:
     const VFSGetDirectoryCallbacks* m_cb;
   };
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief List a directory
   ///
@@ -952,16 +883,15 @@ public:
   /// | CVFSCallbacks::SetErrorDialog | @copybrief CVFSCallbacks::SetErrorDialog @copydetails CVFSCallbacks::SetErrorDialog
   /// | CVFSCallbacks::RequireAuthentication | @copybrief CVFSCallbacks::RequireAuthentication @copydetails CVFSCallbacks::RequireAuthentication
   ///
-  virtual bool GetDirectory(const VFSURL& url,
+  virtual bool GetDirectory(const kodi::addon::VFSUrl& url,
                             std::vector<kodi::vfs::CDirEntry>& entries,
                             CVFSCallbacks callbacks)
   {
     return false;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
+  //============================================================================
   /// @ingroup cpp_kodi_addon_vfs_general
   /// @brief Check if file should be presented as a directory (multiple streams)
   ///
@@ -972,13 +902,13 @@ public:
   /// @param[out] rootPath Path to root directory if multiple entries
   /// @return Context for the directory listing
   ///
-  virtual bool ContainsFiles(const VFSURL& url,
+  virtual bool ContainsFiles(const kodi::addon::VFSUrl& url,
                              std::vector<kodi::vfs::CDirEntry>& entries,
                              std::string& rootPath)
   {
     return false;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
   //@}
 
 private:
@@ -999,7 +929,10 @@ private:
     m_instanceData->toAddon->get_length = ADDON_GetLength;
     m_instanceData->toAddon->get_position = ADDON_GetPosition;
     m_instanceData->toAddon->get_chunk_size = ADDON_GetChunkSize;
-    m_instanceData->toAddon->io_control = ADDON_IoControl;
+    m_instanceData->toAddon->io_control_get_seek_possible = ADDON_IoControlGetSeekPossible;
+    m_instanceData->toAddon->io_control_get_cache_status = ADDON_IoControlGetCacheStatus;
+    m_instanceData->toAddon->io_control_set_cache_rate = ADDON_IoControlSetCacheRate;
+    m_instanceData->toAddon->io_control_set_retry = ADDON_IoControlSetRetry;
     m_instanceData->toAddon->stat = ADDON_Stat;
     m_instanceData->toAddon->close = ADDON_Close;
     m_instanceData->toAddon->exists = ADDON_Exists;
@@ -1015,22 +948,23 @@ private:
     m_instanceData->toAddon->contains_files = ADDON_ContainsFiles;
   }
 
-  inline static void* ADDON_Open(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+  inline static VFS_FILE_HANDLE ADDON_Open(const AddonInstance_VFSEntry* instance,
+                                           const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Open(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Open(url);
   }
 
-  inline static void* ADDON_OpenForWrite(const AddonInstance_VFSEntry* instance,
-                                         const VFSURL* url,
-                                         bool overWrite)
+  inline static VFS_FILE_HANDLE ADDON_OpenForWrite(const AddonInstance_VFSEntry* instance,
+                                                   const VFSURL* url,
+                                                   bool overWrite)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
-        ->OpenForWrite(*url, overWrite);
+        ->OpenForWrite(url, overWrite);
   }
 
   inline static ssize_t ADDON_Read(const AddonInstance_VFSEntry* instance,
-                                   void* context,
-                                   void* buffer,
+                                   VFS_FILE_HANDLE context,
+                                   uint8_t* buffer,
                                    size_t uiBufSize)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
@@ -1038,8 +972,8 @@ private:
   }
 
   inline static ssize_t ADDON_Write(const AddonInstance_VFSEntry* instance,
-                                    void* context,
-                                    const void* buffer,
+                                    VFS_FILE_HANDLE context,
+                                    const uint8_t* buffer,
                                     size_t uiBufSize)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
@@ -1047,7 +981,7 @@ private:
   }
 
   inline static int64_t ADDON_Seek(const AddonInstance_VFSEntry* instance,
-                                   void* context,
+                                   VFS_FILE_HANDLE context,
                                    int64_t position,
                                    int whence)
   {
@@ -1056,51 +990,78 @@ private:
   }
 
   inline static int ADDON_Truncate(const AddonInstance_VFSEntry* instance,
-                                   void* context,
+                                   VFS_FILE_HANDLE context,
                                    int64_t size)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Truncate(context, size);
   }
 
-  inline static int64_t ADDON_GetLength(const AddonInstance_VFSEntry* instance, void* context)
+  inline static int64_t ADDON_GetLength(const AddonInstance_VFSEntry* instance,
+                                        VFS_FILE_HANDLE context)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetLength(context);
   }
 
-  inline static int64_t ADDON_GetPosition(const AddonInstance_VFSEntry* instance, void* context)
+  inline static int64_t ADDON_GetPosition(const AddonInstance_VFSEntry* instance,
+                                          VFS_FILE_HANDLE context)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetPosition(context);
   }
 
-  inline static int ADDON_GetChunkSize(const AddonInstance_VFSEntry* instance, void* context)
+  inline static int ADDON_GetChunkSize(const AddonInstance_VFSEntry* instance,
+                                       VFS_FILE_HANDLE context)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetChunkSize(context);
   }
 
-  inline static int ADDON_IoControl(const AddonInstance_VFSEntry* instance,
-                                    void* context,
-                                    enum VFS_IOCTRL request,
-                                    void* param)
+  inline static bool ADDON_IoControlGetSeekPossible(const AddonInstance_VFSEntry* instance,
+                                                    VFS_FILE_HANDLE context)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->IoControlGetSeekPossible(context);
+  }
+
+  inline static bool ADDON_IoControlGetCacheStatus(const struct AddonInstance_VFSEntry* instance,
+                                                   VFS_FILE_HANDLE context,
+                                                   VFS_CACHE_STATUS_DATA* status)
+  {
+    kodi::vfs::CacheStatus cppStatus(status);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->IoControlGetCacheStatus(context, cppStatus);
+  }
+
+  inline static bool ADDON_IoControlSetCacheRate(const struct AddonInstance_VFSEntry* instance,
+                                                 VFS_FILE_HANDLE context,
+                                                 unsigned int rate)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->IoControlSetCacheRate(context, rate);
+  }
+
+  inline static bool ADDON_IoControlSetRetry(const struct AddonInstance_VFSEntry* instance,
+                                             VFS_FILE_HANDLE context,
+                                             bool retry)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
-        ->IoControl(context, request, param);
+        ->IoControlSetRetry(context, retry);
   }
 
   inline static int ADDON_Stat(const AddonInstance_VFSEntry* instance,
                                const VFSURL* url,
-                               struct __stat64* buffer)
+                               struct STAT_STRUCTURE* buffer)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Stat(*url, buffer);
+    kodi::vfs::FileStatus cppBuffer(buffer);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Stat(url, cppBuffer);
   }
 
-  inline static bool ADDON_Close(const AddonInstance_VFSEntry* instance, void* context)
+  inline static bool ADDON_Close(const AddonInstance_VFSEntry* instance, VFS_FILE_HANDLE context)
   {
     return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Close(context);
   }
 
   inline static bool ADDON_Exists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Exists(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Exists(url);
   }
 
   inline static void ADDON_ClearOutIdle(const AddonInstance_VFSEntry* instance)
@@ -1115,32 +1076,32 @@ private:
 
   inline static bool ADDON_Delete(const AddonInstance_VFSEntry* instance, const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Delete(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Delete(url);
   }
 
   inline static bool ADDON_Rename(const AddonInstance_VFSEntry* instance,
                                   const VFSURL* url,
                                   const VFSURL* url2)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Rename(*url, *url2);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Rename(url, url2);
   }
 
   inline static bool ADDON_DirectoryExists(const AddonInstance_VFSEntry* instance,
                                            const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->DirectoryExists(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->DirectoryExists(url);
   }
 
   inline static bool ADDON_RemoveDirectory(const AddonInstance_VFSEntry* instance,
                                            const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->RemoveDirectory(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->RemoveDirectory(url);
   }
 
   inline static bool ADDON_CreateDirectory(const AddonInstance_VFSEntry* instance,
                                            const VFSURL* url)
   {
-    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->CreateDirectory(*url);
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->CreateDirectory(url);
   }
 
   inline static bool ADDON_GetDirectory(const AddonInstance_VFSEntry* instance,
@@ -1151,7 +1112,7 @@ private:
   {
     std::vector<kodi::vfs::CDirEntry> addonEntries;
     bool ret = static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
-                   ->GetDirectory(*url, addonEntries, CVFSCallbacks(callbacks));
+                   ->GetDirectory(url, addonEntries, CVFSCallbacks(callbacks));
     if (ret)
     {
       VFSDirEntry* entries =
@@ -1218,7 +1179,7 @@ private:
     std::string cppRootPath;
     std::vector<kodi::vfs::CDirEntry> addonEntries;
     bool ret = static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
-                   ->ContainsFiles(*url, addonEntries, cppRootPath);
+                   ->ContainsFiles(url, addonEntries, cppRootPath);
     if (ret)
     {
       strncpy(rootpath, cppRootPath.c_str(), ADDON_STANDARD_STRING_LENGTH);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 54246f0..12893db 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -18,8 +18,6 @@
 #include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
 #endif
 
-namespace kodi { namespace addon { class CInstanceVideoCodec; } }
-
 extern "C"
 {
   enum VIDEOCODEC_FORMAT
@@ -80,7 +78,7 @@ extern "C"
 
     int64_t pts;
 
-    KODI_HANDLE buffer; //< will be passed in release_frame_buffer
+    KODI_HANDLE videoBufferHandle; //< will be passed in release_frame_buffer
   };
 
   enum VIDEOCODEC_RETVAL
@@ -102,7 +100,7 @@ extern "C"
   struct AddonInstance_VideoCodec;
   typedef struct KodiToAddonFuncTable_VideoCodec
   {
-    kodi::addon::CInstanceVideoCodec* addonInstance;
+    KODI_HANDLE addonInstance;
 
     //! \brief Opens a codec
     bool (__cdecl* open) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData);
@@ -132,9 +130,9 @@ extern "C"
 
   typedef struct AddonInstance_VideoCodec
   {
-    AddonProps_VideoCodec props;
-    AddonToKodiFuncTable_VideoCodec toKodi;
-    KodiToAddonFuncTable_VideoCodec toAddon;
+    AddonProps_VideoCodec* props;
+    AddonToKodiFuncTable_VideoCodec* toKodi;
+    KodiToAddonFuncTable_VideoCodec* toAddon;
   } AddonInstance_VideoCodec;
 }
 
@@ -184,13 +182,15 @@ namespace kodi
       //! \copydoc CInstanceVideoCodec::GetFrameBuffer
       bool GetFrameBuffer(VIDEOCODEC_PICTURE &picture)
       {
-        return m_instanceData->toKodi.get_frame_buffer(m_instanceData->toKodi.kodiInstance, &picture);
+        return m_instanceData->toKodi->get_frame_buffer(m_instanceData->toKodi->kodiInstance,
+                                                        &picture);
       }
 
       //! \copydoc CInstanceVideoCodec::ReleaseFrameBuffer
       void ReleaseFrameBuffer(void *buffer)
       {
-        return m_instanceData->toKodi.release_frame_buffer(m_instanceData->toKodi.kodiInstance, buffer);
+        return m_instanceData->toKodi->release_frame_buffer(m_instanceData->toKodi->kodiInstance,
+                                                            buffer);
       }
 
     private:
@@ -201,43 +201,46 @@ namespace kodi
 
         m_instanceData = static_cast<AddonInstance_VideoCodec*>(instance);
 
-        m_instanceData->toAddon.addonInstance = this;
-        m_instanceData->toAddon.open = ADDON_Open;
-        m_instanceData->toAddon.reconfigure = ADDON_Reconfigure;
-        m_instanceData->toAddon.add_data = ADDON_AddData;
-        m_instanceData->toAddon.get_picture = ADDON_GetPicture;
-        m_instanceData->toAddon.get_name = ADDON_GetName;
-        m_instanceData->toAddon.reset = ADDON_Reset;
+        m_instanceData->toAddon->addonInstance = this;
+        m_instanceData->toAddon->open = ADDON_Open;
+        m_instanceData->toAddon->reconfigure = ADDON_Reconfigure;
+        m_instanceData->toAddon->add_data = ADDON_AddData;
+        m_instanceData->toAddon->get_picture = ADDON_GetPicture;
+        m_instanceData->toAddon->get_name = ADDON_GetName;
+        m_instanceData->toAddon->reset = ADDON_Reset;
       }
 
       inline static bool ADDON_Open(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
       {
-        return instance->toAddon.addonInstance->Open(*initData);
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Open(*initData);
       }
 
       inline static bool ADDON_Reconfigure(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
       {
-        return instance->toAddon.addonInstance->Reconfigure(*initData);
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
+            ->Reconfigure(*initData);
       }
 
       inline static bool ADDON_AddData(const AddonInstance_VideoCodec* instance, const DemuxPacket *packet)
       {
-        return instance->toAddon.addonInstance->AddData(*packet);
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
+            ->AddData(*packet);
       }
 
       inline static VIDEOCODEC_RETVAL ADDON_GetPicture(const AddonInstance_VideoCodec* instance, VIDEOCODEC_PICTURE *picture)
       {
-        return instance->toAddon.addonInstance->GetPicture(*picture);
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
+            ->GetPicture(*picture);
       }
 
       inline static const char *ADDON_GetName(const AddonInstance_VideoCodec* instance)
       {
-        return instance->toAddon.addonInstance->GetName();
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->GetName();
       }
 
       inline static void ADDON_Reset(const AddonInstance_VideoCodec* instance)
       {
-        return instance->toAddon.addonInstance->Reset();
+        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Reset();
       }
 
       AddonInstance_VideoCodec* m_instanceData;
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h
new file mode 100644
index 0000000..7b1db65
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h
@@ -0,0 +1,992 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/addon-instance/visualization.h"
+#include "../gui/renderHelper.h"
+
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
+{
+
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_visualization_Defs_VisualizationTrack class VisualizationTrack
+/// @ingroup cpp_kodi_addon_visualization_Defs
+/// @brief **Info tag data structure**\n
+/// Representation of available information of processed audio file.
+///
+/// This is used to store all the necessary data of audio stream and to have on
+/// e.g. GUI for information.
+///
+/// Called from @ref kodi::addon::CInstanceVisualization::UpdateTrack() with the
+/// information of the currently-playing song.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_visualization_Defs_VisualizationTrack_Help
+///
+///@{
+class VisualizationTrack
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceVisualization;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  VisualizationTrack() = default;
+  VisualizationTrack(const VisualizationTrack& tag)
+  {
+    *this = tag;
+  }
+
+  VisualizationTrack& operator=(const VisualizationTrack& right)
+  {
+    if (&right == this)
+      return *this;
+
+    m_title = right.m_title;
+    m_artist = right.m_artist;
+    m_album = right.m_album;
+    m_albumArtist = right.m_albumArtist;
+    m_genre = right.m_genre;
+    m_comment = right.m_comment;
+    m_lyrics = right.m_lyrics;
+
+    m_trackNumber = right.m_trackNumber;
+    m_discNumber = right.m_discNumber;
+    m_duration = right.m_duration;
+    m_year = right.m_year;
+    m_rating = right.m_rating;
+    return *this;
+  }
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_visualization_Defs_VisualizationTrack_Help Value Help
+  /// @ingroup cpp_kodi_addon_visualization_Defs_VisualizationTrack
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_visualization_Defs_VisualizationTrack :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Title of the current song.** | `std::string` | @ref VisualizationTrack::SetTitle "SetTitle" | @ref VisualizationTrack::GetTitle "GetTitle"
+  /// | **Artist names, as a single string** | `std::string` | @ref VisualizationTrack::SetArtist "SetArtist" | @ref VisualizationTrack::GetArtist "GetArtist"
+  /// | **Album that the current song is from.** | `std::string` | @ref VisualizationTrack::SetAlbum "SetAlbum" | @ref VisualizationTrack::GetAlbum "GetAlbum"
+  /// | **Album artist names, as a single string** | `std::string` | @ref VisualizationTrack::SetAlbumArtist "SetAlbumArtist" | @ref VisualizationTrack::GetAlbumArtist "GetAlbumArtist"
+  /// | **The genre name from the music tag, if present** | `std::string` | @ref VisualizationTrack::SetGenre "SetGenre" | @ref VisualizationTrack::GetGenre "GetGenre"
+  /// | **Duration of the current song, in seconds** | `int` | @ref VisualizationTrack::SetDuration "SetDuration" | @ref VisualizationTrack::GetDuration "GetDuration"
+  /// | **Track number of the current song** | `int` | @ref VisualizationTrack::SetTrack "SetTrack" | @ref VisualizationTrack::GetTrack "GetTrack"
+  /// | **Disc number of the current song stored in the ID tag info** | `int` | @ref VisualizationTrack::SetDisc "SetDisc" | @ref VisualizationTrack::GetDisc "GetDisc"
+  /// | **Year that the current song was released** | `int` | @ref VisualizationTrack::SetYear "SetYear" | @ref VisualizationTrack::GetYear "GetYear"
+  /// | **Lyrics of the current song, if available** | `std::string` | @ref VisualizationTrack::SetLyrics "SetLyrics" | @ref VisualizationTrack::GetLyrics "GetLyrics"
+  /// | **The user-defined rating of the current song** | `int` | @ref VisualizationTrack::SetRating "SetRating" | @ref VisualizationTrack::GetRating "GetRating"
+  /// | **Comment of the current song stored in the ID tag info** | `std::string` | @ref VisualizationTrack::SetComment "SetComment" | @ref VisualizationTrack::GetComment "GetComment"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_visualization_Defs_VisualizationTrack
+  ///@{
+
+  /// @brief Set title of the current song.
+  void SetTitle(const std::string& title) { m_title = title; }
+
+  /// @brief Get title of the current song.
+  const std::string& GetTitle() const { return m_title; }
+
+  /// @brief Set artist names, as a single string-
+  void SetArtist(const std::string& artist) { m_artist = artist; }
+
+  /// @brief Get artist names, as a single string-
+  const std::string& GetArtist() const { return m_artist; }
+
+  /// @brief Set Album that the current song is from.
+  void SetAlbum(const std::string& album) { m_album = album; }
+
+  /// @brief Get Album that the current song is from.
+  const std::string& GetAlbum() const { return m_album; }
+
+  /// @brief Set album artist names, as a single stringalbum artist name
+  void SetAlbumArtist(const std::string& albumArtist) { m_albumArtist = albumArtist; }
+
+  /// @brief Get album artist names, as a single string-
+  const std::string& GetAlbumArtist() const { return m_albumArtist; }
+
+  /// @brief Set genre name from music as string if present.
+  void SetGenre(const std::string& genre) { m_genre = genre; }
+
+  /// @brief Get genre name from music as string if present.
+  const std::string& GetGenre() const { return m_genre; }
+
+  /// @brief Set the duration of music as integer from info.
+  void SetDuration(int duration) { m_duration = duration; }
+
+  /// @brief Get the duration of music as integer from info.
+  int GetDuration() const { return m_duration; }
+
+  /// @brief Set track number (if present) from music info as integer.
+  void SetTrack(int trackNumber) { m_trackNumber = trackNumber; }
+
+  /// @brief Get track number (if present).
+  int GetTrack() const { return m_trackNumber; }
+
+  /// @brief Set disk number (if present) from music info as integer.
+  void SetDisc(int discNumber) { m_discNumber = discNumber; }
+
+  /// @brief Get disk number (if present)
+  int GetDisc() const { return m_discNumber; }
+
+  /// @brief Set year that the current song was released.
+  void SetYear(int year) { m_year = year; }
+
+  /// @brief Get year that the current song was released.
+  int GetYear() const { return m_year; }
+
+  /// @brief Set string from lyrics.
+  void SetLyrics(const std::string& lyrics) { m_lyrics = lyrics; }
+
+  /// @brief Get string from lyrics.
+  const std::string& GetLyrics() const { return m_lyrics; }
+
+  /// @brief Set the user-defined rating of the current song.
+  void SetRating(int rating) { m_rating = rating; }
+
+  /// @brief Get the user-defined rating of the current song.
+  int GetRating() const { return m_rating; }
+
+  /// @brief Set additional information comment (if present).
+  void SetComment(const std::string& comment) { m_comment = comment; }
+
+  /// @brief Get additional information comment (if present).
+  const std::string& GetComment() const { return m_comment; }
+
+  ///@}
+
+private:
+  VisualizationTrack(const VIS_TRACK* tag)
+  {
+    if (!tag)
+      return;
+
+    m_title = tag->title ? tag->title : "";
+    m_artist = tag->artist ? tag->artist : "";
+    m_album = tag->album ? tag->album : "";
+    m_albumArtist = tag->albumArtist ? tag->albumArtist : "";
+    m_genre = tag->genre ? tag->genre : "";
+    m_comment = tag->comment ? tag->comment : "";
+    m_lyrics = tag->lyrics ? tag->lyrics : "";
+
+    m_trackNumber = tag->trackNumber;
+    m_discNumber = tag->discNumber;
+    m_duration = tag->duration;
+    m_year = tag->year;
+    m_rating = tag->rating;
+  }
+
+  std::string m_title;
+  std::string m_artist;
+  std::string m_album;
+  std::string m_albumArtist;
+  std::string m_genre;
+  std::string m_comment;
+  std::string m_lyrics;
+
+  int m_trackNumber = 0;
+  int m_discNumber = 0;
+  int m_duration = 0;
+  int m_year = 0;
+  int m_rating = 0;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_visualization_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_visualization
+/// @brief **Visualization add-on instance definition values**\n
+/// All visualization functions associated data structures.
+///
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_visualization
+/// @brief \cpp_class{ kodi::addon::CInstanceVisualization }
+/// **Visualization add-on instance**\n
+/// [Music visualization](https://en.wikipedia.org/wiki/Music_visualization),
+/// or music visualisation, is a feature in Kodi that generates animated
+/// imagery based on a piece of music. The imagery is usually generated and
+/// rendered in real time synchronized to the music.
+///
+/// Visualization techniques range from simple ones (e.g., a simulation of an
+/// oscilloscope display) to elaborate ones, which often include a plurality
+/// of composited effects. The changes in the music's loudness and frequency
+/// spectrum are among the properties used as input to the visualization.
+///
+/// Include the header @ref Visualization.h "#include <kodi/addon-instance/Visualization.h>"
+/// to use this class.
+///
+/// This interface allows the creation of visualizations for Kodi, based upon
+/// **DirectX** or/and **OpenGL** rendering with `C++` code.
+///
+/// Additionally, there are several @ref cpp_kodi_addon_visualization_CB "other functions"
+/// available in which the child class can ask about the current hardware,
+/// including the device, display and several other parts.
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Here's an example on addon.xml:**
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="visualization.myspecialnamefor"
+///   version="1.0.0"
+///   name="My special visualization addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="xbmc.player.musicviz"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My visualization addon addon</summary>
+///     <description lang="en_GB">My visualization addon description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// Description to visualization related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"xbmc.player.musicviz"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is an example of the minimum required code to start a visualization:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Visualization.h>
+///
+/// class CMyVisualization : public kodi::addon::CAddonBase,
+///                          public kodi::addon::CInstanceVisualization
+/// {
+/// public:
+///   CMyVisualization();
+///
+///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
+///   void Render() override;
+/// };
+///
+/// CMyVisualization::CMyVisualization()
+/// {
+///   ...
+/// }
+///
+/// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
+/// {
+///   ...
+/// }
+///
+/// void CMyVisualization::Render()
+/// {
+///   ...
+/// }
+///
+/// ADDONCREATOR(CMyVisualization)
+/// ~~~~~~~~~~~~~
+///
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Here is another example where the visualization is used together with
+/// other instance types:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Visualization.h>
+///
+/// class CMyVisualization : public kodi::addon::CInstanceVisualization
+/// {
+/// public:
+///   CMyVisualization(KODI_HANDLE instance, const std::string& version);
+///
+///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
+///   void Render() override;
+/// };
+///
+/// CMyVisualization::CMyVisualization(KODI_HANDLE instance, const std::string& version)
+///   : kodi::addon::CInstanceAudioDecoder(instance, version)
+/// {
+///   ...
+/// }
+///
+/// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
+/// {
+///   ...
+/// }
+///
+/// void CMyVisualization::Render()
+/// {
+///   ...
+/// }
+///
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() { }
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_VISUALIZATION)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Creating my visualization");
+///     addonInstance = new CMyVisualization(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyVisualization` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstanceVisualization : public IAddonInstance
+{
+public:
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Visualization class constructor
+  ///
+  /// Used by an add-on that only supports visualizations.
+  ///
+  CInstanceVisualization()
+    : IAddonInstance(ADDON_INSTANCE_VISUALIZATION, GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error(
+          "kodi::addon::CInstanceVisualization: Cannot create multiple instances of add-on.");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Visualization class constructor used to support multiple instance
+  /// types.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyVisualization : public kodi::addon::CInstanceAudioDecoder
+  /// {
+  /// public:
+  ///   CMyVisualization(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : kodi::addon::CInstanceAudioDecoder(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_INFO, "Creating my visualization");
+  ///   addonInstance = new CMyVisualization(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstanceVisualization(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_VISUALIZATION,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVisualization: Creation of multiple together "
+                             "with single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Destructor.
+  ///
+  ~CInstanceVisualization() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to notify the visualization that a new song has been started.
+  ///
+  /// @param[in] channels Number of channels in the stream
+  /// @param[in] samplesPerSec Samples per second of stream
+  /// @param[in] bitsPerSample Number of bits in one sample
+  /// @param[in] songName The name of the currently-playing song
+  /// @return true if start successful done
+  ///
+  virtual bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+  {
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to inform the visualization that the rendering control was
+  /// stopped.
+  ///
+  virtual void Stop() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Pass audio data to the visualization.
+  ///
+  /// @param[in] audioData The raw audio data
+  /// @param[in] audioDataLength Length of the audioData array
+  /// @param[in] freqData The [FFT](https://en.wikipedia.org/wiki/Fast_Fourier_transform)
+  ///                     of the audio data
+  /// @param[in] freqDataLength Length of frequency data array
+  ///
+  /// Values **freqData** and **freqDataLength** are used if GetInfo() returns
+  /// true for the `wantsFreq` parameter. Otherwise, **freqData** is set to
+  /// `nullptr` and **freqDataLength** is `0`.
+  ///
+  virtual void AudioData(const float* audioData,
+                         int audioDataLength,
+                         float* freqData,
+                         int freqDataLength)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to inform Kodi that the rendered region is dirty and need an
+  /// update.
+  ///
+  /// @return True if dirty
+  ///
+  virtual bool IsDirty() { return true; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to indicate when the add-on should render.
+  ///
+  virtual void Render() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to get the number of buffers from the current visualization.
+  ///
+  /// @param[out] wantsFreq Indicates whether the add-on wants FFT data. If set
+  ///                       to true, the **freqData** and **freqDataLength**
+  ///                       parameters of @ref AudioData() are used
+  /// @param[out] syncDelay The number of buffers to delay before calling
+  ///                       @ref AudioData()
+  ///
+  /// @note If this function is not implemented, it will default to
+  /// `wantsFreq` = false and `syncDelay` = 0.
+  ///
+  virtual void GetInfo(bool& wantsFreq, int& syncDelay)
+  {
+    wantsFreq = false;
+    syncDelay = 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to get a list of visualization presets the user can select.
+  /// from
+  ///
+  /// @param[out] presets The vector list containing the names of presets that
+  ///                     the user can select
+  /// @return Return true if successful, or false if there are no presets to
+  /// choose from
+  ///
+  virtual bool GetPresets(std::vector<std::string>& presets) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Get the index of the current preset.
+  ///
+  /// @return Index number of the current preset
+  ///
+  virtual int GetActivePreset() { return -1; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Check if the add-on is locked to the current preset.
+  ///
+  /// @return True if locked to the current preset
+  ///
+  virtual bool IsLocked() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Load the previous visualization preset.
+  ///
+  /// @return Return true if the previous preset was loaded
+  ///
+  virtual bool PrevPreset() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Load the next visualization preset.
+  ///
+  /// @return Return true if the next preset was loaded
+  ///
+  virtual bool NextPreset() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Load a visualization preset.
+  ///
+  /// This function is called after a new preset is selected.
+  ///
+  /// @param[in] select Preset index to use
+  /// @return Return true if the preset is loaded
+  ///
+  virtual bool LoadPreset(int select) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Switch to a new random preset.
+  ///
+  /// @return Return true if a random preset was loaded
+  ///
+  virtual bool RandomPreset() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Lock the current visualization preset, preventing it from changing.
+  ///
+  /// @param[in] lockUnlock If set to true, the preset should be locked
+  /// @return Return true if the current preset is locked
+  ///
+  virtual bool LockPreset(bool lockUnlock) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Used to increase/decrease the visualization preset rating.
+  ///
+  /// @param[in] plusMinus If set to true the rating is increased, otherwise
+  ///                      decreased
+  /// @return Return true if the rating is modified
+  ///
+  virtual bool RatePreset(bool plusMinus) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Inform the visualization of the current album art image.
+  ///
+  /// @param[in] albumart Path to the current album art image
+  /// @return Return true if the image is used
+  ///
+  virtual bool UpdateAlbumart(std::string albumart) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief Inform the visualization of the current track's tag information.
+  ///
+  /// @param[in] track Visualization track information structure
+  /// @return Return true if the track information is used
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_visualization_Defs_VisualizationTrack_Help
+  ///
+  ///-------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  ///
+  /// #include <kodi/addon-instance/Visualization.h>
+  ///
+  /// class CMyVisualization : public kodi::addon::CInstanceVisualization
+  /// {
+  /// public:
+  ///   CMyVisualization(KODI_HANDLE instance, const std::string& version);
+  ///
+  ///   ...
+  ///
+  /// private:
+  ///   kodi::addon::VisualizationTrack m_runningTrack;
+  /// };
+  ///
+  /// bool CMyVisualization::UpdateTrack(const kodi::addon::VisualizationTrack& track)
+  /// {
+  ///   m_runningTrack = track;
+  ///   return true;
+  /// }
+  ///
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual bool UpdateTrack(const kodi::addon::VisualizationTrack& track) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_visualization_CB Information functions
+  /// @ingroup cpp_kodi_addon_visualization
+  /// @brief **To get info about the device, display and several other parts**\n
+  /// These are functions to query any values or to transfer them to Kodi.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief To transfer available presets on addon.
+  ///
+  /// Used if @ref GetPresets not possible to use, e.g. where available presets
+  /// are only known during @ref Start call.
+  ///
+  /// @param[in] presets List to store available presets.
+  ///
+  /// @note The function should only be called once, if possible
+  ///
+  inline void TransferPresets(const std::vector<std::string>& presets)
+  {
+    m_instanceData->toKodi->clear_presets(m_instanceData->toKodi->kodiInstance);
+    for (auto it : presets)
+      m_instanceData->toKodi->transfer_preset(m_instanceData->toKodi->kodiInstance, it.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Device that represents the display adapter.
+  ///
+  /// @return A pointer to the used device with @ref cpp_kodi_Defs_HardwareContext "HardwareContext"
+  ///
+  /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
+  /// **OpenGL**
+  ///
+  ///-------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <d3d11_1.h>
+  /// ..
+  /// // Note: Device() there is used inside addon child class about
+  /// // kodi::addon::CInstanceVisualization
+  /// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::addon::CInstanceVisualization::Device());
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  inline kodi::HardwareContext Device() { return m_instanceData->props->device; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Returns the X position of the rendering window.
+  ///
+  /// @return The X position, in pixels
+  ///
+  inline int X() { return m_instanceData->props->x; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Returns the Y position of the rendering window.
+  ///
+  /// @return The Y position, in pixels
+  ///
+  inline int Y() { return m_instanceData->props->y; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Returns the width of the rendering window.
+  ///
+  /// @return The width, in pixels
+  ///
+  inline int Width() { return m_instanceData->props->width; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Returns the height of the rendering window.
+  ///
+  /// @return The height, in pixels
+  ///
+  inline int Height() { return m_instanceData->props->height; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
+  /// describes how the width of a pixel compares to the height of that pixel.
+  ///
+  /// @return The pixel aspect ratio used by the display
+  ///
+  inline float PixelRatio() { return m_instanceData->props->pixelRatio; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Used to get the name of the add-on defined in `addon.xml`.
+  ///
+  /// @return The add-on name
+  ///
+  inline std::string Name() { return m_instanceData->props->name; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Used to get the full path where the add-on is installed.
+  ///
+  /// @return The add-on installation path
+  ///
+  inline std::string Presets() { return m_instanceData->props->presets; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_visualization_CB
+  /// @brief Used to get the full path to the add-on's user profile.
+  ///
+  /// @note The trailing folder (consisting of the add-on's ID) is not created
+  /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
+  /// to create the folder.
+  ///
+  /// @return Path to the user profile
+  ///
+  inline std::string Profile() { return m_instanceData->props->profile; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVisualization: Null pointer instance passed.");
+
+    m_instanceData = static_cast<AddonInstance_Visualization*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->start = ADDON_Start;
+    m_instanceData->toAddon->stop = ADDON_Stop;
+    m_instanceData->toAddon->audio_data = ADDON_AudioData;
+    m_instanceData->toAddon->is_dirty = ADDON_IsDirty;
+    m_instanceData->toAddon->render = ADDON_Render;
+    m_instanceData->toAddon->get_info = ADDON_GetInfo;
+    m_instanceData->toAddon->prev_preset = ADDON_PrevPreset;
+    m_instanceData->toAddon->next_preset = ADDON_NextPreset;
+    m_instanceData->toAddon->load_preset = ADDON_LoadPreset;
+    m_instanceData->toAddon->random_preset = ADDON_RandomPreset;
+    m_instanceData->toAddon->lock_preset = ADDON_LockPreset;
+    m_instanceData->toAddon->rate_preset = ADDON_RatePreset;
+    m_instanceData->toAddon->update_albumart = ADDON_UpdateAlbumart;
+    m_instanceData->toAddon->update_track = ADDON_UpdateTrack;
+    m_instanceData->toAddon->get_presets = ADDON_GetPresets;
+    m_instanceData->toAddon->get_active_preset = ADDON_GetActivePreset;
+    m_instanceData->toAddon->is_locked = ADDON_IsLocked;
+  }
+
+  inline static bool ADDON_Start(const AddonInstance_Visualization* addon,
+                                 int channels,
+                                 int samplesPerSec,
+                                 int bitsPerSample,
+                                 const char* songName)
+  {
+    CInstanceVisualization* thisClass =
+        static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance);
+    thisClass->m_renderHelper = kodi::gui::GetRenderHelper();
+    return thisClass->Start(channels, samplesPerSec, bitsPerSample, songName);
+  }
+
+  inline static void ADDON_Stop(const AddonInstance_Visualization* addon)
+  {
+    CInstanceVisualization* thisClass =
+        static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance);
+    thisClass->Stop();
+    thisClass->m_renderHelper = nullptr;
+  }
+
+  inline static void ADDON_AudioData(const AddonInstance_Visualization* addon,
+                                     const float* audioData,
+                                     int audioDataLength,
+                                     float* freqData,
+                                     int freqDataLength)
+  {
+    static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)
+        ->AudioData(audioData, audioDataLength, freqData, freqDataLength);
+  }
+
+  inline static bool ADDON_IsDirty(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->IsDirty();
+  }
+
+  inline static void ADDON_Render(const AddonInstance_Visualization* addon)
+  {
+    CInstanceVisualization* thisClass =
+        static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance);
+    if (!thisClass->m_renderHelper)
+      return;
+    thisClass->m_renderHelper->Begin();
+    thisClass->Render();
+    thisClass->m_renderHelper->End();
+  }
+
+  inline static void ADDON_GetInfo(const AddonInstance_Visualization* addon, VIS_INFO* info)
+  {
+    static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)
+        ->GetInfo(info->bWantsFreq, info->iSyncDelay);
+  }
+
+  inline static unsigned int ADDON_GetPresets(const AddonInstance_Visualization* addon)
+  {
+    CInstanceVisualization* thisClass =
+        static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance);
+    std::vector<std::string> presets;
+    if (thisClass->GetPresets(presets))
+    {
+      for (auto it : presets)
+        thisClass->m_instanceData->toKodi->transfer_preset(addon->toKodi->kodiInstance, it.c_str());
+    }
+
+    return static_cast<unsigned int>(presets.size());
+  }
+
+  inline static int ADDON_GetActivePreset(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->GetActivePreset();
+  }
+
+  inline static bool ADDON_PrevPreset(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->PrevPreset();
+  }
+
+  inline static bool ADDON_NextPreset(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->NextPreset();
+  }
+
+  inline static bool ADDON_LoadPreset(const AddonInstance_Visualization* addon, int select)
+
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->LoadPreset(select);
+  }
+
+  inline static bool ADDON_RandomPreset(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->RandomPreset();
+  }
+
+  inline static bool ADDON_LockPreset(const AddonInstance_Visualization* addon)
+  {
+    CInstanceVisualization* thisClass =
+        static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance);
+    thisClass->m_presetLockedByUser = !thisClass->m_presetLockedByUser;
+    return thisClass->LockPreset(thisClass->m_presetLockedByUser);
+  }
+
+  inline static bool ADDON_RatePreset(const AddonInstance_Visualization* addon, bool plus_minus)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)
+        ->RatePreset(plus_minus);
+  }
+
+  inline static bool ADDON_IsLocked(const AddonInstance_Visualization* addon)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)->IsLocked();
+  }
+
+  inline static bool ADDON_UpdateAlbumart(const AddonInstance_Visualization* addon,
+                                          const char* albumart)
+  {
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)
+        ->UpdateAlbumart(albumart);
+  }
+
+  inline static bool ADDON_UpdateTrack(const AddonInstance_Visualization* addon,
+                                       const VIS_TRACK* track)
+  {
+    VisualizationTrack cppTrack(track);
+    return static_cast<CInstanceVisualization*>(addon->toAddon->addonInstance)
+        ->UpdateTrack(cppTrack);
+  }
+
+  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
+  bool m_presetLockedByUser = false;
+  AddonInstance_Visualization* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/CMakeLists.txt
new file mode 100644
index 0000000..d6fba69
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(HEADERS PeripheralUtils.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_addon-instance_peripheral)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h
new file mode 100644
index 0000000..febaeb9
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h
@@ -0,0 +1,1277 @@
+/*
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/peripheral.h"
+
+#ifdef __cplusplus
+
+#include <array> // Requires c++11
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#define PERIPHERAL_SAFE_DELETE(x) \
+  do \
+  { \
+    delete (x); \
+    (x) = NULL; \
+  } while (0)
+#define PERIPHERAL_SAFE_DELETE_ARRAY(x) \
+  do \
+  { \
+    delete[](x); \
+    (x) = NULL; \
+  } while (0)
+
+namespace kodi
+{
+namespace addon
+{
+
+class CInstancePeripheral;
+
+/*!
+ * Utility class to manipulate arrays of peripheral types.
+ */
+template<class THE_CLASS, typename THE_STRUCT>
+class PeripheralVector
+{
+public:
+  static void ToStructs(const std::vector<THE_CLASS>& vecObjects, THE_STRUCT** pStructs)
+  {
+    if (!pStructs)
+      return;
+
+    if (vecObjects.empty())
+    {
+      *pStructs = NULL;
+    }
+    else
+    {
+      (*pStructs) = new THE_STRUCT[vecObjects.size()];
+      for (unsigned int i = 0; i < vecObjects.size(); i++)
+        vecObjects.at(i).ToStruct((*pStructs)[i]);
+    }
+  }
+
+  static void ToStructs(const std::vector<THE_CLASS*>& vecObjects, THE_STRUCT** pStructs)
+  {
+    if (!pStructs)
+      return;
+
+    if (vecObjects.empty())
+    {
+      *pStructs = NULL;
+    }
+    else
+    {
+      *pStructs = new THE_STRUCT[vecObjects.size()];
+      for (unsigned int i = 0; i < vecObjects.size(); i++)
+        vecObjects.at(i)->ToStruct((*pStructs)[i]);
+    }
+  }
+
+  static void ToStructs(const std::vector<std::shared_ptr<THE_CLASS>>& vecObjects,
+                        THE_STRUCT** pStructs)
+  {
+    if (!pStructs)
+      return;
+
+    if (vecObjects.empty())
+    {
+      *pStructs = NULL;
+    }
+    else
+    {
+      *pStructs = new THE_STRUCT[vecObjects.size()];
+      for (unsigned int i = 0; i < vecObjects.size(); i++)
+        vecObjects.at(i)->ToStruct((*pStructs)[i]);
+    }
+  }
+
+  static void FreeStructs(unsigned int structCount, THE_STRUCT* structs)
+  {
+    if (structs)
+    {
+      for (unsigned int i = 0; i < structCount; i++)
+        THE_CLASS::FreeStruct(structs[i]);
+    }
+    PERIPHERAL_SAFE_DELETE_ARRAY(structs);
+  }
+};
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities class PeripheralCapabilities
+/// @ingroup cpp_kodi_addon_peripheral_Defs_General
+/// @brief **%Peripheral add-on capabilities**\n
+/// This class is needed to tell Kodi which options are supported on the addon.
+///
+/// If a capability is set to **true**, then the corresponding methods from
+/// @ref cpp_kodi_addon_peripheral "kodi::addon::CInstancePeripheral" need to be
+/// implemented.
+///
+/// As default them all set to **false**.
+///
+/// Used on @ref kodi::addon::CInstancePeripheral::GetCapabilities().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities_Help
+///
+///@{
+class PeripheralCapabilities : public CStructHdl<PeripheralCapabilities, PERIPHERAL_CAPABILITIES>
+{
+  /*! \cond PRIVATE */
+  friend class CInstancePeripheral;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  PeripheralCapabilities()
+  {
+    m_cStructure->provides_joysticks = false;
+    m_cStructure->provides_joystick_rumble = false;
+    m_cStructure->provides_joystick_power_off = false;
+    m_cStructure->provides_buttonmaps = false;
+  }
+
+  PeripheralCapabilities(const PeripheralCapabilities& data) : CStructHdl(data) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities_Help Value Help
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Provides joysticks** | `boolean` | @ref PeripheralCapabilities::SetProvidesJoysticks "SetProvidesJoysticks" | @ref PeripheralCapabilities::GetProvidesJoysticks "GetProvidesJoysticks"
+  /// | **Provides joystick rumble** | `boolean` | @ref PeripheralCapabilities::SetProvidesJoystickRumble "SetProvidesJoystickRumble" | @ref PeripheralCapabilities::GetProvidesJoystickRumble "GetProvidesJoystickRumble"
+  /// | **Provides joystick power off** | `boolean` | @ref PeripheralCapabilities::SetProvidesJoystickPowerOff "SetProvidesJoystickPowerOff" | @ref PeripheralCapabilities::GetProvidesJoystickPowerOff "GetProvidesJoystickPowerOff"
+  /// | **Provides button maps** | `boolean` | @ref PeripheralCapabilities::SetProvidesButtonmaps "SetProvidesButtonmaps" | @ref PeripheralCapabilities::GetProvidesButtonmaps "GetProvidesButtonmaps"
+
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_PeripheralCapabilities
+  ///@{
+
+  /// @brief Set true if the add-on provides joysticks.
+  void SetProvidesJoysticks(bool providesJoysticks)
+  {
+    m_cStructure->provides_joysticks = providesJoysticks;
+  }
+
+  /// @brief To get with @ref SetProvidesJoysticks changed values.
+  bool GetProvidesJoysticks() const { return m_cStructure->provides_joysticks; }
+
+  /// @brief Set true if the add-on provides joystick rumble.
+  void SetProvidesJoystickRumble(bool providesJoystickRumble)
+  {
+    m_cStructure->provides_joystick_rumble = providesJoystickRumble;
+  }
+
+    /// @brief To get with @ref SetProvidesJoystickRumble changed values.
+  bool GetProvidesJoystickRumble() const { return m_cStructure->provides_joystick_rumble; }
+
+  /// @brief Set true if the add-on provides power off about joystick.
+  void SetProvidesJoystickPowerOff(bool providesJoystickPowerOff)
+  {
+    m_cStructure->provides_joystick_power_off = providesJoystickPowerOff;
+  }
+
+  /// @brief To get with @ref SetProvidesJoystickPowerOff changed values.
+  bool GetProvidesJoystickPowerOff() const { return m_cStructure->provides_joystick_power_off; }
+
+  /// @brief Set true if the add-on provides button maps.
+  void SetProvidesButtonmaps(bool providesButtonmaps)
+  {
+    m_cStructure->provides_buttonmaps = providesButtonmaps;
+  }
+
+  /// @brief To get with @ref SetProvidesButtonmaps changed values.
+  bool GetProvidesButtonmaps() const { return m_cStructure->provides_buttonmaps; }
+
+  ///@}
+
+private:
+  PeripheralCapabilities(const PERIPHERAL_CAPABILITIES* data) : CStructHdl(data) {}
+  PeripheralCapabilities(PERIPHERAL_CAPABILITIES* data) : CStructHdl(data) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral class Peripheral
+/// @ingroup cpp_kodi_addon_peripheral_Defs_Peripheral
+/// @brief **Wrapper class providing peripheral information**\n
+/// Classes can extend %Peripheral to inherit peripheral properties.
+///
+/// Used on @ref kodi::addon::CInstancePeripheral::PerformDeviceScan().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral_Help
+///
+///@{
+class Peripheral
+{
+public:
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral_Help Value Help
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **%Peripheral type** | @ref PERIPHERAL_TYPE | @ref Peripheral::SetType "SetType" | @ref Peripheral::Type "Type"
+  /// | **%Peripheral name** | `const std::string&` | @ref Peripheral::SetName "SetName" | @ref Peripheral::Name "Name"
+  /// | **%Peripheral vendor id** | `uint16_t` | @ref Peripheral::SetVendorID "SetVendorID" | @ref Peripheral::VendorID "VendorID"
+  /// | **%Peripheral product id** | `uint16_t` | @ref Peripheral::SetProductID "SetProductID" | @ref Peripheral::ProductID "ProductID"
+  /// | **%Peripheral index** | `unsigned int` | @ref Peripheral::SetIndex "SetIndex" | @ref Peripheral::Index "Index"
+  ///
+  /// Further are following included:
+  /// - @ref Peripheral::Peripheral "Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = \"\")": Class constructor.
+  /// - @ref Peripheral::IsVidPidKnown "IsVidPidKnown()": To check VID and PID are known.
+  ///
+
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral
+  ///@{
+
+  /// @brief Constructor.
+  ///
+  /// @param[in] type [optional] Peripheral type, or @ref PERIPHERAL_TYPE_UNKNOWN
+  ///                 as default
+  /// @param[in] strName [optional] Name of related peripheral
+  Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = "")
+    : m_type(type), m_strName(strName)
+  {
+  }
+
+  /// @brief Destructor.
+  virtual ~Peripheral(void) = default;
+
+  /// @brief Get peripheral type.
+  ///
+  /// @return Type defined with @ref PERIPHERAL_TYPE
+  PERIPHERAL_TYPE Type(void) const { return m_type; }
+
+  /// @brief Get peripheral name.
+  ///
+  /// @return Name string of peripheral
+  const std::string& Name(void) const { return m_strName; }
+
+  /// @brief Get peripheral vendor id.
+  ///
+  /// @return Vendor id
+  uint16_t VendorID(void) const { return m_vendorId; }
+
+  /// @brief Get peripheral product id.
+  ///
+  /// @return Product id
+  uint16_t ProductID(void) const { return m_productId; }
+
+  /// @brief Get peripheral index identifier.
+  ///
+  /// @return Index number
+  unsigned int Index(void) const { return m_index; }
+
+  /// @brief Check VID and PID are known.
+  ///
+  /// @return true if VID and PID are not 0
+  ///
+  /// @note Derived property: VID and PID are `0x0000` if unknown
+  bool IsVidPidKnown(void) const { return m_vendorId != 0 || m_productId != 0; }
+
+  /// @brief Set peripheral type.
+  ///
+  /// @param[in] type Type to set
+  void SetType(PERIPHERAL_TYPE type) { m_type = type; }
+
+  /// @brief Set peripheral name.
+  ///
+  /// @param[in] strName Name to set
+  void SetName(const std::string& strName) { m_strName = strName; }
+
+  /// @brief Set peripheral vendor id.
+  ///
+  /// @param[in] vendorId Type to set
+  void SetVendorID(uint16_t vendorId) { m_vendorId = vendorId; }
+
+  /// @brief Set peripheral product identifier.
+  ///
+  /// @param[in] productId Type to set
+  void SetProductID(uint16_t productId) { m_productId = productId; }
+
+  /// @brief Set peripheral index.
+  ///
+  /// @param[in] index Type to set
+  void SetIndex(unsigned int index) { m_index = index; }
+
+  ///@}
+
+  explicit Peripheral(const PERIPHERAL_INFO& info)
+    : m_type(info.type),
+      m_strName(info.name ? info.name : ""),
+      m_vendorId(info.vendor_id),
+      m_productId(info.product_id),
+      m_index(info.index)
+  {
+  }
+
+  void ToStruct(PERIPHERAL_INFO& info) const
+  {
+    info.type = m_type;
+    info.name = new char[m_strName.size() + 1];
+    info.vendor_id = m_vendorId;
+    info.product_id = m_productId;
+    info.index = m_index;
+
+    std::strcpy(info.name, m_strName.c_str());
+  }
+
+  static void FreeStruct(PERIPHERAL_INFO& info) { PERIPHERAL_SAFE_DELETE_ARRAY(info.name); }
+
+private:
+  PERIPHERAL_TYPE m_type;
+  std::string m_strName;
+  uint16_t m_vendorId = 0;
+  uint16_t m_productId = 0;
+  unsigned int m_index = 0;
+};
+///@}
+//------------------------------------------------------------------------------
+
+typedef PeripheralVector<Peripheral, PERIPHERAL_INFO> Peripherals;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent class PeripheralEvent
+/// @ingroup cpp_kodi_addon_peripheral_Defs_Peripheral
+/// @brief **Wrapper class for %peripheral events**\n
+/// To handle data of change events between add-on and Kodi.
+///
+/// Used on @ref kodi::addon::CInstancePeripheral::GetEvents() and
+/// @ref kodi::addon::CInstancePeripheral::SendEvent().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent_Help
+///
+///@{
+class PeripheralEvent
+{
+public:
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent_Help Value Help
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **%Peripheral event type** | @ref PERIPHERAL_EVENT_TYPE | @ref PeripheralEvent::SetType "SetType" | @ref PeripheralEvent::Type "Type"
+  /// | **%Peripheral index** | `unsigned int` | @ref PeripheralEvent::SetPeripheralIndex "SetPeripheralIndex" | @ref PeripheralEvent::PeripheralIndex "PeripheralIndex"
+  /// | **%Peripheral event driver index** | `unsigned int` | @ref PeripheralEvent::SetDriverIndex "SetDriverIndex" | @ref PeripheralEvent::DriverIndex "DriverIndex"
+  /// | **%Peripheral event button state** | @ref JOYSTICK_STATE_BUTTON | @ref PeripheralEvent::SetButtonState "SetButtonState" | @ref PeripheralEvent::ButtonState "ButtonState"
+  /// | **%Peripheral event hat state** | @ref JOYSTICK_STATE_HAT | @ref PeripheralEvent::SetHatState "SetHatState" | @ref PeripheralEvent::HatState "HatState"
+  /// | **%Peripheral event axis state** | @ref JOYSTICK_STATE_AXIS (`float`) | @ref PeripheralEvent::SetAxisState "SetAxisState" | @ref PeripheralEvent::AxisState "AxisState"
+  /// | **%Peripheral event motor state** | @ref JOYSTICK_STATE_MOTOR (`float`) | @ref PeripheralEvent::SetMotorState "SetMotorState" | @ref PeripheralEvent::MotorState "MotorState"
+  ///
+  /// Further are several class constructors with values included.
+
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_Peripheral_PeripheralEvent
+  ///@{
+
+  /// @brief Constructor.
+  PeripheralEvent() = default;
+
+  /// @brief Constructor.
+  ///
+  /// @param[in] peripheralIndex %Peripheral index
+  /// @param[in] buttonIndex Button index
+  /// @param[in] state Joystick state button
+  PeripheralEvent(unsigned int peripheralIndex,
+                  unsigned int buttonIndex,
+                  JOYSTICK_STATE_BUTTON state)
+    : m_type(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON),
+      m_peripheralIndex(peripheralIndex),
+      m_driverIndex(buttonIndex),
+      m_buttonState(state)
+  {
+  }
+
+  /// @brief Constructor.
+  ///
+  /// @param[in] peripheralIndex %Peripheral index
+  /// @param[in] hatIndex Hat index
+  /// @param[in] state Joystick state hat
+  PeripheralEvent(unsigned int peripheralIndex, unsigned int hatIndex, JOYSTICK_STATE_HAT state)
+    : m_type(PERIPHERAL_EVENT_TYPE_DRIVER_HAT),
+      m_peripheralIndex(peripheralIndex),
+      m_driverIndex(hatIndex),
+      m_hatState(state)
+  {
+  }
+
+  /// @brief Constructor.
+  ///
+  /// @param[in] peripheralIndex %Peripheral index
+  /// @param[in] axisIndex Axis index
+  /// @param[in] state Joystick state axis
+  PeripheralEvent(unsigned int peripheralIndex, unsigned int axisIndex, JOYSTICK_STATE_AXIS state)
+    : m_type(PERIPHERAL_EVENT_TYPE_DRIVER_AXIS),
+      m_peripheralIndex(peripheralIndex),
+      m_driverIndex(axisIndex),
+      m_axisState(state)
+  {
+  }
+
+  /// @brief Get type of event.
+  ///
+  /// @return Type defined with @ref PERIPHERAL_EVENT_TYPE
+  PERIPHERAL_EVENT_TYPE Type(void) const { return m_type; }
+
+  /// @brief Get peripheral index.
+  ///
+  /// @return %Peripheral index number
+  unsigned int PeripheralIndex(void) const { return m_peripheralIndex; }
+
+  /// @brief Get driver index.
+  ///
+  /// @return Driver index number
+  unsigned int DriverIndex(void) const { return m_driverIndex; }
+
+  /// @brief Get button state.
+  ///
+  /// @return Button state as @ref JOYSTICK_STATE_BUTTON
+  JOYSTICK_STATE_BUTTON ButtonState(void) const { return m_buttonState; }
+
+  /// @brief Get hat state.
+  ///
+  /// @return Hat state
+  JOYSTICK_STATE_HAT HatState(void) const { return m_hatState; }
+
+  /// @brief Get axis state.
+  ///
+  /// @return Axis state
+  JOYSTICK_STATE_AXIS AxisState(void) const { return m_axisState; }
+
+  /// @brief Get motor state.
+  ///
+  /// @return Motor state
+  JOYSTICK_STATE_MOTOR MotorState(void) const { return m_motorState; }
+
+  /// @brief Set type of event.
+  ///
+  /// @param[in] type Type defined with @ref PERIPHERAL_EVENT_TYPE
+  void SetType(PERIPHERAL_EVENT_TYPE type) { m_type = type; }
+
+  /// @brief Set peripheral index.
+  ///
+  /// @param[in] index %Peripheral index number
+  void SetPeripheralIndex(unsigned int index) { m_peripheralIndex = index; }
+
+  /// @brief Set driver index.
+  ///
+  /// @param[in] index Driver index number
+  void SetDriverIndex(unsigned int index) { m_driverIndex = index; }
+
+  /// @brief Set button state.
+  ///
+  /// @param[in] state Button state as @ref JOYSTICK_STATE_BUTTON
+  void SetButtonState(JOYSTICK_STATE_BUTTON state) { m_buttonState = state; }
+
+  /// @brief Set hat state.
+  ///
+  /// @param[in] state Hat state as @ref JOYSTICK_STATE_HAT (float)
+  void SetHatState(JOYSTICK_STATE_HAT state) { m_hatState = state; }
+
+  /// @brief Set axis state.
+  ///
+  /// @param[in] state Axis state as @ref JOYSTICK_STATE_AXIS (float)
+  void SetAxisState(JOYSTICK_STATE_AXIS state) { m_axisState = state; }
+
+  /// @brief Set motor state.
+  ///
+  /// @param[in] state Motor state as @ref JOYSTICK_STATE_MOTOR (float)
+  void SetMotorState(JOYSTICK_STATE_MOTOR state) { m_motorState = state; }
+
+  ///@}
+
+  explicit PeripheralEvent(const PERIPHERAL_EVENT& event)
+    : m_type(event.type),
+      m_peripheralIndex(event.peripheral_index),
+      m_driverIndex(event.driver_index),
+      m_buttonState(event.driver_button_state),
+      m_hatState(event.driver_hat_state),
+      m_axisState(event.driver_axis_state),
+      m_motorState(event.motor_state)
+  {
+  }
+
+  void ToStruct(PERIPHERAL_EVENT& event) const
+  {
+    event.type = m_type;
+    event.peripheral_index = m_peripheralIndex;
+    event.driver_index = m_driverIndex;
+    event.driver_button_state = m_buttonState;
+    event.driver_hat_state = m_hatState;
+    event.driver_axis_state = m_axisState;
+    event.motor_state = m_motorState;
+  }
+
+  static void FreeStruct(PERIPHERAL_EVENT& event) { (void)event; }
+
+private:
+  PERIPHERAL_EVENT_TYPE m_type = PERIPHERAL_EVENT_TYPE_NONE;
+  unsigned int m_peripheralIndex = 0;
+  unsigned int m_driverIndex = 0;
+  JOYSTICK_STATE_BUTTON m_buttonState = JOYSTICK_STATE_BUTTON_UNPRESSED;
+  JOYSTICK_STATE_HAT m_hatState = JOYSTICK_STATE_HAT_UNPRESSED;
+  JOYSTICK_STATE_AXIS m_axisState = 0.0f;
+  JOYSTICK_STATE_MOTOR m_motorState = 0.0f;
+};
+///@}
+//------------------------------------------------------------------------------
+
+typedef PeripheralVector<PeripheralEvent, PERIPHERAL_EVENT> PeripheralEvents;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_Joystick class Joystick
+/// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+/// @brief **Wrapper class providing additional joystick information**\n
+/// This is a child class to expand another class with necessary joystick data.
+///
+/// For data not provided by @ref cpp_kodi_addon_peripheral_Defs_Peripheral_Peripheral.
+///
+/// Used on:
+/// - @ref kodi::addon::CInstancePeripheral::GetJoystickInfo()
+/// - @ref kodi::addon::CInstancePeripheral::GetFeatures().
+/// - @ref kodi::addon::CInstancePeripheral::MapFeatures().
+/// - @ref kodi::addon::CInstancePeripheral::GetIgnoredPrimitives().
+/// - @ref kodi::addon::CInstancePeripheral::SetIgnoredPrimitives().
+/// - @ref kodi::addon::CInstancePeripheral::SaveButtonMap().
+/// - @ref kodi::addon::CInstancePeripheral::RevertButtonMap().
+/// - @ref kodi::addon::CInstancePeripheral::ResetButtonMap().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_peripheral_Defs_Joystick_Joystick_Help
+///
+///@{
+class Joystick : public Peripheral
+{
+public:
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_Joystick_Help Value Help
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick_Joystick
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_peripheral_Defs_Joystick_Joystick :</b>
+  /// | Name | Type | Class | Set call | Get call
+  /// |------|------|-------|----------|----------
+  /// | **%Joystick provider** | `const std::string&` | @ref Joystick | @ref Joystick::SetProvider "SetProvider" | @ref Joystick::Provider "Provider"
+  /// | **%Joystick requested port** | `int` | @ref Joystick | @ref Joystick::SetRequestedPort "SetRequestedPort" | @ref Joystick::RequestedPort "RequestedPort"
+  /// | **%Joystick button count** | `unsigned int` | @ref Joystick | @ref Joystick::SetButtonCount "SetButtonCount" | @ref Joystick::ButtonCount "ButtonCount"
+  /// | **%Joystick hat count** | `unsigned int` | @ref Joystick | @ref Joystick::SetHatCount "SetHatCount" | @ref Joystick::HatCount "HatCount"
+  /// | **%Joystick axis count** | `unsigned int` | @ref Joystick | @ref Joystick::SetAxisCount "SetAxisCount" | @ref Joystick::AxisCount "AxisCount"
+  /// | **%Joystick motor count** | `unsigned int` | @ref Joystick | @ref Joystick::SetMotorCount "SetMotorCount" | @ref Joystick::MotorCount "MotorCount"
+  /// | **%Joystick support power off** | `bool` | @ref Joystick | @ref Joystick::SetSupportsPowerOff "SetSupportsPowerOff" | @ref Joystick::SupportsPowerOff "SupportsPowerOff"
+  /// | **%Peripheral type** | @ref PERIPHERAL_TYPE | @ref Peripheral | @ref Peripheral::SetType "SetType" | @ref Peripheral::Type "Type"
+  /// | **%Peripheral name** | `const std::string&` | @ref Peripheral | @ref Peripheral::SetName "SetName" | @ref Peripheral::Name "Name"
+  /// | **%Peripheral vendor id** | `uint16_t` | @ref Peripheral | @ref Peripheral::SetVendorID "SetVendorID" | @ref Peripheral::VendorID "VendorID"
+  /// | **%Peripheral product id** | `uint16_t` | @ref Peripheral | @ref Peripheral::SetProductID "SetProductID" | @ref Peripheral::ProductID "ProductID"
+  /// | **%Peripheral index** | `unsigned int` | @ref Peripheral | @ref Peripheral::SetIndex "SetIndex" | @ref Peripheral::Index "Index"
+  ///
+  /// Further are following included:
+  /// - @ref Joystick::Joystick "Joystick(const std::string& provider = \"\", const std::string& strName = \"\")"
+  /// - @ref Joystick::operator= "Joystick& operator=(const Joystick& rhs)"
+  /// - @ref Peripheral::IsVidPidKnown "IsVidPidKnown()": To check VID and PID are known.
+  ///
+
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_Joystick_Joystick
+  ///@{
+
+  /// @brief Constructor.
+  ///
+  /// @param[in] provider [optional] Provide name
+  /// @param[in] strName [optional] Name of related joystick
+  Joystick(const std::string& provider = "", const std::string& strName = "")
+    : Peripheral(PERIPHERAL_TYPE_JOYSTICK, strName),
+      m_provider(provider),
+      m_requestedPort(NO_PORT_REQUESTED)
+  {
+  }
+
+  /// @brief Class copy constructor.
+  ///
+  /// @param[in] other Other class to copy on construct here
+  Joystick(const Joystick& other) { *this = other; }
+
+  /// @brief Destructor.
+  ///
+  ~Joystick(void) override = default;
+
+  /// @brief Copy data from another @ref Joystick class to here.
+  ///
+  /// @param[in] other Other class to copy here
+  Joystick& operator=(const Joystick& rhs)
+  {
+    if (this != &rhs)
+    {
+      Peripheral::operator=(rhs);
+
+      m_provider = rhs.m_provider;
+      m_requestedPort = rhs.m_requestedPort;
+      m_buttonCount = rhs.m_buttonCount;
+      m_hatCount = rhs.m_hatCount;
+      m_axisCount = rhs.m_axisCount;
+      m_motorCount = rhs.m_motorCount;
+      m_supportsPowerOff = rhs.m_supportsPowerOff;
+    }
+    return *this;
+  }
+
+  /// @brief Get provider name.
+  ///
+  /// @return Name of provider
+  const std::string& Provider(void) const { return m_provider; }
+
+  /// @brief Get requested port number.
+  ///
+  /// @return Port
+  int RequestedPort(void) const { return m_requestedPort; }
+
+  /// @brief Get button count.
+  ///
+  /// @return Button count
+  unsigned int ButtonCount(void) const { return m_buttonCount; }
+
+  /// @brief Get hat count.
+  ///
+  /// @return Hat count
+  unsigned int HatCount(void) const { return m_hatCount; }
+
+  /// @brief Get axis count.
+  ///
+  /// @return Axis count
+  unsigned int AxisCount(void) const { return m_axisCount; }
+
+  /// @brief Get motor count.
+  ///
+  /// @return Motor count
+  unsigned int MotorCount(void) const { return m_motorCount; }
+
+  /// @brief Get supports power off.
+  ///
+  /// @return True if power off is supported, false otherwise
+  bool SupportsPowerOff(void) const { return m_supportsPowerOff; }
+
+  /// @brief Set provider name.
+  ///
+  /// @param[in] provider Name of provider
+  void SetProvider(const std::string& provider) { m_provider = provider; }
+
+  /// @brief Get requested port number.
+  ///
+  /// @param[in] requestedPort Port
+  void SetRequestedPort(int requestedPort) { m_requestedPort = requestedPort; }
+
+  /// @brief Get button count.
+  ///
+  /// @param[in] buttonCount Button count
+  void SetButtonCount(unsigned int buttonCount) { m_buttonCount = buttonCount; }
+
+  /// @brief Get hat count.
+  ///
+  /// @param[in] hatCount Hat count
+  void SetHatCount(unsigned int hatCount) { m_hatCount = hatCount; }
+
+  /// @brief Get axis count.
+  ///
+  /// @param[in] axisCount Axis count
+  void SetAxisCount(unsigned int axisCount) { m_axisCount = axisCount; }
+
+  /// @brief Get motor count.
+  ///
+  /// @param[in] motorCount Motor count
+  void SetMotorCount(unsigned int motorCount) { m_motorCount = motorCount; }
+
+  /// @brief Get supports power off.
+  ///
+  /// @param[in] supportsPowerOff True if power off is supported, false otherwise
+  void SetSupportsPowerOff(bool supportsPowerOff) { m_supportsPowerOff = supportsPowerOff; }
+
+  ///@}
+
+  explicit Joystick(const JOYSTICK_INFO& info)
+    : Peripheral(info.peripheral),
+      m_provider(info.provider ? info.provider : ""),
+      m_requestedPort(info.requested_port),
+      m_buttonCount(info.button_count),
+      m_hatCount(info.hat_count),
+      m_axisCount(info.axis_count),
+      m_motorCount(info.motor_count),
+      m_supportsPowerOff(info.supports_poweroff)
+  {
+  }
+
+  void ToStruct(JOYSTICK_INFO& info) const
+  {
+    Peripheral::ToStruct(info.peripheral);
+
+    info.provider = new char[m_provider.size() + 1];
+    info.requested_port = m_requestedPort;
+    info.button_count = m_buttonCount;
+    info.hat_count = m_hatCount;
+    info.axis_count = m_axisCount;
+    info.motor_count = m_motorCount;
+    info.supports_poweroff = m_supportsPowerOff;
+
+    std::strcpy(info.provider, m_provider.c_str());
+  }
+
+  static void FreeStruct(JOYSTICK_INFO& info)
+  {
+    Peripheral::FreeStruct(info.peripheral);
+
+    PERIPHERAL_SAFE_DELETE_ARRAY(info.provider);
+  }
+
+private:
+  std::string m_provider;
+  int m_requestedPort;
+  unsigned int m_buttonCount = 0;
+  unsigned int m_hatCount = 0;
+  unsigned int m_axisCount = 0;
+  unsigned int m_motorCount = 0;
+  bool m_supportsPowerOff = false;
+};
+///@}
+//------------------------------------------------------------------------------
+
+typedef PeripheralVector<Joystick, JOYSTICK_INFO> Joysticks;
+
+class JoystickFeature;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_DriverPrimitive class DriverPrimitive
+/// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+/// @brief **Base class for joystick driver primitives**
+///
+/// A driver primitive can be:
+///
+///   1. a button
+///   2. a hat direction
+///   3. a semiaxis (either the positive or negative half of an axis)
+///   4. a motor
+///   5. a keyboard key
+///   6. a mouse button
+///   7. a relative pointer direction
+///
+/// The type determines the fields in use:
+///
+///    Button:
+///       - driver index
+///
+///    Hat direction:
+///       - driver index
+///       - hat direction
+///
+///    Semiaxis:
+///       - driver index
+///       - center
+///       - semiaxis direction
+///       - range
+///
+///    Motor:
+///       - driver index
+///
+///    Key:
+///       - key code
+///
+///    Mouse button:
+///       - driver index
+///
+///    Relative pointer direction:
+///       - relative pointer direction
+///
+///@{
+struct DriverPrimitive
+{
+protected:
+  /*!
+   * \brief Construct a driver primitive of the specified type
+   */
+  DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE type, unsigned int driverIndex)
+    : m_type(type), m_driverIndex(driverIndex)
+  {
+  }
+
+public:
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_Joystick_DriverPrimitive
+  ///@{
+
+  /// @brief Construct an invalid driver primitive.
+  DriverPrimitive(void) = default;
+
+  /// @brief Construct a driver primitive representing a joystick button.
+  ///
+  /// @param[in] buttonIndex Index
+  /// @return Created class
+  static DriverPrimitive CreateButton(unsigned int buttonIndex)
+  {
+    return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON, buttonIndex);
+  }
+
+  /// @brief Construct a driver primitive representing one of the four direction
+  /// arrows on a dpad.
+  ///
+  /// @param[in] hatIndex Hat index
+  /// @param[in] direction With @ref JOYSTICK_DRIVER_HAT_DIRECTION defined direction
+  DriverPrimitive(unsigned int hatIndex, JOYSTICK_DRIVER_HAT_DIRECTION direction)
+    : m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
+      m_driverIndex(hatIndex),
+      m_hatDirection(direction)
+  {
+  }
+
+  /// @brief Construct a driver primitive representing the positive or negative
+  /// half of an axis.
+  ///
+  /// @param[in] axisIndex Axis index
+  /// @param[in] center Center
+  /// @param[in] direction With @ref JOYSTICK_DRIVER_HAT_DIRECTION defined direction
+  /// @param[in] range Range
+  DriverPrimitive(unsigned int axisIndex,
+                  int center,
+                  JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction,
+                  unsigned int range)
+    : m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS),
+      m_driverIndex(axisIndex),
+      m_center(center),
+      m_semiAxisDirection(direction),
+      m_range(range)
+  {
+  }
+
+  /// @brief Construct a driver primitive representing a motor.
+  ///
+  /// @param[in] motorIndex Motor index number
+  /// @return Constructed driver primitive representing a motor
+  static DriverPrimitive CreateMotor(unsigned int motorIndex)
+  {
+    return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR, motorIndex);
+  }
+
+  /// @brief Construct a driver primitive representing a key on a keyboard.
+  ///
+  /// @param[in] keycode Keycode to use
+  DriverPrimitive(std::string keycode)
+    : m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY), m_keycode(std::move(keycode))
+  {
+  }
+
+  /// @brief Construct a driver primitive representing a mouse button.
+  ///
+  /// @param[in] buttonIndex Index
+  /// @return Constructed driver primitive representing a mouse button
+  static DriverPrimitive CreateMouseButton(JOYSTICK_DRIVER_MOUSE_INDEX buttonIndex)
+  {
+    return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON,
+                           static_cast<unsigned int>(buttonIndex));
+  }
+
+  /// @brief Construct a driver primitive representing one of the four
+  /// direction in which a relative pointer can move
+  ///
+  /// @param[in] direction With @ref JOYSTICK_DRIVER_RELPOINTER_DIRECTION defined direction
+  DriverPrimitive(JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction)
+    : m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION), m_relPointerDirection(direction)
+  {
+  }
+
+  /// @brief Get type of primitive.
+  ///
+  /// @return The with @ref JOYSTICK_DRIVER_PRIMITIVE_TYPE defined type
+  JOYSTICK_DRIVER_PRIMITIVE_TYPE Type(void) const { return m_type; }
+
+  /// @brief Get driver index.
+  ///
+  /// @return Index number
+  unsigned int DriverIndex(void) const { return m_driverIndex; }
+
+  /// @brief Get hat direction
+  ///
+  /// @return The with @ref JOYSTICK_DRIVER_HAT_DIRECTION defined direction
+  JOYSTICK_DRIVER_HAT_DIRECTION HatDirection(void) const { return m_hatDirection; }
+
+  /// @brief Get center
+  ///
+  /// @return Center
+  int Center(void) const { return m_center; }
+
+  /// @brief Get semi axis direction
+  ///
+  /// @return With @ref JOYSTICK_DRIVER_SEMIAXIS_DIRECTION defined direction
+  JOYSTICK_DRIVER_SEMIAXIS_DIRECTION SemiAxisDirection(void) const { return m_semiAxisDirection; }
+
+  /// @brief Get range.
+  ///
+  /// @return Range
+  unsigned int Range(void) const { return m_range; }
+
+  /// @brief Get key code as string.
+  ///
+  /// @return Key code
+  const std::string& Keycode(void) const { return m_keycode; }
+
+  /// @brief Get mouse index
+  ///
+  /// @return With @ref JOYSTICK_DRIVER_MOUSE_INDEX defined mouse index
+  JOYSTICK_DRIVER_MOUSE_INDEX MouseIndex(void) const
+  {
+    return static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex);
+  }
+
+  /// @brief Get relative pointer direction.
+  ///
+  /// @return With @ref JOYSTICK_DRIVER_RELPOINTER_DIRECTION defined direction
+  JOYSTICK_DRIVER_RELPOINTER_DIRECTION RelPointerDirection(void) const
+  {
+    return m_relPointerDirection;
+  }
+
+  /// @brief Compare this with another class of this type.
+  ///
+  /// @param[in] other Other class to compare
+  /// @return True if they are equal, false otherwise
+  bool operator==(const DriverPrimitive& other) const
+  {
+    if (m_type == other.m_type)
+    {
+      switch (m_type)
+      {
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+        {
+          return m_driverIndex == other.m_driverIndex;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+        {
+          return m_driverIndex == other.m_driverIndex && m_hatDirection == other.m_hatDirection;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+        {
+          return m_driverIndex == other.m_driverIndex && m_center == other.m_center &&
+                 m_semiAxisDirection == other.m_semiAxisDirection && m_range == other.m_range;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+        {
+          return m_keycode == other.m_keycode;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
+        {
+          return m_driverIndex == other.m_driverIndex;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+        {
+          return m_driverIndex == other.m_driverIndex;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+        {
+          return m_relPointerDirection == other.m_relPointerDirection;
+        }
+        default:
+          break;
+      }
+    }
+    return false;
+  }
+
+  ///@}
+
+  explicit DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) : m_type(primitive.type)
+  {
+    switch (m_type)
+    {
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+      {
+        m_driverIndex = primitive.button.index;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+      {
+        m_driverIndex = primitive.hat.index;
+        m_hatDirection = primitive.hat.direction;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+      {
+        m_driverIndex = primitive.semiaxis.index;
+        m_center = primitive.semiaxis.center;
+        m_semiAxisDirection = primitive.semiaxis.direction;
+        m_range = primitive.semiaxis.range;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
+      {
+        m_driverIndex = primitive.motor.index;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+      {
+        m_keycode = primitive.key.keycode;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+      {
+        m_driverIndex = primitive.mouse.button;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+      {
+        m_relPointerDirection = primitive.relpointer.direction;
+        break;
+      }
+      default:
+        break;
+    }
+  }
+
+  void ToStruct(JOYSTICK_DRIVER_PRIMITIVE& driver_primitive) const
+  {
+    driver_primitive.type = m_type;
+    switch (m_type)
+    {
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+      {
+        driver_primitive.button.index = m_driverIndex;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+      {
+        driver_primitive.hat.index = m_driverIndex;
+        driver_primitive.hat.direction = m_hatDirection;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+      {
+        driver_primitive.semiaxis.index = m_driverIndex;
+        driver_primitive.semiaxis.center = m_center;
+        driver_primitive.semiaxis.direction = m_semiAxisDirection;
+        driver_primitive.semiaxis.range = m_range;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
+      {
+        driver_primitive.motor.index = m_driverIndex;
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+      {
+        const size_t size = sizeof(driver_primitive.key.keycode);
+        std::strncpy(driver_primitive.key.keycode, m_keycode.c_str(), size - 1);
+        driver_primitive.key.keycode[size - 1] = '\0';
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+      {
+        driver_primitive.mouse.button = static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex);
+        break;
+      }
+      case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+      {
+        driver_primitive.relpointer.direction = m_relPointerDirection;
+        break;
+      }
+      default:
+        break;
+    }
+  }
+
+  static void FreeStruct(JOYSTICK_DRIVER_PRIMITIVE& primitive) { (void)primitive; }
+
+private:
+  JOYSTICK_DRIVER_PRIMITIVE_TYPE m_type = JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN;
+  unsigned int m_driverIndex = 0;
+  JOYSTICK_DRIVER_HAT_DIRECTION m_hatDirection = JOYSTICK_DRIVER_HAT_UNKNOWN;
+  int m_center = 0;
+  JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection = JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
+  unsigned int m_range = 1;
+  std::string m_keycode;
+  JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection = JOYSTICK_DRIVER_RELPOINTER_UNKNOWN;
+};
+///@}
+//------------------------------------------------------------------------------
+
+typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JoystickFeature class JoystickFeature
+/// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+/// @brief **Base class for joystick feature primitives**
+///
+/// Class for joystick features. A feature can be:
+///
+///   1. scalar *[1]*
+///   2. analog stick
+///   3. accelerometer
+///   4. motor
+///   5. relative pointer *[2]*
+///   6. absolute pointer
+///   7. wheel
+///   8. throttle
+///   9. keyboard key
+///
+/// *[1]* All three driver primitives (buttons, hats and axes) have a state that
+///       can be represented using a single scalar value. For this reason,
+///       features that map to a single primitive are called "scalar features".
+///
+/// *[2]* Relative pointers are similar to analog sticks, but they use
+///       relative distances instead of positions.
+///
+///@{
+class JoystickFeature
+{
+public:
+  /// @addtogroup cpp_kodi_addon_peripheral_Defs_Joystick_JoystickFeature
+  ///@{
+
+  /// @brief Class constructor.
+  ///
+  /// @param[in] name [optional] Name of the feature
+  /// @param[in] type [optional] Type of the feature, @ref JOYSTICK_FEATURE_TYPE_UNKNOWN
+  ///                 as default
+  JoystickFeature(const std::string& name = "",
+                  JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
+    : m_name(name), m_type(type), m_primitives{}
+  {
+  }
+
+  /// @brief Class copy constructor.
+  ///
+  /// @param[in] other Other class to copy on construct here
+  JoystickFeature(const JoystickFeature& other) { *this = other; }
+
+  /// @brief Copy data from another @ref JoystickFeature class to here.
+  ///
+  /// @param[in] other Other class to copy here
+  JoystickFeature& operator=(const JoystickFeature& rhs)
+  {
+    if (this != &rhs)
+    {
+      m_name = rhs.m_name;
+      m_type = rhs.m_type;
+      m_primitives = rhs.m_primitives;
+    }
+    return *this;
+  }
+
+  /// @brief Compare this with another class of this type.
+  ///
+  /// @param[in] other Other class to compare
+  /// @return True if they are equal, false otherwise
+  bool operator==(const JoystickFeature& other) const
+  {
+    return m_name == other.m_name && m_type == other.m_type && m_primitives == other.m_primitives;
+  }
+
+  /// @brief Get name of feature.
+  ///
+  /// @return Name of feature
+  const std::string& Name(void) const { return m_name; }
+
+  /// @brief Get name of feature.
+  ///
+  /// @return Type of feature defined with @ref JOYSTICK_FEATURE_TYPE
+  JOYSTICK_FEATURE_TYPE Type(void) const { return m_type; }
+
+  /// @brief Check this feature is valid.
+  ///
+  /// @return True if valid (type != JOYSTICK_FEATURE_TYPE_UNKNOWN), false otherwise
+  bool IsValid() const { return m_type != JOYSTICK_FEATURE_TYPE_UNKNOWN; }
+
+  /// @brief Set name of feature.
+  ///
+  /// @param[in] name Name of feature
+  void SetName(const std::string& name) { m_name = name; }
+
+  /// @brief Set type of feature.
+  ///
+  /// @param[in] type Type of feature
+  void SetType(JOYSTICK_FEATURE_TYPE type) { m_type = type; }
+
+  /// @brief Set type as invalid.
+  void SetInvalid(void) { m_type = JOYSTICK_FEATURE_TYPE_UNKNOWN; }
+
+  /// @brief Get primitive of feature by wanted type.
+  ///
+  /// @param[in] which Type of feature, defined with @ref JOYSTICK_FEATURE_PRIMITIVE
+  /// @return Primitive of asked type
+  const DriverPrimitive& Primitive(JOYSTICK_FEATURE_PRIMITIVE which) const
+  {
+    return m_primitives[which];
+  }
+
+  /// @brief Set primitive for feature by wanted type.
+  ///
+  /// @param[in] which Type of feature, defined with @ref JOYSTICK_FEATURE_PRIMITIVE
+  /// @param[in] primitive The with @ref DriverPrimitive defined primitive to set
+  void SetPrimitive(JOYSTICK_FEATURE_PRIMITIVE which, const DriverPrimitive& primitive)
+  {
+    m_primitives[which] = primitive;
+  }
+
+  /// @brief Get all primitives on this class.
+  ///
+  /// @return Array list of primitives
+  std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX>& Primitives() { return m_primitives; }
+
+  /// @brief Get all primitives on this class (as constant).
+  ///
+  /// @return Constant a´rray list of primitives
+  const std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX>& Primitives() const
+  {
+    return m_primitives;
+  }
+
+  ///@}
+
+  explicit JoystickFeature(const JOYSTICK_FEATURE& feature)
+    : m_name(feature.name ? feature.name : ""), m_type(feature.type)
+  {
+    for (unsigned int i = 0; i < JOYSTICK_PRIMITIVE_MAX; i++)
+      m_primitives[i] = DriverPrimitive(feature.primitives[i]);
+  }
+
+  void ToStruct(JOYSTICK_FEATURE& feature) const
+  {
+    feature.name = new char[m_name.length() + 1];
+    feature.type = m_type;
+    for (unsigned int i = 0; i < JOYSTICK_PRIMITIVE_MAX; i++)
+      m_primitives[i].ToStruct(feature.primitives[i]);
+
+    std::strcpy(feature.name, m_name.c_str());
+  }
+
+  static void FreeStruct(JOYSTICK_FEATURE& feature) { PERIPHERAL_SAFE_DELETE_ARRAY(feature.name); }
+
+private:
+  std::string m_name;
+  JOYSTICK_FEATURE_TYPE m_type;
+  std::array<DriverPrimitive, JOYSTICK_PRIMITIVE_MAX> m_primitives;
+};
+///@}
+//------------------------------------------------------------------------------
+
+typedef PeripheralVector<JoystickFeature, JOYSTICK_FEATURE> JoystickFeatures;
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt
index 946849e..3443b1e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt
@@ -9,5 +9,5 @@ set(HEADERS ChannelGroups.h
             Timers.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_addon-instance_pvr)
+  core_add_library(addons_kodi-dev-kit_include_kodi_addon-instance_pvr)
 endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
index 17995bb..17995bb 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Channels.h
index 9c2f5d2..9c2f5d2 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Channels.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EDL.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/EDL.h
index 34c7c41..34c7c41 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EDL.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/EDL.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/EPG.h
index e1fc04f..e1fc04f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/EPG.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/General.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/General.h
index c7977c2..c7977c2 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/General.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/General.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h
index 053a4d5..053a4d5 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
index 24ecf11..24ecf11 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Stream.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h
index 5613947..5613947 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Stream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Timers.h
index 6e05e55..6e05e55 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Timers.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/CMakeLists.txt
index d7b2269..091e0fe 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/CMakeLists.txt
@@ -4,6 +4,10 @@ set(HEADERS addon_base.h
             general.h
             network.h)
 
+if(CORE_SYSTEM_NAME STREQUAL android)
+  list(APPEND SOURCES platform/android/system.h)
+endif()
+
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api)
 endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
new file mode 100644
index 0000000..4edd034
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(HEADERS audio_decoder.h
+            audio_encoder.h
+            game.h
+            image_decoder.h
+            peripheral.h
+            pvr.h
+            screensaver.h
+            vfs.h
+            visualization.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_addon-instance)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h
new file mode 100644
index 0000000..8b75ddb
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h
@@ -0,0 +1,92 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_ADDONINSTANCE_AUDIO_DECODER_H
+#define C_API_ADDONINSTANCE_AUDIO_DECODER_H
+
+#include "../addon_base.h"
+#include "../audio_engine.h"
+
+#define AUDIO_DECODER_LYRICS_SIZE 65535
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  // WARNING About size use malloc/new!
+  struct AUDIO_DECODER_INFO_TAG
+  {
+    char title[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char artist[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char album[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char album_artist[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char media_type[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char genre[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    int duration;
+    int track;
+    int disc;
+    char disc_subtitle[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    int disc_total;
+    char release_date[ADDON_STANDARD_STRING_LENGTH_SMALL];
+    char lyrics[AUDIO_DECODER_LYRICS_SIZE];
+    int samplerate;
+    int channels;
+    int bitrate;
+    char comment[ADDON_STANDARD_STRING_LENGTH];
+  };
+
+  typedef struct AddonProps_AudioDecoder
+  {
+    int dummy;
+  } AddonProps_AudioDecoder;
+
+  typedef struct AddonToKodiFuncTable_AudioDecoder
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_AudioDecoder;
+
+  struct AddonInstance_AudioDecoder;
+  typedef struct KodiToAddonFuncTable_AudioDecoder
+  {
+    KODI_HANDLE addonInstance;
+    bool(__cdecl* init)(const struct AddonInstance_AudioDecoder* instance,
+                        const char* file,
+                        unsigned int filecache,
+                        int* channels,
+                        int* samplerate,
+                        int* bitspersample,
+                        int64_t* totaltime,
+                        int* bitrate,
+                        enum AudioEngineDataFormat* format,
+                        const enum AudioEngineChannel** info);
+    int(__cdecl* read_pcm)(const struct AddonInstance_AudioDecoder* instance,
+                           uint8_t* buffer,
+                           int size,
+                           int* actualsize);
+    int64_t(__cdecl* seek)(const struct AddonInstance_AudioDecoder* instance, int64_t time);
+    bool(__cdecl* read_tag)(const struct AddonInstance_AudioDecoder* instance,
+                            const char* file,
+                            struct AUDIO_DECODER_INFO_TAG* tag);
+    int(__cdecl* track_count)(const struct AddonInstance_AudioDecoder* instance, const char* file);
+  } KodiToAddonFuncTable_AudioDecoder;
+
+  typedef struct AddonInstance_AudioDecoder
+  {
+    struct AddonProps_AudioDecoder* props;
+    struct AddonToKodiFuncTable_AudioDecoder* toKodi;
+    struct KodiToAddonFuncTable_AudioDecoder* toAddon;
+  } AddonInstance_AudioDecoder;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_AUDIO_DECODER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h
new file mode 100644
index 0000000..6f24d1c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h
@@ -0,0 +1,67 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_ADDONINSTANCE_AUDIO_ENCODER_H
+#define C_API_ADDONINSTANCE_AUDIO_ENCODER_H
+
+#include "../addon_base.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonProps_AudioEncoder
+  {
+    int dummy;
+  } AddonProps_AudioEncoder;
+
+  typedef struct AddonToKodiFuncTable_AudioEncoder
+  {
+    KODI_HANDLE kodiInstance;
+    int (*write)(KODI_HANDLE kodiInstance, const uint8_t* data, int len);
+    int64_t (*seek)(KODI_HANDLE kodiInstance, int64_t pos, int whence);
+  } AddonToKodiFuncTable_AudioEncoder;
+
+  struct AddonInstance_AudioEncoder;
+  typedef struct KodiToAddonFuncTable_AudioEncoder
+  {
+    KODI_HANDLE addonInstance;
+    bool(__cdecl* start)(const struct AddonInstance_AudioEncoder* instance,
+                         int in_channels,
+                         int in_rate,
+                         int in_bits,
+                         const char* title,
+                         const char* artist,
+                         const char* albumartist,
+                         const char* album,
+                         const char* year,
+                         const char* track,
+                         const char* genre,
+                         const char* comment,
+                         int track_length);
+    int(__cdecl* encode)(const struct AddonInstance_AudioEncoder* instance,
+                         int num_bytes_read,
+                         const uint8_t* pbt_stream);
+    bool(__cdecl* finish)(const struct AddonInstance_AudioEncoder* instance);
+  } KodiToAddonFuncTable_AudioEncoder;
+
+  typedef struct AddonInstance_AudioEncoder
+  {
+    struct AddonProps_AudioEncoder* props;
+    struct AddonToKodiFuncTable_AudioEncoder* toKodi;
+    struct KodiToAddonFuncTable_AudioEncoder* toAddon;
+  } AddonInstance_AudioEncoder;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_AUDIO_ENCODER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h
new file mode 100644
index 0000000..c97fa5d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h
@@ -0,0 +1,1212 @@
+/*
+ *  Copyright (C) 2014-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_ADDONINSTANCE_GAME_H
+#define C_API_ADDONINSTANCE_GAME_H
+
+#include "../addon_base.h"
+
+#include <stddef.h> /* size_t */
+
+//==============================================================================
+/// @ingroup cpp_kodi_addon_game_Defs
+/// @brief **Port ID used when topology is unknown**
+#define DEFAULT_PORT_ID "1"
+//------------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Game add-on error codes**
+  ///
+  /// Used as return values on most Game related functions.
+  ///
+  typedef enum GAME_ERROR
+  {
+    /// @brief no error occurred
+    GAME_ERROR_NO_ERROR,
+
+    /// @brief an unknown error occurred
+    GAME_ERROR_UNKNOWN,
+
+    /// @brief the method that the frontend called is not implemented
+    GAME_ERROR_NOT_IMPLEMENTED,
+
+    /// @brief the command was rejected by the game client
+    GAME_ERROR_REJECTED,
+
+    /// @brief the parameters of the method that was called are invalid for this operation
+    GAME_ERROR_INVALID_PARAMETERS,
+
+    /// @brief the command failed
+    GAME_ERROR_FAILED,
+
+    /// @brief no game is loaded
+    GAME_ERROR_NOT_LOADED,
+
+    /// @brief game requires restricted resources
+    GAME_ERROR_RESTRICTED,
+  } GAME_ERROR;
+  //----------------------------------------------------------------------------
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_AudioStream 1. Audio stream
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **The for Audio stream used data system**
+  ///
+  /// Used to give Addon currently used audio stream configuration on Kodi and
+  /// arrays to give related data to Kodi on callbacks.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Stream Format**
+  ///
+  /// From Kodi requested specified audio sample format.
+  ///
+  typedef enum GAME_PCM_FORMAT
+  {
+    GAME_PCM_FORMAT_UNKNOWN,
+
+    /// @brief S16NE sample format
+    GAME_PCM_FORMAT_S16NE,
+  } GAME_PCM_FORMAT;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Audio channel**
+  ///
+  /// Channel identification flags.
+  ///
+  typedef enum GAME_AUDIO_CHANNEL
+  {
+    /// @brief Channel list terminator
+    GAME_CH_NULL,
+
+    /// @brief Channel front left
+    GAME_CH_FL,
+
+    /// @brief Channel front right
+    GAME_CH_FR,
+
+    /// @brief Channel front center
+    GAME_CH_FC,
+
+    /// @brief Channel Low Frequency Effects / Subwoofer
+    GAME_CH_LFE,
+
+    /// @brief Channel back left
+    GAME_CH_BL,
+
+    /// @brief Channel back right
+    GAME_CH_BR,
+
+    /// @brief Channel front left over center
+    GAME_CH_FLOC,
+
+    /// @brief Channel front right over center
+    GAME_CH_FROC,
+
+    /// @brief Channel back center
+    GAME_CH_BC,
+
+    /// @brief Channel surround/side left
+    GAME_CH_SL,
+
+    /// @brief Channel surround/side right
+    GAME_CH_SR,
+
+    /// @brief Channel top front left
+    GAME_CH_TFL,
+
+    /// @brief Channel top front right
+    GAME_CH_TFR,
+
+    /// @brief Channel top front center
+    GAME_CH_TFC,
+
+    /// @brief Channel top center
+    GAME_CH_TC,
+
+    /// @brief Channel top back left
+    GAME_CH_TBL,
+
+    /// @brief Channel top back right
+    GAME_CH_TBR,
+
+    /// @brief Channel top back center
+    GAME_CH_TBC,
+
+    /// @brief Channel bacl left over center
+    GAME_CH_BLOC,
+
+    /// @brief Channel back right over center
+    GAME_CH_BROC,
+  } GAME_AUDIO_CHANNEL;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Game audio stream properties**
+  ///
+  /// Used by Kodi to pass the currently required audio stream settings to the addon
+  ///
+  typedef struct game_stream_audio_properties
+  {
+    GAME_PCM_FORMAT format;
+    const GAME_AUDIO_CHANNEL* channel_map;
+  } ATTRIBUTE_PACKED game_stream_audio_properties;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Audio stream packet**
+  ///
+  /// This packet contains audio stream data passed to Kodi.
+  ///
+  typedef struct game_stream_audio_packet
+  {
+    /// @brief Pointer for audio stream data given to Kodi
+    const uint8_t* data;
+
+    /// @brief Size of data array
+    size_t size;
+  } ATTRIBUTE_PACKED game_stream_audio_packet;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_VideoStream 2. Video stream
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **The for Video stream used data system**
+  ///
+  /// Used to give Addon currently used video stream configuration on Kodi and
+  /// arrays to give related data to Kodi on callbacks.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Pixel format**
+  ///
+  /// From Kodi requested specified video RGB color model format.
+  ///
+  typedef enum GAME_PIXEL_FORMAT
+  {
+    GAME_PIXEL_FORMAT_UNKNOWN,
+
+    /// @brief 0RGB8888 Format
+    GAME_PIXEL_FORMAT_0RGB8888,
+
+    /// @brief RGB565 Format
+    GAME_PIXEL_FORMAT_RGB565,
+
+    /// @brief 0RGB1555 Format
+    GAME_PIXEL_FORMAT_0RGB1555,
+  } GAME_PIXEL_FORMAT;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Video rotation position**
+  ///
+  /// To define position how video becomes shown.
+  ///
+  typedef enum GAME_VIDEO_ROTATION
+  {
+    /// @brief 0° and Without rotation
+    GAME_VIDEO_ROTATION_0,
+
+    /// @brief rotate 90° counterclockwise
+    GAME_VIDEO_ROTATION_90_CCW,
+
+    /// @brief rotate 180° counterclockwise
+    GAME_VIDEO_ROTATION_180_CCW,
+
+    /// @brief rotate 270° counterclockwise
+    GAME_VIDEO_ROTATION_270_CCW,
+  } GAME_VIDEO_ROTATION;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Game video stream properties**
+  ///
+  /// Used by Kodi to pass the currently required video stream settings to the addon
+  ///
+  typedef struct game_stream_video_properties
+  {
+    /// @brief The to used pixel format
+    GAME_PIXEL_FORMAT format;
+
+    /// @brief The nominal used width
+    unsigned int nominal_width;
+
+    /// @brief The nominal used height
+    unsigned int nominal_height;
+
+    /// @brief The maximal used width
+    unsigned int max_width;
+
+    /// @brief The maximal used height
+    unsigned int max_height;
+
+    /// @brief On video stream used aspect ration
+    ///
+    /// @note If aspect_ratio is <= 0.0, an aspect ratio of nominal_width / nominal_height is assumed
+    float aspect_ratio;
+  } ATTRIBUTE_PACKED game_stream_video_properties;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Video stream packet**
+  ///
+  /// This packet contains video stream data passed to Kodi.
+  ///
+  typedef struct game_stream_video_packet
+  {
+    /// @brief Video height
+    unsigned int width;
+
+    /// @brief Video width
+    unsigned int height;
+
+    /// @brief Width @ref GAME_VIDEO_ROTATION defined rotation angle.
+    GAME_VIDEO_ROTATION rotation;
+
+    /// @brief Pointer for video stream data given to Kodi
+    const uint8_t* data;
+
+    /// @brief Size of data array
+    size_t size;
+  } ATTRIBUTE_PACKED game_stream_video_packet;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_HardwareFramebuffer 3. Hardware framebuffer stream
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Hardware framebuffer stream data**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Hardware framebuffer type**
+  ///
+  typedef enum GAME_HW_CONTEXT_TYPE
+  {
+    /// @brief None context
+    GAME_HW_CONTEXT_NONE,
+
+    /// @brief OpenGL 2.x. Driver can choose to use latest compatibility context
+    GAME_HW_CONTEXT_OPENGL,
+
+    /// @brief OpenGL ES 2.0
+    GAME_HW_CONTEXT_OPENGLES2,
+
+    /// @brief Modern desktop core GL context. Use major/minor fields to set GL version
+    GAME_HW_CONTEXT_OPENGL_CORE,
+
+    /// @brief OpenGL ES 3.0
+    GAME_HW_CONTEXT_OPENGLES3,
+
+    /// @brief OpenGL ES 3.1+. Set major/minor fields.
+    GAME_HW_CONTEXT_OPENGLES_VERSION,
+
+    /// @brief Vulkan
+    GAME_HW_CONTEXT_VULKAN
+  } GAME_HW_CONTEXT_TYPE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Hardware framebuffer properties**
+  ///
+  typedef struct game_stream_hw_framebuffer_properties
+  {
+    /// @brief The API to use.
+    ///
+    GAME_HW_CONTEXT_TYPE context_type;
+
+    /// @brief Set if render buffers should have depth component attached.
+    ///
+    /// @todo: Obsolete
+    ///
+    bool depth;
+
+    /// @brief Set if stencil buffers should be attached.
+    ///
+    /// If depth and stencil are true, a packed 24/8 buffer will be added.
+    /// Only attaching stencil is invalid and will be ignored.
+    ///
+    /// @todo: Obsolete.
+    ///
+    bool stencil;
+
+    /// @brief Use conventional bottom-left origin convention.
+    ///
+    /// If false, standard top-left origin semantics are used.
+    ///
+    /// @todo: Move to GL specific interface
+    ///
+    bool bottom_left_origin;
+
+    /// @brief Major version number for core GL context or GLES 3.1+.
+    unsigned int version_major;
+
+    /// @brief Minor version number for core GL context or GLES 3.1+.
+    unsigned int version_minor;
+
+    /// @brief If this is true, the frontend will go very far to avoid resetting context
+    /// in scenarios like toggling fullscreen, etc.
+    ///
+    /// @todo: Obsolete? Maybe frontend should just always assume this...
+    ///
+    /// The reset callback might still be called in extreme situations such as if
+    /// the context is lost beyond recovery.
+    ///
+    /// For optimal stability, set this to false, and allow context to be reset at
+    /// any time.
+    ///
+    bool cache_context;
+
+    /// @brief Creates a debug context.
+    bool debug_context;
+  } ATTRIBUTE_PACKED game_stream_hw_framebuffer_properties;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Hardware framebuffer buffer**
+  ///
+  typedef struct game_stream_hw_framebuffer_buffer
+  {
+    /// @brief
+    uintptr_t framebuffer;
+  } ATTRIBUTE_PACKED game_stream_hw_framebuffer_buffer;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Hardware framebuffer packet**
+  ///
+  typedef struct game_stream_hw_framebuffer_packet
+  {
+    /// @brief
+    uintptr_t framebuffer;
+  } ATTRIBUTE_PACKED game_stream_hw_framebuffer_packet;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Hardware framebuffer process function address**
+  ///
+  typedef void (*game_proc_address_t)(void);
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_SoftwareFramebuffer 4. Software framebuffer stream
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Software framebuffer stream data**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Game video stream properties**
+  ///
+  /// Used by Kodi to pass the currently required video stream settings to the addon
+  ///
+  typedef game_stream_video_properties game_stream_sw_framebuffer_properties;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Hardware framebuffer type**
+  ///
+  typedef struct game_stream_sw_framebuffer_buffer
+  {
+    GAME_PIXEL_FORMAT format;
+    uint8_t* data;
+    size_t size;
+  } ATTRIBUTE_PACKED game_stream_sw_framebuffer_buffer;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Video stream packet**
+  ///
+  /// This packet contains video stream data passed to Kodi.
+  ///
+  typedef game_stream_video_packet game_stream_sw_framebuffer_packet;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_StreamTypes 5. Stream types
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Stream types data**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Game stream types**
+  ///
+  typedef enum GAME_STREAM_TYPE
+  {
+    /// @brief Unknown
+    GAME_STREAM_UNKNOWN,
+
+    /// @brief Audio stream
+    GAME_STREAM_AUDIO,
+
+    /// @brief Video stream
+    GAME_STREAM_VIDEO,
+
+    /// @brief Hardware framebuffer
+    GAME_STREAM_HW_FRAMEBUFFER,
+
+    /// @brief Software framebuffer
+    GAME_STREAM_SW_FRAMEBUFFER,
+  } GAME_STREAM_TYPE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Immutable stream metadata**
+  ///
+  /// This metadata is provided when the stream is opened. If any stream
+  /// properties change, a new stream must be opened.
+  ///
+  typedef struct game_stream_properties
+  {
+    /// @brief
+    GAME_STREAM_TYPE type;
+    union
+    {
+      /// @brief
+      game_stream_audio_properties audio;
+
+      /// @brief
+      game_stream_video_properties video;
+
+      /// @brief
+      game_stream_hw_framebuffer_properties hw_framebuffer;
+
+      /// @brief
+      game_stream_sw_framebuffer_properties sw_framebuffer;
+    };
+  } ATTRIBUTE_PACKED game_stream_properties;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Stream buffers for hardware rendering and zero-copy support**
+  ///
+  typedef struct game_stream_buffer
+  {
+    /// @brief
+    GAME_STREAM_TYPE type;
+    union
+    {
+      /// @brief
+      game_stream_hw_framebuffer_buffer hw_framebuffer;
+
+      /// @brief
+      game_stream_sw_framebuffer_buffer sw_framebuffer;
+    };
+  } ATTRIBUTE_PACKED game_stream_buffer;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Stream packet and ephemeral metadata**
+  ///
+  /// This packet contains stream data and accompanying metadata. The metadata
+  /// is ephemeral, meaning it only applies to the current packet and can change
+  /// from packet to packet in the same stream.
+  ///
+  typedef struct game_stream_packet
+  {
+    /// @brief
+    GAME_STREAM_TYPE type;
+    union
+    {
+      /// @brief
+      game_stream_audio_packet audio;
+
+      /// @brief
+      game_stream_video_packet video;
+
+      /// @brief
+      game_stream_hw_framebuffer_packet hw_framebuffer;
+
+      /// @brief
+      game_stream_sw_framebuffer_packet sw_framebuffer;
+    };
+  } ATTRIBUTE_PACKED game_stream_packet;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_GameTypes 6. Game types
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Game types data**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief **Game reguin definition**
+  ///
+  /// Returned from game_get_region()
+  typedef enum GAME_REGION
+  {
+    /// @brief Game region unknown
+    GAME_REGION_UNKNOWN,
+
+    /// @brief Game region NTSC
+    GAME_REGION_NTSC,
+
+    /// @brief Game region PAL
+    GAME_REGION_PAL,
+  } GAME_REGION;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Special game types passed into game_load_game_special().**
+  ///
+  /// @remark Only used when multiple ROMs are required.
+  ///
+  typedef enum SPECIAL_GAME_TYPE
+  {
+    /// @brief Game Type BSX
+    SPECIAL_GAME_TYPE_BSX,
+
+    /// @brief Game Type BSX slotted
+    SPECIAL_GAME_TYPE_BSX_SLOTTED,
+
+    /// @brief Game Type sufami turbo
+    SPECIAL_GAME_TYPE_SUFAMI_TURBO,
+
+    /// @brief Game Type super game boy
+    SPECIAL_GAME_TYPE_SUPER_GAME_BOY,
+  } SPECIAL_GAME_TYPE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Game Memory**
+  ///
+  typedef enum GAME_MEMORY
+  {
+    /// @brief Passed to game_get_memory_data/size(). If the memory type doesn't apply
+    /// to the implementation NULL/0 can be returned.
+    GAME_MEMORY_MASK = 0xff,
+
+    /// @brief Regular save ram.
+    ///
+    /// This ram is usually found on a game cartridge, backed
+    /// up by a battery. If save game data is too complex for a single memory
+    /// buffer, the SYSTEM_DIRECTORY environment callback can be used.
+    GAME_MEMORY_SAVE_RAM = 0,
+
+    /// @brief Some games have a built-in clock to keep track of time.
+    ///
+    /// This memory is usually just a couple of bytes to keep track of time.
+    GAME_MEMORY_RTC = 1,
+
+    /// @brief System ram lets a frontend peek into a game systems main RAM
+    GAME_MEMORY_SYSTEM_RAM = 2,
+
+    /// @brief Video ram lets a frontend peek into a game systems video RAM (VRAM)
+    GAME_MEMORY_VIDEO_RAM = 3,
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_BSX_RAM = ((1 << 8) | GAME_MEMORY_SAVE_RAM),
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_BSX_PRAM = ((2 << 8) | GAME_MEMORY_SAVE_RAM),
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_SUFAMI_TURBO_A_RAM = ((3 << 8) | GAME_MEMORY_SAVE_RAM),
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_SUFAMI_TURBO_B_RAM = ((4 << 8) | GAME_MEMORY_SAVE_RAM),
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_GAME_BOY_RAM = ((5 << 8) | GAME_MEMORY_SAVE_RAM),
+
+    /// @brief Special memory type
+    GAME_MEMORY_SNES_GAME_BOY_RTC = ((6 << 8) | GAME_MEMORY_RTC),
+  } GAME_MEMORY;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **ID values for SIMD CPU features**
+  typedef enum GAME_SIMD
+  {
+    /// @brief SIMD CPU SSE
+    GAME_SIMD_SSE = (1 << 0),
+
+    /// @brief SIMD CPU SSE2
+    GAME_SIMD_SSE2 = (1 << 1),
+
+    /// @brief SIMD CPU VMX
+    GAME_SIMD_VMX = (1 << 2),
+
+    /// @brief SIMD CPU VMX128
+    GAME_SIMD_VMX128 = (1 << 3),
+
+    /// @brief SIMD CPU AVX
+    GAME_SIMD_AVX = (1 << 4),
+
+    /// @brief SIMD CPU NEON
+    GAME_SIMD_NEON = (1 << 5),
+
+    /// @brief SIMD CPU SSE3
+    GAME_SIMD_SSE3 = (1 << 6),
+
+    /// @brief SIMD CPU SSSE3
+    GAME_SIMD_SSSE3 = (1 << 7),
+
+    /// @brief SIMD CPU MMX
+    GAME_SIMD_MMX = (1 << 8),
+
+    /// @brief SIMD CPU MMXEXT
+    GAME_SIMD_MMXEXT = (1 << 9),
+
+    /// @brief SIMD CPU SSE4
+    GAME_SIMD_SSE4 = (1 << 10),
+
+    /// @brief SIMD CPU SSE42
+    GAME_SIMD_SSE42 = (1 << 11),
+
+    /// @brief SIMD CPU AVX2
+    GAME_SIMD_AVX2 = (1 << 12),
+
+    /// @brief SIMD CPU VFPU
+    GAME_SIMD_VFPU = (1 << 13),
+  } GAME_SIMD;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_InputTypes 7. Input types
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Input types**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief
+  typedef enum GAME_INPUT_EVENT_SOURCE
+  {
+    /// @brief
+    GAME_INPUT_EVENT_DIGITAL_BUTTON,
+
+    /// @brief
+    GAME_INPUT_EVENT_ANALOG_BUTTON,
+
+    /// @brief
+    GAME_INPUT_EVENT_AXIS,
+
+    /// @brief
+    GAME_INPUT_EVENT_ANALOG_STICK,
+
+    /// @brief
+    GAME_INPUT_EVENT_ACCELEROMETER,
+
+    /// @brief
+    GAME_INPUT_EVENT_KEY,
+
+    /// @brief
+    GAME_INPUT_EVENT_RELATIVE_POINTER,
+
+    /// @brief
+    GAME_INPUT_EVENT_ABSOLUTE_POINTER,
+
+    /// @brief
+    GAME_INPUT_EVENT_MOTOR,
+  } GAME_INPUT_EVENT_SOURCE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef enum GAME_KEY_MOD
+  {
+    /// @brief
+    GAME_KEY_MOD_NONE = 0x0000,
+
+    /// @brief
+    GAME_KEY_MOD_SHIFT = 0x0001,
+
+    /// @brief
+    GAME_KEY_MOD_CTRL = 0x0002,
+
+    /// @brief
+    GAME_KEY_MOD_ALT = 0x0004,
+
+    /// @brief
+    GAME_KEY_MOD_META = 0x0008,
+
+    /// @brief
+    GAME_KEY_MOD_SUPER = 0x0010,
+
+    /// @brief
+    GAME_KEY_MOD_NUMLOCK = 0x0100,
+
+    /// @brief
+    GAME_KEY_MOD_CAPSLOCK = 0x0200,
+
+    /// @brief
+    GAME_KEY_MOD_SCROLLOCK = 0x0400,
+  } GAME_KEY_MOD;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Type of port on the virtual game console
+  typedef enum GAME_PORT_TYPE
+  {
+    /// @brief Game port unknown
+    GAME_PORT_UNKNOWN,
+
+    /// @brief Game port Keyboard
+    GAME_PORT_KEYBOARD,
+
+    /// @brief Game port mouse
+    GAME_PORT_MOUSE,
+
+    /// @brief Game port controller
+    GAME_PORT_CONTROLLER,
+  } GAME_PORT_TYPE;
+  //----------------------------------------------------------------------------
+
+  /*! @cond PRIVATE */
+  /*!
+    * @brief "C" Game add-on controller layout.
+    *
+    * Structure used to interface in "C" between Kodi and Addon.
+    *
+    * See @ref AddonGameControllerLayout for description of values.
+    */
+  typedef struct game_controller_layout
+  {
+    char* controller_id;
+    bool provides_input; // False for multitaps
+    char** digital_buttons;
+    unsigned int digital_button_count;
+    char** analog_buttons;
+    unsigned int analog_button_count;
+    char** analog_sticks;
+    unsigned int analog_stick_count;
+    char** accelerometers;
+    unsigned int accelerometer_count;
+    char** keys;
+    unsigned int key_count;
+    char** rel_pointers;
+    unsigned int rel_pointer_count;
+    char** abs_pointers;
+    unsigned int abs_pointer_count;
+    char** motors;
+    unsigned int motor_count;
+  } ATTRIBUTE_PACKED game_controller_layout;
+  /*! @endcond */
+
+  struct game_input_port;
+
+  //============================================================================
+  /// @brief Device that can provide input
+  typedef struct game_input_device
+  {
+    /// @brief ID used in the Kodi controller API
+    const char* controller_id;
+
+    /// @brief
+    const char* port_address;
+
+    /// @brief
+    struct game_input_port* available_ports;
+
+    /// @brief
+    unsigned int port_count;
+  } ATTRIBUTE_PACKED game_input_device;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Port that can provide input
+  ///
+  /// Ports can accept multiple devices and devices can have multiple ports, so
+  /// the topology of possible configurations is a tree structure of alternating
+  /// port and device nodes.
+  ///
+  typedef struct game_input_port
+  {
+    /// @brief
+    GAME_PORT_TYPE type;
+
+    /// @brief Required for GAME_PORT_CONTROLLER type
+    const char* port_id;
+
+    /// @brief
+    game_input_device* accepted_devices;
+
+    /// @brief
+    unsigned int device_count;
+  } ATTRIBUTE_PACKED game_input_port;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief The input topology is the possible ways to connect input devices
+  ///
+  /// This represents the logical topology, which is the possible connections that
+  /// the game client's logic can handle. It is strictly a subset of the physical
+  /// topology. Loops are not allowed.
+  ///
+  typedef struct game_input_topology
+  {
+    /// @brief The list of ports on the virtual game console
+    game_input_port* ports;
+
+    /// @brief The number of ports
+    unsigned int port_count;
+
+    /// @brief A limit on the number of input-providing devices, or -1 for no limit
+    int player_limit;
+  } ATTRIBUTE_PACKED game_input_topology;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_digital_button_event
+  {
+    /// @brief
+    bool pressed;
+  } ATTRIBUTE_PACKED game_digital_button_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_analog_button_event
+  {
+    /// @brief
+    float magnitude;
+  } ATTRIBUTE_PACKED game_analog_button_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_axis_event
+  {
+    /// @brief
+    float position;
+  } ATTRIBUTE_PACKED game_axis_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_analog_stick_event
+  {
+    /// @brief
+    float x;
+
+    /// @brief
+    float y;
+  } ATTRIBUTE_PACKED game_analog_stick_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_accelerometer_event
+  {
+    /// @brief
+    float x;
+
+    /// @brief
+    float y;
+
+    /// @brief
+    float z;
+  } ATTRIBUTE_PACKED game_accelerometer_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_key_event
+  {
+    /// @brief
+    bool pressed;
+
+    /// @brief If the keypress generates a printing character
+    ///
+    /// The unicode value contains the character generated. If the key is a
+    /// non-printing character, e.g. a function or arrow key, the unicode value
+    /// is zero.
+    uint32_t unicode;
+
+    /// @brief
+    GAME_KEY_MOD modifiers;
+  } ATTRIBUTE_PACKED game_key_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_rel_pointer_event
+  {
+    /// @brief
+    int x;
+
+    /// @brief
+    int y;
+  } ATTRIBUTE_PACKED game_rel_pointer_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_abs_pointer_event
+  {
+    /// @brief
+    bool pressed;
+
+    /// @brief
+    float x;
+
+    /// @brief
+    float y;
+  } ATTRIBUTE_PACKED game_abs_pointer_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_motor_event
+  {
+    /// @brief
+    float magnitude;
+  } ATTRIBUTE_PACKED game_motor_event;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief
+  typedef struct game_input_event
+  {
+    /// @brief
+    GAME_INPUT_EVENT_SOURCE type;
+
+    /// @brief
+    const char* controller_id;
+
+    /// @brief
+    GAME_PORT_TYPE port_type;
+
+    /// @brief
+    const char* port_address;
+
+    /// @brief
+    const char* feature_name;
+    union
+    {
+      /// @brief
+      struct game_digital_button_event digital_button;
+
+      /// @brief
+      struct game_analog_button_event analog_button;
+
+      /// @brief
+      struct game_axis_event axis;
+
+      /// @brief
+      struct game_analog_stick_event analog_stick;
+
+      /// @brief
+      struct game_accelerometer_event accelerometer;
+
+      /// @brief
+      struct game_key_event key;
+
+      /// @brief
+      struct game_rel_pointer_event rel_pointer;
+
+      /// @brief
+      struct game_abs_pointer_event abs_pointer;
+
+      /// @brief
+      struct game_motor_event motor;
+    };
+  } ATTRIBUTE_PACKED game_input_event;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+  /// @defgroup cpp_kodi_addon_game_Defs_EnvironmentTypes 8. Environment types
+  /// @ingroup cpp_kodi_addon_game_Defs
+  /// @brief **Environment types**
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Game system timing
+  ///
+  struct game_system_timing
+  {
+    /// @brief FPS of video content.
+    double fps;
+
+    /// @brief Sampling rate of audio.
+    double sample_rate;
+  };
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  /*!
+   * @brief Game properties
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonProps_Game
+  {
+    /*!
+     * The path of the game client being loaded.
+     */
+    const char* game_client_dll_path;
+
+    /*!
+     * Paths to proxy DLLs used to load the game client.
+     */
+    const char** proxy_dll_paths;
+
+    /*!
+     * Number of proxy DLL paths provided.
+     */
+    unsigned int proxy_dll_count;
+
+    /*!
+     * The "system" directories of the frontend. These directories can be used to
+     * store system-specific ROMs such as BIOSes, configuration data, etc.
+     */
+    const char** resource_directories;
+
+    /*!
+     * Number of resource directories provided
+     */
+    unsigned int resource_directory_count;
+
+    /*!
+     * The writable directory of the frontend. This directory can be used to store
+     * SRAM, memory cards, high scores, etc, if the game client cannot use the
+     * regular memory interface, GetMemoryData().
+     */
+    const char* profile_directory;
+
+    /*!
+     * The value of the <supports_vfs> property from addon.xml
+     */
+    bool supports_vfs;
+
+    /*!
+     * The extensions in the <extensions> property from addon.xml
+     */
+    const char** extensions;
+
+    /*!
+     * Number of extensions provided
+     */
+    unsigned int extension_count;
+  } AddonProps_Game;
+
+  typedef void* KODI_GAME_STREAM_HANDLE;
+
+  /*! Structure to transfer the methods from kodi_game_dll.h to Kodi */
+
+  struct AddonInstance_Game;
+
+  /*!
+   * @brief Game callbacks
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonToKodiFuncTable_Game
+  {
+    KODI_HANDLE kodiInstance;
+
+    void (*CloseGame)(KODI_HANDLE kodiInstance);
+    KODI_GAME_STREAM_HANDLE (*OpenStream)(KODI_HANDLE, const struct game_stream_properties*);
+    bool (*GetStreamBuffer)(KODI_HANDLE,
+                            KODI_GAME_STREAM_HANDLE,
+                            unsigned int,
+                            unsigned int,
+                            struct game_stream_buffer*);
+    void (*AddStreamData)(KODI_HANDLE, KODI_GAME_STREAM_HANDLE, const struct game_stream_packet*);
+    void (*ReleaseStreamBuffer)(KODI_HANDLE, KODI_GAME_STREAM_HANDLE, struct game_stream_buffer*);
+    void (*CloseStream)(KODI_HANDLE, KODI_GAME_STREAM_HANDLE);
+    game_proc_address_t (*HwGetProcAddress)(KODI_HANDLE kodiInstance, const char* symbol);
+    bool (*InputEvent)(KODI_HANDLE kodiInstance, const struct game_input_event* event);
+  } AddonToKodiFuncTable_Game;
+
+  /*!
+   * @brief Game function hooks
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct KodiToAddonFuncTable_Game
+  {
+    KODI_HANDLE addonInstance;
+
+    GAME_ERROR(__cdecl* LoadGame)(const struct AddonInstance_Game*, const char*);
+    GAME_ERROR(__cdecl* LoadGameSpecial)
+    (const struct AddonInstance_Game*, enum SPECIAL_GAME_TYPE, const char**, size_t);
+    GAME_ERROR(__cdecl* LoadStandalone)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* UnloadGame)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* GetGameTiming)
+    (const struct AddonInstance_Game*, struct game_system_timing*);
+    GAME_REGION(__cdecl* GetRegion)(const struct AddonInstance_Game*);
+    bool(__cdecl* RequiresGameLoop)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* RunFrame)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* Reset)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* HwContextReset)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* HwContextDestroy)(const struct AddonInstance_Game*);
+    bool(__cdecl* HasFeature)(const struct AddonInstance_Game*, const char*, const char*);
+    game_input_topology*(__cdecl* GetTopology)(const struct AddonInstance_Game*);
+    void(__cdecl* FreeTopology)(const struct AddonInstance_Game*, struct game_input_topology*);
+    void(__cdecl* SetControllerLayouts)(const struct AddonInstance_Game*,
+                                        const struct game_controller_layout*,
+                                        unsigned int);
+    bool(__cdecl* EnableKeyboard)(const struct AddonInstance_Game*, bool, const char*);
+    bool(__cdecl* EnableMouse)(const struct AddonInstance_Game*, bool, const char*);
+    bool(__cdecl* ConnectController)(const struct AddonInstance_Game*,
+                                     bool,
+                                     const char*,
+                                     const char*);
+    bool(__cdecl* InputEvent)(const struct AddonInstance_Game*, const struct game_input_event*);
+    size_t(__cdecl* SerializeSize)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* Serialize)(const struct AddonInstance_Game*, uint8_t*, size_t);
+    GAME_ERROR(__cdecl* Deserialize)(const struct AddonInstance_Game*, const uint8_t*, size_t);
+    GAME_ERROR(__cdecl* CheatReset)(const struct AddonInstance_Game*);
+    GAME_ERROR(__cdecl* GetMemory)
+    (const struct AddonInstance_Game*, enum GAME_MEMORY, uint8_t**, size_t*);
+    GAME_ERROR(__cdecl* SetCheat)
+    (const struct AddonInstance_Game*, unsigned int, bool, const char*);
+  } KodiToAddonFuncTable_Game;
+
+  /*!
+   * @brief Game instance
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonInstance_Game
+  {
+    struct AddonProps_Game* props;
+    struct AddonToKodiFuncTable_Game* toKodi;
+    struct KodiToAddonFuncTable_Game* toAddon;
+  } AddonInstance_Game;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_GAME_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
index 595a5dc..6455b38 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_IMAGE_DECODER_H
+#define C_API_ADDONINSTANCE_IMAGE_DECODER_H
+
 #include "../addon_base.h"
 
 #ifdef __cplusplus
@@ -76,3 +79,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_IMAGE_DECODER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h
new file mode 100644
index 0000000..393f34a
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h
@@ -0,0 +1,709 @@
+/*
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_ADDONINSTANCE_PERIPHERAL_H
+#define C_API_ADDONINSTANCE_PERIPHERAL_H
+
+#include "../addon_base.h"
+
+/* indicates a joystick has no preference for port number */
+#define NO_PORT_REQUESTED (-1)
+
+/* joystick's driver button/hat/axis index is unknown */
+#define DRIVER_INDEX_UNKNOWN (-1)
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_General_PERIPHERAL_ERROR enum PERIPHERAL_ERROR
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_General
+  /// @brief **Peripheral add-on error codes**\n
+  /// Used as return values on most peripheral related functions.
+  ///
+  /// In this way, a peripheral instance signals errors in its processing and,
+  /// under certain conditions, allows Kodi to make corrections.
+  ///
+  ///@{
+  typedef enum PERIPHERAL_ERROR
+  {
+    /// @brief __0__ : No error occurred
+    PERIPHERAL_NO_ERROR = 0,
+
+    /// @brief __-1__ : An unknown error occurred
+    PERIPHERAL_ERROR_UNKNOWN = -1,
+
+    /// @brief __-2__ : The command failed
+    PERIPHERAL_ERROR_FAILED = -2,
+
+    /// @brief __-3__ : The parameters of the method are invalid for this operation
+    PERIPHERAL_ERROR_INVALID_PARAMETERS = -3,
+
+    /// @brief __-4__ : The method that the frontend called is not implemented
+    PERIPHERAL_ERROR_NOT_IMPLEMENTED = -4,
+
+    /// @brief __-5__ : No peripherals are connected
+    PERIPHERAL_ERROR_NOT_CONNECTED = -5,
+
+    /// @brief __-6__ : Peripherals are connected, but command was interrupted
+    PERIPHERAL_ERROR_CONNECTION_FAILED = -6,
+  } PERIPHERAL_ERROR;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  // @name Peripheral types
+  //{
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Peripheral_PERIPHERAL_TYPE enum PERIPHERAL_TYPE
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Peripheral
+  /// @brief **Peripheral types**\n
+  /// Types used to identify wanted peripheral.
+  ///@{
+  typedef enum PERIPHERAL_TYPE
+  {
+    /// @brief Type declared as unknown.
+    PERIPHERAL_TYPE_UNKNOWN,
+
+    /// @brief Type declared as joystick.
+    PERIPHERAL_TYPE_JOYSTICK,
+
+    /// @brief Type declared as keyboard.
+    PERIPHERAL_TYPE_KEYBOARD,
+  } PERIPHERAL_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Information shared between peripherals
+   */
+  typedef struct PERIPHERAL_INFO
+  {
+    PERIPHERAL_TYPE type; /*!< type of peripheral */
+    char* name; /*!< name of peripheral */
+    uint16_t vendor_id; /*!< vendor ID of peripheral, 0x0000 if unknown */
+    uint16_t product_id; /*!< product ID of peripheral, 0x0000 if unknown */
+    unsigned int index; /*!< the order in which the add-on identified this peripheral */
+  } ATTRIBUTE_PACKED PERIPHERAL_INFO;
+
+  /*!
+   * @brief Peripheral add-on capabilities.
+   */
+  typedef struct PERIPHERAL_CAPABILITIES
+  {
+    bool provides_joysticks; /*!< true if the add-on provides joysticks */
+    bool provides_joystick_rumble;
+    bool provides_joystick_power_off;
+    bool provides_buttonmaps; /*!< true if the add-on provides button maps */
+  } ATTRIBUTE_PACKED PERIPHERAL_CAPABILITIES;
+
+  //}
+
+  // @name Event types
+  //{
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Event_PERIPHERAL_EVENT_TYPE enum PERIPHERAL_EVENT_TYPE
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Event
+  /// @brief **Event types**\n
+  /// Types of events that can be sent and received.
+  ///@{
+  typedef enum PERIPHERAL_EVENT_TYPE
+  {
+    /// @brief unknown event
+    PERIPHERAL_EVENT_TYPE_NONE,
+
+    /// @brief state changed for joystick driver button
+    PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON,
+
+    /// @brief state changed for joystick driver hat
+    PERIPHERAL_EVENT_TYPE_DRIVER_HAT,
+
+    /// @brief state changed for joystick driver axis
+    PERIPHERAL_EVENT_TYPE_DRIVER_AXIS,
+
+    /// @brief set the state for joystick rumble motor
+    PERIPHERAL_EVENT_TYPE_SET_MOTOR,
+  } PERIPHERAL_EVENT_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Event_JOYSTICK_STATE_BUTTON enum JOYSTICK_STATE_BUTTON
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Event
+  /// @brief **State button**\n
+  /// States a button can have
+  ///@{
+  typedef enum JOYSTICK_STATE_BUTTON
+  {
+    /// @brief button is released
+    JOYSTICK_STATE_BUTTON_UNPRESSED = 0x0,
+
+    /// @brief button is pressed
+    JOYSTICK_STATE_BUTTON_PRESSED = 0x1,
+  } JOYSTICK_STATE_BUTTON;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Event_JOYSTICK_STATE_HAT enum JOYSTICK_STATE_HAT
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Event
+  /// @brief **State hat**\n
+  /// States a D-pad (also called a hat) can have
+  ///@{
+  typedef enum JOYSTICK_STATE_HAT
+  {
+    /// @brief no directions are pressed
+    JOYSTICK_STATE_HAT_UNPRESSED = 0x0,
+
+     /// @brief only left is pressed
+    JOYSTICK_STATE_HAT_LEFT = 0x1,
+
+     /// @brief only right is pressed
+    JOYSTICK_STATE_HAT_RIGHT = 0x2,
+
+    /// @brief only up is pressed
+    JOYSTICK_STATE_HAT_UP = 0x4,
+
+    /// @brief only down is pressed
+    JOYSTICK_STATE_HAT_DOWN = 0x8,
+
+    /// @brief left and up is pressed
+    JOYSTICK_STATE_HAT_LEFT_UP = JOYSTICK_STATE_HAT_LEFT | JOYSTICK_STATE_HAT_UP,
+
+    /// @brief left and down is pressed
+    JOYSTICK_STATE_HAT_LEFT_DOWN = JOYSTICK_STATE_HAT_LEFT | JOYSTICK_STATE_HAT_DOWN,
+
+    /// @brief right and up is pressed
+    JOYSTICK_STATE_HAT_RIGHT_UP = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_UP,
+
+    /// @brief right and down is pressed
+    JOYSTICK_STATE_HAT_RIGHT_DOWN = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_DOWN,
+  } JOYSTICK_STATE_HAT;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Event
+  /// @brief Axis value in the closed interval [-1.0, 1.0]
+  ///
+  /// The axis state uses the XInput coordinate system:
+  ///  - Negative values signify down or to the left
+  ///  - Positive values signify up or to the right
+  ///
+  typedef float JOYSTICK_STATE_AXIS;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Event
+  /// @brief Motor value in the closed interval [0.0, 1.0]
+  typedef float JOYSTICK_STATE_MOTOR;
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Event information
+   */
+  typedef struct PERIPHERAL_EVENT
+  {
+    /*! @brief Index of the peripheral handling/receiving the event */
+    unsigned int peripheral_index;
+
+    /*! @brief Type of the event used to determine which enum field to access below */
+    PERIPHERAL_EVENT_TYPE type;
+
+    /*! @brief The index of the event source */
+    unsigned int driver_index;
+
+    JOYSTICK_STATE_BUTTON driver_button_state;
+    JOYSTICK_STATE_HAT driver_hat_state;
+    JOYSTICK_STATE_AXIS driver_axis_state;
+    JOYSTICK_STATE_MOTOR motor_state;
+  } ATTRIBUTE_PACKED PERIPHERAL_EVENT;
+
+  //}
+
+  // @name Joystick types
+  //{
+
+  /*!
+   * @brief Info specific to joystick peripherals
+   */
+  typedef struct JOYSTICK_INFO
+  {
+    PERIPHERAL_INFO peripheral; /*!< @brief peripheral info for this joystick */
+    char* provider; /*!< @brief name of the driver or interface providing the joystick */
+    int requested_port; /*!< @brief requested port number (such as for 360 controllers), or NO_PORT_REQUESTED */
+    unsigned int button_count; /*!< @brief number of buttons reported by the driver */
+    unsigned int hat_count; /*!< @brief number of hats reported by the driver */
+    unsigned int axis_count; /*!< @brief number of axes reported by the driver */
+    unsigned int motor_count; /*!< @brief number of motors reported by the driver */
+    bool supports_poweroff; /*!< @brief whether the joystick supports being powered off */
+  } ATTRIBUTE_PACKED JOYSTICK_INFO;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_DRIVER_PRIMITIVE_TYPE enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Driver primitive type**\n
+  /// Driver input primitives
+  ///
+  /// Mapping lower-level driver values to higher-level controller features is
+  /// non-injective; two triggers can share a single axis.
+  ///
+  /// To handle this, driver values are subdivided into "primitives" that map
+  /// injectively to higher-level features.
+  ///
+  ///@{
+  typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
+  {
+    /// @brief Driver input primitive type unknown
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
+
+    /// @brief Driver input primitive type button
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON,
+
+    /// @brief Driver input primitive type hat direction
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
+
+    /// @brief Driver input primitive type semiaxis
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
+
+    /// @brief Driver input primitive type motor
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR,
+
+    /// @brief Driver input primitive type key
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY,
+
+    /// @brief Driver input primitive type mouse button
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON,
+
+    /// @brief Driver input primitive type relative pointer direction
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION,
+  } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Button primitive
+   */
+  typedef struct JOYSTICK_DRIVER_BUTTON
+  {
+    int index;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_DRIVER_HAT_DIRECTION enum JOYSTICK_DRIVER_HAT_DIRECTION
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Driver direction**\n
+  /// Hat direction.
+  ///@{
+  typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
+  {
+    /// @brief Driver hat unknown
+    JOYSTICK_DRIVER_HAT_UNKNOWN,
+
+    /// @brief Driver hat left
+    JOYSTICK_DRIVER_HAT_LEFT,
+
+    /// @brief Driver hat right
+    JOYSTICK_DRIVER_HAT_RIGHT,
+
+    /// @brief Driver hat up
+    JOYSTICK_DRIVER_HAT_UP,
+
+    /// @brief Driver hat down
+    JOYSTICK_DRIVER_HAT_DOWN,
+  } JOYSTICK_DRIVER_HAT_DIRECTION;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Hat direction primitive
+   */
+  typedef struct JOYSTICK_DRIVER_HAT
+  {
+    int index;
+    JOYSTICK_DRIVER_HAT_DIRECTION direction;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_DRIVER_SEMIAXIS_DIRECTION enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Driver direction**\n
+  /// Semiaxis direction.
+  ///@{
+  typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
+  {
+    /// @brief negative half of the axis
+    JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1,
+
+    /// @brief unknown direction
+    JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN = 0,
+
+    /// @brief positive half of the axis
+    JOYSTICK_DRIVER_SEMIAXIS_POSITIVE = 1,
+  } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Semiaxis primitive
+   */
+  typedef struct JOYSTICK_DRIVER_SEMIAXIS
+  {
+    int index;
+    int center;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
+    unsigned int range;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
+
+  /*!
+   * @brief Motor primitive
+   */
+  typedef struct JOYSTICK_DRIVER_MOTOR
+  {
+    int index;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOTOR;
+
+  /*!
+   * @brief Keyboard key primitive
+   */
+  typedef struct JOYSTICK_DRIVER_KEY
+  {
+    char keycode[16];
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_KEY;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_DRIVER_MOUSE_INDEX enum JOYSTICK_DRIVER_MOUSE_INDEX
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Buttons**\n
+  /// Mouse buttons.
+  ///@{
+  typedef enum JOYSTICK_DRIVER_MOUSE_INDEX
+  {
+    /// @brief Mouse index unknown
+    JOYSTICK_DRIVER_MOUSE_INDEX_UNKNOWN,
+
+    /// @brief Mouse index left
+    JOYSTICK_DRIVER_MOUSE_INDEX_LEFT,
+
+    /// @brief Mouse index right
+    JOYSTICK_DRIVER_MOUSE_INDEX_RIGHT,
+
+    /// @brief Mouse index middle
+    JOYSTICK_DRIVER_MOUSE_INDEX_MIDDLE,
+
+    /// @brief Mouse index button 4
+    JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON4,
+
+    /// @brief Mouse index button 5
+    JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON5,
+
+    /// @brief Mouse index wheel up
+    JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_UP,
+
+    /// @brief Mouse index wheel down
+    JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_DOWN,
+
+    /// @brief Mouse index horizontal wheel left
+    JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_LEFT,
+
+    /// @brief Mouse index horizontal wheel right
+    JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_RIGHT,
+  } JOYSTICK_DRIVER_MOUSE_INDEX;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Mouse button primitive
+   */
+  typedef struct JOYSTICK_DRIVER_MOUSE_BUTTON
+  {
+    JOYSTICK_DRIVER_MOUSE_INDEX button;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOUSE_BUTTON;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_DRIVER_RELPOINTER_DIRECTION enum JOYSTICK_DRIVER_RELPOINTER_DIRECTION
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Pointer direction**\n
+  /// Relative pointer direction
+  ///@{
+  typedef enum JOYSTICK_DRIVER_RELPOINTER_DIRECTION
+  {
+    /// @brief Relative pointer direction unknown
+    JOYSTICK_DRIVER_RELPOINTER_UNKNOWN,
+
+    /// @brief Relative pointer direction left
+    JOYSTICK_DRIVER_RELPOINTER_LEFT,
+
+    /// @brief Relative pointer direction right
+    JOYSTICK_DRIVER_RELPOINTER_RIGHT,
+
+    /// @brief Relative pointer direction up
+    JOYSTICK_DRIVER_RELPOINTER_UP,
+
+    /// @brief Relative pointer direction down
+    JOYSTICK_DRIVER_RELPOINTER_DOWN,
+  } JOYSTICK_DRIVER_RELPOINTER_DIRECTION;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Relative pointer direction primitive
+   */
+  typedef struct JOYSTICK_DRIVER_RELPOINTER
+  {
+    JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_RELPOINTER;
+
+  /*!
+   * @brief Driver primitive struct
+   */
+  typedef struct JOYSTICK_DRIVER_PRIMITIVE
+  {
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE type;
+    union
+    {
+      struct JOYSTICK_DRIVER_BUTTON button;
+      struct JOYSTICK_DRIVER_HAT hat;
+      struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
+      struct JOYSTICK_DRIVER_MOTOR motor;
+      struct JOYSTICK_DRIVER_KEY key;
+      struct JOYSTICK_DRIVER_MOUSE_BUTTON mouse;
+      struct JOYSTICK_DRIVER_RELPOINTER relpointer;
+    };
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_FEATURE_TYPE enum JOYSTICK_FEATURE_TYPE
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Feature type**\n
+  /// Controller feature.
+  ///
+  /// Controller features are an abstraction over driver values. Each feature
+  /// maps to one or more driver primitives.
+  ///
+  ///@{
+  typedef enum JOYSTICK_FEATURE_TYPE
+  {
+    /// @brief Unknown type
+    JOYSTICK_FEATURE_TYPE_UNKNOWN,
+
+    /// @brief Type scalar
+    JOYSTICK_FEATURE_TYPE_SCALAR,
+
+    /// @brief Type analog stick
+    JOYSTICK_FEATURE_TYPE_ANALOG_STICK,
+
+    /// @brief Type accelerometer
+    JOYSTICK_FEATURE_TYPE_ACCELEROMETER,
+
+    /// @brief Type motor
+    JOYSTICK_FEATURE_TYPE_MOTOR,
+
+    /// @brief Type relative pointer
+    JOYSTICK_FEATURE_TYPE_RELPOINTER,
+
+    /// @brief Type absolut pointer
+    JOYSTICK_FEATURE_TYPE_ABSPOINTER,
+
+    /// @brief Type wheel
+    JOYSTICK_FEATURE_TYPE_WHEEL,
+
+    /// @brief Type throttle
+    JOYSTICK_FEATURE_TYPE_THROTTLE,
+
+    /// @brief Type key
+    JOYSTICK_FEATURE_TYPE_KEY,
+  } JOYSTICK_FEATURE_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_peripheral_Defs_Joystick_JOYSTICK_FEATURE_PRIMITIVE enum JOYSTICK_FEATURE_PRIMITIVE
+  /// @ingroup cpp_kodi_addon_peripheral_Defs_Joystick
+  /// @brief **Feature primitives**\n
+  /// Indices used to access a feature's driver primitives.
+  ///
+  ///@{
+  typedef enum JOYSTICK_FEATURE_PRIMITIVE
+  {
+    /// @brief Scalar feature (a button, hat direction or semiaxis)
+    JOYSTICK_SCALAR_PRIMITIVE = 0,
+
+    /// @brief Analog stick up
+    JOYSTICK_ANALOG_STICK_UP = 0,
+    /// @brief Analog stick down
+    JOYSTICK_ANALOG_STICK_DOWN = 1,
+    /// @brief Analog stick right
+    JOYSTICK_ANALOG_STICK_RIGHT = 2,
+    /// @brief Analog stick left
+    JOYSTICK_ANALOG_STICK_LEFT = 3,
+
+    /// @brief Accelerometer X
+    JOYSTICK_ACCELEROMETER_POSITIVE_X = 0,
+    /// @brief Accelerometer Y
+    JOYSTICK_ACCELEROMETER_POSITIVE_Y = 1,
+    /// @brief Accelerometer Z
+    JOYSTICK_ACCELEROMETER_POSITIVE_Z = 2,
+
+    /// @brief Motor
+    JOYSTICK_MOTOR_PRIMITIVE = 0,
+
+    /// @brief Wheel left
+    JOYSTICK_WHEEL_LEFT = 0,
+    /// @brief Wheel right
+    JOYSTICK_WHEEL_RIGHT = 1,
+
+    /// @brief Throttle up
+    JOYSTICK_THROTTLE_UP = 0,
+    /// @brief Throttle down
+    JOYSTICK_THROTTLE_DOWN = 1,
+
+    /// @brief Key
+    JOYSTICK_KEY_PRIMITIVE = 0,
+
+    /// @brief Mouse button
+    JOYSTICK_MOUSE_BUTTON = 0,
+
+    /// @brief Relative pointer direction up
+    JOYSTICK_RELPOINTER_UP = 0,
+    /// @brief Relative pointer direction down
+    JOYSTICK_RELPOINTER_DOWN = 1,
+    /// @brief Relative pointer direction right
+    JOYSTICK_RELPOINTER_RIGHT = 2,
+    /// @brief Relative pointer direction left
+    JOYSTICK_RELPOINTER_LEFT = 3,
+
+    /// @brief Maximum number of primitives
+    JOYSTICK_PRIMITIVE_MAX = 4,
+  } JOYSTICK_FEATURE_PRIMITIVE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Mapping between higher-level controller feature and its driver primitives
+   */
+  typedef struct JOYSTICK_FEATURE
+  {
+    char* name;
+    JOYSTICK_FEATURE_TYPE type;
+    struct JOYSTICK_DRIVER_PRIMITIVE primitives[JOYSTICK_PRIMITIVE_MAX];
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE;
+  //}
+
+  typedef struct AddonProps_Peripheral
+  {
+    const char* user_path; /*!< @brief path to the user profile */
+    const char* addon_path; /*!< @brief path to this add-on */
+  } ATTRIBUTE_PACKED AddonProps_Peripheral;
+
+  struct AddonInstance_Peripheral;
+
+  typedef struct AddonToKodiFuncTable_Peripheral
+  {
+    KODI_HANDLE kodiInstance;
+    void (*trigger_scan)(void* kodiInstance);
+    void (*refresh_button_maps)(void* kodiInstance,
+                                const char* device_name,
+                                const char* controller_id);
+    unsigned int (*feature_count)(void* kodiInstance,
+                                  const char* controller_id,
+                                  JOYSTICK_FEATURE_TYPE type);
+    JOYSTICK_FEATURE_TYPE(*feature_type)
+    (void* kodiInstance, const char* controller_id, const char* feature_name);
+  } AddonToKodiFuncTable_Peripheral;
+
+  //! @todo Mouse, light gun, multitouch
+
+  typedef struct KodiToAddonFuncTable_Peripheral
+  {
+    KODI_HANDLE addonInstance;
+
+    void(__cdecl* get_capabilities)(const struct AddonInstance_Peripheral* addonInstance,
+                                    struct PERIPHERAL_CAPABILITIES* capabilities);
+    PERIPHERAL_ERROR(__cdecl* perform_device_scan)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     unsigned int* peripheral_count,
+     struct PERIPHERAL_INFO** scan_results);
+    void(__cdecl* free_scan_results)(const struct AddonInstance_Peripheral* addonInstance,
+                                     unsigned int peripheral_count,
+                                     struct PERIPHERAL_INFO* scan_results);
+    PERIPHERAL_ERROR(__cdecl* get_events)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     unsigned int* event_count,
+     struct PERIPHERAL_EVENT** events);
+    void(__cdecl* free_events)(const struct AddonInstance_Peripheral* addonInstance,
+                               unsigned int event_count,
+                               struct PERIPHERAL_EVENT* events);
+    bool(__cdecl* send_event)(const struct AddonInstance_Peripheral* addonInstance,
+                              const struct PERIPHERAL_EVENT* event);
+
+    /// @name Joystick operations
+    ///{
+    PERIPHERAL_ERROR(__cdecl* get_joystick_info)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     unsigned int index,
+     struct JOYSTICK_INFO* info);
+    void(__cdecl* free_joystick_info)(const struct AddonInstance_Peripheral* addonInstance,
+                                      struct JOYSTICK_INFO* info);
+    PERIPHERAL_ERROR(__cdecl* get_features)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     const struct JOYSTICK_INFO* joystick,
+     const char* controller_id,
+     unsigned int* feature_count,
+     struct JOYSTICK_FEATURE** features);
+    void(__cdecl* free_features)(const struct AddonInstance_Peripheral* addonInstance,
+                                 unsigned int feature_count,
+                                 struct JOYSTICK_FEATURE* features);
+    PERIPHERAL_ERROR(__cdecl* map_features)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     const struct JOYSTICK_INFO* joystick,
+     const char* controller_id,
+     unsigned int feature_count,
+     const struct JOYSTICK_FEATURE* features);
+    PERIPHERAL_ERROR(__cdecl* get_ignored_primitives)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     const struct JOYSTICK_INFO* joystick,
+     unsigned int* feature_count,
+     struct JOYSTICK_DRIVER_PRIMITIVE** primitives);
+    void(__cdecl* free_primitives)(const struct AddonInstance_Peripheral* addonInstance,
+                                   unsigned int,
+                                   struct JOYSTICK_DRIVER_PRIMITIVE* primitives);
+    PERIPHERAL_ERROR(__cdecl* set_ignored_primitives)
+    (const struct AddonInstance_Peripheral* addonInstance,
+     const struct JOYSTICK_INFO* joystick,
+     unsigned int primitive_count,
+     const struct JOYSTICK_DRIVER_PRIMITIVE* primitives);
+    void(__cdecl* save_button_map)(const struct AddonInstance_Peripheral* addonInstance,
+                                   const struct JOYSTICK_INFO* joystick);
+    void(__cdecl* revert_button_map)(const struct AddonInstance_Peripheral* addonInstance,
+                                     const struct JOYSTICK_INFO* joystick);
+    void(__cdecl* reset_button_map)(const struct AddonInstance_Peripheral* addonInstance,
+                                    const struct JOYSTICK_INFO* joystick,
+                                    const char* controller_id);
+    void(__cdecl* power_off_joystick)(const struct AddonInstance_Peripheral* addonInstance,
+                                      unsigned int index);
+    ///}
+  } KodiToAddonFuncTable_Peripheral;
+
+  typedef struct AddonInstance_Peripheral
+  {
+    struct AddonProps_Peripheral* props;
+    struct AddonToKodiFuncTable_Peripheral* toKodi;
+    struct KodiToAddonFuncTable_Peripheral* toAddon;
+  } AddonInstance_Peripheral;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PERIPHERAL_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h
index 2d255ad..a50ea2b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_H
+#define C_API_ADDONINSTANCE_PVR_H
+
 #include "../../AddonBase.h"
 #include "pvr/pvr_channel_groups.h"
 #include "pvr/pvr_channels.h"
@@ -325,3 +328,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt
index 6617084..0e37ea4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt
@@ -10,5 +10,5 @@ set(HEADERS pvr_channel_groups.h
             pvr_timers.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance_pvr)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_addon-instance_pvr)
 endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
index 36f9ed6..a24d27f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H
+#define C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H
+
 #include "pvr_defines.h"
 
 #include <stdbool.h>
@@ -52,3 +55,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
index a2ce591..00daffa 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_CHANNELS_H
+#define C_API_ADDONINSTANCE_PVR_CHANNELS_H
+
 #include "pvr_defines.h"
 
 #include <stdbool.h>
@@ -102,3 +105,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_CHANNELS_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
index af1daae..449000f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_DEFINES_H
+#define C_API_ADDONINSTANCE_PVR_DEFINES_H
+
 //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
 // "C" Standard PVR definitions
 //
@@ -59,3 +62,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_DEFINES_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
index 8378eaf..e7cdf06 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_EDL_H
+#define C_API_ADDONINSTANCE_PVR_EDL_H
+
 #include "pvr_defines.h"
 
 #include <stdint.h>
@@ -60,3 +63,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_EDL_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
index 57c603f..d7512dc 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_EPG_H
+#define C_API_ADDONINSTANCE_PVR_EPG_H
+
 #include "pvr_defines.h"
 
 #include <time.h>
@@ -651,3 +654,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_EPG_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
index 52787b0..e2136f6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_GENERAL_H
+#define C_API_ADDONINSTANCE_PVR_GENERAL_H
+
 #include "pvr_defines.h"
 
 #ifdef BUILD_KODI_ADDON
@@ -16,6 +19,8 @@
 #include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h"
 #endif
 
+#include <stdbool.h>
+
 //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
 // "C" Definitions group 1 - General PVR
 #ifdef __cplusplus
@@ -205,7 +210,7 @@ extern "C"
   /// {
   ///   if (instanceType == ADDON_INSTANCE_INPUTSTREAM)
   ///   {
-  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my special inputstream");
+  ///     kodi::Log(ADDON_LOG_INFO, "Creating my special inputstream");
   ///     if (instanceID == "my_special_id_1")
   ///       addonInstance = new CMyPVRClientInstance_Type1(instance, version);
   ///     else if (instanceID == "my_special_id_2")
@@ -286,3 +291,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_GENERAL_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
index df2216f..2ead263 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_MENUHOOK_H
+#define C_API_ADDONINSTANCE_PVR_MENUHOOK_H
+
 #include "pvr_defines.h"
 
 //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@@ -70,3 +73,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_MENUHOOK_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
index 1a7fc66..2e2c081 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_RECORDINGS_H
+#define C_API_ADDONINSTANCE_PVR_RECORDINGS_H
+
 #include "pvr_defines.h"
 
 #include <stdbool.h>
@@ -141,3 +144,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_RECORDINGS_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
index 04b4059..1206c67 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_STREAM_H
+#define C_API_ADDONINSTANCE_PVR_STREAM_H
+
 #include "pvr_defines.h"
 
 #ifdef BUILD_KODI_ADDON
@@ -153,3 +156,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_STREAM_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
index bc16adb..209726d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_ADDONINSTANCE_PVR_TIMERS_H
+#define C_API_ADDONINSTANCE_PVR_TIMERS_H
+
 #include "pvr_defines.h"
 
 #include <stdbool.h>
@@ -405,3 +408,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_PVR_TIMERS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h
new file mode 100644
index 0000000..32cf6e1
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../addon_base.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  struct AddonInstance_Screensaver;
+
+  /*!
+   * @brief Screensaver properties
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonProps_Screensaver
+  {
+    ADDON_HARDWARE_CONTEXT device;
+    int x;
+    int y;
+    int width;
+    int height;
+    float pixelRatio;
+    const char* name;
+    const char* presets;
+    const char* profile;
+  } AddonProps_Screensaver;
+
+  /*!
+   * @brief Screensaver callbacks
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonToKodiFuncTable_Screensaver
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_Screensaver;
+
+  /*!
+   * @brief Screensaver function hooks
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct KodiToAddonFuncTable_Screensaver
+  {
+    KODI_HANDLE addonInstance;
+    bool(__cdecl* Start)(struct AddonInstance_Screensaver* instance);
+    void(__cdecl* Stop)(struct AddonInstance_Screensaver* instance);
+    void(__cdecl* Render)(struct AddonInstance_Screensaver* instance);
+  } KodiToAddonFuncTable_Screensaver;
+
+  /*!
+   * @brief Screensaver instance
+   *
+   * Not to be used outside this header.
+   */
+  typedef struct AddonInstance_Screensaver
+  {
+    struct AddonProps_Screensaver* props;
+    struct AddonToKodiFuncTable_Screensaver* toKodi;
+    struct KodiToAddonFuncTable_Screensaver* toAddon;
+  } AddonInstance_Screensaver;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h
new file mode 100644
index 0000000..a6c3f44
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h
@@ -0,0 +1,149 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_ADDONINSTANCE_VFS_H
+#define C_API_ADDONINSTANCE_VFS_H
+
+#include "../addon_base.h"
+#include "../filesystem.h"
+
+#define VFS_FILE_HANDLE void*
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  struct VFSURL
+  {
+    const char* url;
+    const char* domain;
+    const char* hostname;
+    const char* filename;
+    unsigned int port;
+    const char* options;
+    const char* username;
+    const char* password;
+    const char* redacted;
+    const char* sharename;
+    const char* protocol;
+  };
+
+  typedef struct VFSGetDirectoryCallbacks /* internal */
+  {
+    bool(__cdecl* get_keyboard_input)(KODI_HANDLE ctx,
+                                      const char* heading,
+                                      char** input,
+                                      bool hidden_input);
+    void(__cdecl* set_error_dialog)(KODI_HANDLE ctx,
+                                    const char* heading,
+                                    const char* line1,
+                                    const char* line2,
+                                    const char* line3);
+    void(__cdecl* require_authentication)(KODI_HANDLE ctx, const char* url);
+    KODI_HANDLE ctx;
+  } VFSGetDirectoryCallbacks;
+
+  typedef struct AddonProps_VFSEntry /* internal */
+  {
+    int dummy;
+  } AddonProps_VFSEntry;
+
+  typedef struct AddonToKodiFuncTable_VFSEntry /* internal */
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_VFSEntry;
+
+  struct AddonInstance_VFSEntry;
+  typedef struct KodiToAddonFuncTable_VFSEntry /* internal */
+  {
+    KODI_HANDLE addonInstance;
+
+    VFS_FILE_HANDLE(__cdecl* open)
+    (const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
+    VFS_FILE_HANDLE(__cdecl* open_for_write)
+    (const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url, bool overwrite);
+    ssize_t(__cdecl* read)(const struct AddonInstance_VFSEntry* instance,
+                           VFS_FILE_HANDLE context,
+                           uint8_t* buffer,
+                           size_t buf_size);
+    ssize_t(__cdecl* write)(const struct AddonInstance_VFSEntry* instance,
+                            VFS_FILE_HANDLE context,
+                            const uint8_t* buffer,
+                            size_t buf_size);
+    int64_t(__cdecl* seek)(const struct AddonInstance_VFSEntry* instance,
+                           VFS_FILE_HANDLE context,
+                           int64_t position,
+                           int whence);
+    int(__cdecl* truncate)(const struct AddonInstance_VFSEntry* instance,
+                           VFS_FILE_HANDLE context,
+                           int64_t size);
+    int64_t(__cdecl* get_length)(const struct AddonInstance_VFSEntry* instance,
+                                 VFS_FILE_HANDLE context);
+    int64_t(__cdecl* get_position)(const struct AddonInstance_VFSEntry* instance,
+                                   VFS_FILE_HANDLE context);
+    int(__cdecl* get_chunk_size)(const struct AddonInstance_VFSEntry* instance,
+                                 VFS_FILE_HANDLE context);
+    bool(__cdecl* io_control_get_seek_possible)(const struct AddonInstance_VFSEntry* instance,
+                                                VFS_FILE_HANDLE context);
+    bool(__cdecl* io_control_get_cache_status)(const struct AddonInstance_VFSEntry* instance,
+                                               VFS_FILE_HANDLE context,
+                                               VFS_CACHE_STATUS_DATA* status);
+    bool(__cdecl* io_control_set_cache_rate)(const struct AddonInstance_VFSEntry* instance,
+                                             VFS_FILE_HANDLE context,
+                                             unsigned int rate);
+    bool(__cdecl* io_control_set_retry)(const struct AddonInstance_VFSEntry* instance,
+                                        VFS_FILE_HANDLE context,
+                                        bool retry);
+    int(__cdecl* stat)(const struct AddonInstance_VFSEntry* instance,
+                       const struct VFSURL* url,
+                       struct STAT_STRUCTURE* buffer);
+    bool(__cdecl* close)(const struct AddonInstance_VFSEntry* instance, VFS_FILE_HANDLE context);
+
+    bool(__cdecl* exists)(const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
+    void(__cdecl* clear_out_idle)(const struct AddonInstance_VFSEntry* instance);
+    void(__cdecl* disconnect_all)(const struct AddonInstance_VFSEntry* instance);
+    bool(__cdecl* delete_it)(const struct AddonInstance_VFSEntry* instance,
+                             const struct VFSURL* url);
+    bool(__cdecl* rename)(const struct AddonInstance_VFSEntry* instance,
+                          const struct VFSURL* url,
+                          const struct VFSURL* url2);
+    bool(__cdecl* directory_exists)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* remove_directory)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* create_directory)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* get_directory)(const struct AddonInstance_VFSEntry* instance,
+                                 const struct VFSURL* url,
+                                 struct VFSDirEntry** entries,
+                                 int* num_entries,
+                                 struct VFSGetDirectoryCallbacks* callbacks);
+    bool(__cdecl* contains_files)(const struct AddonInstance_VFSEntry* instance,
+                                  const struct VFSURL* url,
+                                  struct VFSDirEntry** entries,
+                                  int* num_entries,
+                                  char* rootpath);
+    void(__cdecl* free_directory)(const struct AddonInstance_VFSEntry* instance,
+                                  struct VFSDirEntry* entries,
+                                  int num_entries);
+  } KodiToAddonFuncTable_VFSEntry;
+
+  typedef struct AddonInstance_VFSEntry /* internal */
+  {
+    struct AddonProps_VFSEntry* props;
+    struct AddonToKodiFuncTable_VFSEntry* toKodi;
+    struct KodiToAddonFuncTable_VFSEntry* toAddon;
+  } AddonInstance_VFSEntry;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_VFS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h
new file mode 100644
index 0000000..913aad8
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../addon_base.h"
+
+#define VIZ_LYRICS_SIZE 32768
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  struct VIS_INFO
+  {
+    bool bWantsFreq;
+    int iSyncDelay;
+  };
+
+  struct VIS_TRACK
+  {
+    const char *title;
+    const char *artist;
+    const char *album;
+    const char *albumArtist;
+    const char *genre;
+    const char *comment;
+    const char *lyrics;
+
+    const char *reserved1;
+    const char *reserved2;
+
+    int trackNumber;
+    int discNumber;
+    int duration;
+    int year;
+    int rating;
+
+    int reserved3;
+    int reserved4;
+  };
+
+  typedef struct AddonProps_Visualization
+  {
+    ADDON_HARDWARE_CONTEXT device;
+    int x;
+    int y;
+    int width;
+    int height;
+    float pixelRatio;
+    const char* name;
+    const char* presets;
+    const char* profile;
+  } AddonProps_Visualization;
+
+  typedef struct AddonToKodiFuncTable_Visualization
+  {
+    KODI_HANDLE kodiInstance;
+    void(__cdecl* transfer_preset)(KODI_HANDLE kodiInstance, const char* preset);
+    void(__cdecl* clear_presets)(KODI_HANDLE kodiInstance);
+  } AddonToKodiFuncTable_Visualization;
+
+  struct AddonInstance_Visualization;
+
+  typedef struct KodiToAddonFuncTable_Visualization
+  {
+    KODI_HANDLE addonInstance;
+    bool(__cdecl* start)(const struct AddonInstance_Visualization* instance,
+                         int channels,
+                         int samples_per_sec,
+                         int bits_per_sample,
+                         const char* song_name);
+    void(__cdecl* stop)(const struct AddonInstance_Visualization* instance);
+
+    void(__cdecl* get_info)(const struct AddonInstance_Visualization* instance,
+                            struct VIS_INFO* info);
+
+    void(__cdecl* audio_data)(const struct AddonInstance_Visualization* instance,
+                              const float* audio_data,
+                              int audio_data_length,
+                              float* freq_data,
+                              int freq_data_length);
+    bool(__cdecl* is_dirty)(const struct AddonInstance_Visualization* instance);
+    void(__cdecl* render)(const struct AddonInstance_Visualization* instance);
+
+    unsigned int(__cdecl* get_presets)(const struct AddonInstance_Visualization* instance);
+    int(__cdecl* get_active_preset)(const struct AddonInstance_Visualization* instance);
+    bool(__cdecl* prev_preset)(const struct AddonInstance_Visualization* instance);
+    bool(__cdecl* next_preset)(const struct AddonInstance_Visualization* instance);
+    bool(__cdecl* load_preset)(const struct AddonInstance_Visualization* instance, int select);
+    bool(__cdecl* random_preset)(const struct AddonInstance_Visualization* instance);
+    bool(__cdecl* lock_preset)(const struct AddonInstance_Visualization* instance);
+    bool(__cdecl* rate_preset)(const struct AddonInstance_Visualization* instance, bool plus_minus);
+    bool(__cdecl* is_locked)(const struct AddonInstance_Visualization* instance);
+
+    bool(__cdecl* update_albumart)(const struct AddonInstance_Visualization* instance,
+                                   const char* albumart);
+    bool(__cdecl* update_track)(const struct AddonInstance_Visualization* instance,
+                                const struct VIS_TRACK* track);
+  } KodiToAddonFuncTable_Visualization;
+
+  typedef struct AddonInstance_Visualization
+  {
+    struct AddonProps_Visualization* props;
+    struct AddonToKodiFuncTable_Visualization* toKodi;
+    struct KodiToAddonFuncTable_Visualization* toAddon;
+  } AddonInstance_Visualization;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon_base.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h
index 1924d77..faa99fa 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon_base.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h
@@ -8,6 +8,13 @@
 
 #pragma once
 
+#ifndef C_API_ADDON_BASE_H
+#define C_API_ADDON_BASE_H
+
+#if !defined(NOMINMAX)
+#define NOMINMAX
+#endif
+
 #include "stdbool.h"
 #include "stdint.h"
 
@@ -53,6 +60,9 @@
 #define ATTRIBUTE_FORCEINLINE inline
 #endif
 
+// Hardware specific device context interface
+#define ADDON_HARDWARE_CONTEXT void*
+
 /*
  * To have a on add-on and kodi itself handled string always on known size!
  */
@@ -250,3 +260,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDON_BASE_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/audio_engine.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h
index 02e96ac..97510f7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/audio_engine.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h
@@ -8,7 +8,11 @@
 
 #pragma once
 
-#include "stdint.h"
+#ifndef C_API_AUDIO_ENGINE_H
+#define C_API_AUDIO_ENGINE_H
+
+#include <stdbool.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -35,7 +39,7 @@ extern "C"
   /// m_audioengine = new kodi::audioengine::CAEStream(format, AUDIO_STREAM_FORCE_RESAMPLE | AUDIO_STREAM_AUTOSTART);
   /// ~~~~~~~~~~~~~
   ///
-  //@{
+  ///@{
   typedef enum AudioEngineStreamOptions
   {
     /// force resample even if rates match
@@ -45,7 +49,7 @@ extern "C"
     /// autostart the stream when enough data is buffered
     AUDIO_STREAM_AUTOSTART = 1 << 2,
   } AudioEngineStreamOptions;
-  //@}
+  ///@}
   //----------------------------------------------------------------------------
 
   //============================================================================
@@ -63,7 +67,7 @@ extern "C"
   /// format.SetChannelLayout(std::vector<AudioEngineChannel>(AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR));
   /// ~~~~~~~~~~~~~
   ///
-  //@{
+  ///@{
   enum AudioEngineChannel
   {
     /// Used inside to indicate the end of a list and not for addon use directly.
@@ -113,7 +117,7 @@ extern "C"
     /// Maximum possible value, to use e.g. as size inside list
     AUDIOENGINE_CH_MAX
   };
-  //@}
+  ///@}
   //----------------------------------------------------------------------------
 
   //============================================================================
@@ -141,7 +145,7 @@ extern "C"
   /// format.SetDataFormat(AUDIOENGINE_FMT_FLOATP);
   /// ~~~~~~~~~~~~~
   ///
-  //@{
+  ///@{
   enum AudioEngineDataFormat
   {
     /// To define format as invalid
@@ -217,7 +221,7 @@ extern "C"
     /// Amount of sample formats.
     AUDIOENGINE_FMT_MAX
   };
-  //@}
+  ///@}
   //----------------------------------------------------------------------------
 
   /*!
@@ -306,3 +310,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+
+#endif /* !C_API_AUDIO_ENGINE_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/filesystem.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h
index b68a24c..70f9400 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/filesystem.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef C_API_FILESYSTEM_H
+#define C_API_FILESYSTEM_H
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <time.h>
@@ -25,8 +28,15 @@ typedef intptr_t ssize_t;
 #ifdef DeleteFile
 #undef DeleteFile
 #endif // DeleteFile
+#ifdef RemoveDirectory
+#undef RemoveDirectory
+#endif // RemoveDirectory
 #endif // _WIN32
 
+#ifdef TARGET_POSIX // Linux, Mac, FreeBSD
+#include <sys/types.h>
+#endif // TARGET_POSIX
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -194,6 +204,19 @@ extern "C"
     bool isDirectory;
     /// The stat url is a symbolic link
     bool isSymLink;
+    /// The stat url is block special
+    bool isBlock;
+    /// The stat url is character special
+    bool isCharacter;
+    /// The stat url is FIFO special
+    bool isFifo;
+    /// The stat url is regular
+    bool isRegular;
+    /// The stat url is socket
+    bool isSocket;
+    /// The file serial number, which distinguishes this file from all other files on the same
+    /// device.
+    uint64_t fileSerialNumber;
   };
 
   struct VFS_CACHE_STATUS_DATA
@@ -290,6 +313,7 @@ extern "C"
 
     bool (*get_disk_space)(
         void* kodiBase, const char* path, uint64_t* capacity, uint64_t* free, uint64_t* available);
+    bool (*remove_directory_recursive)(void* kodiBase, const char* path);
   } AddonToKodiFuncTable_kodi_filesystem;
 
   //}}}
@@ -297,3 +321,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_FILESYSTEM_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h
index ede8e94..12afd02 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/general.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h
@@ -8,6 +8,11 @@
 
 #pragma once
 
+#ifndef C_API_GENERAL_H
+#define C_API_GENERAL_H
+
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -121,3 +126,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_GENERAL_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/CMakeLists.txt
new file mode 100644
index 0000000..53c4e60
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(HEADERS definitions.h
+            general.h
+            list_item.h
+            window.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_gui)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/CMakeLists.txt
new file mode 100644
index 0000000..2e6cd53
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(HEADERS button.h
+            edit.h
+            fade_label.h
+            image.h
+            label.h
+            progress.h
+            radio_button.h
+            rendering.h
+            settings_slider.h
+            slider.h
+            spin.h
+            text_box.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_gui_controls)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h
new file mode 100644
index 0000000..84fd822
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_BUTTON_H
+#define C_API_GUI_CONTROLS_BUTTON_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_button
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*set_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* label);
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_label2)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* label);
+    char* (*get_label2)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_button;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_BUTTON_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h
new file mode 100644
index 0000000..ca38b27
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_EDIT_H
+#define C_API_GUI_CONTROLS_EDIT_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit_Defs
+  /// @{
+  /// @anchor AddonGUIInputType
+  /// @brief Text input types used on kodi::gui::controls::CEdit
+  enum AddonGUIInputType
+  {
+    /// Text inside edit control only readable
+    ADDON_INPUT_TYPE_READONLY = -1,
+    /// Normal text entries
+    ADDON_INPUT_TYPE_TEXT = 0,
+    /// To use on edit control only numeric numbers
+    ADDON_INPUT_TYPE_NUMBER,
+    /// To insert seconds
+    ADDON_INPUT_TYPE_SECONDS,
+    /// To insert time
+    ADDON_INPUT_TYPE_TIME,
+    /// To insert a date
+    ADDON_INPUT_TYPE_DATE,
+    /// Used for write in IP addresses
+    ADDON_INPUT_TYPE_IPADDRESS,
+    /// Text field used as password entry field with not visible text
+    ADDON_INPUT_TYPE_PASSWORD,
+    /// Text field used as password entry field with not visible text but
+    /// returned as MD5 value
+    ADDON_INPUT_TYPE_PASSWORD_MD5,
+    /// Use text field for search purpose
+    ADDON_INPUT_TYPE_SEARCH,
+    /// Text field as filter
+    ADDON_INPUT_TYPE_FILTER,
+    ///
+    ADDON_INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW
+  };
+  /// @}
+  //----------------------------------------------------------------------------
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_edit
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*set_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* label);
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    char* (*get_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_cursor_position)(KODI_HANDLE kodiBase,
+                                KODI_GUI_CONTROL_HANDLE handle,
+                                unsigned int position);
+    unsigned int (*get_cursor_position)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_input_type)(KODI_HANDLE kodiBase,
+                           KODI_GUI_CONTROL_HANDLE handle,
+                           int type,
+                           const char* heading);
+  } AddonToKodiFuncTable_kodi_gui_control_edit;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_EDIT_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h
new file mode 100644
index 0000000..fea014b
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_FADE_LABEL_H
+#define C_API_GUI_CONTROLS_FADE_LABEL_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_fade_label
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*add_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_scrolling)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool scroll);
+    void (*reset)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_fade_label;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_FADE_LABEL_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h
new file mode 100644
index 0000000..4a46e6d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_IMAGE_H
+#define C_API_GUI_CONTROLS_IMAGE_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_image
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_filename)(KODI_HANDLE kodiBase,
+                         KODI_GUI_CONTROL_HANDLE handle,
+                         const char* filename,
+                         bool use_cache);
+    void (*set_color_diffuse)(KODI_HANDLE kodiBase,
+                              KODI_GUI_CONTROL_HANDLE handle,
+                              uint32_t color_diffuse);
+  } AddonToKodiFuncTable_kodi_gui_control_image;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_IMAGE_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h
new file mode 100644
index 0000000..d8a9fe4
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_LABEL_H
+#define C_API_GUI_CONTROLS_LABEL_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_label
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_label;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_LABEL_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h
new file mode 100644
index 0000000..88638e0
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_PROGRESS_H
+#define C_API_GUI_CONTROLS_PROGRESS_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_progress
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float percent);
+    float (*get_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_progress;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_PROGRESS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h
new file mode 100644
index 0000000..a672d95
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_RADIO_BUTTON_H
+#define C_API_GUI_CONTROLS_RADIO_BUTTON_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_radio_button
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*set_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_selected)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool selected);
+    bool (*is_selected)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_radio_button;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_RADIO_BUTTON_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h
new file mode 100644
index 0000000..d4053a6
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_RENDERING_H
+#define C_API_GUI_CONTROLS_RENDERING_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_rendering
+  {
+    void (*set_callbacks)(
+        KODI_HANDLE kodiBase,
+        KODI_GUI_CONTROL_HANDLE handle,
+        KODI_GUI_CLIENT_HANDLE clienthandle,
+        bool (*createCB)(KODI_GUI_CLIENT_HANDLE, int, int, int, int, ADDON_HARDWARE_CONTEXT),
+        void (*renderCB)(KODI_GUI_CLIENT_HANDLE),
+        void (*stopCB)(KODI_GUI_CLIENT_HANDLE),
+        bool (*dirtyCB)(KODI_GUI_CLIENT_HANDLE));
+    void (*destroy)(void* kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_control_rendering;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_RENDERING_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h
new file mode 100644
index 0000000..2cbc972
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_SETTINGS_SLIDER_H
+#define C_API_GUI_CONTROLS_SETTINGS_SLIDER_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_settings_slider
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*set_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* label);
+    void (*reset)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_int_range)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int start, int end);
+    void (*set_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int value);
+    int (*get_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_int_interval)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int interval);
+    void (*set_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float percent);
+    float (*get_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_range)(KODI_HANDLE kodiBase,
+                            KODI_GUI_CONTROL_HANDLE handle,
+                            float start,
+                            float end);
+    void (*set_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float value);
+    float (*get_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_interval)(KODI_HANDLE kodiBase,
+                               KODI_GUI_CONTROL_HANDLE handle,
+                               float interval);
+  } AddonToKodiFuncTable_kodi_gui_control_settings_slider;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_SETTINGS_SLIDER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h
new file mode 100644
index 0000000..0a67208
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_SLIDER_H
+#define C_API_GUI_CONTROLS_SLIDER_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_slider
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*reset)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    char* (*get_description)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_int_range)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int start, int end);
+    void (*set_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int value);
+    int (*get_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_int_interval)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int interval);
+    void (*set_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float percent);
+    float (*get_percentage)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_range)(KODI_HANDLE kodiBase,
+                            KODI_GUI_CONTROL_HANDLE handle,
+                            float start,
+                            float end);
+    void (*set_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float value);
+    float (*get_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_interval)(KODI_HANDLE kodiBase,
+                               KODI_GUI_CONTROL_HANDLE handle,
+                               float interval);
+  } AddonToKodiFuncTable_kodi_gui_control_slider;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_SLIDER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h
new file mode 100644
index 0000000..d5e5c86
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_SPIN_H
+#define C_API_GUI_CONTROLS_SPIN_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_spin
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*set_enabled)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool enabled);
+    void (*set_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    void (*reset)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_type)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int type);
+    void (*add_string_label)(KODI_HANDLE kodiBase,
+                             KODI_GUI_CONTROL_HANDLE handle,
+                             const char* label,
+                             const char* value);
+    void (*set_string_value)(KODI_HANDLE kodiBase,
+                             KODI_GUI_CONTROL_HANDLE handle,
+                             const char* value);
+    char* (*get_string_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*add_int_label)(KODI_HANDLE kodiBase,
+                          KODI_GUI_CONTROL_HANDLE handle,
+                          const char* label,
+                          int value);
+    void (*set_int_range)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int start, int end);
+    void (*set_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int value);
+    int (*get_int_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_range)(KODI_HANDLE kodiBase,
+                            KODI_GUI_CONTROL_HANDLE handle,
+                            float start,
+                            float end);
+    void (*set_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, float value);
+    float (*get_float_value)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_float_interval)(KODI_HANDLE kodiBase,
+                               KODI_GUI_CONTROL_HANDLE handle,
+                               float interval);
+  } AddonToKodiFuncTable_kodi_gui_control_spin;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_SPIN_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h
new file mode 100644
index 0000000..276d04c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_CONTROLS_TEXT_BOX_H
+#define C_API_GUI_CONTROLS_TEXT_BOX_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_control_text_box
+  {
+    void (*set_visible)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, bool visible);
+    void (*reset)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*set_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, const char* text);
+    char* (*get_text)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle);
+    void (*scroll)(KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, unsigned int scroll);
+    void (*set_auto_scrolling)(
+        KODI_HANDLE kodiBase, KODI_GUI_CONTROL_HANDLE handle, int delay, int time, int repeat);
+  } AddonToKodiFuncTable_kodi_gui_control_text_box;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_CONTROLS_TEXT_BOX_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h
new file mode 100644
index 0000000..ec60bc2
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h
@@ -0,0 +1,106 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DEFINITIONS_H
+#define C_API_GUI_DEFINITIONS_H
+
+#include "../addon_base.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef void* KODI_GUI_HANDLE;
+  typedef void* KODI_GUI_CLIENT_HANDLE;
+  typedef void* KODI_GUI_CONTROL_HANDLE;
+  typedef void* KODI_GUI_LISTITEM_HANDLE;
+  typedef void* KODI_GUI_WINDOW_HANDLE;
+
+  struct AddonToKodiFuncTable_kodi_gui_general;
+  struct AddonToKodiFuncTable_kodi_gui_control_button;
+  struct AddonToKodiFuncTable_kodi_gui_control_edit;
+  struct AddonToKodiFuncTable_kodi_gui_control_fade_label;
+  struct AddonToKodiFuncTable_kodi_gui_control_label;
+  struct AddonToKodiFuncTable_kodi_gui_control_image;
+  struct AddonToKodiFuncTable_kodi_gui_control_progress;
+  struct AddonToKodiFuncTable_kodi_gui_control_radio_button;
+  struct AddonToKodiFuncTable_kodi_gui_control_rendering;
+  struct AddonToKodiFuncTable_kodi_gui_control_settings_slider;
+  struct AddonToKodiFuncTable_kodi_gui_control_slider;
+  struct AddonToKodiFuncTable_kodi_gui_control_spin;
+  struct AddonToKodiFuncTable_kodi_gui_control_text_box;
+  struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu;
+  struct AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress;
+  struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser;
+  struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard;
+  struct AddonToKodiFuncTable_kodi_gui_dialogNumeric;
+  struct AddonToKodiFuncTable_kodi_gui_dialogOK;
+  struct AddonToKodiFuncTable_kodi_gui_dialogProgress;
+  struct AddonToKodiFuncTable_kodi_gui_dialogSelect;
+  struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer;
+  struct AddonToKodiFuncTable_kodi_gui_dialogYesNo;
+  struct AddonToKodiFuncTable_kodi_gui_listItem;
+  struct AddonToKodiFuncTable_kodi_gui_window;
+
+  typedef struct AddonToKodiFuncTable_kodi_gui
+  {
+    struct AddonToKodiFuncTable_kodi_gui_general* general;
+    struct AddonToKodiFuncTable_kodi_gui_control_button* control_button;
+    struct AddonToKodiFuncTable_kodi_gui_control_edit* control_edit;
+    struct AddonToKodiFuncTable_kodi_gui_control_fade_label* control_fade_label;
+    struct AddonToKodiFuncTable_kodi_gui_control_label* control_label;
+    struct AddonToKodiFuncTable_kodi_gui_control_image* control_image;
+    struct AddonToKodiFuncTable_kodi_gui_control_progress* control_progress;
+    struct AddonToKodiFuncTable_kodi_gui_control_radio_button* control_radio_button;
+    struct AddonToKodiFuncTable_kodi_gui_control_rendering* control_rendering;
+    struct AddonToKodiFuncTable_kodi_gui_control_settings_slider* control_settings_slider;
+    struct AddonToKodiFuncTable_kodi_gui_control_slider* control_slider;
+    struct AddonToKodiFuncTable_kodi_gui_control_spin* control_spin;
+    struct AddonToKodiFuncTable_kodi_gui_control_text_box* control_text_box;
+    KODI_HANDLE control_dummy1;
+    KODI_HANDLE control_dummy2;
+    KODI_HANDLE control_dummy3;
+    KODI_HANDLE control_dummy4;
+    KODI_HANDLE control_dummy5;
+    KODI_HANDLE control_dummy6;
+    KODI_HANDLE control_dummy7;
+    KODI_HANDLE control_dummy8;
+    KODI_HANDLE control_dummy9;
+    KODI_HANDLE control_dummy10; /* This and above used to add new controls */
+    struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu* dialogContextMenu;
+    struct AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress* dialogExtendedProgress;
+    struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser* dialogFileBrowser;
+    struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard* dialogKeyboard;
+    struct AddonToKodiFuncTable_kodi_gui_dialogNumeric* dialogNumeric;
+    struct AddonToKodiFuncTable_kodi_gui_dialogOK* dialogOK;
+    struct AddonToKodiFuncTable_kodi_gui_dialogProgress* dialogProgress;
+    struct AddonToKodiFuncTable_kodi_gui_dialogSelect* dialogSelect;
+    struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer* dialogTextViewer;
+    struct AddonToKodiFuncTable_kodi_gui_dialogYesNo* dialogYesNo;
+    KODI_HANDLE dialog_dummy1;
+    KODI_HANDLE dialog_dummy2;
+    KODI_HANDLE dialog_dummy3;
+    KODI_HANDLE dialog_dummy4;
+    KODI_HANDLE dialog_dummy5;
+    KODI_HANDLE dialog_dummy6;
+    KODI_HANDLE dialog_dummy7;
+    KODI_HANDLE dialog_dummy8;
+    KODI_HANDLE dialog_dummy9;
+    KODI_HANDLE dialog_dummy10; /* This and above used to add new dialogs */
+    struct AddonToKodiFuncTable_kodi_gui_listItem* listItem;
+    struct AddonToKodiFuncTable_kodi_gui_window* window;
+  } AddonToKodiFuncTable_kodi_gui;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DEFINITIONS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/CMakeLists.txt
new file mode 100644
index 0000000..bc35e91
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(HEADERS context_menu.h
+            extended_progress.h
+            filebrowser.h
+            keyboard.h
+            numeric.h
+            ok.h
+            progress.h
+            select.h
+            text_viewer.h
+            yes_no.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_gui_dialogs)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h
new file mode 100644
index 0000000..8bb5370
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_CONTEXT_MENU_H
+#define C_API_GUI_DIALOGS_CONTEXT_MENU_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu
+  {
+    int (*open)(KODI_HANDLE kodiBase,
+                const char* heading,
+                const char* entries[],
+                unsigned int size);
+  } AddonToKodiFuncTable_kodi_gui_dialogContextMenu;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_CONTEXT_MENU_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h
new file mode 100644
index 0000000..e53588f
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_EXTENDED_PROGRESS_H
+#define C_API_GUI_DIALOGS_EXTENDED_PROGRESS_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress
+  {
+    KODI_GUI_HANDLE (*new_dialog)(KODI_HANDLE kodiBase, const char* title);
+    void (*delete_dialog)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    char* (*get_title)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*set_title)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, const char* title);
+    char* (*get_text)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*set_text)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, const char* text);
+    bool (*is_finished)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*mark_finished)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    float (*get_percentage)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*set_percentage)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, float percentage);
+    void (*set_progress)(KODI_HANDLE kodiBase,
+                         KODI_GUI_HANDLE handle,
+                         int currentItem,
+                         int itemCount);
+  } AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_EXTENDED_PROGRESS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h
new file mode 100644
index 0000000..7ae4fac
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_FILEBROWSER_H
+#define C_API_GUI_DIALOGS_FILEBROWSER_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser
+  {
+    bool (*show_and_get_directory)(KODI_HANDLE kodiBase,
+                                   const char* shares,
+                                   const char* heading,
+                                   const char* path_in,
+                                   char** path_out,
+                                   bool writeOnly);
+    bool (*show_and_get_file)(KODI_HANDLE kodiBase,
+                              const char* shares,
+                              const char* mask,
+                              const char* heading,
+                              const char* path_in,
+                              char** path_out,
+                              bool use_thumbs,
+                              bool use_file_directories);
+    bool (*show_and_get_file_from_dir)(KODI_HANDLE kodiBase,
+                                       const char* directory,
+                                       const char* mask,
+                                       const char* heading,
+                                       const char* path_in,
+                                       char** path_out,
+                                       bool use_thumbs,
+                                       bool use_file_directories,
+                                       bool singleList);
+    bool (*show_and_get_file_list)(KODI_HANDLE kodiBase,
+                                   const char* shares,
+                                   const char* mask,
+                                   const char* heading,
+                                   char*** file_list,
+                                   unsigned int* entries,
+                                   bool use_thumbs,
+                                   bool use_file_directories);
+    bool (*show_and_get_source)(KODI_HANDLE kodiBase,
+                                const char* path_in,
+                                char** path_out,
+                                bool allow_network_shares,
+                                const char* additional_share,
+                                const char* type);
+    bool (*show_and_get_image)(KODI_HANDLE kodiBase,
+                               const char* shares,
+                               const char* heading,
+                               const char* path_in,
+                               char** path_out);
+    bool (*show_and_get_image_list)(KODI_HANDLE kodiBase,
+                                    const char* shares,
+                                    const char* heading,
+                                    char*** file_list,
+                                    unsigned int* entries);
+    void (*clear_file_list)(KODI_HANDLE kodiBase, char*** file_list, unsigned int entries);
+  } AddonToKodiFuncTable_kodi_gui_dialogFileBrowser;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_FILEBROWSER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h
new file mode 100644
index 0000000..fc3c34c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_KEYBOARD_H
+#define C_API_GUI_DIALOGS_KEYBOARD_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard
+  {
+    bool (*show_and_get_input_with_head)(KODI_HANDLE kodiBase,
+                                         const char* text_in,
+                                         char** text_out,
+                                         const char* heading,
+                                         bool allow_empty_result,
+                                         bool hiddenInput,
+                                         unsigned int auto_close_ms);
+    bool (*show_and_get_input)(KODI_HANDLE kodiBase,
+                               const char* text_in,
+                               char** text_out,
+                               bool allow_empty_result,
+                               unsigned int auto_close_ms);
+    bool (*show_and_get_new_password_with_head)(KODI_HANDLE kodiBase,
+                                                const char* password_in,
+                                                char** password_out,
+                                                const char* heading,
+                                                bool allow_empty_result,
+                                                unsigned int auto_close_ms);
+    bool (*show_and_get_new_password)(KODI_HANDLE kodiBase,
+                                      const char* password_in,
+                                      char** password_out,
+                                      unsigned int auto_close_ms);
+    bool (*show_and_verify_new_password_with_head)(KODI_HANDLE kodiBase,
+                                                   char** password_out,
+                                                   const char* heading,
+                                                   bool allow_empty_result,
+                                                   unsigned int auto_close_ms);
+    bool (*show_and_verify_new_password)(KODI_HANDLE kodiBase,
+                                         char** password_out,
+                                         unsigned int auto_close_ms);
+    int (*show_and_verify_password)(KODI_HANDLE kodiBase,
+                                    const char* password_in,
+                                    char** password_out,
+                                    const char* heading,
+                                    int retries,
+                                    unsigned int auto_close_ms);
+    bool (*show_and_get_filter)(KODI_HANDLE kodiBase,
+                                const char* text_in,
+                                char** text_out,
+                                bool searching,
+                                unsigned int auto_close_ms);
+    bool (*send_text_to_active_keyboard)(KODI_HANDLE kodiBase,
+                                         const char* text,
+                                         bool close_keyboard);
+    bool (*is_keyboard_activated)(KODI_HANDLE kodiBase);
+  } AddonToKodiFuncTable_kodi_gui_dialogKeyboard;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_KEYBOARD_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h
new file mode 100644
index 0000000..df23cd7
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_NUMERIC_H
+#define C_API_GUI_DIALOGS_NUMERIC_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogNumeric
+  {
+    bool (*show_and_verify_new_password)(KODI_HANDLE kodiBase, char** password);
+    int (*show_and_verify_password)(KODI_HANDLE kodiBase,
+                                    const char* password,
+                                    const char* heading,
+                                    int retries);
+    bool (*show_and_verify_input)(KODI_HANDLE kodiBase,
+                                  const char* verify_in,
+                                  char** verify_out,
+                                  const char* heading,
+                                  bool verify_input);
+    bool (*show_and_get_time)(KODI_HANDLE kodiBase, struct tm* time, const char* heading);
+    bool (*show_and_get_date)(KODI_HANDLE kodiBase, struct tm* date, const char* heading);
+    bool (*show_and_get_ip_address)(KODI_HANDLE kodiBase,
+                                    const char* ip_address_in,
+                                    char** ip_address_out,
+                                    const char* heading);
+    bool (*show_and_get_number)(KODI_HANDLE kodiBase,
+                                const char* input_in,
+                                char** input_out,
+                                const char* heading,
+                                unsigned int auto_close_ms);
+    bool (*show_and_get_seconds)(KODI_HANDLE kodiBase,
+                                 const char* time_in,
+                                 char** time_out,
+                                 const char* heading);
+  } AddonToKodiFuncTable_kodi_gui_dialogNumeric;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_NUMERIC_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h
new file mode 100644
index 0000000..9f37051
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_OK_H
+#define C_API_GUI_DIALOGS_OK_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogOK
+  {
+    void (*show_and_get_input_single_text)(KODI_HANDLE kodiBase,
+                                           const char* heading,
+                                           const char* text);
+    void (*show_and_get_input_line_text)(KODI_HANDLE kodiBase,
+                                         const char* heading,
+                                         const char* line0,
+                                         const char* line1,
+                                         const char* line2);
+  } AddonToKodiFuncTable_kodi_gui_dialogOK;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_OK_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h
new file mode 100644
index 0000000..f1c8972
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_PROGRESS_H
+#define C_API_GUI_DIALOGS_PROGRESS_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogProgress
+  {
+    KODI_GUI_HANDLE (*new_dialog)(KODI_HANDLE kodiBase);
+    void (*delete_dialog)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*open)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*set_heading)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, const char* heading);
+    void (*set_line)(KODI_HANDLE kodiBase,
+                     KODI_GUI_HANDLE handle,
+                     unsigned int lineNo,
+                     const char* line);
+    void (*set_can_cancel)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, bool canCancel);
+    bool (*is_canceled)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*set_percentage)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, int percentage);
+    int (*get_percentage)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+    void (*show_progress_bar)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, bool pnOff);
+    void (*set_progress_max)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, int max);
+    void (*set_progress_advance)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle, int nSteps);
+    bool (*abort)(KODI_HANDLE kodiBase, KODI_GUI_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_dialogProgress;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_PROGRESS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h
new file mode 100644
index 0000000..41ab82f
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_SELECT_H
+#define C_API_GUI_DIALOGS_SELECT_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogSelect
+  {
+    int (*open)(KODI_HANDLE kodiBase,
+                const char* heading,
+                const char* entries[],
+                unsigned int size,
+                int selected,
+                unsigned int autoclose);
+    bool (*open_multi_select)(KODI_HANDLE kodiBase,
+                              const char* heading,
+                              const char* entryIDs[],
+                              const char* entryNames[],
+                              bool entriesSelected[],
+                              unsigned int size,
+                              unsigned int autoclose);
+  } AddonToKodiFuncTable_kodi_gui_dialogSelect;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_SELECT_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h
new file mode 100644
index 0000000..eb38b0b
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_TEXT_VIEWER_H
+#define C_API_GUI_DIALOGS_TEXT_VIEWER_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer
+  {
+    void (*open)(KODI_HANDLE kodiBase, const char* heading, const char* text);
+  } AddonToKodiFuncTable_kodi_gui_dialogTextViewer;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_TEXT_VIEWER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h
new file mode 100644
index 0000000..01ed806
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_DIALOGS_YES_NO_H
+#define C_API_GUI_DIALOGS_YES_NO_H
+
+#include "../definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_dialogYesNo
+  {
+    bool (*show_and_get_input_single_text)(KODI_HANDLE kodiBase,
+                                           const char* heading,
+                                           const char* text,
+                                           bool* canceled,
+                                           const char* noLabel,
+                                           const char* yesLabel);
+    bool (*show_and_get_input_line_text)(KODI_HANDLE kodiBase,
+                                         const char* heading,
+                                         const char* line0,
+                                         const char* line1,
+                                         const char* line2,
+                                         const char* noLabel,
+                                         const char* yesLabel);
+    bool (*show_and_get_input_line_button_text)(KODI_HANDLE kodiBase,
+                                                const char* heading,
+                                                const char* line0,
+                                                const char* line1,
+                                                const char* line2,
+                                                bool* canceled,
+                                                const char* noLabel,
+                                                const char* yesLabel);
+  } AddonToKodiFuncTable_kodi_gui_dialogYesNo;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_DIALOGS_YES_NO_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h
new file mode 100644
index 0000000..d0d256c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_GENERAL_H
+#define C_API_GUI_GENERAL_H
+
+#include "definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_general
+  {
+    void (*lock)();
+    void (*unlock)();
+    int (*get_screen_height)(KODI_HANDLE kodiBase);
+    int (*get_screen_width)(KODI_HANDLE kodiBase);
+    int (*get_video_resolution)(KODI_HANDLE kodiBase);
+    int (*get_current_window_dialog_id)(KODI_HANDLE kodiBase);
+    int (*get_current_window_id)(KODI_HANDLE kodiBase);
+    ADDON_HARDWARE_CONTEXT (*get_hw_context)(KODI_HANDLE kodiBase);
+  } AddonToKodiFuncTable_kodi_gui_general;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_GENERAL_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/CMakeLists.txt
new file mode 100644
index 0000000..c0bbd11
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(HEADERS action_ids.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_gui_input)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
new file mode 100644
index 0000000..274f3d9
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
@@ -0,0 +1,763 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_ACTION_IDS_H
+#define C_API_GUI_ACTION_IDS_H
+
+/// @defgroup cpp_kodi_gui_Defs_action_ids enum ADDON_ACTION
+/// @ingroup cpp_kodi_gui_Defs
+/// @brief **Action Id's**\n
+/// Actions that we have defined.
+///
+///@{
+enum ADDON_ACTION
+{
+  /// @ingroup cpp_kodi_gui_key_action_ids
+  ///@{
+
+  /// @brief <b>`0  `</b>: None.
+  ADDON_ACTION_NONE = 0,
+
+  /// @brief <b>`1  `</b>: Move left.
+  ADDON_ACTION_MOVE_LEFT = 1,
+
+  /// @brief <b>`2  `</b>: Move right.
+  ADDON_ACTION_MOVE_RIGHT = 2,
+
+  /// @brief <b>`3  `</b>: Move up.
+  ADDON_ACTION_MOVE_UP = 3,
+
+  /// @brief <b>`4  `</b>: Move down.
+  ADDON_ACTION_MOVE_DOWN = 4,
+
+  /// @brief <b>`5  `</b>: Page up.
+  ADDON_ACTION_PAGE_UP = 5,
+
+  /// @brief <b>`6  `</b>: Page down.
+  ADDON_ACTION_PAGE_DOWN = 6,
+
+  /// @brief <b>`7  `</b>: Select item.
+  ADDON_ACTION_SELECT_ITEM = 7,
+
+  /// @brief <b>`8  `</b>: Highlight item.
+  ADDON_ACTION_HIGHLIGHT_ITEM = 8,
+
+  /// @brief <b>`9  `</b>: Parent directory.
+  ADDON_ACTION_PARENT_DIR = 9,
+
+  /// @brief <b>`10 `</b>: Previous menu.
+  ADDON_ACTION_PREVIOUS_MENU = 10,
+
+  /// @brief <b>`11 `</b>: Show info.
+  ADDON_ACTION_SHOW_INFO = 11,
+
+  /// @brief <b>`12 `</b>: Pause.
+  ADDON_ACTION_PAUSE = 12,
+
+  /// @brief <b>`13 `</b>: Stop.
+  ADDON_ACTION_STOP = 13,
+
+  /// @brief <b>`14 `</b>: Next item.
+  ADDON_ACTION_NEXT_ITEM = 14,
+
+  /// @brief <b>`15 `</b>: Previous item.
+  ADDON_ACTION_PREV_ITEM = 15,
+
+  /// @brief <b>`16 `</b>: Can be used to specify specific action in a window, Playback control is handled in ADDON_ACTION_PLAYER_*
+  ADDON_ACTION_FORWARD = 16,
+
+  /// @brief <b>`17 `</b>: Can be used to specify specific action in a window, Playback control is handled in ADDON_ACTION_PLAYER_*
+  ADDON_ACTION_REWIND = 17,
+
+  /// @brief <b>`18 `</b>: Toggle between GUI and movie or GUI and visualisation.
+  ADDON_ACTION_SHOW_GUI = 18,
+
+  /// @brief <b>`19 `</b>: Toggle quick-access zoom modes. Can b used in videoFullScreen.zml window id=2005
+  ADDON_ACTION_ASPECT_RATIO = 19,
+
+  /// @brief <b>`20 `</b>: Seek +1% in the movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_STEP_FORWARD = 20,
+
+  /// @brief <b>`21 `</b>: Seek -1% in the movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_STEP_BACK = 21,
+
+  /// @brief <b>`22 `</b>: Seek +10% in the movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_BIG_STEP_FORWARD = 22,
+
+  /// @brief <b>`23 `</b>: Seek -10% in the movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_BIG_STEP_BACK = 23,
+
+  /// @brief <b>`24 `</b>: Show/hide OSD. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SHOW_OSD = 24,
+
+  /// @brief <b>`25 `</b>: Turn subtitles on/off. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SHOW_SUBTITLES = 25,
+
+  /// @brief <b>`26 `</b>: Switch to next subtitle of movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_NEXT_SUBTITLE = 26,
+
+  /// @brief <b>`27 `</b>: Show debug info for VideoPlayer
+  ADDON_ACTION_PLAYER_DEBUG = 27,
+
+  /// @brief <b>`28 `</b>: Show next picture of slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_NEXT_PICTURE = 28,
+
+  /// @brief <b>`29 `</b>: Show previous picture of slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_PREV_PICTURE = 29,
+
+  /// @brief <b>`30 `</b>: Zoom in picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_OUT = 30,
+
+  /// @brief <b>`31 `</b>: Zoom out picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_IN = 31,
+
+  /// @brief <b>`32 `</b>: Used to toggle between source view and destination view. Can be used in myfiles.xml window id=3
+  ADDON_ACTION_TOGGLE_SOURCE_DEST = 32,
+
+  /// @brief <b>`33 `</b>: Used to toggle between current view and playlist view. Can b used in all mymusic xml files
+  ADDON_ACTION_SHOW_PLAYLIST = 33,
+
+  /// @brief <b>`34 `</b>: Used to queue a item to the playlist. Can b used in all mymusic xml files
+  ADDON_ACTION_QUEUE_ITEM = 34,
+
+  /// @brief <b>`35 `</b>: Not used anymore
+  ADDON_ACTION_REMOVE_ITEM = 35,
+
+  /// @brief <b>`36 `</b>: Not used anymore
+  ADDON_ACTION_SHOW_FULLSCREEN = 36,
+
+  /// @brief <b>`37 `</b>: Zoom 1x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_NORMAL = 37,
+
+  /// @brief <b>`38 `</b>: Zoom 2x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_1 = 38,
+
+  /// @brief <b>`39 `</b>: Zoom 3x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_2 = 39,
+
+  /// @brief <b>`40 `</b>: Zoom 4x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_3 = 40,
+
+  /// @brief <b>`41 `</b>: Zoom 5x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_4 = 41,
+
+  /// @brief <b>`42 `</b>: Zoom 6x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_5 = 42,
+
+  /// @brief <b>`43 `</b>: Zoom 7x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_6 = 43,
+
+  /// @brief <b>`44 `</b>: Zoom 8x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_7 = 44,
+
+  /// @brief <b>`45 `</b>: Zoom 9x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_8 = 45,
+
+  /// @brief <b>`46 `</b>: Zoom 10x picture during slideshow. Can b used in slideshow.xml window id=2007
+  ADDON_ACTION_ZOOM_LEVEL_9 = 46,
+
+  /// @brief <b>`47 `</b>: Select next arrow. Can b used in: settingsScreenCalibration.xml windowid=11
+  ADDON_ACTION_CALIBRATE_SWAP_ARROWS = 47,
+
+  /// @brief <b>`48 `</b>: Reset calibration to defaults. Can b used in: `settingsScreenCalibration.xml` windowid=11/settingsUICalibration.xml windowid=10
+  ADDON_ACTION_CALIBRATE_RESET = 48,
+
+  /// @brief <b>`49 `</b>: Analog thumbstick move. Can b used in: `slideshow.xml`
+  /// windowid=2007/settingsScreenCalibration.xml windowid=11/settingsUICalibration.xml
+  /// windowid=10
+  /// @note see also ADDON_ACTION_ANALOG_MOVE_X_LEFT, ADDON_ACTION_ANALOG_MOVE_X_RIGHT,
+  /// ADDON_ACTION_ANALOG_MOVE_Y_UP, ADDON_ACTION_ANALOG_MOVE_Y_DOWN
+  ADDON_ACTION_ANALOG_MOVE = 49,
+
+  /// @brief <b>`50 `</b>: Rotate current picture clockwise during slideshow. Can be used in slideshow.xml window id=2007
+  ADDON_ACTION_ROTATE_PICTURE_CW = 50,
+
+  /// @brief <b>`51 `</b>: Rotate current picture counterclockwise during slideshow. Can be used in slideshow.xml window id=2007
+  ADDON_ACTION_ROTATE_PICTURE_CCW = 51,
+
+  /// @brief <b>`52 `</b>: Decrease subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SUBTITLE_DELAY_MIN = 52,
+
+  /// @brief <b>`53 `</b>: Increase subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SUBTITLE_DELAY_PLUS = 53,
+
+  /// @brief <b>`54 `</b>: Increase avsync delay.  Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_AUDIO_DELAY_MIN = 54,
+
+  /// @brief <b>`55 `</b>: Decrease avsync delay.  Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_AUDIO_DELAY_PLUS = 55,
+
+  /// @brief <b>`56 `</b>: Select next language in movie.  Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_AUDIO_NEXT_LANGUAGE = 56,
+
+  /// @brief <b>`57 `</b>: Switch 2 next resolution. Can b used during screen calibration settingsScreenCalibration.xml windowid=11
+  ADDON_ACTION_CHANGE_RESOLUTION = 57,
+
+  /// @brief <b>`58 `</b>: remote keys 0-9. are used by multiple windows
+  /// for example in videoFullScreen.xml window id=2005 you can
+  /// enter time (mmss) to jump to particular point in the movie
+  /// with spincontrols you can enter 3digit number to quickly set
+  /// spincontrol to desired value
+  ///
+  /// Remote key 0
+  ADDON_ACTION_REMOTE_0 = 58,
+
+  /// @brief <b>`59 `</b>: Remote key 1
+  ADDON_ACTION_REMOTE_1 = 59,
+
+  /// @brief <b>`60 `</b>: Remote key 2
+  ADDON_ACTION_REMOTE_2 = 60,
+
+  /// @brief <b>`61 `</b>: Remote key 3
+  ADDON_ACTION_REMOTE_3 = 61,
+
+  /// @brief <b>`62 `</b>: Remote key 4
+  ADDON_ACTION_REMOTE_4 = 62,
+
+  /// @brief <b>`63 `</b>: Remote key 5
+  ADDON_ACTION_REMOTE_5 = 63,
+
+  /// @brief <b>`64 `</b>: Remote key 6
+  ADDON_ACTION_REMOTE_6 = 64,
+
+  /// @brief <b>`65 `</b>: Remote key 7
+  ADDON_ACTION_REMOTE_7 = 65,
+
+  /// @brief <b>`66 `</b>: Remote key 8
+  ADDON_ACTION_REMOTE_8 = 66,
+
+  /// @brief <b>`67 `</b>: Remote key 9
+  ADDON_ACTION_REMOTE_9 = 67,
+
+  /// @brief <b>`69 `</b>: Show player process info (video decoder, pixel format, pvr signal strength and the like
+  ADDON_ACTION_PLAYER_PROCESS_INFO = 69,
+
+  /// @brief <b>`70 `</b>: Program select.
+  ADDON_ACTION_PLAYER_PROGRAM_SELECT = 70,
+
+  /// @brief <b>`71 `</b>: Resolution select.
+  ADDON_ACTION_PLAYER_RESOLUTION_SELECT = 71,
+
+  /// @brief <b>`76 `</b>: Jumps a few seconds back during playback of movie. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SMALL_STEP_BACK = 76,
+
+  /// @brief <b>`77 `</b>: FF in current file played. global action, can be used anywhere
+  ADDON_ACTION_PLAYER_FORWARD = 77,
+
+  /// @brief <b>`78 `</b>: RW in current file played. global action, can be used anywhere
+  ADDON_ACTION_PLAYER_REWIND = 78,
+
+  /// @brief <b>`79 `</b>: Play current song. Unpauses song and sets playspeed to 1x. global action, can be used anywhere
+  ADDON_ACTION_PLAYER_PLAY = 79,
+
+  /// @brief <b>`80 `</b>: Delete current selected item. Can be used in myfiles.xml window id=3 and in myvideoTitle.xml window id=25
+  ADDON_ACTION_DELETE_ITEM = 80,
+
+  /// @brief <b>`81 `</b>: Copy current selected item. Can be used in myfiles.xml window id=3
+  ADDON_ACTION_COPY_ITEM = 81,
+
+  /// @brief <b>`82 `</b>: move current selected item. Can be used in myfiles.xml window id=3
+  ADDON_ACTION_MOVE_ITEM = 82,
+
+  /// @brief <b>`85 `</b>: Take a screenshot.
+  ADDON_ACTION_TAKE_SCREENSHOT = 85,
+
+  /// @brief <b>`87 `</b>: Rename item.
+  ADDON_ACTION_RENAME_ITEM = 87,
+
+  /// @brief <b>`87 `</b>: Volume up.
+  ADDON_ACTION_VOLUME_UP = 88,
+
+  /// @brief <b>`87 `</b>: Volume down.
+  ADDON_ACTION_VOLUME_DOWN = 89,
+
+  /// @brief <b>`90 `</b>: Volume amplication.
+  ADDON_ACTION_VOLAMP = 90,
+
+  /// @brief <b>`90 `</b>: Mute.
+  ADDON_ACTION_MUTE = 91,
+
+  /// @brief <b>`90 `</b>: Nav back.
+  ADDON_ACTION_NAV_BACK = 92,
+
+  /// @brief <b>`90 `</b>: Volume amp up,
+  ADDON_ACTION_VOLAMP_UP = 93,
+
+  /// @brief <b>`94 `</b>: Volume amp down.
+  ADDON_ACTION_VOLAMP_DOWN = 94,
+
+  /// @brief <b>`95 `</b>: Creates an episode bookmark on the currently playing video file containing more than one
+  /// episode
+  ADDON_ACTION_CREATE_EPISODE_BOOKMARK = 95,
+
+  /// @brief <b>`96 `</b>: Creates a bookmark of the currently playing video file
+  ADDON_ACTION_CREATE_BOOKMARK = 96,
+
+  /// @brief <b>`97 `</b>: Goto the next chapter, if not available perform a big step forward
+  ADDON_ACTION_CHAPTER_OR_BIG_STEP_FORWARD = 97,
+
+  /// @brief <b>`98 `</b>: Goto the previous chapter, if not available perform a big step back
+  ADDON_ACTION_CHAPTER_OR_BIG_STEP_BACK = 98,
+
+  /// @brief <b>`99 `</b>: Switch to next subtitle of movie, but will not enable/disable the subtitles. Can be used
+  /// in videoFullScreen.xml window id=2005
+  ADDON_ACTION_CYCLE_SUBTITLE = 99,
+
+  /// @brief <b>`100`</b>: Mouse action values start.
+  ///
+  /// Ends with @ref ADDON_ACTION_MOUSE_END.
+  ADDON_ACTION_MOUSE_START = 100,
+
+  /// @brief <b>`100`</b>: Mouse left click.
+  ADDON_ACTION_MOUSE_LEFT_CLICK = 100,
+
+  /// @brief <b>`101`</b>: Mouse right click.
+  ADDON_ACTION_MOUSE_RIGHT_CLICK = 101,
+
+  /// @brief <b>`102`</b>: Mouse middle click.
+  ADDON_ACTION_MOUSE_MIDDLE_CLICK = 102,
+
+  /// @brief <b>`103`</b>: Mouse double click.
+  ADDON_ACTION_MOUSE_DOUBLE_CLICK = 103,
+
+  /// @brief <b>`104`</b>: Mouse wheel up.
+  ADDON_ACTION_MOUSE_WHEEL_UP = 104,
+
+  /// @brief <b>`105`</b>: Mouse wheel down.
+  ADDON_ACTION_MOUSE_WHEEL_DOWN = 105,
+
+  /// @brief <b>`106`</b>: Mouse drag.
+  ADDON_ACTION_MOUSE_DRAG = 106,
+
+  /// @brief <b>`107`</b>: Mouse move.
+  ADDON_ACTION_MOUSE_MOVE = 107,
+
+  /// @brief <b>`108`</b>: Mouse long click.
+  ADDON_ACTION_MOUSE_LONG_CLICK = 108,
+
+  /// @brief <b>`109`</b>: Mouse drag end.
+  ADDON_ACTION_MOUSE_DRAG_END = 109,
+
+  /// @brief <b>`109`</b>: Mouse action values end.
+  ///
+  /// Starts with @ref ADDON_ACTION_MOUSE_START.
+  ADDON_ACTION_MOUSE_END = 109,
+
+  /// @brief <b>`110`</b>: Backspace.
+  ADDON_ACTION_BACKSPACE = 110,
+
+  /// @brief <b>`111`</b>: Scroll up.
+  ADDON_ACTION_SCROLL_UP = 111,
+
+  /// @brief <b>`112`</b>: Scroll down.
+  ADDON_ACTION_SCROLL_DOWN = 112,
+
+  /// @brief <b>`113`</b>: Analog forward.
+  ADDON_ACTION_ANALOG_FORWARD = 113,
+
+  /// @brief <b>`114`</b>: Analog rewind.
+  ADDON_ACTION_ANALOG_REWIND = 114,
+
+  /// @brief <b>`115`</b>: move item up in playlist
+  ADDON_ACTION_MOVE_ITEM_UP = 115,
+
+  /// @brief <b>`116`</b>: move item down in playlist
+  ADDON_ACTION_MOVE_ITEM_DOWN = 116,
+
+  /// @brief <b>`117`</b>: pops up the context menu
+  ADDON_ACTION_CONTEXT_MENU = 117,
+
+  /// @brief <b>`118`</b>: stuff for virtual keyboard shortcuts
+  ADDON_ACTION_SHIFT = 118,
+
+  /// @brief <b>`119`</b>: stuff for virtual keyboard shortcuts
+  ADDON_ACTION_SYMBOLS = 119,
+
+  /// @brief <b>`120`</b>: stuff for virtual keyboard shortcuts
+  ADDON_ACTION_CURSOR_LEFT = 120,
+
+  /// @brief <b>`121`</b>: stuff for virtual keyboard shortcuts
+  ADDON_ACTION_CURSOR_RIGHT = 121,
+
+  /// @brief <b>`122`</b>: Build in function
+  ADDON_ACTION_BUILT_IN_FUNCTION = 122,
+
+  /// @brief <b>`114`</b>: Displays current time, can be used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_SHOW_OSD_TIME = 123,
+
+  /// @brief <b>`124`</b>: Seeks forward, and displays the seek bar.
+  ADDON_ACTION_ANALOG_SEEK_FORWARD = 124,
+
+  /// @brief <b>`125`</b>: Seeks backward, and displays the seek bar.
+  ADDON_ACTION_ANALOG_SEEK_BACK = 125,
+
+  /// @brief <b>`126`</b>: Visualization preset show.
+  ADDON_ACTION_VIS_PRESET_SHOW = 126,
+
+  /// @brief <b>`128`</b>: Visualization preset next.
+  ADDON_ACTION_VIS_PRESET_NEXT = 128,
+
+  /// @brief <b>`129`</b>: Visualization preset previous.
+  ADDON_ACTION_VIS_PRESET_PREV = 129,
+
+  /// @brief <b>`130`</b>: Visualization preset lock.
+  ADDON_ACTION_VIS_PRESET_LOCK = 130,
+
+  /// @brief <b>`131`</b>: Visualization preset random.
+  ADDON_ACTION_VIS_PRESET_RANDOM = 131,
+
+  /// @brief <b>`132`</b>: Visualization preset plus.
+  ADDON_ACTION_VIS_RATE_PRESET_PLUS = 132,
+
+  /// @brief <b>`133`</b>: Visualization preset minus.
+  ADDON_ACTION_VIS_RATE_PRESET_MINUS = 133,
+
+  /// @brief <b>`134`</b>: Show Videomenu
+  ADDON_ACTION_SHOW_VIDEOMENU = 134,
+
+  /// @brief <b>`135`</b>: Enter.
+  ADDON_ACTION_ENTER = 135,
+
+  /// @brief <b>`136`</b>: Increase rating.
+  ADDON_ACTION_INCREASE_RATING = 136,
+
+  /// @brief <b>`137`</b>: Decrease rating.
+  ADDON_ACTION_DECREASE_RATING = 137,
+
+  /// @brief <b>`138`</b>: Switch to next scene/cutpoint in movie.
+  ADDON_ACTION_NEXT_SCENE = 138,
+
+  /// @brief <b>`139`</b>: Switch to previous scene/cutpoint in movie.
+  ADDON_ACTION_PREV_SCENE = 139,
+
+  /// @brief <b>`140`</b>: Jump through a list or container to next letter.
+  ADDON_ACTION_NEXT_LETTER = 140,
+
+  /// @brief <b>`141`</b>: Jump through a list or container to previous letter.
+  ADDON_ACTION_PREV_LETTER = 141,
+
+  /// @brief <b>`142`</b>: Jump direct to a particular letter using SMS-style input
+  ///
+  /// Jump to SMS2.
+  ADDON_ACTION_JUMP_SMS2 = 142,
+
+  /// @brief <b>`143`</b>: Jump to SMS3.
+  ADDON_ACTION_JUMP_SMS3 = 143,
+
+  /// @brief <b>`144`</b>: Jump to SMS4.
+  ADDON_ACTION_JUMP_SMS4 = 144,
+
+  /// @brief <b>`145`</b>: Jump to SMS5.
+  ADDON_ACTION_JUMP_SMS5 = 145,
+
+  /// @brief <b>`146`</b>: Jump to SMS6.
+  ADDON_ACTION_JUMP_SMS6 = 146,
+
+  /// @brief <b>`147`</b>: Jump to SMS7.
+  ADDON_ACTION_JUMP_SMS7 = 147,
+
+  /// @brief <b>`148`</b>: Jump to SMS8.
+  ADDON_ACTION_JUMP_SMS8 = 148,
+
+  /// @brief <b>`149`</b>: Jump to SMS9.
+  ADDON_ACTION_JUMP_SMS9 = 149,
+
+  /// @brief <b>`150`</b>: Filter clear.
+  ADDON_ACTION_FILTER_CLEAR = 150,
+
+  /// @brief <b>`151`</b>: Filter SMS2.
+  ADDON_ACTION_FILTER_SMS2 = 151,
+
+  /// @brief <b>`152`</b>: Filter SMS3.
+  ADDON_ACTION_FILTER_SMS3 = 152,
+
+  /// @brief <b>`153`</b>: Filter SMS4.
+  ADDON_ACTION_FILTER_SMS4 = 153,
+
+  /// @brief <b>`154`</b>: Filter SMS5.
+  ADDON_ACTION_FILTER_SMS5 = 154,
+
+  /// @brief <b>`155`</b>: Filter SMS6.
+  ADDON_ACTION_FILTER_SMS6 = 155,
+
+  /// @brief <b>`156`</b>: Filter SMS7.
+  ADDON_ACTION_FILTER_SMS7 = 156,
+
+  /// @brief <b>`157`</b>: Filter SMS8.
+  ADDON_ACTION_FILTER_SMS8 = 157,
+
+  /// @brief <b>`158`</b>: Filter SMS9.
+  ADDON_ACTION_FILTER_SMS9 = 158,
+
+  /// @brief <b>`159`</b>: First page.
+  ADDON_ACTION_FIRST_PAGE = 159,
+
+  /// @brief <b>`160`</b>: Last page.
+  ADDON_ACTION_LAST_PAGE = 160,
+
+  /// @brief <b>`161`</b>: Audio delay.
+  ADDON_ACTION_AUDIO_DELAY = 161,
+
+  /// @brief <b>`162`</b>: Subtitle delay.
+  ADDON_ACTION_SUBTITLE_DELAY = 162,
+
+  /// @brief <b>`163`</b>: Menu.
+  ADDON_ACTION_MENU = 163,
+
+  /// @brief <b>`164`</b>: Set rating.
+  ADDON_ACTION_SET_RATING = 164,
+
+  /// @brief <b>`170`</b>: Record.
+  ADDON_ACTION_RECORD = 170,
+
+  /// @brief <b>`180`</b>: Paste.
+  ADDON_ACTION_PASTE = 180,
+
+  /// @brief <b>`181`</b>: Next control.
+  ADDON_ACTION_NEXT_CONTROL = 181,
+
+  /// @brief <b>`182`</b>: Previous control.
+  ADDON_ACTION_PREV_CONTROL = 182,
+
+  /// @brief <b>`183`</b>: Channel switch.
+  ADDON_ACTION_CHANNEL_SWITCH = 183,
+
+  /// @brief <b>`184`</b>: Channel up.
+  ADDON_ACTION_CHANNEL_UP = 184,
+
+  /// @brief <b>`185`</b>: Channel down.
+  ADDON_ACTION_CHANNEL_DOWN = 185,
+
+  /// @brief <b>`186`</b>: Next channel group.
+  ADDON_ACTION_NEXT_CHANNELGROUP = 186,
+
+  /// @brief <b>`187`</b>: Previous channel group.
+  ADDON_ACTION_PREVIOUS_CHANNELGROUP = 187,
+
+  /// @brief <b>`188`</b>: PVR play.
+  ADDON_ACTION_PVR_PLAY = 188,
+
+  /// @brief <b>`189`</b>: PVR play TV.
+  ADDON_ACTION_PVR_PLAY_TV = 189,
+
+  /// @brief <b>`190`</b>: PVR play radio.
+  ADDON_ACTION_PVR_PLAY_RADIO = 190,
+
+  /// @brief <b>`191`</b>: PVR show timer rule.
+  ADDON_ACTION_PVR_SHOW_TIMER_RULE = 191,
+
+  /// @brief <b>`192`</b>: Channel number sep
+  ADDON_ACTION_CHANNEL_NUMBER_SEP = 192,
+
+  /// @brief <b>`193`</b>: PVR announce reminders
+  ADDON_ACTION_PVR_ANNOUNCE_REMINDERS = 193,
+
+  /// @brief <b>`199`</b>: Switch 2 desktop resolution
+  ADDON_ACTION_TOGGLE_FULLSCREEN = 199,
+
+  /// @brief <b>`200`</b>: Toggle watched status (videos)
+  ADDON_ACTION_TOGGLE_WATCHED = 200,
+
+  /// @brief <b>`201`</b>: Scan item
+  ADDON_ACTION_SCAN_ITEM = 201,
+
+  /// @brief <b>`202`</b>: Switch digital <-> analog
+  ADDON_ACTION_TOGGLE_DIGITAL_ANALOG = 202,
+
+  /// @brief <b>`203`</b>: Reloads CButtonTranslator's keymaps
+  ADDON_ACTION_RELOAD_KEYMAPS = 203,
+
+  /// @brief <b>`204`</b>: Start the GUIControlProfiler running
+  ADDON_ACTION_GUIPROFILE_BEGIN = 204,
+
+  /// @brief <b>`215`</b>: Teletext Color button <b>Red</b> to control TopText
+  ADDON_ACTION_TELETEXT_RED = 215,
+
+  /// @brief <b>`216`</b>: Teletext Color button <b>Green</b> to control TopText
+  ADDON_ACTION_TELETEXT_GREEN = 216,
+
+  /// @brief <b>`217`</b>: Teletext Color button <b>Yellow</b> to control TopText
+  ADDON_ACTION_TELETEXT_YELLOW = 217,
+
+  /// @brief <b>`218`</b>: Teletext Color button <b>Blue</b> to control TopText
+  ADDON_ACTION_TELETEXT_BLUE = 218,
+
+  /// @brief <b>`219`</b>: Increase par.
+  ADDON_ACTION_INCREASE_PAR = 219,
+
+  /// @brief <b>`220`</b>: Decrease par.
+  ADDON_ACTION_DECREASE_PAR = 220,
+
+  /// @brief <b>`227`</b>: Shift up video image in VideoPlayer
+  ADDON_ACTION_VSHIFT_UP = 227,
+
+  /// @brief <b>`228`</b>: Shift down video image in VideoPlayer
+  ADDON_ACTION_VSHIFT_DOWN = 228,
+
+  /// @brief <b>`229`</b>: Play/pause. If playing it pauses, if paused it plays.
+  ADDON_ACTION_PLAYER_PLAYPAUSE = 229,
+
+  /// @brief <b>`230`</b>: Shift up subtitles in VideoPlayer
+  ADDON_ACTION_SUBTITLE_VSHIFT_UP = 230,
+
+  /// @brief <b>`231`</b>: Shift down subtitles in VideoPlayer
+  ADDON_ACTION_SUBTITLE_VSHIFT_DOWN = 231,
+
+  /// @brief <b>`232`</b>: Toggle vertical alignment of subtitles
+  ADDON_ACTION_SUBTITLE_ALIGN = 232,
+
+  /// @brief <b>`233`</b>: Filter.
+  ADDON_ACTION_FILTER = 233,
+
+  /// @brief <b>`234`</b>: Switch player.
+  ADDON_ACTION_SWITCH_PLAYER = 234,
+
+  /// @brief <b>`235`</b>: Stereo mode next.
+  ADDON_ACTION_STEREOMODE_NEXT = 235,
+
+  /// @brief <b>`236`</b>: Stereo mode previous.
+  ADDON_ACTION_STEREOMODE_PREVIOUS = 236,
+
+  /// @brief <b>`237`</b>: Turns 3d mode on/off.
+  ADDON_ACTION_STEREOMODE_TOGGLE = 237,
+
+  /// @brief <b>`238`</b>: Stereo mode select.
+  ADDON_ACTION_STEREOMODE_SELECT = 238,
+
+  /// @brief <b>`239`</b>: Stereo mode to mono.
+  ADDON_ACTION_STEREOMODE_TOMONO = 239,
+
+  /// @brief <b>`240`</b>: Stereo mode set.
+  ADDON_ACTION_STEREOMODE_SET = 240,
+
+  /// @brief <b>`241`</b>: Settings reset.
+  ADDON_ACTION_SETTINGS_RESET = 241,
+
+  /// @brief <b>`242`</b>: Settings level change.
+  ADDON_ACTION_SETTINGS_LEVEL_CHANGE = 242,
+
+  /// @brief <b>`243`</b>: Show autoclosing OSD. Can b used in videoFullScreen.xml window id=2005
+  ADDON_ACTION_TRIGGER_OSD = 243,
+
+  /// @brief <b>`244`</b>: Input text.
+  ADDON_ACTION_INPUT_TEXT = 244,
+
+  /// @brief <b>`245`</b>: Volume set.
+  ADDON_ACTION_VOLUME_SET = 245,
+
+  /// @brief <b>`246`</b>: Toggle commercial skip.
+  ADDON_ACTION_TOGGLE_COMMSKIP = 246,
+
+  /// @brief <b>`247`</b>: Browse for subtitle. Can be used in videofullscreen
+  ADDON_ACTION_BROWSE_SUBTITLE = 247,
+
+  /// @brief <b>`248`</b>: Send a reset command to the active game
+  ADDON_ACTION_PLAYER_RESET = 248,
+
+  /// @brief <b>`249`</b>: Toggle font. Used in TextViewer dialog
+  ADDON_ACTION_TOGGLE_FONT = 249,
+
+  /// @brief <b>`250`</b>: Cycle video streams. Used in videofullscreen.
+  ADDON_ACTION_VIDEO_NEXT_STREAM = 250,
+
+  /// @brief <b>`251`</b>: Used to queue an item to the next position in the playlist
+  ADDON_ACTION_QUEUE_ITEM_NEXT = 251,
+
+  /// @brief <b>`247`</b>: Toggle display HDR on/off
+  ADDON_ACTION_HDR_TOGGLE = 260,
+
+  /// @brief <b>`300`</b>: Voice actions
+  ADDON_ACTION_VOICE_RECOGNIZE = 300,
+
+  // Number 347 used om front by ADDON_ACTION_BROWSE_SUBTITLE
+
+  /// @brief <b>`401`</b>: Touch actions
+  ADDON_ACTION_TOUCH_TAP = 401,
+
+  /// @brief <b>`410`</b>: Touch actions
+  ADDON_ACTION_TOUCH_TAP_TEN = 410,
+
+  /// @brief <b>`411`</b>: Touch actions
+  ADDON_ACTION_TOUCH_LONGPRESS = 411,
+
+  /// @brief <b>`412`</b>: Touch actions
+  ADDON_ACTION_TOUCH_LONGPRESS_TEN = 420,
+
+  /// @brief <b>`500`</b>: Gesture notify.
+  ADDON_ACTION_GESTURE_NOTIFY = 500,
+
+  /// @brief <b>`501`</b>: Gesture begin.
+  ADDON_ACTION_GESTURE_BEGIN = 501,
+
+  /// @brief <b>`502`</b>: Send action with point and currentPinchScale (fingers together < 1.0 -> fingers apart > 1.0)
+  ADDON_ACTION_GESTURE_ZOOM = 502,
+
+  /// @brief <b>`503`</b>: Gesture rotate.
+  ADDON_ACTION_GESTURE_ROTATE = 503,
+
+  /// @brief <b>`504`</b>: Gesture pan.
+  ADDON_ACTION_GESTURE_PAN = 504,
+
+  /// @brief <b>`505`</b>: Gesture was interrupted in unspecified state
+  ADDON_ACTION_GESTURE_ABORT = 505,
+
+  /// @brief <b>`511`</b>: Gesture swipe left.
+  ADDON_ACTION_GESTURE_SWIPE_LEFT = 511,
+
+  /// @brief <b>`520`</b>: Gesture swipe left ten
+  ADDON_ACTION_GESTURE_SWIPE_LEFT_TEN = 520,
+
+  /// @brief <b>`521`</b>: Gesture swipe right
+  ADDON_ACTION_GESTURE_SWIPE_RIGHT = 521,
+
+  /// @brief <b>`530`</b>: Gesture swipe right ten
+  ADDON_ACTION_GESTURE_SWIPE_RIGHT_TEN = 530,
+
+  /// @brief <b>`531`</b>: Gesture swipe up
+  ADDON_ACTION_GESTURE_SWIPE_UP = 531,
+
+  /// @brief <b>`540`</b>: Gesture swipe up ten
+  ADDON_ACTION_GESTURE_SWIPE_UP_TEN = 540,
+
+  /// @brief <b>`541`</b>: Gesture swipe down.
+  ADDON_ACTION_GESTURE_SWIPE_DOWN = 541,
+
+  /// @brief <b>`550`</b>: Gesture swipe down ten.
+  ADDON_ACTION_GESTURE_SWIPE_DOWN_TEN = 550,
+
+  /// @brief <b>`599`</b>: 5xx is reserved for additional gesture actions
+  ADDON_ACTION_GESTURE_END = 599,
+
+  // other, non-gesture actions
+
+  /// @brief <b>`601`</b>: Analog thumbstick move, horizontal axis, left; see ADDON_ACTION_ANALOG_MOVE
+  ADDON_ACTION_ANALOG_MOVE_X_LEFT = 601,
+
+  /// @brief <b>`602`</b>: Analog thumbstick move, horizontal axis, right; see ADDON_ACTION_ANALOG_MOVE
+  ADDON_ACTION_ANALOG_MOVE_X_RIGHT = 602,
+
+  /// @brief <b>`603`</b>: Analog thumbstick move, vertical axis, up; see ADDON_ACTION_ANALOG_MOVE
+  ADDON_ACTION_ANALOG_MOVE_Y_UP = 603,
+
+  /// @brief <b>`604`</b>: Analog thumbstick move, vertical axis, down; see ADDON_ACTION_ANALOG_MOVE
+  ADDON_ACTION_ANALOG_MOVE_Y_DOWN = 604,
+
+  /// @brief <b>`998`</b>: ERROR action is used to play an error sound.
+  ADDON_ACTION_ERROR = 998,
+
+  /// @brief <b>`999`</b>: The NOOP action can be specified to disable an input event. This is
+  /// useful in user keyboard.xml etc to disable actions specified in the
+  /// system mappings.
+  ADDON_ACTION_NOOP = 999
+  ///@}
+};
+///@}
+
+#endif /* !C_API_GUI_ACTION_IDS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h
new file mode 100644
index 0000000..f0c4dc7
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_LIST_ITEM_H
+#define C_API_GUI_LIST_ITEM_H
+
+#include "definitions.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_listItem
+  {
+    KODI_GUI_LISTITEM_HANDLE(*create)
+    (KODI_HANDLE kodiBase,
+     const char* label,
+     const char* label2,
+     const char* path);
+    void (*destroy)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle);
+
+    char* (*get_label)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle);
+    void (*set_label)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, const char* label);
+    char* (*get_label2)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle);
+    void (*set_label2)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, const char* label);
+    char* (*get_art)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, const char* type);
+    void (*set_art)(KODI_HANDLE kodiBase,
+                    KODI_GUI_LISTITEM_HANDLE handle,
+                    const char* type,
+                    const char* image);
+    char* (*get_path)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle);
+    void (*set_path)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, const char* path);
+    char* (*get_property)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, const char* key);
+    void (*set_property)(KODI_HANDLE kodiBase,
+                         KODI_GUI_LISTITEM_HANDLE handle,
+                         const char* key,
+                         const char* value);
+    void (*select)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle, bool select);
+    bool (*is_selected)(KODI_HANDLE kodiBase, KODI_GUI_LISTITEM_HANDLE handle);
+  } AddonToKodiFuncTable_kodi_gui_listItem;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_LIST_ITEM_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h
new file mode 100644
index 0000000..0f844f5
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h
@@ -0,0 +1,183 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_GUI_WINDOW_H
+#define C_API_GUI_WINDOW_H
+
+#include "definitions.h"
+#include "input/action_ids.h"
+
+#include <stddef.h>
+
+#define ADDON_MAX_CONTEXT_ENTRIES 20
+#define ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH 80
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  typedef struct gui_context_menu_pair
+  {
+    unsigned int id;
+    char name[ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH];
+  } gui_context_menu_pair;
+
+  typedef struct AddonToKodiFuncTable_kodi_gui_window
+  {
+    /* Window creation functions */
+    KODI_GUI_WINDOW_HANDLE(*create)
+    (KODI_HANDLE kodiBase,
+     const char* xml_filename,
+     const char* default_skin,
+     bool as_dialog,
+     bool is_media);
+    void (*destroy)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+
+    void (*set_callbacks)(KODI_HANDLE kodiBase,
+                          KODI_GUI_WINDOW_HANDLE handle,
+                          KODI_GUI_CLIENT_HANDLE clienthandle,
+                          bool (*CBInit)(KODI_GUI_CLIENT_HANDLE),
+                          bool (*CBFocus)(KODI_GUI_CLIENT_HANDLE, int),
+                          bool (*CBClick)(KODI_GUI_CLIENT_HANDLE, int),
+                          bool (*CBOnAction)(KODI_GUI_CLIENT_HANDLE, enum ADDON_ACTION),
+                          void (*CBGetContextButtons)(
+                              KODI_GUI_CLIENT_HANDLE, int, gui_context_menu_pair*, unsigned int*),
+                          bool (*CBOnContextButton)(KODI_GUI_CLIENT_HANDLE, int, unsigned int));
+    bool (*show)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    bool (*close)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    bool (*do_modal)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+
+    /* Window control functions */
+    bool (*set_focus_id)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    int (*get_focus_id)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    void (*set_control_label)(KODI_HANDLE kodiBase,
+                              KODI_GUI_WINDOW_HANDLE handle,
+                              int control_id,
+                              const char* label);
+    void (*set_control_visible)(KODI_HANDLE kodiBase,
+                                KODI_GUI_WINDOW_HANDLE handle,
+                                int control_id,
+                                bool visible);
+    void (*set_control_selected)(KODI_HANDLE kodiBase,
+                                 KODI_GUI_WINDOW_HANDLE handle,
+                                 int control_id,
+                                 bool selected);
+
+    /* Window property functions */
+    void (*set_property)(KODI_HANDLE kodiBase,
+                         KODI_GUI_WINDOW_HANDLE handle,
+                         const char* key,
+                         const char* value);
+    void (*set_property_int)(KODI_HANDLE kodiBase,
+                             KODI_GUI_WINDOW_HANDLE handle,
+                             const char* key,
+                             int value);
+    void (*set_property_bool)(KODI_HANDLE kodiBase,
+                              KODI_GUI_WINDOW_HANDLE handle,
+                              const char* key,
+                              bool value);
+    void (*set_property_double)(KODI_HANDLE kodiBase,
+                                KODI_GUI_WINDOW_HANDLE handle,
+                                const char* key,
+                                double value);
+    char* (*get_property)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, const char* key);
+    int (*get_property_int)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, const char* key);
+    bool (*get_property_bool)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, const char* key);
+    double (*get_property_double)(KODI_HANDLE kodiBase,
+                                  KODI_GUI_WINDOW_HANDLE handle,
+                                  const char* key);
+    void (*clear_properties)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    void (*clear_property)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, const char* key);
+
+    /* List item functions */
+    void (*clear_item_list)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    void (*add_list_item)(KODI_HANDLE kodiBase,
+                          KODI_GUI_WINDOW_HANDLE handle,
+                          KODI_GUI_LISTITEM_HANDLE item,
+                          int list_position);
+    void (*remove_list_item_from_position)(KODI_HANDLE kodiBase,
+                                           KODI_GUI_WINDOW_HANDLE handle,
+                                           int list_position);
+    void (*remove_list_item)(KODI_HANDLE kodiBase,
+                             KODI_GUI_WINDOW_HANDLE handle,
+                             KODI_GUI_LISTITEM_HANDLE item);
+    KODI_GUI_LISTITEM_HANDLE(*get_list_item)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int list_position);
+    void (*set_current_list_position)(KODI_HANDLE kodiBase,
+                                      KODI_GUI_WINDOW_HANDLE handle,
+                                      int list_position);
+    int (*get_current_list_position)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    int (*get_list_size)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+    void (*set_container_property)(KODI_HANDLE kodiBase,
+                                   KODI_GUI_WINDOW_HANDLE handle,
+                                   const char* key,
+                                   const char* value);
+    void (*set_container_content)(KODI_HANDLE kodiBase,
+                                  KODI_GUI_WINDOW_HANDLE handle,
+                                  const char* value);
+    int (*get_current_container_id)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+
+    /* Various functions */
+    void (*mark_dirty_region)(KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle);
+
+    /* GUI control access functions */
+    KODI_GUI_CONTROL_HANDLE(*get_control_button)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_edit)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_fade_label)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_image)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_label)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_progress)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_radio_button)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_render_addon)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_settings_slider)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_slider)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_spin)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_text_box)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy1)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy2)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy3)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy4)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy5)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy6)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy7)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy8)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy9)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    KODI_GUI_CONTROL_HANDLE(*get_control_dummy10)
+    (KODI_HANDLE kodiBase, KODI_GUI_WINDOW_HANDLE handle, int control_id);
+    /* This above used to add new get_control_* functions */
+  } AddonToKodiFuncTable_kodi_gui_window;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_GUI_WINDOW_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/network.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h
index 6c0441f..88d5231 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/network.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h
@@ -8,7 +8,10 @@
 
 #pragma once
 
-#include <stddef.h>
+#ifndef C_API_NETWORK_H
+#define C_API_NETWORK_H
+
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -41,3 +44,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* C_API_NETWORK_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h
new file mode 100644
index 0000000..568a2fd
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifndef C_API_PLATFORM_ANDROID_H
+#define C_API_PLATFORM_ANDROID_H
+
+#define INTERFACE_ANDROID_SYSTEM_NAME "ANDROID_SYSTEM"
+#define INTERFACE_ANDROID_SYSTEM_VERSION "1.0.2"
+#define INTERFACE_ANDROID_SYSTEM_VERSION_MIN "1.0.1"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  struct AddonToKodiFuncTable_android_system
+  {
+    void* (*get_jni_env)();
+    int (*get_sdk_version)();
+    const char *(*get_class_name)();
+  };
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* !C_API_PLATFORM_ANDROID_H */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/gui/CMakeLists.txt
index 834ec00..8f12955 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/CMakeLists.txt
@@ -1,9 +1,8 @@
 set(HEADERS General.h
             ListItem.h
             Window.h
-            definitions.h
             renderHelper.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui)
+  core_add_library(addons_kodi-dev-kit_include_kodi_gui)
 endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/General.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/General.h
new file mode 100644
index 0000000..85ba3f2
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/General.h
@@ -0,0 +1,176 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/gui/general.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+
+//==============================================================================
+/// @addtogroup cpp_kodi_gui_general
+/// Permits the use of the required functions of the add-on to Kodi.
+///
+/// These are pure functions them no other initialization need.
+///
+/// It has the header @ref kodi/gui/General.h "#include <kodi/gui/General.h>" be included
+/// to enjoy it.
+///
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Performs a graphical lock of rendering engine.
+///
+inline void ATTRIBUTE_HIDDEN Lock()
+{
+  using namespace ::kodi::addon;
+  CAddonBase::m_interface->toKodi->kodi_gui->general->lock();
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Performs a graphical unlock of previous locked rendering engine.
+///
+inline void ATTRIBUTE_HIDDEN Unlock()
+{
+  using namespace ::kodi::addon;
+  CAddonBase::m_interface->toKodi->kodi_gui->general->unlock();
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Return the the current screen height with pixel.
+///
+/// @return Screen height with pixel
+///
+inline int ATTRIBUTE_HIDDEN GetScreenHeight()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_height(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Return the the current screen width with pixel.
+///
+/// @return Screen width with pixel
+///
+inline int ATTRIBUTE_HIDDEN GetScreenWidth()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_width(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Return the the current screen rendering resolution.
+///
+/// @return Current screen rendering resolution
+///
+inline int ATTRIBUTE_HIDDEN GetVideoResolution()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_video_resolution(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Returns the id for the current 'active' dialog as an integer.
+///
+/// @return The currently active dialog Id
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// ..
+/// int wid = kodi::gui::GetCurrentWindowDialogId();
+/// ..
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN GetCurrentWindowDialogId()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_dialog_id(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief Returns the id for the current 'active' window as an integer.
+///
+/// @return The currently active window Id
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// ..
+/// int wid = kodi::gui::GetCurrentWindowId();
+/// ..
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN GetCurrentWindowId()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_id(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_general
+/// @brief To get hardware specific device context interface.
+///
+/// @return A pointer to the used device with @ref cpp_kodi_Defs_HardwareContext "kodi::HardwareContext"
+///
+/// @warning This function is only be supported under Windows, on all other
+/// OS it return `nullptr`!
+///
+/// @note Returned Windows class pointer is `ID3D11DeviceContext1`.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <d3d11_1.h>
+/// ..
+/// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::gui::GetHWContext());
+/// ..
+/// ~~~~~~~~~~~~~
+///
+inline kodi::HardwareContext GetHWContext()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->general->get_hw_context(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/ListItem.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/ListItem.h
new file mode 100644
index 0000000..3a4d50b
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/ListItem.h
@@ -0,0 +1,345 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/gui/list_item.h"
+
+#ifdef __cplusplus
+
+#include <memory>
+
+namespace kodi
+{
+namespace gui
+{
+
+class CWindow;
+
+class ATTRIBUTE_HIDDEN CAddonGUIControlBase
+{
+public:
+  KODI_GUI_LISTITEM_HANDLE GetControlHandle() const { return m_controlHandle; }
+
+protected:
+  explicit CAddonGUIControlBase(CAddonGUIControlBase* window)
+    : m_controlHandle(nullptr),
+      m_interface(::kodi::addon::CAddonBase::m_interface->toKodi),
+      m_Window(window)
+  {
+  }
+
+  virtual ~CAddonGUIControlBase() = default;
+
+  friend class CWindow;
+
+  KODI_GUI_LISTITEM_HANDLE m_controlHandle;
+  AddonToKodiFuncTable_Addon* m_interface;
+  CAddonGUIControlBase* m_Window;
+
+private:
+  CAddonGUIControlBase() = delete;
+  CAddonGUIControlBase(const CAddonGUIControlBase&) = delete;
+  CAddonGUIControlBase& operator=(const CAddonGUIControlBase&) = delete;
+};
+
+class CListItem;
+
+//==============================================================================
+/// @addtogroup cpp_kodi_gui_windows_listitem
+/// @brief @cpp_class{ kodi::gui::CListItem }
+/// **Selectable window list item**\n
+/// The list item control is used for creating item lists in Kodi.
+///
+/// The with @ref ListItem.h "#include <kodi/gui/ListItem.h>" given
+/// class is used to create a item entry for a list on window and to support it's
+/// control.
+///
+class ATTRIBUTE_HIDDEN CListItem : public CAddonGUIControlBase
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Class constructor with parameters.
+  ///
+  /// @param[in] label [opt] Item label
+  /// @param[in] label2 [opt] Second Item label (if needed)
+  /// @param[in] path [opt] Path to where item is defined
+  ///
+  CListItem(const std::string& label = "",
+            const std::string& label2 = "",
+            const std::string& path = "")
+    : CAddonGUIControlBase(nullptr)
+  {
+    m_controlHandle = m_interface->kodi_gui->listItem->create(m_interface->kodiBase, label.c_str(),
+                                                              label2.c_str(), path.c_str());
+  }
+
+  /*
+   * Constructor used for parts given by list items from addon window
+   *
+   * Related to call of "std::shared_ptr<CListItem> kodi::gui::CWindow::GetListItem(int listPos)"
+   * Not needed for addon development itself
+   */
+  explicit CListItem(KODI_GUI_LISTITEM_HANDLE listItemHandle) : CAddonGUIControlBase(nullptr)
+  {
+    m_controlHandle = listItemHandle;
+  }
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Class destructor
+  ///
+  ~CListItem() override
+  {
+    m_interface->kodi_gui->listItem->destroy(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Returns the listitem label.
+  ///
+  /// @return Label of item
+  ///
+  std::string GetLabel()
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->listItem->get_label(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return label;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets the listitem label.
+  ///
+  /// @param[in] label              string or unicode - text string.
+  ///
+  void SetLabel(const std::string& label)
+  {
+    m_interface->kodi_gui->listItem->set_label(m_interface->kodiBase, m_controlHandle,
+                                               label.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Returns the second listitem label.
+  ///
+  /// @return Second label of item
+  ///
+  std::string GetLabel2()
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->listItem->get_label2(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return label;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets the listitem's label2.
+  ///
+  /// @param[in] label              string or unicode - text string.
+  ///
+  void SetLabel2(const std::string& label)
+  {
+    m_interface->kodi_gui->listItem->set_label2(m_interface->kodiBase, m_controlHandle,
+                                                label.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets the listitem's art
+  ///
+  /// @param[in] type                 Type of Art to set
+  ///  - Some default art values (any string possible):
+  ///  | value (type)  | Type                                              |
+  ///  |:-------------:|:--------------------------------------------------|
+  ///  | thumb         | string - image filename
+  ///  | poster        | string - image filename
+  ///  | banner        | string - image filename
+  ///  | fanart        | string - image filename
+  ///  | clearart      | string - image filename
+  ///  | clearlogo     | string - image filename
+  ///  | landscape     | string - image filename
+  ///  | icon          | string - image filename
+  /// @return   The url to use for Art
+  ///
+  std::string GetArt(const std::string& type)
+  {
+    std::string strReturn;
+    char* ret = m_interface->kodi_gui->listItem->get_art(m_interface->kodiBase, m_controlHandle,
+                                                         type.c_str());
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        strReturn = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets the listitem's art
+  ///
+  /// @param[in] type                 Type of Art to set
+  /// @param[in] url                  The url to use for Art
+  ///  - Some default art values (any string possible):
+  ///  | value (type)  | Type                                              |
+  ///  |:-------------:|:--------------------------------------------------|
+  ///  | thumb         | string - image filename
+  ///  | poster        | string - image filename
+  ///  | banner        | string - image filename
+  ///  | fanart        | string - image filename
+  ///  | clearart      | string - image filename
+  ///  | clearlogo     | string - image filename
+  ///  | landscape     | string - image filename
+  ///  | icon          | string - image filename
+  ///
+  void SetArt(const std::string& type, const std::string& url)
+  {
+    m_interface->kodi_gui->listItem->set_art(m_interface->kodiBase, m_controlHandle, type.c_str(),
+                                             url.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Returns the path / filename of this listitem.
+  ///
+  /// @return Path string
+  ///
+  std::string GetPath()
+  {
+    std::string strReturn;
+    char* ret = m_interface->kodi_gui->listItem->get_path(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        strReturn = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets the listitem's path.
+  ///
+  /// @param[in] path string or unicode - path, activated when item is clicked.
+  ///
+  /// @note You can use the above as keywords for arguments.
+  ///
+  void SetPath(const std::string& path)
+  {
+    m_interface->kodi_gui->listItem->set_path(m_interface->kodiBase, m_controlHandle, path.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Sets a listitem property, similar to an infolabel.
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value string or unicode - value of property.
+  ///
+  /// @note Key is NOT case sensitive.
+  ///       You can use the above as keywords for arguments and skip certain@n
+  ///       optional arguments.\n
+  ///       Once you use a keyword, all following arguments require the
+  ///       keyword.
+  ///
+  /// Some of these are treated internally by Kodi, such as the
+  /// <b>'StartOffset'</b> property, which is the offset in seconds at which to
+  /// start playback of an item.  Others may be used in the skin to add
+  /// extra information, such as <b>'WatchedCount'</b> for tvshow items
+  ///
+  void SetProperty(const std::string& key, const std::string& value)
+  {
+    m_interface->kodi_gui->listItem->set_property(m_interface->kodiBase, m_controlHandle,
+                                                  key.c_str(), value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Returns a listitem property as a string, similar to an infolabel.
+  ///
+  /// @param[in] key string - property name.
+  /// @return string - List item property
+  ///
+  /// @note Key is NOT case sensitive.\n
+  ///       You can use the above as keywords for arguments and skip certain
+  ///       optional arguments.\n
+  ///       Once you use a keyword, all following arguments require the
+  ///       keyword.
+  ///
+  std::string GetProperty(const std::string& key)
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->listItem->get_property(m_interface->kodiBase,
+                                                              m_controlHandle, key.c_str());
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return label;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief To control selection of item in list (also multiple selection,
+  /// in list on serveral items possible).
+  ///
+  /// @param[in] selected if true becomes set as selected
+  ///
+  void Select(bool selected)
+  {
+    m_interface->kodi_gui->listItem->select(m_interface->kodiBase, m_controlHandle, selected);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_listitem
+  /// @brief Returns the listitem's selected status.
+  ///
+  /// @return true if selected, otherwise false
+  ///
+  bool IsSelected()
+  {
+    return m_interface->kodi_gui->listItem->is_selected(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+};
+
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
new file mode 100644
index 0000000..3066b3c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
@@ -0,0 +1,915 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../c-api/gui/window.h"
+#include "ListItem.h"
+#include "input/ActionIDs.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_window_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_gui_windows_window
+/// @brief **Library definition values**\n
+/// Additional values, structures and things that are used in the Window class.
+///
+/// ------------------------------------------------------------------------
+///
+/// @link cpp_kodi_gui_windows_window Go back to normal functions from CWindow@endlink
+///
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_windows_window_Defs
+/// @brief **Handler for addon-sided processing class**\n
+/// If the callback functions used by the window are not used directly in the
+/// @ref cpp_kodi_gui_windows_window "CWindow" class and are outside of it.
+///
+/// This value here corresponds to a <b>`void*`</b> and returns the address
+/// requested by the add-on for callbacks.
+///
+using ClientHandle = KODI_GUI_CLIENT_HANDLE;
+//------------------------------------------------------------------------------
+
+class CListItem;
+
+//==============================================================================
+/// @addtogroup cpp_kodi_gui_windows_window
+/// @brief @cpp_class{ kodi::gui::CWindow }
+/// **Main window control class**\n
+/// The addon uses its own skin xml file and displays it in Kodi using this class.
+///
+/// The with  @ref Window.h "#include <kodi/gui/Window.h>"
+/// included file brings support to create a window or dialog on Kodi.
+///
+/// The add-on has to integrate its own @ref cpp_kodi_gui_windows_window_callbacks "callback functions"
+/// in order to process the necessary user access to its window.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Window header example:**
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <window>
+///   <onload>RunScript(script.foobar)</onload>
+///   <onunload>SetProperty(foo,bar)</onunload>
+///   <defaultcontrol always="false">2</defaultcontrol>
+///   <menucontrol>9000</menucontrol>
+///   <backgroundcolor>0xff00ff00</backgroundcolor>
+///   <views>50,51,509,510</views>
+///   <visible>Window.IsActive(Home)</visible>
+///   <animation effect="fade" time="100">WindowOpen</animation>
+///   <animation effect="slide" end="0,576" time="100">WindowClose</animation>
+///   <zorder>1</zorder>
+///   <coordinates>
+///     <left>40</left>
+///     <top>50</top>
+///     <origin x="100" y="50">Window.IsActive(Home)</origin>
+///   </coordinates>
+///   <previouswindow>MyVideos</previouswindow>
+///   <controls>
+///     <control>
+///     </control>
+///     ....
+///   </controls>
+/// </window>
+/// ~~~~~~~~~~~~~
+///
+/// --------------------------------------------------------------------------
+///
+/// On functions defined input variable <b><tt>controlId</tt> (GUI control identifier)</b>
+/// is the on window.xml defined value behind type added with <tt><b>id="..."</b></tt> and
+/// used to identify for changes there and on callbacks.
+///
+/// ~~~~~~~~~~~~~{.xml}
+///  <control type="label" id="31">
+///    <description>Title Label</description>
+///    ...
+///  </control>
+///  <control type="progress" id="32">
+///    <description>progress control</description>
+///    ...
+///  </control>
+/// ~~~~~~~~~~~~~
+///
+///
+class ATTRIBUTE_HIDDEN CWindow : public CAddonGUIControlBase
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Class constructor with needed values for window / dialog.
+  ///
+  /// Creates a new Window class.
+  ///
+  /// @param[in] xmlFilename XML file for the skin
+  /// @param[in] defaultSkin Default skin to use if needed not available
+  /// @param[in] asDialog Use window as dialog if set
+  /// @param[in] isMedia [opt] bool - if False, create a regular window.
+  ///                    if True, create a mediawindow. (default=false)
+  ///
+  /// @note <b>`isMedia`</b> value as true only usable for windows not for dialogs.
+  ///
+  CWindow(const std::string& xmlFilename,
+          const std::string& defaultSkin,
+          bool asDialog,
+          bool isMedia = false)
+    : CAddonGUIControlBase(nullptr)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->create(
+        m_interface->kodiBase, xmlFilename.c_str(), defaultSkin.c_str(), asDialog, isMedia);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow can't create window class from Kodi !!!");
+    m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
+                                                 CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
+                                                 CBGetContextButtons, CBOnContextButton);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup CWindow
+  /// @brief Class destructor.
+  ///
+  ~CWindow() override
+  {
+    if (m_controlHandle)
+      m_interface->kodi_gui->window->destroy(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Show this window.
+  ///
+  /// Shows this window by activating it, calling close() after it wil activate
+  /// the current window again.
+  ///
+  /// @note If your Add-On ends this window will be closed to. To show it forever,
+  /// make a loop at the end of your Add-On or use @ref DoModal() instead.
+  ///
+  /// @warning If used must be the class be global present until Kodi becomes
+  /// closed. The creation can be done before "Show" becomes called, but
+  /// not delete class after them.
+  ///
+  /// @return Return true if call and show is successed, if false was something
+  /// failed to get needed skin parts.
+  ///
+  bool Show()
+  {
+    return m_interface->kodi_gui->window->show(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Closes this window.
+  ///
+  /// Closes this window by activating the old window.
+  /// @note The window is not deleted with this method.
+  ///
+  void Close() { m_interface->kodi_gui->window->close(m_interface->kodiBase, m_controlHandle); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Display this window until close() is called.
+  ///
+  void DoModal()
+  {
+    m_interface->kodi_gui->window->do_modal(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Gives the control with the supplied focus.
+  ///
+  /// @param[in] controlId On skin defined id of control
+  /// @return Return true if call and focus is successed, if false was something
+  /// failed to get needed skin parts
+  ///
+  bool SetFocusId(int controlId)
+  {
+    return m_interface->kodi_gui->window->set_focus_id(m_interface->kodiBase, m_controlHandle,
+                                                       controlId);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Returns the id of the control which is focused.
+  ///
+  /// @return Focused control id
+  ///
+  int GetFocusId()
+  {
+    return m_interface->kodi_gui->window->get_focus_id(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To set the used label on given control id.
+  ///
+  /// @param[in] controlId Control id where label need to set
+  /// @param[in] label Label to use
+  ///
+  void SetControlLabel(int controlId, const std::string& label)
+  {
+    m_interface->kodi_gui->window->set_control_label(m_interface->kodiBase, m_controlHandle,
+                                                     controlId, label.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To set the visibility on given control id.
+  ///
+  /// @param[in] controlId Control id where visibility is changed
+  /// @param[in] visible Boolean value with `true` for visible, `false` for hidden
+  ///
+  void SetControlVisible(int controlId, bool visible)
+  {
+    m_interface->kodi_gui->window->set_control_visible(m_interface->kodiBase, m_controlHandle,
+                                                       controlId, visible);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To set the selection on given control id.
+  ///
+  /// @param[in] controlId Control id where selection is changed
+  /// @param[in] selected Boolean value with `true` for selected, `false` for not
+  ///
+  void SetControlSelected(int controlId, bool selected)
+  {
+    m_interface->kodi_gui->window->set_control_selected(m_interface->kodiBase, m_controlHandle,
+                                                        controlId, selected);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets a window property, similar to an infolabel.
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value string or unicode - value of property.
+  ///
+  /// @note  Key is NOT case sensitive. Setting value to an empty string is
+  ///        equivalent to clearProperty(key).\n
+  ///        You can use the above as keywords for arguments and skip certain
+  ///        optional arguments.\n
+  ///        Once you use a keyword, all following arguments require the keyword.
+  ///
+  void SetProperty(const std::string& key, const std::string& value)
+  {
+    m_interface->kodi_gui->window->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(),
+                                                value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Returns a window property as a string, similar to an infolabel.
+  ///
+  /// @param[in] key string - property name.
+  /// @return The property as string (if present)
+  ///
+  /// @note  Key is NOT case sensitive. Setting value to an empty string is
+  ///        equivalent to clearProperty(key).\n
+  ///        You can use the above as keywords for arguments and skip certain
+  ///        optional arguments.\n
+  ///        Once you use a keyword, all following arguments require the keyword.
+  ///
+  std::string GetProperty(const std::string& key) const
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->window->get_property(m_interface->kodiBase, m_controlHandle,
+                                                            key.c_str());
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return label;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets a window property with integer value
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value integer value to set
+  ///
+  void SetPropertyInt(const std::string& key, int value)
+  {
+    m_interface->kodi_gui->window->set_property_int(m_interface->kodiBase, m_controlHandle,
+                                                    key.c_str(), value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Returns a window property with integer value
+  ///
+  /// @param[in] key string - property name.
+  /// @return integer value of property
+  ///
+  int GetPropertyInt(const std::string& key) const
+  {
+    return m_interface->kodi_gui->window->get_property_int(m_interface->kodiBase, m_controlHandle,
+                                                           key.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets a window property with boolean value
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value boolean value to set
+  ///
+  void SetPropertyBool(const std::string& key, bool value)
+  {
+    m_interface->kodi_gui->window->set_property_bool(m_interface->kodiBase, m_controlHandle,
+                                                     key.c_str(), value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Returns a window property with boolean value
+  ///
+  /// @param[in] key string - property name.
+  /// @return boolean value of property
+  ///
+  bool GetPropertyBool(const std::string& key) const
+  {
+    return m_interface->kodi_gui->window->get_property_bool(m_interface->kodiBase, m_controlHandle,
+                                                            key.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets a window property with double value
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value double value to set
+  ///
+  void SetPropertyDouble(const std::string& key, double value)
+  {
+    m_interface->kodi_gui->window->set_property_double(m_interface->kodiBase, m_controlHandle,
+                                                       key.c_str(), value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Returns a window property with double value
+  ///
+  /// @param[in] key string - property name.
+  /// @return double value of property
+  ///
+  double GetPropertyDouble(const std::string& key) const
+  {
+    return m_interface->kodi_gui->window->get_property_double(m_interface->kodiBase,
+                                                              m_controlHandle, key.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Remove all present properties from window
+  ///
+  void ClearProperties()
+  {
+    m_interface->kodi_gui->window->clear_properties(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Clears the specific window property.
+  ///
+  /// @param[in] key string - property name.
+  ///
+  /// @note Key is NOT case sensitive. Equivalent to SetProperty(key, "")
+  ///       You can use the above as keywords for arguments and skip certain
+  ///       optional arguments.
+  ///       Once you use a keyword, all following arguments require the
+  ///       keyword.
+  ///
+  ///
+  ///-----------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ..
+  /// ClearProperty('Category')
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  void ClearProperty(const std::string& key)
+  {
+    m_interface->kodi_gui->window->clear_property(m_interface->kodiBase, m_controlHandle,
+                                                  key.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  /// @{
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Function delete all entries in integrated list.
+  ///
+  void ClearList()
+  {
+    m_interface->kodi_gui->window->clear_item_list(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To add a list item in the on window integrated list.
+  ///
+  /// @param[in] item List item to add
+  /// @param[in] itemPosition [opt] The position for item, default is on end
+  ///
+  void AddListItem(std::shared_ptr<CListItem> item, int itemPosition = -1)
+  {
+    m_interface->kodi_gui->window->add_list_item(m_interface->kodiBase, m_controlHandle,
+                                                 item->m_controlHandle, itemPosition);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To add a list item based upon string in the on window integrated list.
+  ///
+  /// @param[in] item List item to add
+  /// @param[in] itemPosition [opt] The position for item, default is on end
+  ///
+  void AddListItem(const std::string item, int itemPosition = -1)
+  {
+    m_interface->kodi_gui->window->add_list_item(
+        m_interface->kodiBase, m_controlHandle,
+        std::make_shared<kodi::gui::CListItem>(item)->m_controlHandle, itemPosition);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Remove list item on position.
+  ///
+  /// @param[in] itemPosition List position to remove
+  ///
+  void RemoveListItem(int itemPosition)
+  {
+    m_interface->kodi_gui->window->remove_list_item_from_position(m_interface->kodiBase,
+                                                                  m_controlHandle, itemPosition);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Remove item with given control class from list.
+  ///
+  /// @param[in] item List item control class to remove
+  ///
+  void RemoveListItem(std::shared_ptr<CListItem> item)
+  {
+    m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle,
+                                                    item->m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To get list item control class on wanted position.
+  ///
+  /// @param[in] listPos Position from where control is needed
+  /// @return The list item control class or null if not found
+  ///
+  /// @warning Function returns a new generated **CListItem** class!
+  ///
+  std::shared_ptr<CListItem> GetListItem(int listPos)
+  {
+    KODI_GUI_LISTITEM_HANDLE handle = m_interface->kodi_gui->window->get_list_item(
+        m_interface->kodiBase, m_controlHandle, listPos);
+    if (!handle)
+      return std::shared_ptr<CListItem>();
+
+    return std::make_shared<kodi::gui::CListItem>(handle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To set position of selected part in list.
+  ///
+  /// @param[in] listPos Position to use
+  ///
+  void SetCurrentListPosition(int listPos)
+  {
+    m_interface->kodi_gui->window->set_current_list_position(m_interface->kodiBase, m_controlHandle,
+                                                             listPos);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To get current selected position in list
+  ///
+  /// @return Current list position
+  ///
+  int GetCurrentListPosition()
+  {
+    return m_interface->kodi_gui->window->get_current_list_position(m_interface->kodiBase,
+                                                                    m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To get the amount of entries in the list.
+  ///
+  /// @return Size of in window integrated control class
+  ///
+  int GetListSize()
+  {
+    return m_interface->kodi_gui->window->get_list_size(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets a container property, similar to an infolabel.
+  ///
+  /// @param[in] key string - property name.
+  /// @param[in] value string or unicode - value of property.
+  ///
+  /// @note Key is NOT case sensitive.\n
+  /// You can use the above as keywords for arguments and skip certain
+  /// optional arguments.\n
+  /// Once you use a keyword, all following arguments require the keyword.
+  ///
+  void SetContainerProperty(const std::string& key, const std::string& value)
+  {
+    m_interface->kodi_gui->window->set_container_property(m_interface->kodiBase, m_controlHandle,
+                                                          key.c_str(), value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Sets the content type of the container.
+  ///
+  /// @param[in] value string or unicode - content value.
+  ///
+  /// __Available content types__
+  /// | Name        | Media                                    |
+  /// |:-----------:|:-----------------------------------------|
+  /// | actors      | Videos
+  /// | addons      | Addons, Music, Pictures, Programs, Videos
+  /// | albums      | Music, Videos
+  /// | artists     | Music, Videos
+  /// | countries   | Music, Videos
+  /// | directors   | Videos
+  /// | files       | Music, Videos
+  /// | games       | Games
+  /// | genres      | Music, Videos
+  /// | images      | Pictures
+  /// | mixed       | Music, Videos
+  /// | movies      | Videos
+  /// | Musicvideos | Music, Videos
+  /// | playlists   | Music, Videos
+  /// | seasons     | Videos
+  /// | sets        | Videos
+  /// | songs       | Music
+  /// | studios     | Music, Videos
+  /// | tags        | Music, Videos
+  /// | tvshows     | Videos
+  /// | videos      | Videos
+  /// | years       | Music, Videos
+  ///
+  void SetContainerContent(const std::string& value)
+  {
+    m_interface->kodi_gui->window->set_container_content(m_interface->kodiBase, m_controlHandle,
+                                                         value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief Get the id of the currently visible container.
+  ///
+  /// @return currently visible container id
+  ///
+  int GetCurrentContainerId()
+  {
+    return m_interface->kodi_gui->window->get_current_container_id(m_interface->kodiBase,
+                                                                   m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+  /// @}
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @brief To inform Kodi that it need to render region new.
+  ///
+  void MarkDirtyRegion()
+  {
+    return m_interface->kodi_gui->window->mark_dirty_region(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_gui_windows_window_callbacks Callback functions from Kodi to add-on
+  /// @ingroup cpp_kodi_gui_windows_window
+  /// @{
+  /// @brief <b>GUI window callback functions.</b>\n
+  /// Functions to handle control callbacks from Kodi
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// @link cpp_kodi_gui_windows_window Go back to normal functions from CWindow@endlink
+  //
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief OnInit method.
+  ///
+  /// @return Return true if initialize was done successful
+  ///
+  ///
+  virtual bool OnInit() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief OnFocus method.
+  ///
+  /// @param[in] controlId GUI control identifier
+  /// @return Return true if focus condition was handled there or false to handle
+  ///         them by Kodi itself
+  ///
+  ///
+  virtual bool OnFocus(int controlId) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief OnClick method.
+  ///
+  /// @param[in] controlId GUI control identifier
+  /// @return Return true if click was handled there or false to handle them by
+  ///         Kodi itself
+  ///
+  ///
+  virtual bool OnClick(int controlId) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief OnAction method.
+  ///
+  /// @param[in] actionId             The action id to perform, see
+  ///                                 @ref kodi_key_action_ids to get list of
+  ///                                 them
+  /// @return Return true if action was handled there
+  ///                                 or false to handle them by Kodi itself
+  ///
+  ///
+  /// This method will receive all actions that the main program will send
+  /// to this window.
+  ///
+  /// @note
+  /// - By default, only the @c ADDON_ACTION_PREVIOUS_MENU and @c ADDON_ACTION_NAV_BACK actions are handled.
+  /// - Overwrite this method to let your code handle all actions.
+  /// - Don't forget to capture @ref ADDON_ACTION_PREVIOUS_MENU or @ref ADDON_ACTION_NAV_BACK, else the user can't close this window.
+  ///
+  ///
+  ///----------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ..
+  /// // Window used with parent / child way
+  /// bool cYOUR_CLASS::OnAction(ADDON_ACTION actionId)
+  /// {
+  ///   switch (action)
+  ///   {
+  ///     case ADDON_ACTION_PREVIOUS_MENU:
+  ///     case ADDON_ACTION_NAV_BACK:
+  ///       printf("action recieved: previous");
+  ///       Close();
+  ///       return true;
+  ///     case ADDON_ACTION_SHOW_INFO:
+  ///       printf("action recieved: show info");
+  ///       break;
+  ///     case ADDON_ACTION_STOP:
+  ///       printf("action recieved: stop");
+  ///       break;
+  ///     case ADDON_ACTION_PAUSE:
+  ///       printf("action recieved: pause");
+  ///       break;
+  ///     default:
+  ///       break;
+  ///   }
+  ///   return false;
+  /// }
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual bool OnAction(ADDON_ACTION actionId)
+  {
+    switch (actionId)
+    {
+      case ADDON_ACTION_PREVIOUS_MENU:
+      case ADDON_ACTION_NAV_BACK:
+        Close();
+        return true;
+      default:
+        break;
+    }
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief Get context menu buttons for list entry.
+  ///
+  /// @param[in] itemNumber Selected list item entry
+  /// @param[in] buttons List where context menus becomes added with his
+  ///                    identifier and name
+  ///
+  virtual void GetContextButtons(int itemNumber,
+                                 std::vector<std::pair<unsigned int, std::string>>& buttons)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief Called after selection in context menu.
+  ///
+  /// @param[in] itemNumber Selected list item entry
+  /// @param[in] button The pressed button id
+  /// @return true if handled, otherwise false
+  ///
+  virtual bool OnContextButton(int itemNumber, unsigned int button) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_window_callbacks
+  /// @brief **Set independent callbacks**
+  ///
+  /// If the class is used independent (with "new CWindow") and
+  /// not as parent (with \"cCLASS_own : public @ref cpp_kodi_gui_windows_window "kodi::gui::CWindow"\") from own must be the
+  /// callback from Kodi to add-on overdriven with own functions!
+  ///
+  /// @param[in] cbhdl The pointer to own handle data structure / class
+  /// @param[in] CBOnInit Own defined window init function
+  /// @param[in] CBOnFocus Own defined focus function
+  /// @param[in] CBOnClick Own defined click function
+  /// @param[in] CBOnAction Own defined action function
+  /// @param[in] CBGetContextButtons [opt] To get context menu entries for
+  ///                                lists function
+  /// @param[in] CBOnContextButton [opt] Used context menu entry function
+  ///
+  ///
+  ///----------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  ///
+  /// bool OnInit(kodi::gui::ClientHandle cbhdl)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// bool OnFocus(kodi::gui::ClientHandle cbhdl, int controlId)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// bool OnClick(kodi::gui::ClientHandle cbhdl, int controlId)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// bool OnAction(kodi::gui::ClientHandle cbhdl, ADDON_ACTION actionId)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// ...
+  /// // Somewhere where you create the window
+  /// CWindow myWindow = new CWindow;
+  /// myWindow->SetIndependentCallbacks(myWindow, OnInit, OnFocus, OnClick, OnAction);
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetIndependentCallbacks(kodi::gui::ClientHandle cbhdl,
+                               bool (*CBOnInit)(kodi::gui::ClientHandle cbhdl),
+                               bool (*CBOnFocus)(kodi::gui::ClientHandle cbhdl, int controlId),
+                               bool (*CBOnClick)(kodi::gui::ClientHandle cbhdl, int controlId),
+                               bool (*CBOnAction)(kodi::gui::ClientHandle cbhdl,
+                                                  ADDON_ACTION actionId),
+                               void (*CBGetContextButtons)(kodi::gui::ClientHandle cbhdl,
+                                                           int itemNumber,
+                                                           gui_context_menu_pair* buttons,
+                                                           unsigned int* size) = nullptr,
+                               bool (*CBOnContextButton)(kodi::gui::ClientHandle cbhdl,
+                                                         int itemNumber,
+                                                         unsigned int button) = nullptr)
+  {
+    if (!cbhdl || !CBOnInit || !CBOnFocus || !CBOnClick || !CBOnAction)
+    {
+      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CWindow::%s called with nullptr !!!", __FUNCTION__);
+      return;
+    }
+
+    m_interface->kodi_gui->window->set_callbacks(m_interface->kodiBase, m_controlHandle, cbhdl,
+                                                 CBOnInit, CBOnFocus, CBOnClick, CBOnAction,
+                                                 CBGetContextButtons, CBOnContextButton);
+  }
+  //----------------------------------------------------------------------------
+  /// @}
+
+private:
+  static bool CBOnInit(KODI_GUI_CLIENT_HANDLE cbhdl)
+  {
+    return static_cast<CWindow*>(cbhdl)->OnInit();
+  }
+
+  static bool CBOnFocus(KODI_GUI_CLIENT_HANDLE cbhdl, int controlId)
+  {
+    return static_cast<CWindow*>(cbhdl)->OnFocus(controlId);
+  }
+
+  static bool CBOnClick(KODI_GUI_CLIENT_HANDLE cbhdl, int controlId)
+  {
+    return static_cast<CWindow*>(cbhdl)->OnClick(controlId);
+  }
+
+  static bool CBOnAction(KODI_GUI_CLIENT_HANDLE cbhdl, ADDON_ACTION actionId)
+  {
+    return static_cast<CWindow*>(cbhdl)->OnAction(actionId);
+  }
+
+  static void CBGetContextButtons(KODI_GUI_CLIENT_HANDLE cbhdl,
+                                  int itemNumber,
+                                  gui_context_menu_pair* buttons,
+                                  unsigned int* size)
+  {
+    std::vector<std::pair<unsigned int, std::string>> buttonList;
+    static_cast<CWindow*>(cbhdl)->GetContextButtons(itemNumber, buttonList);
+    if (!buttonList.empty())
+    {
+      unsigned int presentSize = static_cast<unsigned int>(buttonList.size());
+      if (presentSize > *size)
+        kodi::Log(ADDON_LOG_WARNING, "GetContextButtons: More as allowed '%i' entries present!",
+                  *size);
+      else
+        *size = presentSize;
+      for (unsigned int i = 0; i < *size; ++i)
+      {
+        buttons[i].id = buttonList[i].first;
+        strncpy(buttons[i].name, buttonList[i].second.c_str(), ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH);
+      }
+    }
+  }
+
+  static bool CBOnContextButton(KODI_GUI_CLIENT_HANDLE cbhdl, int itemNumber, unsigned int button)
+  {
+    return static_cast<CWindow*>(cbhdl)->OnContextButton(itemNumber, button);
+  }
+};
+
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Button.h
index 081ab06..873a549 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Button.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/button.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,35 +20,33 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CButton Control Button
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CButton }
-/// **Standard push button control for window**
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CButton Control Button
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CButton }
+/// **Standard push button control for window**\n
+/// The button control is used for creating push buttons in Kodi.
 ///
-/// The  button  control  is used for creating push buttons  in Kodi.  You can
-/// choose the position,  size,  and look of the button,  as well as  choosing
-/// what action(s) should be performed when pushed.
+/// You can choose the position, size, and look of the button, as well as
+/// choosing what action(s) should be performed when pushed.
 ///
-/// It has the header \ref Button.h "#include <kodi/gui/controls/Button.h>"
+/// It has the header @ref Button.h "#include <kodi/gui/controls/Button.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref skin_Button_control "button control"
+/// Here you find the needed skin part for a @ref skin_Button_control "button control"
 ///
-/// @note The call of the control is  only  possible  from  the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CButton : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CButton(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -55,64 +55,59 @@ public:
     if (!m_controlHandle)
       kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CButton can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Destructor.
   ///
   ~CButton() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_button->set_visible(m_interface->kodiBase, m_controlHandle,
                                                        visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Set's the control's enabled/disabled state
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Set's the control's enabled/disabled state.
   ///
-  /// @param[in] enabled              If true enabled, otherwise disabled
+  /// @param[in] enabled If true enabled, otherwise disabled
   ///
   void SetEnabled(bool enabled)
   {
     m_interface->kodi_gui->control_button->set_enabled(m_interface->kodiBase, m_controlHandle,
                                                        enabled);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief To set the text string on button.
   ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief To set the text string on button
-  ///
-  /// @param[in] label                Text to show
+  /// @param[in] label Text to show
   ///
   void SetLabel(const std::string& label)
   {
     m_interface->kodi_gui->control_button->set_label(m_interface->kodiBase, m_controlHandle,
                                                      label.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Get the used text from button
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Get the used text from button.
   ///
-  /// @return                         Text shown
+  /// @return Text shown
   ///
   std::string GetLabel() const
   {
@@ -127,28 +122,26 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief If two labels are used for button becomes it set with them
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief If two labels are used for button becomes it set with them.
   ///
-  /// @param[in] label                Text for second label
+  /// @param[in] label Text for second label
   ///
   void SetLabel2(const std::string& label)
   {
     m_interface->kodi_gui->control_button->set_label2(m_interface->kodiBase, m_controlHandle,
                                                       label.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CButton
+  /// @brief Get the second label if present.
   ///
-  /// @ingroup cpp_kodi_gui_control_CButton
-  /// @brief Get the second label if present
-  ///
-  /// @return                         Second label
+  /// @return Second label
   ///
   std::string GetLabel2() const
   {
@@ -163,9 +156,11 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/CMakeLists.txt
index c7cc1dd..3fdab01 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/CMakeLists.txt
@@ -12,5 +12,5 @@ set(HEADERS Button.h
             TextBox.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui_controls)
+  core_add_library(addons_kodi-dev-kit_include_kodi_gui_controls)
 endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Edit.h
index 99c01de..00c6231 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Edit.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/edit.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,93 +20,43 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_controls_CEdit Control Edit
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CEdit }
-  /// **Editable window text control used as an input control for the osd keyboard
-  /// and other input fields**
-  ///
-  /// The edit control  allows a user to  input text in Kodi. You can choose the
-  /// font, size, colour, location and header of the text to be displayed.
-  ///
-  /// It has the header \ref Edit.h "#include <kodi/gui/controls/Edit.h>"
-  /// be included to enjoy it.
-  ///
-  /// Here  you  find  the   needed  skin  part  for  a   \ref skin_Edit_control
-  /// "edit control".
-  ///
-  /// @note The  call of the  control is only possible  from  the  corresponding
-  /// window as its class and identification number is required.
-  ///
-
-  //============================================================================
-  // see gui/definition.h for use of group "cpp_kodi_gui_controls_CEdit_Defs"
-  ///
-  /// \defgroup cpp_kodi_gui_controls_CEdit_Defs Definitions, structures and enumerators
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief **Library definition values**
-  ///
-
-} /* namespace controls */
-} /* namespace gui */
-} /* namespace kodi */
-
-//============================================================================
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CEdit Control Edit
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CEdit }
+/// **Editable window text control used as an input control for the osd keyboard
+/// and other input fields**\n
+/// The edit control allows a user to input text in Kodi.
+///
+/// You can choose the font, size, colour, location and header of the text to be
+/// displayed.
+///
+/// It has the header @ref Edit.h "#include <kodi/gui/controls/Edit.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin partfor a @ref skin_Edit_control "edit control".
+///
+/// @note The call of the control is only possible from the corresponding
+/// window as its class and identification number is required.
 ///
-/// \ingroup cpp_kodi_gui_controls_CEdit_Defs
-/// @{
-/// @anchor AddonGUIInputType
-/// @brief Text input types used on kodi::gui::controls::CEdit
-enum AddonGUIInputType
-{
-  /// Text inside edit control only readable
-  ADDON_INPUT_TYPE_READONLY = -1,
-  /// Normal text entries
-  ADDON_INPUT_TYPE_TEXT = 0,
-  /// To use on edit control only numeric numbers
-  ADDON_INPUT_TYPE_NUMBER,
-  /// To insert seconds
-  ADDON_INPUT_TYPE_SECONDS,
-  /// To insert time
-  ADDON_INPUT_TYPE_TIME,
-  /// To insert a date
-  ADDON_INPUT_TYPE_DATE,
-  /// Used for write in IP addresses
-  ADDON_INPUT_TYPE_IPADDRESS,
-  /// Text field used as password entry field with not visible text
-  ADDON_INPUT_TYPE_PASSWORD,
-  /// Text field used as password entry field with not visible text but
-  /// returned as MD5 value
-  ADDON_INPUT_TYPE_PASSWORD_MD5,
-  /// Use text field for search purpose
-  ADDON_INPUT_TYPE_SEARCH,
-  /// Text field as filter
-  ADDON_INPUT_TYPE_FILTER,
-  ///
-  ADDON_INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW
-};
-/// @}
-//----------------------------------------------------------------------------
 
-namespace kodi
-{
-namespace gui
-{
-namespace controls
-{
+//==============================================================================
+// see gui/definition.h for use of group "cpp_kodi_gui_windows_controls_CEdit_Defs"
+///
+/// @defgroup cpp_kodi_gui_windows_controls_CEdit_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_gui_windows_controls_CEdit
+/// @brief **Library definition values**
+///
 
 class ATTRIBUTE_HIDDEN CEdit : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CEdit(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -114,64 +66,59 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::control::CEdit can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief Destructor.
   ///
   ~CEdit() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_edit->set_visible(m_interface->kodiBase, m_controlHandle,
                                                      visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief Set's the control's enabled/disabled state
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief Set's the control's enabled/disabled state.
   ///
-  /// @param[in] enabled              If true enabled, otherwise disabled
+  /// @param[in] enabled If true enabled, otherwise disabled
   ///
   void SetEnabled(bool enabled)
   {
     m_interface->kodi_gui->control_edit->set_enabled(m_interface->kodiBase, m_controlHandle,
                                                      enabled);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief To set the text string on edit control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief To set the text string on edit control.
   ///
-  /// @param[in] label                Text to show
+  /// @param[in] label Text to show
   ///
   void SetLabel(const std::string& label)
   {
     m_interface->kodi_gui->control_edit->set_label(m_interface->kodiBase, m_controlHandle,
                                                    label.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
   /// @brief Returns the text heading for this edit control.
   ///
-  /// @return                         Heading text
+  /// @return Heading text
   ///
   std::string GetLabel() const
   {
@@ -186,11 +133,10 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
   /// @brief Set's text heading for this edit control.
   ///
   /// @param[in] text                 string or unicode - text string.
@@ -200,14 +146,13 @@ public:
     m_interface->kodi_gui->control_edit->set_text(m_interface->kodiBase, m_controlHandle,
                                                   text.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
   /// @brief Returns the text value for this edit control.
   ///
-  /// @return                         Text value of control
+  /// @return Text value of control
   ///
   std::string GetText() const
   {
@@ -222,54 +167,51 @@ public:
     }
     return text;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
   /// @brief Set the cursor position on text.
   ///
-  /// @param[in] iPosition            The position to set
+  /// @param[in] position The position to set
   ///
-  void SetCursorPosition(unsigned int iPosition)
+  void SetCursorPosition(unsigned int position)
   {
     m_interface->kodi_gui->control_edit->set_cursor_position(m_interface->kodiBase, m_controlHandle,
-                                                             iPosition);
+                                                             position);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief To get current cursor position on text field
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief To get current cursor position on text field.
   ///
-  /// @return                         The current cursor position
+  /// @return The current cursor position
   ///
   unsigned int GetCursorPosition()
   {
     return m_interface->kodi_gui->control_edit->get_cursor_position(m_interface->kodiBase,
                                                                     m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CEdit
-  /// @brief To set field input type which are defined on \ref AddonGUIInputType
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CEdit
+  /// @brief To set field input type which are defined on @ref AddonGUIInputType.
   ///
-  /// @param[in] type                 The \ref AddonGUIInputType "Add-on input type"
-  ///                                 to use
-  /// @param[in] heading              The heading text for related keyboard
-  ///                                 dialog
+  /// @param[in] type The @ref AddonGUIInputType "Add-on input type" to use
+  /// @param[in] heading The heading text for related keyboard dialog
   ///
   void SetInputType(AddonGUIInputType type, const std::string& heading)
   {
     m_interface->kodi_gui->control_edit->set_input_type(m_interface->kodiBase, m_controlHandle,
                                                         static_cast<int>(type), heading.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/FadeLabel.h
index 02c843f..01847fb 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/FadeLabel.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/fade_label.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,40 +20,38 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CFadeLabel Control Fade Label
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CFadeLabel }
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CFadeLabel Control Fade Label
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CFadeLabel }
 /// **Window control used to show multiple pieces of text in the same position,
-/// by fading from one to the other**
+/// by fading from one to the other**\n
+/// The fade label control is used for displaying multiple pieces of text in
+/// the same space in Kodi.
 ///
-/// The fade label  control is used for displaying multiple pieces  of text in
-/// the same  space in  Kodi. You can choose  the font, size, colour, location
-/// and contents  of the text to be displayed.  The first piece of information
-/// to display fades in over 50 frames, then scrolls off to the left.  Once it
-/// is  finished scrolling off screen,  the second piece  of information fades
-/// in and  the process repeats.  A fade label  control is not  supported in a
-/// list container.
+/// You can choose the font, size, colour, location and contents of the text to
+/// be displayed. The first piece of information to display fades in over 50
+/// frames, then scrolls off to the left. Once it is finished scrolling off
+/// screen, the second piece of information fades in and the process repeats.
+/// A fade label control is not supported in a list container.
 ///
-/// It has the header \ref FadeLabel.h "#include <kodi/gui/controls/FadeLabel.h>"
+/// It has the header @ref FadeLabel.h "#include <kodi/gui/controls/FadeLabel.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Fade_Label_Control "fade label control"
+/// Here you find the needed skin part for a @ref Fade_Label_Control "fade label control".
 ///
-/// @note The  call of the  control is only  possible from  the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CFadeLabel : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
   /// @brief Construct a new control.
   ///
-  /// @param[in] window     related window control class
-  /// @param[in] controlId  Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CFadeLabel(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -61,50 +61,46 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CFadeLabel can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
   /// @brief Destructor.
   ///
   ~CFadeLabel() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
   /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible    If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_fade_label->set_visible(m_interface->kodiBase, m_controlHandle,
                                                            visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
   /// @brief To add additional text string on fade label.
   ///
-  /// @param[in] label      Text to show
+  /// @param[in] label Text to show
   ///
   void AddLabel(const std::string& label)
   {
     m_interface->kodi_gui->control_fade_label->add_label(m_interface->kodiBase, m_controlHandle,
                                                          label.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-  /// @brief Get the used text from button
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
+  /// @brief Get the used text from button.
   ///
-  /// @return               Text shown
+  /// @return Text shown
   ///
   std::string GetLabel() const
   {
@@ -119,35 +115,34 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-  /// @brief To enable or disable scrolling on fade label
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
+  /// @brief To enable or disable scrolling on fade label.
   ///
-  /// @param[in] scroll     To  enable scrolling  set  to true,  otherwise  is
-  ///                       disabled
+  /// @param[in] scroll To enable scrolling set to true, otherwise is disabled
   ///
   void SetScrolling(bool scroll)
   {
     m_interface->kodi_gui->control_fade_label->set_scrolling(m_interface->kodiBase, m_controlHandle,
                                                              scroll);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CFadeLabel
   /// @brief To reset al inserted labels.
   ///
   void Reset()
   {
     m_interface->kodi_gui->control_fade_label->reset(m_interface->kodiBase, m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Image.h
index b4d092f..9dc493e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Image.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/image.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -19,33 +21,30 @@ namespace controls
 {
 
 //============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CImage Control Image
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CImage }
-/// **Window control used to show an image.**
-///
-/// The  image control is used  for displaying  images in Kodi. You can choose
+/// @defgroup cpp_kodi_gui_windows_controls_CImage Control Image
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CImage }
+/// **Window control used to show an image.**\n
+/// The image control is used for displaying images in Kodi. You can choose
 /// the position, size, transparency and contents of the image to be displayed.
 ///
-/// It has the header \ref Image.h "#include <kodi/gui/controls/Image.h>"
+/// It has the header @ref Image.h "#include <kodi/gui/controls/Image.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Image_Control "image control"
+/// Here you find the needed skin part for a @ref Image_Control "image control".
 ///
-/// @note The  call of  the control is  only possible  from the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CImage : public CAddonGUIControlBase
 {
 public:
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CImage
+  /// @brief Construct a new control.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CImage
-  /// @brief Construct a new control
-  ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CImage(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -58,19 +57,17 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CImage
-  /// @brief Destructor
+  /// @ingroup cpp_kodi_gui_windows_controls_CImage
+  /// @brief Destructor.
   ///
   ~CImage() override = default;
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CImage
+  /// @brief Set the control on window to visible.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CImage
-  /// @brief Set the control on window to visible
-  ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
@@ -80,14 +77,12 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @ingroup cpp_kodi_gui_windows_controls_CImage
   /// @brief To set the filename used on image control.
   ///
-  /// @param[in] filename             Image file to use
-  /// @param[in] useCache             To define  storage of image,  default is
-  ///                                 in  cache,  if false  becomes it  loaded
-  ///                                 always on changes again
+  /// @param[in] filename Image file to use
+  /// @param[in] useCache To define storage of image, default is in cache, if
+  ///                     false becomes it loaded always on changes again
   ///
   void SetFileName(const std::string& filename, bool useCache = true)
   {
@@ -97,11 +92,10 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @ingroup cpp_kodi_gui_windows_controls_CImage
   /// @brief To set set the diffuse color on image.
   ///
-  /// @param[in] colorDiffuse         Color to use for diffuse
+  /// @param[in] colorDiffuse Color to use for diffuse
   ///
   void SetColorDiffuse(uint32_t colorDiffuse)
   {
@@ -114,3 +108,5 @@ public:
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Label.h
index 82604bd..d10b85f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Label.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/label.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,34 +20,31 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CLabel Control Label
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CLabel }
-/// **Window control used to show some lines of text.**
-///
-/// The  label control  is used for  displaying text  in Kodi.  You can choose
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CLabel Control Label
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CLabel }
+/// **Window control used to show some lines of text**\n
+/// The label control is used for displaying text in Kodi. You can choose
 /// the font, size, colour, location and contents of the text to be displayed.
 ///
-/// It has the header \ref Label.h "#include <kodi/gui/controls/Label.h>"
+/// It has the header @ref Label.h "#include <kodi/gui/controls/Label.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Label_Control "label control"
+/// Here you find the needed skin part for a @ref Label_Control "label control".
 ///
-/// @note The  call  of the control  is only possible  from the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CLabel : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CLabel
+  /// @brief Construct a new control.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CLabel
-  /// @brief Construct a new control
-  ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CLabel(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -55,50 +54,46 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CLabel can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CLabel
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CLabel
+  /// @brief Destructor.
   ///
   ~CLabel() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CLabel
+  /// @brief Set the control on window to visible.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CLabel
-  /// @brief Set the control on window to visible
-  ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_label->set_visible(m_interface->kodiBase, m_controlHandle,
                                                       visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CLabel
-  /// @brief To set the text string on label
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CLabel
+  /// @brief To set the text string on label.
   ///
-  /// @param[in] text                 Text to show
+  /// @param[in] text Text to show
   ///
   void SetLabel(const std::string& text)
   {
     m_interface->kodi_gui->control_label->set_label(m_interface->kodiBase, m_controlHandle,
                                                     text.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CLabel
+  /// @brief Get the used text from control.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CLabel
-  /// @brief Get the used text from control
-  ///
-  /// @return                         Used text on label control
+  /// @return Used text on label control
   ///
   std::string GetLabel() const
   {
@@ -113,9 +108,11 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Progress.h
index 8cb582b..83b16aa 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Progress.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/progress.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,21 +20,20 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CProgress Control Progress
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CProgress }
-/// **Window control to show the progress of a particular operation**
-///
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CProgress Control Progress
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CProgress }
+/// **Window control to show the progress of a particular operation**\n
 /// The progress control is used to show the progress of an item that may take
-/// a long time,  or to show how far  through a movie you are.  You can choose
-/// the position, size, and look of the progress control.
+/// a long time, or to show how far through a movie you are.
 ///
-/// It has the header \ref Progress.h "#include <kodi/gui/controls/Progress.h>"
+/// You can choose  the position, size, and look of the progress control.
+///
+/// It has the header @ref Progress.h "#include <kodi/gui/controls/Progress.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Progress_Control "progress control"
+/// Here you find the needed skin part for a @ref Progress_Control "progress control".
 ///
 /// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
@@ -40,13 +41,12 @@ namespace controls
 class ATTRIBUTE_HIDDEN CProgress : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CProgress
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CProgress
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CProgress(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -56,59 +56,57 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CProgress can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CProgress
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CProgress
+  /// @brief Destructor.
   ///
   ~CProgress() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CProgress
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CProgress
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_progress->set_visible(m_interface->kodiBase, m_controlHandle,
                                                          visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CProgress
-  /// @brief To set Percent position of control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CProgress
+  /// @brief To set Percent position of control.
   ///
-  /// @param[in] percent              The percent position to use
+  /// @param[in] percent The percent position to use
   ///
   void SetPercentage(float percent)
   {
     m_interface->kodi_gui->control_progress->set_percentage(m_interface->kodiBase, m_controlHandle,
                                                             percent);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CProgress
+  /// @brief Get the active percent position of progress bar.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CProgress
-  /// @brief Get the active percent position of progress bar
-  ///
-  /// @return                         Progress position as percent
+  /// @return Progress position as percent
   ///
   float GetPercentage() const
   {
     return m_interface->kodi_gui->control_progress->get_percentage(m_interface->kodiBase,
                                                                    m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/RadioButton.h
index 305195d..3b6a23c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/RadioButton.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/radio_button.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,36 +20,87 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CRadioButton Control Radio Button
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CRadioButton }
-/// **Window control for a radio button (as used for on/off settings)**
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CRadioButton Control Radio Button
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CRadioButton }
+/// **Window control for a radio button (as used for on/off settings)**\n
+/// The radio button control is used for creating push button on/off settings
+/// in Kodi.
 ///
-/// The radio  button control is used for creating push button on/off settings
-/// in Kodi. You can choose the position,  size,  and look of the button. When
-/// the user clicks on the radio button,  the state will change,  toggling the
-/// extra  textures  (textureradioon and textureradiooff).  Used  for settings
+/// You can choose the position, size, and look of the button. When the user
+/// clicks on the radio button, the state will change, toggling the extra
+/// textures (textureradioon and textureradiooff). Used for settings
 /// controls.
 ///
-/// It has the header \ref RadioButton.h "#include <kodi/gui/controls/RadioButton.h>"
+/// It has the header @ref RadioButton.h "#include <kodi/gui/controls/RadioButton.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Radio_button_control "radio button control"
+/// Here you find the needed skin part for a @ref Radio_button_control "radio button control".
 ///
-/// @note The  call  of the  control is  only possible  from the corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
+///
+/// --------------------------------------------------------------------------
+/// **Example:**
+/// ~~~~~~~~~~~~cpp
+/// #include <kodi/gui/Window.h>
+///
+/// #define MY_RADIO_BUTTON_CONTROL 1
+///
+/// class CMyWindow : public kodi::gui::CWindow
+/// {
+/// public:
+///   CMyWindow()
+///
+///   void ShowWindow();
+///
+///   bool OnInit() override;
+///   bool OnClick(int controlId) override;
+///
+/// private:
+///   kodi::gui::controls::CSpin m_myRadioButtonControl;
+/// };
+///
+/// CMyWindow::CMyWindow()
+///   : kodi::gui::CWindow("my_skin.xml", "skin.estuary", true, false),
+///     m_myRadioButtonControl(this, MY_RADIO_BUTTON_CONTROL)
+/// {
+/// }
+///
+/// void CMyWindow::ShowWindow()
+/// {
+///   kodi::gui::CWindow::DoModal();
+/// }
+///
+/// bool CMyWindow::OnInit()
+/// {
+///   m_myRadioButtonControl.SetSelected(false); // can also on skin set to default
+///   return true;
+/// }
+///
+/// bool CMyWindow::OnClick(int controlId)
+/// {
+///   if (controlId == MY_RADIO_BUTTON_CONTROL)
+///   {
+///     bool selected = m_myRadioButtonControl.IsSelected();
+///     ...
+///     }
+///     return true;
+///   }
+///   return false;
+/// }
+/// ~~~~~~~~~~~~
+///
 class ATTRIBUTE_HIDDEN CRadioButton : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window     related window control class
+  /// @param[in] window Related window control class
   /// @param[in] controlId  Used skin xml control id
   ///
   CRadioButton(CWindow* window, int controlId) : CAddonGUIControlBase(window)
@@ -58,64 +111,59 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CRadioButton can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief Destructor.
   ///
   ~CRadioButton() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton.
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible    If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_radio_button->set_visible(m_interface->kodiBase, m_controlHandle,
                                                              visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Set's the control's enabled/disabled state
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief Set's the control's enabled/disabled state.
   ///
-  /// @param[in] enabled    If true enabled, otherwise disabled
+  /// @param[in] enabled If true enabled, otherwise disabled
   ///
   void SetEnabled(bool enabled)
   {
     m_interface->kodi_gui->control_radio_button->set_enabled(m_interface->kodiBase, m_controlHandle,
                                                              enabled);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief To set the text string on radio button.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief To set the text string on radio button
-  ///
-  /// @param[in] label      Text to show
+  /// @param[in] label Text to show
   ///
   void SetLabel(const std::string& label)
   {
     m_interface->kodi_gui->control_radio_button->set_label(m_interface->kodiBase, m_controlHandle,
                                                            label.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Get the used text from control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief Get the used text from control.
   ///
-  /// @return               Text shown
+  /// @return Text shown
   ///
   std::string GetLabel() const
   {
@@ -130,38 +178,37 @@ public:
     }
     return label;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief To set radio button condition to on or off
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief To set radio button condition to on or off.
   ///
-  /// @param[in] selected   true set radio button to  selection on,  otherwise
-  ///                       off
+  /// @param[in] selected true set radio button to selection on, otherwise off
   ///
   void SetSelected(bool selected)
   {
     m_interface->kodi_gui->control_radio_button->set_selected(m_interface->kodiBase,
                                                               m_controlHandle, selected);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRadioButton
+  /// @brief Get the current selected condition of radio button.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CRadioButton
-  /// @brief Get the current selected condition of radio button
-  ///
-  /// @return               Selected condition
+  /// @return Selected condition
   ///
   bool IsSelected() const
   {
     return m_interface->kodi_gui->control_radio_button->is_selected(m_interface->kodiBase,
                                                                     m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Rendering.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Rendering.h
new file mode 100644
index 0000000..7f5feef
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Rendering.h
@@ -0,0 +1,217 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/gui/controls/rendering.h"
+#include "../Window.h"
+#include "../renderHelper.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+//============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CRendering Control Rendering
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CRendering }
+/// **Window control for rendering own parts**\n
+/// This rendering control is used when own parts are needed.
+///
+/// You have the control over them to render direct OpenGL or DirectX content
+/// to the screen set by the size of them.
+///
+/// Alternative can be the virtual functions from t his been ignored if the
+/// callbacks are defined by the @ref CRendering_SetIndependentCallbacks
+/// function and class is used as single and not as a parent class.
+///
+/// It has the header @ref Rendering.h "#include <kodi/gui/controls/Rendering.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a @ref Addon_Rendering_control "rendering control".
+///
+/// @note The call of the control is only possible from the corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CRendering : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief Construct a new control.
+  ///
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
+  ///
+  CRendering(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_render_addon(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (m_controlHandle)
+      m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase,
+                                                              m_controlHandle, this, OnCreateCB,
+                                                              OnRenderCB, OnStopCB, OnDirtyCB);
+    else
+      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::%s can't create control class from Kodi !!!",
+                __FUNCTION__);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief Destructor.
+  ///
+  ~CRendering() override
+  {
+    m_interface->kodi_gui->control_rendering->destroy(m_interface->kodiBase, m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief To create rendering control on Add-on.
+  ///
+  /// Function creates the needed rendering control for Kodi which becomes
+  /// handled and processed from Add-on
+  ///
+  /// @note This is callback function from Kodi to Add-on and not to use
+  /// for calls from add-on to this function.
+  ///
+  /// @param[in] x Horizontal position
+  /// @param[in] y Vertical position
+  /// @param[in] w Width of control
+  /// @param[in] h Height of control
+  /// @param[in] device The device to use. For OpenGL is empty on Direct X is
+  ///                   the needed device send.
+  /// @return Add-on needs to return true if successed, otherwise false.
+  ///
+  /// @note The @ref kodi::HardwareContext is basically a simple pointer which
+  /// has to be changed to the desired format at the corresponding places using
+  /// <b>`static_cast<...>(...)`</b>.
+  ///
+  virtual bool Create(int x, int y, int w, int h, kodi::HardwareContext device) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief Render process call from Kodi.
+  ///
+  /// @note This is callback function from  Kodi to Add-on and not to use for
+  /// calls from add-on to this function.
+  ///
+  virtual void Render() {}
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief Call from Kodi to stop rendering process.
+  ///
+  /// @note This is callback function from Kodi to Add-on and not to use
+  /// for calls from add-on to this function.
+  ///
+  virtual void Stop() {}
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @brief Call from Kodi where add-on becomes asked about dirty rendering
+  /// region.
+  ///
+  /// @note This is callback function from Kodi to Add-on and not to use
+  /// for calls from add-on to this function.
+  ///
+  /// @return True if a render region is dirty and need rendering.
+  ///
+  virtual bool Dirty() { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CRendering
+  /// @anchor CRendering_SetIndependentCallbacks
+  /// @brief If the class is used independent (with "new CRendering")
+  /// and not as parent (with "cCLASS_own : CRendering") from own must
+  /// be the callback from Kodi to add-on overdriven with own functions!
+  ///
+  /// @param[in] cbhdl Addon related class point where becomes given as value on
+  ///                  related functions.
+  /// @param[in] CBCreate External creation function pointer, see also @ref Create
+  ///                     about related values
+  /// @param[in] CBRender External render function pointer, see also @ref Render
+  ///                     about related values
+  /// @param[in] CBStop External stop function pointer, see also @ref Stop
+  ///                   about related values
+  /// @param[in] CBDirty External dirty function pointer, see also @ref Dirty
+  ///                    about related values
+  ///
+  void SetIndependentCallbacks(kodi::gui::ClientHandle cbhdl,
+                               bool (*CBCreate)(kodi::gui::ClientHandle cbhdl,
+                                                int x,
+                                                int y,
+                                                int w,
+                                                int h,
+                                                kodi::HardwareContext device),
+                               void (*CBRender)(kodi::gui::ClientHandle cbhdl),
+                               void (*CBStop)(kodi::gui::ClientHandle cbhdl),
+                               bool (*CBDirty)(kodi::gui::ClientHandle cbhdl))
+  {
+    if (!cbhdl || !CBCreate || !CBRender || !CBStop || !CBDirty)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "kodi::gui::controls::%s called with nullptr !!!", __FUNCTION__);
+      return;
+    }
+
+    m_interface->kodi_gui->control_rendering->set_callbacks(
+        m_interface->kodiBase, m_controlHandle, cbhdl, CBCreate, CBRender, CBStop, CBDirty);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  /*
+   * Defined callback functions from Kodi to add-on, for use in parent / child system
+   * (is private)!
+   */
+  static bool OnCreateCB(
+      KODI_GUI_CLIENT_HANDLE cbhdl, int x, int y, int w, int h, ADDON_HARDWARE_CONTEXT device)
+  {
+    static_cast<CRendering*>(cbhdl)->m_renderHelper = kodi::gui::GetRenderHelper();
+    return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
+  }
+
+  static void OnRenderCB(KODI_GUI_CLIENT_HANDLE cbhdl)
+  {
+    if (!static_cast<CRendering*>(cbhdl)->m_renderHelper)
+      return;
+    static_cast<CRendering*>(cbhdl)->m_renderHelper->Begin();
+    static_cast<CRendering*>(cbhdl)->Render();
+    static_cast<CRendering*>(cbhdl)->m_renderHelper->End();
+  }
+
+  static void OnStopCB(KODI_GUI_CLIENT_HANDLE cbhdl)
+  {
+    static_cast<CRendering*>(cbhdl)->Stop();
+    static_cast<CRendering*>(cbhdl)->m_renderHelper = nullptr;
+  }
+
+  static bool OnDirtyCB(KODI_GUI_CLIENT_HANDLE cbhdl)
+  {
+    return static_cast<CRendering*>(cbhdl)->Dirty();
+  }
+
+  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
+};
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/SettingsSlider.h
index 76a02aa..5557fc4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/SettingsSlider.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/settings_slider.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,37 +20,36 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CSettingsSlider Control Settings Slider
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CSettingsSlider }
-/// **Window control for moveable slider with text name**
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CSettingsSlider Control Settings Slider
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CSettingsSlider }
+/// **Window control for moveable slider with text name**\n
+/// The settings slider control is used in the settings screens for when an
+/// option is best specified on a sliding scale.
 ///
-/// The settings slider control is  used in the settings  screens for  when an
-/// option is best  specified on a sliding scale. You can choose the position,
-/// size, and look of the slider control.  It is basically a cross between the
-/// button control  and a slider  control.  It has a  label and  focus and non
-/// focus textures, as well as a slider control on the right.
+/// You can choose the position, size, and look of the slider control. It is
+/// basically a cross between the button control and a slider control. It has a
+/// label and focus and non focus textures, as well as a slider control on the
+/// right.
 ///
-/// It has the header \ref SettingsSlider.h "#include <kodi/gui/controls/SettingsSlider.h>"
+/// It has the header @ref SettingsSlider.h "#include <kodi/gui/controls/SettingsSlider.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Settings_Slider_Control "settings slider control"
+/// Here you find the needed skin part for a @ref Settings_Slider_Control "settings slider control".
 ///
-/// @note The call  of the control  is only  possible  from the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CSettingsSlider : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CSettingsSlider(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -58,74 +59,68 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CSettingsSlider can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Destructor.
   ///
   ~CSettingsSlider() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_settings_slider->set_visible(m_interface->kodiBase,
                                                                 m_controlHandle, visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Set's the control's enabled/disabled state.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Set's the control's enabled/disabled state
-  ///
-  /// @param[in] enabled              If true enabled, otherwise disabled
+  /// @param[in] enabled If true enabled, otherwise disabled
   ///
   void SetEnabled(bool enabled)
   {
     m_interface->kodi_gui->control_settings_slider->set_enabled(m_interface->kodiBase,
                                                                 m_controlHandle, enabled);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief To set the text string on settings slider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief To set the text string on settings slider.
   ///
-  /// @param[in] text                 Text to show
+  /// @param[in] text Text to show
   ///
   void SetText(const std::string& text)
   {
     m_interface->kodi_gui->control_settings_slider->set_text(m_interface->kodiBase, m_controlHandle,
                                                              text.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief To reset slider on defaults
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief To reset slider on defaults.
   ///
   void Reset()
   {
     m_interface->kodi_gui->control_settings_slider->reset(m_interface->kodiBase, m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief To set the the range as integer of slider, e.g. -10 is the slider
-  /// start and e.g. +10 is  the from here defined position where it reach the
+  /// start and e.g. +10 is the from here defined position where it reach the
   /// end.
   ///
   /// Ad default is the range from 0 to 100.
@@ -133,11 +128,11 @@ public:
   /// The integer interval is as default 1 and can be changed with
   /// @ref SetIntInterval.
   ///
-  /// @param[in] start                Integer start value
-  /// @param[in] end                  Integer end value
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
   ///
-  /// @note Percent, floating point  or integer are alone possible.  Combining
-  /// these different  values  can be not  together  and can, therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetIntRange(int start, int end)
@@ -145,18 +140,17 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_int_range(m_interface->kodiBase,
                                                                   m_controlHandle, start, end);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Set the slider position  with the given integer value.  The Range
-  /// must be defined with a call from \ref SetIntRange before.
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Set the slider position with the given integer value. The Range
+  /// must be defined with a call from @ref SetIntRange before.
   ///
-  /// @param[in] value                Position in range to set with integer
+  /// @param[in] value Position in range to set with integer
   ///
-  /// @note Percent, floating point  or integer are alone possible.  Combining
-  /// these different  values ​​can  be not  together and  can, therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetIntValue(int value)
@@ -164,17 +158,16 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_int_value(m_interface->kodiBase,
                                                                   m_controlHandle, value);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief To get the current position as integer value.
   ///
-  /// @return                         The position as integer
+  /// @return The position as integer
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different  values ​​can  be not  together and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   int GetIntValue() const
@@ -182,19 +175,18 @@ public:
     return m_interface->kodi_gui->control_settings_slider->get_int_value(m_interface->kodiBase,
                                                                          m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief To set the  interval steps of slider,  as default is it 1.  If it
-  /// becomes  changed with  this function  will a step  of the user  with the
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief To set the interval steps of slider, as default is it 1. If it
+  /// becomes changed with this function will a step of the user with the
   /// value fixed here be executed.
   ///
-  /// @param[in] interval             Intervall step to set.
+  /// @param[in] interval Intervall step to set.
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different values  ​​can  be not  together and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetIntInterval(int interval)
@@ -202,17 +194,16 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_int_interval(m_interface->kodiBase,
                                                                      m_controlHandle, interval);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief Sets the percent of the slider.
   ///
-  /// @param[in] percent              float - Percent value of slide
+  /// @param[in] percent float - Percent value of slide
   ///
-  /// @note Percent, floating point  or integer are alone possible.  Combining
-  /// these different  values ​​can  be not together  and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetPercentage(float percent)
@@ -220,17 +211,16 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_percentage(m_interface->kodiBase,
                                                                    m_controlHandle, percent);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief Returns a float of the percent of the slider.
   ///
-  /// @return                         float - Percent of slider
+  /// @return float - Percent of slider
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different  values ​​can be  not together  and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   float GetPercentage() const
@@ -238,13 +228,12 @@ public:
     return m_interface->kodi_gui->control_settings_slider->get_percentage(m_interface->kodiBase,
                                                                           m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
-  /// start and  e.g.  +25.0 is the from  here defined position where it reach
+  /// start and e.g. +25.0 is the from here defined position where it reach
   /// the end.
   ///
   /// As default is the range 0.0 to 1.0.
@@ -252,11 +241,11 @@ public:
   /// The float interval is as default 0.1 and can be changed with
   /// @ref SetFloatInterval.
   ///
-  /// @param[in] start                Integer start value
-  /// @param[in] end                  Integer end value
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different values ​​ can be not  together  and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetFloatRange(float start, float end)
@@ -264,19 +253,18 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_float_range(m_interface->kodiBase,
                                                                     m_controlHandle, start, end);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief Set  the slider position  with the given  float value.  The Range
-  /// can be defined with a  call from \ref SetIntRange before,  as default it
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief Set the slider position with the given float value. The Range can
+  /// be defined with a call from @ref SetIntRange before, as default it
   /// is 0.0 to 1.0.
   ///
-  /// @param[in] value                Position in range to set with float
+  /// @param[in] value Position in range to set with float
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different  values ​​can be not  together  and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetFloatValue(float value)
@@ -284,33 +272,31 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_float_value(m_interface->kodiBase,
                                                                     m_controlHandle, value);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
   /// @brief To get the current position as float value.
   ///
-  /// @return                         The position as float
+  /// @return The position as float
   ///
   float GetFloatValue() const
   {
     return m_interface->kodi_gui->control_settings_slider->get_float_value(m_interface->kodiBase,
                                                                            m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-  /// @brief To set  the interval steps of slider,  as default is it 0.1 If it
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSettingsSlider
+  /// @brief To set the interval steps of slider, as default is it 0.1 If it
   /// becomes changed with this function will a step of the user with the
   /// value fixed here be executed.
   ///
-  /// @param[in] interval             Intervall step to set.
+  /// @param[in] interval Intervall step to set.
   ///
-  /// @note Percent, floating point or  integer are alone possible.  Combining
-  /// these different values ​​can be not together and can, therefore, only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetFloatInterval(float interval)
@@ -318,9 +304,11 @@ public:
     m_interface->kodi_gui->control_settings_slider->set_float_interval(m_interface->kodiBase,
                                                                        m_controlHandle, interval);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Slider.h
index 715cc7d..077def8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Slider.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/slider.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -18,35 +20,33 @@ namespace gui
 namespace controls
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_controls_CSlider Control Slider
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CSlider }
-/// **Window control for moveable slider**
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CSlider Control Slider
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CSlider }
+/// **Window control for moveable slider**\n
+/// The slider control is used for things where a sliding bar best represents
+/// the operation at hand (such as a volume control or seek control).
 ///
-/// The slider control is used for things where a sliding bar best  represents
-/// the operation at hand (such as a volume control or seek control).  You can
-/// choose the position, size, and look of the slider control.
+/// You can choose the position, size, and look of the slider control.
 ///
-/// It has the header \ref Slider.h "#include <kodi/gui/controls/Slider.h>"
+/// It has the header @ref Slider.h "#include <kodi/gui/controls/Slider.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Slider_Control "slider control"
+/// Here you find the needed skin part for a @ref Slider_Control "slider control".
 ///
-/// @note The  call of the  control  is only  possible from  the corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CSlider : public CAddonGUIControlBase
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief Construct a new control
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Construct a new control.
   ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CSlider(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -56,61 +56,56 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::controls::CSlider can't create control class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Destructor.
   ///
   ~CSlider() override = default;
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief Set the control on window to visible
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Set the control on window to visible.
   ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
     m_interface->kodi_gui->control_slider->set_visible(m_interface->kodiBase, m_controlHandle,
                                                        visible);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Set's the control's enabled/disabled state.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief Set's the control's enabled/disabled state
-  ///
-  /// @param[in] enabled              If true enabled, otherwise disabled
+  /// @param[in] enabled If true enabled, otherwise disabled
   ///
   void SetEnabled(bool enabled)
   {
     m_interface->kodi_gui->control_slider->set_enabled(m_interface->kodiBase, m_controlHandle,
                                                        enabled);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief To reset slider on defaults
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief To reset slider on defaults.
   ///
   void Reset()
   {
     m_interface->kodi_gui->control_slider->reset(m_interface->kodiBase, m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief With GetDescription becomes a string value of position returned.
   ///
-  /// @return                        Text string about current slider position
+  /// @return Text string about current slider position
   ///
   /// The following are the text definition returned from this:
   /// | Value     | Without range selection | With range selection           |
@@ -132,13 +127,12 @@ public:
     }
     return text;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief To set the the range as integer of slider, e.g. -10 is the slider
-  /// start and e.g. +10 is the from here defined position where it  reach the
+  /// start and e.g. +10 is the from here defined position where it reach the
   /// end.
   ///
   /// Ad default is the range from 0 to 100.
@@ -146,11 +140,11 @@ public:
   /// The integer interval is as default 1 and can be changed with
   /// @ref SetIntInterval.
   ///
-  /// @param[in] start                Integer start value
-  /// @param[in] end                  Integer end value
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
   ///
-  /// @note Percent, floating point or  integer are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   void SetIntRange(int start, int end)
@@ -158,18 +152,17 @@ public:
     m_interface->kodi_gui->control_slider->set_int_range(m_interface->kodiBase, m_controlHandle,
                                                          start, end);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup CSlider
-  /// @brief Set the slider position  with the given integer value.  The Range
-  /// must be defined with a call from \ref SetIntRange before.
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Set the slider position with the given integer value. The Range
+  /// must be defined with a call from @ref SetIntRange before.
   ///
-  /// @param[in] value                Position in range to set with integer
+  /// @param[in] value Position in range to set with integer
   ///
-  /// @note Percent, floating point or integer  are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   void SetIntValue(int value)
@@ -177,17 +170,16 @@ public:
     m_interface->kodi_gui->control_slider->set_int_value(m_interface->kodiBase, m_controlHandle,
                                                          value);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief To get the current position as integer value.
   ///
-  /// @return                         The position as integer
+  /// @return The position as integer
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these  different  values  can be not together and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   int GetIntValue() const
@@ -195,19 +187,18 @@ public:
     return m_interface->kodi_gui->control_slider->get_int_value(m_interface->kodiBase,
                                                                 m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief To set the interval  steps of slider,  as default is it 1.  If it
-  /// becomes  changed  with this function  will a step  of the  user with the
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief To set the interval steps of slider, as default is it 1. If it
+  /// becomes changed with this function will a step of the user with the
   /// value fixed here be executed.
   ///
-  /// @param[in] interval             Intervall step to set.
+  /// @param[in] interval Intervall step to set.
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   void SetIntInterval(int interval)
@@ -215,17 +206,16 @@ public:
     m_interface->kodi_gui->control_slider->set_int_interval(m_interface->kodiBase, m_controlHandle,
                                                             interval);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief Sets the percent of the slider.
   ///
-  /// @param[in] percent              float - Percent value of slide
+  /// @param[in] percent float - Percent value of slide
   ///
-  /// @note Percent, floating point or  integer are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   void SetPercentage(float percent)
@@ -233,17 +223,16 @@ public:
     m_interface->kodi_gui->control_slider->set_percentage(m_interface->kodiBase, m_controlHandle,
                                                           percent);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief Returns a float of the percent of the slider.
   ///
-  /// @return                         float - Percent of slider
+  /// @return float - Percent of slider
   ///
-  /// @note Percent, floating point or integer  are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   float GetPercentage() const
@@ -251,13 +240,12 @@ public:
     return m_interface->kodi_gui->control_slider->get_percentage(m_interface->kodiBase,
                                                                  m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
-  /// start and e.g. +25.0 is  the from here  defined position  where it reach
+  /// start and e.g. +25.0 is the from here defined position where it reach
   /// the end.
   ///
   /// As default is the range 0.0 to 1.0.
@@ -265,11 +253,11 @@ public:
   /// The float interval is as default 0.1 and can be changed with
   /// @ref SetFloatInterval.
   ///
-  /// @param[in] start                Integer start value
-  /// @param[in] end                  Integer end value
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
   ///
-  /// @note Percent,  floating point or integer are alone possible.  Combining
-  /// these  different  values  can be not together and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetFloatRange(float start, float end)
@@ -277,19 +265,18 @@ public:
     m_interface->kodi_gui->control_slider->set_float_range(m_interface->kodiBase, m_controlHandle,
                                                            start, end);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief Set the slider  position with the  given float value.  The  Range
-  /// can be defined with a call from  \ref SetIntRange before,  as default it
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief Set the slider position with the given float value. The Range
+  /// can be defined with a call from @ref SetIntRange before, as default it
   /// is 0.0 to 1.0.
   ///
-  /// @param[in] value                Position in range to set with float
+  /// @param[in] value Position in range to set with float
   ///
-  /// @note Percent, floating  point or integer are alone possible.  Combining
-  /// these different values can be not together and can, therefore,  only one
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only one
   /// each can be used.
   ///
   void SetFloatValue(float value)
@@ -297,33 +284,31 @@ public:
     m_interface->kodi_gui->control_slider->set_float_value(m_interface->kodiBase, m_controlHandle,
                                                            value);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
   /// @brief To get the current position as float value.
   ///
-  /// @return                         The position as float
+  /// @return The position as float
   ///
   float GetFloatValue() const
   {
     return m_interface->kodi_gui->control_slider->get_float_value(m_interface->kodiBase,
                                                                   m_controlHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CSlider
-  /// @brief To set the interval  steps of slider, as default is it 0.1  If it
-  /// becomes changed  with this  function  will a step  of the user  with the
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSlider
+  /// @brief To set the interval steps of slider, as default is it 0.1 If it
+  /// becomes changed with this function will a step of the user with the
   /// value fixed here be executed.
   ///
-  /// @param[in] interval             Intervall step to set.
+  /// @param[in] interval Intervall step to set.
   ///
-  /// @note Percent, floating point or integer  are alone possible.  Combining
-  /// these different  values can be  not together  and can,  therefore,  only
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
   /// one each can be used.
   ///
   void SetFloatInterval(float interval)
@@ -331,9 +316,11 @@ public:
     m_interface->kodi_gui->control_slider->set_float_interval(m_interface->kodiBase,
                                                               m_controlHandle, interval);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 };
 
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Spin.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Spin.h
new file mode 100644
index 0000000..6c55243
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/Spin.h
@@ -0,0 +1,416 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/gui/controls/spin.h"
+#include "../Window.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CSpin Control Spin
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CSpin }
+/// **Window control used for cycling up/down controls**\n
+/// The settings spin control is used in the settings screens for when a list
+/// of options can be chosen from using up/down arrows.
+///
+/// You can choose the position, size, and look of the spin control. It is
+/// basically a cross between the button control and a spin control. It has a
+/// label and focus and non focus textures, as well as a spin control on the
+/// right.
+///
+/// It has the header @ref Spin.h "#include <kodi/gui/controls/Spin.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a @ref Spin_Control "spin control".
+///
+/// @note The call of the control is only possible from the corresponding
+/// window as its class and identification number is required.
+///
+/// --------------------------------------------------------------------------
+/// **Example:**
+/// ~~~~~~~~~~~~cpp
+/// #include <kodi/gui/Window.h>
+///
+/// #define MY_SPIN_CONTROL 1
+///
+/// class CMyWindow : public kodi::gui::CWindow
+/// {
+/// public:
+///   CMyWindow()
+///
+///   void ShowWindow();
+///
+///   bool OnInit() override;
+///   bool OnClick(int controlId) override;
+///
+/// private:
+///   kodi::gui::controls::CSpin m_mySpinControl;
+/// };
+///
+/// CMyWindow::CMyWindow()
+///   : kodi::gui::CWindow("my_skin.xml", "skin.estuary", true, false),
+///     m_mySpinControl(this, MY_SPIN_CONTROL)
+/// {
+/// }
+///
+/// void CMyWindow::ShowWindow()
+/// {
+///   kodi::gui::CWindow::DoModal();
+/// }
+///
+/// bool CMyWindow::OnInit()
+/// {
+///   m_mySpinControl.SetType(kodi::gui::controls::ADDON_SPIN_CONTROL_TYPE_INT);
+///   m_mySpinControl.SetIntRange(1, 80);
+///   return true;
+/// }
+///
+/// bool CMyWindow::OnClick(int controlId)
+/// {
+///   if (controlId == MY_SPIN_CONTROL)
+///   {
+///     int value = m_mySpinControl.GetIntValue();
+///     ...
+///     }
+///     return true;
+///   }
+///   return false;
+/// }
+/// ~~~~~~~~~~~~
+///
+
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_windows_controls_CSpin
+/// @anchor AddonGUISpinControlType
+/// @brief The values here defines the used value format for steps on
+/// spin control.
+///
+typedef enum AddonGUISpinControlType
+{
+  /// One spin step interpreted as integer
+  ADDON_SPIN_CONTROL_TYPE_INT = 1,
+  /// One spin step interpreted as floating point value
+  ADDON_SPIN_CONTROL_TYPE_FLOAT = 2,
+  /// One spin step interpreted as text string
+  ADDON_SPIN_CONTROL_TYPE_TEXT = 3,
+  /// One spin step interpreted as a page change value
+  ADDON_SPIN_CONTROL_TYPE_PAGE = 4
+} AddonGUISpinControlType;
+//------------------------------------------------------------------------------
+
+class ATTRIBUTE_HIDDEN CSpin : public CAddonGUIControlBase
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Construct a new control.
+  ///
+  /// @param[in] window Related window control class
+  /// @param[in] controlId Used skin xml control id
+  ///
+  CSpin(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_spin(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CSpin can't create control class from Kodi !!!");
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Destructor.
+  ///
+  ~CSpin() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Set the control on window to visible.
+  ///
+  /// @param[in] visible If true visible, otherwise hidden
+  ///
+  void SetVisible(bool visible)
+  {
+    m_interface->kodi_gui->control_spin->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                     visible);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Set's the control's enabled/disabled state.
+  ///
+  /// @param[in] enabled If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_spin->set_enabled(m_interface->kodiBase, m_controlHandle,
+                                                     enabled);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To set the text string on spin control.
+  ///
+  /// @param[in] text Text to show as name for spin
+  ///
+  void SetText(const std::string& text)
+  {
+    m_interface->kodi_gui->control_spin->set_text(m_interface->kodiBase, m_controlHandle,
+                                                  text.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To reset spin control to defaults.
+  ///
+  void Reset()
+  {
+    m_interface->kodi_gui->control_spin->reset(m_interface->kodiBase, m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To set the with SpinControlType defined types of spin.
+  ///
+  /// @param[in] type The type to use
+  ///
+  /// @note See description of @ref AddonGUISpinControlType for available types.
+  ///
+  void SetType(AddonGUISpinControlType type)
+  {
+    m_interface->kodi_gui->control_spin->set_type(m_interface->kodiBase, m_controlHandle,
+                                                  (int)type);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To add a label entry in spin defined with a value as string.
+  ///
+  /// Format must be set to @ref ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+  ///
+  /// @param[in] label Label string to view on skin
+  /// @param[in] value String value to use for selection of them
+  ///
+  void AddLabel(const std::string& label, const std::string& value)
+  {
+    m_interface->kodi_gui->control_spin->add_string_label(m_interface->kodiBase, m_controlHandle,
+                                                          label.c_str(), value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To add a label entry in spin defined with a value as integer.
+  ///
+  /// Format must be set to @ref ADDON_SPIN_CONTROL_TYPE_INT to use this function.
+  ///
+  /// @param[in] label Label string to view on skin
+  /// @param[in] value Integer value to use for selection of them.
+  ///
+  void AddLabel(const std::string& label, int value)
+  {
+    m_interface->kodi_gui->control_spin->add_int_label(m_interface->kodiBase, m_controlHandle,
+                                                       label.c_str(), value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To change the spin to position with them string as value.
+  ///
+  /// Format must be set to @ref ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+  ///
+  /// @param[in] value String value to change to
+  ///
+  void SetStringValue(const std::string& value)
+  {
+    m_interface->kodi_gui->control_spin->set_string_value(m_interface->kodiBase, m_controlHandle,
+                                                          value.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To get the current spin control position with text string value.
+  ///
+  /// Format must be set to @ref ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+  ///
+  /// @return Currently selected string value
+  ///
+  std::string GetStringValue() const
+  {
+    std::string value;
+    char* ret = m_interface->kodi_gui->control_spin->get_string_value(m_interface->kodiBase,
+                                                                      m_controlHandle);
+    if (ret != nullptr)
+    {
+      if (std::strlen(ret))
+        value = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
+    }
+    return value;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+  /// start and e.g. +10 is the from here defined position where it reach the
+  /// end.
+  ///
+  /// Ad default is the range from 0 to 100.
+  ///
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  void SetIntRange(int start, int end)
+  {
+    m_interface->kodi_gui->control_spin->set_int_range(m_interface->kodiBase, m_controlHandle,
+                                                       start, end);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Set the slider position with the given integer value. The Range
+  /// must be defined with a call from @ref SetIntRange before.
+  ///
+  /// @param[in] value Position in range to set with integer
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  void SetIntValue(int value)
+  {
+    m_interface->kodi_gui->control_spin->set_int_value(m_interface->kodiBase, m_controlHandle,
+                                                       value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To get the current position as integer value.
+  ///
+  /// @return The position as integer
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  int GetIntValue() const
+  {
+    return m_interface->kodi_gui->control_spin->get_int_value(m_interface->kodiBase,
+                                                              m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To set the the range as float of spin, e.g. -25.0 is the spin
+  /// start and e.g. +25.0 is the from here defined position where it reach
+  /// the end.
+  ///
+  /// As default is the range 0.0 to 1.0.
+  ///
+  /// The float interval is as default 0.1 and can be changed with
+  /// @ref SetFloatInterval.
+  ///
+  /// @param[in] start Integer start value
+  /// @param[in] end Integer end value
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  void SetFloatRange(float start, float end)
+  {
+    m_interface->kodi_gui->control_spin->set_float_range(m_interface->kodiBase, m_controlHandle,
+                                                         start, end);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief Set the spin position with the given float value. The Range
+  /// can be defined with a call from @ref SetIntRange before, as default it
+  /// is 0.0 to 1.0.
+  ///
+  /// @param[in] value Position in range to set with float
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  void SetFloatValue(float value)
+  {
+    m_interface->kodi_gui->control_spin->set_float_value(m_interface->kodiBase, m_controlHandle,
+                                                         value);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To get the current position as float value.
+  ///
+  /// @return The position as float
+  ///
+  float GetFloatValue() const
+  {
+    return m_interface->kodi_gui->control_spin->get_float_value(m_interface->kodiBase,
+                                                                m_controlHandle);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CSpin
+  /// @brief To set the interval steps of spin, as default is it 0.1 If it
+  /// becomes changed with this function will a step of the user with the
+  /// value fixed here be executed.
+  ///
+  /// @param[in] interval Intervall step to set.
+  ///
+  /// @note Percent, floating point or integer are alone possible. Combining
+  /// these different values can be not together and can, therefore, only
+  /// one each can be used and must be defined with @ref SetType before.
+  ///
+  void SetFloatInterval(float interval)
+  {
+    m_interface->kodi_gui->control_spin->set_float_interval(m_interface->kodiBase, m_controlHandle,
+                                                            interval);
+  }
+  //----------------------------------------------------------------------------
+};
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/TextBox.h
index b4e8ae0..2634568 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/controls/TextBox.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
-#include "../../AddonBase.h"
+#include "../../c-api/gui/controls/text_box.h"
 #include "../Window.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -19,34 +21,33 @@ namespace controls
 {
 
 //============================================================================
+/// @defgroup cpp_kodi_gui_windows_controls_CTextBox Control Text Box
+/// @ingroup cpp_kodi_gui_windows_controls
+/// @brief @cpp_class{ kodi::gui::controls::CTextBox }
+/// **Used to show a multi-page piece of text**\n
+/// The text box control can be used to display descriptions, help texts or
+/// other larger texts.
 ///
-/// \defgroup cpp_kodi_gui_controls_CTextBox Control Text Box
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::controls::CTextBox }
-/// **Used to show a multi-page piece of text**
-///
-/// The text box control  can be used to display  descriptions,  help texts or
-/// other larger texts.  It corresponds to the representation which is also to
-/// be seen on the CDialogTextViewer.
+/// It corresponds to the representation which is also to be seen on the
+/// @ref CDialogTextViewer.
 ///
-/// It has the header \ref TextBox.h "#include <kodi/gui/controls/TextBox.h>"
+/// It has the header @ref TextBox.h "#include <kodi/gui/controls/TextBox.h>"
 /// be included to enjoy it.
 ///
-/// Here you find the needed skin part for a \ref Text_Box "textbox control".
+/// Here you find the needed skin part for a @ref Text_Box "textbox control".
 ///
-/// @note The call  of the  control is  only possible  from the  corresponding
+/// @note The call of the control is only possible from the corresponding
 /// window as its class and identification number is required.
 ///
 class ATTRIBUTE_HIDDEN CTextBox : public CAddonGUIControlBase
 {
 public:
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief Construct a new control.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief Construct a new control
-  ///
-  /// @param[in] window               related window control class
-  /// @param[in] controlId            Used skin xml control id
+  /// @param[in] window related window control class
+  /// @param[in] controlId Used skin xml control id
   ///
   CTextBox(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
@@ -59,19 +60,17 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief Destructor
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief Destructor.
   ///
   ~CTextBox() override = default;
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief Set the control on window to visible.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief Set the control on window to visible
-  ///
-  /// @param[in] visible              If true visible, otherwise hidden
+  /// @param[in] visible If true visible, otherwise hidden
   ///
   void SetVisible(bool visible)
   {
@@ -81,19 +80,17 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief To reset box an remove all the text
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief To reset box an remove all the text.
   ///
   void Reset() { m_interface->kodi_gui->control_text_box->reset(m_controlHandle, m_controlHandle); }
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief To set the text on box.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief To set the text on box
-  ///
-  /// @param[in] text                 Text to show
+  /// @param[in] text Text to show
   ///
   void SetText(const std::string& text)
   {
@@ -103,11 +100,10 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief Get the used text from control.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief Get the used text from control
-  ///
-  /// @return                         Text shown
+  /// @return Text shown
   ///
   std::string GetText() const
   {
@@ -125,11 +121,10 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
+  /// @brief To scroll text on other position.
   ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
-  /// @brief To scroll text on other position
-  ///
-  /// @param[in] position             The line position to scroll to
+  /// @param[in] position The line position to scroll to
   ///
   void Scroll(unsigned int position)
   {
@@ -139,8 +134,7 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @ingroup cpp_kodi_gui_windows_controls_CTextBox
   /// @brief To set automatic scrolling of textbox
   ///
   /// Specifies the timing  and conditions of  any autoscrolling  this textbox
@@ -150,10 +144,10 @@ public:
   /// time,  fades out over 1 second,  and repeats.  It does not wrap or reset
   /// to the top at the end of the scroll.
   ///
-  /// @param[in] delay                Content delay
-  /// @param[in] time                 One line per time interval
-  /// @param[in] repeat               Delays with given time, fades out over 1
-  ///                                 second, and repeats
+  /// @param[in] delay Content delay
+  /// @param[in] time One line per time interval
+  /// @param[in] repeat Delays with given time, fades out over 1 second, and
+  ///                   repeats
   ///
   void SetAutoScrolling(int delay, int time, int repeat)
   {
@@ -166,3 +160,5 @@ public:
 } /* namespace controls */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/CMakeLists.txt
index 7227343..9aaee4f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/CMakeLists.txt
@@ -10,5 +10,5 @@ set(HEADERS ContextMenu.h
             YesNo.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui_dialogs)
+  core_add_library(addons_kodi-dev-kit_include_kodi_gui_dialogs)
 endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/ContextMenu.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
new file mode 100644
index 0000000..b576b9a
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
@@ -0,0 +1,186 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/context_menu.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_ContextMenu Dialog Context Menu
+/// @ingroup cpp_kodi_gui_dialogs
+/// @brief @cpp_namespace{ kodi::gui::dialogs::ContextMenu }
+/// **Context menu dialog**@n
+/// The function listed below permits the call of a dialogue as context menu to
+/// select of an entry as a key
+///
+/// It has the header @ref ContextMenu.h "#include <kodi/gui/dialogs/ContextMenu.h>"
+/// be included to enjoy it.
+///
+///
+namespace ContextMenu
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_ContextMenu
+/// @brief Show a context menu dialog about given parts.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries String list about entries
+/// @return The selected entry, if return <tt>-1</tt> was nothing selected or canceled
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/ContextMenu.h>
+///
+/// const std::vector<std::string> entries
+/// {
+///   "Test 1",
+///   "Test 2",
+///   "Test 3",
+///   "Test 4",
+///   "Test 5"
+/// };
+///
+/// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
+/// if (selected < 0)
+///   fprintf(stderr, "Item selection canceled\n");
+/// else
+///   fprintf(stderr, "Selected item is: %i\n", selected);
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                 const std::vector<std::string>& entries)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntries[i] = entries[i].c_str();
+  }
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
+  free(cEntries);
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_ContextMenu
+/// @brief Show a context menu dialog about given parts.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries String list about entries
+/// @return The selected entry, if return <tt>-1</tt> was nothing selected or canceled
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/ContextMenu.h>
+///
+/// const std::vector<std::pair<std::string, std::string>> entries
+/// {
+///   { "ID 1", "Test 1" },
+///   { "ID 2", "Test 2" },
+///   { "ID 3", "Test 3" },
+///   { "ID 4", "Test 4" },
+///   { "ID 5", "Test 5" }
+/// };
+///
+/// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
+/// if (selected < 0)
+///   fprintf(stderr, "Item selection canceled\n");
+/// else
+///   fprintf(stderr, "Selected item is: %i\n", selected);
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                 const std::vector<std::pair<std::string, std::string>>& entries)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntries[i] = entries[i].second.c_str();
+  }
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
+  free(cEntries);
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_ContextMenu
+/// @brief Show a context menu dialog about given parts.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries String list about entries
+/// @return The selected entry, if return <tt>-1</tt> was nothing selected or canceled
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/ContextMenu.h>
+///
+/// const std::vector<std::pair<int, std::string>> entries
+/// {
+///   { 1, "Test 1" },
+///   { 2, "Test 2" },
+///   { 3, "Test 3" },
+///   { 4, "Test 4" },
+///   { 5, "Test 5" }
+/// };
+///
+/// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
+/// if (selected < 0)
+///   fprintf(stderr, "Item selection canceled\n");
+/// else
+///   fprintf(stderr, "Selected item is: %i\n", selected);
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                 const std::vector<std::pair<int, std::string>>& entries)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntries[i] = entries[i].second.c_str();
+  }
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
+  free(cEntries);
+  return ret;
+}
+//------------------------------------------------------------------------------
+}; // namespace ContextMenu
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
index 5a49b70..c650483 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
@@ -8,8 +8,10 @@
 
 #pragma once
 
-#include "../definitions.h"
 #include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/extended_progress.h"
+
+#ifdef __cplusplus
 
 namespace kodi
 {
@@ -18,14 +20,13 @@ namespace gui
 namespace dialogs
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::dialogs::ExtendedProgress }
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
+/// @ingroup cpp_kodi_gui_dialogs
+/// @brief @cpp_class{ kodi::gui::dialogs::ExtendedProgress }
 /// **Progress dialog shown for background work**
 ///
-/// The with \ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
+/// The with @ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
 /// given class are basically used to create Kodi's extended progress.
 ///
 ///
@@ -57,12 +58,11 @@ namespace dialogs
 class ATTRIBUTE_HIDDEN CExtendedProgress
 {
 public:
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// Construct a new dialog.
   ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// Construct a new dialog
-  ///
-  /// @param[in] title  Title string
+  /// @param[in] title [opt] Title string
   ///
   explicit CExtendedProgress(const std::string& title = "")
   {
@@ -73,12 +73,11 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::CDialogExtendedProgress can't create window class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// Destructor
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// Destructor.
   ///
   ~CExtendedProgress()
   {
@@ -87,12 +86,11 @@ public:
       CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->delete_dialog(
           CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief Get the used title
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the used title.
   ///
   /// @return Title string
   ///
@@ -111,14 +109,13 @@ public:
     }
     return text;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief To set the title of dialog
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the title of dialog.
   ///
-  /// @param[in] title     Title string
+  /// @param[in] title Title string
   ///
   void SetTitle(const std::string& title)
   {
@@ -126,12 +123,11 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_title(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, title.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief Get the used text information string
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the used text information string.
   ///
   /// @return Text string
   ///
@@ -150,14 +146,13 @@ public:
     }
     return text;
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the used text information string.
   ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief To set the used text information string
-  ///
-  /// @param[in] text         information text to set
+  /// @param[in] text Information text to set
   ///
   void SetText(const std::string& text)
   {
@@ -165,12 +160,11 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_text(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, text.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief To ask dialog is finished
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To ask dialog is finished.
   ///
   /// @return True if on end
   ///
@@ -180,12 +174,11 @@ public:
     return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->is_finished(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief Mark progress finished
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Mark progress finished.
   ///
   void MarkFinished()
   {
@@ -193,12 +186,11 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->mark_finished(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief Get the current progress position as percent
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the current progress position as percent.
   ///
   /// @return Position
   ///
@@ -208,14 +200,13 @@ public:
     return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_percentage(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the current progress position as percent.
   ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief To set the current progress position as percent
-  ///
-  /// @param[in] percentage   Position to use from 0.0 to 100.0
+  /// @param[in] percentage Position to use from 0.0 to 100.0
   ///
   void SetPercentage(float percentage)
   {
@@ -223,15 +214,14 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_percentage(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-  /// @brief To set progress position with predefined places
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set progress position with predefined places.
   ///
-  /// @param[in] currentItem    Place position to use
-  /// @param[in] itemCount      Amount of used places
+  /// @param[in] currentItem Place position to use
+  /// @param[in] itemCount Amount of used places
   ///
   void SetProgress(int currentItem, int itemCount)
   {
@@ -239,12 +229,14 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_progress(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, currentItem, itemCount);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
 private:
-  void* m_DialogHandle;
+  KODI_GUI_HANDLE m_DialogHandle;
 };
 
 } /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/FileBrowser.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
new file mode 100644
index 0000000..244c76c
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
@@ -0,0 +1,302 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/filebrowser.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_FileBrowser Dialog File Browser
+/// @ingroup cpp_kodi_gui_dialogs
+/// @brief @cpp_namespace{ kodi::gui::dialogs::FileBrowser }
+/// **File browser dialog**\n
+/// The functions listed below of the class "FileBrowser" offer the possibility
+/// to select to a file by the user of the add-on.
+///
+/// It allows all the options that are possible in Kodi itself and offers all
+/// support file types.
+///
+/// It has the header @ref FileBrowser.h "#include <kodi/gui/dialogs/FileBrowser.h>"
+/// be included to enjoy it.
+///
+namespace FileBrowser
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief Directory selection dialog.
+///
+/// @param[in] shares With Shares becomes the available start folders be set
+/// @param[in] heading Dialog header name
+/// @param[in,out] path As in the path to start and return value about
+///                     selected directory
+/// @param[in] writeOnly [opt] If set only writeable folders are shown
+/// @return False if selection becomes canceled
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/FileBrowser.h>
+///
+/// // Example show directory selection dialog with on 'share' (first value)
+/// // defined directory types.
+/// //
+/// // If this becomes leaved empty and 'directory' is empty goes it to the
+/// // base path of the hard disk.
+/// //
+/// // Also can be with path written to 'directory' before the dialog forced
+/// // to a start place.
+/// std::string directory;
+/// bool ret = kodi::gui::dialogs::FileBrowser::ShowAndGetDirectory("local|network|removable",
+///                                                    "Test directory selection",
+///                                                    directory,
+///                                                    false);
+/// fprintf(stderr, "Selected directory is : %s and was %s\n", directory.c_str(), ret ? "OK" : "Canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetDirectory(const std::string& shares,
+                                                 const std::string& heading,
+                                                 std::string& path,
+                                                 bool writeOnly = false)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_directory(
+      CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), heading.c_str(), path.c_str(),
+      &retString, writeOnly);
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      path = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief File selection dialog.
+///
+/// @param[in] shares With Shares becomes the available start folders be set.
+/// @param[in] mask The mask to filter visible files, e.g. ".m3u|.pls|.b4s|.wpl"
+/// @param[in] heading Dialog header name
+/// @param[in,out] path As in the path to start and Return value about selected
+///                     file
+/// @param[in] useThumbs [opt] If set show thumbs if possible on dialog
+/// @param[in] useFileDirectories [opt] If set also packages (e.g. *.zip) are
+///                               handled as directories.
+/// @return False if selection becomes canceled
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetFile(const std::string& shares,
+                                            const std::string& mask,
+                                            const std::string& heading,
+                                            std::string& path,
+                                            bool useThumbs = false,
+                                            bool useFileDirectories = false)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file(
+      CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), mask.c_str(), heading.c_str(),
+      path.c_str(), &retString, useThumbs, useFileDirectories);
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      path = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief File selection from a directory.
+///
+/// @param[in] directory The directory name where the dialog start, possible are
+///                      normal names and kodi's special names
+/// @param[in] mask The mask to filter visible files, e.g. ".m3u|.pls|.b4s|.wpl"
+/// @param[in] heading Dialog header name
+/// @param[in,out] path As in the path to start and Return value about selected
+///                     file
+/// @param[in] useThumbs [opt] If set show thumbs if possible on dialog
+/// @param[in] useFileDirectories [opt] If set also  packages (e.g. *.zip) are
+///                               handled as directories
+/// @param[in] singleList [opt]
+/// @return False if selection becomes canceled
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetFileFromDir(const std::string& directory,
+                                                   const std::string& mask,
+                                                   const std::string& heading,
+                                                   std::string& path,
+                                                   bool useThumbs = false,
+                                                   bool useFileDirectories = false,
+                                                   bool singleList = false)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret =
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file_from_dir(
+          CAddonBase::m_interface->toKodi->kodiBase, directory.c_str(), mask.c_str(),
+          heading.c_str(), path.c_str(), &retString, useThumbs, useFileDirectories, singleList);
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      path = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief File selection dialog to get several in to a list.
+///
+/// @param[in] shares With Shares becomes the available start folders be set.
+/// @param[in] mask The mask to filter visible files, e.g. ".m3u|.pls|.b4s|.wpl"
+/// @param[in] heading Dialog header name
+/// @param[out] fileList Return value about selected files
+/// @param[in] useThumbs [opt] If set show thumbs if possible on dialog.
+/// @param[in] useFileDirectories [opt] If set also packages (e.g. *.zip) are
+///                               handled as directories.
+/// @return False if selection becomes canceled.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetFileList(const std::string& shares,
+                                                const std::string& mask,
+                                                const std::string& heading,
+                                                std::vector<std::string>& fileList,
+                                                bool useThumbs = false,
+                                                bool useFileDirectories = false)
+{
+  using namespace ::kodi::addon;
+  char** list = nullptr;
+  unsigned int listSize = 0;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_file_list(
+      CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), mask.c_str(), heading.c_str(),
+      &list, &listSize, useThumbs, useFileDirectories);
+  if (ret)
+  {
+    for (unsigned int i = 0; i < listSize; ++i)
+      fileList.emplace_back(list[i]);
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(
+        CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief Source selection dialog.
+///
+/// @param[in,out] path As in the path to start and Return value about selected
+///                     source
+/// @param[in] allowNetworkShares Allow also access to network
+/// @param[in] additionalShare [opt] With additionalShare becomes the available
+///                            start folders be set.
+/// @param[in] type [opt]
+/// @return False if selection becomes canceled
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetSource(std::string& path,
+                                              bool allowNetworkShares,
+                                              const std::string& additionalShare = "",
+                                              const std::string& type = "")
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_source(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), &retString, allowNetworkShares,
+      additionalShare.c_str(), type.c_str());
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      path = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief Image selection dialog.
+///
+/// @param[in] shares With Shares becomes the available start folders be set
+/// @param[in] heading Dialog header name
+/// @param[out] path Return value about selected image
+/// @return False if selection becomes canceled
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetImage(const std::string& shares,
+                                             const std::string& heading,
+                                             std::string& path)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_image(
+      CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), heading.c_str(), path.c_str(),
+      &retString);
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      path = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_FileBrowser
+/// @brief Image selection dialog to get several in to a list.
+///
+/// @param[in] shares With Shares becomes the available start folders be set
+/// @param[in] heading Dialog header name
+/// @param[out] file_list Return value about selected images
+/// @return False if selection becomes canceled
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetImageList(const std::string& shares,
+                                                 const std::string& heading,
+                                                 std::vector<std::string>& file_list)
+{
+  using namespace ::kodi::addon;
+  char** list = nullptr;
+  unsigned int listSize = 0;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_image_list(
+      CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), heading.c_str(), &list, &listSize);
+  if (ret)
+  {
+    for (unsigned int i = 0; i < listSize; ++i)
+      file_list.emplace_back(list[i]);
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(
+        CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+}; // namespace FileBrowser
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Keyboard.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Keyboard.h
new file mode 100644
index 0000000..710b7dd
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Keyboard.h
@@ -0,0 +1,404 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/keyboard.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//================================================================================
+/// @defgroup cpp_kodi_gui_dialogs_Keyboard Dialog Keyboard
+/// @ingroup cpp_kodi_gui_dialogs
+/// @brief @cpp_namespace{ kodi::gui::dialogs::Keyboard }
+/// **Keyboard dialogs**\n
+/// The functions listed below have to be permitted by the user for the
+/// representation of a keyboard around an input.
+///
+/// The class supports several kinds, from an easy text choice up to the
+/// passport Word production and their confirmation for add-on.
+///
+/// It has the header @ref Keyboard.h "#include <kodi/gui/dialogs/Keyboard.h>"
+/// be included to enjoy it.
+///
+namespace Keyboard
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Show keyboard with initial value `text` and replace with  result
+/// string.
+///
+/// @param[in,out] text Overwritten with user input if return=true.
+/// @param[in] heading String shown on dialog title.
+/// @param[in] allowEmptyResult Whether a blank password is valid or not.
+/// @param[in] hiddenInput [opt] The inserted input is not shown as text.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/Keyboard.h>
+///
+/// // The example shows the display of keyboard call dialog at Kodi from the add-on.
+/// // Below all values are set, however, can last two (hidden input = false and autoCloseMs = 0)
+/// // to be released if not needed.
+/// std::string text = "Please change me to them want you want"; // It can be leaved empty or a entry text added
+/// bool bRet = ::kodi::gui::dialogs::Keyboard::ShowAndGetInput(text,
+///                                                      "Demonstration text entry",
+///                                                      true,
+///                                                      false,
+///                                                      0);
+/// fprintf(stderr, "Written keyboard input is : '%s' and was %s\n",
+///                   text.c_str(), bRet ? "OK" : "Canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
+                                             const std::string& heading,
+                                             bool allowEmptyResult,
+                                             bool hiddenInput = false,
+                                             unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret =
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head(
+          CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, heading.c_str(),
+          allowEmptyResult, hiddenInput, autoCloseMs);
+  if (retString != nullptr)
+  {
+    text = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief The example shows the display of keyboard  call dialog  at  Kodi
+/// from the add-on.
+///
+/// @param[out] text Overwritten with user input if return=true.
+/// @param[in] allowEmptyResult If set to true keyboard can also exited without
+///                             entered text.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
+                                             bool allowEmptyResult,
+                                             unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input(
+      CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, allowEmptyResult,
+      autoCloseMs);
+  if (retString != nullptr)
+  {
+    text = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Shows keyboard and prompts for a password. Differs from
+/// `ShowAndVerifyNewPassword()` in that no second verification.
+///
+/// @param[in,out] newPassword Overwritten with user input if return=true.
+/// @param[in] heading String shown on dialog title.
+/// @param[in] allowEmptyResult  Whether a blank password is valid or not.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
+                                                   const std::string& heading,
+                                                   bool allowEmptyResult,
+                                                   unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard
+                 ->show_and_get_new_password_with_head(
+                     CAddonBase::m_interface->toKodi->kodiBase, newPassword.c_str(), &retString,
+                     heading.c_str(), allowEmptyResult, autoCloseMs);
+  if (retString != nullptr)
+  {
+    newPassword = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Shows keyboard and prompts for a password. Differs from
+/// `ShowAndVerifyNewPassword()` in that no second verification.
+///
+/// @param[in,out] newPassword Overwritten with user input if return=true.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
+                                                   unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_new_password(
+      CAddonBase::m_interface->toKodi->kodiBase, newPassword.c_str(), &retString, autoCloseMs);
+  if (retString != nullptr)
+  {
+    newPassword = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Show keyboard twice to get and confirm a user-entered password
+/// string.
+///
+/// @param[out] newPassword Overwritten with user input if return=true.
+/// @param[in] heading String shown on dialog title.
+/// @param[in] allowEmptyResult
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// #include <kodi/gui/dialogs/Keyboard.h>
+///
+/// // The example below shows the complete use of keyboard dialog for password
+/// // check. If only one check from add-on needed can be function with retries
+/// // set to '0' called alone.
+/// //
+/// // The use of MD5 translated password is always required for the check on Kodi!
+///
+/// int maxretries = 3;
+/// // Password names need to be send as md5 sum to kodi.
+/// std::string password;
+/// kodi::GetMD5("kodi", password);
+///
+/// // To the loop about password checks.
+/// int ret;
+/// for (unsigned int i = 0; i < maxretries; i++)
+/// {
+///   // Ask the user about the password.
+///   ret = ::kodi::gui::dialogs::Keyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
+///   if (ret == 0)
+///   {
+///     fprintf(stderr, "Password successfull confirmed after '%i' tries\n", i+1);
+///     break;
+///   }
+///   else if (ret < 0)
+///   {
+///     fprintf(stderr, "Canceled editing on try '%i'\n", i+1);
+///     break;
+///   }
+///   else // if (ret > 0)
+///   {
+///     fprintf(stderr, "Wrong password entered on try '%i'\n", i+1);
+///   }
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
+                                                      const std::string& heading,
+                                                      bool allowEmptyResult,
+                                                      unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard
+                 ->show_and_verify_new_password_with_head(CAddonBase::m_interface->toKodi->kodiBase,
+                                                          &retString, heading.c_str(),
+                                                          allowEmptyResult, autoCloseMs);
+  if (retString != nullptr)
+  {
+    newPassword = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Show keyboard twice to get and confirm a user-entered password
+/// string.
+///
+/// @param[out] newPassword Overwritten with user input if return=true.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
+                                                      unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret =
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_verify_new_password(
+          CAddonBase::m_interface->toKodi->kodiBase, &retString, autoCloseMs);
+  if (retString != nullptr)
+  {
+    newPassword = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Show keyboard and verify user input against `password`.
+///
+/// @param[in,out] password Value to compare against user input.
+/// @param[in] heading String shown on dialog title.
+/// @param[in] retries If greater than 0, shows "Incorrect password, %d retries
+///                    left" on dialog line 2, else line 2 is blank.
+/// @param[in] autoCloseMs [opt] To close the dialog after a specified time, in
+///                        milliseconds, default is 0 which keeps the dialog
+///                        open indefinitely.
+/// @return 0 if successful display and user input. 1 if unsuccessful input.
+///         -1 if no user input or canceled editing.
+///
+inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(std::string& password,
+                                                  const std::string& heading,
+                                                  int retries,
+                                                  unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_verify_password(
+      CAddonBase::m_interface->toKodi->kodiBase, password.c_str(), &retString, heading.c_str(),
+      retries, autoCloseMs);
+  if (retString != nullptr)
+  {
+    password = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Shows a filter related keyboard.
+///
+/// @param[in,out] text Overwritten with user input if return=true.
+/// @param[in] searching Use dialog for search and send our search  message in
+///                      safe way (only the active window needs it)
+///  - header name if true is "Enter search string"
+///  - header name if false is "Enter value"
+/// @param autoCloseMs [opt] To close the dialog after a specified time, in
+///                    milliseconds, default is 0 which keeps the dialog open
+///                    indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetFilter(std::string& text,
+                                              bool searching,
+                                              unsigned int autoCloseMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_filter(
+      CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, searching, autoCloseMs);
+  if (retString != nullptr)
+  {
+    text = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Send a text to a visible keyboard.
+///
+/// @param[in] text Overwritten with user input if return=true.
+/// @param[in] closeKeyboard [opt] The open dialog is if also closed on 'true'.
+/// @return true if successful done, false if unsuccessful or keyboard not
+///         present.
+///
+inline bool ATTRIBUTE_HIDDEN SendTextToActiveKeyboard(const std::string& text,
+                                                      bool closeKeyboard = false)
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->send_text_to_active_keyboard(
+      CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), closeKeyboard);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Keyboard
+/// @brief Check for visible keyboard on GUI.
+///
+/// @return true if keyboard present, false if not present
+///
+inline bool ATTRIBUTE_HIDDEN IsKeyboardActivated()
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->is_keyboard_activated(
+      CAddonBase::m_interface->toKodi->kodiBase);
+}
+//------------------------------------------------------------------------------
+}; // namespace Keyboard
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Numeric.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Numeric.h
new file mode 100644
index 0000000..835a8d4
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Numeric.h
@@ -0,0 +1,346 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/numeric.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_Numeric Dialog Numeric
+/// @ingroup cpp_kodi_gui_dialogs
+/// @{
+/// @brief @cpp_namespace{ kodi::gui::dialogs::Numeric }
+/// **Numeric dialogs**\n
+/// The functions listed below have to be permitted by the user for the
+/// representation of a numeric keyboard around an input.
+///
+/// The class supports several kinds, from an easy number choice up to the
+/// passport Word production and their confirmation for add-on.
+///
+/// It has the header @ref Numeric.h "#include <kodi/gui/dialogs/Numeric.h>"
+/// be included to enjoy it.
+///
+namespace Numeric
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to get numeric new password
+///
+/// @param[out] newPassword String to preload into the keyboard accumulator.
+///                         Overwritten with user input if return=true.
+///                         Returned in MD5 format.
+/// @return true if successful display and user input entry/re-entry. false if
+///         unsuccessful display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword)
+{
+  using namespace ::kodi::addon;
+  char* pw = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password(
+      CAddonBase::m_interface->toKodi->kodiBase, &pw);
+  if (pw != nullptr)
+  {
+    newPassword = pw;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, pw);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+///
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to verify numeric password.
+///
+/// @param[in] password             Password to compare with user input, need
+///                                 in MD5 format.
+/// @param[in] heading              Heading to display
+/// @param[in] retries              If greater than 0, shows "Incorrect
+///                                 password, %d retries left" on dialog
+///                                 line 2, else line 2 is blank.
+/// @return                         Possible values:
+///                                 - 0 if successful display and user input.
+///                                 - 1 if unsuccessful input.
+///                                 - -1 if no user input or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <stdio.h>      // fprintf
+/// #include <kodi/General.h>
+/// #include <kodi/gui/dialogs/Numeric.h>
+///
+/// // The example below shows the complete use of keyboard dialog for password
+/// // check. If only one check from add-on needed can be function with retries
+/// // set to '0' called alone.
+/// //
+/// // The use of MD5 translated password is always required for the check on Kodi!
+///
+/// int maxretries = 3;
+///
+/// // Password names need to be send as md5 sum to kodi.
+/// std::string password = kodi::GetMD5("1234");
+///
+/// // To the loop about password checks.
+/// int ret;
+/// for (unsigned int i = 0; i < maxretries; i++)
+/// {
+///   // Ask the user about the password.
+///   ret = kodi::gui::dialogs::Numeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
+///   if (ret == 0)
+///   {
+///     fprintf(stderr, "Numeric password successfull confirmed after '%i' tries\n", i+1);
+///     break;
+///   }
+///   else if (ret < 0)
+///   {
+///     fprintf(stderr, "Canceled editing on try '%i'\n", i+1);
+///     break;
+///   }
+///   else // if (ret > 0)
+///   {
+///     fprintf(stderr, "Wrong numeric password entered on try '%i'\n", i+1);
+///   }
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(const std::string& password,
+                                                  const std::string& heading,
+                                                  int retries)
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_password(
+      CAddonBase::m_interface->toKodi->kodiBase, password.c_str(), heading.c_str(), retries);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to verify numeric password
+///
+/// @param[in,out] toVerify Value to compare against user input.
+/// @param[in] heading Heading to display
+/// @param[in] verifyInput If set as true we verify the users input versus
+///                        toVerify.
+/// @return true if successful display and user input. false if unsuccessful
+/// display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndVerifyInput(std::string& toVerify,
+                                                const std::string& heading,
+                                                bool verifyInput)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_input(
+      CAddonBase::m_interface->toKodi->kodiBase, toVerify.c_str(), &retString, heading.c_str(),
+      verifyInput);
+  if (retString != nullptr)
+  {
+    toVerify = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to get time value.
+///
+/// @param[out] time Overwritten with user input if return=true and time
+///                  inserted.
+/// @param[in] heading Heading to display.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <stdio.h>      // printf
+/// #include <time.h>       // time_t, struct tm, time, localtime, strftime
+/// #include <kodi/gui/dialogs/Numeric.h>
+///
+/// time_t rawtime;
+/// struct tm * timeinfo;
+/// char buffer [10];
+///
+/// time (&rawtime);
+/// timeinfo = localtime(&rawtime);
+/// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetTime(*timeinfo, "Selected time test call");
+/// strftime(buffer, sizeof(buffer), "%H:%M.", timeinfo);
+/// printf("Selected time it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetTime(tm& time, const std::string& heading)
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_time(
+      CAddonBase::m_interface->toKodi->kodiBase, &time, heading.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to get date value.
+///
+/// @param[in,out] date Overwritten with user input if return=true and date
+///                     inserted.
+/// @param[in] heading Heading to display
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <stdio.h>      // printf
+/// #include <time.h>       // time_t, struct tm, time, localtime, strftime
+/// #include <kodi/gui/dialogs/Numeric.h>
+///
+/// time_t rawtime;
+/// struct tm * timeinfo;
+/// char buffer [20];
+///
+/// time (&rawtime);
+/// timeinfo = localtime(&rawtime);
+/// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetDate(*timeinfo, "Selected date test call");
+/// strftime(buffer, sizeof(buffer), "%Y-%m-%d", timeinfo);
+/// printf("Selected date it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetDate(tm& date, const std::string& heading)
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_date(
+      CAddonBase::m_interface->toKodi->kodiBase, &date, heading.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to get a IP
+///
+/// @param[in,out] ipAddress Overwritten with user input if return=true and
+///                          IP address inserted.
+/// @param[in] heading Heading to display.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetIPAddress(std::string& ipAddress, const std::string& heading)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_ip_address(
+      CAddonBase::m_interface->toKodi->kodiBase, ipAddress.c_str(), &retString, heading.c_str());
+  if (retString != nullptr)
+  {
+    ipAddress = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Use dialog to get normal number.
+///
+/// @param[in,out] input Overwritten with user input if return=true and time
+///                      in seconds inserted
+/// @param[in] heading Heading to display
+/// @param[in] autoCloseTimeoutMs [opt] To close the dialog after a specified
+///                               time, in milliseconds, default is 0
+///                               which keeps the dialog open
+///                                 indefinitely.
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///   #include <stdio.h>      // printf
+///   #include <stdlib.h>     // strtoull (C++11)
+///   #include <kodi/gui/dialogs/Numeric.h>
+///
+///   std::string number;
+///   bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetNumber(number, "Number test call");
+///   printf("Written number input is : %llu and was %s\n",
+///                  strtoull(number.c_str(), nullptr, 0), bRet ? "OK" : "Canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetNumber(std::string& input,
+                                              const std::string& heading,
+                                              unsigned int autoCloseTimeoutMs = 0)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_number(
+      CAddonBase::m_interface->toKodi->kodiBase, input.c_str(), &retString, heading.c_str(),
+      autoCloseTimeoutMs);
+  if (retString != nullptr)
+  {
+    input = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Numeric
+/// @brief Show numeric keypad to get seconds.
+///
+/// @param[in,out] time Overwritten with user input if return=true and time
+///                     in seconds inserted.
+/// @param[in] heading Heading to display
+/// @return true if successful display and user input. false if unsuccessful
+///         display, no user input, or canceled editing.
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetSeconds(std::string& time, const std::string& heading)
+{
+  using namespace ::kodi::addon;
+  char* retString = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_seconds(
+      CAddonBase::m_interface->toKodi->kodiBase, time.c_str(), &retString, heading.c_str());
+  if (retString != nullptr)
+  {
+    time = retString;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+}; // namespace Numeric
+/// @}
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/OK.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/OK.h
new file mode 100644
index 0000000..747ab9d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/OK.h
@@ -0,0 +1,101 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/ok.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_OK Dialog OK
+/// @ingroup cpp_kodi_gui_dialogs
+/// @{
+/// @brief @cpp_namespace{ kodi::gui::dialogs::OK }
+/// **OK dialog**\n
+/// The functions listed below permit the call of a dialogue of information, a
+/// confirmation of the user by press from OK required.
+///
+/// It has the header @ref OK.h "#include <kodi/gui/dialogs/OK.h>"
+/// be included to enjoy it.
+///
+namespace OK
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_OK
+/// @brief Use dialog to inform user with text and confirmation with OK with
+/// continued string.
+///
+/// @param[in] heading Dialog heading.
+/// @param[in] text Multi-line text.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/OK.h>
+/// ...
+/// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading, const std::string& text)
+{
+  using namespace ::kodi::addon;
+  CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_single_text(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_OK
+/// @brief Use dialog to inform user with text and confirmation with OK with
+/// strings separated to the lines.
+///
+/// @param[in] heading Dialog heading.
+/// @param[in] line0 Line #1 text.
+/// @param[in] line1 Line #2 text.
+/// @param[in] line2 Line #3 text.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/OK.h>
+/// ...
+/// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                             const std::string& line0,
+                                             const std::string& line1,
+                                             const std::string& line2)
+{
+  using namespace ::kodi::addon;
+  CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_line_text(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), line0.c_str(), line1.c_str(),
+      line2.c_str());
+}
+//------------------------------------------------------------------------------
+} // namespace OK
+/// @}
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Progress.h
index b1f8cc5..d242a56 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Progress.h
@@ -8,8 +8,10 @@
 
 #pragma once
 
-#include "../definitions.h"
 #include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/progress.h"
+
+#ifdef __cplusplus
 
 namespace kodi
 {
@@ -18,14 +20,12 @@ namespace gui
 namespace dialogs
 {
 
-//============================================================================
-///
-/// \defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
-/// \ingroup cpp_kodi_gui
-/// @brief \cpp_class{ kodi::gui::dialogs::CProgress }
-/// **Progress dialog shown in center**
-///
-/// The with \ref DialogProgress.h "#include <kodi/gui/dialogs/Progress.h>"
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
+/// @ingroup cpp_kodi_gui_dialogs
+/// @brief @cpp_class{ kodi::gui::dialogs::CProgress }
+/// **Progress dialog shown in center**\n
+/// The with @ref Progress.h "#include <kodi/gui/dialogs/Progress.h>"
 /// given class are basically used to create Kodi's progress dialog with named
 /// text fields.
 ///
@@ -52,9 +52,8 @@ namespace dialogs
 class ATTRIBUTE_HIDDEN CProgress
 {
 public:
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief Construct a new dialog
   ///
   CProgress()
@@ -66,11 +65,10 @@ public:
       kodi::Log(ADDON_LOG_FATAL,
                 "kodi::gui::dialogs::CProgress can't create window class from Kodi !!!");
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief Destructor
   ///
   ~CProgress()
@@ -80,11 +78,10 @@ public:
       CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->delete_dialog(
           CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To open the dialog
   ///
   void Open()
@@ -93,11 +90,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->open(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief Set the heading title of dialog
   ///
   /// @param[in] heading Title string to use
@@ -108,11 +104,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_heading(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, heading.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To set the line text field on dialog from 0 - 2
   ///
   /// @param[in] iLine Line number
@@ -124,11 +119,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_line(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, iLine, line.c_str());
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To enable and show cancel button on dialog
   ///
   /// @param[in] canCancel if true becomes it shown
@@ -139,11 +133,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_can_cancel(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, canCancel);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To check dialog for clicked cancel button
   ///
   /// @return True if canceled
@@ -154,11 +147,10 @@ public:
     return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->is_canceled(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief Get the current progress position as percent
   ///
   /// @param[in] percentage Position to use from 0 to 100
@@ -169,11 +161,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_percentage(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To set the current progress position as percent
   ///
   /// @return Current Position used from 0 to 100
@@ -184,11 +175,10 @@ public:
     return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->get_percentage(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To show or hide progress bar dialog
   ///
   /// @param[in] onOff If true becomes it shown
@@ -199,11 +189,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->show_progress_bar(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, onOff);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief Set the maximum position of progress, needed if `SetProgressAdvance(...)` is used
   ///
   /// @param[in] max Biggest usable position to use
@@ -214,11 +203,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_max(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, max);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To increase progress bar by defined step size until reach of maximum position
   ///
   /// @param[in] steps Step size to increase, default is 1
@@ -229,11 +217,10 @@ public:
     CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_advance(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, steps);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
-  //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  //============================================================================
+  /// @ingroup cpp_kodi_gui_dialogs_CProgress
   /// @brief To check progress was canceled on work
   ///
   /// @return True if aborted
@@ -244,12 +231,14 @@ public:
     return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->abort(
         CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
   }
-  //--------------------------------------------------------------------------
+  //----------------------------------------------------------------------------
 
 private:
-  void* m_DialogHandle;
+  KODI_GUI_HANDLE m_DialogHandle;
 };
 
 } /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Select.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Select.h
new file mode 100644
index 0000000..9b1923e
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/Select.h
@@ -0,0 +1,269 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/select.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_Select_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_gui_dialogs_Select
+/// @brief **Dialog Select definition values**\n
+/// Data structures associated with this dialog.
+///
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Select_Defs
+/// @brief **Selection entry structure**\n
+/// Used to provide the necessary data for the selection dialog and to declare
+/// the selected position in it.
+///
+typedef struct SSelectionEntry
+{
+  /*! \cond PRIVATE */
+  SSelectionEntry() = default;
+  /*! \endcond */
+
+  /// Entry identfication string
+  std::string id;
+
+  /// Entry name to show on GUI dialog
+  std::string name;
+
+  /// Place where entry can be preselected and after return the from user
+  /// selected is set.
+  bool selected = false;
+} SSelectionEntry;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_Select Dialog Select
+/// @ingroup cpp_kodi_gui_dialogs
+/// @{
+/// @brief @cpp_namespace{ kodi::gui::dialogs::Select }
+/// **Selection dialog**\n
+/// The function listed below permits the call of a dialogue to select of an
+/// entry as a key
+///
+/// It has the header @ref Select.h "#include <kodi/gui/dialogs/Select.h>"
+/// be included to enjoy it.
+///
+///
+namespace Select
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Select
+/// @brief Show a selection dialog about given parts.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries String list about entries
+/// @param[in] selected [opt] Predefined selection (default is <tt>-1</tt> for
+///                     the first)
+/// @param[in] autoclose [opt] To close dialog automatic after the given time
+///                      in ms. As '0' it stays open.
+/// @return The selected entry, if return <tt>-1</tt> was nothing selected or
+///         canceled
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/Select.h>
+///
+/// const std::vector<std::string> entries
+/// {
+///   "Test 1",
+///   "Test 2",
+///   "Test 3",
+///   "Test 4",
+///   "Test 5"
+/// };
+///
+/// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
+/// if (selected < 0)
+///   fprintf(stderr, "Item selection canceled\n");
+/// else
+///   fprintf(stderr, "Selected item is: %i\n", selected);
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                 const std::vector<std::string>& entries,
+                                 int selected = -1,
+                                 unsigned int autoclose = 0)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntries = (const char**)malloc(size * sizeof(const char**));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntries[i] = entries[i].c_str();
+  }
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected,
+      autoclose);
+  free(cEntries);
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Select
+/// @brief Show a selection dialog about given parts.
+///
+/// This function is mostly equal to the other, only becomes the string list
+/// here done by a @ref SSelectionEntry, where a ID string can be defined.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries @ref SSelectionEntry list about entries
+/// @param[in] selected [opt] Predefined selection (default is <tt>-1</tt> for
+///                     the first)
+/// @param[in] autoclose [opt] To close dialog automatic after the given time
+///                      in ms. As '0' it stays open.
+/// @return The selected entry, if return <tt>-1</tt> was nothing selected
+///         or canceled
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/Select.h>
+///
+/// std::vector<kodi::gui::dialogs::SSelectionEntry> entries
+/// {
+///   { "ID 1", "Test 1", false },
+///   { "ID 2", "Test 2", false },
+///   { "ID 3", "Test 3", false },
+///   { "ID 4", "Test 4", false },
+///   { "ID 5", "Test 5", false }
+/// };
+///
+/// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
+/// if (selected < 0)
+///   fprintf(stderr, "Item selection canceled\n");
+/// else
+///   fprintf(stderr, "Selected item is: %i\n", selected);
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                 std::vector<kodi::gui::dialogs::SSelectionEntry>& entries,
+                                 int selected = -1,
+                                 unsigned int autoclose = 0)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char*)));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntries[i] = entries[i].name.c_str();
+    if (selected == -1 && entries[i].selected)
+      selected = i;
+  }
+  int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected,
+      autoclose);
+  if (ret >= 0)
+  {
+    entries[ret].selected = true;
+  }
+  free(cEntries);
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_Select
+/// @brief Show a multiple selection dialog about given parts.
+///
+/// @param[in] heading Dialog heading name
+/// @param[in] entries @ref SSelectionEntry list about entries
+/// @param[in] autoclose [opt] To close dialog automatic after the given time in
+///                       ms. As '0' it stays open.
+/// @return The selected entries, if return <tt>empty</tt> was nothing selected
+///         or canceled
+///
+/// With selected on @ref SSelectionEntry can be a pre selection defined.
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/Select.h>
+///
+/// std::vector<kodi::gui::dialogs::SSelectionEntry> entries
+/// {
+///   { "ID 1", "Test 1", false },
+///   { "ID 2", "Test 2", false },
+///   { "ID 3", "Test 3", false },
+///   { "ID 4", "Test 4", false },
+///   { "ID 5", "Test 5", false }
+/// };
+///
+/// bool ret = kodi::gui::dialogs::Select::ShowMultiSelect("Test selection", entries);
+/// if (!ret)
+///   fprintf(stderr, "Selection canceled\n");
+/// else
+/// {
+///   fprintf(stderr, "Selected items:\n");
+///   for (const auto& entry : entries)
+///   {
+///     if (entry.selected)
+///       fprintf(stderr, " - %s\n", entry.selected.id.c_str());
+///   }
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowMultiSelect(const std::string& heading,
+                                             std::vector<kodi::gui::dialogs::SSelectionEntry>& entries,
+                                             int autoclose = 0)
+{
+  using namespace ::kodi::addon;
+  unsigned int size = static_cast<unsigned int>(entries.size());
+  const char** cEntryIDs = static_cast<const char**>(malloc(size * sizeof(const char*)));
+  const char** cEntryNames = static_cast<const char**>(malloc(size * sizeof(const char*)));
+  bool* cEntriesSelected = static_cast<bool*>(malloc(size * sizeof(bool)));
+  for (unsigned int i = 0; i < size; ++i)
+  {
+    cEntryIDs[i] = entries[i].id.c_str();
+    cEntryNames[i] = entries[i].name.c_str();
+    cEntriesSelected[i] = entries[i].selected;
+  }
+  bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open_multi_select(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntryIDs, cEntryNames,
+      cEntriesSelected, size, autoclose);
+  if (ret)
+  {
+    for (unsigned int i = 0; i < size; ++i)
+      entries[i].selected = cEntriesSelected[i];
+  }
+  free(cEntryNames);
+  free(cEntryIDs);
+  free(cEntriesSelected);
+  return ret;
+}
+//------------------------------------------------------------------------------
+}; // namespace Select
+/// @}
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
new file mode 100644
index 0000000..42a86f3
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (C) 2015-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/text_viewer.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_TextViewer Dialog Text Viewer
+/// @ingroup cpp_kodi_gui_dialogs
+/// @{
+/// @brief @cpp_namespace{ kodi::gui::dialogs::TextViewer }
+/// **Text viewer dialog**\n
+/// The text viewer dialog can be used to display descriptions, help texts or
+/// other larger texts.
+///
+/// In order to achieve a line break is a <b>\\n</b> directly in the text or
+/// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
+/// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
+///
+/// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
+/// be included to enjoy it.
+///
+namespace TextViewer
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_TextViewer
+/// @brief Show info text dialog
+///
+/// @param[in] heading  mall heading text
+/// @param[in] text Showed text on dialog
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/TextViewer.h>
+///
+/// kodi::gui::dialogs::TextViewer::Show("The Wizard of Oz (1939 film)",
+///  "The Wizard of Oz is a 1939 American musical comedy-drama fantasy film "
+///  "produced by Metro-Goldwyn-Mayer, and the most well-known and commercially "
+///  "successful adaptation based on the 1900 novel The Wonderful Wizard of Oz "
+///  "by L. Frank Baum. The film stars Judy Garland as Dorothy Gale. The film"
+///  "co-stars Terry the dog, billed as Toto; Ray Bolger, Jack Haley, Bert Lahr, "
+///  "Frank Morgan, Billie Burke, Margaret Hamilton, with Charley Grapewin and "
+///  "Clara Blandick, and the Singer Midgets as the Munchkins.\n"
+///  "\n"
+///  "Notable for its use of Technicolor, fantasy storytelling, musical score and "
+///  "unusual characters, over the years it has become an icon of American popular "
+///  "culture. It was nominated for six Academy Awards, including Best Picture but "
+///  "lost to Gone with the Wind. It did win in two other categories including Best "
+///  "Original Song for \"Over the Rainbow\". However, the film was a box office "
+///  "disappointment on its initial release, earning only $3,017,000 on a $2,777,000 "
+///  "budget, despite receiving largely positive reviews. It was MGM's most "
+///  "expensive production at that time, and did not completely recoup the studio's "
+///  "investment and turn a profit until theatrical re-releases starting in 1949.\n"
+///  "\n"
+///  "The 1956 broadcast television premiere of the film on CBS re-introduced the "
+///  "film to the wider public and eventually made the presentation an annual "
+///  "tradition, making it one of the most known films in cinema history. The "
+///  "film was named the most-viewed motion picture on television syndication by "
+///  "the Library of Congress who also included the film in its National Film "
+///  "Registry in its inaugural year in 1989. Designation on the registry calls "
+///  "for efforts to preserve it for being \"culturally, historically, and "
+///  "aesthetically significant\". It is also one of the few films on UNESCO's "
+///  "Memory of the World Register.\n"
+///  "\n"
+///  "The Wizard of Oz is often ranked on best-movie lists in critics' and public "
+///  "polls. It is the source of many quotes referenced in modern popular culture. "
+///  "It was directed primarily by Victor Fleming (who left production to take "
+///  "over direction on the troubled Gone with the Wind production). Noel Langley, "
+///  "Florence Ryerson and Edgar Allan Woolf received credit for the screenplay, "
+///  "but there were uncredited contributions by others. The songs were written "
+///  "by Edgar \"Yip\" Harburg (lyrics) and Harold Arlen (music). The incidental "
+///  "music, based largely on the songs, was composed by Herbert Stothart, with "
+///  "interspersed renderings from classical composers.\n");
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN Show(const std::string& heading, const std::string& text)
+{
+  using namespace ::kodi::addon;
+  CAddonBase::m_interface->toKodi->kodi_gui->dialogTextViewer->open(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
+}
+//------------------------------------------------------------------------------
+}; // namespace TextViewer
+/// @}
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/YesNo.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/YesNo.h
new file mode 100644
index 0000000..6e6e069
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/YesNo.h
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/gui/dialogs/yes_no.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace gui
+{
+namespace dialogs
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_gui_dialogs_YesNo Dialog Yes/No
+/// @ingroup cpp_kodi_gui_dialogs
+/// @{
+/// @brief @cpp_namespace{ kodi::gui::dialogs::YesNo }
+/// **Yes / No dialog**\n
+/// The Yes / No dialog can be used to inform the user about questions and get
+/// the answer.
+///
+/// In order to achieve a line break is a <b>\\n</b> directly in the text or
+/// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
+/// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
+///
+/// It has the header @ref YesNo.h "#include <kodi/gui/dialogs/YesNo.h>"
+/// be included to enjoy it.
+///
+namespace YesNo
+{
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_YesNo
+/// @brief Use dialog to get numeric new password with one text string shown
+/// everywhere and cancel return field.
+///
+/// @param[in] heading Dialog heading
+/// @param[in] text  Multi-line text
+/// @param[out] canceled Return value about cancel button
+/// @param[in] noLabel [opt] label to put on the no button
+/// @param[in] yesLabel [opt] label to put on the yes button
+/// @return Returns True if 'Yes' was pressed, else False
+///
+/// @note It is preferred to only use this as it is actually a multi-line text.
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/YesNo.h>
+///
+/// bool canceled = false;
+/// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
+///    "Yes / No test call",   // The Header
+///    "You has opened Yes / No dialog for test\n\nIs this OK for you?",
+///    canceled,               // return value about cancel button
+///    "Not really",           // No label, is optional and if empty "No"
+///    "Ohhh yes");            // Yes label, also optional and if empty "Yes"
+/// fprintf(stderr, "You has called Yes/No, returned '%s' and was %s\n",
+///          ret ? "yes" : "no",
+///          canceled ? "canceled" : "not canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                             const std::string& text,
+                                             bool& canceled,
+                                             const std::string& noLabel = "",
+                                             const std::string& yesLabel = "")
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_single_text(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str(), &canceled,
+      noLabel.c_str(), yesLabel.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_YesNo
+/// @brief Use dialog to get numeric new password with separated line strings.
+///
+/// @param[in] heading Dialog heading
+/// @param[in] line0 Line #0 text
+/// @param[in] line1 Line #1 text
+/// @param[in] line2 Line #2 text
+/// @param[in] noLabel [opt] label to put on the no button
+/// @param[in] yesLabel [opt] label to put on the yes button
+/// @return Returns True if 'Yes' was pressed, else False
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/YesNo.h>
+///
+/// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
+///    "Yes / No test call",   // The Header
+///    "You has opened Yes / No dialog for test",
+///    "",
+///    "Is this OK for you?",
+///    "Not really",           // No label, is optional and if empty "No"
+///    "Ohhh yes");            // Yes label, also optional and if empty "Yes"
+/// fprintf(stderr, "You has called Yes/No, returned '%s'\n",
+///          ret ? "yes" : "no");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                             const std::string& line0,
+                                             const std::string& line1,
+                                             const std::string& line2,
+                                             const std::string& noLabel = "",
+                                             const std::string& yesLabel = "")
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_line_text(
+      CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), line0.c_str(), line1.c_str(),
+      line2.c_str(), noLabel.c_str(), yesLabel.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_gui_dialogs_YesNo
+/// @brief Use dialog to get numeric new password with separated line strings
+/// and cancel return field.
+///
+/// @param[in] heading Dialog heading
+/// @param[in] line0 Line #0 text
+/// @param[in] line1 Line #1 text
+/// @param[in] line2 Line #2 text
+/// @param[out] canceled Return value about cancel button
+/// @param[in] noLabel [opt] label to put on the no button
+/// @param[in] yesLabel [opt] label to put on the yes button
+/// @return Returns True if 'Yes' was pressed, else False
+///
+///
+///-------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/YesNo.h>
+///
+/// bool canceled = false;
+/// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
+///    "Yes / No test call",   // The Header
+///    "You has opened Yes / No dialog for test",
+///    "",
+///    "Is this OK for you?",
+///    canceled,               // return value about cancel button
+///    "Not really",           // No label, is optional and if empty "No"
+///    "Ohhh yes");            // Yes label, also optional and if empty "Yes"
+/// fprintf(stderr, "You has called Yes/No, returned '%s' and was %s\n",
+///          ret ? "yes" : "no",
+///          canceled ? "canceled" : "not canceled");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                             const std::string& line0,
+                                             const std::string& line1,
+                                             const std::string& line2,
+                                             bool& canceled,
+                                             const std::string& noLabel = "",
+                                             const std::string& yesLabel = "")
+{
+  using namespace ::kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo
+      ->show_and_get_input_line_button_text(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), line0.c_str(), line1.c_str(),
+          line2.c_str(), &canceled, noLabel.c_str(), yesLabel.c_str());
+}
+//------------------------------------------------------------------------------
+}; // namespace YesNo
+/// @}
+
+} /* namespace dialogs */
+} /* namespace gui */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/CMakeLists.txt
index a9ab70c..844902d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/CMakeLists.txt
@@ -3,5 +3,5 @@ set(HEADERS GL.h
             Shader.h)
 
 if(NOT ENABLE_STATIC_LIBS)
-  core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui_gl)
+  core_add_library(addons_kodi-dev-kit_include_kodi_gui_gl)
 endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GL.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GL.h
index 943c7d0..16d43e3 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GL.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GL.h
@@ -8,28 +8,25 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 //==============================================================================
-///
-/// \defgroup cpp_kodi_gui_gl OpenGL helpers
-/// \ingroup cpp_kodi_gui
-/// \brief Auxiliary functions for Open GL
-///
+/// @defgroup cpp_kodi_gui_helpers_gl OpenGL helpers
+/// @ingroup cpp_kodi_gui_helpers
+/// @brief **Auxiliary functions for Open GL**\n
 /// This group includes help for definitions, functions, and classes for
 /// OpenGL.
 ///
-/// To use OpenGL for your system, add the \ref GL.h "#include <kodi/gui/gl/GL.h>".
-///
+/// To use OpenGL for your system, add the @ref GL.h "#include <kodi/gui/gl/GL.h>".
 ///
-///-----------------------------------------------------------------------------
-///
-/// The \ref HAS_GL is declared if Open GL is required and \ref HAS_GLES if Open GL 
+/// The @ref HAS_GL is declared if Open GL is required and @ref HAS_GLES if Open GL
 /// Embedded Systems (ES) is required, with ES the version is additionally given
 /// in the definition, this can be "2" or "3".
 ///
 ///
 ///-----------------------------------------------------------------------------
 ///
-/// Following \ref GL_TYPE_STRING define can be used, for example, to manage 
+/// Following @ref GL_TYPE_STRING define can be used, for example, to manage
 /// different folders for GL and GLES and make the selection easier.
 /// This are on OpenGL <b>"GL"</b> and on Open GL|ES <b>"GLES"</b>.
 ///
@@ -41,7 +38,7 @@
 ///
 ///----------------------------------------------------------------------------
 ///
-/// In addition, \ref BUFFER_OFFSET is declared in it which can be used to give an 
+/// In addition, @ref BUFFER_OFFSET is declared in it which can be used to give an
 /// offset on the array to GL.
 ///
 /// **Example:**
@@ -63,49 +60,53 @@
 /// ~~~~~~~~~~~~~~~~~
 
 #if HAS_GL
-  #define GL_TYPE_STRING "GL"
-  // always define GL_GLEXT_PROTOTYPES before include gl headers
-  #if !defined(GL_GLEXT_PROTOTYPES)
-    #define GL_GLEXT_PROTOTYPES
-  #endif
-  #if defined(TARGET_LINUX)
-    #include <GL/gl.h>
-    #include <GL/glext.h>
-  #elif defined(TARGET_FREEBSD)
-    #include <GL/gl.h>
-  #elif defined(TARGET_DARWIN)
-    #include <OpenGL/gl3.h>
-    #include <OpenGL/gl3ext.h>
-  #elif defined(WIN32)
-    #error Use of GL under Windows is not possible
-  #endif
+#define GL_TYPE_STRING "GL"
+// always define GL_GLEXT_PROTOTYPES before include gl headers
+#if !defined(GL_GLEXT_PROTOTYPES)
+#define GL_GLEXT_PROTOTYPES
+#endif
+#if defined(TARGET_LINUX)
+#include <GL/gl.h>
+#include <GL/glext.h>
+#elif defined(TARGET_FREEBSD)
+#include <GL/gl.h>
+#elif defined(TARGET_DARWIN)
+#include <OpenGL/gl3.h>
+#include <OpenGL/gl3ext.h>
+#elif defined(WIN32)
+#error Use of GL under Windows is not possible
+#endif
 #elif HAS_GLES >= 2
-  #define GL_TYPE_STRING "GLES"
-  #if defined(WIN32)
-    #if defined(HAS_ANGLE)
-      #include <angle_gl.h>
-    #else
-      #error Use of GLES only be available under Windows by the use of angle
-    #endif
-  #elif defined(TARGET_DARWIN)
-    #if HAS_GLES == 3
-      #include <OpenGLES/ES3/gl.h>
-      #include <OpenGLES/ES3/glext.h>
-    #else
-      #include <OpenGLES/ES2/gl.h>
-      #include <OpenGLES/ES2/glext.h>
-    #endif
-  #else
-    #if HAS_GLES == 3
-      #include <GLES3/gl3.h>
-      #include <GLES3/gl3ext.h>
-    #else
-      #include <GLES2/gl2.h>
-      #include <GLES2/gl2ext.h>
-    #endif
-  #endif
+#define GL_TYPE_STRING "GLES"
+#if defined(WIN32)
+#if defined(HAS_ANGLE)
+#include <angle_gl.h>
+#else
+#error Use of GLES only be available under Windows by the use of angle
+#endif
+#elif defined(TARGET_DARWIN)
+#if HAS_GLES == 3
+#include <OpenGLES/ES3/gl.h>
+#include <OpenGLES/ES3/glext.h>
+#else
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#endif
+#else
+#if HAS_GLES == 3
+#include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
+#else
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+#endif
 #endif
 
 #ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+/// @ingroup cpp_kodi_gui_helpers_gl
+/// @brief To give a offset number as pointer value.
+#define BUFFER_OFFSET(i) ((char*)nullptr + (i))
 #endif
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GLonDX.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
index 7a6a0a1..4dd97af 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GLonDX.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
@@ -8,16 +8,18 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <angle_gl.h>
 #include <d3d11.h>
 #include <d3dcompiler.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <kodi/AddonBase.h>
 #include <kodi/gui/General.h>
 #include <wrl/client.h>
 
-#pragma comment( lib, "d3dcompiler.lib" )
+#pragma comment(lib, "d3dcompiler.lib")
 #ifndef GL_CLIENT_VERSION
 #define GL_CLIENT_VERSION 3
 #endif
@@ -32,33 +34,41 @@ namespace gl
 class ATTRIBUTE_HIDDEN CGLonDX : public kodi::gui::IRenderHelper
 {
 public:
-  explicit CGLonDX() : m_pContext(reinterpret_cast<ID3D11DeviceContext*>(kodi::gui::GetHWContext())) {}
+  explicit CGLonDX() : m_pContext(reinterpret_cast<ID3D11DeviceContext*>(kodi::gui::GetHWContext()))
+  {
+  }
   ~CGLonDX() override { destruct(); }
 
   bool Init() override
   {
-    EGLint egl_display_attrs[] =
-    {
-      EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-      EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE,
-      EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE,
-      EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE,
-      EGL_NONE
-    };
-    EGLint egl_config_attrs[] =
-    {
-      EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 8,
-      EGL_BIND_TO_TEXTURE_RGBA, EGL_TRUE,
-      EGL_RENDERABLE_TYPE, GL_CLIENT_VERSION == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
-      EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
-      EGL_NONE
-    };
-    EGLint egl_context_attrs[] =
-    {
-      EGL_CONTEXT_CLIENT_VERSION, GL_CLIENT_VERSION, EGL_NONE
-    };
-
-    m_eglDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, egl_display_attrs);
+    EGLint egl_display_attrs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+                                  EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+                                  EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE,
+                                  EGL_DONT_CARE,
+                                  EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE,
+                                  EGL_DONT_CARE,
+                                  EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE,
+                                  EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE,
+                                  EGL_NONE};
+    EGLint egl_config_attrs[] = {EGL_RED_SIZE,
+                                 8,
+                                 EGL_GREEN_SIZE,
+                                 8,
+                                 EGL_BLUE_SIZE,
+                                 8,
+                                 EGL_ALPHA_SIZE,
+                                 8,
+                                 EGL_BIND_TO_TEXTURE_RGBA,
+                                 EGL_TRUE,
+                                 EGL_RENDERABLE_TYPE,
+                                 GL_CLIENT_VERSION == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
+                                 EGL_SURFACE_TYPE,
+                                 EGL_PBUFFER_BIT,
+                                 EGL_NONE};
+    EGLint egl_context_attrs[] = {EGL_CONTEXT_CLIENT_VERSION, GL_CLIENT_VERSION, EGL_NONE};
+
+    m_eglDisplay =
+        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, egl_display_attrs);
     if (m_eglDisplay == EGL_NO_DISPLAY)
     {
       Log(ADDON_LOG_ERROR, "GLonDX: unable to get EGL display (%s)", eglGetErrorString());
@@ -72,7 +82,8 @@ public:
     }
 
     EGLint numConfigs = 0;
-    if (eglChooseConfig(m_eglDisplay, egl_config_attrs, &m_eglConfig, 1, &numConfigs) != EGL_TRUE || numConfigs == 0)
+    if (eglChooseConfig(m_eglDisplay, egl_config_attrs, &m_eglConfig, 1, &numConfigs) != EGL_TRUE ||
+        numConfigs == 0)
     {
       Log(ADDON_LOG_ERROR, "GLonDX: unable to get EGL config (%s)", eglGetErrorString());
       return false;
@@ -165,7 +176,7 @@ private:
     Microsoft::WRL::ComPtr<ID3D11Resource> pRTResource;
     Microsoft::WRL::ComPtr<ID3D11Texture2D> pRTTexture;
     Microsoft::WRL::ComPtr<ID3D11Texture2D> pOffScreenTexture;
-    Microsoft::WRL::ComPtr<IDXGIResource>  dxgiResource;
+    Microsoft::WRL::ComPtr<IDXGIResource> dxgiResource;
 
     m_pContext->GetDevice(&pDevice);
     m_pContext->OMGetRenderTargets(1, &pRTView, nullptr);
@@ -187,7 +198,8 @@ private:
       return false;
     }
 
-    CD3D11_SHADER_RESOURCE_VIEW_DESC srvDesc(pOffScreenTexture.Get(), D3D11_SRV_DIMENSION_TEXTURE2D);
+    CD3D11_SHADER_RESOURCE_VIEW_DESC srvDesc(pOffScreenTexture.Get(),
+                                             D3D11_SRV_DIMENSION_TEXTURE2D);
     if (FAILED(pDevice->CreateShaderResourceView(pOffScreenTexture.Get(), &srvDesc, &m_pSRView)))
     {
       Log(ADDON_LOG_ERROR, "GLonDX: unable to create shader view");
@@ -215,18 +227,19 @@ private:
     }
 
     // create EGL buffer from D3D shared texture
-    EGLint egl_buffer_attrs[] =
-    {
-      EGL_WIDTH, static_cast<EGLint>(texDesc.Width),
-      EGL_HEIGHT, static_cast<EGLint>(texDesc.Height),
-      EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
-      EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
-      EGL_NONE
-    };
-
-    m_eglBuffer = eglCreatePbufferFromClientBuffer(m_eglDisplay,
-      EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
-      sharedHandle, m_eglConfig, egl_buffer_attrs);
+    EGLint egl_buffer_attrs[] = {EGL_WIDTH,
+                                 static_cast<EGLint>(texDesc.Width),
+                                 EGL_HEIGHT,
+                                 static_cast<EGLint>(texDesc.Height),
+                                 EGL_TEXTURE_TARGET,
+                                 EGL_TEXTURE_2D,
+                                 EGL_TEXTURE_FORMAT,
+                                 EGL_TEXTURE_RGBA,
+                                 EGL_NONE};
+
+    m_eglBuffer =
+        eglCreatePbufferFromClientBuffer(m_eglDisplay, EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
+                                         sharedHandle, m_eglConfig, egl_buffer_attrs);
 
     if (m_eglBuffer == EGL_NO_SURFACE)
     {
@@ -236,13 +249,15 @@ private:
     return true;
   }
 
-  HRESULT d3dCreateShader(ShaderType shaderType, const std::string& source, IUnknown** ppShader) const
+  HRESULT d3dCreateShader(ShaderType shaderType,
+                          const std::string& source,
+                          IUnknown** ppShader) const
   {
     Microsoft::WRL::ComPtr<ID3DBlob> pBlob;
     Microsoft::WRL::ComPtr<ID3DBlob> pErrors;
 
     auto hr = D3DCompile(source.c_str(), source.length(), nullptr, nullptr, nullptr, "main",
-      shaderType == PIXEL_SHADER ? "ps_4_0" : "vs_4_0", 0, 0, &pBlob, &pErrors);
+                         shaderType == PIXEL_SHADER ? "ps_4_0" : "vs_4_0", 0, 0, &pBlob, &pErrors);
 
     if (SUCCEEDED(hr))
     {
@@ -252,18 +267,18 @@ private:
       if (shaderType == PIXEL_SHADER)
       {
         hr = pDevice->CreatePixelShader(pBlob->GetBufferPointer(), pBlob->GetBufferSize(), nullptr,
-          reinterpret_cast<ID3D11PixelShader**>(ppShader));
+                                        reinterpret_cast<ID3D11PixelShader**>(ppShader));
       }
       else
       {
         hr = pDevice->CreateVertexShader(pBlob->GetBufferPointer(), pBlob->GetBufferSize(), nullptr,
-          reinterpret_cast<ID3D11VertexShader**>(ppShader));
+                                         reinterpret_cast<ID3D11VertexShader**>(ppShader));
       }
 
       if (FAILED(hr))
       {
         Log(ADDON_LOG_ERROR, "GLonDX: unable to create %s shader",
-          shaderType == PIXEL_SHADER ? "pixel" : "vertex");
+            shaderType == PIXEL_SHADER ? "pixel" : "vertex");
       }
     }
     else
@@ -275,7 +290,9 @@ private:
 
   static const char* eglGetErrorString()
   {
-#define CASE_STR( value ) case value: return #value
+#define CASE_STR(value) \
+  case value: \
+    return #value
     switch (eglGetError())
     {
       CASE_STR(EGL_SUCCESS);
@@ -293,8 +310,8 @@ private:
       CASE_STR(EGL_BAD_NATIVE_PIXMAP);
       CASE_STR(EGL_BAD_NATIVE_WINDOW);
       CASE_STR(EGL_CONTEXT_LOST);
-    default:
-      return "Unknown";
+      default:
+        return "Unknown";
     }
 #undef CASE_STR
   }
@@ -338,9 +355,10 @@ private:
   Microsoft::WRL::ComPtr<ID3D11PixelShader> m_pPShader = nullptr;
 
 #define TO_STRING(...) #__VA_ARGS__
-  std::string vs_out_shader_text = TO_STRING(
-  void main(uint id : SV_VertexId, out float2 tex : TEXCOORD0, out float4 pos : SV_POSITION)
-  {
+  std::string vs_out_shader_text = TO_STRING(void main(uint id
+                                                       : SV_VertexId, out float2 tex
+                                                       : TEXCOORD0, out float4 pos
+                                                       : SV_POSITION) {
     tex = float2(id % 2, (id % 4) >> 1);
     pos = float4((tex.x - 0.5f) * 2, -(tex.y - 0.5f) * 2, 0, 1);
   });
@@ -367,3 +385,5 @@ private:
 using CRenderHelper = gl::CGLonDX;
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/Shader.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/Shader.h
index 209f274..bf6d48c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/Shader.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/Shader.h
@@ -10,9 +10,11 @@
 
 #include "GL.h"
 
+#ifdef __cplusplus
+
 #include <stdio.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <kodi/AddonBase.h>
 #include <kodi/Filesystem.h>
@@ -34,8 +36,7 @@ class ATTRIBUTE_HIDDEN CShader
 public:
   CShader() = default;
   virtual ~CShader() = default;
-  virtual bool Compile(const std::string& extraBegin = "",
-                       const std::string& extraEnd = "") = 0;
+  virtual bool Compile(const std::string& extraBegin = "", const std::string& extraEnd = "") = 0;
   virtual void Free() = 0;
   virtual GLuint Handle() = 0;
 
@@ -46,7 +47,8 @@ public:
     kodi::vfs::CFile source;
     if (!source.OpenFile(file))
     {
-      kodi::Log(ADDON_LOG_ERROR, "CShader::%s: Failed to open file '%s'", __FUNCTION__, file.c_str());
+      kodi::Log(ADDON_LOG_ERROR, "CShader::%s: Failed to open file '%s'", __FUNCTION__,
+                file.c_str());
       return false;
     }
     size_t len = source.Read(buffer, sizeof(buffer));
@@ -80,8 +82,7 @@ public:
     m_vertexShader = 0;
   }
 
-  bool Compile(const std::string& extraBegin = "",
-               const std::string& extraEnd = "") override
+  bool Compile(const std::string& extraBegin = "", const std::string& extraEnd = "") override
   {
     GLint params[4];
 
@@ -90,7 +91,7 @@ public:
     m_vertexShader = glCreateShader(GL_VERTEX_SHADER);
 
     GLsizei count = 0;
-    const char *sources[3];
+    const char* sources[3];
     if (!extraBegin.empty())
       sources[count++] = extraBegin.c_str();
     if (!m_source.empty())
@@ -141,8 +142,7 @@ public:
     m_pixelShader = 0;
   }
 
-  bool Compile(const std::string& extraBegin = "",
-               const std::string& extraEnd = "") override
+  bool Compile(const std::string& extraBegin = "", const std::string& extraEnd = "") override
   {
     GLint params[4];
 
@@ -151,7 +151,7 @@ public:
     m_pixelShader = glCreateShader(GL_FRAGMENT_SHADER);
 
     GLsizei count = 0;
-    const char *sources[3];
+    const char* sources[3];
     if (!extraBegin.empty())
       sources[count++] = extraBegin.c_str();
     if (!m_source.empty())
@@ -189,16 +189,14 @@ protected:
 //------------------------------------------------------------------------
 
 //============================================================================
-///
-/// \defgroup cpp_kodi_gui_gl_CShaderProgram GL Shader Program
-/// \ingroup cpp_kodi_gui_gl
-/// @brief \cpp_class{ kodi::gui::gl::CShaderProgram }
-/// **Class to manage an OpenGL shader program**
-///
+/// @defgroup cpp_kodi_gui_helpers_gl_CShaderProgram GL Shader Program
+/// @ingroup cpp_kodi_gui_helpers_gl
+/// @brief @cpp_class{ kodi::gui::gl::CShaderProgram }
+/// **Class to manage an OpenGL shader program**\n
 /// With this class the used GL shader code can be defined on the GPU and
 /// its variables can be managed between CPU and GPU.
 ///
-/// It has the header \ref Shader.h "#include <kodi/gui/gl/Shader.h>"
+/// It has the header @ref Shader.h "#include <kodi/gui/gl/Shader.h>"
 /// be included to enjoy it.
 ///
 /// ----------------------------------------------------------------------------
@@ -275,58 +273,45 @@ protected:
 /// ADDONCREATOR(CExample);
 /// ~~~~~~~~~~~~~
 ///
-
-//========================================================================
-/// CShaderProgram
 class ATTRIBUTE_HIDDEN CShaderProgram
 {
 public:
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief Construct a new shader.
   ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief Construct a new shader
-  ///
-  /// Load must be done later with \ref LoadShaderFiles.
+  /// Load must be done later with @ref LoadShaderFiles.
   ///
   CShaderProgram() = default;
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief Construct a new shader and load defined shader files
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief Construct a new shader and load defined shader files.
   ///
   /// @param[in] vert Path to used GL vertext shader
   /// @param[in] frag Path to used GL fragment shader
   ///
-  CShaderProgram(const std::string& vert, const std::string& frag)
-  {
-    LoadShaderFiles(vert, frag);
-  }
+  CShaderProgram(const std::string& vert, const std::string& frag) { LoadShaderFiles(vert, frag); }
   //--------------------------------------------------------------------------
 
   //==========================================================================
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief Destructor.
   ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief Destructor
-  ///
-  virtual ~CShaderProgram()
-  {
-    ShaderFree();
-  }
+  virtual ~CShaderProgram() { ShaderFree(); }
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To load manually the needed shader files
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To load manually the needed shader files.
   ///
   /// @param[in] vert Path to used GL vertext shader
   /// @param[in] frag Path to used GL fragment shader
   ///
   ///
   /// @note The use of the files is optional, but it must either be passed over
-  /// here or via \ref CompileAndLink, or both of the source code.
+  /// here or via @ref CompileAndLink, or both of the source code.
   ///
   bool LoadShaderFiles(const std::string& vert, const std::string& frag)
   {
@@ -347,9 +332,8 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To compile and link the shader to the GL interface
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To compile and link the shader to the GL interface.
   ///
   /// Optionally, additional source code can be transferred here, or it can be
   /// used independently without any files
@@ -421,7 +405,7 @@ public:
       GLchar log[LOG_SIZE];
       glGetProgramInfoLog(m_shaderProgram, LOG_SIZE, nullptr, log);
       kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: %s", __FUNCTION__, log);
-      fprintf(stderr, "CShaderProgram::%s: %s\n", __FUNCTION__, log);
+      fprintf(stderr, "CShaderProgram::%s: %s@n", __FUNCTION__, log);
       ShaderFree();
       return false;
     }
@@ -434,14 +418,13 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To activate the shader and use it on the GPU
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To activate the shader and use it on the GPU.
   ///
   /// @return true if enable was successfull done
   ///
   ///
-  /// @note During this call, the \ref OnEnabled stored in the child is also
+  /// @note During this call, the @ref OnEnabled stored in the child is also
   /// called
   ///
   bool EnableShader()
@@ -480,9 +463,8 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To deactivate the shader use on the GPU
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To deactivate the shader use on the GPU.
   ///
   void DisableShader()
   {
@@ -495,8 +477,7 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
   /// @brief Used to check if shader has been loaded before.
   ///
   /// @return true if enable was successfull done
@@ -507,9 +488,8 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To get the vertex shader class used by Kodi at the addon
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To get the vertex shader class used by Kodi at the addon.
   ///
   /// @return pointer to vertex shader class
   ///
@@ -517,9 +497,8 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief To get the fragment shader class used by Kodi at the addon
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief To get the fragment shader class used by Kodi at the addon.
   ///
   /// @return pointer to fragment shader class
   ///
@@ -527,9 +506,8 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief Used to get the definition created in the OpenGL itself
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief Used to get the definition created in the OpenGL itself.
   ///
   /// @return GLuint of GL shader program handler
   ///
@@ -537,24 +515,22 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_gl_CShaderProgram_child Child Functions
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
-  /// @brief \cpp_class{ kodi::gui::gl::CShaderProgram child functions }
+  /// @defgroup cpp_kodi_gui_helpers_gl_CShaderProgram_child Child Functions
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram
+  /// @brief @cpp_class{ kodi::gui::gl::CShaderProgram child functions }
   ///
   /// Functions that are added by parent in the child
-  //@{
+  /// @{
   //==========================================================================
   ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram_child
   /// @brief Mandatory child function to set the necessary CPU to GPU data
   ///
-  virtual void OnCompiledAndLinked() {};
+  virtual void OnCompiledAndLinked(){};
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram_child
   /// @brief Optional function to exchange data between CPU and GPU while
   /// activating the shader
   ///
@@ -564,13 +540,12 @@ public:
   //--------------------------------------------------------------------------
 
   //==========================================================================
-  ///
-  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @ingroup cpp_kodi_gui_helpers_gl_CShaderProgram_child
   /// @brief Optional child function that may have to be performed when
   /// switching off the shader
-  virtual void OnDisabled() {};
+  virtual void OnDisabled(){};
   //--------------------------------------------------------------------------
-  //@}
+  /// @}
 
 private:
   void ShaderFree()
@@ -592,3 +567,5 @@ private:
 } /* namespace gl */
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/ActionIDs.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/ActionIDs.h
new file mode 100644
index 0000000..4c816a4
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/ActionIDs.h
@@ -0,0 +1,11 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/gui/input/action_ids.h"
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/CMakeLists.txt
new file mode 100644
index 0000000..d576974
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/input/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(HEADERS ActionIDs.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_gui_input)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/renderHelper.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
index 2e96d21..dabe101 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/renderHelper.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
@@ -10,6 +10,8 @@
 
 #include "../AddonBase.h"
 
+#ifdef __cplusplus
+
 namespace kodi
 {
 namespace gui
@@ -37,8 +39,8 @@ namespace gui
 struct ATTRIBUTE_HIDDEN CRenderHelperStub : public IRenderHelper
 {
   bool Init() override { return true; }
-  void Begin() override { }
-  void End() override { }
+  void Begin() override {}
+  void End() override {}
 }; /* class CRenderHelperStub */
 
 using CRenderHelper = CRenderHelperStub;
@@ -76,3 +78,5 @@ inline std::shared_ptr<IRenderHelper> ATTRIBUTE_HIDDEN GetRenderHelper()
 
 } /* namespace gui */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h b/xbmc/addons/kodi-dev-kit/include/kodi/platform/android/System.h
index ef2d728..245abd6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/platform/android/System.h
@@ -9,44 +9,37 @@
 #pragma once
 
 #include "../../AddonBase.h"
+#include "../../c-api/platform/android/system.h"
 
-/*
- * For interface between add-on and kodi.
- *
- * This structure defines the addresses of functions stored inside Kodi which
- * are then available for the add-on to call
- *
- * All function pointers there are used by the C++ interface functions below.
- * You find the set of them on xbmc/addons/interfaces/General.cpp
- *
- * Note: For add-on development itself this is not needed
- */
-
-static const char* INTERFACE_ANDROID_SYSTEM_NAME = "ANDROID_SYSTEM";
-static const char* INTERFACE_ANDROID_SYSTEM_VERSION = "1.0.1";
-static const char* INTERFACE_ANDROID_SYSTEM_VERSION_MIN = "1.0.1";
-
-struct AddonToKodiFuncTable_android_system
+#ifdef __cplusplus
+namespace kodi
+{
+namespace platform
 {
-  void* (*get_jni_env)();
-  int (*get_sdk_version)();
-  const char *(*get_class_name)();
-};
 
 //==============================================================================
+/// @defgroup cpp_kodi_platform_CInterfaceAndroidSystem class CInterfaceAndroidSystem
+/// @ingroup cpp_kodi_platform
+/// @brief **Android platform specific functions**\n
+/// C++ class to query Android specific things in Kodi.
 ///
-/// \defgroup cpp_kodi_platform  Interface - kodi::platform
-/// \ingroup cpp
-/// @brief **Android platform specific functions**
+/// It has the header is @ref System.h "#include <kodi/platform/android/System.h>".
 ///
-/// #include <kodi/platform/android/System.h>"
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/platform/android/System.h>
+///
+/// #if defined(ANDROID)
+/// kodi::platform::CInterfaceAndroidSystem system;
+/// if (system.GetSDKVersion() >= 23)
+/// {
+///   ...
+/// }
+/// #endif
+/// ~~~~~~~~~~~~~
 ///
-//------------------------------------------------------------------------------
-
-namespace kodi
-{
-namespace platform
-{
 class ATTRIBUTE_HIDDEN CInterfaceAndroidSystem
 {
 public:
@@ -55,13 +48,12 @@ public:
           GetInterface(INTERFACE_ANDROID_SYSTEM_NAME, INTERFACE_ANDROID_SYSTEM_VERSION))){};
 
   //============================================================================
+  /// @ingroup cpp_kodi_platform_CInterfaceAndroidSystem
+  /// @brief Request an JNI env pointer for the calling thread.
   ///
-  /// \ingroup cpp_kodi_platform
-  /// @brief request an JNI env pointer for the calling thread.
   /// JNI env has to be controlled by kodi because of the underlying
   /// threading concep.
   ///
-  /// @param[in]:
   /// @return JNI env pointer for the calling thread
   ///
   inline void* GetJNIEnv()
@@ -74,11 +66,9 @@ public:
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @ingroup cpp_kodi_platform_CInterfaceAndroidSystem
+  /// @brief Request the android sdk version to e.g. initialize <b>`JNIBase`</b>.
   ///
-  /// \ingroup cpp_kodi_platform
-  /// @brief request the android sdk version to e.g. initialize JNIBase.
-  ///
-  /// @param[in]:
   /// @return Android SDK version
   ///
   inline int GetSDKVersion()
@@ -88,13 +78,12 @@ public:
 
     return 0;
   }
+  //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @ingroup cpp_kodi_platform_CInterfaceAndroidSystem
+  /// @brief Request the android main class name e.g. <b>`org.xbmc.kodi`</b>.
   ///
-  /// \ingroup cpp_kodi_platform
-  /// @brief request the android main class name e.g. org.xbmc.kodi.
-  ///
-  /// @param[in]:
   /// @return package class name
   ///
   inline std::string GetClassName()
@@ -104,11 +93,13 @@ public:
 
     return std::string();
   }
+  //----------------------------------------------------------------------------
 
 private:
   AddonToKodiFuncTable_android_system* m_interface;
 };
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
 } /* namespace platform */
 } /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/tools/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/tools/CMakeLists.txt
new file mode 100644
index 0000000..16b83cb
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(HEADERS DllHelper.h
+            EndTime.h
+            StringUtils.h
+            Thread.h
+            Timer.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_tools)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h b/xbmc/addons/kodi-dev-kit/include/kodi/tools/DllHelper.h
index 3cc9eea..3cc9eea 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/DllHelper.h
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/tools/EndTime.h b/xbmc/addons/kodi-dev-kit/include/kodi/tools/EndTime.h
new file mode 100644
index 0000000..14983fa
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/EndTime.h
@@ -0,0 +1,215 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <chrono>
+
+namespace kodi
+{
+namespace tools
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_CEndTime class CEndTime
+/// @ingroup cpp_kodi_tools
+/// @brief **Timeout check**\n
+/// Class which makes it easy to check if a specified amount of time has passed.
+///
+/// This code uses the support of platform-independent chrono system introduced
+/// with C++11.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/tools/EndTime.h>
+///
+/// class ATTRIBUTE_HIDDEN CExample
+/// {
+/// public:
+///   CExample()
+///   {
+///     TimerCall();
+///   }
+///
+///   void TimerCall()
+///   {
+///     fprintf(stderr, "Hello World\n");
+///     CEndTime timer(1000);
+///
+///     while (timer.MillisLeft())
+///     {
+///       if (timer.IsTimePast())
+///       {
+///         fprintf(stderr, "We timed out!\n");
+///       }
+///       std::this_thread::sleep_for(std::chrono::milliseconds(10));
+///     }
+///   }
+///
+/// };
+/// ~~~~~~~~~~~~~
+///
+///@{
+class CEndTime
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Class constructor with no time to expiry set
+  ///
+  inline CEndTime() = default;
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Class constructor to set future time when timer has expired
+  ///
+  /// @param[in] millisecondsIntoTheFuture the time in the future we cosider this timer as expired
+  ///
+  inline explicit CEndTime(unsigned int millisecondsIntoTheFuture)
+    : m_startTime(std::chrono::system_clock::now().time_since_epoch()),
+      m_totalWaitTime(std::chrono::milliseconds(millisecondsIntoTheFuture))
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Set the time in the future we cosider this timer as expired
+  ///
+  /// @param[in] millisecondsIntoTheFuture the time in the future we cosider this timer as expired
+  ///
+  inline void Set(unsigned int millisecondsIntoTheFuture)
+  {
+    using namespace std::chrono;
+
+    m_startTime = system_clock::now().time_since_epoch();
+    m_totalWaitTime = milliseconds(millisecondsIntoTheFuture);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Check if the expiry time has been reached
+  ///
+  /// @return True if the expiry amount of time has past, false otherwise
+  ///
+  inline bool IsTimePast() const
+  {
+    using namespace std::chrono;
+
+    // timer is infinite
+    if (m_totalWaitTime.count() == std::numeric_limits<unsigned int>::max())
+      return false;
+
+    if (m_totalWaitTime.count() == 0)
+      return true;
+    else
+      return (system_clock::now().time_since_epoch() - m_startTime) >= m_totalWaitTime;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief The amount of time left till this timer expires
+  ///
+  /// @return 0 if the expiry amount of time has past, the numbe rof milliseconds remaining otherwise
+  ///
+  inline unsigned int MillisLeft() const
+  {
+    using namespace std::chrono;
+
+    // timer is infinite
+    if (m_totalWaitTime.count() == std::numeric_limits<unsigned int>::max())
+      return std::numeric_limits<unsigned int>::max();
+
+    if (m_totalWaitTime.count() == 0)
+      return 0;
+
+    auto elapsed = system_clock::now().time_since_epoch() - m_startTime;
+
+    auto timeWaitedAlready = duration_cast<milliseconds>(elapsed).count();
+
+    if (timeWaitedAlready >= m_totalWaitTime.count())
+      return 0;
+
+    return static_cast<unsigned int>(m_totalWaitTime.count() - timeWaitedAlready);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Consider this timer expired
+  ///
+  inline void SetExpired()
+  {
+    using namespace std::chrono;
+    m_totalWaitTime = milliseconds(0);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Set this timer as never expiring
+  ///
+  inline void SetInfinite()
+  {
+    using namespace std::chrono;
+    m_totalWaitTime = milliseconds(std::numeric_limits<unsigned int>::max());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Check if the timer has been set to infinite expiry
+  ///
+  /// @return True if the expiry has been set as infinite, false otherwise
+  ///
+  inline bool IsInfinite(void) const
+  {
+    return (m_totalWaitTime.count() == std::numeric_limits<unsigned int>::max());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Get the initial timeout value this timer had
+  ///
+  /// @return The initial expiry amount of time this timer had in milliseconds
+  ///
+  inline unsigned int GetInitialTimeoutValue(void) const
+  {
+    auto value = std::chrono::duration_cast<std::chrono::milliseconds>(m_totalWaitTime);
+    return static_cast<unsigned int>(value.count());
+  }
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CEndTime
+  /// @brief Get the time this timer started
+  ///
+  /// @return The time this timer started in milliseconds since epoch
+  ///
+  inline uint64_t GetStartTime(void) const
+  {
+    auto value = std::chrono::duration_cast<std::chrono::milliseconds>(m_startTime);
+    return value.count();
+  }
+  //----------------------------------------------------------------------------
+
+private:
+  std::chrono::system_clock::duration m_startTime;
+  std::chrono::system_clock::duration m_totalWaitTime;
+};
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/tools/StringUtils.h b/xbmc/addons/kodi-dev-kit/include/kodi/tools/StringUtils.h
new file mode 100644
index 0000000..977c0e5
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/StringUtils.h
@@ -0,0 +1,3086 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+
+#if !defined(NOMINMAX)
+#define NOMINMAX
+#endif
+
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <cinttypes>
+#include <cmath>
+#include <cstdarg>
+#include <cstring>
+#include <iomanip>
+#include <regex>
+#include <sstream>
+#include <string>
+#include <vector>
+
+// # of bytes for initial allocation for printf
+#define FORMAT_BLOCK_SIZE 512
+
+// macros for gcc, clang & others
+#ifndef PARAM1_PRINTF_FORMAT
+#ifdef __GNUC__
+// for use in functions that take printf format string as first parameter and additional printf parameters as second parameter
+// for example: int myprintf(const char* format, ...) PARAM1_PRINTF_FORMAT;
+#define PARAM1_PRINTF_FORMAT __attribute__((format(printf, 1, 2)))
+
+// for use in functions that take printf format string as second parameter and additional printf parameters as third parameter
+// for example: bool log_string(int logLevel, const char* format, ...) PARAM2_PRINTF_FORMAT;
+// note: all non-static class member functions take pointer to class object as hidden first parameter
+#define PARAM2_PRINTF_FORMAT __attribute__((format(printf, 2, 3)))
+
+// for use in functions that take printf format string as third parameter and additional printf parameters as fourth parameter
+// note: all non-static class member functions take pointer to class object as hidden first parameter
+// for example: class A { bool log_string(int logLevel, const char* functionName, const char* format, ...) PARAM3_PRINTF_FORMAT; };
+#define PARAM3_PRINTF_FORMAT __attribute__((format(printf, 3, 4)))
+
+// for use in functions that take printf format string as fourth parameter and additional printf parameters as fith parameter
+// note: all non-static class member functions take pointer to class object as hidden first parameter
+// for example: class A { bool log_string(int logLevel, const char* functionName, int component, const char* format, ...) PARAM4_PRINTF_FORMAT; };
+#define PARAM4_PRINTF_FORMAT __attribute__((format(printf, 4, 5)))
+#else // ! __GNUC__
+#define PARAM1_PRINTF_FORMAT
+#define PARAM2_PRINTF_FORMAT
+#define PARAM3_PRINTF_FORMAT
+#define PARAM4_PRINTF_FORMAT
+#endif // ! __GNUC__
+#endif // PARAM1_PRINTF_FORMAT
+
+// macros for VC
+// VC check parameters only when "Code Analysis" is called
+#ifndef PRINTF_FORMAT_STRING
+#ifdef _MSC_VER
+#include <sal.h>
+
+// for use in any function that take printf format string and parameters
+// for example: bool log_string(int logLevel, PRINTF_FORMAT_STRING const char* format, ...);
+#define PRINTF_FORMAT_STRING _In_z_ _Printf_format_string_
+
+// specify that parameter must be zero-terminated string
+// for example: void SetName(IN_STRING const char* newName);
+#define IN_STRING _In_z_
+
+// specify that parameter must be zero-terminated string or NULL
+// for example: bool SetAdditionalName(IN_OPT_STRING const char* addName);
+#define IN_OPT_STRING _In_opt_z_
+#else // ! _MSC_VER
+#define PRINTF_FORMAT_STRING
+#define IN_STRING
+#define IN_OPT_STRING
+#endif // ! _MSC_VER
+#endif // PRINTF_FORMAT_STRING
+
+static constexpr wchar_t unicode_lowers[] = {
+    (wchar_t)0x0061, (wchar_t)0x0062, (wchar_t)0x0063, (wchar_t)0x0064, (wchar_t)0x0065,
+    (wchar_t)0x0066, (wchar_t)0x0067, (wchar_t)0x0068, (wchar_t)0x0069, (wchar_t)0x006A,
+    (wchar_t)0x006B, (wchar_t)0x006C, (wchar_t)0x006D, (wchar_t)0x006E, (wchar_t)0x006F,
+    (wchar_t)0x0070, (wchar_t)0x0071, (wchar_t)0x0072, (wchar_t)0x0073, (wchar_t)0x0074,
+    (wchar_t)0x0075, (wchar_t)0x0076, (wchar_t)0x0077, (wchar_t)0x0078, (wchar_t)0x0079,
+    (wchar_t)0x007A, (wchar_t)0x00E0, (wchar_t)0x00E1, (wchar_t)0x00E2, (wchar_t)0x00E3,
+    (wchar_t)0x00E4, (wchar_t)0x00E5, (wchar_t)0x00E6, (wchar_t)0x00E7, (wchar_t)0x00E8,
+    (wchar_t)0x00E9, (wchar_t)0x00EA, (wchar_t)0x00EB, (wchar_t)0x00EC, (wchar_t)0x00ED,
+    (wchar_t)0x00EE, (wchar_t)0x00EF, (wchar_t)0x00F0, (wchar_t)0x00F1, (wchar_t)0x00F2,
+    (wchar_t)0x00F3, (wchar_t)0x00F4, (wchar_t)0x00F5, (wchar_t)0x00F6, (wchar_t)0x00F8,
+    (wchar_t)0x00F9, (wchar_t)0x00FA, (wchar_t)0x00FB, (wchar_t)0x00FC, (wchar_t)0x00FD,
+    (wchar_t)0x00FE, (wchar_t)0x00FF, (wchar_t)0x0101, (wchar_t)0x0103, (wchar_t)0x0105,
+    (wchar_t)0x0107, (wchar_t)0x0109, (wchar_t)0x010B, (wchar_t)0x010D, (wchar_t)0x010F,
+    (wchar_t)0x0111, (wchar_t)0x0113, (wchar_t)0x0115, (wchar_t)0x0117, (wchar_t)0x0119,
+    (wchar_t)0x011B, (wchar_t)0x011D, (wchar_t)0x011F, (wchar_t)0x0121, (wchar_t)0x0123,
+    (wchar_t)0x0125, (wchar_t)0x0127, (wchar_t)0x0129, (wchar_t)0x012B, (wchar_t)0x012D,
+    (wchar_t)0x012F, (wchar_t)0x0131, (wchar_t)0x0133, (wchar_t)0x0135, (wchar_t)0x0137,
+    (wchar_t)0x013A, (wchar_t)0x013C, (wchar_t)0x013E, (wchar_t)0x0140, (wchar_t)0x0142,
+    (wchar_t)0x0144, (wchar_t)0x0146, (wchar_t)0x0148, (wchar_t)0x014B, (wchar_t)0x014D,
+    (wchar_t)0x014F, (wchar_t)0x0151, (wchar_t)0x0153, (wchar_t)0x0155, (wchar_t)0x0157,
+    (wchar_t)0x0159, (wchar_t)0x015B, (wchar_t)0x015D, (wchar_t)0x015F, (wchar_t)0x0161,
+    (wchar_t)0x0163, (wchar_t)0x0165, (wchar_t)0x0167, (wchar_t)0x0169, (wchar_t)0x016B,
+    (wchar_t)0x016D, (wchar_t)0x016F, (wchar_t)0x0171, (wchar_t)0x0173, (wchar_t)0x0175,
+    (wchar_t)0x0177, (wchar_t)0x017A, (wchar_t)0x017C, (wchar_t)0x017E, (wchar_t)0x0183,
+    (wchar_t)0x0185, (wchar_t)0x0188, (wchar_t)0x018C, (wchar_t)0x0192, (wchar_t)0x0199,
+    (wchar_t)0x01A1, (wchar_t)0x01A3, (wchar_t)0x01A5, (wchar_t)0x01A8, (wchar_t)0x01AD,
+    (wchar_t)0x01B0, (wchar_t)0x01B4, (wchar_t)0x01B6, (wchar_t)0x01B9, (wchar_t)0x01BD,
+    (wchar_t)0x01C6, (wchar_t)0x01C9, (wchar_t)0x01CC, (wchar_t)0x01CE, (wchar_t)0x01D0,
+    (wchar_t)0x01D2, (wchar_t)0x01D4, (wchar_t)0x01D6, (wchar_t)0x01D8, (wchar_t)0x01DA,
+    (wchar_t)0x01DC, (wchar_t)0x01DF, (wchar_t)0x01E1, (wchar_t)0x01E3, (wchar_t)0x01E5,
+    (wchar_t)0x01E7, (wchar_t)0x01E9, (wchar_t)0x01EB, (wchar_t)0x01ED, (wchar_t)0x01EF,
+    (wchar_t)0x01F3, (wchar_t)0x01F5, (wchar_t)0x01FB, (wchar_t)0x01FD, (wchar_t)0x01FF,
+    (wchar_t)0x0201, (wchar_t)0x0203, (wchar_t)0x0205, (wchar_t)0x0207, (wchar_t)0x0209,
+    (wchar_t)0x020B, (wchar_t)0x020D, (wchar_t)0x020F, (wchar_t)0x0211, (wchar_t)0x0213,
+    (wchar_t)0x0215, (wchar_t)0x0217, (wchar_t)0x0253, (wchar_t)0x0254, (wchar_t)0x0257,
+    (wchar_t)0x0258, (wchar_t)0x0259, (wchar_t)0x025B, (wchar_t)0x0260, (wchar_t)0x0263,
+    (wchar_t)0x0268, (wchar_t)0x0269, (wchar_t)0x026F, (wchar_t)0x0272, (wchar_t)0x0275,
+    (wchar_t)0x0283, (wchar_t)0x0288, (wchar_t)0x028A, (wchar_t)0x028B, (wchar_t)0x0292,
+    (wchar_t)0x03AC, (wchar_t)0x03AD, (wchar_t)0x03AE, (wchar_t)0x03AF, (wchar_t)0x03B1,
+    (wchar_t)0x03B2, (wchar_t)0x03B3, (wchar_t)0x03B4, (wchar_t)0x03B5, (wchar_t)0x03B6,
+    (wchar_t)0x03B7, (wchar_t)0x03B8, (wchar_t)0x03B9, (wchar_t)0x03BA, (wchar_t)0x03BB,
+    (wchar_t)0x03BC, (wchar_t)0x03BD, (wchar_t)0x03BE, (wchar_t)0x03BF, (wchar_t)0x03C0,
+    (wchar_t)0x03C1, (wchar_t)0x03C3, (wchar_t)0x03C4, (wchar_t)0x03C5, (wchar_t)0x03C6,
+    (wchar_t)0x03C7, (wchar_t)0x03C8, (wchar_t)0x03C9, (wchar_t)0x03CA, (wchar_t)0x03CB,
+    (wchar_t)0x03CC, (wchar_t)0x03CD, (wchar_t)0x03CE, (wchar_t)0x03E3, (wchar_t)0x03E5,
+    (wchar_t)0x03E7, (wchar_t)0x03E9, (wchar_t)0x03EB, (wchar_t)0x03ED, (wchar_t)0x03EF,
+    (wchar_t)0x0430, (wchar_t)0x0431, (wchar_t)0x0432, (wchar_t)0x0433, (wchar_t)0x0434,
+    (wchar_t)0x0435, (wchar_t)0x0436, (wchar_t)0x0437, (wchar_t)0x0438, (wchar_t)0x0439,
+    (wchar_t)0x043A, (wchar_t)0x043B, (wchar_t)0x043C, (wchar_t)0x043D, (wchar_t)0x043E,
+    (wchar_t)0x043F, (wchar_t)0x0440, (wchar_t)0x0441, (wchar_t)0x0442, (wchar_t)0x0443,
+    (wchar_t)0x0444, (wchar_t)0x0445, (wchar_t)0x0446, (wchar_t)0x0447, (wchar_t)0x0448,
+    (wchar_t)0x0449, (wchar_t)0x044A, (wchar_t)0x044B, (wchar_t)0x044C, (wchar_t)0x044D,
+    (wchar_t)0x044E, (wchar_t)0x044F, (wchar_t)0x0451, (wchar_t)0x0452, (wchar_t)0x0453,
+    (wchar_t)0x0454, (wchar_t)0x0455, (wchar_t)0x0456, (wchar_t)0x0457, (wchar_t)0x0458,
+    (wchar_t)0x0459, (wchar_t)0x045A, (wchar_t)0x045B, (wchar_t)0x045C, (wchar_t)0x045E,
+    (wchar_t)0x045F, (wchar_t)0x0461, (wchar_t)0x0463, (wchar_t)0x0465, (wchar_t)0x0467,
+    (wchar_t)0x0469, (wchar_t)0x046B, (wchar_t)0x046D, (wchar_t)0x046F, (wchar_t)0x0471,
+    (wchar_t)0x0473, (wchar_t)0x0475, (wchar_t)0x0477, (wchar_t)0x0479, (wchar_t)0x047B,
+    (wchar_t)0x047D, (wchar_t)0x047F, (wchar_t)0x0481, (wchar_t)0x0491, (wchar_t)0x0493,
+    (wchar_t)0x0495, (wchar_t)0x0497, (wchar_t)0x0499, (wchar_t)0x049B, (wchar_t)0x049D,
+    (wchar_t)0x049F, (wchar_t)0x04A1, (wchar_t)0x04A3, (wchar_t)0x04A5, (wchar_t)0x04A7,
+    (wchar_t)0x04A9, (wchar_t)0x04AB, (wchar_t)0x04AD, (wchar_t)0x04AF, (wchar_t)0x04B1,
+    (wchar_t)0x04B3, (wchar_t)0x04B5, (wchar_t)0x04B7, (wchar_t)0x04B9, (wchar_t)0x04BB,
+    (wchar_t)0x04BD, (wchar_t)0x04BF, (wchar_t)0x04C2, (wchar_t)0x04C4, (wchar_t)0x04C8,
+    (wchar_t)0x04CC, (wchar_t)0x04D1, (wchar_t)0x04D3, (wchar_t)0x04D5, (wchar_t)0x04D7,
+    (wchar_t)0x04D9, (wchar_t)0x04DB, (wchar_t)0x04DD, (wchar_t)0x04DF, (wchar_t)0x04E1,
+    (wchar_t)0x04E3, (wchar_t)0x04E5, (wchar_t)0x04E7, (wchar_t)0x04E9, (wchar_t)0x04EB,
+    (wchar_t)0x04EF, (wchar_t)0x04F1, (wchar_t)0x04F3, (wchar_t)0x04F5, (wchar_t)0x04F9,
+    (wchar_t)0x0561, (wchar_t)0x0562, (wchar_t)0x0563, (wchar_t)0x0564, (wchar_t)0x0565,
+    (wchar_t)0x0566, (wchar_t)0x0567, (wchar_t)0x0568, (wchar_t)0x0569, (wchar_t)0x056A,
+    (wchar_t)0x056B, (wchar_t)0x056C, (wchar_t)0x056D, (wchar_t)0x056E, (wchar_t)0x056F,
+    (wchar_t)0x0570, (wchar_t)0x0571, (wchar_t)0x0572, (wchar_t)0x0573, (wchar_t)0x0574,
+    (wchar_t)0x0575, (wchar_t)0x0576, (wchar_t)0x0577, (wchar_t)0x0578, (wchar_t)0x0579,
+    (wchar_t)0x057A, (wchar_t)0x057B, (wchar_t)0x057C, (wchar_t)0x057D, (wchar_t)0x057E,
+    (wchar_t)0x057F, (wchar_t)0x0580, (wchar_t)0x0581, (wchar_t)0x0582, (wchar_t)0x0583,
+    (wchar_t)0x0584, (wchar_t)0x0585, (wchar_t)0x0586, (wchar_t)0x10D0, (wchar_t)0x10D1,
+    (wchar_t)0x10D2, (wchar_t)0x10D3, (wchar_t)0x10D4, (wchar_t)0x10D5, (wchar_t)0x10D6,
+    (wchar_t)0x10D7, (wchar_t)0x10D8, (wchar_t)0x10D9, (wchar_t)0x10DA, (wchar_t)0x10DB,
+    (wchar_t)0x10DC, (wchar_t)0x10DD, (wchar_t)0x10DE, (wchar_t)0x10DF, (wchar_t)0x10E0,
+    (wchar_t)0x10E1, (wchar_t)0x10E2, (wchar_t)0x10E3, (wchar_t)0x10E4, (wchar_t)0x10E5,
+    (wchar_t)0x10E6, (wchar_t)0x10E7, (wchar_t)0x10E8, (wchar_t)0x10E9, (wchar_t)0x10EA,
+    (wchar_t)0x10EB, (wchar_t)0x10EC, (wchar_t)0x10ED, (wchar_t)0x10EE, (wchar_t)0x10EF,
+    (wchar_t)0x10F0, (wchar_t)0x10F1, (wchar_t)0x10F2, (wchar_t)0x10F3, (wchar_t)0x10F4,
+    (wchar_t)0x10F5, (wchar_t)0x1E01, (wchar_t)0x1E03, (wchar_t)0x1E05, (wchar_t)0x1E07,
+    (wchar_t)0x1E09, (wchar_t)0x1E0B, (wchar_t)0x1E0D, (wchar_t)0x1E0F, (wchar_t)0x1E11,
+    (wchar_t)0x1E13, (wchar_t)0x1E15, (wchar_t)0x1E17, (wchar_t)0x1E19, (wchar_t)0x1E1B,
+    (wchar_t)0x1E1D, (wchar_t)0x1E1F, (wchar_t)0x1E21, (wchar_t)0x1E23, (wchar_t)0x1E25,
+    (wchar_t)0x1E27, (wchar_t)0x1E29, (wchar_t)0x1E2B, (wchar_t)0x1E2D, (wchar_t)0x1E2F,
+    (wchar_t)0x1E31, (wchar_t)0x1E33, (wchar_t)0x1E35, (wchar_t)0x1E37, (wchar_t)0x1E39,
+    (wchar_t)0x1E3B, (wchar_t)0x1E3D, (wchar_t)0x1E3F, (wchar_t)0x1E41, (wchar_t)0x1E43,
+    (wchar_t)0x1E45, (wchar_t)0x1E47, (wchar_t)0x1E49, (wchar_t)0x1E4B, (wchar_t)0x1E4D,
+    (wchar_t)0x1E4F, (wchar_t)0x1E51, (wchar_t)0x1E53, (wchar_t)0x1E55, (wchar_t)0x1E57,
+    (wchar_t)0x1E59, (wchar_t)0x1E5B, (wchar_t)0x1E5D, (wchar_t)0x1E5F, (wchar_t)0x1E61,
+    (wchar_t)0x1E63, (wchar_t)0x1E65, (wchar_t)0x1E67, (wchar_t)0x1E69, (wchar_t)0x1E6B,
+    (wchar_t)0x1E6D, (wchar_t)0x1E6F, (wchar_t)0x1E71, (wchar_t)0x1E73, (wchar_t)0x1E75,
+    (wchar_t)0x1E77, (wchar_t)0x1E79, (wchar_t)0x1E7B, (wchar_t)0x1E7D, (wchar_t)0x1E7F,
+    (wchar_t)0x1E81, (wchar_t)0x1E83, (wchar_t)0x1E85, (wchar_t)0x1E87, (wchar_t)0x1E89,
+    (wchar_t)0x1E8B, (wchar_t)0x1E8D, (wchar_t)0x1E8F, (wchar_t)0x1E91, (wchar_t)0x1E93,
+    (wchar_t)0x1E95, (wchar_t)0x1EA1, (wchar_t)0x1EA3, (wchar_t)0x1EA5, (wchar_t)0x1EA7,
+    (wchar_t)0x1EA9, (wchar_t)0x1EAB, (wchar_t)0x1EAD, (wchar_t)0x1EAF, (wchar_t)0x1EB1,
+    (wchar_t)0x1EB3, (wchar_t)0x1EB5, (wchar_t)0x1EB7, (wchar_t)0x1EB9, (wchar_t)0x1EBB,
+    (wchar_t)0x1EBD, (wchar_t)0x1EBF, (wchar_t)0x1EC1, (wchar_t)0x1EC3, (wchar_t)0x1EC5,
+    (wchar_t)0x1EC7, (wchar_t)0x1EC9, (wchar_t)0x1ECB, (wchar_t)0x1ECD, (wchar_t)0x1ECF,
+    (wchar_t)0x1ED1, (wchar_t)0x1ED3, (wchar_t)0x1ED5, (wchar_t)0x1ED7, (wchar_t)0x1ED9,
+    (wchar_t)0x1EDB, (wchar_t)0x1EDD, (wchar_t)0x1EDF, (wchar_t)0x1EE1, (wchar_t)0x1EE3,
+    (wchar_t)0x1EE5, (wchar_t)0x1EE7, (wchar_t)0x1EE9, (wchar_t)0x1EEB, (wchar_t)0x1EED,
+    (wchar_t)0x1EEF, (wchar_t)0x1EF1, (wchar_t)0x1EF3, (wchar_t)0x1EF5, (wchar_t)0x1EF7,
+    (wchar_t)0x1EF9, (wchar_t)0x1F00, (wchar_t)0x1F01, (wchar_t)0x1F02, (wchar_t)0x1F03,
+    (wchar_t)0x1F04, (wchar_t)0x1F05, (wchar_t)0x1F06, (wchar_t)0x1F07, (wchar_t)0x1F10,
+    (wchar_t)0x1F11, (wchar_t)0x1F12, (wchar_t)0x1F13, (wchar_t)0x1F14, (wchar_t)0x1F15,
+    (wchar_t)0x1F20, (wchar_t)0x1F21, (wchar_t)0x1F22, (wchar_t)0x1F23, (wchar_t)0x1F24,
+    (wchar_t)0x1F25, (wchar_t)0x1F26, (wchar_t)0x1F27, (wchar_t)0x1F30, (wchar_t)0x1F31,
+    (wchar_t)0x1F32, (wchar_t)0x1F33, (wchar_t)0x1F34, (wchar_t)0x1F35, (wchar_t)0x1F36,
+    (wchar_t)0x1F37, (wchar_t)0x1F40, (wchar_t)0x1F41, (wchar_t)0x1F42, (wchar_t)0x1F43,
+    (wchar_t)0x1F44, (wchar_t)0x1F45, (wchar_t)0x1F51, (wchar_t)0x1F53, (wchar_t)0x1F55,
+    (wchar_t)0x1F57, (wchar_t)0x1F60, (wchar_t)0x1F61, (wchar_t)0x1F62, (wchar_t)0x1F63,
+    (wchar_t)0x1F64, (wchar_t)0x1F65, (wchar_t)0x1F66, (wchar_t)0x1F67, (wchar_t)0x1F80,
+    (wchar_t)0x1F81, (wchar_t)0x1F82, (wchar_t)0x1F83, (wchar_t)0x1F84, (wchar_t)0x1F85,
+    (wchar_t)0x1F86, (wchar_t)0x1F87, (wchar_t)0x1F90, (wchar_t)0x1F91, (wchar_t)0x1F92,
+    (wchar_t)0x1F93, (wchar_t)0x1F94, (wchar_t)0x1F95, (wchar_t)0x1F96, (wchar_t)0x1F97,
+    (wchar_t)0x1FA0, (wchar_t)0x1FA1, (wchar_t)0x1FA2, (wchar_t)0x1FA3, (wchar_t)0x1FA4,
+    (wchar_t)0x1FA5, (wchar_t)0x1FA6, (wchar_t)0x1FA7, (wchar_t)0x1FB0, (wchar_t)0x1FB1,
+    (wchar_t)0x1FD0, (wchar_t)0x1FD1, (wchar_t)0x1FE0, (wchar_t)0x1FE1, (wchar_t)0x24D0,
+    (wchar_t)0x24D1, (wchar_t)0x24D2, (wchar_t)0x24D3, (wchar_t)0x24D4, (wchar_t)0x24D5,
+    (wchar_t)0x24D6, (wchar_t)0x24D7, (wchar_t)0x24D8, (wchar_t)0x24D9, (wchar_t)0x24DA,
+    (wchar_t)0x24DB, (wchar_t)0x24DC, (wchar_t)0x24DD, (wchar_t)0x24DE, (wchar_t)0x24DF,
+    (wchar_t)0x24E0, (wchar_t)0x24E1, (wchar_t)0x24E2, (wchar_t)0x24E3, (wchar_t)0x24E4,
+    (wchar_t)0x24E5, (wchar_t)0x24E6, (wchar_t)0x24E7, (wchar_t)0x24E8, (wchar_t)0x24E9,
+    (wchar_t)0xFF41, (wchar_t)0xFF42, (wchar_t)0xFF43, (wchar_t)0xFF44, (wchar_t)0xFF45,
+    (wchar_t)0xFF46, (wchar_t)0xFF47, (wchar_t)0xFF48, (wchar_t)0xFF49, (wchar_t)0xFF4A,
+    (wchar_t)0xFF4B, (wchar_t)0xFF4C, (wchar_t)0xFF4D, (wchar_t)0xFF4E, (wchar_t)0xFF4F,
+    (wchar_t)0xFF50, (wchar_t)0xFF51, (wchar_t)0xFF52, (wchar_t)0xFF53, (wchar_t)0xFF54,
+    (wchar_t)0xFF55, (wchar_t)0xFF56, (wchar_t)0xFF57, (wchar_t)0xFF58, (wchar_t)0xFF59,
+    (wchar_t)0xFF5A};
+
+static const wchar_t unicode_uppers[] = {
+    (wchar_t)0x0041, (wchar_t)0x0042, (wchar_t)0x0043, (wchar_t)0x0044, (wchar_t)0x0045,
+    (wchar_t)0x0046, (wchar_t)0x0047, (wchar_t)0x0048, (wchar_t)0x0049, (wchar_t)0x004A,
+    (wchar_t)0x004B, (wchar_t)0x004C, (wchar_t)0x004D, (wchar_t)0x004E, (wchar_t)0x004F,
+    (wchar_t)0x0050, (wchar_t)0x0051, (wchar_t)0x0052, (wchar_t)0x0053, (wchar_t)0x0054,
+    (wchar_t)0x0055, (wchar_t)0x0056, (wchar_t)0x0057, (wchar_t)0x0058, (wchar_t)0x0059,
+    (wchar_t)0x005A, (wchar_t)0x00C0, (wchar_t)0x00C1, (wchar_t)0x00C2, (wchar_t)0x00C3,
+    (wchar_t)0x00C4, (wchar_t)0x00C5, (wchar_t)0x00C6, (wchar_t)0x00C7, (wchar_t)0x00C8,
+    (wchar_t)0x00C9, (wchar_t)0x00CA, (wchar_t)0x00CB, (wchar_t)0x00CC, (wchar_t)0x00CD,
+    (wchar_t)0x00CE, (wchar_t)0x00CF, (wchar_t)0x00D0, (wchar_t)0x00D1, (wchar_t)0x00D2,
+    (wchar_t)0x00D3, (wchar_t)0x00D4, (wchar_t)0x00D5, (wchar_t)0x00D6, (wchar_t)0x00D8,
+    (wchar_t)0x00D9, (wchar_t)0x00DA, (wchar_t)0x00DB, (wchar_t)0x00DC, (wchar_t)0x00DD,
+    (wchar_t)0x00DE, (wchar_t)0x0178, (wchar_t)0x0100, (wchar_t)0x0102, (wchar_t)0x0104,
+    (wchar_t)0x0106, (wchar_t)0x0108, (wchar_t)0x010A, (wchar_t)0x010C, (wchar_t)0x010E,
+    (wchar_t)0x0110, (wchar_t)0x0112, (wchar_t)0x0114, (wchar_t)0x0116, (wchar_t)0x0118,
+    (wchar_t)0x011A, (wchar_t)0x011C, (wchar_t)0x011E, (wchar_t)0x0120, (wchar_t)0x0122,
+    (wchar_t)0x0124, (wchar_t)0x0126, (wchar_t)0x0128, (wchar_t)0x012A, (wchar_t)0x012C,
+    (wchar_t)0x012E, (wchar_t)0x0049, (wchar_t)0x0132, (wchar_t)0x0134, (wchar_t)0x0136,
+    (wchar_t)0x0139, (wchar_t)0x013B, (wchar_t)0x013D, (wchar_t)0x013F, (wchar_t)0x0141,
+    (wchar_t)0x0143, (wchar_t)0x0145, (wchar_t)0x0147, (wchar_t)0x014A, (wchar_t)0x014C,
+    (wchar_t)0x014E, (wchar_t)0x0150, (wchar_t)0x0152, (wchar_t)0x0154, (wchar_t)0x0156,
+    (wchar_t)0x0158, (wchar_t)0x015A, (wchar_t)0x015C, (wchar_t)0x015E, (wchar_t)0x0160,
+    (wchar_t)0x0162, (wchar_t)0x0164, (wchar_t)0x0166, (wchar_t)0x0168, (wchar_t)0x016A,
+    (wchar_t)0x016C, (wchar_t)0x016E, (wchar_t)0x0170, (wchar_t)0x0172, (wchar_t)0x0174,
+    (wchar_t)0x0176, (wchar_t)0x0179, (wchar_t)0x017B, (wchar_t)0x017D, (wchar_t)0x0182,
+    (wchar_t)0x0184, (wchar_t)0x0187, (wchar_t)0x018B, (wchar_t)0x0191, (wchar_t)0x0198,
+    (wchar_t)0x01A0, (wchar_t)0x01A2, (wchar_t)0x01A4, (wchar_t)0x01A7, (wchar_t)0x01AC,
+    (wchar_t)0x01AF, (wchar_t)0x01B3, (wchar_t)0x01B5, (wchar_t)0x01B8, (wchar_t)0x01BC,
+    (wchar_t)0x01C4, (wchar_t)0x01C7, (wchar_t)0x01CA, (wchar_t)0x01CD, (wchar_t)0x01CF,
+    (wchar_t)0x01D1, (wchar_t)0x01D3, (wchar_t)0x01D5, (wchar_t)0x01D7, (wchar_t)0x01D9,
+    (wchar_t)0x01DB, (wchar_t)0x01DE, (wchar_t)0x01E0, (wchar_t)0x01E2, (wchar_t)0x01E4,
+    (wchar_t)0x01E6, (wchar_t)0x01E8, (wchar_t)0x01EA, (wchar_t)0x01EC, (wchar_t)0x01EE,
+    (wchar_t)0x01F1, (wchar_t)0x01F4, (wchar_t)0x01FA, (wchar_t)0x01FC, (wchar_t)0x01FE,
+    (wchar_t)0x0200, (wchar_t)0x0202, (wchar_t)0x0204, (wchar_t)0x0206, (wchar_t)0x0208,
+    (wchar_t)0x020A, (wchar_t)0x020C, (wchar_t)0x020E, (wchar_t)0x0210, (wchar_t)0x0212,
+    (wchar_t)0x0214, (wchar_t)0x0216, (wchar_t)0x0181, (wchar_t)0x0186, (wchar_t)0x018A,
+    (wchar_t)0x018E, (wchar_t)0x018F, (wchar_t)0x0190, (wchar_t)0x0193, (wchar_t)0x0194,
+    (wchar_t)0x0197, (wchar_t)0x0196, (wchar_t)0x019C, (wchar_t)0x019D, (wchar_t)0x019F,
+    (wchar_t)0x01A9, (wchar_t)0x01AE, (wchar_t)0x01B1, (wchar_t)0x01B2, (wchar_t)0x01B7,
+    (wchar_t)0x0386, (wchar_t)0x0388, (wchar_t)0x0389, (wchar_t)0x038A, (wchar_t)0x0391,
+    (wchar_t)0x0392, (wchar_t)0x0393, (wchar_t)0x0394, (wchar_t)0x0395, (wchar_t)0x0396,
+    (wchar_t)0x0397, (wchar_t)0x0398, (wchar_t)0x0399, (wchar_t)0x039A, (wchar_t)0x039B,
+    (wchar_t)0x039C, (wchar_t)0x039D, (wchar_t)0x039E, (wchar_t)0x039F, (wchar_t)0x03A0,
+    (wchar_t)0x03A1, (wchar_t)0x03A3, (wchar_t)0x03A4, (wchar_t)0x03A5, (wchar_t)0x03A6,
+    (wchar_t)0x03A7, (wchar_t)0x03A8, (wchar_t)0x03A9, (wchar_t)0x03AA, (wchar_t)0x03AB,
+    (wchar_t)0x038C, (wchar_t)0x038E, (wchar_t)0x038F, (wchar_t)0x03E2, (wchar_t)0x03E4,
+    (wchar_t)0x03E6, (wchar_t)0x03E8, (wchar_t)0x03EA, (wchar_t)0x03EC, (wchar_t)0x03EE,
+    (wchar_t)0x0410, (wchar_t)0x0411, (wchar_t)0x0412, (wchar_t)0x0413, (wchar_t)0x0414,
+    (wchar_t)0x0415, (wchar_t)0x0416, (wchar_t)0x0417, (wchar_t)0x0418, (wchar_t)0x0419,
+    (wchar_t)0x041A, (wchar_t)0x041B, (wchar_t)0x041C, (wchar_t)0x041D, (wchar_t)0x041E,
+    (wchar_t)0x041F, (wchar_t)0x0420, (wchar_t)0x0421, (wchar_t)0x0422, (wchar_t)0x0423,
+    (wchar_t)0x0424, (wchar_t)0x0425, (wchar_t)0x0426, (wchar_t)0x0427, (wchar_t)0x0428,
+    (wchar_t)0x0429, (wchar_t)0x042A, (wchar_t)0x042B, (wchar_t)0x042C, (wchar_t)0x042D,
+    (wchar_t)0x042E, (wchar_t)0x042F, (wchar_t)0x0401, (wchar_t)0x0402, (wchar_t)0x0403,
+    (wchar_t)0x0404, (wchar_t)0x0405, (wchar_t)0x0406, (wchar_t)0x0407, (wchar_t)0x0408,
+    (wchar_t)0x0409, (wchar_t)0x040A, (wchar_t)0x040B, (wchar_t)0x040C, (wchar_t)0x040E,
+    (wchar_t)0x040F, (wchar_t)0x0460, (wchar_t)0x0462, (wchar_t)0x0464, (wchar_t)0x0466,
+    (wchar_t)0x0468, (wchar_t)0x046A, (wchar_t)0x046C, (wchar_t)0x046E, (wchar_t)0x0470,
+    (wchar_t)0x0472, (wchar_t)0x0474, (wchar_t)0x0476, (wchar_t)0x0478, (wchar_t)0x047A,
+    (wchar_t)0x047C, (wchar_t)0x047E, (wchar_t)0x0480, (wchar_t)0x0490, (wchar_t)0x0492,
+    (wchar_t)0x0494, (wchar_t)0x0496, (wchar_t)0x0498, (wchar_t)0x049A, (wchar_t)0x049C,
+    (wchar_t)0x049E, (wchar_t)0x04A0, (wchar_t)0x04A2, (wchar_t)0x04A4, (wchar_t)0x04A6,
+    (wchar_t)0x04A8, (wchar_t)0x04AA, (wchar_t)0x04AC, (wchar_t)0x04AE, (wchar_t)0x04B0,
+    (wchar_t)0x04B2, (wchar_t)0x04B4, (wchar_t)0x04B6, (wchar_t)0x04B8, (wchar_t)0x04BA,
+    (wchar_t)0x04BC, (wchar_t)0x04BE, (wchar_t)0x04C1, (wchar_t)0x04C3, (wchar_t)0x04C7,
+    (wchar_t)0x04CB, (wchar_t)0x04D0, (wchar_t)0x04D2, (wchar_t)0x04D4, (wchar_t)0x04D6,
+    (wchar_t)0x04D8, (wchar_t)0x04DA, (wchar_t)0x04DC, (wchar_t)0x04DE, (wchar_t)0x04E0,
+    (wchar_t)0x04E2, (wchar_t)0x04E4, (wchar_t)0x04E6, (wchar_t)0x04E8, (wchar_t)0x04EA,
+    (wchar_t)0x04EE, (wchar_t)0x04F0, (wchar_t)0x04F2, (wchar_t)0x04F4, (wchar_t)0x04F8,
+    (wchar_t)0x0531, (wchar_t)0x0532, (wchar_t)0x0533, (wchar_t)0x0534, (wchar_t)0x0535,
+    (wchar_t)0x0536, (wchar_t)0x0537, (wchar_t)0x0538, (wchar_t)0x0539, (wchar_t)0x053A,
+    (wchar_t)0x053B, (wchar_t)0x053C, (wchar_t)0x053D, (wchar_t)0x053E, (wchar_t)0x053F,
+    (wchar_t)0x0540, (wchar_t)0x0541, (wchar_t)0x0542, (wchar_t)0x0543, (wchar_t)0x0544,
+    (wchar_t)0x0545, (wchar_t)0x0546, (wchar_t)0x0547, (wchar_t)0x0548, (wchar_t)0x0549,
+    (wchar_t)0x054A, (wchar_t)0x054B, (wchar_t)0x054C, (wchar_t)0x054D, (wchar_t)0x054E,
+    (wchar_t)0x054F, (wchar_t)0x0550, (wchar_t)0x0551, (wchar_t)0x0552, (wchar_t)0x0553,
+    (wchar_t)0x0554, (wchar_t)0x0555, (wchar_t)0x0556, (wchar_t)0x10A0, (wchar_t)0x10A1,
+    (wchar_t)0x10A2, (wchar_t)0x10A3, (wchar_t)0x10A4, (wchar_t)0x10A5, (wchar_t)0x10A6,
+    (wchar_t)0x10A7, (wchar_t)0x10A8, (wchar_t)0x10A9, (wchar_t)0x10AA, (wchar_t)0x10AB,
+    (wchar_t)0x10AC, (wchar_t)0x10AD, (wchar_t)0x10AE, (wchar_t)0x10AF, (wchar_t)0x10B0,
+    (wchar_t)0x10B1, (wchar_t)0x10B2, (wchar_t)0x10B3, (wchar_t)0x10B4, (wchar_t)0x10B5,
+    (wchar_t)0x10B6, (wchar_t)0x10B7, (wchar_t)0x10B8, (wchar_t)0x10B9, (wchar_t)0x10BA,
+    (wchar_t)0x10BB, (wchar_t)0x10BC, (wchar_t)0x10BD, (wchar_t)0x10BE, (wchar_t)0x10BF,
+    (wchar_t)0x10C0, (wchar_t)0x10C1, (wchar_t)0x10C2, (wchar_t)0x10C3, (wchar_t)0x10C4,
+    (wchar_t)0x10C5, (wchar_t)0x1E00, (wchar_t)0x1E02, (wchar_t)0x1E04, (wchar_t)0x1E06,
+    (wchar_t)0x1E08, (wchar_t)0x1E0A, (wchar_t)0x1E0C, (wchar_t)0x1E0E, (wchar_t)0x1E10,
+    (wchar_t)0x1E12, (wchar_t)0x1E14, (wchar_t)0x1E16, (wchar_t)0x1E18, (wchar_t)0x1E1A,
+    (wchar_t)0x1E1C, (wchar_t)0x1E1E, (wchar_t)0x1E20, (wchar_t)0x1E22, (wchar_t)0x1E24,
+    (wchar_t)0x1E26, (wchar_t)0x1E28, (wchar_t)0x1E2A, (wchar_t)0x1E2C, (wchar_t)0x1E2E,
+    (wchar_t)0x1E30, (wchar_t)0x1E32, (wchar_t)0x1E34, (wchar_t)0x1E36, (wchar_t)0x1E38,
+    (wchar_t)0x1E3A, (wchar_t)0x1E3C, (wchar_t)0x1E3E, (wchar_t)0x1E40, (wchar_t)0x1E42,
+    (wchar_t)0x1E44, (wchar_t)0x1E46, (wchar_t)0x1E48, (wchar_t)0x1E4A, (wchar_t)0x1E4C,
+    (wchar_t)0x1E4E, (wchar_t)0x1E50, (wchar_t)0x1E52, (wchar_t)0x1E54, (wchar_t)0x1E56,
+    (wchar_t)0x1E58, (wchar_t)0x1E5A, (wchar_t)0x1E5C, (wchar_t)0x1E5E, (wchar_t)0x1E60,
+    (wchar_t)0x1E62, (wchar_t)0x1E64, (wchar_t)0x1E66, (wchar_t)0x1E68, (wchar_t)0x1E6A,
+    (wchar_t)0x1E6C, (wchar_t)0x1E6E, (wchar_t)0x1E70, (wchar_t)0x1E72, (wchar_t)0x1E74,
+    (wchar_t)0x1E76, (wchar_t)0x1E78, (wchar_t)0x1E7A, (wchar_t)0x1E7C, (wchar_t)0x1E7E,
+    (wchar_t)0x1E80, (wchar_t)0x1E82, (wchar_t)0x1E84, (wchar_t)0x1E86, (wchar_t)0x1E88,
+    (wchar_t)0x1E8A, (wchar_t)0x1E8C, (wchar_t)0x1E8E, (wchar_t)0x1E90, (wchar_t)0x1E92,
+    (wchar_t)0x1E94, (wchar_t)0x1EA0, (wchar_t)0x1EA2, (wchar_t)0x1EA4, (wchar_t)0x1EA6,
+    (wchar_t)0x1EA8, (wchar_t)0x1EAA, (wchar_t)0x1EAC, (wchar_t)0x1EAE, (wchar_t)0x1EB0,
+    (wchar_t)0x1EB2, (wchar_t)0x1EB4, (wchar_t)0x1EB6, (wchar_t)0x1EB8, (wchar_t)0x1EBA,
+    (wchar_t)0x1EBC, (wchar_t)0x1EBE, (wchar_t)0x1EC0, (wchar_t)0x1EC2, (wchar_t)0x1EC4,
+    (wchar_t)0x1EC6, (wchar_t)0x1EC8, (wchar_t)0x1ECA, (wchar_t)0x1ECC, (wchar_t)0x1ECE,
+    (wchar_t)0x1ED0, (wchar_t)0x1ED2, (wchar_t)0x1ED4, (wchar_t)0x1ED6, (wchar_t)0x1ED8,
+    (wchar_t)0x1EDA, (wchar_t)0x1EDC, (wchar_t)0x1EDE, (wchar_t)0x1EE0, (wchar_t)0x1EE2,
+    (wchar_t)0x1EE4, (wchar_t)0x1EE6, (wchar_t)0x1EE8, (wchar_t)0x1EEA, (wchar_t)0x1EEC,
+    (wchar_t)0x1EEE, (wchar_t)0x1EF0, (wchar_t)0x1EF2, (wchar_t)0x1EF4, (wchar_t)0x1EF6,
+    (wchar_t)0x1EF8, (wchar_t)0x1F08, (wchar_t)0x1F09, (wchar_t)0x1F0A, (wchar_t)0x1F0B,
+    (wchar_t)0x1F0C, (wchar_t)0x1F0D, (wchar_t)0x1F0E, (wchar_t)0x1F0F, (wchar_t)0x1F18,
+    (wchar_t)0x1F19, (wchar_t)0x1F1A, (wchar_t)0x1F1B, (wchar_t)0x1F1C, (wchar_t)0x1F1D,
+    (wchar_t)0x1F28, (wchar_t)0x1F29, (wchar_t)0x1F2A, (wchar_t)0x1F2B, (wchar_t)0x1F2C,
+    (wchar_t)0x1F2D, (wchar_t)0x1F2E, (wchar_t)0x1F2F, (wchar_t)0x1F38, (wchar_t)0x1F39,
+    (wchar_t)0x1F3A, (wchar_t)0x1F3B, (wchar_t)0x1F3C, (wchar_t)0x1F3D, (wchar_t)0x1F3E,
+    (wchar_t)0x1F3F, (wchar_t)0x1F48, (wchar_t)0x1F49, (wchar_t)0x1F4A, (wchar_t)0x1F4B,
+    (wchar_t)0x1F4C, (wchar_t)0x1F4D, (wchar_t)0x1F59, (wchar_t)0x1F5B, (wchar_t)0x1F5D,
+    (wchar_t)0x1F5F, (wchar_t)0x1F68, (wchar_t)0x1F69, (wchar_t)0x1F6A, (wchar_t)0x1F6B,
+    (wchar_t)0x1F6C, (wchar_t)0x1F6D, (wchar_t)0x1F6E, (wchar_t)0x1F6F, (wchar_t)0x1F88,
+    (wchar_t)0x1F89, (wchar_t)0x1F8A, (wchar_t)0x1F8B, (wchar_t)0x1F8C, (wchar_t)0x1F8D,
+    (wchar_t)0x1F8E, (wchar_t)0x1F8F, (wchar_t)0x1F98, (wchar_t)0x1F99, (wchar_t)0x1F9A,
+    (wchar_t)0x1F9B, (wchar_t)0x1F9C, (wchar_t)0x1F9D, (wchar_t)0x1F9E, (wchar_t)0x1F9F,
+    (wchar_t)0x1FA8, (wchar_t)0x1FA9, (wchar_t)0x1FAA, (wchar_t)0x1FAB, (wchar_t)0x1FAC,
+    (wchar_t)0x1FAD, (wchar_t)0x1FAE, (wchar_t)0x1FAF, (wchar_t)0x1FB8, (wchar_t)0x1FB9,
+    (wchar_t)0x1FD8, (wchar_t)0x1FD9, (wchar_t)0x1FE8, (wchar_t)0x1FE9, (wchar_t)0x24B6,
+    (wchar_t)0x24B7, (wchar_t)0x24B8, (wchar_t)0x24B9, (wchar_t)0x24BA, (wchar_t)0x24BB,
+    (wchar_t)0x24BC, (wchar_t)0x24BD, (wchar_t)0x24BE, (wchar_t)0x24BF, (wchar_t)0x24C0,
+    (wchar_t)0x24C1, (wchar_t)0x24C2, (wchar_t)0x24C3, (wchar_t)0x24C4, (wchar_t)0x24C5,
+    (wchar_t)0x24C6, (wchar_t)0x24C7, (wchar_t)0x24C8, (wchar_t)0x24C9, (wchar_t)0x24CA,
+    (wchar_t)0x24CB, (wchar_t)0x24CC, (wchar_t)0x24CD, (wchar_t)0x24CE, (wchar_t)0x24CF,
+    (wchar_t)0xFF21, (wchar_t)0xFF22, (wchar_t)0xFF23, (wchar_t)0xFF24, (wchar_t)0xFF25,
+    (wchar_t)0xFF26, (wchar_t)0xFF27, (wchar_t)0xFF28, (wchar_t)0xFF29, (wchar_t)0xFF2A,
+    (wchar_t)0xFF2B, (wchar_t)0xFF2C, (wchar_t)0xFF2D, (wchar_t)0xFF2E, (wchar_t)0xFF2F,
+    (wchar_t)0xFF30, (wchar_t)0xFF31, (wchar_t)0xFF32, (wchar_t)0xFF33, (wchar_t)0xFF34,
+    (wchar_t)0xFF35, (wchar_t)0xFF36, (wchar_t)0xFF37, (wchar_t)0xFF38, (wchar_t)0xFF39,
+    (wchar_t)0xFF3A};
+
+namespace kodi
+{
+namespace tools
+{
+
+template<typename T, std::enable_if_t<!std::is_enum<T>::value, int> = 0>
+constexpr auto&& EnumToInt(T&& arg) noexcept
+{
+  return arg;
+}
+template<typename T, std::enable_if_t<std::is_enum<T>::value, int> = 0>
+constexpr auto EnumToInt(T&& arg) noexcept
+{
+  return static_cast<int>(arg);
+}
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_StringUtils_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_tools_StringUtils
+/// @brief **Parts used within string util functions**\n
+/// All to string functions associated data structures.
+///
+/// It is divided into individual modules that correspond to the respective
+/// types.
+///
+///
+///
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_StringUtils_Defs_TIME_FORMAT enum TIME_FORMAT
+/// @ingroup cpp_kodi_tools_StringUtils_Defs
+/// @brief TIME_FORMAT enum/bitmask used for formatting time strings.
+///
+/// Note the use of bitmasking, e.g. TIME_FORMAT_HH_MM_SS = TIME_FORMAT_HH | TIME_FORMAT_MM | TIME_FORMAT_SS
+/// @sa kodi::tools::StringUtils::SecondsToTimeString
+///
+/// @note For InfoLabels use the equivalent value listed (bold) on the
+/// description of each enum value.
+///
+/// <b>Example:</b> 3661 seconds => h=1, hh=01, m=1, mm=01, ss=01, hours=1, mins=61, secs=3661
+///
+///@{
+enum TIME_FORMAT
+{
+  /// Usually used as the fallback value if the format value is empty
+  TIME_FORMAT_GUESS = 0,
+
+  /// <b>ss</b> - seconds only
+  TIME_FORMAT_SS = 1,
+
+  /// <b>mm</b> - minutes only (2-digit)
+  TIME_FORMAT_MM = 2,
+
+  /// <b>mm:ss</b> - minutes and seconds
+  TIME_FORMAT_MM_SS = 3,
+
+  /// <b>hh</b> - hours only (2-digit)
+  TIME_FORMAT_HH = 4,
+
+  /// <b>hh:ss</b> - hours and seconds (this is not particularly useful)
+  TIME_FORMAT_HH_SS = 5,
+
+  /// <b>hh:mm</b> - hours and minutes
+  TIME_FORMAT_HH_MM = 6,
+
+  /// <b>hh:mm:ss</b> - hours, minutes and seconds
+  TIME_FORMAT_HH_MM_SS = 7,
+
+  /// <b>xx</b> - returns AM/PM for a 12-hour clock
+  TIME_FORMAT_XX = 8,
+
+  /// <b>hh:mm xx</b> - returns hours and minutes in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_HH_MM_XX = 14,
+
+  /// <b>hh:mm:ss xx</b> - returns hours (2-digit), minutes and seconds in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_HH_MM_SS_XX = 15,
+
+  /// <b>h</b> - hours only (1-digit)
+  TIME_FORMAT_H = 16,
+
+  /// <b>hh:mm:ss</b> - hours, minutes and seconds
+  TIME_FORMAT_H_MM_SS = 19,
+
+  /// <b>hh:mm:ss xx</b> - returns hours (1-digit), minutes and seconds in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_H_MM_SS_XX = 27,
+
+  /// <b>secs</b> - total time in seconds
+  TIME_FORMAT_SECS = 32,
+
+  /// <b>mins</b> - total time in minutes
+  TIME_FORMAT_MINS = 64,
+
+  /// <b>hours</b> - total time in hours
+  TIME_FORMAT_HOURS = 128,
+
+  /// <b>m</b> - minutes only (1-digit)
+  TIME_FORMAT_M = 256
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_StringUtils class StringUtils
+/// @ingroup cpp_kodi_tools
+/// @brief **C++ class for processing strings**\n
+/// This class brings many different functions to edit, check or search texts.
+///
+/// Is intended to reduce any code work of C++ on addons and to have them faster
+/// to use.
+///
+/// All functions are static within the <b>`kodi::tools::StringUtils`</b> class.
+///
+///@{
+class StringUtils
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_StringUtils_Defs
+  /// @brief Defines a static empty <b>`std::string`</b>.
+  ///
+  static const std::string Empty;
+  //----------------------------------------------------------------------------
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_FormatControl String format
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **Formatting functions**\n
+  /// Used to output the given values in newly formatted text using functions.
+  ///
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Returns the C++ string pointed by given format. If format includes
+  /// format specifiers (subsequences beginning with %), the additional arguments
+  /// following format are formatted and inserted in the resulting string replacing
+  /// their respective specifiers.
+  ///
+  /// After the format parameter, the function expects at least as many additional
+  /// arguments as specified by format.
+  ///
+  /// @param[in] fmt The format of the text to process for output.
+  ///                C string that contains the text to be written to the stream.
+  ///                It can optionally contain embedded format specifiers that are
+  ///                replaced by the values specified in subsequent additional
+  ///                arguments and formatted as requested.
+  ///  |  specifier | Output                                             | Example
+  ///  |------------|----------------------------------------------------|------------
+  ///  |  d or i    | Signed decimal integer                             | 392
+  ///  |  u         | Unsigned decimal integer                           | 7235
+  ///  |  o         | Unsigned octal                                     | 610
+  ///  |  x         | Unsigned hexadecimal integer                       | 7fa
+  ///  |  X         | Unsigned hexadecimal integer (uppercase)           | 7FA
+  ///  |  f         | Decimal floating point, lowercase                  | 392.65
+  ///  |  F         | Decimal floating point, uppercase                  | 392.65
+  ///  |  e         | Scientific notation (mantissa/exponent), lowercase | 3.9265e+2
+  ///  |  E         | Scientific notation (mantissa/exponent), uppercase | 3.9265E+2
+  ///  |  g         | Use the shortest representation: %e or %f          | 392.65
+  ///  |  G         | Use the shortest representation: %E or %F          | 392.65
+  ///  |  a         | Hexadecimal floating point, lowercase              | -0xc.90fep-2
+  ///  |  A         | Hexadecimal floating point, uppercase              | -0XC.90FEP-2
+  ///  |  c         | Character                                          | a
+  ///  |  s         | String of characters                               | sample
+  ///  |  p         | Pointer address                                    | b8000000
+  ///  |  %         | A % followed by another % character will write a single % to the stream. | %
+  /// The length sub-specifier modifies the length of the data type. This is a chart
+  /// showing the types used to interpret the corresponding arguments with and without
+  /// length specifier (if a different type is used, the proper type promotion or
+  /// conversion is performed, if allowed):
+  ///  | length| d i           | u o x X               | f F e E g G a A | c     | s       | p       | n               |
+  ///  |-------|---------------|-----------------------|-----------------|-------|---------|---------|-----------------|
+  ///  | (none)| int           | unsigned int          | double          | int   | char*   | void*   | int*            |
+  ///  | hh    | signed char   | unsigned char         |                 |       |         |         | signed char*    |
+  ///  | h     | short int     | unsigned short int    |                 |       |         |         | short int*      |
+  ///  | l     | long int      | unsigned long int     |                 | wint_t| wchar_t*|         | long int*       |
+  ///  | ll    | long long int | unsigned long long int|                 |       |         |         | long long int*  |
+  ///  | j     | intmax_t      | uintmax_t             |                 |       |         |         | intmax_t*       |
+  ///  | z     | size_t        | size_t                |                 |       |         |         | size_t*         |
+  ///  | t     | ptrdiff_t     | ptrdiff_t             |                 |       |         |         | ptrdiff_t*      |
+  ///  | L     |               |                       | long double     |       |         |         |                 |
+  ///  <b>Note:</b> that the c specifier takes an int (or wint_t) as argument, but performs the proper conversion to a char value
+  ///  (or a wchar_t) before formatting it for output.
+  /// @param[in] ... <i>(additional arguments)</i>\n
+  ///                Depending on the format string, the function may expect a
+  ///                sequence of additional arguments, each containing a value
+  ///                to be used to replace a format specifier in the format
+  ///                string (or a pointer to a storage location, for n).\n
+  ///                There should be at least as many of these arguments as the
+  ///                number of values specified in the format specifiers.
+  ///                Additional arguments are ignored by the function.
+  /// @return Formatted string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string str = kodi::tools::StringUtils::Format("Hello %s %i", "World", 2020);
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string Format(const char* fmt, ...)
+  {
+    va_list args;
+    va_start(args, fmt);
+    std::string str = FormatV(fmt, args);
+    va_end(args);
+
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns the C++ wide string pointed by given format.
+  ///
+  /// @param[in] fmt The format of the text to process for output
+  ///                (see @ref Format(const char* fmt, ...) for details).
+  /// @param[in] ... <i>(additional arguments)</i>\n
+  ///                Depending on the format string, the function may expect a
+  ///                sequence of additional arguments, each containing a value
+  ///                to be used to replace a format specifier in the format
+  ///                string (or a pointer to a storage location, for n).\n
+  ///                There should be at least as many of these arguments as the
+  ///                number of values specified in the format specifiers.
+  ///                Additional arguments are ignored by the function.
+  /// @return Formatted string
+  ///
+  inline static std::wstring Format(const wchar_t* fmt, ...)
+  {
+    va_list args;
+    va_start(args, fmt);
+    std::wstring str = FormatV(fmt, args);
+    va_end(args);
+
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns the C++ string pointed by given format list.
+  ///
+  /// @param[in] fmt The format of the text to process for output
+  ///                (see @ref Format(const char* fmt, ...) for details).
+  /// @param[in] args A value identifying a variable arguments list initialized
+  ///                 with `va_start`.
+  /// @return Formatted string
+  ///
+  inline static std::string FormatV(PRINTF_FORMAT_STRING const char* fmt, va_list args)
+  {
+    if (!fmt || !fmt[0])
+      return "";
+
+    int size = FORMAT_BLOCK_SIZE;
+    va_list argCopy;
+
+    while (true)
+    {
+      char* cstr = reinterpret_cast<char*>(malloc(sizeof(char) * size));
+      if (!cstr)
+        return "";
+
+      va_copy(argCopy, args);
+      int nActual = vsnprintf(cstr, size, fmt, argCopy);
+      va_end(argCopy);
+
+      if (nActual > -1 && nActual < size) // We got a valid result
+      {
+        std::string str(cstr, nActual);
+        free(cstr);
+        return str;
+      }
+      free(cstr);
+#ifndef TARGET_WINDOWS
+      if (nActual > -1) // Exactly what we will need (glibc 2.1)
+        size = nActual + 1;
+      else // Let's try to double the size (glibc 2.0)
+        size *= 2;
+#else // TARGET_WINDOWS
+      va_copy(argCopy, args);
+      size = _vscprintf(fmt, argCopy);
+      va_end(argCopy);
+      if (size < 0)
+        return "";
+      else
+        size++; // increment for null-termination
+#endif // TARGET_WINDOWS
+    }
+
+    return ""; // unreachable
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns the C++ wide string pointed by given format list.
+  ///
+  /// @param[in] fmt The format of the text to process for output
+  ///                (see @ref Format(const char* fmt, ...) for details).
+  /// @param[in] args A value identifying a variable arguments list initialized
+  ///                 with `va_start`.
+  /// @return Formatted string
+  ///
+  inline static std::wstring FormatV(PRINTF_FORMAT_STRING const wchar_t* fmt, va_list args)
+  {
+    if (!fmt || !fmt[0])
+      return L"";
+
+    int size = FORMAT_BLOCK_SIZE;
+    va_list argCopy;
+
+    while (true)
+    {
+      wchar_t* cstr = reinterpret_cast<wchar_t*>(malloc(sizeof(wchar_t) * size));
+      if (!cstr)
+        return L"";
+
+      va_copy(argCopy, args);
+      int nActual = vswprintf(cstr, size, fmt, argCopy);
+      va_end(argCopy);
+
+      if (nActual > -1 && nActual < size) // We got a valid result
+      {
+        std::wstring str(cstr, nActual);
+        free(cstr);
+        return str;
+      }
+      free(cstr);
+
+#ifndef TARGET_WINDOWS
+      if (nActual > -1) // Exactly what we will need (glibc 2.1)
+        size = nActual + 1;
+      else // Let's try to double the size (glibc 2.0)
+        size *= 2;
+#else // TARGET_WINDOWS
+      va_copy(argCopy, args);
+      size = _vscwprintf(fmt, argCopy);
+      va_end(argCopy);
+      if (size < 0)
+        return L"";
+      else
+        size++; // increment for null-termination
+#endif // TARGET_WINDOWS
+    }
+
+    return L"";
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns bytes in a human readable format using the smallest unit
+  /// that will fit `bytes` in at most three digits. The number of decimals are
+  /// adjusted with significance such that 'small' numbers will have more
+  /// decimals than larger ones.
+  ///
+  /// For example: 1024 bytes will be formatted as "1.00kB", 10240 bytes as
+  /// "10.0kB" and 102400 bytes as "100kB". See TestStringUtils for more
+  /// examples.
+  ///
+  /// Supported file sizes:
+  /// | Value      | Short | Metric
+  /// |------------|-------|-----------
+  /// | 1          | B     | byte
+  /// | 1024¹      | kB    | kilobyte
+  /// | 1024²      | MB    | megabyte
+  /// | 1024³      | GB    | gigabyte
+  /// | 1024 exp 4 | TB    | terabyte
+  /// | 1024 exp 5 | PB    | petabyte
+  /// | 1024 exp 6 | EB    | exabyte
+  /// | 1024 exp 7 | ZB    | zettabyte
+  /// | 1024 exp 8 | YB    | yottabyte
+  ///
+  /// @param[in] bytes Bytes amount to return as human readable string
+  /// @return Size as string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_STREQ("0B", kodi::tools::StringUtils::FormatFileSize(0).c_str());
+  ///
+  /// EXPECT_STREQ("999B", kodi::tools::StringUtils::FormatFileSize(999).c_str());
+  /// EXPECT_STREQ("0.98kB", kodi::tools::StringUtils::FormatFileSize(1000).c_str());
+  ///
+  /// EXPECT_STREQ("1.00kB", kodi::tools::StringUtils::FormatFileSize(1024).c_str());
+  /// EXPECT_STREQ("9.99kB", kodi::tools::StringUtils::FormatFileSize(10229).c_str());
+  ///
+  /// EXPECT_STREQ("10.1kB", kodi::tools::StringUtils::FormatFileSize(10387).c_str());
+  /// EXPECT_STREQ("99.9kB", kodi::tools::StringUtils::FormatFileSize(102297).c_str());
+  ///
+  /// EXPECT_STREQ("100kB", kodi::tools::StringUtils::FormatFileSize(102400).c_str());
+  /// EXPECT_STREQ("999kB", kodi::tools::StringUtils::FormatFileSize(1023431).c_str());
+  ///
+  /// EXPECT_STREQ("0.98MB", kodi::tools::StringUtils::FormatFileSize(1023897).c_str());
+  /// EXPECT_STREQ("0.98MB", kodi::tools::StringUtils::FormatFileSize(1024000).c_str());
+  ///
+  /// EXPECT_STREQ("5.30EB", kodi::tools::StringUtils::FormatFileSize(6115888293969133568).c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string FormatFileSize(uint64_t bytes)
+  {
+    const std::array<std::string, 9> units{{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}};
+    if (bytes < 1000)
+      return Format("%" PRIu64 "B", bytes);
+
+    size_t i = 0;
+    double value = static_cast<double>(bytes);
+    while (i + 1 < units.size() && value >= 999.5)
+    {
+      ++i;
+      value /= 1024.0;
+    }
+    unsigned int decimals = value < 9.995 ? 2 : (value < 99.95 ? 1 : 0);
+    auto frmt = "%." + Format("%u", decimals) + "f%s";
+    return Format(frmt.c_str(), value, units[i].c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert the string of binary chars to the actual string.
+  ///
+  /// Convert the string representation of binary chars to the actual string.
+  /// For example <b>`\1\2\3`</b> is converted to a string with binary char
+  /// <b>`\1`</b>, <b>`\2`</b> and <b>`\3`</b>
+  ///
+  /// @param[in] in String to convert
+  /// @return Converted string
+  ///
+  inline static std::string BinaryStringToString(const std::string& in)
+  {
+    std::string out;
+    out.reserve(in.size() / 2);
+    for (const char *cur = in.c_str(), *end = cur + in.size(); cur != end; ++cur)
+    {
+      if (*cur == '\\')
+      {
+        ++cur;
+        if (cur == end)
+        {
+          break;
+        }
+        if (isdigit(*cur))
+        {
+          char* end;
+          unsigned long num = strtol(cur, &end, 10);
+          cur = end - 1;
+          out.push_back(static_cast<char>(num));
+          continue;
+        }
+      }
+      out.push_back(*cur);
+    }
+    return out;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert each character in the string to its hexadecimal
+  /// representation and return the concatenated result
+  ///
+  /// Example: "abc\n" -> "6162630a"
+  ///
+  /// @param[in] in String to convert
+  /// @return Converted string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_STREQ("", kodi::tools::StringUtils::ToHexadecimal("").c_str());
+  /// EXPECT_STREQ("616263", kodi::tools::StringUtils::ToHexadecimal("abc").c_str());
+  /// std::string a{"a\0b\n", 4};
+  /// EXPECT_STREQ("6100620a", kodi::tools::StringUtils::ToHexadecimal(a).c_str());
+  /// std::string nul{"\0", 1};
+  /// EXPECT_STREQ("00", kodi::tools::StringUtils::ToHexadecimal(nul).c_str());
+  /// std::string ff{"\xFF", 1};
+  /// EXPECT_STREQ("ff", kodi::tools::StringUtils::ToHexadecimal(ff).c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string ToHexadecimal(const std::string& in)
+  {
+    std::ostringstream ss;
+    ss << std::hex;
+    for (unsigned char ch : in)
+    {
+      ss << std::setw(2) << std::setfill('0') << static_cast<unsigned long>(ch);
+    }
+    return ss.str();
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_EditControl String edit
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **Edits given texts**\n
+  /// This is used to revise the respective strings and to get them in the desired format.
+  ///
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Convert a string to uppercase.
+  ///
+  /// @param[in,out] str String to convert
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "TEST";
+  ///
+  /// std::string varstr = "TeSt";
+  /// kodi::tools::StringUtils::ToUpper(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static void ToUpper(std::string& str)
+  {
+    std::transform(str.begin(), str.end(), str.begin(), ::toupper);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert a 16bit wide string to uppercase.
+  ///
+  /// @param[in,out] str String to convert
+  ///
+  inline static void ToUpper(std::wstring& str)
+  {
+    transform(str.begin(), str.end(), str.begin(), toupperUnicode);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert a string to lowercase.
+  ///
+  /// @param[in,out] str String to convert
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "test";
+  ///
+  /// std::string varstr = "TeSt";
+  /// kodi::tools::StringUtils::ToLower(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static void ToLower(std::string& str)
+  {
+    transform(str.begin(), str.end(), str.begin(), ::tolower);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert a 16bit wide string to lowercase.
+  ///
+  /// @param[in,out] str String to convert
+  ///
+  inline static void ToLower(std::wstring& str)
+  {
+    transform(str.begin(), str.end(), str.begin(), tolowerUnicode);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Combine all numerical digits and give it as integer value.
+  ///
+  /// @param[in,out] str String to check for digits
+  /// @return All numerical digits fit together as integer value
+  ///
+  inline static int ReturnDigits(const std::string& str)
+  {
+    std::stringstream ss;
+    for (const auto& character : str)
+    {
+      if (isdigit(character))
+        ss << character;
+    }
+    return atoi(ss.str().c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns a string from start with givent count.
+  ///
+  /// @param[in] str String to use
+  /// @param[in] count Amount of characters to go from left
+  /// @return The left part string in amount of given count or complete if it
+  ///         was higher.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr, varstr;
+  /// std::string origstr = "test";
+  ///
+  /// refstr = "";
+  /// varstr = kodi::tools::StringUtils::Left(origstr, 0);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "te";
+  /// varstr = kodi::tools::StringUtils::Left(origstr, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "test";
+  /// varstr = kodi::tools::StringUtils::Left(origstr, 10);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string Left(const std::string& str, size_t count)
+  {
+    count = std::max((size_t)0, std::min(count, str.size()));
+    return str.substr(0, count);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get substring from mid of given string.
+  ///
+  /// @param[in] str String to get substring from
+  /// @param[in] first Position from where to start
+  /// @param[in] count [opt] length of position to get after start, default is
+  ///                  complete to end
+  /// @return The substring taken from middle of input string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr, varstr;
+  /// std::string origstr = "test";
+  ///
+  /// refstr = "";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 0, 0);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "te";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 0, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "test";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 0, 10);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "st";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "st";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 2, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "es";
+  /// varstr = kodi::tools::StringUtils::Mid(origstr, 1, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string Mid(const std::string& str,
+                                size_t first,
+                                size_t count = std::string::npos)
+  {
+    if (first + count > str.size())
+      count = str.size() - first;
+
+    if (first > str.size())
+      return std::string();
+
+    assert(first + count <= str.size());
+
+    return str.substr(first, count);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Returns a string from end with givent count.
+  ///
+  /// @param[in] str String to use
+  /// @param[in] count Amount of characters to go from right
+  /// @return The right part string in amount of given count or complete if it
+  ///         was higher.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr, varstr;
+  /// std::string origstr = "test";
+  ///
+  /// refstr = "";
+  /// varstr = kodi::tools::StringUtils::Right(origstr, 0);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "st";
+  /// varstr = kodi::tools::StringUtils::Right(origstr, 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// refstr = "test";
+  /// varstr = kodi::tools::StringUtils::Right(origstr, 10);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string Right(const std::string& str, size_t count)
+  {
+    count = std::max((size_t)0, std::min(count, str.size()));
+    return str.substr(str.size() - count);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted spaces at begin and end
+  /// of string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @return The changed string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "test test";
+  ///
+  /// std::string varstr = " test test   ";
+  /// kodi::tools::StringUtils::Trim(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string& Trim(std::string& str)
+  {
+    TrimLeft(str);
+    return TrimRight(str);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted characters at begin and end
+  /// of string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @param[in] chars Characters to use for trim
+  /// @return The changed string
+  ///
+  inline static std::string& Trim(std::string& str, const char* const chars)
+  {
+    TrimLeft(str, chars);
+    return TrimRight(str, chars);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted spaces at begin of string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @return The changed string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "test test   ";
+  ///
+  /// std::string varstr = " test test   ";
+  /// kodi::tools::StringUtils::TrimLeft(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string& TrimLeft(std::string& str)
+  {
+    str.erase(str.begin(),
+              std::find_if(str.begin(), str.end(), [](char s) { return IsSpace(s) == 0; }));
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted characters at begin of
+  /// string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @param[in] chars Characters to use for trim
+  /// @return The changed string
+  ///
+  inline static std::string& TrimLeft(std::string& str, const char* const chars)
+  {
+    size_t nidx = str.find_first_not_of(chars);
+    str.erase(0, nidx);
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted spaces at end of string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @return The changed string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = " test test";
+  ///
+  /// std::string varstr = " test test   ";
+  /// kodi::tools::StringUtils::TrimRight(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string& TrimRight(std::string& str)
+  {
+    str.erase(std::find_if(str.rbegin(), str.rend(), [](char s) { return IsSpace(s) == 0; }).base(),
+              str.end());
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Trim a string with remove of not wanted characters at end of
+  /// string.
+  ///
+  /// @param[in,out] str String to trim, becomes also changed and given on
+  ///                    return
+  /// @param[in] chars Characters to use for trim
+  /// @return The changed string
+  ///
+  inline static std::string& TrimRight(std::string& str, const char* const chars)
+  {
+    size_t nidx = str.find_last_not_of(chars);
+    str.erase(str.npos == nidx ? 0 : ++nidx);
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Cleanup string by remove of duplicates of spaces and tabs.
+  ///
+  /// @param[in,out] str String to remove duplicates, becomes also changed and
+  ///                    given further on return
+  /// @return The changed string
+  ///
+  inline static std::string& RemoveDuplicatedSpacesAndTabs(std::string& str)
+  {
+    std::string::iterator it = str.begin();
+    bool onSpace = false;
+    while (it != str.end())
+    {
+      if (*it == '\t')
+        *it = ' ';
+
+      if (*it == ' ')
+      {
+        if (onSpace)
+        {
+          it = str.erase(it);
+          continue;
+        }
+        else
+          onSpace = true;
+      }
+      else
+        onSpace = false;
+
+      ++it;
+    }
+    return str;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Replace a character with another inside text string.
+  ///
+  /// @param[in] str String to replace within
+  /// @param[in] oldChar Character to search for replacement
+  /// @param[in] newChar New character to use for replacement
+  /// @return Amount of replaced characters
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "text text";
+  ///
+  /// std::string varstr = "test test";
+  /// EXPECT_EQ(kodi::tools::StringUtils::Replace(varstr, 's', 'x'), 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// EXPECT_EQ(kodi::tools::StringUtils::Replace(varstr, 's', 'x'), 0);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static int Replace(std::string& str, char oldChar, char newChar)
+  {
+    int replacedChars = 0;
+    for (std::string::iterator it = str.begin(); it != str.end(); ++it)
+    {
+      if (*it == oldChar)
+      {
+        *it = newChar;
+        replacedChars++;
+      }
+    }
+
+    return replacedChars;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Replace a complete text with another inside text string.
+  ///
+  /// @param[in] str String to replace within
+  /// @param[in] oldStr String to search for replacement
+  /// @param[in] newStr New string to use for replacement
+  /// @return Amount of replaced text fields
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "text text";
+  ///
+  /// std::string varstr = "test test";
+  /// EXPECT_EQ(kodi::tools::StringUtils::Replace(varstr, "s", "x"), 2);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  ///
+  /// EXPECT_EQ(kodi::tools::StringUtils::Replace(varstr, "s", "x"), 0);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static int Replace(std::string& str, const std::string& oldStr, const std::string& newStr)
+  {
+    if (oldStr.empty())
+      return 0;
+
+    int replacedChars = 0;
+    size_t index = 0;
+
+    while (index < str.size() && (index = str.find(oldStr, index)) != std::string::npos)
+    {
+      str.replace(index, oldStr.size(), newStr);
+      index += newStr.size();
+      replacedChars++;
+    }
+
+    return replacedChars;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Replace a complete text with another inside 16bit wide text string.
+  ///
+  /// @param[in] str String to replace within
+  /// @param[in] oldStr String to search for replacement
+  /// @param[in] newStr New string to use for replacement
+  /// @return Amount of replaced text fields
+  ///
+  inline static int Replace(std::wstring& str,
+                            const std::wstring& oldStr,
+                            const std::wstring& newStr)
+  {
+    if (oldStr.empty())
+      return 0;
+
+    int replacedChars = 0;
+    size_t index = 0;
+
+    while (index < str.size() && (index = str.find(oldStr, index)) != std::string::npos)
+    {
+      str.replace(index, oldStr.size(), newStr);
+      index += newStr.size();
+      replacedChars++;
+    }
+
+    return replacedChars;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Transform characters to create a safe URL.
+  ///
+  /// @param[in] str The string to transform
+  /// @return The transformed string, with unsafe characters replaced by "_"
+  ///
+  /// Safe URLs are composed of the unreserved characters defined in
+  /// RFC 3986 section 2.3:
+  ///
+  ///   ALPHA / DIGIT / "-" / "." / "_" / "~"
+  ///
+  /// Characters outside of this set will be replaced by "_".
+  ///
+  inline static std::string MakeSafeUrl(const std::string& str)
+  {
+    std::string safeUrl;
+
+    safeUrl.reserve(str.size());
+
+    std::transform(str.begin(), str.end(), std::back_inserter(safeUrl), [](char c) {
+      if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '-' ||
+          c == '.' || c == '_' || c == '~')
+      {
+        return c;
+      }
+      return '_';
+    });
+
+    return safeUrl;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Transform characters to create a safe, printable string.
+  ///
+  /// @param[in] str The string to transform
+  /// @return The transformed string, with unsafe characters replaced by " "
+  ///
+  /// Unsafe characters are defined as the non-printable ASCII characters
+  /// (character code 0-31).
+  ///
+  inline static std::string MakeSafeString(const std::string& str)
+  {
+    std::string safeString;
+
+    safeString.reserve(str.size());
+
+    std::transform(str.begin(), str.end(), std::back_inserter(safeString), [](char c) {
+      if (c < 0x20)
+        return ' ';
+
+      return c;
+    });
+
+    return safeString;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Removes a MAC address from a given string.
+  ///
+  /// @param[in] str The string containing a MAC address
+  /// @return The string without the MAC address (for chaining)
+  ///
+  inline static std::string RemoveMACAddress(const std::string& str)
+  {
+    std::regex re(R"mac([\(\[]?([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})[\)\]]?)mac");
+    return std::regex_replace(str, re, "", std::regex_constants::format_default);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Remove carriage return and line feeds on string ends.
+  ///
+  /// @param[in,out] str String where CR and LF becomes removed on end
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr, varstr;
+  ///
+  /// refstr = "test\r\nstring\nblah blah";
+  /// varstr = "test\r\nstring\nblah blah\n";
+  /// kodi::tools::StringUtils::RemoveCRLF(varstr);
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static void RemoveCRLF(std::string& strLine) { StringUtils::TrimRight(strLine, "\n\r"); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert a word to a digit numerical string
+  ///
+  /// @param[in] str String to convert
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// std::string ref, var;
+  ///
+  /// ref = "8378 787464";
+  /// var = "test string";
+  /// kodi::tools::StringUtils::WordToDigits(var);
+  /// EXPECT_STREQ(ref.c_str(), var.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static void WordToDigits(std::string& word)
+  {
+    static const char word_to_letter[] = "22233344455566677778889999";
+    StringUtils::ToLower(word);
+    for (unsigned int i = 0; i < word.size(); ++i)
+    { // NB: This assumes ascii, which probably needs extending at some point.
+      char letter = word[i];
+      if ((letter >= 'a' && letter <= 'z')) // assume contiguous letter range
+      {
+        word[i] = word_to_letter[letter - 'a'];
+      }
+      else if (letter < '0' || letter > '9') // We want to keep 0-9!
+      {
+        word[i] = ' '; // replace everything else with a space
+      }
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Escapes the given string to be able to be used as a parameter.
+  ///
+  /// Escapes backslashes and double-quotes with an additional backslash and
+  ///  adds double-quotes around the whole string.
+  ///
+  /// @param[in] param String to escape/paramify
+  /// @return Escaped/Paramified string
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// const char *input = "some, very \\ odd \"string\"";
+  /// const char *ref   = "\"some, very \\\\ odd \\\"string\\\"\"";
+  ///
+  /// std::string result = kodi::tools::StringUtils::Paramify(input);
+  /// EXPECT_STREQ(ref, result.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string Paramify(const std::string& param)
+  {
+    std::string result = param;
+    // escape backspaces
+    StringUtils::Replace(result, "\\", "\\\\");
+    // escape double quotes
+    StringUtils::Replace(result, "\"", "\\\"");
+
+    // add double quotes around the whole string
+    return "\"" + result + "\"";
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_CompareControl String compare
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **Check strings for the desired state**\n
+  /// With this, texts can be checked to see that they correspond to a required
+  /// format.
+  ///
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Compare two strings with ignore of lower-/uppercase.
+  ///
+  /// @param[in] str1 C++ string to compare
+  /// @param[in] str2 C++ string to compare
+  /// @return True if the strings are equal, false otherwise
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr = "TeSt";
+  ///
+  /// EXPECT_TRUE(kodi::tools::StringUtils::EqualsNoCase(refstr, "TeSt"));
+  /// EXPECT_TRUE(kodi::tools::StringUtils::EqualsNoCase(refstr, "tEsT"));
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool EqualsNoCase(const std::string& str1, const std::string& str2)
+  {
+    // before we do the char-by-char comparison, first compare sizes of both strings.
+    // This led to a 33% improvement in benchmarking on average. (size() just returns a member of std::string)
+    if (str1.size() != str2.size())
+      return false;
+    return EqualsNoCase(str1.c_str(), str2.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Compare two strings with ignore of lower-/uppercase.
+  ///
+  /// @param[in] str1 C++ string to compare
+  /// @param[in] s2 C string to compare
+  /// @return True if the strings are equal, false otherwise
+  ///
+  inline static bool EqualsNoCase(const std::string& str1, const char* s2)
+  {
+    return EqualsNoCase(str1.c_str(), s2);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Compare two strings with ignore of lower-/uppercase.
+  ///
+  /// @param[in] s1 C string to compare
+  /// @param[in] s2 C string to compare
+  /// @return True if the strings are equal, false otherwise
+  ///
+  inline static bool EqualsNoCase(const char* s1, const char* s2)
+  {
+    char c2; // we need only one char outside the loop
+    do
+    {
+      const char c1 = *s1++; // const local variable should help compiler to optimize
+      c2 = *s2++;
+      // This includes the possibility that one of the characters is the null-terminator,
+      // which implies a string mismatch.
+      if (c1 != c2 && ::tolower(c1) != ::tolower(c2))
+        return false;
+    } while (c2 != '\0'); // At this point, we know c1 == c2, so there's no need to test them both.
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Compare two strings with ignore of lower-/uppercase with given
+  /// size.
+  ///
+  /// Equal to @ref EqualsNoCase only that size can defined and on return the
+  /// difference between compared character becomes given.
+  ///
+  /// @param[in] str1 C++ string to compare
+  /// @param[in] str2 C++ string to compare
+  /// @param[in] n [opt] Length to check, 0 as default to make complete
+  /// @return 0 if equal, otherwise difference of failed character in string to
+  /// other ("a" - "b" = -1)
+  ///
+  inline static int CompareNoCase(const std::string& str1, const std::string& str2, size_t n = 0)
+  {
+    return CompareNoCase(str1.c_str(), str2.c_str(), n);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Compare two strings with ignore of lower-/uppercase with given
+  /// size.
+  ///
+  /// Equal to @ref EqualsNoCase only that size can defined and on return the
+  /// difference between compared character becomes given.
+  ///
+  /// @param[in] s1 C string to compare
+  /// @param[in] s2 C string to compare
+  /// @param[in] n [opt] Length to check, 0 as default to make complete
+  /// @return 0 if equal, otherwise difference of failed character in string to
+  /// other ("a" - "b" = -1)
+  ///
+  inline static int CompareNoCase(const char* s1, const char* s2, size_t n = 0)
+  {
+    char c2; // we need only one char outside the loop
+    size_t index = 0;
+    do
+    {
+      const char c1 = *s1++; // const local variable should help compiler to optimize
+      c2 = *s2++;
+      index++;
+      // This includes the possibility that one of the characters is the null-terminator,
+      // which implies a string mismatch.
+      if (c1 != c2 && ::tolower(c1) != ::tolower(c2))
+        return ::tolower(c1) - ::tolower(c2);
+    } while (c2 != '\0' &&
+             index != n); // At this point, we know c1 == c2, so there's no need to test them both.
+    return 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] str2 C++ string with which text defined in str1 is checked at
+  ///                 the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// bool ret;
+  /// std::string refstr = "test";
+  ///
+  /// ret = kodi::tools::StringUtils::StartsWith(refstr, "te");
+  /// fprintf(stderr, "Excpect true for here and is '%s'\n", ret ? "true" : "false");
+  ///
+  /// ret = kodi::tools::StringUtils::StartsWith(refstr, "abc");
+  /// fprintf(stderr, "Excpect false for here and is '%s'\n", ret ? "true" : "false");
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool StartsWith(const std::string& str1, const std::string& str2)
+  {
+    return str1.compare(0, str2.size(), str2) == 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  inline static bool StartsWith(const std::string& str1, const char* s2)
+  {
+    return StartsWith(str1.c_str(), s2);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string.
+  ///
+  /// @param[in] s1 C string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  inline static bool StartsWith(const char* s1, const char* s2)
+  {
+    while (*s2 != '\0')
+    {
+      if (*s1 != *s2)
+        return false;
+      s1++;
+      s2++;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string by ignore of
+  /// upper-/lowercase.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] str2 C++ string with which text defined in str1 is checked at
+  ///                 the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// bool ret;
+  /// std::string refstr = "test";
+  ///
+  /// ret = kodi::tools::StringUtils::StartsWithNoCase(refstr, "te");
+  /// fprintf(stderr, "Excpect true for here and is '%s'\n", ret ? "true" : "false");
+  ///
+  /// ret = kodi::tools::StringUtils::StartsWithNoCase(refstr, "TEs");
+  /// fprintf(stderr, "Excpect true for here and is '%s'\n", ret ? "true" : "false");
+  ///
+  /// ret = kodi::tools::StringUtils::StartsWithNoCase(refstr, "abc");
+  /// fprintf(stderr, "Excpect false for here and is '%s'\n", ret ? "true" : "false");
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool StartsWithNoCase(const std::string& str1, const std::string& str2)
+  {
+    return StartsWithNoCase(str1.c_str(), str2.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string by ignore of
+  /// upper-/lowercase.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  inline static bool StartsWithNoCase(const std::string& str1, const char* s2)
+  {
+    return StartsWithNoCase(str1.c_str(), s2);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the begin of another string by ignore of
+  /// upper-/lowercase.
+  ///
+  /// @param[in] s1 C string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the beginning
+  /// @return True if string started with asked text, false otherwise
+  ///
+  inline static bool StartsWithNoCase(const char* s1, const char* s2)
+  {
+    while (*s2 != '\0')
+    {
+      if (::tolower(*s1) != ::tolower(*s2))
+        return false;
+      s1++;
+      s2++;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the ending of another string.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] str2 C++ string with which text defined in str1 is checked at
+  ///                 the ending
+  /// @return True if string ended with asked text, false otherwise
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// bool ret;
+  /// std::string refstr = "test";
+  ///
+  /// ret = kodi::tools::StringUtils::EndsWith(refstr, "st");
+  /// fprintf(stderr, "Excpect true for here and is '%s'\n", ret ? "true" : "false");
+  ///
+  /// ret = kodi::tools::StringUtils::EndsWith(refstr, "abc");
+  /// fprintf(stderr, "Excpect false for here and is '%s'\n", ret ? "true" : "false");
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool EndsWith(const std::string& str1, const std::string& str2)
+  {
+    if (str1.size() < str2.size())
+      return false;
+    return str1.compare(str1.size() - str2.size(), str2.size(), str2) == 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the ending of another string.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the ending
+  /// @return True if string ended with asked text, false otherwise
+  ///
+  inline static bool EndsWith(const std::string& str1, const char* s2)
+  {
+    size_t len2 = strlen(s2);
+    if (str1.size() < len2)
+      return false;
+    return str1.compare(str1.size() - len2, len2, s2) == 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the ending of another string by ignore of
+  /// upper-/lowercase.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] str2 C++ string with which text defined in str1 is checked at
+  ///                 the ending
+  /// @return True if string ended with asked text, false otherwise
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// bool ret;
+  /// std::string refstr = "test";
+  ///
+  /// ret = kodi::tools::StringUtils::EndsWithNoCase(refstr, "ST");
+  /// fprintf(stderr, "Excpect true for here and is '%s'\n", ret ? "true" : "false");
+  ///
+  /// ret = kodi::tools::StringUtils::EndsWithNoCase(refstr, "ABC");
+  /// fprintf(stderr, "Excpect false for here and is '%s'\n", ret ? "true" : "false");
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool EndsWithNoCase(const std::string& str1, const std::string& str2)
+  {
+    if (str1.size() < str2.size())
+      return false;
+    const char* s1 = str1.c_str() + str1.size() - str2.size();
+    const char* s2 = str2.c_str();
+    while (*s2 != '\0')
+    {
+      if (::tolower(*s1) != ::tolower(*s2))
+        return false;
+      s1++;
+      s2++;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a string for the ending of another string by ignore of
+  /// upper-/lowercase.
+  ///
+  /// @param[in] str1 C++ string to be checked
+  /// @param[in] s2 C string with which text defined in str1 is checked at
+  ///               the ending
+  /// @return True if string ended with asked text, false otherwise
+  ///
+  inline static bool EndsWithNoCase(const std::string& str1, const char* s2)
+  {
+    size_t len2 = strlen(s2);
+    if (str1.size() < len2)
+      return false;
+    const char* s1 = str1.c_str() + str1.size() - len2;
+    while (*s2 != '\0')
+    {
+      if (::tolower(*s1) != ::tolower(*s2))
+        return false;
+      s1++;
+      s2++;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Compare two strings by his calculated alpha numeric values.
+  ///
+  /// @param[in] left Left string to compare with right
+  /// @param[in] right Right string to compare with left
+  /// @return Return about compare
+  ///         - 0 if left and right the same
+  ///         - -1 if right is longer
+  ///         - 1 if left is longer
+  ///         - < 0 if less equal
+  ///         - > 0 if more equal
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// int64_t ref, var;
+  ///
+  /// ref = 0;
+  /// var = kodi::tools::StringUtils::AlphaNumericCompare(L"123abc", L"abc123");
+  /// EXPECT_LT(var, ref);
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static int64_t AlphaNumericCompare(const wchar_t* left, const wchar_t* right)
+  {
+    const wchar_t* l = left;
+    const wchar_t* r = right;
+    const wchar_t *ld, *rd;
+    wchar_t lc, rc;
+    int64_t lnum, rnum;
+    const std::collate<wchar_t>& coll = std::use_facet<std::collate<wchar_t>>(std::locale());
+    int cmp_res = 0;
+    while (*l != 0 && *r != 0)
+    {
+      // check if we have a numerical value
+      if (*l >= L'0' && *l <= L'9' && *r >= L'0' && *r <= L'9')
+      {
+        ld = l;
+        lnum = 0;
+        while (*ld >= L'0' && *ld <= L'9' && ld < l + 15)
+        { // compare only up to 15 digits
+          lnum *= 10;
+          lnum += *ld++ - '0';
+        }
+        rd = r;
+        rnum = 0;
+        while (*rd >= L'0' && *rd <= L'9' && rd < r + 15)
+        { // compare only up to 15 digits
+          rnum *= 10;
+          rnum += *rd++ - L'0';
+        }
+        // do we have numbers?
+        if (lnum != rnum)
+        { // yes - and they're different!
+          return lnum - rnum;
+        }
+        l = ld;
+        r = rd;
+        continue;
+      }
+      // do case less comparison
+      lc = *l;
+      if (lc >= L'A' && lc <= L'Z')
+        lc += L'a' - L'A';
+      rc = *r;
+      if (rc >= L'A' && rc <= L'Z')
+        rc += L'a' - L'A';
+
+      // ok, do a normal comparison, taking current locale into account. Add special case stuff (eg '(' characters)) in here later
+      if ((cmp_res = coll.compare(&lc, &lc + 1, &rc, &rc + 1)) != 0)
+      {
+        return cmp_res;
+      }
+      l++;
+      r++;
+    }
+    if (*r)
+    { // r is longer
+      return -1;
+    }
+    else if (*l)
+    { // l is longer
+      return 1;
+    }
+    return 0; // files are the same
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief UTF8 version of strlen
+  ///
+  /// Skips any non-starting bytes in the count, thus returning the number of
+  /// utf8 characters.
+  ///
+  /// @param[in] s c-string to find the length of.
+  /// @return The number of utf8 characters in the string.
+  ///
+  inline static size_t Utf8StringLength(const char* s)
+  {
+    size_t length = 0;
+    while (*s)
+    {
+      if ((*s++ & 0xC0) != 0x80)
+        length++;
+    }
+    return length;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check given character is a space.
+  ///
+  /// Hack to check only first byte of UTF-8 character
+  /// without this hack "TrimX" functions failed on Win32 and OS X with UTF-8 strings
+  ///
+  /// @param[in] c Character to check
+  /// @return true if space, false otherwise
+  ///
+  inline static int IsSpace(char c) { return (c & 0x80) == 0 && ::isspace(c); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks given pointer in string is a UTF8 letter.
+  ///
+  /// @param[in] str Given character values to check, must be minimum array of 2
+  /// @return return -1 if not, else return the utf8 char length.
+  ///
+  inline static int IsUTF8Letter(const unsigned char* str)
+  {
+    // reference:
+    // unicode -> utf8 table: http://www.utf8-chartable.de/
+    // latin characters in unicode: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
+    unsigned char ch = str[0];
+    if (!ch)
+      return -1;
+    if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
+      return 1;
+    if (!(ch & 0x80))
+      return -1;
+    unsigned char ch2 = str[1];
+    if (!ch2)
+      return -1;
+    // check latin 1 letter table: http://en.wikipedia.org/wiki/C1_Controls_and_Latin-1_Supplement
+    if (ch == 0xC3 && ch2 >= 0x80 && ch2 <= 0xBF && ch2 != 0x97 && ch2 != 0xB7)
+      return 2;
+    // check latin extended A table: http://en.wikipedia.org/wiki/Latin_Extended-A
+    if (ch >= 0xC4 && ch <= 0xC7 && ch2 >= 0x80 && ch2 <= 0xBF)
+      return 2;
+    // check latin extended B table: http://en.wikipedia.org/wiki/Latin_Extended-B
+    // and International Phonetic Alphabet: http://en.wikipedia.org/wiki/IPA_Extensions_(Unicode_block)
+    if (((ch == 0xC8 || ch == 0xC9) && ch2 >= 0x80 && ch2 <= 0xBF) ||
+        (ch == 0xCA && ch2 >= 0x80 && ch2 <= 0xAF))
+      return 2;
+    return -1;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check whether a string is a natural number.
+  ///
+  /// Matches `[ \t]*[0-9]+[ \t]*`
+  ///
+  /// @param[in] str The string to check
+  /// @return true if the string is a natural number, false otherwise.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsNaturalNumber("10"));
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsNaturalNumber(" 10"));
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsNaturalNumber("0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber(" 1 0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber("1.0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber("1.1"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber("0x1"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber("blah"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber("120 h"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber(" "));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsNaturalNumber(""));
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool IsNaturalNumber(const std::string& str)
+  {
+    size_t i = 0, n = 0;
+    // allow whitespace,digits,whitespace
+    while (i < str.size() && isspace((unsigned char)str[i]))
+      i++;
+    while (i < str.size() && isdigit((unsigned char)str[i]))
+    {
+      i++;
+      n++;
+    }
+    while (i < str.size() && isspace((unsigned char)str[i]))
+      i++;
+    return i == str.size() && n > 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check whether a string is an integer.
+  ///
+  /// Matches `[ \t]*[\-]*[0-9]+[ \t]*`
+  ///
+  /// @param str The string to check
+  /// @return true if the string is an integer, false otherwise.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsInteger("10"));
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsInteger(" -10"));
+  /// EXPECT_TRUE(kodi::tools::StringUtils::IsInteger("0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger(" 1 0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger("1.0"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger("1.1"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger("0x1"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger("blah"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger("120 h"));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger(" "));
+  /// EXPECT_FALSE(kodi::tools::StringUtils::IsInteger(""));
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static bool IsInteger(const std::string& str)
+  {
+    size_t i = 0, n = 0;
+    // allow whitespace,-,digits,whitespace
+    while (i < str.size() && isspace((unsigned char)str[i]))
+      i++;
+    if (i < str.size() && str[i] == '-')
+      i++;
+    while (i < str.size() && isdigit((unsigned char)str[i]))
+    {
+      i++;
+      n++;
+    }
+    while (i < str.size() && isspace((unsigned char)str[i]))
+      i++;
+    return i == str.size() && n > 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a character is ascii number.
+  ///
+  /// @param[in] chr Single character to test
+  /// @return true if yes, false otherwise
+  ///
+  inline static bool IsAasciiDigit(char chr) // locale independent
+  {
+    return chr >= '0' && chr <= '9';
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a character is ascii hexadecimal number.
+  ///
+  /// @param[in] chr Single character to test
+  /// @return true if yes, false otherwise
+  ///
+  inline static bool IsAsciiXDigit(char chr) // locale independent
+  {
+    return (chr >= '0' && chr <= '9') || (chr >= 'a' && chr <= 'f') || (chr >= 'A' && chr <= 'F');
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Translate a character where defined as a numerical value (0-9)
+  /// string to right integer.
+  ///
+  /// @param[in] chr Single character to translate
+  /// @return
+  ///
+  inline static int AsciiDigitValue(char chr) // locale independent
+  {
+    if (!IsAasciiDigit(chr))
+      return -1;
+
+    return chr - '0';
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Translate a character where defined as a hexadecimal value string
+  /// to right integer.
+  ///
+  /// @param[in] chr Single character to translate
+  /// @return Corresponding integer value, e.g. character is "A" becomes
+  ///         returned as a integer with 10.
+  ///
+  inline static int AsciiXDigitValue(char chr) // locale independent
+  {
+    int v = AsciiDigitValue(chr);
+    if (v >= 0)
+      return v;
+    if (chr >= 'a' && chr <= 'f')
+      return chr - 'a' + 10;
+    if (chr >= 'A' && chr <= 'F')
+      return chr - 'A' + 10;
+
+    return -1;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a character is ascii alphabetic lowercase.
+  ///
+  /// @param[in] chr Single character to test
+  /// @return True if ascii uppercase letter, false otherwise
+  ///
+  inline static bool IsAsciiUppercaseLetter(char chr) // locale independent
+  {
+    return (chr >= 'A' && chr <= 'Z');
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a character is ascii alphabetic lowercase.
+  ///
+  /// @param[in] chr Single character to test
+  /// @return True if ascii lowercase letter, false otherwise
+  ///
+  inline static bool IsAsciiLowercaseLetter(char chr) // locale independent
+  {
+    return (chr >= 'a' && chr <= 'z');
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Checks a character is within ascii alphabetic and numerical fields.
+  ///
+  /// @param[in] chr Single character to test
+  /// @return true if alphabetic / numerical ascii value
+  ///
+  inline static bool IsAsciiAlphaNum(char chr) // locale independent
+  {
+    return IsAsciiUppercaseLetter(chr) || IsAsciiLowercaseLetter(chr) || IsAasciiDigit(chr);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check a string for another text.
+  ///
+  /// @param[in] str String to seach for keywords
+  /// @param[in] keywords List of keywords to search in text
+  /// @return true if string contains word in list
+  ///
+  inline static bool ContainsKeyword(const std::string& str,
+                                     const std::vector<std::string>& keywords)
+  {
+    for (const auto& it : keywords)
+    {
+      if (str.find(it) != str.npos)
+        return true;
+    }
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_SearchControl String search
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **To search a string**\n
+  /// Various functions are defined in here which allow you to search through a
+  /// text in different ways.
+  ///
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Search for a single word within a text.
+  ///
+  /// @param[in] str String to search within
+  /// @param[in] wordLowerCase Word as lowercase to search
+  /// @return Position in string where word is found, -1 (std::string::npos) if
+  ///         not found
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// size_t ref, var;
+  ///
+  /// // The name "string" is alone within text and becomes found on position 5
+  /// ref = 5;
+  /// var = kodi::tools::StringUtils::FindWords("test string", "string");
+  /// EXPECT_EQ(ref, var);
+  ///
+  /// // The 12 is included inside another word and then not found as it should alone (-1 return)
+  /// ref = -1;
+  /// var = kodi::tools::StringUtils::FindWords("apple2012", "12");
+  /// EXPECT_EQ(ref, var);
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static size_t FindWords(const char* str, const char* wordLowerCase)
+  {
+    // NOTE: This assumes word is lowercase!
+    const unsigned char* s = (const unsigned char*)str;
+    do
+    {
+      // start with a compare
+      const unsigned char* c = s;
+      const unsigned char* w = (const unsigned char*)wordLowerCase;
+      bool same = true;
+      while (same && *c && *w)
+      {
+        unsigned char lc = *c++;
+        if (lc >= 'A' && lc <= 'Z')
+          lc += 'a' - 'A';
+
+        if (lc != *w++) // different
+          same = false;
+      }
+      if (same && *w == 0) // only the same if word has been exhausted
+        return (const char*)s - str;
+
+      // otherwise, skip current word (composed by latin letters) or number
+      int l;
+      if (*s >= '0' && *s <= '9')
+      {
+        ++s;
+        while (*s >= '0' && *s <= '9')
+          ++s;
+      }
+      else if ((l = IsUTF8Letter(s)) > 0)
+      {
+        s += l;
+        while ((l = IsUTF8Letter(s)) > 0)
+          s += l;
+      }
+      else
+        ++s;
+      while (*s && *s == ' ')
+        s++;
+
+      // and repeat until we're done
+    } while (*s);
+
+    return std::string::npos;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Search a string for a given bracket and give its end position.
+  ///
+  /// @param[in] str String to search within
+  /// @param[in] opener Begin character to start search
+  /// @param[in] closer End character to end search
+  /// @param[in] startPos [opt] Position to start search in string, 0 as default
+  ///                     to start from begin
+  /// @return End position where found, -1 if failed
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// int ref, var;
+  ///
+  /// ref = 11;
+  /// var = kodi::tools::StringUtils::FindEndBracket("atest testbb test", 'a', 'b');
+  /// EXPECT_EQ(ref, var);
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static size_t FindEndBracket(const std::string& str,
+                                      char opener,
+                                      char closer,
+                                      size_t startPos = 0)
+  {
+    size_t blocks = 1;
+    for (size_t i = startPos; i < str.size(); i++)
+    {
+      if (str[i] == opener)
+        blocks++;
+      else if (str[i] == closer)
+      {
+        blocks--;
+        if (!blocks)
+          return i;
+      }
+    }
+
+    return std::string::npos;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Search a text and return the number of parts found as a number.
+  ///
+  /// @param[in] strInput Input string to search for
+  /// @param[in] strFind String to search in input
+  /// @return Amount how much the string is found
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_EQ(3, kodi::tools::StringUtils::FindNumber("aabcaadeaa", "aa"));
+  /// EXPECT_EQ(1, kodi::tools::StringUtils::FindNumber("aabcaadeaa", "b"));
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static int FindNumber(const std::string& strInput, const std::string& strFind)
+  {
+    size_t pos = strInput.find(strFind, 0);
+    int numfound = 0;
+    while (pos != std::string::npos)
+    {
+      numfound++;
+      pos = strInput.find(strFind, pos + 1);
+    }
+    return numfound;
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_ListControl String list
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **Creating lists using a string**\n
+  /// With this, either simple vectors or lists defined by templates can be given
+  /// for the respective divided text.
+  ///
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Concatenates the elements of a specified array or the members of a
+  /// collection and uses the specified separator between each element or
+  /// member.
+  ///
+  /// @param[in] strings An array of objects whose string representations are
+  ///                    concatenated.
+  /// @param[in] delimiter Delimiter to be used to join the input string
+  /// @return A string consisting of the elements of values, separated by the
+  /// separator character.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string refstr, varstr;
+  /// std::vector<std::string> strarray;
+  ///
+  /// strarray.emplace_back("a");
+  /// strarray.emplace_back("b");
+  /// strarray.emplace_back("c");
+  /// strarray.emplace_back("de");
+  /// strarray.emplace_back(",");
+  /// strarray.emplace_back("fg");
+  /// strarray.emplace_back(",");
+  /// refstr = "a,b,c,de,,,fg,,";
+  /// varstr = kodi::tools::StringUtils::Join(strarray, ",");
+  /// EXPECT_STREQ(refstr.c_str(), varstr.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  template<typename CONTAINER>
+  inline static std::string Join(const CONTAINER& strings, const std::string& delimiter)
+  {
+    std::string result;
+    for (const auto& str : strings)
+      result += str + delimiter;
+
+    if (!result.empty())
+      result.erase(result.size() - delimiter.size());
+    return result;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty the result will be an empty array (not
+  /// an array containing an empty string).
+  ///
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiter Delimiter to be used to split the input string
+  /// @param[in] iMaxStrings [opt] Maximum number of resulting split strings
+  /// @return List of splitted strings
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::vector<std::string> varresults;
+  ///
+  /// varresults = kodi::tools::StringUtils::Split("g,h,ij,k,lm,,n", ",");
+  /// EXPECT_STREQ("g", varresults.at(0).c_str());
+  /// EXPECT_STREQ("h", varresults.at(1).c_str());
+  /// EXPECT_STREQ("ij", varresults.at(2).c_str());
+  /// EXPECT_STREQ("k", varresults.at(3).c_str());
+  /// EXPECT_STREQ("lm", varresults.at(4).c_str());
+  /// EXPECT_STREQ("", varresults.at(5).c_str());
+  /// EXPECT_STREQ("n", varresults.at(6).c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::vector<std::string> Split(const std::string& input,
+                                               const std::string& delimiter,
+                                               unsigned int iMaxStrings = 0)
+  {
+    std::vector<std::string> result;
+    SplitTo(std::back_inserter(result), input, delimiter, iMaxStrings);
+    return result;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty the result will be an empty array (not
+  /// an array containing an empty string).
+  ///
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiter Delimiter to be used to split the input string
+  /// @param[in] iMaxStrings [opt] Maximum number of resulting split strings
+  /// @return List of splitted strings
+  ///
+  inline static std::vector<std::string> Split(const std::string& input,
+                                               const char delimiter,
+                                               int iMaxStrings = 0)
+  {
+    std::vector<std::string> result;
+    SplitTo(std::back_inserter(result), input, delimiter, iMaxStrings);
+    return result;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty the result will be an empty array (not
+  /// an array containing an empty string).
+  ///
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiters Delimiter strings to be used to split the input
+  ///                       strings
+  /// @return List of splitted strings
+  ///
+  inline static std::vector<std::string> Split(const std::string& input,
+                                               const std::vector<std::string>& delimiters)
+  {
+    std::vector<std::string> result;
+    SplitTo(std::back_inserter(result), input, delimiters);
+    return result;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty nothing will be put into the target
+  /// iterator.
+  ///
+  /// @param[in] d_first The beginning of the destination range
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiter Delimiter to be used to split the input string
+  /// @param[in] iMaxStrings [opt] Maximum number of resulting split strings
+  /// @return Output iterator to the element in the destination range, one past
+  ///         the last element that was put there
+  ///
+  template<typename OutputIt>
+  inline static OutputIt SplitTo(OutputIt d_first,
+                                 const std::string& input,
+                                 const std::string& delimiter,
+                                 unsigned int iMaxStrings = 0)
+  {
+    OutputIt dest = d_first;
+
+    if (input.empty())
+      return dest;
+    if (delimiter.empty())
+    {
+      *d_first++ = input;
+      return dest;
+    }
+
+    const size_t delimLen = delimiter.length();
+    size_t nextDelim;
+    size_t textPos = 0;
+    do
+    {
+      if (--iMaxStrings == 0)
+      {
+        *dest++ = input.substr(textPos);
+        break;
+      }
+      nextDelim = input.find(delimiter, textPos);
+      *dest++ = input.substr(textPos, nextDelim - textPos);
+      textPos = nextDelim + delimLen;
+    } while (nextDelim != std::string::npos);
+
+    return dest;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty nothing will be put into the target
+  /// iterator.
+  ///
+  /// @param[in] d_first The beginning of the destination range
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiter Delimiter to be used to split the input string
+  /// @param[in] iMaxStrings [opt] Maximum number of resulting split strings
+  /// @return Output iterator to the element in the destination range, one past
+  ///         the last element that was put there
+  ///
+  template<typename OutputIt>
+  inline static OutputIt SplitTo(OutputIt d_first,
+                                 const std::string& input,
+                                 const char delimiter,
+                                 int iMaxStrings = 0)
+  {
+    return SplitTo(d_first, input, std::string(1, delimiter), iMaxStrings);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input string using the given delimiter into
+  /// separate strings.
+  ///
+  /// If the given input string is empty nothing will be put into the target
+  /// iterator.
+  ///
+  /// @param[in] d_first The beginning of the destination range
+  /// @param[in] input Input string to be split
+  /// @param[in] delimiters Delimiter strings to be used to split the input
+  ///                       strings
+  /// @return Output iterator to the element in the destination range, one past
+  ///         the last element that was put there
+  ///
+  template<typename OutputIt>
+  inline static OutputIt SplitTo(OutputIt d_first,
+                                 const std::string& input,
+                                 const std::vector<std::string>& delimiters)
+  {
+    OutputIt dest = d_first;
+    if (input.empty())
+      return dest;
+
+    if (delimiters.empty())
+    {
+      *dest++ = input;
+      return dest;
+    }
+    std::string str = input;
+    for (size_t di = 1; di < delimiters.size(); di++)
+      StringUtils::Replace(str, delimiters[di], delimiters[0]);
+    return SplitTo(dest, str, delimiters[0]);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Splits the given input strings using the given delimiters into
+  /// further separate strings.
+  ///
+  /// If the given input string vector is empty the result will be an empty
+  /// array (not an array containing an empty string).
+  ///
+  /// Delimiter strings are applied in order, so once the (optional) maximum
+  /// number of items is produced no other delimiters are applied. This produces
+  /// different results to applying all delimiters at once e.g. "a/b#c/d"
+  /// becomes "a", "b#c", "d" rather than "a", "b", "c/d"
+  ///
+  /// @param[in] input Input vector of strings each to be split
+  /// @param[in] delimiters Delimiter strings to be used to split the input
+  ///                       strings
+  /// @param[in] iMaxStrings [opt] Maximum number of resulting split strings
+  /// @return List of splitted strings
+  ///
+  inline static std::vector<std::string> SplitMulti(const std::vector<std::string>& input,
+                                                    const std::vector<std::string>& delimiters,
+                                                    unsigned int iMaxStrings = 0)
+  {
+    if (input.empty())
+      return std::vector<std::string>();
+
+    std::vector<std::string> results(input);
+
+    if (delimiters.empty() || (iMaxStrings > 0 && iMaxStrings <= input.size()))
+      return results;
+
+    std::vector<std::string> strings1;
+    if (iMaxStrings == 0)
+    {
+      for (size_t di = 0; di < delimiters.size(); di++)
+      {
+        for (size_t i = 0; i < results.size(); i++)
+        {
+          std::vector<std::string> substrings = StringUtils::Split(results[i], delimiters[di]);
+          for (size_t j = 0; j < substrings.size(); j++)
+            strings1.push_back(substrings[j]);
+        }
+        results = strings1;
+        strings1.clear();
+      }
+      return results;
+    }
+
+    // Control the number of strings input is split into, keeping the original strings.
+    // Note iMaxStrings > input.size()
+    size_t iNew = iMaxStrings - results.size();
+    for (size_t di = 0; di < delimiters.size(); di++)
+    {
+      for (size_t i = 0; i < results.size(); i++)
+      {
+        if (iNew > 0)
+        {
+          std::vector<std::string> substrings =
+              StringUtils::Split(results[i], delimiters[di], static_cast<int>(iNew + 1));
+          iNew = iNew - substrings.size() + 1;
+          for (size_t j = 0; j < substrings.size(); j++)
+            strings1.push_back(substrings[j]);
+        }
+        else
+          strings1.push_back(results[i]);
+      }
+      results = strings1;
+      iNew = iMaxStrings - results.size();
+      strings1.clear();
+      if ((iNew <= 0))
+        break; //Stop trying any more delimiters
+    }
+    return results;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Split a string by the specified delimiters.
+  ///
+  /// Splits a string using one or more delimiting characters, ignoring empty
+  /// tokens.
+  ///
+  /// Differs from Split() in two ways:
+  /// 1. The delimiters are treated as individual characters, rather than a single delimiting string.
+  /// 2. Empty tokens are ignored.
+  ///
+  ///
+  /// @param[in] input String to split
+  /// @param[in] delimiters Delimiters
+  /// @return A vector of tokens
+  ///
+  inline static std::vector<std::string> Tokenize(const std::string& input,
+                                                  const std::string& delimiters)
+  {
+    std::vector<std::string> tokens;
+    Tokenize(input, tokens, delimiters);
+    return tokens;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Tokenizing a string denotes splitting a string with respect to a
+  /// delimiter.
+  ///
+  /// @param[in] input String to split
+  /// @param[out] tokens A vector of tokens
+  /// @param[in] delimiters Delimiters
+  ///
+  inline static void Tokenize(const std::string& input,
+                              std::vector<std::string>& tokens,
+                              const std::string& delimiters)
+  {
+    tokens.clear();
+    // Skip delimiters at beginning.
+    std::string::size_type dataPos = input.find_first_not_of(delimiters);
+    while (dataPos != std::string::npos)
+    {
+      // Find next delimiter
+      const std::string::size_type nextDelimPos = input.find_first_of(delimiters, dataPos);
+      // Found a token, add it to the vector.
+      tokens.push_back(input.substr(dataPos, nextDelimPos - dataPos));
+      // Skip delimiters.  Note the "not_of"
+      dataPos = input.find_first_not_of(delimiters, nextDelimPos);
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Tokenizing a string denotes splitting a string with respect to a
+  /// delimiter.
+  ///
+  /// @param[in] input String to split
+  /// @param[in] delimiter Delimiters
+  /// @return A vector of tokens
+  ///
+  inline static std::vector<std::string> Tokenize(const std::string& input, const char delimiter)
+  {
+    std::vector<std::string> tokens;
+    Tokenize(input, tokens, delimiter);
+    return tokens;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Tokenizing a string denotes splitting a string with respect to a
+  /// delimiter.
+  ///
+  /// @param[in] input String to split
+  /// @param[out] tokens List of
+  /// @param[in] delimiter Delimiters
+  ///
+  inline static void Tokenize(const std::string& input,
+                              std::vector<std::string>& tokens,
+                              const char delimiter)
+  {
+    tokens.clear();
+    // Skip delimiters at beginning.
+    std::string::size_type dataPos = input.find_first_not_of(delimiter);
+    while (dataPos != std::string::npos)
+    {
+      // Find next delimiter
+      const std::string::size_type nextDelimPos = input.find(delimiter, dataPos);
+      // Found a token, add it to the vector.
+      tokens.push_back(input.substr(dataPos, nextDelimPos - dataPos));
+      // Skip delimiters.  Note the "not_of"
+      dataPos = input.find_first_not_of(delimiter, nextDelimPos);
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+  //----------------------------------------------------------------------------
+  /// @defgroup cpp_kodi_tools_StringUtils_TimeControl Time value processing
+  /// @ingroup cpp_kodi_tools_StringUtils
+  /// @brief **String time formats**\n
+  /// This is used to process the respective time formats in text fields.
+  /*!@{*/
+
+  //============================================================================
+  /// @brief Converts a time string to the respective integer value.
+  ///
+  /// @param[in] timeString String with time.\n
+  ///                       Following types are possible:
+  ///                       - "MM min" (integer number with "min" on end)
+  ///                       - "HH:MM:SS"
+  /// @return Time in seconds
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// EXPECT_EQ(77455, kodi::tools::StringUtils::TimeStringToSeconds("21:30:55"));
+  /// EXPECT_EQ(7*60, kodi::tools::StringUtils::TimeStringToSeconds("7 min"));
+  /// EXPECT_EQ(7*60, kodi::tools::StringUtils::TimeStringToSeconds("7 min\t"));
+  /// EXPECT_EQ(154*60, kodi::tools::StringUtils::TimeStringToSeconds("   154 min"));
+  /// EXPECT_EQ(1*60+1, kodi::tools::StringUtils::TimeStringToSeconds("1:01"));
+  /// EXPECT_EQ(4*60+3, kodi::tools::StringUtils::TimeStringToSeconds("4:03"));
+  /// EXPECT_EQ(2*3600+4*60+3, kodi::tools::StringUtils::TimeStringToSeconds("2:04:03"));
+  /// EXPECT_EQ(2*3600+4*60+3, kodi::tools::StringUtils::TimeStringToSeconds("   2:4:3"));
+  /// EXPECT_EQ(2*3600+4*60+3, kodi::tools::StringUtils::TimeStringToSeconds("  \t\t 02:04:03 \n "));
+  /// EXPECT_EQ(1*3600+5*60+2, kodi::tools::StringUtils::TimeStringToSeconds("01:05:02:04:03 \n "));
+  /// EXPECT_EQ(0, kodi::tools::StringUtils::TimeStringToSeconds("blah"));
+  /// EXPECT_EQ(0, kodi::tools::StringUtils::TimeStringToSeconds("ля-ля"));
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static long TimeStringToSeconds(const std::string& timeString)
+  {
+    std::string strCopy(timeString);
+    StringUtils::Trim(strCopy);
+    if (StringUtils::EndsWithNoCase(strCopy, " min"))
+    {
+      // this is imdb format of "XXX min"
+      return 60 * atoi(strCopy.c_str());
+    }
+    else
+    {
+      std::vector<std::string> secs = StringUtils::Split(strCopy, ':');
+      int timeInSecs = 0;
+      for (unsigned int i = 0; i < 3 && i < secs.size(); i++)
+      {
+        timeInSecs *= 60;
+        timeInSecs += atoi(secs[i].c_str());
+      }
+      return timeInSecs;
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Convert a time in seconds to a string based on the given time
+  /// format.
+  ///
+  /// @param[in] seconds time in seconds
+  /// @param[in] format [opt] The format we want the time in
+  /// @return The formatted time
+  ///
+  /// @sa TIME_FORMAT
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// std::string ref, var;
+  ///
+  /// ref = "21:30:55";
+  /// var = kodi::tools::StringUtils::SecondsToTimeString(77455);
+  /// EXPECT_STREQ(ref.c_str(), var.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static std::string SecondsToTimeString(long seconds,
+                                                TIME_FORMAT format = TIME_FORMAT_GUESS)
+  {
+    bool isNegative = seconds < 0;
+    seconds = std::abs(seconds);
+
+    std::string strHMS;
+    if (format == TIME_FORMAT_SECS)
+      strHMS = StringUtils::Format("%i", seconds);
+    else if (format == TIME_FORMAT_MINS)
+      strHMS = StringUtils::Format("%i", lrintf(static_cast<float>(seconds) / 60.0f));
+    else if (format == TIME_FORMAT_HOURS)
+      strHMS = StringUtils::Format("%i", lrintf(static_cast<float>(seconds) / 3600.0f));
+    else if (format & TIME_FORMAT_M)
+      strHMS += StringUtils::Format("%i", seconds % 3600 / 60);
+    else
+    {
+      int hh = seconds / 3600;
+      seconds = seconds % 3600;
+      int mm = seconds / 60;
+      int ss = seconds % 60;
+
+      if (format == TIME_FORMAT_GUESS)
+        format = (hh >= 1) ? TIME_FORMAT_HH_MM_SS : TIME_FORMAT_MM_SS;
+      if (format & TIME_FORMAT_HH)
+        strHMS += StringUtils::Format("%2.2i", hh);
+      else if (format & TIME_FORMAT_H)
+        strHMS += StringUtils::Format("%i", hh);
+      if (format & TIME_FORMAT_MM)
+        strHMS += StringUtils::Format(strHMS.empty() ? "%2.2i" : ":%2.2i", mm);
+      if (format & TIME_FORMAT_SS)
+        strHMS += StringUtils::Format(strHMS.empty() ? "%2.2i" : ":%2.2i", ss);
+    }
+
+    if (isNegative)
+      strHMS = "-" + strHMS;
+
+    return strHMS;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Converts a string in the format YYYYMMDD to the corresponding
+  /// integer value.
+  ///
+  /// @param[in] dateString The date in the associated format, possible values
+  ///                       are:
+  ///                       - DD (for days only)
+  ///                       - MM-DD (for days with month)
+  ///                       - YYYY-MM-DD (for years, then month and last days)
+  /// @return Corresponding integer, e.g. "2020-12-24" return as integer value
+  ///         20201224
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/tools/StringUtils.h>
+  ///
+  /// int ref, var;
+  ///
+  /// ref = 20120706;
+  /// var = kodi::tools::StringUtils::DateStringToYYYYMMDD("2012-07-06");
+  /// EXPECT_EQ(ref, var);
+  /// ~~~~~~~~~~~~~
+  ///
+  inline static int DateStringToYYYYMMDD(const std::string& dateString)
+  {
+    std::vector<std::string> days = StringUtils::Split(dateString, '-');
+    if (days.size() == 1)
+      return atoi(days[0].c_str());
+    else if (days.size() == 2)
+      return atoi(days[0].c_str()) * 100 + atoi(days[1].c_str());
+    else if (days.size() == 3)
+      return atoi(days[0].c_str()) * 10000 + atoi(days[1].c_str()) * 100 + atoi(days[2].c_str());
+    else
+      return -1;
+  }
+  //----------------------------------------------------------------------------
+
+  /*!@}*/
+
+private:
+  inline static int compareWchar(const void* a, const void* b)
+  {
+    if (*static_cast<const wchar_t*>(a) < *static_cast<const wchar_t*>(b))
+      return -1;
+    else if (*static_cast<const wchar_t*>(a) > *static_cast<const wchar_t*>(b))
+      return 1;
+    return 0;
+  }
+
+  inline static wchar_t tolowerUnicode(const wchar_t& c)
+  {
+    wchar_t* p =
+        static_cast<wchar_t*>(bsearch(&c, unicode_uppers, sizeof(unicode_uppers) / sizeof(wchar_t),
+                                      sizeof(wchar_t), compareWchar));
+    if (p)
+      return *(unicode_lowers + (p - unicode_uppers));
+
+    return c;
+  }
+
+  inline static wchar_t toupperUnicode(const wchar_t& c)
+  {
+    wchar_t* p =
+        static_cast<wchar_t*>(bsearch(&c, unicode_lowers, sizeof(unicode_lowers) / sizeof(wchar_t),
+                                      sizeof(wchar_t), compareWchar));
+    if (p)
+      return *(unicode_uppers + (p - unicode_lowers));
+
+    return c;
+  }
+
+  static uint32_t UTF8ToUnicode(const unsigned char* z, int nKey, unsigned char& bytes)
+  {
+    // Lookup table used decode the first byte of a multi-byte UTF8 character
+    // clang-format off
+    static const unsigned char utf8Trans1[] = {
+      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+      0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00,
+    };
+    // clang-format on
+
+    uint32_t c;
+    bytes = 0;
+    c = z[0];
+    if (c >= 0xc0)
+    {
+      c = utf8Trans1[c - 0xc0];
+      int index = 1;
+      while (index < nKey && (z[index] & 0xc0) == 0x80)
+      {
+        c = (c << 6) + (0x3f & z[index]);
+        index++;
+      }
+      if (c < 0x80 || (c & 0xFFFFF800) == 0xD800 || (c & 0xFFFFFFFE) == 0xFFFE)
+        c = 0xFFFD;
+      bytes = static_cast<unsigned char>(index - 1);
+    }
+    return c;
+  }
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/tools/Thread.h b/xbmc/addons/kodi-dev-kit/include/kodi/tools/Thread.h
new file mode 100644
index 0000000..4cae13e
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/Thread.h
@@ -0,0 +1,399 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include "../General.h"
+
+#include <chrono>
+#include <condition_variable>
+#include <future>
+#include <mutex>
+#include <thread>
+
+namespace kodi
+{
+namespace tools
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_CThread class CThread
+/// @ingroup cpp_kodi_tools
+/// @brief **Helper class to represent threads of execution**\n
+/// An execution thread is a sequence of instructions that can run concurrently
+/// with other such sequences in multithreaded environments while sharing the
+/// same address space.
+///
+/// Is intended to reduce any code work of C++ on addons and to have them faster
+/// to use.
+///
+/// His code uses the support of platform-independent thread system introduced
+/// with C++11.
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/tools/Thread.h>
+/// #include <kodi/AddonBase.h>
+///
+/// class ATTRIBUTE_HIDDEN CTestAddon
+///   : public kodi::addon::CAddonBase,
+///     public kodi::tools::CThread
+/// {
+/// public:
+///   CTestAddon() = default;
+///
+///   ADDON_STATUS Create() override;
+///
+///   void Process() override;
+/// };
+///
+/// ADDON_STATUS CTestAddon::Create()
+/// {
+///   kodi::Log(ADDON_LOG_INFO, "Starting thread");
+///   CreateThread();
+///
+///   Sleep(4000);
+///
+///   kodi::Log(ADDON_LOG_INFO, "Stopping thread");
+///   // This added as example and also becomes stopped by class destructor
+///   StopThread();
+///
+///   return ADDON_STATUS_OK;
+/// }
+///
+/// void CTestAddon::Process()
+/// {
+///   kodi::Log(ADDON_LOG_INFO, "Thread started");
+///
+///   while (!m_threadStop)
+///   {
+///     kodi::Log(ADDON_LOG_INFO, "Hello World");
+///     Sleep(1000);
+///   }
+///
+///   kodi::Log(ADDON_LOG_INFO, "Thread ended");
+/// }
+///
+/// ADDONCREATOR(CTestAddon)
+/// ~~~~~~~~~~~~~
+///
+///@{
+class CThread
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Class constructor.
+  ///
+  CThread() : m_threadStop(false) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Class destructor.
+  ///
+  virtual ~CThread()
+  {
+    StopThread();
+    if (m_thread != nullptr)
+    {
+      m_thread->detach();
+      delete m_thread;
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Check auto delete is enabled on this thread class.
+  ///
+  /// @return true if auto delete is used, false otherwise
+  ///
+  bool IsAutoDelete() const { return m_autoDelete; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Check caller is on this running thread.
+  ///
+  /// @return true if called from thread inside the class, false if from another
+  ///         thread
+  ///
+  bool IsCurrentThread() const { return m_threadId == std::this_thread::get_id(); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Check thread inside this class is running and active.
+  ///
+  /// @note This function should be used from outside and not within process to
+  /// check thread is active. Use use atomic bool @ref m_threadStop for this.
+  ///
+  /// @return true if running, false if not
+  ///
+  bool IsRunning() const
+  {
+    if (m_thread != nullptr)
+    {
+      // it's possible that the thread exited on it's own without a call to StopThread. If so then
+      // the promise should be fulfilled.
+      std::future_status stat = m_future.wait_for(std::chrono::milliseconds(0));
+      // a status of 'ready' means the future contains the value so the thread has exited
+      // since the thread can't exit without setting the future.
+      if (stat == std::future_status::ready) // this is an indication the thread has exited.
+        return false;
+      return true; // otherwise the thread is still active.
+    }
+    else
+      return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Create a new thread defined by this class on child.
+  ///
+  /// This starts then @ref Process() where is available on the child by addon.
+  ///
+  /// @param[in] autoDelete To set thread to delete itself after end, default is
+  ///                       false
+  ///
+  void CreateThread(bool autoDelete = false)
+  {
+    if (m_thread != nullptr)
+    {
+      // if the thread exited on it's own, without a call to StopThread, then we can get here
+      // incorrectly. We should be able to determine this by checking the promise.
+      std::future_status stat = m_future.wait_for(std::chrono::milliseconds(0));
+      // a status of 'ready' means the future contains the value so the thread has exited
+      // since the thread can't exit without setting the future.
+      if (stat == std::future_status::ready) // this is an indication the thread has exited.
+        StopThread(true); // so let's just clean up
+      else
+      { // otherwise we have a problem.
+        kodi::Log(ADDON_LOG_FATAL, "%s - fatal error creating thread - old thread id not null",
+                  __func__);
+        exit(1);
+      }
+    }
+
+    m_autoDelete = autoDelete;
+    m_threadStop = false;
+    m_startEvent.notify_all();
+    m_stopEvent.notify_all();
+
+    std::promise<bool> prom;
+    m_future = prom.get_future();
+
+    {
+      // The std::thread internals must be set prior to the lambda doing
+      //   any work. This will cause the lambda to wait until m_thread
+      //   is fully initialized. Interestingly, using a std::atomic doesn't
+      //   have the appropriate memory barrier behavior to accomplish the
+      //   same thing so a full system mutex needs to be used.
+      std::unique_lock<std::recursive_mutex> lock(m_threadMutex);
+      m_thread = new std::thread(
+          [](CThread* thread, std::promise<bool> promise) {
+            try
+            {
+              {
+                // Wait for the pThread->m_thread internals to be set. Otherwise we could
+                // get to a place where we're reading, say, the thread id inside this
+                // lambda's call stack prior to the thread that kicked off this lambda
+                // having it set. Once this lock is released, the CThread::Create function
+                // that kicked this off is done so everything should be set.
+                std::unique_lock<std::recursive_mutex> lock(thread->m_threadMutex);
+              }
+
+              thread->m_threadId = std::this_thread::get_id();
+              std::stringstream ss;
+              ss << thread->m_threadId;
+              std::string id = ss.str();
+              bool autodelete = thread->m_autoDelete;
+
+              kodi::Log(ADDON_LOG_DEBUG, "Thread %s start, auto delete: %s", id.c_str(),
+                        (autodelete ? "true" : "false"));
+
+              thread->m_running = true;
+              thread->m_startEvent.notify_one();
+
+              thread->Process();
+
+              if (autodelete)
+              {
+                kodi::Log(ADDON_LOG_DEBUG, "Thread %s terminating (autodelete)", id.c_str());
+                delete thread;
+                thread = nullptr;
+              }
+              else
+                kodi::Log(ADDON_LOG_DEBUG, "Thread %s terminating", id.c_str());
+            }
+            catch (const std::exception& e)
+            {
+              kodi::Log(ADDON_LOG_DEBUG, "Thread Terminating with Exception: %s", e.what());
+            }
+            catch (...)
+            {
+              kodi::Log(ADDON_LOG_DEBUG, "Thread Terminating with Exception");
+            }
+
+            promise.set_value(true);
+          },
+          this, std::move(prom));
+
+      m_startEvent.wait(lock);
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Stop a running thread.
+  ///
+  /// @param[in] wait As true (default) to wait until thread is finished and
+  ///                 stopped, as false the function return directly and thread
+  ///                 becomes independently stopped.
+  ///
+  void StopThread(bool wait = true)
+  {
+    std::unique_lock<std::recursive_mutex> lock(m_threadMutex);
+
+    if (m_threadStop)
+      return;
+
+    if (m_thread && !m_running)
+      m_startEvent.wait(lock);
+    m_running = false;
+    m_threadStop = true;
+    m_stopEvent.notify_one();
+
+    std::thread* lthread = m_thread;
+    if (lthread != nullptr && wait && !IsCurrentThread())
+    {
+      lock.unlock();
+      if (lthread->joinable())
+        lthread->join();
+      delete m_thread;
+      m_thread = nullptr;
+      m_threadId = std::thread::id();
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Thread sleep with given amount of milliseconds.
+  ///
+  /// This makes a sleep in the thread with a given time value. If it is called
+  /// within the process itself, it is also checked whether the thread is
+  /// terminated and the sleep process is thereby interrupted.
+  ///
+  /// If the external point calls this, only a regular sleep is used, which runs
+  /// through completely.
+  ///
+  /// @param[in] milliseconds Time to sleep
+  ///
+  void Sleep(uint32_t milliseconds)
+  {
+    if (milliseconds > 10 && IsCurrentThread())
+    {
+      std::unique_lock<std::recursive_mutex> lock(m_threadMutex);
+      m_stopEvent.wait_for(lock, std::chrono::milliseconds(milliseconds));
+    }
+    else
+    {
+      std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
+    }
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief The function returns when the thread execution has completed or
+  /// timing is reached in milliseconds beforehand
+  ///
+  /// This synchronizes the moment this function returns with the completion of
+  /// all operations on the thread.
+  ///
+  /// @param[in] milliseconds Time to wait for join
+  ///
+  bool Join(unsigned int milliseconds)
+  {
+    std::unique_lock<std::recursive_mutex> lock(m_threadMutex);
+    std::thread* lthread = m_thread;
+    if (lthread != nullptr)
+    {
+      if (IsCurrentThread())
+        return false;
+
+      {
+        m_threadMutex.unlock(); // don't hold the thread lock while we're waiting
+        std::future_status stat = m_future.wait_for(std::chrono::milliseconds(milliseconds));
+        if (stat != std::future_status::ready)
+          return false;
+        m_threadMutex.lock();
+      }
+
+      // it's possible it's already joined since we released the lock above.
+      if (lthread->joinable())
+        m_thread->join();
+      return true;
+    }
+    else
+      return false;
+  }
+  //----------------------------------------------------------------------------
+
+protected:
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief The function to be added by the addon as a child to carry out the
+  /// process thread.
+  ///
+  /// Use @ref m_threadStop to check about active of thread and want stopped from
+  /// external place.
+  ///
+  /// @note This function is necessary and must be implemented by the addon.
+  ///
+  virtual void Process() = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CThread
+  /// @brief Atomic bool to indicate thread is active.
+  ///
+  /// This should be used in @ref Process() to check the activity of the thread and,
+  /// if true, to terminate the process.
+  ///
+  /// - <b>`false`</b>: Thread active and should be run
+  /// - <b>`true`</b>: Thread ends and should be stopped
+  ///
+  std::atomic<bool> m_threadStop;
+  //----------------------------------------------------------------------------
+
+private:
+  bool m_autoDelete = false;
+  bool m_running = false;
+  std::condition_variable_any m_stopEvent;
+  std::condition_variable_any m_startEvent;
+  std::recursive_mutex m_threadMutex;
+  std::thread::id m_threadId;
+  std::thread* m_thread = nullptr;
+  std::future<bool> m_future;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/tools/Timer.h b/xbmc/addons/kodi-dev-kit/include/kodi/tools/Timer.h
new file mode 100644
index 0000000..0e0ced7
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/tools/Timer.h
@@ -0,0 +1,315 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include "Thread.h"
+
+#include <functional>
+
+namespace kodi
+{
+namespace tools
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_CTimer class CTimer
+/// @ingroup cpp_kodi_tools
+/// @brief **Time interval management**\n
+/// Class which enables a time interval to be called up by a given function or
+/// class by means of a thread.
+///
+/// His code uses the support of platform-independent thread system introduced
+/// with C++11.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/tools/Timer.h>
+///
+/// class ATTRIBUTE_HIDDEN CExample
+/// {
+/// public:
+///   CExample() : m_timer([this](){TimerCall();})
+///   {
+///     m_timer.Start(5000, true); // let call continuously all 5 seconds
+///   }
+///
+///   void TimerCall()
+///   {
+///     fprintf(stderr, "Hello World\n");
+///   }
+///
+/// private:
+///   kodi::tools::CTimer m_timer;
+/// };
+/// ~~~~~~~~~~~~~
+///
+///@{
+class CTimer : protected CThread
+{
+public:
+  class ITimerCallback;
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Class constructor to pass individual other class as callback.
+  ///
+  /// @param[in] callback Child class of parent @ref ITimerCallback with
+  ///                     implemented function @ref ITimerCallback::OnTimeout().
+  ///
+  explicit CTimer(kodi::tools::CTimer::ITimerCallback* callback)
+    : CTimer(std::bind(&ITimerCallback::OnTimeout, callback))
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Class constructor to pass individual function as callback.
+  ///
+  /// @param[in] callback Function to pass as callback about timeout.
+  ///
+  /// **Callback function style:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// void TimerCallback()
+  /// {
+  /// }
+  /// ~~~~~~~~~~~~~
+  explicit CTimer(std::function<void()> const& callback) : m_callback(callback) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Class destructor.
+  ///
+  ~CTimer() override { Stop(true); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Start the timer by given time in milliseconds to make his call
+  /// by arrive of them.
+  ///
+  /// If interval is activated, it calls the associated callback function
+  /// continuously in the given interval.
+  ///
+  /// @param[in] timeout Timeout in milliseconds
+  /// @param[in] interval [opt] To run continuously if true, false only one time
+  ///                     and default
+  /// @return True if successfully done, false if not (callback missing,
+  ///         timeout = 0 or was already running.
+  ///
+  bool Start(uint64_t timeout, bool interval = false)
+  {
+    using namespace std::chrono;
+
+    if (m_callback == nullptr || timeout == 0 || IsRunning())
+      return false;
+
+    m_timeout = milliseconds(timeout);
+    m_interval = interval;
+
+    CreateThread();
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Stop the timer if it is active.
+  ///
+  /// @param[in] wait [opt] Wait until timer is stopped, false is default and
+  ///                 call unblocked
+  /// @return True if timer was active and was stopped, false if already was
+  ///         stopped.
+  ///
+  bool Stop(bool wait = false)
+  {
+    if (!IsRunning())
+      return false;
+
+    m_threadStop = true;
+    m_eventTimeout.notify_all();
+    StopThread(wait);
+
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Restart timer complete by stop and restart his thread again.
+  ///
+  /// @note Restart only possible as long the timer was running and not done his
+  /// work.
+  ///
+  /// @return True if start was successfully done, on error, or if was already
+  ///         finished returned as false
+  ///
+  bool Restart()
+  {
+    using namespace std::chrono;
+
+    if (!IsRunning())
+      return false;
+
+    Stop(true);
+    return Start(duration_cast<milliseconds>(m_timeout).count(), m_interval);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Restart the timer with new timeout without touch of his thread.
+  ///
+  /// @param[in] timeout Time as milliseconds to wait for next call
+  ///
+  void RestartAsync(uint64_t timeout)
+  {
+    using namespace std::chrono;
+
+    m_timeout = milliseconds(timeout);
+    const auto now = system_clock::now();
+    m_endTime = now.time_since_epoch() + m_timeout;
+    m_eventTimeout.notify_all();
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Check timer is still active to wait for next call.
+  ///
+  /// @return True if active, false if all his work done and no more running
+  ///
+  bool IsRunning() const { return CThread::IsRunning(); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Get elapsed time as floating point of timer as seconds.
+  ///
+  /// @return Elapsed time
+  ///
+  float GetElapsedSeconds() const { return GetElapsedMilliseconds() / 1000.0f; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief Get elapsed time as floating point of timer as milliseconds.
+  ///
+  /// @return Elapsed time
+  ///
+  float GetElapsedMilliseconds() const
+  {
+    using namespace std::chrono;
+
+    if (!IsRunning())
+      return 0.0f;
+
+    const auto now = system_clock::now();
+    return static_cast<float>(duration_cast<milliseconds>(now.time_since_epoch() - (m_endTime - m_timeout)).count());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_tools_CTimer_CB class ITimerCallback
+  /// @ingroup cpp_kodi_tools_CTimer
+  /// @brief **Callback class of timer**\n
+  /// To give on contructor by @ref CTimer(kodi::tools::CTimer::ITimerCallback* callback)
+  ///
+  class ITimerCallback
+  {
+  public:
+    //==========================================================================
+    /// @ingroup cpp_kodi_tools_CTimer_CB
+    /// @brief Class destructor.
+    ///
+    virtual ~ITimerCallback() = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_tools_CTimer_CB
+    /// @brief Callback function to implement if constuctor @ref CTimer(kodi::tools::CTimer::ITimerCallback* callback)
+    /// is used and this as parent on related class
+    ///
+    /// ----------------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    /// #include <kodi/tools/Timer.h>
+    ///
+    /// class CExample : public kodi::tools::CTimer,
+    ///                  private kodi::tools::CTimer::ITimerCallback
+    /// {
+    /// public:
+    ///   CExample() : kodi::tools::CTimer(this)
+    ///   {
+    ///   }
+    ///
+    ///   void OnTimeout() override
+    ///   {
+    ///     // Some work
+    ///   }
+    /// };
+    ///
+    /// ~~~~~~~~~~~~~
+    ///
+    virtual void OnTimeout() = 0;
+    //--------------------------------------------------------------------------
+  };
+  //----------------------------------------------------------------------------
+
+protected:
+  void Process() override
+  {
+    using namespace std::chrono;
+
+    while (!m_threadStop)
+    {
+      auto currentTime = system_clock::now();
+      m_endTime = currentTime.time_since_epoch() + m_timeout;
+
+      // wait the necessary time
+      std::mutex mutex;
+      std::unique_lock<std::mutex> lock(mutex);
+      const auto waitTime = duration_cast<milliseconds>(m_endTime - currentTime.time_since_epoch());
+      if (m_eventTimeout.wait_for(lock, waitTime) == std::cv_status::timeout)
+      {
+        currentTime = system_clock::now();
+        if (m_endTime.count() <= currentTime.time_since_epoch().count())
+        {
+          // execute OnTimeout() callback
+          m_callback();
+
+          // continue if this is an interval timer, or if it was restarted during callback
+          if (!m_interval && m_endTime.count() <= currentTime.time_since_epoch().count())
+            break;
+        }
+      }
+    }
+  }
+
+private:
+  bool m_interval = false;
+  std::function<void()> m_callback;
+  std::chrono::system_clock::duration m_timeout;
+  std::chrono::system_clock::duration m_endTime;
+  std::condition_variable_any m_eventTimeout;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-dev-kit/include/kodi/versions.h
index 041e22b..e632f5a 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/versions.h
@@ -46,10 +46,11 @@
 #define ADDON_GLOBAL_VERSION_GENERAL_XML_ID           "kodi.binary.global.general"
 #define ADDON_GLOBAL_VERSION_GENERAL_DEPENDS          "General.h"
 
-#define ADDON_GLOBAL_VERSION_GUI                      "5.14.1"
-#define ADDON_GLOBAL_VERSION_GUI_MIN                  "5.14.0"
+#define ADDON_GLOBAL_VERSION_GUI                      "5.15.0"
+#define ADDON_GLOBAL_VERSION_GUI_MIN                  "5.15.0"
 #define ADDON_GLOBAL_VERSION_GUI_XML_ID               "kodi.binary.global.gui"
-#define ADDON_GLOBAL_VERSION_GUI_DEPENDS              "ActionIDs.h" \
+#define ADDON_GLOBAL_VERSION_GUI_DEPENDS              "c-api/gui/input/action_ids.h" \
+                                                      "c-api/gui/" \
                                                       "gui/"
 
 #define ADDON_GLOBAL_VERSION_AUDIOENGINE              "1.1.1"
@@ -58,7 +59,7 @@
 #define ADDON_GLOBAL_VERSION_AUDIOENGINE_DEPENDS      "AudioEngine.h" \
                                                       "c-api/audio_engine.h"
 
-#define ADDON_GLOBAL_VERSION_FILESYSTEM               "1.1.4"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM               "1.1.6"
 #define ADDON_GLOBAL_VERSION_FILESYSTEM_MIN           "1.1.0"
 #define ADDON_GLOBAL_VERSION_FILESYSTEM_XML_ID        "kodi.binary.global.filesystem"
 #define ADDON_GLOBAL_VERSION_FILESYSTEM_DEPENDS       "Filesystem.h" \
@@ -72,23 +73,29 @@
 #define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h" \
                                                       "c-api/network.h"
 
-#define ADDON_GLOBAL_VERSION_TOOLS                    "1.0.1"
+#define ADDON_GLOBAL_VERSION_TOOLS                    "1.0.4"
 #define ADDON_GLOBAL_VERSION_TOOLS_MIN                "1.0.0"
 #define ADDON_GLOBAL_VERSION_TOOLS_XML_ID             "kodi.binary.global.tools"
-#define ADDON_GLOBAL_VERSION_TOOLS_DEPENDS            "tools/DllHelper.h"
-
-#define ADDON_INSTANCE_VERSION_AUDIODECODER           "2.0.2"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "2.0.1"
+#define ADDON_GLOBAL_VERSION_TOOLS_DEPENDS            "tools/DllHelper.h" \
+                                                      "tools/EndTime.h" \
+                                                      "tools/StringUtils.h" \
+                                                      "tools/Thread.h" \
+                                                      "tools/Timer.h"
+
+#define ADDON_INSTANCE_VERSION_AUDIODECODER           "3.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "3.0.0"
 #define ADDON_INSTANCE_VERSION_AUDIODECODER_XML_ID    "kodi.binary.instance.audiodecoder"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "addon-instance/AudioDecoder.h"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "c-api/addon-instance/audio_decoder.h" \
+                                                      "addon-instance/AudioDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.0.2"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.1.0"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.1.0"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "c-api/addon-instance/audio_encoder.h" \
+                                                      "addon-instance/AudioEncoder.h"
 
-#define ADDON_INSTANCE_VERSION_GAME                   "2.0.2"
-#define ADDON_INSTANCE_VERSION_GAME_MIN               "2.0.1"
+#define ADDON_INSTANCE_VERSION_GAME                   "2.1.0"
+#define ADDON_INSTANCE_VERSION_GAME_MIN               "2.1.0"
 #define ADDON_INSTANCE_VERSION_GAME_XML_ID            "kodi.binary.instance.game"
 #define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "addon-instance/Game.h"
 
@@ -97,13 +104,13 @@
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.3.3"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.3.1"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.3.4"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.3.4"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
 
-#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.9"
-#define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.8"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL             "2.0.0"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "2.0.0"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
                                                       "addon-instance/PeripheralUtils.h"
@@ -133,23 +140,26 @@
                                                       "addon-instance/pvr/Stream.h" \
                                                       "addon-instance/pvr/Timers.h"
 
-#define ADDON_INSTANCE_VERSION_SCREENSAVER            "2.0.2"
-#define ADDON_INSTANCE_VERSION_SCREENSAVER_MIN        "2.0.1"
+#define ADDON_INSTANCE_VERSION_SCREENSAVER            "2.1.0"
+#define ADDON_INSTANCE_VERSION_SCREENSAVER_MIN        "2.1.0"
 #define ADDON_INSTANCE_VERSION_SCREENSAVER_XML_ID     "kodi.binary.instance.screensaver"
-#define ADDON_INSTANCE_VERSION_SCREENSAVER_DEPENDS    "addon-instance/Screensaver.h"
+#define ADDON_INSTANCE_VERSION_SCREENSAVER_DEPENDS    "c-api/addon-instance/screensaver.h" \
+                                                      "addon-instance/Screensaver.h"
 
-#define ADDON_INSTANCE_VERSION_VFS                    "2.3.2"
-#define ADDON_INSTANCE_VERSION_VFS_MIN                "2.3.1"
+#define ADDON_INSTANCE_VERSION_VFS                    "3.0.0"
+#define ADDON_INSTANCE_VERSION_VFS_MIN                "3.0.0"
 #define ADDON_INSTANCE_VERSION_VFS_XML_ID             "kodi.binary.instance.vfs"
-#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "addon-instance/VFS.h"
+#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "c-api/addon-instance/vfs.h" \
+                                                      "addon-instance/VFS.h"
 
-#define ADDON_INSTANCE_VERSION_VISUALIZATION          "2.0.4"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "2.0.3"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION          "3.0.0"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "3.0.0"
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_XML_ID   "kodi.binary.instance.visualization"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "addon-instance/Visualization.h"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "addon-instance/Visualization.h" \
+                                                      "c-api/addon-instance/visualization.h"
 
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.3"
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.2"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.4"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.4"
 #define ADDON_INSTANCE_VERSION_VIDEOCODEC_XML_ID      "kodi.binary.instance.videocodec"
 #define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "addon-instance/VideoCodec.h" \
                                                       "StreamCodec.h" \