73 files changed, 12729 insertions, 3190 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/.gitignore b/xbmc/addons/kodi-addon-dev-kit/.gitignore
new file mode 100644
index 0000000..039c6a7
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/.gitignore
@@ -0,0 +1,31 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+/docs
+/build
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
new file mode 100644
index 0000000..184b34e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -0,0 +1,2532 @@
+# Doxyfile 1.8.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Kodi Development"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 17.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "for Binary (API Level 2) and Script based Add-Ons"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ./kodi-dev.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = .
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = "table_start=<table width= 100% style= border bgcolor= 576f9f border= 0>" \
+                         "table_end=</table>" \
+                         "table_h2_l{2}=<tr bgcolor= 576f9f><th width= 40% align=left>\1</th><th width= 60% align=left>\2</th></tr>" \
+                         "table_row2_l{2}=<tr bgcolor=white><td width= 40% align=left>\1</td><td width= 60% align=left>\2</td></tr>" \
+                         "table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
+                         "table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>" \
+                         "python_func{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+                         "python_func_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style="float:right;"><small>\2</small></span></h4> \endhtmlonly" \
+                         "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+                         "python_class_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style="float:right;"><small>\2</small></span></h4> \endhtmlonly" \
+                         "doc_header{1}=\htmlonly <h3><span style=\"text-decoration: underline;\"><span  style=\"font-style: italic;\"><span style=\"color: rgb(102, 102, 102);\">\1</span></span></span></h3> \endhtmlonly" \
+                         "python_v12=\xrefitem python_v12 \"v12 Python API changes\" \"\"" \
+                         "python_v13=\xrefitem python_v13 \"v13 Python API changes\" \"\"" \
+                         "python_v14=\xrefitem python_v14 \"v14 Python API changes\" \"\"" \
+                         "python_v15=\xrefitem python_v15 \"v15 Python API changes\" \"\"" \
+                         "python_v16=\xrefitem python_v16 \"v16 Python API changes\" \"\"" \
+                         "python_v17=\xrefitem python_v17 \"v17 Python API changes\" \"\"" \
+                         "python_v18=\xrefitem python_v18 \"v18 Python API changes\" \"\""
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = NO
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = YES
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = NO
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = DoxygenLayout.xml
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = main.txt \
+                         General/General.dox \
+                         General/DoxygenOnAddon.dox \
+                         ../../../../CODING_GUIDELINES.dox \
+                         ../../../GUIInfoManager.cpp \
+                         Modules/modules_general.dox \
+                         Modules/modules_python.dox \
+                         Skin/skin.dox \
+                         ../../../guilib/GUIRenderingControl.dox \
+                         ../../../guilib/GUIButtonControl.dox \
+                         ../../../guilib/GUIEditControl.dox \
+                         ../../../epg/GUIEPGGridContainer.dox \
+                         ../../../guilib/GUIFadeLabelControl.dox \
+                         ../../../guilib/GUIFixedListContainer.dox \
+                         ../../../guilib/GUIControlGroup.dox \
+                         ../../../guilib/GUIListContainer.dox \
+                         ../../../guilib/GUIImage.dox \
+                         ../../../guilib/GUILabelControl.dox \
+                         ../../../guilib/GUIListGroup.dox \
+                         ../../../guilib/GUIMoverControl.dox \
+                         ../../../guilib/GUIMultiImage.dox \
+                         ../../../guilib/GUIPanelContainer.dox \
+                         ../../../guilib/GUIProgressControl.dox \
+                         ../../../guilib/GUIRadioButtonControl.dox \
+                         ../../../guilib/GUIResizeControl.dox \
+                         ../../../guilib/GUIRSSControl.dox \
+                         ../../../guilib/GUIScrollBarControl.dox \
+                         ../../../guilib/GUISettingsSliderControl.dox \
+                         ../../../guilib/GUISpinControlEx.dox \
+                         ../../../guilib/GUISliderControl.dox \
+                         ../../../guilib/GUISpinControl.dox \
+                         ../../../guilib/GUITextBox.dox \
+                         ../../../guilib/GUIToggleButtonControl.dox \
+                         ../../../guilib/GUIVideoControl.dox \
+                         ../../../guilib/GUIVisualisationControl.dox \
+                         ../../../guilib/GUIWrappingListContainer.dox \
+                         ../../../guilib/_Controls.dox \
+                         ../../../interfaces/builtins/AddonBuiltins.cpp \
+                         ../../../interfaces/builtins/AndroidBuiltins.cpp \
+                         ../../../interfaces/builtins/ApplicationBuiltins.cpp \
+                         ../../../interfaces/builtins/CECBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIContainerBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIControlBuiltins.cpp \
+                         ../../../interfaces/builtins/LibraryBuiltins.cpp \
+                         ../../../interfaces/builtins/OpticalBuiltins.cpp \
+                         ../../../interfaces/builtins/PictureBuiltins.cpp \
+                         ../../../interfaces/builtins/PlayerBuiltins.cpp \
+                         ../../../interfaces/builtins/ProfileBuiltins.cpp \
+                         ../../../interfaces/builtins/PVRBuiltins.cpp \
+                         ../../../interfaces/builtins/SkinBuiltins.cpp \
+                         ../../../interfaces/builtins/SystemBuiltins.cpp \
+                         ../../../interfaces/builtins/WeatherBuiltins.cpp \
+                         ../../../interfaces/legacy/Keyboard.h \
+                         ../../../interfaces/legacy/InfoTagMusic.h \
+                         ../../../interfaces/legacy/InfoTagVideo.h \
+                         ../../../interfaces/legacy/Addon.h \
+                         ../../../interfaces/legacy/Dialog.h \
+                         ../../../interfaces/legacy/ModuleXbmc.h \
+                         ../../../interfaces/legacy/ModuleXbmcgui.h \
+                         ../../../interfaces/legacy/File.h \
+                         ../../../interfaces/legacy/ListItem.h \
+                         ../../../interfaces/legacy/Monitor.h \
+                         ../../../interfaces/legacy/ModuleXbmcvfs.h \
+                         ../../../interfaces/legacy/ModuleXbmcplugin.h \
+                         ../../../interfaces/legacy/InfoTagRadioRDS.h \
+                         ../../../interfaces/legacy/Window.h \
+                         ../../../interfaces/legacy/WindowDialog.h \
+                         ../../../interfaces/legacy/WindowXML.h \
+                         ../../../interfaces/legacy/Stat.h \
+                         ../../../interfaces/legacy/PlayList.h \
+                         ../../../interfaces/legacy/Player.h \
+                         ../../../interfaces/legacy/RenderCapture.h \
+                         ../../../interfaces/legacy/Control.h \
+                         ../../../interfaces/legacy/wsgi/WsgiErrorStream.h \
+                         ../../../interfaces/legacy/wsgi/WsgiInputStream.h \
+                         ../../../interfaces/legacy/wsgi/WsgiResponseBody.h \
+                         ../../../interfaces/legacy/wsgi/WsgiResponse.h \
+                         ../../../pictures/PictureInfoTag.cpp
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.as \
+                         *.js \
+                         *.GPL
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = .
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = .
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = LICENSE.GPL
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             = 
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
+                         DOXYGEN_SHOULD_USE_THIS
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               = 
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           = 
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      = 
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml b/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml
new file mode 100644
index 0000000..f0d9268
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/DoxygenLayout.xml
@@ -0,0 +1,207 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.9.1 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
+    <tab type="modules" visible="yes" title="Language Development" intro=""/>
+<!--    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="yes" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>-->
+    <tab type="files" visible="yes" title="">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>
+    <tab type="usergroup" title="Older versions">
+      <tab type="user" url="http://mirrors.kodi.tv/docs/python-docs/16.x-jarvis/" title="Kodi 16.x Jarvis"/>
+      <tab type="user" url="http://mirrors.kodi.tv/docs/python-docs/15.x-isengard/" title="Kodi 15.x Isengard"/>
+      <tab type="user" url="http://mirrors.kodi.tv/docs/python-docs/14.x-helix/" title="Kodi 14.x Helix"/>
+      <tab type="user" url="http://mirrors.kodi.tv/docs/python-docs/13.0-gotham/" title="XBMC 13.x Gotham"/>
+      <tab type="user" url="http://mirrors.kodi.tv/docs/python-docs/12.2-frodo/" title="XBMC 12.x Frodo"/>
+    </tab>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+<!--    <detaileddescription title=""/> -->
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+<!--    <detaileddescription title=""/> -->
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+<!--    <detaileddescription title=""/> -->
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+<!--    <briefdescription visible="yes"/> -->
+    <detaileddescription title=""/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+<!--      <classes visible="yes" title=""/> -->
+      <defines title=""/>
+      <typedefs title=""/>
+<!--      <enums title=""/> -->
+      <enumvalues title=""/>
+<!--      <functions title=""/> -->
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+<!--      <membergroups visible="yes"/>-->
+    </memberdecl>
+<!--    <detaileddescription title=""/> -->
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <detaileddescription title=""/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+<!--    <detaileddescription title=""/> -->
+  </directory>
+
+</doxygenlayout>
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox
new file mode 100644
index 0000000..7502e5e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/DoxygenOnAddon.dox
@@ -0,0 +1,90 @@
+/*!
+
+@page Doxygen_On_Addon Doxygen on Kodi's Add-On headers
+
+### This page is for notes on using Doxygen to document the Kodi's Add-On headers source code.
+
+[Doxygen](http://www.stack.nl/~dimitri/doxygen/index.html), is a documentation
+system for C++, C, Java, and some other weird languages. It can generate html
+docs documenting a projects source code, by either extracting special tags from
+the source code (put there by people wanting to make use of doxygen), or doxygen
+attempts to build documentation from existing source.
+
+Doxygen seems to be installed on the NMR systems, type:
+~~~~~~~~~~~~~
+doxygen --version
+~~~~~~~~~~~~~
+
+
+_ _ _
+
+Start doxygen documentation for add-ons always with `///` and on Kodi itself with `/*!`, this makes it more easy to see for which place the documentation is.
+
+<b>Here an example on add-on about function coding style:</b>
+
+\verbatim
+#ifdef DOXYGEN_SHOULD_USE_THIS
+  ///
+  /// \ingroup python_xbmcgui_window
+  /// @brief Sets the resolution
+  ///
+  /// That the coordinates of all controls are defined in.  Allows Kodi
+  /// to scale control positions and width/heights to whatever resolution
+  /// Kodi is currently using.
+  ///
+  /// @param[in] res                Coordinate resolution to set
+  ///  Resolution is one of the following:
+  ///  | value | Resolution                |
+  ///  |:-----:|:--------------------------|
+  ///  |   0   | 1080i      (1920x1080)
+  ///  |   1   | 720p       (1280x720)
+  ///  |   2   | 480p 4:3   (720x480)
+  ///  |   3   | 480p 16:9  (720x480)
+  ///  |   4   | NTSC 4:3   (720x480)
+  ///  |   5   | NTSC 16:9  (720x480)
+  ///  |   6   | PAL 4:3    (720x576)
+  ///  |   7   | PAL 16:9   (720x576)
+  ///  |   8   | PAL60 4:3  (720x480)
+  ///  |   9   | PAL60 16:9 (720x480)
+  /// @return                       Nothing only added as example here :)
+  /// @param[out] nothingExample    Example here, if on value pointer data becomes
+  ///                               returned.
+  /// @throws TypeError             If supplied argument is not of List type, or a
+  ///                               control is not of Control type
+  /// @throws ReferenceError        If control is already used in another window
+  /// @throws RuntimeError          Should not happen :-)
+  ///
+  ///
+  ///--------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.py}
+  /// ..
+  /// win = xbmcgui.Window(xbmcgui.getCurrentWindowId())
+  /// win.setCoordinateResolution(0)
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  setCoordinateResolution(...);
+#else
+  SWIGHIDDENVIRTUAL bool setCoordinateResolution(long res, int &nothingExample);
+#endif
+\endverbatim
+- \verbatim /// \ingroup\endverbatim - Define the group where the documentation part comes in.
+- \verbatim /// @brief\endverbatim - Add a small text of part there.
+- \verbatim /// TEXT_FIELD\endverbatim - Add a bigger text there if needed.
+- \verbatim /// @param[in] VALUE_NAME                 VALUE_TEXT\endverbatim - To set input parameter defined by name and add a description. There the example also add a small table which is useful to describe values.
+- \verbatim /// @param[out] VALUE_NAME                VALUE_TEXT\endverbatim - To set output parameter defined by name and add a description.
+- \verbatim /// @return                               VALUE_TEXT\endverbatim - To add a description of return value.
+- \verbatim /// @throws ERROR_TYPE                    ERROR_TEXT\endverbatim - If also exception becomes handled, can you use this for description.
+- \verbatim /// TEXT_FIELD\endverbatim - Add a much bigger text there if needed.
+- \verbatim /// ------------------\endverbatim - Use this to define a field line, e.g. if you add example add this always before, further must you make two empty lines before to prevent add of them on string before!
+- \verbatim /// ~~~~~~~~~~~~~ \endverbatim - Here can you define a code example which must start and end with the defination string, also can you define the code style with e.g. <b>{.py}</b> for Python or <b>{.cpp}</b> for CPP code on the first line of them.
+
+@note Start all `VALUE_TEXT` at same character to hold a clean code on <c>*.cpp</c> or <c>*.h</c> files.\n\n
+      The `#ifdef DOXYGEN_SHOULD_USE_THIS` on example above can be becomes used
+      if for Doxygen another function is needed to describe.
+
+If you want to prevent a part from doxygen can you define <b>`#ifndef DOXYGEN_SHOULD_SKIP_THIS`</b>
+or <b>`#ifdef DOXYGEN_SHOULD_USE_THIS`</b> on the related code.
+*/
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/General/General.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/General.dox
new file mode 100644
index 0000000..ef7ccf0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/General/General.dox
@@ -0,0 +1,29 @@
+/*!
+
+\page general General
+\brief \doc_header{ General descriptions }
+
+The used code guidelines from Kodi
+@note Is not direct needed on C++ add-ons but makes it more easy for reviews and
+changes from the others.
+
+\subpage code_guidelines
+
+--------------------------------------------------------------------------------
+
+Guideline for Kodi's developers to create documentation
+
+\subpage Doxygen_On_Addon
+
+*/
+
+---------------------------------------------------------------------------------
+
+@subpage revisions "Revisions against older versions"
+*/
+
+/*!
+\page revisions Revisions
+
+\subpage python_revisions
+*/
\ No newline at end of file
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png
new file mode 100644
index 0000000..26867b0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox
new file mode 100644
index 0000000..481a0db
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox
@@ -0,0 +1,8 @@
+/*!
+
+\page general_parts General Development parts
+\brief \doc_header{ General Add-On Development parts }
+
+\subpage modules__General__List_of_gui_access
+\subpage page_List_of_built_in_functions
+*/
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox
new file mode 100644
index 0000000..2812c8a
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_python.dox
@@ -0,0 +1,179 @@
+/*!
+
+
+\defgroup python Python
+\image html logo-python.png
+\brief \htmlonly
+      <h3><span  style="text-decoration: underline;"><span  style="font-style: italic;"><span
+               style="color: rgb(102, 102, 102);">Python Script Add-On Development</span></span></span></h3>
+       \endhtmlonly
+
+Kodi includes a built-in [Python interpreter](http://en.wikipedia.org/wiki/Python_%28programming_language%29)
+that allows users to develop add-ons (scripts and plugins) that interface easily
+and cleanly with the Kodi dashboard. These add-ons can extend the functionality
+of Kodi without requiring extensive programming experience or ability. While you
+may not feel comfortable browsing the Kodi source code and submitting patches (or
+even bug reports), you can learn how to write a script or plugin with just a few
+hours' practice, using the information available in these pages.
+
+This page is intended as an introduction to Kodi Python for new developers, and
+a quick reference for more experienced programmers. If you're not interested in
+programming, you might want to visit [this page](http://kodi.wiki/view/Add-ons)
+for information about installing and using Python add-ons as an end user. If
+you're already familiar with Kodi Python, you can probably skip on down to the
+[environment details](http://kodi.wiki/view/Python_Development#Environment_details)
+or the [resource links](http://kodi.wiki/view/Python_Development#Resource_links)
+below for quick reference material.
+
+_ _ _
+
+Built-in modules
+----------------
+
+In addition to the standard libraries, Kodi [Python](https://www.python.org/)
+uses a handful of custom modules to expose Kodi functionality to Python.
+
+| Module                              | Description                                                |
+|------------------------------------:|:-----------------------------------------------------------|
+| \ref python_xbmc       "xbmc"       | Offers classes and functions that provide information about the media currently playing and that allow manipulation of the media player (such as starting a new song). You can also find system information using the functions available in this library.
+| \ref python_xbmcgui    "xbmcgui"    | Offers classes and functions that manipulate the Graphical User Interface through windows, dialogs, and various control widgets.
+| \ref python_xbmcplugin "xbmcplugin" | Offers classes and functions that allow a developer to present information through Kodi's standard menu structure. While plugins don't have the same flexibility as scripts, they boast significantly quicker development time and a more consistent user experience.
+| \ref python_xbmcaddon  "xbmcaddon"  | Offers classes and functions that manipulate the add-on settings, information and localization.
+| \ref python_xbmcvfs    "xbmcvfs"    | Offers classes and functions offers access to the Virtual File Server (VFS) which you can use to manipulate files and folders.
+| \ref python_xbmcwsgi   "xbmcwsgi"   | The [<b>Web Server Gateway Interface (WSGI)</b>](https://en.wikipedia.org/wiki/Web_Server_Gateway_Interface) is a specification for simple and universal interface between web servers and web applications or frameworks for the Python programming language.
+
+_ _ _
+
+Installing additional modules
+----------------
+
+Additional modules may be installed by simply adding the module to the root
+folder of your add-on.
+
+A common way to organized third-party modules that are not part of add-on source
+code itself, is to add a lib directory and place an __init__.py file and other
+third-party modules inside it. These modules may then normally be imported using
+from lib import some module.
+
+_ _ _
+
+Python plugins versus scripts
+----------------
+
+Please do not confuse "Plugins" with "Scripts". Unlike the Scripts, Plugins are
+not meant to be directly invoked by the user. Instead, Plugins are automatically
+invoked when the user enters such a virtual folder. Do not try to run Plugins
+files from the scripts window as that will only give you a weird error message.
+Plugins, unlike Scripts, do not really provide new functionality to Kodi,
+instead what they do do is provide an easy way to present content listings in
+Kodi through the native GUI interface.
+
+_ _ _
+
+Script development
+----------------
+
+If you're new to Python programming (or just new to Kodi Python), the easiest
+way to get started is with a script. The traditional Hello World program,
+written as an Kodi Python script, would look like this:
+~~~~~~~~~~~~~{.py}
+print("Hello World!")
+~~~~~~~~~~~~~
+That's the same code you would enter at the Python command line, because Kodi
+runs a full-featured, standard Python interpreter (for more information
+concerning the current version number and included modules see the environment
+details below). If you're already familiar with Python programming, the only new
+challenge is learning the custom modules that allow you to gather information
+from Kodi and manipulate the Graphical User Interface (GUI).
+
+There are some excellent tutorials available to introduce you to Kodi scripting
+(and Python in general). See the [HOW-TO](http://kodi.wiki/view/HOW-TO_write_Python_Scripts)
+included in the Kodi Online Manual, or visit Alexpoet's Kodi Scripting site for
+a popular beginner's tutorial (PDF).
+
+_ _ _
+Plugin development
+----------------
+
+While scripts offer you flexibility and full control over the Kodi GUI, plugins
+allow you to quickly and consistently present information to the user through
+the standard Kodi menu structure.
+
+When a user launches a plugin, the plugin generates a list of menu items and
+hands them to Kodi to draw on the screen (regardless of screen resolution, skin,
+or any other user setting). While plugin developers lose some amount of control
+over the presentation, they no longer have to make up their own UIs, or worry
+about creating a usable look and feel across multiple displays.
+
+Plugins are most commonly used to scrape websites for links to streaming videos,
+displaying the video list in Kodi just like it would movie files on the local
+hard drive, but a plugin can be used anywhere a script could, as long as the
+menu structure is a sufficient GUI for the add-on's needs.
+
+Also, note that a script can launch a plugin, and a plugin can launch a script
+(and, for that matter, it can call all the same functions available to a script)
+so the distinction is more theoretical than practical.
+
+
+@{
+\ingroup python
+\defgroup python_xbmc Library - xbmc
+
+\ingroup python
+\defgroup python_xbmcgui Library - xbmcgui
+
+\ingroup python
+\defgroup python_xbmcplugin Library - xbmcplugin
+
+\ingroup python
+\defgroup python_xbmcaddon Library - xbmcaddon
+
+\ingroup python
+\defgroup python_xbmcvfs Library - xbmcvfs
+
+\ingroup python
+\defgroup python_xbmcwsgi Library - xbmcwsgi
+@brief **Web Server Gateway Interface**
+
+The [<b>Web Server Gateway Interface (WSGI)</b>](https://en.wikipedia.org/wiki/Web_Server_Gateway_Interface)
+is a specification for simple and universal interface between web servers and
+web applications or frameworks for the Python programming language.
+@}
+
+*/
+
+/*!
+@page python_v12 Python API v12
+*/
+/*!
+@page python_v13 Python API v13
+*/
+/*!
+@page python_v14 Python API v14
+*/
+/*!
+@page python_v15 Python API v15
+*/
+/*!
+@page python_v16 Python API v16
+*/
+/*!
+@page python_v17 Python API v17
+*/
+/*!
+@page python_v18 Python API v18
+*/
+
+/*!
+@page python_revisions Python API Changes
+@brief Overview of changes on Python API for Kodi
+
+- @subpage python_v12
+- @subpage python_v13
+- @subpage python_v14
+- @subpage python_v15
+- @subpage python_v16
+- @subpage python_v17
+- @subpage python_v18
++*/
+  
\ No newline at end of file
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox
new file mode 100644
index 0000000..4bb26fb
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox
@@ -0,0 +1,24 @@
+/*!
+
+\page skin_parts Skin Development
+@brief \doc_header{ Skin Add-On Development }
+
+Kodi includes a GUI library that allows you to skin/change everything you see.
+The images, sizes and positions of controls, colours, fonts, text, through to
+altering navigation and even adding new functionality.
+
+The skin system is quite complex. This portion of the manual is dedicated to
+providing in depth information on how it all works. It contains tips to make the
+experience a little more pleasant.
+
+If you are just getting started with skinning Kodi, then it is suggested that the
+best way to learn is by modifying one of the many existing skins that are
+available. The default skin, Estuary, includes almost all the various tricks
+and features that make the Kodi skinning engine so powerful, so is an ideal place
+to start. You may wish to start by having a look through the tutorial section on
+skinning Kodi as well as the "Skinning Kodi" article, and try modifying a window
+or two by adding a button, or altering the textures or layout.
+
+- \subpage skin_controls - Controls are the substance of your skin.
+
+*/
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png b/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png
new file mode 100644
index 0000000..e513ef2
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt b/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt
new file mode 100644
index 0000000..7eddbf8
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt
@@ -0,0 +1,49 @@
+/*!
+
+@mainpage
+
+### Welcome to the Documentation of Kodi for Add-On Development.
+
+__Kodi®__ media center, formerly known as XBMC Media Center, is a free and
+open-source media player software developed by the XBMC Foundation, a non-profit
+technology consortium. Kodi is available for multiple operating systems and
+hardware platforms, with a software 10-foot user interface for use with
+televisions and remote controls. It allows users to play and view most videos,
+music, such as audio and video podcasts from the internet, and all common
+digital media files from local and network storage media.
+
+Add-ons are extensions that can be run from inside the Kodi GUI and in
+addition to binary add-ons for the use of different systems. They are usual
+written by third party developers and published to our official repository.
+Add-ons can also be published in other repositories or as stand alone zip
+files anywhere on the internet. Examples of Add-ons include video website
+streams, scrapers, skins and scripts.
+
+#### Supported systems
+
+Currently support Kodi Add-Ons based upon Python and C++.
+
+#### Tutorials and Examples
+
+In the distribution of the library  you find the two directories *tutorials*
+and *examples*. They contain subdirectories for the packages...
+The demos use third party libraries for the graphical user interface. The
+examples don't have this dependency and most examples are refered to in the
+user manual.
+
+#### License
+
+Kodi is distributed under a [GNU General Public License version 2](./LICENSE.GPL).
+
+\htmlonly
+<div style="display:none">
+\endhtmlonly
+
+\subpage general
+\subpage general_parts
+
+\htmlonly
+</div>
+\endhtmlonly
+
+*/
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/NOTE b/xbmc/addons/kodi-addon-dev-kit/include/NOTE
new file mode 100644
index 0000000..c375cd8
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/NOTE
@@ -0,0 +1,15 @@
+NOTE:
+
+This directory contains independent Headers to build Add-on's
+without the whole Kodi source tree. The Add-on itself can add
+this headers to his source tree without dependencies to any
+Kodi related classes or functions.
+
+Also this headers are never changed without a API Version
+change.
+
+The current PVR API version can be found in xbmc_pvr_types.h:
+XBMC_PVR_API_VERSION
+
+The current audio DSP API version can be found in kodi_adsp_types.h:
+KODI_AE_DSP_API_VERSION
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
new file mode 100644
index 0000000..fdf030b
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
@@ -0,0 +1,634 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdarg.h>     /* va_list, va_start, va_arg, va_end */
+#include <cstdlib>
+#include <cstring>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#ifndef TARGET_WINDOWS
+#ifndef __cdecl
+#define __cdecl
+#endif
+#ifndef __declspec
+#define __declspec(X)
+#endif
+#endif
+
+#undef ATTRIBUTE_PACKED
+#undef PRAGMA_PACK_BEGIN
+#undef PRAGMA_PACK_END
+
+#if defined(__GNUC__)
+  #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+    #define ATTRIBUTE_PACKED __attribute__ ((packed))
+    #define PRAGMA_PACK 0
+  #endif
+#endif
+
+#if !defined(ATTRIBUTE_PACKED)
+  #define ATTRIBUTE_PACKED
+  #define PRAGMA_PACK 1
+#endif
+
+#include "versions.h"
+
+namespace kodi { namespace addon { class CAddonBase; }}
+namespace kodi { namespace addon { class IAddonInstance; }}
+
+extern "C" {
+
+//==============================================================================
+/// Standard undefined pointer handle
+typedef void* KODI_HANDLE;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+///
+typedef enum ADDON_STATUS
+{
+  ///
+  ADDON_STATUS_OK,
+
+  ///
+  ADDON_STATUS_LOST_CONNECTION,
+
+  ///
+  ADDON_STATUS_NEED_RESTART,
+
+  ///
+  ADDON_STATUS_NEED_SETTINGS,
+
+  ///
+  ADDON_STATUS_UNKNOWN,
+
+  ///
+  ADDON_STATUS_NEED_SAVEDSETTINGS,
+
+  /// permanent failure, like failing to resolve methods
+  ADDON_STATUS_PERMANENT_FAILURE,
+
+  /* internal used return error if function becomes not used from child on
+   * addon */
+  ADDON_STATUS_NOT_IMPLEMENTED
+} ADDON_STATUS;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @todo remove start with ADDON_* after old way on libXBMC_addon.h is removed
+///
+typedef enum AddonLog
+{
+  ///
+  ADDON_LOG_DEBUG = 0,
+
+  ///
+  ADDON_LOG_INFO = 1,
+
+  ///
+  ADDON_LOG_NOTICE = 2,
+
+  ///
+  ADDON_LOG_WARNING = 3,
+
+  ///
+  ADDON_LOG_ERROR = 4,
+
+  ///
+  ADDON_LOG_SEVERE = 5,
+
+  ///
+  ADDON_LOG_FATAL = 6
+} AddonLog;
+//------------------------------------------------------------------------------
+
+/*!
+ * @brief Handle used to return data from the PVR add-on to CPVRClient
+ */
+struct ADDON_HANDLE_STRUCT
+{
+  void *callerAddress;  /*!< address of the caller */
+  void *dataAddress;    /*!< address to store data in */
+  int   dataIdentifier; /*!< parameter to pass back when calling the callback */
+};
+typedef ADDON_HANDLE_STRUCT *ADDON_HANDLE;
+
+/*
+ * To have a on add-on and kodi itself handled string always on known size!
+ */
+#define ADDON_STANDARD_STRING_LENGTH 1024
+#define ADDON_STANDARD_STRING_LENGTH_SMALL 256
+
+/*
+ * Callback function tables from addon to Kodi
+ * Set complete from Kodi!
+ */
+struct AddonToKodiFuncTable_kodi;
+struct AddonToKodiFuncTable_kodi_audioengine;
+struct AddonToKodiFuncTable_kodi_filesystem;
+struct AddonToKodiFuncTable_kodi_network;
+struct AddonToKodiFuncTable_kodi_gui;
+typedef struct AddonToKodiFuncTable_Addon
+{
+  // Pointer inside Kodi, used on callback functions to give related handle
+  // class, for this ADDON::CAddonDll inside Kodi.
+  KODI_HANDLE kodiBase;
+
+  // Function addresses used for callbacks from addon to Kodi
+  void (*free_string)(void* kodiBase, char* str);
+  char* (*get_addon_path)(void* kodiBase);
+  char* (*get_base_user_path)(void* kodiBase);
+  void (*addon_log_msg)(void* kodiBase, const int loglevel, const char *msg);
+  bool (*get_setting)(void* kodiBase, const char* settingName, void *settingValue);
+  bool (*set_setting)(void* kodiBase, const char* settingName, const char* settingValue);
+
+  AddonToKodiFuncTable_kodi* kodi;
+  AddonToKodiFuncTable_kodi_audioengine* kodi_audioengine;
+  AddonToKodiFuncTable_kodi_filesystem* kodi_filesystem;
+  AddonToKodiFuncTable_kodi_gui* kodi_gui;
+  AddonToKodiFuncTable_kodi_network *kodi_network;
+} AddonToKodiFuncTable_Addon;
+
+/*
+ * Function tables from Kodi to addon
+ */
+typedef struct KodiToAddonFuncTable_Addon
+{
+  void (*destroy)();
+  ADDON_STATUS (*get_status)();
+  ADDON_STATUS (*create_instance)(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent);
+  void (*destroy_instance)(int instanceType, KODI_HANDLE instance);
+  ADDON_STATUS (*set_setting)(const char *settingName, const void *settingValue);
+} KodiToAddonFuncTable_Addon;
+
+/*
+ * Main structure passed from kodi to addon with basic information needed to
+ * create add-on.
+ */
+typedef struct AddonGlobalInterface
+{
+  // String with full path where add-on is installed (without his name on end)
+  // Set from Kodi!
+  const char* libBasePath;
+
+  // Pointer of first created instance, used in case this add-on goes with single way
+  // Set from Kodi!
+  KODI_HANDLE firstKodiInstance;
+
+  // Pointer to master base class inside add-on
+  // Set from addon header!
+  kodi::addon::CAddonBase* addonBase;
+
+  // Pointer to a instance used on single way (together with this class)
+  // Set from addon header!
+  kodi::addon::IAddonInstance* globalSingleInstance;
+
+  // Callback function tables from addon to Kodi
+  // Set from Kodi!
+  AddonToKodiFuncTable_Addon* toKodi;
+
+  // Function tables from Kodi to addon
+  // Set from addon header!
+  KodiToAddonFuncTable_Addon* toAddon;
+} AddonGlobalInterface;
+
+} /* extern "C" */
+
+//==============================================================================
+namespace kodi {
+namespace addon {
+/*
+ * Internal class to control various instance types with general parts defined
+ * here.
+ *
+ * Mainly is this currently used to identify requested instance types.
+ *
+ * @note This class is not need to know during add-on development thats why
+ * commented with "*".
+ */
+class IAddonInstance
+{
+public:
+  IAddonInstance(ADDON_TYPE type) : m_type(type) { }
+  virtual ~IAddonInstance() = default;
+
+  virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance)
+  {
+    return ADDON_STATUS_NOT_IMPLEMENTED;
+  }
+
+  const ADDON_TYPE m_type;
+};
+} /* namespace addon */
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+class CSettingValue
+{
+public:
+  CSettingValue(const void *settingValue) : m_settingValue(settingValue) {}
+
+  bool empty() const { return (m_settingValue == nullptr) ? true : false; }
+  std::string GetString() const { return (char*)m_settingValue; }
+  int GetInt() const { return *(int*)m_settingValue; }
+  unsigned int GetUInt() const { return *(unsigned int*)m_settingValue; }
+  bool GetBoolean() const { return *(bool*)m_settingValue; }
+  float GetFloat() const { return *(float*)m_settingValue; }
+
+private:
+  const void *m_settingValue;
+};
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+namespace addon {
+/// Add-on main instance class.
+class CAddonBase
+{
+public:
+  CAddonBase()
+  {
+    CAddonBase::m_interface->toAddon->destroy = ADDONBASE_Destroy;
+    CAddonBase::m_interface->toAddon->get_status = ADDONBASE_GetStatus;
+    CAddonBase::m_interface->toAddon->create_instance = ADDONBASE_CreateInstance;
+    CAddonBase::m_interface->toAddon->destroy_instance = ADDONBASE_DestroyInstance;
+    CAddonBase::m_interface->toAddon->set_setting = ADDONBASE_SetSetting;
+  }
+
+  virtual ~CAddonBase() = default;
+
+  virtual ADDON_STATUS Create() { return ADDON_STATUS_OK; }
+
+  virtual ADDON_STATUS GetStatus() { return ADDON_STATUS_OK; }
+
+  virtual ADDON_STATUS SetSetting(const std::string& settingName, const CSettingValue& settingValue) { return ADDON_STATUS_UNKNOWN; }
+
+  virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance)
+  {
+    /* The handling below is intended for the case of the add-on only one
+     * instance and this is integrated in the add-on base class.
+     */
+
+    /* Check about single instance usage */
+    if (CAddonBase::m_interface->firstKodiInstance == instance && // the kodi side instance pointer must be equal to first one
+        CAddonBase::m_interface->globalSingleInstance &&  // the addon side instance pointer must be set
+        CAddonBase::m_interface->globalSingleInstance->m_type == instanceType) // and the requested type must be equal with used add-on class
+    {
+      addonInstance = CAddonBase::m_interface->globalSingleInstance;
+      return ADDON_STATUS_OK;
+    }
+
+    return ADDON_STATUS_UNKNOWN;
+  }
+
+  /* Global variables of class */
+  static AddonGlobalInterface* m_interface; // Interface function table to hold addresses on add-on and from kodi
+
+/*private:*/ /* Needed public as long the old call functions becomes used! */
+  static inline void ADDONBASE_Destroy()
+  {
+    delete CAddonBase::m_interface->addonBase;
+    CAddonBase::m_interface->addonBase = nullptr;
+  }
+
+  static inline ADDON_STATUS ADDONBASE_GetStatus() { return CAddonBase::m_interface->addonBase->GetStatus(); }
+
+  static inline ADDON_STATUS ADDONBASE_SetSetting(const char *settingName, const void *settingValue)
+  {
+    return CAddonBase::m_interface->addonBase->SetSetting(settingName, CSettingValue(settingValue));
+  }
+
+  static inline ADDON_STATUS ADDONBASE_CreateInstance(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent)
+  {
+    ADDON_STATUS status = ADDON_STATUS_NOT_IMPLEMENTED;
+    if (parent != nullptr)
+      status = static_cast<IAddonInstance*>(parent)->CreateInstance(instanceType, instanceID, instance, *addonInstance);
+    if (status == ADDON_STATUS_NOT_IMPLEMENTED)
+      status = CAddonBase::m_interface->addonBase->CreateInstance(instanceType, instanceID, instance, *addonInstance);
+    if (*addonInstance == nullptr)
+      throw std::logic_error("kodi::addon::CAddonBase CreateInstance returns a empty instance pointer!");
+
+    if (static_cast<::kodi::addon::IAddonInstance*>(*addonInstance)->m_type != instanceType)
+      throw std::logic_error("kodi::addon::CAddonBase CreateInstance with difference on given and returned instance type!");
+
+    return status;
+  }
+
+  static inline void ADDONBASE_DestroyInstance(int instanceType, KODI_HANDLE instance)
+  {
+    if (CAddonBase::m_interface->globalSingleInstance == nullptr && instance != CAddonBase::m_interface->addonBase)
+    {
+      if (static_cast<::kodi::addon::IAddonInstance*>(instance)->m_type == instanceType)
+        delete static_cast<::kodi::addon::IAddonInstance*>(instance);
+      else
+        throw std::logic_error("kodi::addon::CAddonBase DestroyInstance called with difference on given and present instance type!");
+    }
+  }
+};
+} /* namespace addon */
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+inline std::string GetAddonPath(const std::string& append = "")
+{
+  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->get_addon_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  std::string ret = str;
+  ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, str);
+  if (!append.empty())
+  {
+    if (append.at(0) != '\\' &&
+        append.at(0) != '/')
+#ifdef TARGET_WINDOWS
+      ret.append("\\");
+#else
+      ret.append("/");
+#endif
+    ret.append(append);
+  }
+  return ret;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+inline std::string GetBaseUserPath(const std::string& append = "")
+{
+  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->get_base_user_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  std::string ret = str;
+  ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, str);
+  if (!append.empty())
+  {
+    if (append.at(0) != '\\' &&
+        append.at(0) != '/')
+#ifdef TARGET_WINDOWS
+      ret.append("\\");
+#else
+      ret.append("/");
+#endif
+    ret.append(append);
+  }
+  return ret;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+inline std::string GetLibPath()
+{
+  return ::kodi::addon::CAddonBase::m_interface->libBasePath;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+inline void Log(const AddonLog loglevel, const char* format, ...)
+{
+  char buffer[16384];
+  va_list args;
+  va_start(args, format);
+  vsprintf(buffer, format, args);
+  va_end(args);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->addon_log_msg(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, loglevel, buffer);
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline bool CheckSettingString(const std::string& settingName, std::string& settingValue)
+{
+  char * buffer = nullptr;
+  bool ret = ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &buffer);
+  if (buffer)
+  {
+    if (ret)
+      settingValue = buffer;
+    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, buffer);
+  }
+  return ret;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline std::string GetSettingString(const std::string& settingName)
+{
+  std::string settingValue;
+  CheckSettingString(settingName, settingValue);
+  return settingValue;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline void SetSettingString(const std::string& settingName, const std::string& settingValue)
+{
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue.c_str());
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline bool CheckSettingInt(const std::string& settingName, int& settingValue)
+{
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline int GetSettingInt(const std::string& settingName)
+{
+  int settingValue = 0;
+  CheckSettingInt(settingName, settingValue);
+  return settingValue;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline void SetSettingInt(const std::string& settingName, int settingValue)
+{
+  char buffer[33];
+  snprintf(buffer, sizeof(buffer), "%i", settingValue);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), buffer);
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline bool CheckSettingBoolean(const std::string& settingName, bool& settingValue)
+{
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline bool GetSettingBoolean(const std::string& settingName)
+{
+  bool settingValue = false;
+  CheckSettingBoolean(settingName, settingValue);
+  return settingValue;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline void SetSettingBoolean(const std::string& settingName, bool settingValue)
+{
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue ? "true" : "false");
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline bool CheckSettingFloat(const std::string& settingName, float& settingValue)
+{
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline float GetSettingFloat(const std::string& settingName)
+{
+  float settingValue = 0.0f;
+  CheckSettingFloat(settingName, settingValue);
+  return settingValue;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline void SetSettingFloat(const std::string& settingName, float settingValue)
+{
+  char buffer[50];
+  snprintf(buffer, sizeof(buffer), "%f", settingValue);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), buffer);
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+inline std::string TranslateAddonStatus(ADDON_STATUS status)
+{
+  switch (status)
+  {
+    case ADDON_STATUS_OK:
+      return "OK";
+    case ADDON_STATUS_LOST_CONNECTION:
+      return "Lost Connection";
+    case ADDON_STATUS_NEED_RESTART:
+      return "Need Restart";
+    case ADDON_STATUS_NEED_SETTINGS:
+      return "Need Settings";
+    case ADDON_STATUS_UNKNOWN:
+      return "Unknown error";
+    case ADDON_STATUS_NEED_SAVEDSETTINGS:
+      return "Need saved settings";
+    case ADDON_STATUS_PERMANENT_FAILURE:
+      return "Permanent failure";
+    case ADDON_STATUS_NOT_IMPLEMENTED:
+      return "Not implemented";
+    default:
+      break;
+  }
+  return "Unknown";
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+
+/*! addon creation macro
+ * @todo cleanup this stupid big macro
+ * This macro includes now all for add-on's needed functions. This becomes a bigger
+ * rework after everything is done on Kodi itself, currently is this way needed
+ * to have compatibility with not reworked interfaces.
+ *
+ * Becomes really cleaned up soon :D
+ */
+#define ADDONCREATOR(AddonClass) \
+  extern "C" __declspec(dllexport) void get_addon(void* pAddon) {} \
+  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_Create(KODI_HANDLE addonInterface, void *unused) \
+  { \
+    kodi::addon::CAddonBase::m_interface = static_cast<AddonGlobalInterface*>(addonInterface); \
+    kodi::addon::CAddonBase::m_interface->addonBase = new AddonClass; \
+    return kodi::addon::CAddonBase::m_interface->addonBase->Create(); \
+  } \
+  extern "C" __declspec(dllexport) void ADDON_Destroy() \
+  { \
+    kodi::addon::CAddonBase::ADDONBASE_Destroy(); \
+  } \
+  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_GetStatus() \
+  { \
+    return kodi::addon::CAddonBase::ADDONBASE_GetStatus(); \
+  } \
+  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue) \
+  { \
+    return kodi::addon::CAddonBase::ADDONBASE_SetSetting(settingName, settingValue); \
+  } \
+  extern "C" __declspec(dllexport) const char* ADDON_GetTypeVersion(int type) \
+  { \
+    return kodi::addon::GetTypeVersion(type); \
+  } \
+  AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h
new file mode 100644
index 0000000..380e5e2
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h
@@ -0,0 +1,580 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonBase.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "AEChannelData.h"
+#else
+#include "cores/AudioEngine/Utils/AEChannelData.h"
+#endif
+
+//==============================================================================
+///
+/// \defgroup cpp_kodi_audioengine  Interface - kodi::audioengine
+/// \ingroup cpp
+/// @brief **Audio engine functions**
+///
+///
+/// It has the header \ref AudioEngine.h "#include <kodi/AudioEngine.h>" be included
+/// to enjoy it.
+///
+//------------------------------------------------------------------------------
+
+//==============================================================================
+///
+/// \defgroup cpp_kodi_audioengine_Defs Definitions, structures and enumerators
+/// \ingroup cpp_kodi_audioengine
+/// @brief **Library definition values**
+///
+//------------------------------------------------------------------------------
+
+extern "C"
+{
+
+  //============================================================================
+  /// \ingroup cpp_kodi_audioengine_Defs
+  /// @brief Bit options to pass to CAddonAEStream
+  ///
+  typedef enum AudioEngineStreamOptions
+  {
+    /// force resample even if rates match
+    AUDIO_STREAM_FORCE_RESAMPLE = 1 << 0,
+    /// create the stream paused
+    AUDIO_STREAM_PAUSED         = 1 << 1,
+    /// autostart the stream when enough data is buffered
+    AUDIO_STREAM_AUTOSTART      = 1 << 2,
+    /// if this option is set the ADSP-System is bypassed and the raw stream
+    /// will be passed through IAESink
+    AUDIO_STREAM_BYPASS_ADSP    = 1 << 3
+  } AudioEngineStreamOptions;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// \defgroup cpp_kodi_audioengine_Defs_AudioEngineFormat struct AudioEngineFormat
+  /// \ingroup cpp_kodi_audioengine_Defs
+  /// @brief The audio format structure that fully defines a stream's audio
+  /// information
+  ///
+  //@{
+  struct AudioEngineFormat
+  {
+    /// The stream's data format (eg, AE_FMT_S16LE)
+    enum AEDataFormat m_dataFormat;
+
+    /// The stream's sample rate (eg, 48000)
+    unsigned int m_sampleRate;
+
+    /// The encoded streams sample rate if a bitstream, otherwise undefined
+    unsigned int m_encodedRate;
+
+    /// The amount of used speaker channels
+    unsigned int m_channelCount;
+
+    /// The stream's channel layout
+    enum AEChannel m_channels[AE_CH_MAX];
+
+    /// The number of frames per period
+    unsigned int m_frames;
+
+    /// The size of one frame in bytes
+    unsigned int m_frameSize;
+
+    AudioEngineFormat()
+    {
+      m_dataFormat = AE_FMT_INVALID;
+      m_sampleRate = 0;
+      m_encodedRate = 0;
+      m_frames = 0;
+      m_frameSize = 0;
+      m_channelCount = 0;
+
+      for (unsigned int ch = 0; ch < AE_CH_MAX; ++ch)
+      {
+        m_channels[ch] = AE_CH_MAX;
+      }
+    }
+
+    /// Function to compare the format structure with another
+    bool compareFormat(const AudioEngineFormat *fmt)
+    {
+      if (!fmt)
+      {
+        return false;
+      }
+
+      if (m_dataFormat    != fmt->m_dataFormat    ||
+          m_sampleRate    != fmt->m_sampleRate    ||
+          m_encodedRate   != fmt->m_encodedRate   ||
+          m_frames        != fmt->m_frames        ||
+          m_frameSize     != fmt->m_frameSize     ||
+          m_channelCount  != fmt->m_channelCount)
+      {
+        return false;
+      }
+
+      for (unsigned int ch = 0; ch < AE_CH_MAX; ++ch)
+      {
+        if (fmt->m_channels[ch] != m_channels[ch])
+        {
+          return false;
+        }
+      }
+
+      return  true;
+    }
+  };
+  //@}
+  //----------------------------------------------------------------------------
+
+  /* A stream handle pointer, which is only used internally by the addon stream handle */
+  typedef void AEStreamHandle;
+
+  /*
+   * Function address structure, not need to visible on dev kit doxygen
+   * documentation
+   */
+  typedef struct AddonToKodiFuncTable_kodi_audioengine
+  {
+    AEStreamHandle* (*MakeStream) (void *kodiBase, AudioEngineFormat format, unsigned int options);
+    void (*FreeStream) (void *kodiBase, AEStreamHandle *stream);
+    bool (*GetCurrentSinkFormat) (void *kodiBase, AudioEngineFormat *SinkFormat);
+
+    // Audio Engine Stream definitions
+    unsigned int (*AEStream_GetSpace) (void *kodiBase, AEStreamHandle *handle);
+    unsigned int (*AEStream_AddData) (void *kodiBase, AEStreamHandle *handle, uint8_t* const *Data, unsigned int Offset, unsigned int Frames);
+    double (*AEStream_GetDelay)(void *kodiBase, AEStreamHandle *handle);
+    bool (*AEStream_IsBuffering)(void *kodiBase, AEStreamHandle *handle);
+    double (*AEStream_GetCacheTime)(void *kodiBase, AEStreamHandle *handle);
+    double (*AEStream_GetCacheTotal)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_Pause)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_Resume)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_Drain)(void *kodiBase, AEStreamHandle *handle, bool Wait);
+    bool (*AEStream_IsDraining)(void *kodiBase, AEStreamHandle *handle);
+    bool (*AEStream_IsDrained)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_Flush)(void *kodiBase, AEStreamHandle *handle);
+    float (*AEStream_GetVolume)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_SetVolume)(void *kodiBase, AEStreamHandle *handle, float Volume);
+    float (*AEStream_GetAmplification)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_SetAmplification)(void *kodiBase, AEStreamHandle *handle, float Amplify);
+    const unsigned int (*AEStream_GetFrameSize)(void *kodiBase, AEStreamHandle *handle);
+    const unsigned int (*AEStream_GetChannelCount)(void *kodiBase, AEStreamHandle *handle);
+    const unsigned int (*AEStream_GetSampleRate)(void *kodiBase, AEStreamHandle *handle);
+    const AEDataFormat (*AEStream_GetDataFormat)(void *kodiBase, AEStreamHandle *handle);
+    double (*AEStream_GetResampleRatio)(void *kodiBase, AEStreamHandle *handle);
+    void (*AEStream_SetResampleRatio)(void *kodiBase, AEStreamHandle *handle, double Ratio);
+  } AddonToKodiFuncTable_kodi_audioengine;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace audioengine
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_audioengine_CAddonAEStream class CAddonAEStream
+  /// \ingroup cpp_kodi_audioengine
+  /// @brief **Audio Engine Stream Class**
+  ///
+  ///
+  /// It has the header \ref AudioEngine.h "#include <kodi/AudioEngine.h>" be
+  /// included to enjoy it.
+  ///
+  //----------------------------------------------------------------------------
+  class CAddonAEStream
+  {
+  public:
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Contructs new class to an Kodi IAEStream in the format specified.
+    ///
+    /// @param[in] format       The data format the incoming audio will be in
+    ///                         (e.g. \ref AE_FMT_S16LE)
+    /// @param[in] options      [opt] A bit field of stream options (see: enum \ref AudioEngineStreamOptions)
+    ///
+    ///
+    /// ------------------------------------------------------------------------
+    ///
+    /// **Audio engine format information:**
+    /// @code
+    /// /*
+    ///  * Audio engine format information
+    ///  *
+    ///  * Only as example shown here! See always the original structure on related header.
+    ///  */
+    /// typedef struct AudioEngineFormat
+    /// {
+    ///   enum AEDataFormat    m_dataFormat;             /* The stream's data format (eg, AE_FMT_S16LE) */
+    ///   unsigned int         m_sampleRate;             /* The stream's sample rate (eg, 48000) */
+    ///   unsigned int         m_encodedRate;            /* The encoded streams sample rate if a bitstream, otherwise undefined */
+    ///   unsigned int         m_channelCount;           /* The amount of used speaker channels */
+    ///   enum AEChannel       m_channels[AE_CH_MAX];    /* The stream's channel layout */
+    ///   unsigned int         m_frames;                 /* The number of frames per period */
+    ///   unsigned int         m_frameSamples;           /* The number of samples in one frame */
+    ///   unsigned int         m_frameSize;              /* The size of one frame in bytes */
+    ///
+    ///   /* Function to compare the format structure with another */
+    ///   bool compareFormat(const AudioEngineFormat *fmt);
+    /// } AudioEngineFormat;
+    /// @endcode
+    ///
+    /// ------------------------------------------------------------------------
+    ///
+    /// **Bit options to pass to CAELib_Stream (on Kodi by <c>IAE::MakeStream</c>)**
+    ///
+    /// | enum AEStreamOptions     | Value: | Description:
+    /// |-------------------------:|:------:|:-----------------------------------
+    /// | AE_STREAM_FORCE_RESAMPLE | 1 << 0 | Force resample even if rates match
+    /// | AE_STREAM_PAUSED         | 1 << 1 | Create the stream paused
+    /// | AE_STREAM_AUTOSTART      | 1 << 2 | Autostart the stream when enough data is buffered
+    /// | AE_STREAM_BYPASS_ADSP    | 1 << 3 | if this option is set the ADSP-System is bypassed and the raw stream will be passed through IAESink.
+    ///
+    ///
+    /// ------------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    ///
+    /// #include <kodi/AudioEngine.h>
+    ///
+    /// using namespace kodi::audioengine;
+    ///
+    /// ...
+    ///
+    /// CAddonAEStream* stream = new CAddonAEStream(AE_FMT_S16LE, AE_STREAM_AUTOSTART | AE_STREAM_BYPASS_ADSP);
+    ///
+    /// ~~~~~~~~~~~~~
+    ///
+    CAddonAEStream(AudioEngineFormat format, unsigned int options = 0)
+      : m_kodiBase(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase),
+        m_cb(::kodi::addon::CAddonBase::m_interface->toKodi->kodi_audioengine)
+    {
+      AEStreamHandle *streamHandle = m_cb->MakeStream(m_kodiBase, format, options);
+      if (streamHandle == nullptr)
+      {
+        kodi::Log(ADDON_LOG_FATAL, "CAddonAEStream: MakeStream failed!");
+      }
+    }
+    //--------------------------------------------------------------------------
+
+    ~CAddonAEStream()
+    {
+      if (m_StreamHandle)
+      {
+        m_cb->FreeStream(m_kodiBase, m_StreamHandle);
+        m_StreamHandle = nullptr;
+      }
+    }
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the amount of space available in the stream
+    ///
+    /// @return                 The number of bytes AddData will consume
+    ///
+    unsigned int GetSpace()
+    {
+      return m_cb->AEStream_GetSpace(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Add planar or interleaved PCM data to the stream
+    ///
+    /// @param data             array of pointers to the planes
+    /// @param offset           to frame in frames
+    /// @param frames           number of frames
+    /// @return                 The number of frames consumed
+    ///
+    unsigned int AddData(uint8_t* const *data, unsigned int offset, unsigned int frames)
+    {
+      return m_cb->AEStream_AddData(m_kodiBase, m_StreamHandle, data, offset, frames);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the time in seconds that it will take for the next added
+    /// packet to be heard from the speakers.
+    ///
+    /// @return seconds
+    ///
+    double GetDelay()
+    {
+      return m_cb->AEStream_GetDelay(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns if the stream is buffering
+    ///
+    /// @return True if the stream is buffering
+    ///
+    bool IsBuffering()
+    {
+      return m_cb->AEStream_IsBuffering(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the time in seconds of the stream's cached audio samples.
+    /// Engine buffers excluded.
+    ///
+    /// @return seconds
+    ///
+    double GetCacheTime()
+    {
+      return m_cb->AEStream_GetCacheTime(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the total time in seconds of the cache
+    ///
+    /// @return seconds
+    ///
+    double GetCacheTotal()
+    {
+      return m_cb->AEStream_GetCacheTotal(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Pauses the stream playback
+    ///
+    void Pause()
+    {
+      return m_cb->AEStream_Pause(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Resumes the stream after pausing
+    ///
+    void Resume()
+    {
+      return m_cb->AEStream_Resume(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Start draining the stream
+    ///
+    /// @param[in] wait         [opt] Wait until drain is finished if set to
+    ///                         true, otherwise it returns direct
+    ///
+    /// @note Once called AddData will not consume more data.
+    ///
+    void Drain(bool wait)
+    {
+      return m_cb->AEStream_Drain(m_kodiBase, m_StreamHandle, wait=true);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns true if the is stream draining
+    ///
+    bool IsDraining()
+    {
+      return m_cb->AEStream_IsDraining(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns true if the is stream has finished draining
+    ///
+    bool IsDrained()
+    {
+      return m_cb->AEStream_IsDrained(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Flush all buffers dropping the audio data
+    ///
+    void Flush()
+    {
+      return m_cb->AEStream_Flush(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Return the stream's current volume level
+    ///
+    /// @return The volume level between 0.0 and 1.0
+    ///
+    float GetVolume()
+    {
+      return m_cb->AEStream_GetVolume(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Set the stream's volume level
+    ///
+    /// @param[in] volume               The new volume level between 0.0 and 1.0
+    ///
+    void SetVolume(float volume)
+    {
+      return m_cb->AEStream_SetVolume(m_kodiBase, m_StreamHandle, volume);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Gets the stream's volume amplification in linear units.
+    ///
+    /// @return The volume amplification factor between 1.0 and 1000.0
+    ///
+    float GetAmplification()
+    {
+      return m_cb->AEStream_GetAmplification(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Sets the stream's volume amplification in linear units.
+    ///
+    /// @param[in] amplify              The volume amplification factor between
+    ///                                 1.0 and 1000.0
+    ///
+    void SetAmplification(float amplify)
+    {
+      return m_cb->AEStream_SetAmplification(m_kodiBase, m_StreamHandle, amplify);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the size of one audio frame in bytes (channelCount * resolution)
+    ///
+    /// @return The size in bytes of one frame
+    ///
+    const unsigned int GetFrameSize() const
+    {
+      return m_cb->AEStream_GetFrameSize(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the number of channels the stream is configured to accept
+    ///
+    /// @return The channel count
+    ///
+    const unsigned int GetChannelCount() const
+    {
+      return m_cb->AEStream_GetChannelCount(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Returns the stream's sample rate, if the stream is using a dynamic
+    /// sample rate, this value will NOT reflect any changes made by calls to
+    /// SetResampleRatio()
+    ///
+    /// @return The stream's sample rate (eg, 48000)
+    ///
+    const unsigned int GetSampleRate() const
+    {
+      return m_cb->AEStream_GetSampleRate(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Return the data format the stream has been configured with
+    ///
+    /// @return The stream's data format (eg, AUDIOENGINE_FMT_S16LE)
+    ///
+    const AEDataFormat GetDataFormat() const
+    {
+      return m_cb->AEStream_GetDataFormat(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Return the resample ratio
+    ///
+    /// @note This will return an undefined value if the stream is not resampling
+    ///
+    /// @return the current resample ratio or undefined if the stream is not resampling
+    ///
+    double GetResampleRatio()
+    {
+      return m_cb->AEStream_GetResampleRatio(m_kodiBase, m_StreamHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @ingroup cpp_kodi_audioengine_CAddonAEStream
+    /// @brief Sets the resample ratio
+    ///
+    /// @note This function may return false if the stream is not resampling, if
+    /// you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option
+    ///
+    /// @param[in] ratio         the new sample rate ratio, calculated by
+    ///                          ((double)desiredRate / (double)GetSampleRate())
+    ///
+    void SetResampleRatio(double ratio)
+    {
+      m_cb->AEStream_SetResampleRatio(m_kodiBase, m_StreamHandle, ratio);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void* m_kodiBase;
+    AddonToKodiFuncTable_kodi_audioengine* m_cb;
+    AEStreamHandle  *m_StreamHandle;
+  };
+
+  //============================================================================
+  /// @ingroup cpp_kodi_audioengine
+  /// @brief Get the current sink data format
+  ///
+  /// @param[in] format Current sink data format. For more details see AudioEngineFormat.
+  /// @return Returns true on success, else false.
+  ///
+  inline bool GetCurrentSinkFormat(AudioEngineFormat &format)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_audioengine->GetCurrentSinkFormat(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, &format);
+  }
+  //----------------------------------------------------------------------------
+
+} /* audioengine */
+} /* kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
new file mode 100644
index 0000000..3222e8b
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
@@ -0,0 +1,1490 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonBase.h"
+
+#include <map>
+
+#if !defined(_WIN32)
+  #include <sys/stat.h>
+  #if !defined(__stat64)
+    #define __stat64 stat64
+  #endif
+#endif
+#ifdef _WIN32                   // windows
+#ifndef _SSIZE_T_DEFINED
+  typedef intptr_t      ssize_t;
+  #define _SSIZE_T_DEFINED
+#endif // !_SSIZE_T_DEFINED
+#endif
+  
+#ifndef S_ISDIR
+  #define S_ISDIR(mode)  ((((mode)) & 0170000) == (0040000))
+#endif
+
+#ifndef S_ISLNK
+  #define S_ISLNK(mode)  ((((mode)) & 0170000) == (0120000))
+#endif
+
+/*
+ * 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
+ */
+extern "C"
+{
+
+  struct VFSProperty
+  {
+    char* name;
+    char* val;
+  };
+
+  struct VFSDirEntry
+  {
+    char* label;             //!< item label
+    char* title;             //!< item title
+    char* path;              //!< item path
+    unsigned int num_props;  //!< Number of properties attached to item
+    VFSProperty* properties; //!< Properties
+    time_t date_time;        //!< file creation date & time
+    bool folder;             //!< Item is a folder
+    uint64_t size;           //!< Size of file represented by item
+  };
+
+  typedef struct AddonToKodiFuncTable_kodi_filesystem
+  {
+    bool (*can_open_directory)(void* kodiBase, const char* url);
+    bool (*create_directory)(void* kodiBase, const char* path);
+    bool (*remove_directory)(void* kodiBase, const char* path);
+    bool (*directory_exists)(void* kodiBase, const char* path);
+    bool (*get_directory)(void* kodiBase, const char* path, const char* mask, VFSDirEntry** items, unsigned int* num_items);
+    void (*free_directory)(void* kodiBase, VFSDirEntry* items, unsigned int num_items);
+
+    bool (*file_exists)(void* kodiBase, const char *filename, bool useCache);
+    int (*stat_file)(void* kodiBase, const char *filename, struct __stat64* buffer);
+    bool (*delete_file)(void* kodiBase, const char *filename);
+    bool (*rename_file)(void* kodiBase, const char *filename, const char *newFileName);
+    bool (*copy_file)(void* kodiBase, const char *filename, const char *dest);
+
+    char* (*get_file_md5)(void* kodiBase, const char* filename);
+    char* (*get_cache_thumb_name)(void* kodiBase, const char* filename);
+    char* (*make_legal_filename)(void* kodiBase, const char* filename);
+    char* (*make_legal_path)(void* kodiBase, const char* path);
+    char* (*translate_special_protocol)(void* kodiBase, const char *strSource);
+
+    void* (*open_file)(void* kodiBase, const char* filename, unsigned int flags);
+    void* (*open_file_for_write)(void* kodiBase, const char* filename, bool overwrite);
+    ssize_t (*read_file)(void* kodiBase, void* file, void* ptr, size_t size);
+    bool (*read_file_string)(void* kodiBase, void* file, char *szLine, int iLineLength);
+    ssize_t (*write_file)(void* kodiBase, void* file, const void* ptr, size_t size);
+    void (*flush_file)(void* kodiBase, void* file);
+    int64_t (*seek_file)(void* kodiBase, void* file, int64_t position, int whence);
+    int (*truncate_file)(void* kodiBase, void* file, int64_t size);
+    int64_t (*get_file_position)(void* kodiBase, void* file);
+    int64_t (*get_file_length)(void* kodiBase, void* file);
+    double (*get_file_download_speed)(void* kodiBase, void* file);
+    void (*close_file)(void* kodiBase, void* file);
+    int (*get_file_chunk_size)(void* kodiBase, void* file);
+
+    void* (*curl_create)(void* kodiBase, const char* url);
+    bool (*curl_add_option)(void* kodiBase, void* file, int type, const char* name, const char* value);
+    bool (*curl_open)(void* kodiBase, void* file, unsigned int flags);
+  } AddonToKodiFuncTable_kodi_filesystem;
+
+} /* extern "C" */
+
+//==============================================================================
+/// \defgroup cpp_kodi_vfs_CFile_Defs Definitions, structures and enumerators
+/// \ingroup cpp_kodi_vfs_CFile
+/// @brief **Virtual file Server definition values**
+//------------------------------------------------------------------------------
+
+//==============================================================================
+///
+/// @ingroup cpp_kodi_vfs_CFile_Defs
+/// Flags to define way how file becomes opened with kodi::vfs::CFile::OpenFile()
+///
+/// The values can be used together, e.g. <b>`file.Open("myfile", READ_TRUNCATED | READ_CHUNKED);`</b>
+///
+typedef enum OpenFileFlags
+{
+  /// indicate that caller can handle truncated reads, where function returns
+  /// before entire buffer has been filled
+  READ_TRUNCATED = 0x01,
+
+  /// indicate that that caller support read in the minimum defined chunk size,
+  /// this disables internal cache then
+  READ_CHUNKED = 0x02,
+
+  /// use cache to access this file
+  READ_CACHED = 0x04,
+
+  /// open without caching. regardless to file type
+  READ_NO_CACHE = 0x08,
+
+  /// calcuate bitrate for file while reading
+  READ_BITRATE = 0x10,
+
+  /// indicate to the caller we will seek between multiple streams in the file
+  /// frequently
+  READ_MULTI_STREAM = 0x20,
+
+  /// indicate to the caller file is audio and/or video (and e.g. may grow)
+  READ_AUDIO_VIDEO = 0x40,
+
+  /// indicate that caller will do write operations before reading
+  READ_AFTER_WRITE = 0x80,
+
+  /// indicate that caller want to reopen a file if its already open
+  READ_REOPEN = 0x100
+} OpenFileFlags;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi_vfs_CFile_Defs
+/// @brief Used CURL message types
+///
+typedef enum CURLOptiontype
+{
+  /// Set a general option
+  ADDON_CURL_OPTION_OPTION,
+  /// Set a protocol option
+  ADDON_CURL_OPTION_PROTOCOL,
+  /// Set User and password
+  ADDON_CURL_OPTION_CREDENTIALS,
+  /// Add a Header
+  ADDON_CURL_OPTION_HEADER
+} CURLOptiontype;
+//------------------------------------------------------------------------------
+
+//============================================================================
+///
+/// \ingroup cpp_kodi_vfs_CFile_Defs
+/// @brief Information about a file
+///
+struct STAT_STRUCTURE
+{
+  /// ID of device containing file
+  uint32_t    deviceId;
+  /// Total size, in bytes
+  uint64_t    size;
+#ifdef TARGET_WINDOWS
+  /// Time of last access
+  __time64_t  accessTime;
+  /// Time of last modification
+  __time64_t  modificationTime;
+  /// Time of last status change
+  __time64_t  statusTime;
+#else
+  /// Time of last access
+  timespec    accessTime;
+  /// Time of last modification
+  timespec    modificationTime;
+  /// Time of last status change
+  timespec    statusTime;
+#endif
+  /// The stat url is a directory
+  bool        isDirectory;
+  /// The stat url is a symbolic link
+  bool        isSymLink;
+};
+//------------------------------------------------------------------------------
+
+namespace kodi
+{
+namespace vfs
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_vfs_CDirEntry class CDirEntry
+  /// \ingroup cpp_kodi_vfs
+  ///
+  /// @brief **Virtual file server directory entry**
+  ///
+  /// This class is used as an entry for files and folders in
+  /// kodi::vfs::GetDirectory().
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  ///
+  /// ...
+  ///
+  /// std::vector<kodi::vfs::CDirEntry> items;
+  /// kodi::vfs::GetDirectory("special://temp", "", items);
+  ///
+  /// fprintf(stderr, "Directory have %lu entries\n", items.size());
+  /// for (unsigned long i = 0; i < items.size(); i++)
+  /// {
+  ///   char buff[20];
+  ///   time_t now = items[i].DateTime();
+  ///   strftime(buff, 20, "%Y-%m-%d %H:%M:%S", gmtime(&now));
+  ///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s -- Time: %s\n",
+  ///             i+1,
+  ///             items[i].IsFolder() ? "yes" : "no ",
+  ///             items[i].Label().c_str(),
+  ///             items[i].Path().c_str(),
+  ///             buff);
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  /// It has the header \ref Filesystem.h "#include <kodi/Filesystem.h>" be included
+  /// to enjoy it.
+  ///
+  //@{
+  class CDirEntry
+  {
+  public:
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Constructor for VFS directory entry
+    ///
+    /// @param[in] label   [opt] Name to use for entry
+    /// @param[in] path    [opt] Used path of the entry
+    /// @param[in] folder  [opt] If set entry used as folder
+    /// @param[in] size    [opt] If used as file, his size defined there
+    ///
+    CDirEntry(const std::string& label = "",
+              const std::string& path = "",
+              bool folder = false,
+              int64_t size = -1) :
+      m_label(label),
+      m_path(path),
+      m_folder(folder),
+      m_size(size)
+    {
+    }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    // @note Not for addon development itself needed, thats why below is
+    // disabled for doxygen!
+    //
+    // @ingroup cpp_kodi_vfs_CDirEntry
+    // @brief Constructor to create own copy
+    //
+    // @param[in] dirEntry pointer to own class type
+    //
+    CDirEntry(const VFSDirEntry& dirEntry) :
+      m_label(dirEntry.label ? dirEntry.label : ""),
+      m_path(dirEntry.path ? dirEntry.path : ""),
+      m_folder(dirEntry.folder),
+      m_size(dirEntry.size),
+      m_dateTime(dirEntry.date_time)
+    {
+    }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Get the directory entry name
+    ///
+    /// @return Name of the entry
+    ///
+    const std::string& Label(void) const { return m_label; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Get the optional title of entry
+    ///
+    /// @return Title of the entry, if exists
+    ///
+    const std::string& Title(void) const { return m_title; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Get the path of the entry
+    ///
+    /// @return File system path of the entry
+    ///
+    const std::string& Path(void) const { return m_path; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Used to check entry is folder
+    ///
+    /// @return true if entry is a folder
+    ///
+    bool IsFolder(void) const { return m_folder; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief If file, the size of the file
+    ///
+    /// @return Defined file size
+    ///
+    int64_t Size(void) const { return m_size; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Get file time and date for a new entry
+    ///
+    /// @return The with time_t defined date and time of file
+    ///
+    time_t DateTime() { return m_dateTime; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set the label name
+    ///
+    /// @param[in] label name of entry
+    ///
+    void SetLabel(const std::string& label) { m_label = label; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set the title name
+    ///
+    /// @param[in] title title name of entry
+    ///
+    void SetTitle(const std::string& title) { m_title = title; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set the path of the entry
+    ///
+    /// @param[in] path path of entry
+    ///
+    void SetPath(const std::string& path) { m_path = path; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set the entry defined as folder
+    ///
+    /// @param[in] folder If true becomes entry defined as folder
+    ///
+    void SetFolder(bool folder) { m_folder = folder; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set a file size for a new entry
+    ///
+    /// @param[in] size Size to set for dir entry
+    ///
+    void SetSize(int64_t size) { m_size = size; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Set file time and date for a new entry
+    ///
+    /// @param[in] dateTime The with time_t defined date and time of file
+    ///
+    void SetDateTime(time_t dateTime) { m_dateTime = dateTime; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Add a by string defined property entry to directory entry
+    ///
+    /// @note A property can be used to add some special information about a file
+    /// or directory entry, this can be used on other places to do the right work
+    /// of them.
+    ///
+    /// @param[in] id     Identification name of property
+    /// @param[in] value  The property value to add by given id
+    ///
+    void AddProperty(const std::string& id, const std::string& value) { m_properties[id] = value; }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Clear all present properties
+    ///
+    void ClearProperties() { m_properties.clear(); }
+    //----------------------------------------------------------------------------
+
+    //============================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CDirEntry
+    /// @brief Get the present properties list on directory entry
+    ///
+    /// @return map with all present properties
+    ///
+    const std::map<std::string, std::string>& GetProperties() const { return m_properties; }
+    //----------------------------------------------------------------------------
+
+  private:
+    std::string m_label;
+    std::string m_title;
+    std::string m_path;
+    std::map<std::string, std::string> m_properties;
+    bool m_folder;
+    int64_t m_size;
+    time_t m_dateTime;
+  };
+  //@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Make a directory
+  ///
+  /// The kodi::vfs::CreateDirectory() function shall create a
+  /// new directory with name path.
+  ///
+  /// The newly created directory shall be an empty directory.
+  ///
+  /// @param[in] path           Path to the directory.
+  /// @return  Upon successful completion, CreateDirectory() shall return true.
+  ///          Otherwise false shall be returned, no directory shall be created.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string directory = "C:\\my_dir";
+  /// bool ret = kodi::vfs::CreateDirectory(directory);
+  /// fprintf(stderr, "Directory '%s' successfull created: %s\n", directory.c_str(), ret ? "yes" : "no");
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline bool CreateDirectory(const std::string& path)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Verifying the Existence of a Directory
+  ///
+  /// The kodi::vfs::DirectoryExists() method determines whether
+  /// a specified folder exists.
+  ///
+  /// @param[in] path Path to the directory.
+  /// @return True when it exists, false otherwise.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string directory = "C:\\my_dir";
+  /// bool ret = kodi::vfs::DirectoryExists(directory);
+  /// fprintf(stderr, "Directory '%s' present: %s\n", directory.c_str(), ret ? "yes" : "no");
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline bool DirectoryExists(const std::string& path)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Removes a directory.
+  ///
+  /// The kodi::vfs::RemoveDirectory() function shall remove a
+  /// directory whose name is given by path.
+  ///
+  /// @param[in] path Path to the directory.
+  /// @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
+  ///          shall not be changed.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// bool ret = kodi::vfs::RemoveDirectory("C:\\my_dir");
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline bool RemoveDirectory(const std::string& path)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Lists a directory.
+  ///
+  /// Return the list of files and directories which have been found in the
+  /// specified directory and which respect the given constraint.
+  ///
+  /// It can handle the normal OS dependent paths and also the special virtual
+  /// filesystem from Kodi what starts with \b special://.
+  ///
+  /// @param[in]  path  The path in which the files and directories are located.
+  /// @param[in]  mask  Mask to filter out requested files, e.g. "*.avi|*.mpg" to
+  ///                   files with this ending.
+  /// @param[out] items The returned list directory entries.
+  /// @return           True if listing was successful, false otherwise.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  ///
+  /// std::vector<kodi::vfs::CDirEntry> items;
+  /// kodi::vfs::GetDirectory("special://temp", "", items);
+  ///
+  /// fprintf(stderr, "Directory have %lu entries\n", items.size());
+  /// for (unsigned long i = 0; i < items.size(); i++)
+  /// {
+  ///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s\n",
+  ///             i+1,
+  ///             items[i].IsFolder() ? "yes" : "no ",
+  ///             items[i].Label().c_str(),
+  ///             items[i].Path().c_str());
+  /// }
+  /// ~~~~~~~~~~~~~
+  inline bool GetDirectory(const std::string& path, const std::string& mask, std::vector<CDirEntry>& items)
+  {
+    VFSDirEntry* dir_list = nullptr;
+    unsigned int num_items = 0;
+    if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), mask.c_str(), &dir_list, &num_items))
+    {
+      if (dir_list)
+      {
+        for (unsigned int i = 0; i < num_items; ++i)
+          items.push_back(CDirEntry(dir_list[i]));
+
+        ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->free_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, dir_list, num_items);
+      }
+
+      return true;
+    }
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Retrieve MD5sum of a file
+  ///
+  /// @param[in] path path to the file to MD5sum
+  /// @return md5 sum of the file
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// #include <kodi/gui/DialogFileBrowser.h>
+  /// ...
+  /// std::string md5;
+  /// std::string filename;
+  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
+  ///                                                "Test File selection to get MD5",
+  ///                                                filename))
+  /// {
+  ///   md5 = kodi::vfs::GetFileMD5(filename);
+  ///   fprintf(stderr, "MD5 of file '%s' is %s\n", md5.c_str(), filename.c_str());
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string GetFileMD5(const std::string& path)
+  {
+    std::string strReturn;
+    char* strMd5 = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_md5(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+    if (strMd5 != nullptr)
+    {
+      if (std::strlen(strMd5))
+        strReturn = strMd5;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strMd5);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Returns a thumb cache filename
+  ///
+  /// @param[in] filename path to file
+  /// @return cache filename
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// #include <kodi/gui/DialogFileBrowser.h>
+  /// ...
+  /// std::string thumb;
+  /// std::string filename;
+  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
+  ///                                                "Test File selection to get Thumnail",
+  ///                                                filename))
+  /// {
+  ///   thumb = kodi::vfs::GetCacheThumbName(filename);
+  ///   fprintf(stderr, "Thumb name of file '%s' is %s\n", thumb.c_str(), filename.c_str());
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string GetCacheThumbName(const std::string& filename)
+  {
+    std::string strReturn;
+    char* strThumbName = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_cache_thumb_name(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+    if (strThumbName != nullptr)
+    {
+      if (std::strlen(strThumbName))
+        strReturn = strThumbName;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strThumbName);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Make filename valid
+  ///
+  /// Function to replace not valid characters with '_'. It can be also
+  /// compared with original before in a own loop until it is equal
+  /// (no invalid characters).
+  ///
+  /// @param[in] filename Filename to check and fix
+  /// @return            The legal filename
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string fileName = "///\\jk???lj????.mpg";
+  /// std::string legalName = kodi::vfs::MakeLegalFileName(fileName);
+  /// fprintf(stderr, "Legal name of '%s' is '%s'\n", fileName.c_str(), legalName.c_str());
+  ///
+  /// /* Returns as legal: 'jk___lj____.mpg' */
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string MakeLegalFileName(const std::string& filename)
+  {
+    std::string strReturn;
+    char* strLegalFileName = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_filename(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+    if (strLegalFileName != nullptr)
+    {
+      if (std::strlen(strLegalFileName))
+        strReturn = strLegalFileName;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strLegalFileName);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Make directory name valid
+  ///
+  /// Function to replace not valid characters with '_'. It can be also
+  /// compared with original before in a own loop until it is equal
+  /// (no invalid characters).
+  ///
+  /// @param[in] path Directory name to check and fix
+  /// @return        The legal directory name
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string path = "///\\jk???lj????\\hgjkg";
+  /// std::string legalPath = kodi::vfs::MakeLegalPath(path);
+  /// fprintf(stderr, "Legal name of '%s' is '%s'\n", path.c_str(), legalPath.c_str());
+  ///
+  /// /* Returns as legal: '/jk___lj____/hgjkg' */
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string MakeLegalPath(const std::string& path)
+  {
+    std::string strReturn;
+    char* strLegalPath = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+    if (strLegalPath != nullptr)
+    {
+      if (std::strlen(strLegalPath))
+        strReturn = strLegalPath;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strLegalPath);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi
+  /// @brief Returns the translated path
+  ///
+  /// @param[in] source  string or unicode - Path to format
+  /// @return      A human-readable string suitable for logging
+  ///
+  /// @note        Only useful if you are coding for both Linux and Windows.
+  ///              e.g. Converts 'special://masterprofile/script_data' -> '/home/user/.kodi/UserData/script_data'
+  ///              on Linux.
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string path = kodi::vfs::TranslateSpecialProtocol("special://masterprofile/script_data");
+  /// fprintf(stderr, "Translated path is: %s\n", path.c_str());
+  /// ...
+  /// ~~~~~~~~~~~~~
+  /// or
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// fprintf(stderr, "Directory 'special://temp' is '%s'\n", kodi::vfs::TranslateSpecialProtocol("special://temp").c_str());
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string TranslateSpecialProtocol(const std::string& source)
+  {
+    std::string strReturn;
+    char* protocol = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->translate_special_protocol(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, source.c_str());
+    if (protocol != nullptr)
+    {
+      if (std::strlen(protocol))
+        strReturn = protocol;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, protocol);
+    }
+    return strReturn;
+  }
+  //----------------------------------------------------------------------------
+  
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Return the file name from given complate path string
+  ///
+  /// @param[in] path The complete path include file and directory
+  /// @return Filename from path
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string fileName = kodi::vfs::GetFileName("special://temp/kodi.log");
+  /// fprintf(stderr, "File name is '%s'\n", fileName.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string GetFileName(const std::string& path)
+  {
+    /* find the last slash */
+    const size_t slash = path.find_last_of("/\\");
+    return path.substr(slash+1);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Return the directory name from given complate path string
+  ///
+  /// @param[in] path The complete path include file and directory
+  /// @return Directory name from path
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// std::string dirName = kodi::vfs::GetDirectoryName("special://temp/kodi.log");
+  /// fprintf(stderr, "Directory name is '%s'\n", dirName.c_str());
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string GetDirectoryName(const std::string& path)
+  {
+    // Will from a full filename return the directory the file resides in.
+    // Keeps the final slash at end and possible |option=foo options.
+
+    size_t iPosSlash = path.find_last_of("/\\");
+    if (iPosSlash == std::string::npos)
+      return ""; // No slash, so no path (ignore any options)
+
+    size_t iPosBar = path.rfind('|');
+    if (iPosBar == std::string::npos)
+      return path.substr(0, iPosSlash + 1); // Only path
+
+    return path.substr(0, iPosSlash + 1) + path.substr(iPosBar); // Path + options
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Return a size aligned to the chunk size at least as large as the chunk size.
+  ///
+  /// @param[in] chunk The chunk size
+  /// @param[in] minimum The minimum size (or maybe the minimum number of chunks?)
+  /// @return The aligned size
+  ///
+  inline unsigned int GetChunkSize(unsigned int chunk, unsigned int minimum)
+  {
+    if (chunk)
+      return chunk * ((minimum + chunk - 1) / chunk);
+    else
+      return minimum;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Check if a file exists.
+  ///
+  /// @param[in] filename       The filename to check.
+  /// @param[in] usecache       Check in file cache.
+  /// @return                   true if the file exists false otherwise.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// bool exists = kodi::vfs::FileExists("special://temp/kodi.log");
+  /// fprintf(stderr, "Log file should be always present, is it present? %s\n", exists ? "yes" : "no");
+  /// ~~~~~~~~~~~~~
+  ///
+  static inline bool FileExists(const std::string& filename, bool usecache = false)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->file_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), usecache);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Get file status.
+  ///
+  /// These function return information about a file. Execute (search)
+  /// permission is required on all of the directories in path that
+  /// lead to the file.
+  ///
+  /// The call return a stat structure, which contains the on \ref STAT_STRUCTURE
+  /// defined values.
+  ///
+  /// @warning Not all of the OS file systems implement all of the time fields.
+  ///
+  /// @param[in] filename The filename to read the status from.
+  /// @param[out] buffer The file status is written into this buffer.
+  /// @return On success, tru is returned. On error, fale is returned
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// ...
+  /// STAT_STRUCTURE statFile;
+  /// int ret = kodi::vfs::StatFile("special://temp/kodi.log", &statFile);
+  /// fprintf(stderr, "deviceId (ID of device containing file)       = %u\n"
+  ///                 "size (total size, in bytes)                   = %lu\n"
+  ///                 "accessTime (time of last access)              = %lu\n"
+  ///                 "modificationTime (time of last modification)  = %lu\n"
+  ///                 "statusTime (time of last status change)       = %lu\n"
+  ///                 "isDirectory (The stat url is a directory)     = %s\n"
+  ///                 "isSymLink (The stat url is a symbolic link)   = %s\n"
+  ///                 "Return value                                  = %i\n",
+  ///                      statFile.deviceId,
+  ///                      statFile.size,
+  ///                      statFile.accessTime,
+  ///                      statFile.modificationTime,
+  ///                      statFile.statusTime,
+  ///                      statFile.isDirectory ? "true" : "false",
+  ///                      statFile.isSymLink ? "true" : "false",
+  ///                      ret);
+  /// ~~~~~~~~~~~~~
+  ///
+  static inline bool StatFile(const std::string& filename, STAT_STRUCTURE& buffer)
+  {
+    struct __stat64 frontendBuffer = { };
+    if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->stat_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), &frontendBuffer))
+    {
+      buffer.deviceId         = frontendBuffer.st_dev;
+      buffer.size             = frontendBuffer.st_size;
+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
+      buffer.accessTime       = frontendBuffer.st_atimespec;
+      buffer.modificationTime = frontendBuffer.st_mtimespec;
+      buffer.statusTime       = frontendBuffer.st_ctimespec;
+#elif defined(TARGET_WINDOWS)
+      buffer.accessTime       = frontendBuffer.st_atime;
+      buffer.modificationTime = frontendBuffer.st_mtime;
+      buffer.statusTime       = frontendBuffer.st_ctime;
+#elif defined(TARGET_ANDROID)
+      buffer.accessTime.tv_sec = frontendBuffer.st_atime;
+      buffer.accessTime.tv_nsec = frontendBuffer.st_atime_nsec;
+      buffer.modificationTime.tv_sec = frontendBuffer.st_mtime;
+      buffer.modificationTime.tv_nsec = frontendBuffer.st_mtime_nsec;
+      buffer.statusTime.tv_sec = frontendBuffer.st_ctime;
+      buffer.statusTime.tv_nsec = frontendBuffer.st_ctime_nsec;
+#else
+      buffer.accessTime       = frontendBuffer.st_atim;
+      buffer.modificationTime = frontendBuffer.st_mtim;
+      buffer.statusTime       = frontendBuffer.st_ctim;
+#endif
+      buffer.isDirectory      = S_ISDIR(frontendBuffer.st_mode);
+      buffer.isSymLink        = S_ISLNK(frontendBuffer.st_mode);
+      return true;
+    }
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Deletes a file.
+  ///
+  /// @param[in] filename The filename to delete.
+  /// @return The file was successfully deleted.
+  ///
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  /// #include <kodi/gui/DialogFileBrowser.h>
+  /// #include <kodi/gui/DialogOK.h>
+  /// ...
+  /// std::string filename;
+  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "",
+  ///                                                  "Test File selection and delete of them!",
+  ///                                                  filename))
+  /// {
+  ///   bool successed = kodi::vfs::DeleteFile(filename);
+  ///   if (!successed)
+  ///     kodi::gui::DialogOK::ShowAndGetInput("Error", "Delete of File", filename, "failed!");
+  ///   else
+  ///     kodi::gui::DialogOK::ShowAndGetInput("Information", "Delete of File", filename, "successfull done.");
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  static inline bool DeleteFile(const std::string& filename)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->delete_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Rename a file name
+  ///
+  /// @param[in] filename       The filename to copy.
+  /// @param[in] newFileName    The new filename
+  /// @return                   true if successfully renamed
+  ///
+  ///
+  static inline bool RenameFile(const std::string& filename, const std::string& newFileName)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->rename_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), newFileName.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_vfs
+  /// @brief Copy a file from source to destination
+  ///
+  /// @param[in] filename       The filename to copy.
+  /// @param[in] destination    The destination to copy file to
+  /// @return                   true if successfully copied
+  ///
+  ///
+  static inline bool CopyFile(const std::string& filename, const std::string& destination)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->copy_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), destination.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_vfs_CFile class CFile
+  /// \ingroup cpp_kodi_vfs
+  ///
+  /// @brief **Virtual file server control**
+  ///
+  /// CFile is the class used for handling Files in Kodi. This class can be used
+  /// for creating, reading, writing and modifying files. It directly provides unbuffered, binary disk input/output services
+  ///
+  /// It has the header \ref Filesystem.h "#include <kodi/Filesystem.h>" be included
+  /// to enjoy it.
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Filesystem.h>
+  ///
+  /// ...
+  ///
+  /// /* Create the needed file handle class */
+  /// kodi::vfs::CFile myFile();
+  ///
+  /// /* In this example we use the user path for the add-on */
+  /// std::string file = kodi::GetUserPath() + "/myFile.txt";
+  ///
+  /// /* Now create and open the file or overwrite if present */
+  /// myFile.OpenFileForWrite(file, true);
+  ///
+  /// const char* str = "I love Kodi!";
+  ///
+  /// /* write string */
+  /// myFile.Write(str, sizeof(str));
+  ///
+  /// /* On this way the Close() is not needed to call, becomes done from destructor */
+  ///
+  /// ~~~~~~~~~~~~~
+  ///
+  //@{
+  class CFile
+  {
+  public:
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Construct a new, unopened file
+    ///
+    CFile() : m_file(nullptr) { }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Close() is called from the destructor, so explicitly closing the
+    /// file isn't required
+    ///
+    virtual ~CFile() { Close(); }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Open the file with filename via Kodi's \ref cpp_kodi_vfs_CFile
+    /// "CFile". Needs to be closed by calling Close() when done.
+    ///
+    /// @param[in] filename     The filename to open.
+    /// @param[in] flags        [opt] The flags to pass, see \ref OpenFileFlags
+    /// @return                 True on success or false on failure
+    ///
+    bool OpenFile(const std::string& filename, unsigned int flags = 0)
+    {
+      Close();
+      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), flags);
+      return m_file != nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Open the file with filename via Kodi's \ref cpp_kodi_vfs_CFile
+    /// "CFile" in write mode. Needs to be closed by calling Close() when
+    /// done.
+    ///
+    /// @note Related folders becomes created if not present.
+    ///
+    /// @param[in] filename     The filename to open.
+    /// @param[in] overwrite    True to overwrite, false otherwise.
+    /// @return                 True on success or false on failure
+    ///
+    bool OpenFileForWrite(const std::string& filename, bool overwrite = false)
+    {
+      Close();
+
+      // Try to open the file. If it fails, check if we need to create the directory first
+      // This way we avoid checking if the directory exists every time
+      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
+      if (!m_file)
+      {
+        std::string cacheDirectory = kodi::vfs::GetDirectoryName(filename);
+        if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()) ||
+            ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()))
+          m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
+      }
+      return m_file != nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Create a Curl representation
+    ///
+    /// @param[in] url          the URL of the Type.
+    /// @return                 True on success or false on failure
+    ///
+    bool CURLCreate(const std::string& url)
+    {
+      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_create(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
+      return m_file != nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Add options to the curl file created with CURLCreate
+    ///
+    /// @param[in] type         option type to set, see \ref CURLOptiontype
+    /// @param[in] name         name of the option
+    /// @param[in] value        value of the option
+    /// @return                 True on success or false on failure
+    ///
+    bool CURLAddOption(CURLOptiontype type, const std::string& name, const std::string& value)
+    {
+      if (!m_file)
+      {
+        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
+        return false;
+      }
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_add_option(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, type, name.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Open the curl file created with CURLCreate
+    ///
+    /// @param[in] flags        [opt] The flags to pass, see \ref OpenFileFlags
+    /// @return                 True on success or false on failure
+    ///
+    bool CURLOpen(unsigned int flags = 0)
+    {
+      if (!m_file)
+      {
+        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
+        return false;
+      }
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_open(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, flags);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Read from an open file.
+    ///
+    /// @param[in] ptr          The buffer to store the data in.
+    /// @param[in] size         The size of the buffer.
+    /// @return                 number of successfully read bytes if any bytes
+    ///                         were read and stored in buffer, zero if no bytes
+    ///                         are available to read (end of file was reached)
+    ///                         or undetectable error occur, -1 in case of any
+    ///                         explicit error
+    ///
+    ssize_t Read(void* ptr, size_t size)
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->read_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Read a string from an open file.
+    ///
+    /// @param[out] line        The buffer to store the data in.
+    /// @return                 True when a line was read, false otherwise.
+    ///
+    bool ReadLine(std::string &line)
+    {
+      line.clear();
+      if (!m_file)
+        return false;
+      // TODO: Read 1024 chars into buffer. If file position advanced that many
+      // chars, we didn't hit a newline. Otherwise, if file position is 1 or 2
+      // past the number of bytes read, we read (and skipped) a newline sequence.
+      char buffer[1025];
+      if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->read_file_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, buffer, sizeof(buffer)))
+      {
+        line = buffer;
+        return !line.empty();
+      }
+      return false;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Write to a file opened in write mode.
+    ///
+    /// @param[in] ptr          Pointer to the data to write, converted to a
+    ///                         const void*.
+    /// @param[in] size         Size of the data to write.
+    /// @return                 number of successfully written bytes if any
+    ///                         bytes were written, zero if no bytes were
+    ///                         written and no detectable error occur,-1 in case
+    ///                         of any explicit error
+    ///
+    ssize_t Write(const void* ptr, size_t size)
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->write_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Flush buffered data.
+    ///
+    /// If the given stream was open for writing (or if it was open for updating
+    /// and the last i/o operation was an output operation) any unwritten data
+    /// in its output buffer is written to the file.
+    ///
+    /// The stream remains open after this call.
+    ///
+    /// When a file is closed, either because of a call to close or because the
+    /// class is destructed, all the buffers associated with it are
+    /// automatically flushed.
+    ///
+    void Flush()
+    {
+      if (!m_file)
+        return;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->flush_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @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)
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->seek_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, position, whence);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Truncate a file to the requested size.
+    ///
+    /// @param[in] size                 The new max size.
+    /// @return                         New size? On error, the value -1 is
+    ///                                 returned.
+    ///
+    int Truncate(int64_t size)
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->truncate_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, size);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief The current offset in an open file.
+    ///
+    /// @return                 The requested offset. On error, the value -1 is
+    ///                         returned.
+    ///
+    int64_t GetPosition()
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Get the file size of an open file.
+    ///
+    /// @return                 The requested size. On error, the value -1 is
+    ///                         returned.
+    ///
+    int64_t GetLength()
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Checks the file access is on end position.
+    ///
+    /// @return                 If you've reached the end of the file, AtEnd() returns true.
+    ///
+    bool AtEnd()
+    {
+      if (!m_file)
+        return true;
+      int64_t length = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      int64_t position = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      return position >= length;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Close an open file.
+    ///
+    void Close()
+    {
+      if (!m_file)
+        return;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->close_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      m_file = nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Get the chunk size for an open file.
+    ///
+    /// @return                 The requested size. On error, the value -1 is
+    ///                         returned.
+    ///
+    int GetChunkSize()
+    {
+      if (!m_file)
+        return -1;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_chunk_size(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_vfs_CFile
+    /// @brief Get the current download speed of file if loaded from web.
+    ///
+    /// @return                 The current download speed.
+    ///
+    double GetFileDownloadSpeed()
+    {
+      if (!m_file)
+        return 0.0;
+      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_download_speed(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void* m_file;
+  };
+  //@}
+  //----------------------------------------------------------------------------
+
+} /* namespace vfs */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
new file mode 100644
index 0000000..50718af
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
@@ -0,0 +1,376 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonBase.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
+ */
+typedef struct AddonToKodiFuncTable_kodi
+{
+  bool (*open_settings_dialog)(void* kodiBase);
+  char* (*unknown_to_utf8)(void* kodiBase, const char* source, bool* ret, bool failOnBadChar);
+  char* (*get_localized_string)(void* kodiBase, long dwCode);
+  char* (*get_language)(void* kodiBase, int format, bool region);
+  bool (*queue_notification)(void* kodiBase, int type, const char* header, const char* message, const char* imageFile, unsigned int displayTime, bool withSound, unsigned int messageTime);
+} AddonToKodiFuncTable_kodi;
+
+//==============================================================================
+/// \ingroup cpp_kodi_Defs
+/// @brief For kodi::QueueNotification() used message types
+///
+typedef enum QueueMsg
+{
+  /// Show info notification message
+  QUEUE_INFO,
+  /// Show warning notification message
+  QUEUE_WARNING,
+  /// Show error notification message
+  QUEUE_ERROR,
+  /// Show with own given image and parts if set on values
+  QUEUE_OWN_STYLE
+} QueueMsg;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi_Defs
+/// @brief Format codes to get string from them.
+///
+typedef enum LangFormats
+{
+  /// two letter code as defined in ISO 639-1
+  LANG_FMT_ISO_639_1,
+  /// three letter code as defined in ISO 639-2/T or ISO 639-2/B
+  LANG_FMT_ISO_639_2,
+  /// full language name in English
+  LANG_FMT_ENGLISH_NAME
+} LangFormats;
+//------------------------------------------------------------------------------
+
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Opens this Add-Ons settings dialog.
+///
+/// @return true if settings were changed and the dialog confirmed, false otherwise.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ..
+/// kodi::OpenSettings();
+/// ..
+/// ~~~~~~~~~~~~~
+///
+inline bool OpenSettings()
+{
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->open_settings_dialog(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Returns an addon's localized 'unicode string'.
+///
+/// @param[in] labelId    string you want to localize
+/// @param[in] defaultStr [opt] The default message, also helps to identify
+///                       the code that is used <em>(default is
+///                       <b><c>empty</c></b>)</em>
+/// @return               The localized message, or default if the add-on
+///                       helper fails to return a message
+///
+/// @note Label id's \b 30000 to \b 30999 and \b 32000 to \b 32999 are related 
+/// to the add-on's own included strings from 
+/// <b>./resources/language/resource.language.??_??/strings.po</b>
+/// All other strings are from Kodi core language files.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string str = kodi::GetLocalizedString(30005, "Use me as default");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string GetLocalizedString(uint32_t labelId, const std::string& defaultStr = "")
+{
+  std::string retString = defaultStr;
+  char* strMsg = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_localized_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, labelId);
+  if (strMsg != nullptr)
+  {
+    if (std::strlen(strMsg))
+      retString = strMsg;
+    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strMsg);
+  }
+  return retString;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Translate a string with an unknown encoding to UTF8.
+///
+/// @param[in]  stringSrc       The string to translate.
+/// @param[out] utf8StringDst   The translated string.
+/// @param[in]  failOnBadChar   [opt] returns failed if bad character is inside <em>(default is <b><c>false</c></b>)</em>
+/// @return                     true if OK
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string ret;
+/// if (!kodi::UnknownToUTF8("test string", ret, true))
+///   fprintf(stderr, "Translation to UTF8 failed!\n");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool UnknownToUTF8(const std::string& stringSrc, std::string& utf8StringDst, bool failOnBadChar = false)
+{
+  bool ret = false;
+  char* retString = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->unknown_to_utf8(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
+                                                                                          stringSrc.c_str(), &ret, failOnBadChar);
+  if (retString != nullptr)
+  {
+    if (ret)
+      utf8StringDst = retString;
+    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, retString);
+  }
+  return ret;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Returns the active language as a string.
+///
+/// @param[in] format Used format of the returned language string
+///  | enum code:            | Description:                                               |
+///  |----------------------:|------------------------------------------------------------|
+///  | LANG_FMT_ENGLISH_NAME | full language name in English (Default)                    |
+///  | LANG_FMT_ISO_639_1    | two letter code as defined in ISO 639-1                    |
+///  | LANG_FMT_ISO_639_2    | three letter code as defined in ISO 639-2/T or ISO 639-2/B |
+/// @param[in] region [opt] append the region delimited by "-" of the language (setting) to the returned language string <em>(default is <b><c>false</c></b>)</em>
+/// @return active language
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string language = kodi::GetLanguage(LANG_FMT_ISO_639_1, false);
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string GetLanguage(LangFormats format = LANG_FMT_ENGLISH_NAME, bool region = false)
+{
+  std::string language;
+  char* retString = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_language(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, format, region);
+  if (retString != nullptr)
+  {
+    if (std::strlen(retString))
+      language = retString;
+    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, retString);
+  }
+  return language;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Writes the C string pointed by format in the GUI. 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] type          The message type.
+///  |  enum code:    | Description:                      |
+///  |---------------:|-----------------------------------|
+///  |  QUEUE_INFO    | Show info notification message    |
+///  |  QUEUE_WARNING | Show warning notification message |
+///  |  QUEUE_ERROR   | Show error notification message   |
+/// @param[in] format        The format of the message to pass to display in Kodi.
+///                      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] ... (additional arguments) 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).
+///            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.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// kodi::QueueFormattedNotification(QUEUE_WARNING, "I'm want to inform you, here with a test call to show '%s'", "this");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline void QueueFormattedNotification(QueueMsg type, const char* format, ... )
+{
+  va_list args;
+  char buffer[16384];
+  va_start(args, format);
+  vsprintf(buffer, format, args);
+  va_end(args);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->queue_notification(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
+                                                                           type, "", buffer, "", 5000, false, 1000);
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Queue a notification in the GUI.
+///
+/// @param[in] type          The message type.
+///  |  enum code:           | Description:
+///  |----------------------:|-----------------------------------
+///  |  QUEUE_INFO           | Show info notification message
+///  |  QUEUE_WARNING        | Show warning notification message
+///  |  QUEUE_ERROR          | Show error notification message
+///  |  QUEUE_OWN_STYLE      | If used can be with imageFile the wanted image set or if leaved empty shown as info, also are the other optional values available then
+/// @param[in] header        Header Name (if leaved empty becomes addon name used)
+/// @param[in] message       Message to display on Kodi
+/// @param[in] imageFile     [opt] The image file to show on message (to use must be type set to QUEUE_OWN_STYLE)
+/// @param[in] displayTime   [opt] The time how long message is displayed <b>(default 5 sec)</b> (to use must be type set to QUEUE_OWN_STYLE)
+/// @param[in] withSound     [opt] if true also warning sound becomes played <b>(default with sound)</b> (to use must be type set to QUEUE_OWN_STYLE)
+/// @param[in] messageTime   [opt] how many milli seconds start show of notification <b>(default 1 sec)</b> (to use must be type set to QUEUE_OWN_STYLE)
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// kodi::QueueNotification(QUEUE_OWN_STYLE, "I'm want to inform you", "Here with a test call", "", 3000, false, 1000);
+/// ...
+/// ~~~~~~~~~~~~~
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// kodi::QueueNotification(QUEUE_WARNING, "I'm want to inform you", "Here with a test call");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// kodi::QueueNotification(QUEUE_OWN_STYLE, "", "Here with a test call", "./myImage.png");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline void QueueNotification(QueueMsg type, const std::string& header,
+                              const std::string& message, const std::string& imageFile = "",
+                              unsigned int displayTime = 5000, bool withSound = true,
+                              unsigned int messageTime = 1000)
+{
+  ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->queue_notification(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
+                                                                           type, header.c_str(), message.c_str(), imageFile.c_str(), displayTime,
+                                                                           withSound, messageTime);
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
new file mode 100644
index 0000000..f27b710
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
@@ -0,0 +1,187 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonBase.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
+ */
+typedef struct AddonToKodiFuncTable_kodi_network
+{
+  bool (*wake_on_lan)(void* kodiBase, const char *mac);
+  char* (*get_ip_address)(void* kodiBase);
+  char* (*dns_lookup)(void* kodiBase, const char* url, bool* ret);
+  char* (*url_encode)(void* kodiBase, const char* url);
+} AddonToKodiFuncTable_kodi_network;
+
+//==============================================================================
+///
+/// \defgroup cpp_kodi_network  Interface - kodi::network
+/// \ingroup cpp
+/// @brief **Network functions**
+///
+/// The network module offers functions that allow you to control it.
+///
+/// It has the header \ref Network.h "#include <kodi/Network.h>" be included
+/// to enjoy it.
+///
+//------------------------------------------------------------------------------
+
+namespace kodi
+{
+namespace network
+{
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_network
+  /// @brief Send WakeOnLan magic packet.
+  ///
+  /// @param[in] mac Network address of the host to wake.
+  /// @return True if the magic packet was successfully sent, false otherwise.
+  ///
+  inline bool WakeOnLan(const std::string& mac)
+  {
+    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->wake_on_lan(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, mac.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_network
+  /// @brief To the current own ip address as a string.
+  ///
+  /// @return Own system ip.
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Network.h>
+  /// ...
+  /// std::string ipAddress = kodi::network::GetIPAddress();
+  /// fprintf(stderr, "My IP is '%s'\n", ipAddress.c_str());
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline std::string GetIPAddress()
+  {
+    std::string ip;
+    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->get_ip_address(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+    if (string != nullptr)
+    {
+      ip = string;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
+    }
+    return ip;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_network
+  /// @brief URL encodes the given string
+  ///
+  /// This function converts the given input string to a URL encoded string and
+  /// returns that as a new allocated string. All input characters that are
+  /// not a-z, A-Z, 0-9, '-', '.', '_' or '~' are converted to their "URL escaped"
+  /// version (%NN where NN is a two-digit hexadecimal number).
+  ///
+  /// @param[in] url The code of the message to get.
+  /// @return Encoded URL string
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Network.h>
+  /// ...
+  /// std::string encodedUrl = kodi::network::URLEncode("François");
+  /// fprintf(stderr, "Encoded URL is '%s'\n", encodedUrl.c_str());
+  /// ...
+  /// ~~~~~~~~~~~~~
+  /// For example, the string: François ,would be encoded as: Fran%C3%A7ois
+  ///
+  inline std::string URLEncode(const std::string& url)
+  {
+    std::string retString;
+    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->url_encode(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
+    if (string != nullptr)
+    {
+      retString = string;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
+    }
+    return retString;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_network
+  /// @brief Lookup URL in DNS cache
+  ///
+  /// This test will get DNS record for a domain. The DNS lookup is done directly
+  /// against the domain's authoritative name server, so changes to DNS Records
+  /// should show up instantly. By default, the DNS lookup tool will return an
+  /// IP address if you give it a name (e.g. www.example.com)
+  ///
+  /// @param[in] hostName   The code of the message to get.
+  /// @param[out] ipAddress Returned address
+  /// @return true if successfull
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/Network.h>
+  /// ...
+  /// std::string ipAddress;
+  /// bool ret = kodi::network::DNSLookup("www.google.com", ipAddress);
+  /// fprintf(stderr, "DNSLookup returned for www.google.com the IP '%s', call was %s\n", ipAddress.c_str(), ret ? "ok" : "failed");
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline bool DNSLookup(const std::string& hostName, std::string& ipAddress)
+  {
+    bool ret = false;
+    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->dns_lookup(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, hostName.c_str(), &ret);
+    if (string != nullptr)
+    {
+      ipAddress = string;
+      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
+    }
+    return ret;
+  }
+  //----------------------------------------------------------------------------
+
+} /* namespace network */
+} /* 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
new file mode 100644
index 0000000..39baae7
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
@@ -0,0 +1,141 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+
+namespace kodi { namespace addon { class CInstanceScreensaver; }}
+
+extern "C"
+{
+
+struct AddonInstance_Screensaver;
+
+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;
+
+typedef struct AddonToKodiFuncTable_Screensaver
+{
+  KODI_HANDLE kodiInstance;
+} AddonToKodiFuncTable_Screensaver;
+
+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;
+
+typedef struct AddonInstance_Screensaver
+{
+  AddonProps_Screensaver props;
+  AddonToKodiFuncTable_Screensaver toKodi;
+  KodiToAddonFuncTable_Screensaver toAddon;
+} AddonInstance_Screensaver;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstanceScreensaver : public IAddonInstance
+  {
+  public:
+    CInstanceScreensaver()
+      : IAddonInstance(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;
+    }
+
+    CInstanceScreensaver(KODI_HANDLE instance)
+      : IAddonInstance(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);
+    }
+
+    virtual ~CInstanceScreensaver() { }
+
+    virtual bool Start() { return true; }
+    virtual void Stop() {}
+    virtual void Render() {}
+
+    inline void* Device() { return m_instanceData->props.device; }
+    inline int X() { return m_instanceData->props.x; }
+    inline int Y() { return m_instanceData->props.y; }
+    inline int Width() { return m_instanceData->props.width; }
+    inline int Height() { return m_instanceData->props.height; }
+    inline float PixelRatio() { return m_instanceData->props.pixelRatio; }
+    inline std::string Name() { return m_instanceData->props.name; }
+    inline std::string Presets() { return m_instanceData->props.presets; }
+    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)
+    {
+      return instance->toAddon.addonInstance->Start();
+    }
+
+    inline static void ADDON_Stop(AddonInstance_Screensaver* instance)
+    {
+      instance->toAddon.addonInstance->Stop();
+    }
+
+    inline static void ADDON_Render(AddonInstance_Screensaver* instance)
+    {
+      instance->toAddon.addonInstance->Render();
+    }
+
+    AddonInstance_Screensaver* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h
new file mode 100644
index 0000000..66a1c90
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h
@@ -0,0 +1,95 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogContextMenu Dialog Context Menu
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_namespace{ kodi::gui::DialogContextMenu }
+  /// **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 DialogContextMenu.h "#include <kodi/gui/DialogContextMenu.h>"
+  /// be included to enjoy it.
+  ///
+  ///
+  namespace DialogContextMenu
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogContextMenu
+    /// @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/DialogContextMenu.h>
+    ///
+    /// const std::vector<std::string> entries
+    /// {
+    ///   "Test 1",
+    ///   "Test 2",
+    ///   "Test 3",
+    ///   "Test 4",
+    ///   "Test 5"
+    /// };
+    ///
+    /// int selected = kodi::gui::DialogContextMenu::Show("Test selection", entries);
+    /// if (selected < 0)
+    ///   fprintf(stderr, "Item selection canceled\n");
+    /// else
+    ///   fprintf(stderr, "Selected item is: %i\n", selected);
+    /// ~~~~~~~~~~~~~
+    ///
+    inline int Show(const std::string& heading, const std::vector<std::string>& entries)
+    {
+      using namespace ::kodi::addon;
+      unsigned int size = 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;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h
new file mode 100644
index 0000000..b6f2deb
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h
@@ -0,0 +1,244 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_CDialogExtendedProgress Dialog Extended Progress
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::CDialogExtendedProgress }
+  /// **Progress dialog shown for background work**
+  ///
+  /// The with \ref DialogExtendedProgress.h "#include <kodi/gui/DialogExtendedProgress.h>"
+  /// given class are basically used to create Kodi's extended progress.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/gui/DialogExtendedProgress.h>
+  ///
+  /// kodi::gui::CDialogExtendedProgress *ext_progress = new kodi::gui::CDialogExtendedProgress("Test Extended progress");
+  /// ext_progress->SetText("Test progress");
+  /// for (unsigned int i = 0; i < 50; i += 10)
+  /// {
+  ///   ext_progress->SetProgress(i, 100);
+  ///   sleep(1);
+  /// }
+  ///
+  /// ext_progress->SetTitle("Test Extended progress - Second round");
+  /// ext_progress->SetText("Test progress - Step 2");
+  ///
+  /// for (unsigned int i = 50; i < 100; i += 10)
+  /// {
+  ///   ext_progress->SetProgress(i, 100);
+  ///   sleep(1);
+  /// }
+  /// delete ext_progress;
+  /// ~~~~~~~~~~~~~
+  ///
+  class CDialogExtendedProgress
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// Construct a new dialog
+    ///
+    /// @param[in] title  Title string
+    ///
+    CDialogExtendedProgress(const std::string& title = "")
+    {
+      using namespace ::kodi::addon;
+      m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase, title.c_str());
+      if (!m_DialogHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CDialogExtendedProgress can't create window class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// Destructor
+    ///
+    ~CDialogExtendedProgress()
+    {
+      using namespace ::kodi::addon;
+      if (m_DialogHandle)
+        CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->delete_dialog(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief Get the used title
+    ///
+    /// @return Title string
+    ///
+    std::string Title() const
+    {
+      using namespace ::kodi::addon;
+      std::string text;
+      char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_title(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+      if (strMsg != nullptr)
+      {
+        if (std::strlen(strMsg))
+          text = strMsg;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMsg);
+      }
+      return text;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief To set the title of dialog
+    ///
+    /// @param[in] title     Title string
+    ///
+    void SetTitle(const std::string& title)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_title(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, title.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief Get the used text information string
+    ///
+    /// @return Text string
+    ///
+    std::string Text() const
+    {
+      using namespace ::kodi::addon;
+      std::string text;
+      char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_text(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+      if (strMsg != nullptr)
+      {
+        if (std::strlen(strMsg))
+          text = strMsg;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMsg);
+      }
+      return text;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief To set the used text information string
+    ///
+    /// @param[in] text         information text to set
+    ///
+    void SetText(const std::string& text)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_text(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief To ask dialog is finished
+    ///
+    /// @return True if on end
+    ///
+    bool IsFinished() const
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->is_finished(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief Mark progress finished
+    ///
+    void MarkFinished()
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->mark_finished(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief Get the current progress position as percent
+    ///
+    /// @return Position
+    ///
+    float Percentage() const
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief To set the current progress position as percent
+    ///
+    /// @param[in] percentage   Position to use from 0.0 to 100.0
+    ///
+    void SetPercentage(float percentage)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// @brief To set progress position with predefined places
+    ///
+    /// @param[in] currentItem    Place position to use
+    /// @param[in] itemCount      Amount of used places
+    ///
+    void SetProgress(int currentItem, int itemCount)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_progress(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, currentItem, itemCount);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void* m_DialogHandle;
+  };
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h
new file mode 100644
index 0000000..e348125
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h
@@ -0,0 +1,293 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogFileBrowser Dialog File Browser
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_namespace{ kodi::gui::DialogFileBrowser }
+  /// **File browser dialog**
+  ///
+  /// The functions listed below of the class "DialogFileBrowser" 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 DialogFileBrowser.h "#include <kodi/gui/DialogFileBrowser.h>"
+  /// be included to enjoy it.
+  ///
+  namespace DialogFileBrowser
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// @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/DialogFileBrowser.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::DialogFileBrowser::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 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_DialogFileBrowser
+    /// @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 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_DialogFileBrowser
+    /// @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 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_DialogFileBrowser
+    /// @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 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.push_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_DialogFileBrowser
+    /// @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 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_DialogFileBrowser
+    /// @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 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_DialogFileBrowser
+    /// @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 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.push_back(list[i]);
+        CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h
new file mode 100644
index 0000000..9261972
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h
@@ -0,0 +1,416 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogKeyboard Dialog Keyboard
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_namespace{ kodi::gui::DialogKeyboard }
+  /// **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 DialogKeyboard.h "#include <kodi/gui/DialogKeyboard.h>"
+  /// be included to enjoy it.
+  ///
+  namespace DialogKeyboard
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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/DialogKeyboard.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::DialogKeyboard::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 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)
+      {
+        if (std::strlen(retString))
+          text = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          text = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          newPassword = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          newPassword = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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/DialogKeyboard.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::DialogKeyboard::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 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)
+      {
+        if (std::strlen(retString))
+          newPassword = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          newPassword = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          password = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          text = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// @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 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_DialogKeyboard
+    /// @brief Check for visible keyboard on GUI
+    ///
+    /// @return  true if keyboard present, false if not present
+    ///
+    inline bool IsKeyboardActivated()
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->is_keyboard_activated(CAddonBase::m_interface->toKodi->kodiBase);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h
new file mode 100644
index 0000000..8b5c592
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h
@@ -0,0 +1,366 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogNumeric Dialog Numeric
+  /// \ingroup cpp_kodi_gui
+  /// @{
+  /// @brief \cpp_namespace{ kodi::gui::DialogNumeric }
+  /// **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 DialogNumeric.h "#include <kodi/gui/DialogNumeric.h>"
+  /// be included to enjoy it.
+  ///
+  namespace DialogNumeric
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// @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 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)
+      {
+        if (std::strlen(pw))
+          newPassword = pw;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, pw);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// @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/DialogNumeric.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::DialogNumeric::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 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_DialogNumeric
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          toVerify = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// @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/DialogNumeric.h>
+    ///
+    /// time_t rawtime;
+    /// struct tm * timeinfo;
+    /// char buffer [10];
+    ///
+    /// time (&rawtime);
+    /// timeinfo = localtime(&rawtime);
+    /// bool bRet = kodi::gui::DialogNumeric::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 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_DialogNumeric
+    /// @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/DialogNumeric.h>
+    ///
+    /// time_t rawtime;
+    /// struct tm * timeinfo;
+    /// char buffer [20];
+    ///
+    /// time (&rawtime);
+    /// timeinfo = localtime(&rawtime);
+    /// bool bRet = kodi::gui::DialogNumeric::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 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_DialogNumeric
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          ipAddress = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// @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/DialogNumeric.h>
+    ///
+    ///   std::string number;
+    ///   bool bRet = kodi::gui::DialogNumeric::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 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)
+      {
+        if (std::strlen(retString))
+          input = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// @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 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)
+      {
+        if (std::strlen(retString))
+          time = retString;
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+      }
+      return ret;
+    }
+    //--------------------------------------------------------------------------
+  };
+  /// @}
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h
new file mode 100644
index 0000000..fa98241
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h
@@ -0,0 +1,104 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+#include "definitions.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogOK Dialog OK
+  /// \ingroup cpp_kodi_gui
+  /// @{
+  /// @brief \cpp_namespace{ kodi::gui::DialogOK }
+  /// **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 DialogOK.h "#include <kodi/gui/DialogOK.h>"
+  /// be included to enjoy it.
+  ///
+  namespace DialogOK
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogOK
+    /// @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/DialogOK.h>
+    /// ...
+    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
+    /// ~~~~~~~~~~~~~
+    ///
+    inline void 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_DialogOK
+    /// @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/DialogOK.h>
+    /// ...
+    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
+    /// ~~~~~~~~~~~~~
+    ///
+    inline void 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 gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h
new file mode 100644
index 0000000..e652644
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h
@@ -0,0 +1,249 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_CDialogProgress Dialog Progress
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::CDialogProgress }
+  /// **Progress dialog shown in center**
+  ///
+  /// The with \ref DialogProgress.h "#include <kodi/gui/DialogProgress.h>"
+  /// given class are basically used to create Kodi's progress dialog with named
+  /// text fields.
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/gui/DialogProgress.h>
+  ///
+  /// kodi::gui::CDialogProgress *progress = new kodi::gui::CDialogProgress;
+  /// progress->SetHeading("Test progress");
+  /// progress->SetLine(1, "line 1");
+  /// progress->SetLine(2, "line 2");
+  /// progress->SetLine(3, "line 3");
+  /// progress->SetCanCancel(true);
+  /// progress->ShowProgressBar(true);
+  /// progress->Open();
+  /// for (unsigned int i = 0; i < 100; i += 10)
+  /// {
+  ///   progress->SetPercentage(i);
+  ///   sleep(1);
+  /// }
+  /// delete progress;
+  /// ~~~~~~~~~~~~~
+  ///
+  class CDialogProgress
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief Construct a new dialog
+    ///
+    CDialogProgress()
+    {
+      using namespace ::kodi::addon;
+      m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase);
+      if (!m_DialogHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CDialogProgress can't create window class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief Destructor
+    ///
+    ~CDialogProgress()
+    {
+      using namespace ::kodi::addon;
+      if (m_DialogHandle)
+        CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->delete_dialog(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To open the dialog
+    ///
+    void Open()
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->open(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief Set the heading title of dialog
+    ///
+    /// @param[in] heading Title string to use
+    ///
+    void SetHeading(const std::string& heading)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_heading(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, heading.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To set the line text field on dialog from 0 - 2
+    ///
+    /// @param[in] iLine Line number
+    /// @param[in] line Text string
+    ///
+    void SetLine(unsigned int iLine, const std::string& line)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_line(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, iLine, line.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To enable and show cancel button on dialog
+    ///
+    /// @param[in] canCancel if true becomes it shown
+    ///
+    void SetCanCancel(bool canCancel)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_can_cancel(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, canCancel);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To check dialog for clicked cancel button
+    ///
+    /// @return True if canceled
+    ///
+    bool IsCanceled() const
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->is_canceled(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief Get the current progress position as percent
+    ///
+    /// @param[in] percentage Position to use from 0 to 100
+    ///
+    void SetPercentage(int percentage)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To set the current progress position as percent
+    ///
+    /// @return Current Position used from 0 to 100
+    ///
+    int GetPercentage() const
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->get_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To show or hide progress bar dialog
+    ///
+    /// @param[in] onOff If true becomes it shown
+    ///
+    void ShowProgressBar(bool onOff)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->show_progress_bar(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, onOff);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief Set the maximum position of progress, needed if `SetProgressAdvance(...)` is used
+    ///
+    /// @param[in] max Biggest usable position to use
+    ///
+    void SetProgressMax(int max)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_max(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, max);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To increase progress bar by defined step size until reach of maximum position
+    ///
+    /// @param[in] steps Step size to increase, default is 1
+    ///
+    void SetProgressAdvance(int steps=1)
+    {
+      using namespace ::kodi::addon;
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_advance(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, steps);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// @brief To check progress was canceled on work
+    ///
+    /// @return True if aborted
+    ///
+    bool Abort()
+    {
+      using namespace ::kodi::addon;
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->abort(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void* m_DialogHandle;
+  };
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h
new file mode 100644
index 0000000..36433db
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h
@@ -0,0 +1,101 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogSelect Dialog Select
+  /// \ingroup cpp_kodi_gui
+  /// @{
+  /// @brief \cpp_namespace{ kodi::gui::DialogSelect }
+  /// **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 DialogSelect.h "#include <kodi/gui/DialogSelect.h>"
+  /// be included to enjoy it.
+  ///
+  ///
+  namespace DialogSelect
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogSelect
+    /// @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 a time
+    /// @return                 The selected entry, if return <tt>-1</tt> was
+    ///                         nothing selected or canceled
+    ///
+    ///
+    ///-------------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    /// #include <kodi/gui/DialogSelect.h>
+    ///
+    /// const std::vector<std::string> entries
+    /// {
+    ///   "Test 1",
+    ///   "Test 2",
+    ///   "Test 3",
+    ///   "Test 4",
+    ///   "Test 5"
+    /// };
+    ///
+    /// int selected = kodi::gui::DialogSelect::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 Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, bool autoclose = false)
+    {
+      using namespace ::kodi::addon;
+      unsigned int size = 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;
+    }
+    //--------------------------------------------------------------------------
+  };
+  /// @}
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h
new file mode 100644
index 0000000..09c81bd
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h
@@ -0,0 +1,115 @@
+#pragma once
+/*
+ *      Copyright (C) 2015-2016 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogTextViewer Dialog Text Viewer
+  /// \ingroup cpp_kodi_gui
+  /// @{
+  /// @brief \cpp_namespace{ kodi::gui::DialogTextViewer }
+  /// **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 DialogTextViewer.h "#include <kodi/gui/DialogTextViewer.h>"
+  /// be included to enjoy it.
+  ///
+  namespace DialogTextViewer
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogTextViewer
+    /// @brief Show info text dialog
+    ///
+    /// @param[in] heading  Small heading text
+    /// @param[in] text     Showed text on dialog
+    ///
+    ///
+    ///-------------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    /// #include <kodi/gui/DialogTextViewer.h>
+    ///
+    /// kodi::gui::DialogTextViewer::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 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 gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h
new file mode 100644
index 0000000..064bf8c
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h
@@ -0,0 +1,187 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "definitions.h"
+#include "../AddonBase.h"
+
+namespace kodi
+{
+namespace gui
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_DialogYesNo Dialog Yes/No
+  /// \ingroup cpp_kodi_gui
+  /// @{
+  /// @brief \cpp_namespace{ kodi::gui::DialogYesNo }
+  /// **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 DialogYesNo.h "#include <kodi/gui/DialogYesNo.h>"
+  /// be included to enjoy it.
+  ///
+  ///
+  namespace DialogYesNo
+  {
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// @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/DialogYesNo.h>
+    ///
+    /// bool canceled;
+    /// bool ret = kodi::gui::DialogYesNo::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 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_DialogYesNo
+    /// @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/DialogYesNo.h>
+    ///
+    /// bool ret = kodi::gui::DialogYesNo::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 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_DialogYesNo
+    /// @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/DialogYesNo.h>
+    ///
+    /// bool canceled;
+    /// bool ret = kodi::gui::DialogYesNo::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 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 gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..f1df60d
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
@@ -0,0 +1,156 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#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 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 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 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 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 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 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 GetCurrentWindowId()
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_id(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
new file mode 100644
index 0000000..a473f28
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
@@ -0,0 +1,336 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+#include "definitions.h"
+
+#include <memory>
+
+namespace kodi
+{
+namespace gui
+{
+
+  class CWindow;
+
+  class CAddonGUIControlBase
+  {
+  public:
+    GUIHANDLE GetControlHandle() const { return m_controlHandle; }
+
+  protected:
+    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 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] thumbnailImage       Thumbnail Image of item (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& thumbnailImage = "",
+      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(),
+                                                                thumbnailImage.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
+     */
+    CListItem(GUIHANDLE listItemHandle)
+      : CAddonGUIControlBase(nullptr)
+    {
+      m_controlHandle = listItemHandle;
+    }
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Class destructor
+    ///
+    virtual ~CListItem()
+    {
+      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 To get current icon image of entry
+    ///
+    /// @return The current icon image path (if present)
+    ///
+    std::string GetIconImage()
+    {
+      std::string image;
+      char* ret = m_interface->kodi_gui->listItem->get_icon_image(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          image = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return image;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief To set icon image of entry
+    ///
+    /// @param image                    The image to use for.
+    ///
+    /// @note Alternative can be \ref SetArt used
+    ///
+    ///
+    void SetIconImage(const std::string& image)
+    {
+      m_interface->kodi_gui->listItem->set_icon_image(m_interface->kodiBase, m_controlHandle, image.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());
+    }
+    //--------------------------------------------------------------------------
+
+  };
+
+} /* 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
new file mode 100644
index 0000000..7069e63
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -0,0 +1,503 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+#include "ListItem.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../ActionIDs.h"
+#else
+#include "input/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 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
+    ///
+    ///
+    ///
+    virtual ~CWindow()
+    {
+      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.
+    ///
+    /// @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 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 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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    //
+    /// @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)
+    {
+      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),
+      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)
+    {
+      return static_cast<CWindow*>(cbhdl)->OnAction(actionId);
+    }
+
+    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 = 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/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
new file mode 100644
index 0000000..a4cf963
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -0,0 +1,209 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#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);
+} AddonToKodiFuncTable_kodi_gui_general;
+
+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 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, bool 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* thumbnail_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_icon_image)(void* kodiBase, void* handle);
+  void (*set_icon_image)(void* kodiBase, void* handle, const char* image);
+  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);
+} 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
+{
+  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 (*)(void* handle),
+       bool (*)(void* handle, int),
+       bool (*)(void* handle, int),
+       bool (*)(void* handle, int),
+       void (*)(void* handle, int, gui_context_menu_pair*, unsigned int*),
+       bool (*)(void* handle, int, unsigned int));
+  bool (*show)(void* kodiBase, void* handle);
+  bool (*close)(void* kodiBase, void* handle);
+  bool (*do_modal)(void* kodiBase, void* handle);
+  void (*clear_item_list)(void* kodiBase, void* handle);
+  void (*add_list_item)(void* kodiBase, void* handle, void* item, int item_position);
+  void* (*get_list_item)(void* kodiBase, void* handle, int listPos);
+} AddonToKodiFuncTable_kodi_gui_window;
+
+typedef struct AddonToKodiFuncTable_kodi_gui
+{
+  AddonToKodiFuncTable_kodi_gui_general* general;
+  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;
+  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/kodi_adsp_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h
index c1d8238..b0ecb8b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h
@@ -49,7 +49,7 @@
  *     to his type) about his given sample rate.
  *   - About the from user selected master processing mode the related addon
  *     becomes called now with MasterProcessSetMode(...) to handle it's
- *     selectionon the addon given by the own addon type identifier or by
+ *     selection on the addon given by the own addon type identifier or by
  *     KODI's useddatabase id, also the currently used stream type (e.g.
  *     Music or Video) is send.
  *     - If the addon supports only one master mode it can ignore this function
@@ -97,39 +97,6 @@ extern "C"
   /*! @name Audio DSP add-on methods */
   //@{
   /*!
-   * Get the KODI_AE_DSP_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with KODI.
-   * @return The KODI_AE_DSP_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetAudioDSPAPIVersion(void);
-
-  /*!
-   * Get the KODI_AE_DSP_MIN_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with KODI.
-   * @return The KODI_AE_DSP_MIN_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetMinimumAudioDSPAPIVersion(void);
-
-  /*!
-   * @brief Get the KODI_GUI_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with KODI.
-   * @return The KODI_GUI_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetGUIAPIVersion(void);
-
-  /*!
-   * @brief Get the KODI_GUI_MIN_API_VERSION that was used to compile this
-   * add-on.
-   * Used to check if this add-on is compatible with KODI.
-   * @return The KODI_GUI_MIN_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetMinimumGUIAPIVersion(void);
-
-  /*!
    * @brief Get the list of features that this add-on provides.
    * Called by KODI to query the add-ons capabilities.
    * Used to check which options should be presented in the DSP, which methods
@@ -179,7 +146,7 @@ extern "C"
    * surround upmix not needed on 5.1 audio stream.
    * @param addonSettings The add-ons audio settings.
    * @param pProperties The properties of the currently playing stream.
-   * @param handle On this becomes addon informated about stream id and can set function addresses which need on calls
+   * @param handle On this becomes addon informed about stream id and can set function addresses which need on calls
    * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully
    * and data can be performed. AE_DSP_ERROR_IGNORE_ME if format is not
    * supported, but without fault.
@@ -517,12 +484,10 @@ extern "C"
   //@}
 
   // function to export the above structure to KODI
-  void __declspec(dllexport) get_addon(struct AudioDSP* pDSP)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pDSP->GetAudioDSPAPIVersion                 = GetAudioDSPAPIVersion;
-    pDSP->GetMinimumAudioDSPAPIVersion          = GetMinimumAudioDSPAPIVersion;
-    pDSP->GetGUIAPIVersion                      = GetGUIAPIVersion;
-    pDSP->GetMinimumGUIAPIVersion               = GetMinimumGUIAPIVersion;
+    KodiToAddonFuncTable_AudioDSP* pDSP = static_cast<KodiToAddonFuncTable_AudioDSP*>(ptr);
+
     pDSP->GetAddonCapabilities                  = GetAddonCapabilities;
     pDSP->GetDSPName                            = GetDSPName;
     pDSP->GetDSPVersion                         = GetDSPVersion;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h
index 6e492c8..7dc7ae8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h
@@ -24,9 +24,7 @@
  * Common data structures shared between KODI and KODI's audio DSP add-ons
  */
 
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
+#ifndef TARGET_WINDOWS
 #ifndef __cdecl
 #define __cdecl
 #endif
@@ -38,7 +36,6 @@
 #include <cstddef>
 
 #include "xbmc_addon_types.h"
-#include "xbmc_codec_types.h"
 
 #undef ATTRIBUTE_PACKED
 #undef PRAGMA_PACK_BEGIN
@@ -61,16 +58,11 @@
 #define AE_DSP_STREAM_MAX_STREAMS               8
 #define AE_DSP_STREAM_MAX_MODES                 32
 
-/* current Audio DSP API version */
-#define KODI_AE_DSP_API_VERSION                 "0.1.8"
-
-/* min. Audio DSP API version */
-#define KODI_AE_DSP_MIN_API_VERSION             "0.1.8"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+  typedef void* ADSPHANDLE;
   typedef unsigned int AE_DSP_STREAM_ID;
 
   /*!
@@ -261,15 +253,6 @@ extern "C" {
   } ATTRIBUTE_PACKED AE_DSP_MENUHOOK;
 
   /*!
-   * @brief Properties passed to the Create() method of an add-on.
-   */
-  typedef struct AE_DSP_PROPERTIES
-  {
-    const char* strUserPath;                    /*!< @brief path to the user profile */
-    const char* strAddonPath;                   /*!< @brief path to this add-on */
-  } AE_DSP_PROPERTIES;
-
-  /*!
    * @brief Audio DSP add-on capabilities. All capabilities are set to "false" as default.
    * If a capability is set to true, then the corresponding methods from kodi_audiodsp_dll.h need to be implemented.
    */
@@ -442,7 +425,7 @@ extern "C" {
     struct AE_DSP_MODE
     {
       int               iUniqueDBModeId;                                  /*!< @brief (required) the inside add-on used identifier for the mode, set by KODI's audio DSP database */
-      AE_DSP_MODE_TYPE  iModeType;                                        /*!< @brief (required) the processong mode type, see AE_DSP_MODE_TYPE */
+      AE_DSP_MODE_TYPE  iModeType;                                        /*!< @brief (required) the processing mode type, see AE_DSP_MODE_TYPE */
       char              strModeName[AE_DSP_ADDON_STRING_LENGTH];          /*!< @brief (required) the addon name of the mode, used on KODI's logs  */
 
       unsigned int      iModeNumber;                                      /*!< @brief (required) number of this mode on the add-on, is used on process functions with value "mode_id" */
@@ -474,7 +457,36 @@ extern "C" {
   /*!
    * @brief Structure to transfer the methods from kodi_audiodsp_dll.h to KODI
    */
-  struct AudioDSP
+
+  typedef struct AddonProps_AudioDSP
+  {
+    const char* strUserPath;                    /*!< @brief path to the user profile */
+    const char* strAddonPath;                   /*!< @brief path to this add-on */
+  } AddonProps_AudioDSP;
+
+  typedef AddonProps_AudioDSP AE_DSP_PROPERTIES;
+
+  typedef struct AddonToKodiFuncTable_AudioDSP
+  {
+    KODI_HANDLE kodiInstance;
+
+    void (*AddMenuHook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
+    void (*RemoveMenuHook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
+    void (*RegisterMode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
+    void (*UnregisterMode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
+
+    ADSPHANDLE (*SoundPlay_GetHandle)(void* kodiInstance, const char *filename);
+    void (*SoundPlay_ReleaseHandle)(void* kodiInstance, ADSPHANDLE handle);
+    void (*SoundPlay_Play)(void* kodiInstance, ADSPHANDLE handle);
+    void (*SoundPlay_Stop)(void* kodiInstance, ADSPHANDLE handle);
+    bool (*SoundPlay_IsPlaying)(void* kodiInstance, ADSPHANDLE handle);
+    void (*SoundPlay_SetChannel)(void* kodiInstance, ADSPHANDLE handle, AE_DSP_CHANNEL channel);
+    AE_DSP_CHANNEL (*SoundPlay_GetChannel)(void* kodiInstance, ADSPHANDLE handle);
+    void (*SoundPlay_SetVolume)(void* kodiInstance, ADSPHANDLE handle, float volume);
+    float (*SoundPlay_GetVolume)(void* kodiInstance, ADSPHANDLE handle);
+  } AddonToKodiFuncTable_AudioDSP;
+
+  typedef struct KodiToAddonFuncTable_AudioDSP
   {
     const char*  (__cdecl* GetAudioDSPAPIVersion)                (void);
     const char*  (__cdecl* GetMinimumAudioDSPAPIVersion)         (void);
@@ -516,7 +528,14 @@ extern "C" {
     unsigned int (__cdecl* OutputResampleProcess)                (const ADDON_HANDLE, float**, float**, unsigned int);
     float        (__cdecl* OutputResampleGetDelay)               (const ADDON_HANDLE);
     int          (__cdecl* OutputResampleSampleRate)             (const ADDON_HANDLE);
-  };
+  } KodiToAddonFuncTable_AudioDSP;
+
+  typedef struct AddonInstance_AudioDSP
+  {
+    AddonProps_AudioDSP props;
+    AddonToKodiFuncTable_AudioDSP toKodi;
+    KodiToAddonFuncTable_AudioDSP toAddon;
+  } AddonInstance_AudioDSP;
 
 #ifdef __cplusplus
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h
index 78bc3cc..5232947 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h
@@ -48,13 +48,15 @@ extern "C"
   bool DeInit(void* context);
 
   // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(struct AudioDecoder* pScr)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pScr->Init = Init;
-    pScr->ReadPCM = ReadPCM;
-    pScr->Seek = Seek;
-    pScr->ReadTag = ReadTag;
-    pScr->TrackCount = TrackCount;
-    pScr->DeInit = DeInit;
+    AddonInstance_AudioDecoder* pScr = static_cast<AddonInstance_AudioDecoder*>(ptr);
+
+    pScr->toAddon.Init = Init;
+    pScr->toAddon.ReadPCM = ReadPCM;
+    pScr->toAddon.Seek = Seek;
+    pScr->toAddon.ReadTag = ReadTag;
+    pScr->toAddon.TrackCount = TrackCount;
+    pScr->toAddon.DeInit = DeInit;
   };
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h
index 82d71e5..6820b91 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h
@@ -34,12 +34,17 @@ extern "C"
     int dummy;
   };
 
-  struct AUDIODEC_PROPS
+  typedef struct AddonProps_AudioDecoder
   {
-    int dummy;
-  };
+    const char* mimetype;
+  } AddonProps_AudioDecoder;
+
+  typedef struct AddonToKodiFuncTable_AudioDecoder
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_AudioDecoder;
 
-  struct AudioDecoder
+  typedef struct KodiToAddonFuncTable_AudioDecoder
   {
     //! \brief Initialize a decoder
     //! \param file The file to read
@@ -97,5 +102,12 @@ extern "C"
     //! \return True on success, false on failure
     //! \sa ICodec::DeInit
     bool (__cdecl* DeInit)(void* context);
-  };
+  } KodiToAddonFuncTable_AudioDecoder;
+
+  typedef struct AddonInstance_AudioDecoder
+  {
+    AddonProps_AudioDecoder props;
+    AddonToKodiFuncTable_AudioDecoder toKodi;
+    KodiToAddonFuncTable_AudioDecoder toAddon;
+  } AddonInstance_AudioDecoder;
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h
deleted file mode 100644
index 0402ace..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-/*!
- * Common data structures shared between KODI and KODI's binary add-ons
- */
-
-#ifdef BUILD_KODI_ADDON
-  #include "kodi/AudioEngine/AEChannelInfo.h"
-#else
-  #include "cores/AudioEngine/Utils/AEChannelInfo.h"
-#endif
-
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include <cstddef>
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ATTRIBUTE_PACKED __attribute__ ((packed))
-#define PRAGMA_PACK 0
-#endif
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-#define ATTRIBUTE_PACKED
-#define PRAGMA_PACK 1
-#endif
-
-/* current Audio DSP API version */
-#define KODI_AUDIOENGINE_API_VERSION                 "0.0.1"
-
-/* min. Audio DSP API version */
-#define KODI_AUDIOENGINE_MIN_API_VERSION             "0.0.1"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  /**
-   * A stream handle pointer, which is only used internally by the addon stream handle
-   */
-  typedef void AEStreamHandle;
-
-  /**
-   * The audio format structure that fully defines a stream's audio information
-   */
-  typedef struct AudioEngineFormat
-  {
-    /**
-     * The stream's data format (eg, AE_FMT_S16LE)
-     */
-    enum AEDataFormat m_dataFormat;
-
-    /**
-     * The stream's sample rate (eg, 48000)
-     */
-    unsigned int m_sampleRate;
-
-    /**
-     * The encoded streams sample rate if a bitstream, otherwise undefined
-     */
-    unsigned int m_encodedRate;
-
-    /**
-     * The amount of used speaker channels
-     */
-    unsigned int   m_channelCount;
-
-    /**
-     * The stream's channel layout
-     */
-    enum AEChannel m_channels[AE_CH_MAX];
-
-    /**
-     * The number of frames per period
-     */
-    unsigned int m_frames;
-
-    /**
-     * The size of one frame in bytes
-     */
-    unsigned int m_frameSize;
-
-    AudioEngineFormat()
-    {
-      m_dataFormat = AE_FMT_INVALID;
-      m_sampleRate = 0;
-      m_encodedRate = 0;
-      m_frames = 0;
-      m_frameSize = 0;
-      m_channelCount = 0;
-
-      for (unsigned int ch = 0; ch < AE_CH_MAX; ch++)
-      {
-        m_channels[ch] = AE_CH_NULL;
-      }
-    }
-
-    bool compareFormat(const AudioEngineFormat *fmt)
-    {
-      if (!fmt)
-      {
-        return false;
-      }
-
-      if (m_dataFormat    != fmt->m_dataFormat    ||
-          m_sampleRate    != fmt->m_sampleRate    ||
-          m_encodedRate   != fmt->m_encodedRate   ||
-          m_frames        != fmt->m_frames        ||
-          m_frameSize     != fmt->m_frameSize     ||
-          m_channelCount  != fmt->m_channelCount)
-      {
-        return false;
-      }
-      
-      for (unsigned int ch = 0; ch < AE_CH_MAX; ch++)
-      {
-        if (fmt->m_channels[ch] != m_channels[ch])
-        {
-          return false;
-        }
-      }
-
-      return  true;
-    }
-  } AudioEngineFormat;
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_callbacks.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_callbacks.h
deleted file mode 100644
index 6057f46..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_callbacks.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *      Copyright (C) 2014-2016 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef KODI_GAME_CALLBACKS_H_
-#define KODI_GAME_CALLBACKS_H_
-
-#include "kodi_game_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct CB_GameLib
-{
-  // --- Game callbacks --------------------------------------------------------
-
-  /*!
-   * \brief Requests the frontend to stop the current game
-   */
-  void (*CloseGame)(void* addonData);
-  
-  /*!
-   * \brief Create a video stream for pixel data
-   *
-   * \param format The type of pixel data accepted by this stream
-   * \param width The frame width
-   * \param height The frame height
-   * \param rotation The rotation (counter-clockwise) of the video frames
-   *
-   * \return 0 on success or -1 if a video stream is already created
-   */
-  int (*OpenPixelStream)(void* addonData, GAME_PIXEL_FORMAT format, unsigned int width, unsigned int height, GAME_VIDEO_ROTATION rotation);
-
-  /*!
-   * \brief Create a video stream for encoded video data
-   *
-   * \param codec The video format accepted by this stream
-   *
-   * \return 0 on success or -1 if a video stream is already created
-   */
-  int (*OpenVideoStream)(void* addonData, GAME_VIDEO_CODEC codec);
-
-  /*!
-   * \brief Create an audio stream for PCM audio data
-   *
-   * \param format The type of audio data accepted by this stream
-   * \param channel_map The channel layout terminated by GAME_CH_NULL
-   *
-   * \return 0 on success or -1 if an audio stream is already created
-   */
-  int (*OpenPCMStream)(void* addonData, GAME_PCM_FORMAT format, const GAME_AUDIO_CHANNEL* channel_map);
-
-  /*!
-  * \brief Create an audio stream for encoded audio data
-  *
-  * \param codec The audio format accepted by this stream
-  * \param channel_map The channel layout terminated by GAME_CH_NULL
-  *
-  * \return 0 on success or -1 if an audio stream is already created
-  */
-  int(*OpenAudioStream)(void* addonData, GAME_AUDIO_CODEC codec, const GAME_AUDIO_CHANNEL* channel_map);
-
-  /*!
-   * \brief Add a data packet to an audio or video stream
-   *
-   * \param stream The target stream
-   * \param data The data packet
-   * \param size The size of the data
-   */
-  void (*AddStreamData)(void* addonData, GAME_STREAM_TYPE stream, const uint8_t* data, unsigned int size);
-
-  /*!
-   * \brief Free the specified stream
-   *
-   * \param stream The stream to close
-   */
-  void (*CloseStream)(void* addonData, GAME_STREAM_TYPE stream);
-
-  // -- Hardware rendering callbacks -------------------------------------------
-
-  /*!
-   * \brief Enable hardware rendering
-   *
-   * \param hw_info A struct of properties for the hardware rendering system
-   */
-  void (*EnableHardwareRendering)(void* addonData, const game_hw_info* hw_info);
-
-  /*!
-   * \brief Get the framebuffer for rendering
-   *
-   * \return The framebuffer
-   */
-  uintptr_t (*HwGetCurrentFramebuffer)(void* addonData);
-
-  /*!
-   * \brief Get a symbol from the hardware context
-   *
-   * \param symbol The symbol's name
-   *
-   * \return A function pointer for the specified symbol
-   */
-  game_proc_address_t (*HwGetProcAddress)(void* addonData, const char* symbol);
-
-  /*!
-   * \brief Called when a frame is being rendered
-   */
-  void (*RenderFrame)(void* addonData);
-
-  // --- Input callbacks -------------------------------------------------------
-
-  /*!
-   * \brief Begin reporting events for the specified joystick port
-   *
-   * \param port The zero-indexed port number
-   *
-   * \return true if the port was opened, false otherwise
-   */
-  bool (*OpenPort)(void* addonData, unsigned int port);
-
-  /*!
-   * \brief End reporting events for the specified port
-   *
-   * \param port The port number passed to OpenPort()
-   */
-  void (*ClosePort)(void* addonData, unsigned int port);
-
-  /*!
-  * \brief Notify the port of an input event
-  *
-  * \param event The input event
-  *
-  * Input events can arrive for the following sources:
-  *   - GAME_INPUT_EVENT_MOTOR
-  *
-  * \return true if the event was handled, false otherwise
-  */
-  bool (*InputEvent)(void* addonData, const game_input_event* event);
-
-} CB_GameLib;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // KODI_GAME_CALLBACKS_H_
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
index 247f24b..4ce5bbc 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -26,28 +26,6 @@
 extern "C" {
 #endif
 
-// --- Game API operations -----------------------------------------------------
-
-/*!
- * \brief Return GAME_API_VERSION_STRING
- *
- * The add-on is backwards compatible with the frontend if this API version is
- * is at least the frontend's minimum API version.
- *
- * \return Must be GAME_API_VERSION_STRING
- */
-const char* GetGameAPIVersion(void);
-
-/*!
- * \brief Return GAME_MIN_API_VERSION_STRING
- *
- * The add-on is forwards compatible with the frontend if this minimum version
- * is no more than the frontend's API version.
- *
- * \return Must be GAME_MIN_API_VERSION_STRING
- */
-const char* GetMininumGameAPIVersion(void);
-
 // --- Game operations ---------------------------------------------------------
 
 /*!
@@ -233,7 +211,7 @@ GAME_ERROR CheatReset(void);
  *
  * \return the error, or GAME_ERROR_NO_ERROR if data was set to a valid buffer
  */
-GAME_ERROR GetMemory(GAME_MEMORY type, const uint8_t** data, size_t* size);
+GAME_ERROR GetMemory(GAME_MEMORY type, uint8_t** data, size_t* size);
 
 /*!
  * \brief Set a cheat code
@@ -254,30 +232,30 @@ GAME_ERROR SetCheat(unsigned int index, bool enabled, const char* code);
  * Note that get_addon() is defined here, so it will be available in all
  * compiled game clients.
  */
-void __declspec(dllexport) get_addon(GameClient* pClient)
+void __declspec(dllexport) get_addon(void* ptr)
 {
-  pClient->GetGameAPIVersion        = GetGameAPIVersion;
-  pClient->GetMininumGameAPIVersion = GetMininumGameAPIVersion;
-  pClient->LoadGame                 = LoadGame;
-  pClient->LoadGameSpecial          = LoadGameSpecial;
-  pClient->LoadStandalone           = LoadStandalone;
-  pClient->UnloadGame               = UnloadGame;
-  pClient->GetGameInfo              = GetGameInfo;
-  pClient->GetRegion                = GetRegion;
-  pClient->RequiresGameLoop         = RequiresGameLoop;
-  pClient->RunFrame                 = RunFrame;
-  pClient->Reset                    = Reset;
-  pClient->HwContextReset           = HwContextReset;
-  pClient->HwContextDestroy         = HwContextDestroy;
-  pClient->UpdatePort               = UpdatePort;
-  pClient->HasFeature               = HasFeature;
-  pClient->InputEvent               = InputEvent;
-  pClient->SerializeSize            = SerializeSize;
-  pClient->Serialize                = Serialize;
-  pClient->Deserialize              = Deserialize;
-  pClient->CheatReset               = CheatReset;
-  pClient->GetMemory                = GetMemory;
-  pClient->SetCheat                 = SetCheat;
+  AddonInstance_Game* pClient = static_cast<AddonInstance_Game*>(ptr);
+
+  pClient->toAddon.LoadGame                 = LoadGame;
+  pClient->toAddon.LoadGameSpecial          = LoadGameSpecial;
+  pClient->toAddon.LoadStandalone           = LoadStandalone;
+  pClient->toAddon.UnloadGame               = UnloadGame;
+  pClient->toAddon.GetGameInfo              = GetGameInfo;
+  pClient->toAddon.GetRegion                = GetRegion;
+  pClient->toAddon.RequiresGameLoop         = RequiresGameLoop;
+  pClient->toAddon.RunFrame                 = RunFrame;
+  pClient->toAddon.Reset                    = Reset;
+  pClient->toAddon.HwContextReset           = HwContextReset;
+  pClient->toAddon.HwContextDestroy         = HwContextDestroy;
+  pClient->toAddon.UpdatePort               = UpdatePort;
+  pClient->toAddon.HasFeature               = HasFeature;
+  pClient->toAddon.InputEvent               = InputEvent;
+  pClient->toAddon.SerializeSize            = SerializeSize;
+  pClient->toAddon.Serialize                = Serialize;
+  pClient->toAddon.Deserialize              = Deserialize;
+  pClient->toAddon.CheatReset               = CheatReset;
+  pClient->toAddon.GetMemory                = GetMemory;
+  pClient->toAddon.SetCheat                 = SetCheat;
 }
 
 #ifdef __cplusplus
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h
index fa2762d..da02f6f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -20,18 +20,13 @@
 #ifndef KODI_GAME_TYPES_H_
 #define KODI_GAME_TYPES_H_
 
-/* current game API version */
-#define GAME_API_VERSION                "1.0.28"
-
-/* min. game API version */
-#define GAME_MIN_API_VERSION            "1.0.28"
+#include "versions.h"
+#include "xbmc_addon_types.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
-#ifdef TARGET_WINDOWS
-  #include <windows.h>
-#else
+#ifndef TARGET_WINDOWS
   #ifndef __cdecl
     #define __cdecl
   #endif
@@ -402,7 +397,7 @@ struct game_hw_info
 };
 
 /*! Properties passed to the ADDON_Create() method of a game client */
-typedef struct game_client_properties
+typedef struct AddonProps_Game
 {
   /*!
    * The path of the game client being loaded.
@@ -451,13 +446,35 @@ typedef struct game_client_properties
    * Number of extensions provided
    */
   unsigned int extension_count;
-} game_client_properties;
+} AddonProps_Game;
 
+typedef AddonProps_Game game_client_properties;
+  
 /*! Structure to transfer the methods from kodi_game_dll.h to Kodi */
-typedef struct GameClient
+
+typedef struct AddonToKodiFuncTable_Game
+{
+  KODI_HANDLE kodiInstance;
+
+  void (*CloseGame)(void* kodiInstance);
+  int (*OpenPixelStream)(void* kodiInstance, GAME_PIXEL_FORMAT format, unsigned int width, unsigned int height, GAME_VIDEO_ROTATION rotation);
+  int (*OpenVideoStream)(void* kodiInstance, GAME_VIDEO_CODEC codec);
+  int (*OpenPCMStream)(void* kodiInstance, GAME_PCM_FORMAT format, const GAME_AUDIO_CHANNEL* channel_map);
+  int(*OpenAudioStream)(void* kodiInstance, GAME_AUDIO_CODEC codec, const GAME_AUDIO_CHANNEL* channel_map);
+  void (*AddStreamData)(void* kodiInstance, GAME_STREAM_TYPE stream, const uint8_t* data, unsigned int size);
+  void (*CloseStream)(void* kodiInstance, GAME_STREAM_TYPE stream);
+  void (*EnableHardwareRendering)(void* kodiInstance, const game_hw_info* hw_info);
+  uintptr_t (*HwGetCurrentFramebuffer)(void* kodiInstance);
+  game_proc_address_t (*HwGetProcAddress)(void* kodiInstance, const char* symbol);
+  void (*RenderFrame)(void* kodiInstance);
+  bool (*OpenPort)(void* kodiInstance, unsigned int port);
+  void (*ClosePort)(void* kodiInstance, unsigned int port);
+  bool (*InputEvent)(void* kodiInstance, const game_input_event* event);
+
+} AddonToKodiFuncTable_Game;
+
+typedef struct KodiToAddonFuncTable_Game
 {
-  const char* (__cdecl* GetGameAPIVersion)(void);
-  const char* (__cdecl* GetMininumGameAPIVersion)(void);
   GAME_ERROR  (__cdecl* LoadGame)(const char*);
   GAME_ERROR  (__cdecl* LoadGameSpecial)(SPECIAL_GAME_TYPE, const char**, size_t);
   GAME_ERROR  (__cdecl* LoadStandalone)(void);
@@ -476,9 +493,16 @@ typedef struct GameClient
   GAME_ERROR  (__cdecl* Serialize)(uint8_t*, size_t);
   GAME_ERROR  (__cdecl* Deserialize)(const uint8_t*, size_t);
   GAME_ERROR  (__cdecl* CheatReset)(void);
-  GAME_ERROR  (__cdecl* GetMemory)(GAME_MEMORY, const uint8_t**, size_t*);
+  GAME_ERROR  (__cdecl* GetMemory)(GAME_MEMORY, uint8_t**, size_t*);
   GAME_ERROR  (__cdecl* SetCheat)(unsigned int, bool, const char*);
-} GameClient;
+} KodiToAddonFuncTable_Game;
+
+typedef struct AddonInstance_Game
+{
+  AddonProps_Game props;
+  AddonToKodiFuncTable_Game toKodi;
+  KodiToAddonFuncTable_Game toAddon;
+} AddonInstance_Game;
 
 #ifdef __cplusplus
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h
new file mode 100644
index 0000000..a87c9c0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h
@@ -0,0 +1,46 @@
+/*
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include "xbmc_addon_dll.h"
+#include "kodi_imagedec_types.h"
+
+extern "C"
+{
+  void* LoadImage(unsigned char* buffer, unsigned int bufSize,
+                  unsigned int* width, unsigned int* height);
+
+  bool Decode(void* image, unsigned char* pixels,
+              unsigned int width, unsigned int height,
+              unsigned int pitch, unsigned int format);
+
+  void Close(void* image);
+
+  // function to export the above structure to Kodi
+  void __declspec(dllexport) get_addon(void* ptr)
+  {
+    AddonInstance_ImageDecoder* img = static_cast<AddonInstance_ImageDecoder*>(ptr);
+    img->toAddon.LoadImage = LoadImage;
+    img->toAddon.Decode = Decode;
+    img->toAddon.Close = Close;
+  }
+};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h
new file mode 100644
index 0000000..7af585c
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h
@@ -0,0 +1,76 @@
+/*
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#define ADDON_IMG_FMT_A8R8G8B8 1
+#define ADDON_IMG_FMT_A8       2
+#define ADDON_IMG_FMT_RGBA8    3
+#define ADDON_IMG_FMT_RGB8     4
+
+extern "C"
+{
+  typedef struct AddonProps_ImageDecoder
+  {
+    const char* mimetype;
+  } AddonProps_ImageDecoder;
+
+  typedef struct AddonToKodiFuncTable_ImageDecoder
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_ImageDecoder;
+
+  typedef struct KodiToAddonFuncTable_ImageDecoder
+  {
+    //! \brief Initialize an encoder
+    //! \param buffer The data to read from memory
+    //! \param bufSize The buffer size
+    //! \param width The optimal width of image on entry, obtained width on return
+    //! \param height The optimal height of image, actual obtained height on return
+    //! \return Image or nullptr on error
+    void* (__cdecl* LoadImage) (unsigned char* buffer, unsigned int bufSize,
+                                unsigned int* width, unsigned int* height);
+
+    //! \brief Decode previously loaded image
+    //! \param image Image to decode
+    //! \param pixels Output buffer
+    //! \param width Width of output image
+    //! \param height Height of output image
+    //! \param pitch Pitch of output image
+    //! \param format Format of output image
+    bool (__cdecl* Decode) (void* image, unsigned char* pixels,
+                            unsigned int width, unsigned int height,
+                            unsigned int pitch, unsigned int format);
+
+    //! \brief Close an opened image
+    //! \param image Image to close
+    //! \return True on success, false on failure
+    void (__cdecl* Close)(void* image);
+  } KodiToAddonFuncTable_ImageDecoder;
+
+  typedef struct AddonInstance_ImageDecoder
+  {
+    AddonProps_ImageDecoder props;
+    AddonToKodiFuncTable_ImageDecoder toKodi;
+    KodiToAddonFuncTable_ImageDecoder toAddon;
+  } AddonInstance_ImageDecoder;
+}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
index 8dc49c0..ab8475d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
@@ -214,48 +214,43 @@ extern "C"
   */
   bool IsRealTimeStream();
 
-  const char* GetApiVersion()
-  {
-    static const char *ApiVersion = INPUTSTREAM_API_VERSION;
-    return ApiVersion;
-  }
-
   /*!
   * Called by XBMC to assign the function pointers of this add-on to pClient.
   * @param pClient The struct to assign the function pointers to.
   */
-  void __declspec(dllexport) get_addon(struct InputStreamAddonFunctions* pClient)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pClient->Open = Open;
-    pClient->Close = Close;
-    pClient->GetPathList = GetPathList;
-    pClient->GetCapabilities = GetCapabilities;
-    pClient->GetApiVersion = GetApiVersion;
-
-    pClient->GetStreamIds = GetStreamIds;
-    pClient->GetStream = GetStream;
-    pClient->EnableStream = EnableStream;
-    pClient->DemuxReset = DemuxReset;
-    pClient->DemuxAbort = DemuxAbort;
-    pClient->DemuxFlush = DemuxFlush;
-    pClient->DemuxRead = DemuxRead;
-    pClient->DemuxSeekTime = DemuxSeekTime;
-    pClient->DemuxSetSpeed = DemuxSetSpeed;
-    pClient->SetVideoResolution = SetVideoResolution;
-
-    pClient->GetTotalTime = GetTotalTime;
-    pClient->GetTime = GetTime;
-
-    pClient->PosTime = PosTime;
-
-    pClient->CanPauseStream = CanPauseStream;
-    pClient->CanSeekStream = CanSeekStream;
-
-    pClient->ReadStream = ReadStream;
-    pClient->SeekStream = SeekStream;
-    pClient->PositionStream = PositionStream;
-    pClient->LengthStream = LengthStream;
-    pClient->PauseStream = PauseStream;
-    pClient->IsRealTimeStream = IsRealTimeStream;
+    AddonInstance_InputStream* pClient = static_cast<AddonInstance_InputStream*>(ptr);
+
+    pClient->toAddon.Open = Open;
+    pClient->toAddon.Close = Close;
+    pClient->toAddon.GetPathList = GetPathList;
+    pClient->toAddon.GetCapabilities = GetCapabilities;
+
+    pClient->toAddon.GetStreamIds = GetStreamIds;
+    pClient->toAddon.GetStream = GetStream;
+    pClient->toAddon.EnableStream = EnableStream;
+    pClient->toAddon.DemuxReset = DemuxReset;
+    pClient->toAddon.DemuxAbort = DemuxAbort;
+    pClient->toAddon.DemuxFlush = DemuxFlush;
+    pClient->toAddon.DemuxRead = DemuxRead;
+    pClient->toAddon.DemuxSeekTime = DemuxSeekTime;
+    pClient->toAddon.DemuxSetSpeed = DemuxSetSpeed;
+    pClient->toAddon.SetVideoResolution = SetVideoResolution;
+
+    pClient->toAddon.GetTotalTime = GetTotalTime;
+    pClient->toAddon.GetTime = GetTime;
+
+    pClient->toAddon.PosTime = PosTime;
+
+    pClient->toAddon.CanPauseStream = CanPauseStream;
+    pClient->toAddon.CanSeekStream = CanSeekStream;
+
+    pClient->toAddon.ReadStream = ReadStream;
+    pClient->toAddon.SeekStream = SeekStream;
+    pClient->toAddon.PositionStream = PositionStream;
+    pClient->toAddon.LengthStream = LengthStream;
+    pClient->toAddon.PauseStream = PauseStream;
+    pClient->toAddon.IsRealTimeStream = IsRealTimeStream;
   };
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
index 46e9d03..9597e8a 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
+#ifndef TARGET_WINDOWS
 #ifndef __cdecl
 #define __cdecl
 #endif
@@ -31,24 +29,16 @@
 #endif
 #endif
 
+#include "xbmc_addon_types.h"
+
 #ifdef BUILD_KODI_ADDON
 #include "DVDDemuxPacket.h"
 #else
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
 #endif
 
-/* current API version */
-#define INPUTSTREAM_API_VERSION "1.0.6"
-
 extern "C" {
 
-  // this are properties given to the addon on create
-  // at this time we have no parameters for the addon
-  typedef struct INPUTSTREAM_PROPS
-  {
-    int dummy;
-  } INPUTSTREAM_PROPS;
-
   /*!
    * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
    */
@@ -108,7 +98,6 @@ extern "C" {
     char m_codecName[32];                /*!< @brief (required) name of codec according to ffmpeg */
     char m_codecInternalName[32];        /*!< @brief (optional) internal name of codec (selectionstream info) */
     unsigned int m_pID;                  /*!< @brief (required) physical index */
-    unsigned int m_Bandwidth;            /*!< @brief (optional) bandwidth of the stream (selectionstream info) */
 
     const uint8_t *m_ExtraData;
     unsigned int m_ExtraSize;
@@ -131,13 +120,29 @@ extern "C" {
   /*!
    * @brief Structure to transfer the methods from xbmc_inputstream_dll.h to XBMC
    */
-  typedef struct InputStreamAddonFunctions
+
+  // this are properties given to the addon on create
+  // at this time we have no parameters for the addon
+  typedef struct AddonProps_InputStream
+  {
+    int dummy;
+  } AddonProps_InputStream;
+  
+  typedef AddonProps_InputStream INPUTSTREAM_PROPS;
+  
+  typedef struct AddonToKodiFuncTable_InputStream
+  {
+    KODI_HANDLE kodiInstance;
+    DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
+    void (*FreeDemuxPacket)(void* kodiInstance, DemuxPacket* pPacket);
+  } AddonToKodiFuncTable_InputStream;
+
+  typedef struct KodiToAddonFuncTable_InputStream
   {
     bool (__cdecl* Open)(INPUTSTREAM&);
     void (__cdecl* Close)(void);
     const char* (__cdecl* GetPathList)(void);
     struct INPUTSTREAM_CAPABILITIES (__cdecl* GetCapabilities)(void);
-    const char* (__cdecl* GetApiVersion)(void);
 
     // IDemux
     struct INPUTSTREAM_IDS (__cdecl* GetStreamIds)();
@@ -168,7 +173,15 @@ extern "C" {
     int64_t (__cdecl* LengthStream)(void);
     void (__cdecl* PauseStream)(double);
     bool (__cdecl* IsRealTimeStream)(void);
-  } InputStreamAddonFunctions;
+  } KodiToAddonFuncTable_InputStream;
+
+  typedef struct AddonInstance_InputStream
+  {
+    AddonProps_InputStream props;
+    AddonToKodiFuncTable_InputStream toKodi;
+    KodiToAddonFuncTable_InputStream toAddon;
+  } AddonInstance_InputStream;
+
 }
 
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h
deleted file mode 100644
index 2dfc571..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *      Copyright (C) 2014-2016 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef __PERIPHERAL_CALLBACKS_H__
-#define __PERIPHERAL_CALLBACKS_H__
-
-#include "kodi_peripheral_types.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-typedef struct CB_PeripheralLib
-{
-  /*!
-   * @brief Trigger a scan for peripherals
-   *
-   * The add-on calls this if a change in hardware is detected.
-   */
-  void (*TriggerScan)(void* addonData);
-
-  /*!
-   * @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)(void* addonData, const char* deviceName, const char* controllerId);
-
-  /*!
-   * @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)(void* addonData, const char* controllerId, JOYSTICK_FEATURE_TYPE type);
-
-} CB_PeripheralLib;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __PERIPHERAL_CALLBACKS_H__
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
index f9d7482..b353316 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -32,24 +32,6 @@ extern "C"
   /// @name Peripheral operations
   ///{
   /*!
-   * @brief  Get the PERIPHERAL_API_VERSION used to compile this peripheral add-on
-   * @return KODI_PERIPHERAL_API_VERSION from kodi_peripheral_types.h
-   * @remarks Valid implementation required
-   *
-   * Used to check if the implementation is compatible with the frontend.
-   */
-  const char* GetPeripheralAPIVersion(void);
-
-  /*!
-   * @brief Get the KODI_PERIPHERAL_MIN_API_VERSION used to compile this peripheral add-on
-   * @return KODI_PERIPHERAL_MIN_API_VERSION from kodi_peripheral_types.h
-   * @remarks Valid implementation required
-   *
-   * Used to check if the implementation is compatible with the frontend.
-   */
-  const char* GetMinimumPeripheralAPIVersion(void);
-
-  /*!
    * @brief Get the list of features that this add-on provides
    * @param pCapabilities The add-on's capabilities.
    * @return PERIPHERAL_NO_ERROR if the properties were fetched successfully.
@@ -230,30 +212,30 @@ extern "C"
    * pClient. Note that get_addon() is defined here, so it will be available in
    * all compiled peripheral add-ons.
    */
-  void __declspec(dllexport) get_addon(struct PeripheralAddon* pClient)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pClient->GetPeripheralAPIVersion        = GetPeripheralAPIVersion;
-    pClient->GetMinimumPeripheralAPIVersion = GetMinimumPeripheralAPIVersion;
-    pClient->GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->PerformDeviceScan              = PerformDeviceScan;
-    pClient->FreeScanResults                = FreeScanResults;
-    pClient->GetEvents                      = GetEvents;
-    pClient->FreeEvents                     = FreeEvents;
-    pClient->SendEvent                      = SendEvent;
+    AddonInstance_Peripheral* pClient = static_cast<AddonInstance_Peripheral*>(ptr);
+
+    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
+    pClient->toAddon.PerformDeviceScan              = PerformDeviceScan;
+    pClient->toAddon.FreeScanResults                = FreeScanResults;
+    pClient->toAddon.GetEvents                      = GetEvents;
+    pClient->toAddon.FreeEvents                     = FreeEvents;
+    pClient->toAddon.SendEvent                      = SendEvent;
 
 #ifdef PERIPHERAL_ADDON_JOYSTICKS
-    pClient->GetJoystickInfo                = GetJoystickInfo;
-    pClient->FreeJoystickInfo               = FreeJoystickInfo;
-    pClient->GetFeatures                    = GetFeatures;
-    pClient->FreeFeatures                   = FreeFeatures;
-    pClient->MapFeatures                    = MapFeatures;
-    pClient->GetIgnoredPrimitives           = GetIgnoredPrimitives;
-    pClient->FreePrimitives                 = FreePrimitives;
-    pClient->SetIgnoredPrimitives           = SetIgnoredPrimitives;
-    pClient->SaveButtonMap                  = SaveButtonMap;
-    pClient->RevertButtonMap                = RevertButtonMap;
-    pClient->ResetButtonMap                 = ResetButtonMap;
-    pClient->PowerOffJoystick               = PowerOffJoystick;
+    pClient->toAddon.GetJoystickInfo                = GetJoystickInfo;
+    pClient->toAddon.FreeJoystickInfo               = FreeJoystickInfo;
+    pClient->toAddon.GetFeatures                    = GetFeatures;
+    pClient->toAddon.FreeFeatures                   = FreeFeatures;
+    pClient->toAddon.MapFeatures                    = MapFeatures;
+    pClient->toAddon.GetIgnoredPrimitives           = GetIgnoredPrimitives;
+    pClient->toAddon.FreePrimitives                 = FreePrimitives;
+    pClient->toAddon.SetIgnoredPrimitives           = SetIgnoredPrimitives;
+    pClient->toAddon.SaveButtonMap                  = SaveButtonMap;
+    pClient->toAddon.RevertButtonMap                = RevertButtonMap;
+    pClient->toAddon.ResetButtonMap                 = ResetButtonMap;
+    pClient->toAddon.PowerOffJoystick               = PowerOffJoystick;
 #endif
   }
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
index d7c4282..0786aa8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
@@ -1,6 +1,5 @@
-
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -21,9 +20,10 @@
 #ifndef __PERIPHERAL_TYPES_H__
 #define __PERIPHERAL_TYPES_H__
 
-#ifdef TARGET_WINDOWS
-  #include <windows.h>
-#else
+#include "versions.h"
+#include "xbmc_addon_types.h"
+
+#ifndef TARGET_WINDOWS
   #ifndef __cdecl
     #define __cdecl
   #endif
@@ -50,12 +50,6 @@
   #define PRAGMA_PACK 1
 #endif
 
-/* current Peripheral API version */
-#define PERIPHERAL_API_VERSION "1.2.1"
-
-/* min. Peripheral API version */
-#define PERIPHERAL_MIN_API_VERSION "1.2.0"
-
 /* indicates a joystick has no preference for port number */
 #define NO_PORT_REQUESTED     (-1)
 
@@ -113,6 +107,8 @@ extern "C"
   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;
   ///}
@@ -223,7 +219,9 @@ extern "C"
   typedef struct JOYSTICK_DRIVER_SEMIAXIS
   {
     int                                index;
+    int                                center;
     JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
+    unsigned int                       range;
   } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
 
   typedef struct JOYSTICK_DRIVER_MOTOR
@@ -288,10 +286,19 @@ extern "C"
   /*!
    * @brief Structure to transfer the methods from kodi_peripheral_dll.h to the frontend
    */
-  typedef struct PeripheralAddon
+  
+  typedef PERIPHERAL_PROPERTIES AddonProps_Peripheral;
+
+  typedef struct AddonToKodiFuncTable_Peripheral
+  {
+    KODI_HANDLE kodiInstance;
+    void (*TriggerScan)(void* kodiInstance);
+    void (*RefreshButtonMaps)(void* kodiInstance, const char* deviceName, const char* controllerId);
+    unsigned int (*FeatureCount)(void* kodiInstance, const char* controllerId, JOYSTICK_FEATURE_TYPE type);
+  } AddonToKodiFuncTable_Peripheral;
+
+  typedef struct KodiToAddonFuncTable_Peripheral
   {
-    const char*      (__cdecl* GetPeripheralAPIVersion)(void);
-    const char*      (__cdecl* GetMinimumPeripheralAPIVersion)(void);
     PERIPHERAL_ERROR (__cdecl* GetAddonCapabilities)(PERIPHERAL_CAPABILITIES*);
     PERIPHERAL_ERROR (__cdecl* PerformDeviceScan)(unsigned int*, PERIPHERAL_INFO**);
     void             (__cdecl* FreeScanResults)(unsigned int, PERIPHERAL_INFO*);
@@ -314,7 +321,14 @@ extern "C"
     void             (__cdecl* ResetButtonMap)(const JOYSTICK_INFO*, const char*);
     void             (__cdecl* PowerOffJoystick)(unsigned int);
     ///}
-  } PeripheralAddon;
+  } KodiToAddonFuncTable_Peripheral;
+
+  typedef struct AddonInstance_Peripheral
+  {
+    AddonProps_Peripheral props;
+    AddonToKodiFuncTable_Peripheral toKodi;
+    KodiToAddonFuncTable_Peripheral toAddon;
+  } AddonInstance_Peripheral;
 
 #ifdef __cplusplus
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
index f01180b..2106d19 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -362,7 +362,9 @@ namespace ADDON
    *
    *    Semiaxis:
    *       - driver index
+   *       - center
    *       - semiaxis direction
+   *       - range
    *
    *    Motor:
    *       - driver index
@@ -377,7 +379,9 @@ namespace ADDON
       m_type(type),
       m_driverIndex(driverIndex),
       m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+      m_center(0),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+      m_range(1)
     {
     }
 
@@ -389,7 +393,9 @@ namespace ADDON
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN),
       m_driverIndex(0),
       m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+      m_center(0),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+      m_range(1)
     {
     }
 
@@ -409,7 +415,9 @@ namespace ADDON
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
       m_driverIndex(hatIndex),
       m_hatDirection(direction),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+      m_center(0),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+      m_range(1)
     {
     }
 
@@ -417,11 +425,13 @@ namespace ADDON
      * \brief Construct a driver primitive representing the positive or negative
      *        half of an axis
      */
-    DriverPrimitive(unsigned int axisIndex, JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction) :
+    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_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_semiAxisDirection(direction)
+      m_center(center),
+      m_semiAxisDirection(direction),
+      m_range(range)
     {
     }
 
@@ -437,7 +447,9 @@ namespace ADDON
       m_type(primitive.type),
       m_driverIndex(0),
       m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+      m_center(0),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+      m_range(1)
     {
       switch (m_type)
       {
@@ -455,7 +467,9 @@ namespace ADDON
         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:
@@ -471,7 +485,9 @@ namespace ADDON
     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; }
 
     bool operator==(const DriverPrimitive& other) const
     {
@@ -492,7 +508,9 @@ namespace ADDON
           case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
           {
             return m_driverIndex       == other.m_driverIndex &&
-                   m_semiAxisDirection == other.m_semiAxisDirection;
+                   m_center            == other.m_center &&
+                   m_semiAxisDirection == other.m_semiAxisDirection &&
+                   m_range             == other.m_range;
           }
           default:
             break;
@@ -520,7 +538,9 @@ namespace ADDON
         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:
@@ -542,7 +562,9 @@ namespace ADDON
     JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type;
     unsigned int                       m_driverIndex;
     JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection;
+    int                                m_center;
     JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection;
+    unsigned int                       m_range;
   };
 
   typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h
new file mode 100644
index 0000000..30741a6
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h
@@ -0,0 +1,126 @@
+/*
+ *      Copyright (C) 2013 Arne Morten Kvarving
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <stdint.h>
+#include "xbmc_addon_dll.h"
+#include "kodi_vfs_types.h"
+
+extern "C"
+{
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Open
+  void* Open(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::OpenForWrite
+  void* OpenForWrite(VFSURL* url, bool bOverWrite);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Read
+  ssize_t Read(void* context, void* buffer, size_t size);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Write
+  ssize_t Write(void* context, const void* buffer, size_t size);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Seek
+  int64_t Seek(void* context, int64_t position, int whence);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Truncate
+  int Truncate(void* context, int64_t size);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetLength
+  int64_t GetLength(void* context);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetPosition
+  int64_t GetPosition(void* context);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetChunkSize
+  int GetChunkSize(void* context);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::IoControl
+  int IoControl(void* context, XFILE::EIoControl request, void* param);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Stat
+  int Stat(VFSURL* url, struct __stat64* buffer);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Close
+  bool Close(void* context);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Exists
+  bool Exists(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::ContainsFiles
+  void* ContainsFiles(VFSURL* url, VFSDirEntry** entries, int* num_entries,
+                      char* rootpath);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::ClearOutIdle
+  void ClearOutIdle();
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::DisconnectAll
+  void DisconnectAll();
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::DirectoryExists
+  bool DirectoryExists(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::RemoveDirectory
+  bool RemoveDirectory(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::CreateDirectory
+  bool CreateDirectory(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetDirectory
+  void* GetDirectory(VFSURL* url, VFSDirEntry** entries, int* num_entries,
+                     VFSCallbacks* callbacks);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::FreeDirectory
+  void FreeDirectory(void* ctx);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Delete
+  bool Delete(VFSURL* url);
+
+  //! \copydoc KodiToAddonFuncTable_VFSEntry::Rename
+  bool Rename(VFSURL* url, VFSURL* url2);
+
+  //! \brief Function to export the above structure to Kodi
+  void __declspec(dllexport) get_addon(void* ptr)
+  {
+    AddonInstance_VFSEntry* vfs = static_cast<AddonInstance_VFSEntry*>(ptr);
+    vfs->toAddon.Open = Open;
+    vfs->toAddon.OpenForWrite = OpenForWrite;
+    vfs->toAddon.Read = Read;
+    vfs->toAddon.Write = Write;
+    vfs->toAddon.Seek = Seek;
+    vfs->toAddon.GetLength = GetLength;
+    vfs->toAddon.GetPosition = GetPosition;
+    vfs->toAddon.IoControl = IoControl;
+    vfs->toAddon.Stat = Stat;
+    vfs->toAddon.Close = Close;
+    vfs->toAddon.Exists = Exists;
+    vfs->toAddon.ClearOutIdle = ClearOutIdle;
+    vfs->toAddon.DisconnectAll = DisconnectAll;
+    vfs->toAddon.DirectoryExists = DirectoryExists;
+    vfs->toAddon.GetDirectory = GetDirectory;
+    vfs->toAddon.FreeDirectory = FreeDirectory;
+    vfs->toAddon.Truncate = Truncate;
+    vfs->toAddon.Delete = Delete;
+    vfs->toAddon.Rename = Rename;
+    vfs->toAddon.RemoveDirectory = RemoveDirectory;
+    vfs->toAddon.CreateDirectory = CreateDirectory;
+    vfs->toAddon.ContainsFiles = ContainsFiles;
+    vfs->toAddon.GetChunkSize = GetChunkSize;
+  };
+};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
index b62c7b0..8c02b99 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
@@ -18,15 +18,255 @@
  */
 #pragma once
 
+#ifndef TARGET_WINDOWS
+#ifndef __cdecl
+#define __cdecl
+#endif
+#ifndef __declspec
+#define __declspec(X)
+#endif
+#endif
+
 #include <stdint.h>
+#include "xbmc_addon_types.h"
+#ifdef BUILD_KODI_ADDON
+#include "IFileTypes.h"
+#else
+#include "filesystem/IFileTypes.h"
+#include "PlatformDefs.h"
+#endif
 
 extern "C"
 {
+
+  struct VFSProperty
+  {
+    char* name;
+    char* val;
+  };
+
   struct VFSDirEntry
   {
     char* label;             //!< item label
+    char* title;             //!< item title
     char* path;              //!< item path
+    int num_props;           //!< Number of properties attached to item
+    VFSProperty* properties; //!< Properties
+    //FILETIME mtime;          //!< Mtime for file represented by item
     bool folder;             //!< Item is a folder
     uint64_t size;           //!< Size of file represented by item
   };
+
+  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;
+  };
+
+  struct VFSCallbacks
+  {
+    //! \brief Require keyboard input
+    //! \param heading The heading of the keyboard dialog
+    //! \param input A pointer to the resulting string. Must be free'd by caller.
+    //! \return True if input was received, false otherwise
+    bool (__cdecl* GetKeyboardInput)(void* ctx, const char* heading, char** input);
+
+    //! \brief Display an error dialog
+    //! \param heading The heading of the error dialog
+    //! \param line1 The first line of the error dialog
+    //! \param line2 The second line of the error dialog. Can be NULL
+    //! \param line3 The third line of the error dialog. Can be NULL
+    void (__cdecl* SetErrorDialog)(void* ctx, const char* heading, const char* line1, const char* line2, const char* line3);
+
+    //! \brief Prompt the user for authentication of a URL
+    //! \param url The URL
+    void (__cdecl* RequireAuthentication)(void* ctx, const char* url);
+
+    //! \brief The context to be passed to the callbacks
+    void* ctx;
+  };
+
+  typedef struct AddonProps_VFSEntry
+  {
+    int dummy;
+  } AddonProps_VFSEntry;
+
+  typedef AddonProps_VFSEntry VFS_PROPS;
+
+  typedef struct AddonToKodiFuncTable_VFSEntry
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_VFSEntry;
+
+  typedef struct KodiToAddonFuncTable_VFSEntry
+  {
+    //! \brief Open a file for input
+    //! \param url The URL of the file
+    //! \return Context for the opened file
+    //! \sa IFile::Open
+    void* (__cdecl* Open) (VFSURL* url);
+
+    //! \brief Open a file for output
+    //! \param url The URL of the file
+    //! \param bOverwrite Whether or not to overwrite an existing file
+    //! \return Context for the opened file
+    //! \sa IFile::OpenForWrite
+    void* (__cdecl* OpenForWrite) (VFSURL* url, bool bOverWrite);
+
+    //! \brief Read from a file
+    //! \param context The context of the file
+    //! \param buffer The buffer to read data into
+    //! \param uiBufSize Number of bytes to read
+    //! \return Number of bytes read
+    //! \sa IFile::Read
+    ssize_t (__cdecl* Read) (void* context, void* buffer, size_t uiBufSize);
+
+    //! \brief Write to a file
+    //! \param context The context of the file
+    //! \param buffer The buffer to read data from
+    //! \param uiBufSize Number of bytes to write
+    //! \return Number of bytes written
+    //! \sa IFile::Write
+    ssize_t (__cdecl* Write) (void* context, const void* buffer, size_t uiBufSize);
+
+    //! \brief Seek in a file
+    //! \param context The context of the file
+    //! \param position The position to seek to
+    //! \param whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END)
+    //! \return Offset in file after seek
+    //! \sa IFile::Seek
+    int64_t  (__cdecl* Seek) (void* context, int64_t position, int whence);
+
+    //! \brief Truncate a file
+    //! \param context The context of the file
+    //! \param size The size to truncate the file to
+    //! \return 0 on success, -1 on error
+    //! \sa IFile::Truncate
+    int      (__cdecl* Truncate) (void* context, int64_t size);
+
+    //! \brief Get total size of a file
+    //! \param context The context of the file
+    //! \return Total file size
+    //! \sa IFile::GetLength
+    int64_t  (__cdecl* GetLength) (void* context);
+
+    //! \brief Get current position in a file
+    //! \param context The context of the file
+    //! \return Current position
+    //! \sa IFile::GetPosition
+    int64_t  (__cdecl* GetPosition) (void* context);
+
+    //! \brief Get chunk size of a file
+    //! \param context The context of the file
+    //! \return Chunk size
+    //! \sa IFile::GetChunkSize()
+    int      (__cdecl* GetChunkSize)(void* context);
+
+    //! \brief Perform an IO-control on the file
+    //! \param context The context of the file
+    //! \param request The requested IO-control
+    //! \param param Parameter attached to the IO-control
+    //! \return -1 on error, >= 0 on success
+    //! \sa IFile::IoControl
+    int  (__cdecl* IoControl) (void* context, XFILE::EIoControl request, void* param);
+
+    //! \brief Stat a file
+    //! \param url The URL of the file
+    //! \param buffer The buffer to store results in
+    //! \return -1 on error, 0 otherwise
+    //! \sa IFile::Stat
+    int  (__cdecl* Stat) (VFSURL* url, struct __stat64* buffer);
+    //! \brief Close a file
+    //! \param context The context of the file
+    //! \return True on success, false on failure
+    //! \sa IFile::Close
+
+    bool (__cdecl* Close) (void* context);
+
+    //! \brief Check for file existence
+    //! \param url The URL of the file
+    //! \return True if file exists, false otherwise
+    //! \sa IFile::Exists
+    bool (__cdecl* Exists) (VFSURL* url);
+
+    //! \brief Clear out any idle connections
+    void (__cdecl* ClearOutIdle) ();
+
+    //! \brief Disconnect all connections
+    void (__cdecl* DisconnectAll) ();
+
+    //! \brief Delete a file
+    //! \param url The URL of the file
+    //! \return True if deletion was successful, false otherwise
+    //! \sa IFile::Delete
+    bool (__cdecl* Delete) (VFSURL* url);
+
+    //! \brief Rename a file
+    //! \param url The URL of the source file
+    //! \param url2 The URL of the destination file
+    //! \return True if deletion was successful, false otherwise
+    //! \sa IFile::Rename
+    bool (__cdecl* Rename) (VFSURL* url, VFSURL* url2);
+
+    //! \brief Check for directory existence
+    //! \param url The URL of the file
+    //! \return True if directory exists, false otherwise
+    //! \sa IDirectory::Exists
+    bool (__cdecl* DirectoryExists) (VFSURL* url);
+
+    //! \brief Remove a directory
+    //! \param url The URL of the directory
+    //! \return True if removal was successful, false otherwise
+    //! \sa IDirectory::Remove
+    bool (__cdecl* RemoveDirectory) (VFSURL* url);
+
+    //! \brief Create a directory
+    //! \param url The URL of the file
+    //! \return True if creation was successful, false otherwise
+    //! \sa IDirectory::Create
+    bool (__cdecl* CreateDirectory) (VFSURL* url);
+
+    //! \brief List a directory
+    //! \param url The URL of the directory
+    //! \param entries The entries in the directory
+    //! \param num_entries Number of entries in the directory
+    //! \param callbacks A callback structure
+    //! \return Context for the directory listing
+    //! \sa IDirectory::GetDirectory
+    void* (__cdecl* GetDirectory) (VFSURL* url,
+                                   VFSDirEntry** entries,
+                                   int* num_entries,
+                                   VFSCallbacks* callbacks);
+
+    //! \brief Free up resources after listing a directory
+    void (__cdecl* FreeDirectory) (void* ctx);
+
+    //! \brief Check if file should be presented as a directory (multiple streams)
+    //! \param url The URL of the file
+    //! \param entries The entries in the directory
+    //! \param num_entries Number of entries in the directory
+    //! \param rootpath Path to root directory if multiple entries
+    //! \return Context for the directory listing
+    //! \sa IFileDirectory::ContainsFiles, FreeDirectory
+    void* (__cdecl* ContainsFiles) (VFSURL* url,
+                                    VFSDirEntry** entries,
+                                    int* num_entries,
+                                    char* rootpath);
+  } KodiToAddonFuncTable_VFSEntry;
+
+  typedef struct AddonInstance_VFSEntry
+  {
+    AddonProps_VFSEntry props;
+    AddonToKodiFuncTable_VFSEntry toKodi;
+    KodiToAddonFuncTable_VFSEntry toAddon;
+  } AddonInstance_VFSEntry;
+
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
index fb0c15f..d4ea283 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
@@ -27,29 +27,104 @@
 #include "kodi_adsp_types.h"
 #include "libXBMC_addon.h"
 
-typedef void* ADSPHANDLE;
+class CAddonSoundPlay
+{
+public:
+  CAddonSoundPlay(AddonCB* hdl, AddonInstance_AudioDSP* cb, const char* filename)
+    : m_Filename(filename),
+      m_Handle(hdl),
+      m_cb(cb)
+  {
+    m_PlayHandle = nullptr;
+    if (!hdl || !cb)
+      fprintf(stderr, "libKODI_adsp-ERROR: ADSP_get_sound_play is called with NULL handle !!!\n");
+    else
+    {
+      m_PlayHandle = m_cb->toKodi.SoundPlay_GetHandle(m_cb->toKodi.kodiInstance, m_Filename.c_str());
+      if (!m_PlayHandle)
+        fprintf(stderr, "libKODI_adsp-ERROR: ADSP_get_sound_play can't get callback table from KODI !!!\n");
+    }
+  }
+
+  ~CAddonSoundPlay()
+  {
+    if (m_PlayHandle)
+      m_cb->toKodi.SoundPlay_ReleaseHandle(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
+
+  /*! play the sound this object represents */
+  void Play()
+  {
+    if (m_PlayHandle)
+      m_cb->toKodi.SoundPlay_Play(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
 
-#define ADSP_HELPER_DLL KODI_DLL("adsp")
-#define ADSP_HELPER_DLL_NAME KODI_DLL_NAME("adsp")
 
-class CAddonSoundPlay;
+  /*! stop playing the sound this object represents */
+  void Stop()
+  {
+    if (m_PlayHandle)
+      m_cb->toKodi.SoundPlay_Stop(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
+
+  /*! return true if the sound is currently playing */
+  bool IsPlaying()
+  {
+    if (!m_PlayHandle)
+      return false;
+
+    return m_cb->toKodi.SoundPlay_IsPlaying(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
+
+  /*! set the playback channel position of this sound, AE_DSP_CH_INVALID for all */
+  void SetChannel(AE_DSP_CHANNEL channel)
+  {
+    if (m_PlayHandle)
+      m_cb->toKodi.SoundPlay_SetChannel(m_cb->toKodi.kodiInstance, m_PlayHandle, channel);
+  }
+
+  /*! get the current playback volume of this sound, AE_DSP_CH_INVALID for all */
+  AE_DSP_CHANNEL GetChannel()
+  {
+    if (!m_PlayHandle)
+      return AE_DSP_CH_INVALID;
+    return m_cb->toKodi.SoundPlay_GetChannel(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
+
+  /*! set the playback volume of this sound */
+  void SetVolume(float volume)
+  {
+    if (m_PlayHandle)
+      m_cb->toKodi.SoundPlay_SetVolume(m_cb->toKodi.kodiInstance, m_PlayHandle, volume);
+  }
+
+  /*! get the current playback volume of this sound */
+  float GetVolume()
+  {
+    if (!m_PlayHandle)
+      return 0.0f;
+
+    return m_cb->toKodi.SoundPlay_GetVolume(m_cb->toKodi.kodiInstance, m_PlayHandle);
+  }
+
+private:
+  std::string m_Filename;
+  AddonCB* m_Handle;
+  AddonInstance_AudioDSP *m_cb;
+  ADSPHANDLE  m_PlayHandle;
+};
 
 class CHelper_libKODI_adsp
 {
 public:
   CHelper_libKODI_adsp(void)
   {
-    m_libKODI_adsp = NULL;
-    m_Handle      = NULL;
+    m_Handle    = nullptr;
+    m_Callbacks = nullptr;
   }
 
   ~CHelper_libKODI_adsp(void)
   {
-    if (m_libKODI_adsp)
-    {
-      ADSP_unregister_me(m_Handle, m_Callbacks);
-      dlclose(m_libKODI_adsp);
-    }
   }
 
   /*!
@@ -59,53 +134,13 @@ public:
    */
   bool RegisterMe(void* handle)
   {
-    m_Handle = handle;
-
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_Handle)->libPath;
-    libBasePath += ADSP_HELPER_DLL;
-
-    m_libKODI_adsp = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libKODI_adsp == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
-      return false;
-    }
-
-    ADSP_register_me = (void* (*)(void *HANDLE))
-      dlsym(m_libKODI_adsp, "ADSP_register_me");
-    if (ADSP_register_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_unregister_me = (void (*)(void* HANDLE, void* CB))
-      dlsym(m_libKODI_adsp, "ADSP_unregister_me");
-    if (ADSP_unregister_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    m_Handle = static_cast<AddonCB*>(handle);
+    if (m_Handle)
+      m_Callbacks = (AddonInstance_AudioDSP*)m_Handle->ADSPLib_RegisterMe(m_Handle->addonData);
+    if (!m_Callbacks)
+      fprintf(stderr, "libKODI_adsp-ERROR: ADSLib_RegisterMe can't get callback table from Kodi !!!\n");
 
-    ADSP_add_menu_hook = (void (*)(void* HANDLE, void* CB, AE_DSP_MENUHOOK *hook))
-      dlsym(m_libKODI_adsp, "ADSP_add_menu_hook");
-    if (ADSP_add_menu_hook == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_remove_menu_hook = (void (*)(void* HANDLE, void* CB, AE_DSP_MENUHOOK *hook))
-      dlsym(m_libKODI_adsp, "ADSP_remove_menu_hook");
-    if (ADSP_remove_menu_hook == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_register_mode = (void (*)(void *HANDLE, void* CB, AE_DSP_MODES::AE_DSP_MODE *modes))
-      dlsym(m_libKODI_adsp, "ADSP_register_mode");
-    if (ADSP_register_mode == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_unregister_mode = (void (*)(void* HANDLE, void* CB, AE_DSP_MODES::AE_DSP_MODE *modes))
-      dlsym(m_libKODI_adsp, "ADSP_unregister_mode");
-    if (ADSP_unregister_mode == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_get_sound_play = (CAddonSoundPlay* (*)(void *HANDLE, void *CB, const char *filename))
-      dlsym(m_libKODI_adsp, "ADSP_get_sound_play");
-    if (ADSP_get_sound_play == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    ADSP_release_sound_play = (void (*)(CAddonSoundPlay* p))
-      dlsym(m_libKODI_adsp, "ADSP_release_sound_play");
-    if (ADSP_release_sound_play == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    m_Callbacks = ADSP_register_me(m_Handle);
-    return m_Callbacks != NULL;
+    return m_Callbacks != nullptr;
   }
 
   /*!
@@ -114,7 +149,7 @@ public:
    */
   void AddMenuHook(AE_DSP_MENUHOOK* hook)
   {
-    return ADSP_add_menu_hook(m_Handle, m_Callbacks, hook);
+    return m_Callbacks->toKodi.AddMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
   }
 
   /*!
@@ -123,7 +158,7 @@ public:
    */
   void RemoveMenuHook(AE_DSP_MENUHOOK* hook)
   {
-    return ADSP_remove_menu_hook(m_Handle, m_Callbacks, hook);
+    return m_Callbacks->toKodi.RemoveMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
   }
 
   /*!
@@ -133,7 +168,7 @@ public:
    */
   void RegisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
   {
-    return ADSP_register_mode(m_Handle, m_Callbacks, mode);
+    return m_Callbacks->toKodi.RegisterMode(m_Callbacks->toKodi.kodiInstance, mode);
   }
 
   /*!
@@ -142,7 +177,7 @@ public:
    */
   void UnregisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
   {
-    return ADSP_unregister_mode(m_Handle, m_Callbacks, mode);
+    return m_Callbacks->toKodi.UnregisterMode(m_Callbacks->toKodi.kodiInstance, mode);
   }
 
   /*!
@@ -151,7 +186,7 @@ public:
    */
   CAddonSoundPlay* GetSoundPlay(const char *filename)
   {
-    return ADSP_get_sound_play(m_Handle, m_Callbacks, filename);
+    return new CAddonSoundPlay(m_Handle, m_Callbacks, filename);
   }
 
   /*!
@@ -160,60 +195,10 @@ public:
    */
   void ReleaseSoundPlay(CAddonSoundPlay* p)
   {
-    return ADSP_release_sound_play(p);
+    delete p;
   }
 
-protected:
-  void* (*ADSP_register_me)(void*);
-
-  void (*ADSP_unregister_me)(void*, void*);
-  void (*ADSP_add_menu_hook)(void*, void*, AE_DSP_MENUHOOK*);
-  void (*ADSP_remove_menu_hook)(void*, void*, AE_DSP_MENUHOOK*);
-  void (*ADSP_register_mode)(void*, void*, AE_DSP_MODES::AE_DSP_MODE*);
-  void (*ADSP_unregister_mode)(void*, void*, AE_DSP_MODES::AE_DSP_MODE*);
-  CAddonSoundPlay* (*ADSP_get_sound_play)(void*, void*, const char *);
-  void (*ADSP_release_sound_play)(CAddonSoundPlay*);
-
 private:
-  void* m_libKODI_adsp;
-  void* m_Handle;
-  void* m_Callbacks;
-  struct cb_array
-  {
-    const char* libPath;
-  };
-};
-
-class CAddonSoundPlay
-{
-public:
-  CAddonSoundPlay(void *hdl, void *cb, const char *filename);
-  virtual ~CAddonSoundPlay();
-
-  /*! play the sound this object represents */
-  virtual void Play();
-
-  /*! stop playing the sound this object represents */
-  virtual void Stop();
-
-  /*! return true if the sound is currently playing */
-  virtual bool IsPlaying();
-
-  /*! set the playback channel position of this sound, AE_DSP_CH_INVALID for all */
-  virtual void SetChannel(AE_DSP_CHANNEL channel);
-
-  /*! get the current playback volume of this sound, AE_DSP_CH_INVALID for all */
-  virtual AE_DSP_CHANNEL GetChannel();
-
-  /*! set the playback volume of this sound */
-  virtual void SetVolume(float volume);
-
-  /*! get the current playback volume of this sound */
-  virtual float GetVolume();
-
-private:
-  std::string m_Filename;
-  void       *m_Handle;
-  void       *m_cb;
-  ADSPHANDLE  m_PlayHandle;
+  AddonCB* m_Handle;
+  AddonInstance_AudioDSP *m_Callbacks;
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h
deleted file mode 100644
index 7dbf7af..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h
+++ /dev/null
@@ -1,306 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2014 Team KODI
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KODI; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <string.h>
-#include <vector>
-
-#include "kodi_audioengine_types.h"
-#ifdef BUILD_KODI_ADDON
-  #include "kodi/AudioEngine/AEChannelData.h"
-  #include "kodi/AudioEngine/AEChannelInfo.h"
-  #include "kodi/AudioEngine/AEStreamData.h"
-#else
-  #include "cores/AudioEngine/Utils/AEChannelData.h"
-  #include "cores/AudioEngine/Utils/AEChannelInfo.h"
-  #include "cores/AudioEngine/Utils/AEStreamData.h"
-#endif
-
-#include "libXBMC_addon.h"
-
-#define AUDIOENGINE_HELPER_DLL KODI_DLL("audioengine")
-#define AUDIOENGINE_HELPER_DLL_NAME KODI_DLL_NAME("audioengine")
-
-class CAddonAEStream;
-
-class CHelper_libKODI_audioengine
-{
-public:
-  CHelper_libKODI_audioengine(void)
-  {
-    m_libKODI_audioengine = NULL;
-    m_Handle              = NULL;
-  }
-
-  ~CHelper_libKODI_audioengine(void)
-  {
-    if (m_libKODI_audioengine)
-    {
-      AudioEngine_unregister_me(m_Handle, m_Callbacks);
-      dlclose(m_libKODI_audioengine);
-    }
-  }
-
-  /*!
-   * @brief Resolve all callback methods
-   * @param handle Pointer to the add-on
-   * @return True when all methods were resolved, false otherwise.
-   */
-  bool RegisterMe(void* handle)
-  {
-    m_Handle = handle;
-
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_Handle)->libPath;
-    libBasePath += AUDIOENGINE_HELPER_DLL;
-
-    m_libKODI_audioengine = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libKODI_audioengine == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
-      return false;
-    }
-
-    AudioEngine_register_me = (void* (*)(void *HANDLE))
-      dlsym(m_libKODI_audioengine, "AudioEngine_register_me");
-    if (AudioEngine_register_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    AudioEngine_unregister_me = (void(*)(void* HANDLE, void* CB))
-      dlsym(m_libKODI_audioengine, "AudioEngine_unregister_me");
-    if (AudioEngine_unregister_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    AudioEngine_MakeStream = (CAddonAEStream* (*)(void*, void*, AudioEngineFormat, unsigned int))
-      dlsym(m_libKODI_audioengine, "AudioEngine_make_stream");
-    if (AudioEngine_MakeStream == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    AudioEngine_FreeStream = (void(*)(CAddonAEStream*))
-      dlsym(m_libKODI_audioengine, "AudioEngine_free_stream");
-    if (AudioEngine_FreeStream == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    AudioEngine_GetCurrentSinkFormat = (bool(*)(void*, void*, AudioEngineFormat*))
-      dlsym(m_libKODI_audioengine, "AudioEngine_get_current_sink_Format");
-    if (AudioEngine_GetCurrentSinkFormat == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    m_Callbacks = AudioEngine_register_me(m_Handle);
-    return m_Callbacks != NULL;
-  }
-
-  /**
-   * Creates and returns a new handle to an IAEStream in the format specified, this function should never fail
-   * @param DataFormat The data format the incoming audio will be in (eg, AE_FMT_S16LE)
-   * @param SampleRate The sample rate of the audio data (eg, 48000)
-   * @param ChannelLayout The order of the channels in the audio data
-   * @param Options A bit field of stream options (see: enum AEStreamOptions)
-   * @return a new Handle to an IAEStream that will accept data in the requested format
-   */
-  CAddonAEStream* MakeStream(AudioEngineFormat Format, unsigned int Options = 0)
-  {
-    return AudioEngine_MakeStream(m_Handle, m_Callbacks, Format, Options);
-  }
-
-  /**
-  * This method will remove the specifyed stream from the engine.
-  * For OSX/IOS this is essential to reconfigure the audio output.
-  * @param stream The stream to be altered
-  * @return NULL
-  */
-  void FreeStream(CAddonAEStream **Stream)
-  {
-    AudioEngine_FreeStream(*Stream);
-    *Stream = NULL;
-  }
-
-  /**
-   * Get the current sink data format
-   *
-   * @param Current sink data format. For more details see AudioEngineFormat.
-   * @return Returns true on success, else false.
-   */
-  bool GetCurrentSinkFormat(AudioEngineFormat &SinkFormat)
-  {
-    return AudioEngine_GetCurrentSinkFormat(m_Handle, m_Callbacks, &SinkFormat);
-  }
-
-protected:
-  void* (*AudioEngine_register_me)(void*);
-  void (*AudioEngine_unregister_me)(void*, void*);
-  CAddonAEStream* (*AudioEngine_MakeStream)(void*, void*, AudioEngineFormat, unsigned int);
-  bool (*AudioEngine_GetCurrentSinkFormat)(void*, void*, AudioEngineFormat *SinkFormat);
-  void (*AudioEngine_FreeStream)(CAddonAEStream*);
-
-private:
-  void* m_libKODI_audioengine;
-  void* m_Handle;
-  void* m_Callbacks;
-  struct cb_array
-  {
-    const char* libPath;
-  };
-};
-
-// Audio Engine Stream Class
-class CAddonAEStream
-{
-public:
-  CAddonAEStream(void *Addon, void *Callbacks, AEStreamHandle *StreamHandle);
-  virtual ~CAddonAEStream();
-
-  /**
-  * Returns the amount of space available in the stream
-  * @return The number of bytes AddData will consume
-  */
-  virtual unsigned int GetSpace();
-
-  /**
-  * Add planar or interleaved PCM data to the stream
-  * @param Data array of pointers to the planes
-  * @param Offset to frame in frames
-  * @param Frames number of frames
-  * @return The number of frames consumed
-  */
-  virtual unsigned int AddData(uint8_t* const *Data, unsigned int Offset, unsigned int Frames);
-
-  /**
-  * Returns the time in seconds that it will take
-  * for the next added packet to be heard from the speakers.
-  * @return seconds
-  */
-  virtual double GetDelay();
-
-  /**
-  * Returns if the stream is buffering
-  * @return True if the stream is buffering
-  */
-  virtual bool IsBuffering();
-
-  /**
-   * Returns the time in seconds of the stream's
-   * cached audio samples. Engine buffers excluded.
-  * @return seconds
-  */
-  virtual double GetCacheTime();
-
-  /**
-  * Returns the total time in seconds of the cache
-  * @return seconds
-  */
-  virtual double GetCacheTotal();
-
-  /**
-  * Pauses the stream playback
-  */
-  virtual void Pause();
-
-  /**
-  * Resumes the stream after pausing
-  */
-  virtual void Resume();
-
-  /**
-  * Start draining the stream
-  * @note Once called AddData will not consume more data.
-  */
-  virtual void Drain(bool Wait);
-
-  /**
-  * Returns true if the is stream draining
-  */
-  virtual bool IsDraining();
-
-  /**
-  * Returns true if the is stream has finished draining
-  */
-  virtual bool IsDrained();
-
-  /**
-  * Flush all buffers dropping the audio data
-  */
-  virtual void Flush();
-
-  /**
-  * Return the stream's current volume level
-  * @return The volume level between 0.0 and 1.0
-  */
-  virtual float GetVolume();
-
-  /**
-  * Set the stream's volume level
-  * @param volume The new volume level between 0.0 and 1.0
-  */
-  virtual void  SetVolume(float Volume);
-
-  /**
-  * Gets the stream's volume amplification in linear units.
-  * @return The volume amplification factor between 1.0 and 1000.0
-  */
-  virtual float GetAmplification();
-
-  /**
-  * Sets the stream's volume amplification in linear units.
-  * @param The volume amplification factor between 1.0 and 1000.0
-  */
-  virtual void SetAmplification(float Amplify);
-
-  /**
-  * Returns the size of one audio frame in bytes (channelCount * resolution)
-  * @return The size in bytes of one frame
-  */
-  virtual const unsigned int GetFrameSize() const;
-
-  /**
-  * Returns the number of channels the stream is configured to accept
-  * @return The channel count
-  */
-  virtual const unsigned int GetChannelCount() const;
-
-  /**
-  * Returns the stream's sample rate, if the stream is using a dynamic sample rate, this value will NOT reflect any changes made by calls to SetResampleRatio()
-  * @return The stream's sample rate (eg, 48000)
-  */
-  virtual const unsigned int GetSampleRate() const;
-
-  /**
-  * Return the data format the stream has been configured with
-  * @return The stream's data format (eg, AE_FMT_S16LE)
-  */
-  virtual const AEDataFormat GetDataFormat() const;
-
-  /**
-  * Return the resample ratio
-  * @note This will return an undefined value if the stream is not resampling
-  * @return the current resample ratio or undefined if the stream is not resampling
-  */
-  virtual double GetResampleRatio();
-
-  /**
-  * Sets the resample ratio
-  * @note This function may return false if the stream is not resampling, if you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option
-  * @param ratio the new sample rate ratio, calculated by ((double)desiredRate / (double)GetSampleRate())
-  */
-  virtual void SetResampleRatio(double Ratio);
-
-  private:
-    AEStreamHandle  *m_StreamHandle;
-    void            *m_Callbacks;
-    void            *m_AddonHandle;
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
index b5a46dd..1ca91a4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "libXBMC_addon.h"
-#include "kodi_game_callbacks.h"
+#include "kodi_game_types.h"
 
 #include <string>
 #include <stdio.h>
@@ -29,55 +29,17 @@
   #include <sys/stat.h>
 #endif
 
-#ifdef _WIN32
-  #define GAME_HELPER_DLL "\\library.kodi.game\\libKODI_game" ADDON_HELPER_EXT
-#else
-  #define GAME_HELPER_DLL_NAME "libKODI_game-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
-  #define GAME_HELPER_DLL "/library.kodi.game/" GAME_HELPER_DLL_NAME
-#endif
-
-#define GAME_REGISTER_SYMBOL(dll, functionPtr) \
-  CHelper_libKODI_game::RegisterSymbol(dll, functionPtr, #functionPtr)
-
 class CHelper_libKODI_game
 {
 public:
   CHelper_libKODI_game(void) :
-    GAME_register_me(nullptr),
-    GAME_unregister_me(nullptr),
-    GAME_close_game(nullptr),
-    GAME_open_pixel_stream(nullptr),
-    GAME_open_video_stream(nullptr),
-    GAME_open_pcm_stream(nullptr),
-    GAME_open_audio_stream(nullptr),
-    GAME_add_stream_data(nullptr),
-    GAME_close_stream(nullptr),
-    GAME_enable_hardware_rendering(nullptr),
-    GAME_hw_get_current_framebuffer(nullptr),
-    GAME_hw_get_proc_address(nullptr),
-    GAME_render_frame(nullptr),
-    GAME_open_port(nullptr),
-    GAME_close_port(nullptr),
-    GAME_input_event(nullptr),
     m_handle(nullptr),
-    m_callbacks(nullptr),
-    m_libKODI_game(nullptr)
+    m_callbacks(nullptr)
   {
   }
 
   ~CHelper_libKODI_game(void)
   {
-    if (m_libKODI_game)
-    {
-      GAME_unregister_me(m_handle, m_callbacks);
-      dlclose(m_libKODI_game);
-    }
-  }
-
-  template <typename T>
-  static bool RegisterSymbol(void* dll, T& functionPtr, const char* strFunctionPtr)
-  {
-    return (functionPtr = (T)dlsym(dll, strFunctionPtr)) != NULL;
   }
 
   /*!
@@ -87,152 +49,182 @@ public:
     */
   bool RegisterMe(void* handle)
   {
-    m_handle = handle;
+    m_handle = static_cast<AddonCB*>(handle);
+    if (m_handle)
+      m_callbacks = (AddonInstance_Game*)m_handle->GameLib_RegisterMe(m_handle->addonData);
+    if (!m_callbacks)
+      fprintf(stderr, "libKODI_game-ERROR: GameLib_RegisterMe can't get callback table from Kodi !!!\n");
 
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_handle)->libBasePath;
-    libBasePath += GAME_HELPER_DLL;
-
-#if defined(ANDROID)
-      struct stat st;
-      if (stat(libBasePath.c_str(),&st) != 0)
-      {
-        std::string tempbin = getenv("XBMC_ANDROID_LIBS");
-        libBasePath = tempbin + "/" + GAME_HELPER_DLL_NAME;
-      }
-#endif
-
-    m_libKODI_game = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libKODI_game == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
-      return false;
-    }
-
-    try
-    {
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_register_me)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_unregister_me)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_close_game)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_open_pixel_stream)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_open_video_stream)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_open_pcm_stream)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_open_audio_stream)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_add_stream_data)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_close_stream)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_enable_hardware_rendering)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_hw_get_current_framebuffer)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_hw_get_proc_address)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_render_frame)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_open_port)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_close_port)) throw false;
-      if (!GAME_REGISTER_SYMBOL(m_libKODI_game, GAME_input_event)) throw false;
-    }
-    catch (const bool& bSuccess)
-    {
-      fprintf(stderr, "ERROR: Unable to assign function %s\n", dlerror());
-      return bSuccess;
-    }
-
-    m_callbacks = GAME_register_me(m_handle);
-    return m_callbacks != NULL;
+    return m_callbacks != nullptr;
   }
 
+  // --- Game callbacks --------------------------------------------------------
+
+  /*!
+   * \brief Requests the frontend to stop the current game
+   */
   void CloseGame(void)
   {
-    return GAME_close_game(m_handle, m_callbacks);
+    return m_callbacks->toKodi.CloseGame(m_callbacks->toKodi.kodiInstance);
   }
 
+  /*!
+   * \brief Create a video stream for pixel data
+   *
+   * \param format The type of pixel data accepted by this stream
+   * \param width The frame width
+   * \param height The frame height
+   * \param rotation The rotation (counter-clockwise) of the video frames
+   *
+   * \return 0 on success or -1 if a video stream is already created
+   */
   bool OpenPixelStream(GAME_PIXEL_FORMAT format, unsigned int width, unsigned int height, GAME_VIDEO_ROTATION rotation)
   {
-    return GAME_open_pixel_stream(m_handle, m_callbacks, format, width, height, rotation) == 0;
+    return m_callbacks->toKodi.OpenPixelStream(m_callbacks->toKodi.kodiInstance, format, width, height, rotation) == 0;
   }
 
+  /*!
+   * \brief Create a video stream for encoded video data
+   *
+   * \param codec The video format accepted by this stream
+   *
+   * \return 0 on success or -1 if a video stream is already created
+   */
   bool OpenVideoStream(GAME_VIDEO_CODEC codec)
   {
-    return GAME_open_video_stream(m_handle, m_callbacks, codec) == 0;
+    return m_callbacks->toKodi.OpenVideoStream(m_callbacks->toKodi.kodiInstance, codec) == 0;
   }
 
+  /*!
+   * \brief Create an audio stream for PCM audio data
+   *
+   * \param format The type of audio data accepted by this stream
+   * \param channel_map The channel layout terminated by GAME_CH_NULL
+   *
+   * \return 0 on success or -1 if an audio stream is already created
+   */
   bool OpenPCMStream(GAME_PCM_FORMAT format, const GAME_AUDIO_CHANNEL* channel_map)
   {
-    return GAME_open_pcm_stream(m_handle, m_callbacks, format, channel_map) == 0;
+    return m_callbacks->toKodi.OpenPCMStream(m_callbacks->toKodi.kodiInstance, format, channel_map) == 0;
   }
 
+  /*!
+  * \brief Create an audio stream for encoded audio data
+  *
+  * \param codec The audio format accepted by this stream
+  * \param channel_map The channel layout terminated by GAME_CH_NULL
+  *
+  * \return 0 on success or -1 if an audio stream is already created
+  */
   bool OpenAudioStream(GAME_AUDIO_CODEC codec, const GAME_AUDIO_CHANNEL* channel_map)
   {
-    return GAME_open_audio_stream(m_handle, m_callbacks, codec, channel_map) == 0;
+    return m_callbacks->toKodi.OpenAudioStream(m_callbacks->toKodi.kodiInstance, codec, channel_map) == 0;
   }
 
+  /*!
+   * \brief Add a data packet to an audio or video stream
+   *
+   * \param stream The target stream
+   * \param data The data packet
+   * \param size The size of the data
+   */
   void AddStreamData(GAME_STREAM_TYPE stream, const uint8_t* data, unsigned int size)
   {
-    GAME_add_stream_data(m_handle, m_callbacks, stream, data, size);
+    m_callbacks->toKodi.AddStreamData(m_callbacks->toKodi.kodiInstance, stream, data, size);
   }
 
+  /*!
+   * \brief Free the specified stream
+   *
+   * \param stream The stream to close
+   */
   void CloseStream(GAME_STREAM_TYPE stream)
   {
-    GAME_close_stream(m_handle, m_callbacks, stream);
+    m_callbacks->toKodi.CloseStream(m_callbacks->toKodi.kodiInstance, stream);
   }
 
+  // -- Hardware rendering callbacks -------------------------------------------
+
+  /*!
+   * \brief Enable hardware rendering
+   *
+   * \param hw_info A struct of properties for the hardware rendering system
+   */
   void EnableHardwareRendering(const struct game_hw_info* hw_info)
   {
-    return GAME_enable_hardware_rendering(m_handle, m_callbacks, hw_info);
+    return m_callbacks->toKodi.EnableHardwareRendering(m_callbacks->toKodi.kodiInstance, hw_info);
   }
 
+  /*!
+   * \brief Get the framebuffer for rendering
+   *
+   * \return The framebuffer
+   */
   uintptr_t HwGetCurrentFramebuffer(void)
   {
-    return GAME_hw_get_current_framebuffer(m_handle, m_callbacks);
+    return m_callbacks->toKodi.HwGetCurrentFramebuffer(m_callbacks->toKodi.kodiInstance);
   }
 
+  /*!
+   * \brief Get a symbol from the hardware context
+   *
+   * \param symbol The symbol's name
+   *
+   * \return A function pointer for the specified symbol
+   */
   game_proc_address_t HwGetProcAddress(const char* sym)
   {
-    return GAME_hw_get_proc_address(m_handle, m_callbacks, sym);
+    return m_callbacks->toKodi.HwGetProcAddress(m_callbacks->toKodi.kodiInstance, sym);
   }
 
+  /*!
+   * \brief Called when a frame is being rendered
+   */
   void RenderFrame()
   {
-    return GAME_render_frame(m_handle, m_callbacks);
+    return m_callbacks->toKodi.RenderFrame(m_callbacks->toKodi.kodiInstance);
   }
 
+  // --- Input callbacks -------------------------------------------------------
+
+  /*!
+   * \brief Begin reporting events for the specified joystick port
+   *
+   * \param port The zero-indexed port number
+   *
+   * \return true if the port was opened, false otherwise
+   */
   bool OpenPort(unsigned int port)
   {
-    return GAME_open_port(m_handle, m_callbacks, port);
+    return m_callbacks->toKodi.OpenPort(m_callbacks->toKodi.kodiInstance, port);
   }
 
+  /*!
+   * \brief End reporting events for the specified port
+   *
+   * \param port The port number passed to OpenPort()
+   */
   void ClosePort(unsigned int port)
   {
-    return GAME_close_port(m_handle, m_callbacks, port);
+    return m_callbacks->toKodi.ClosePort(m_callbacks->toKodi.kodiInstance, port);
   }
 
+  /*!
+  * \brief Notify the port of an input event
+  *
+  * \param event The input event
+  *
+  * Input events can arrive for the following sources:
+  *   - GAME_INPUT_EVENT_MOTOR
+  *
+  * \return true if the event was handled, false otherwise
+  */
   bool InputEvent(const game_input_event& event)
   {
-    return GAME_input_event(m_handle, m_callbacks, &event);
-  }
-
-protected:
-  CB_GameLib* (*GAME_register_me)(void* handle);
-  void (*GAME_unregister_me)(void* handle, CB_GameLib* cb);
-  void (*GAME_close_game)(void* handle, CB_GameLib* cb);
-  int (*GAME_open_pixel_stream)(void* handle, CB_GameLib* cb, GAME_PIXEL_FORMAT, unsigned int, unsigned int, GAME_VIDEO_ROTATION);
-  int (*GAME_open_video_stream)(void* handle, CB_GameLib* cb, GAME_VIDEO_CODEC);
-  int (*GAME_open_pcm_stream)(void* handle, CB_GameLib* cb, GAME_PCM_FORMAT, const GAME_AUDIO_CHANNEL*);
-  int (*GAME_open_audio_stream)(void* handle, CB_GameLib* cb, GAME_AUDIO_CODEC, const GAME_AUDIO_CHANNEL*);
-  int (*GAME_add_stream_data)(void* handle, CB_GameLib* cb, GAME_STREAM_TYPE, const uint8_t*, unsigned int);
-  int (*GAME_close_stream)(void* handle, CB_GameLib* cb, GAME_STREAM_TYPE);
-  void (*GAME_enable_hardware_rendering)(void* handle, CB_GameLib* cb, const struct game_hw_info*);
-  uintptr_t (*GAME_hw_get_current_framebuffer)(void* handle, CB_GameLib* cb);
-  game_proc_address_t (*GAME_hw_get_proc_address)(void* handle, CB_GameLib* cb, const char*);
-  void (*GAME_render_frame)(void* handle, CB_GameLib* cb);
-  bool (*GAME_open_port)(void* handle, CB_GameLib* cb, unsigned int);
-  void (*GAME_close_port)(void* handle, CB_GameLib* cb, unsigned int);
-  bool (*GAME_input_event)(void* handle, CB_GameLib* cb, const game_input_event* event);
+    return m_callbacks->toKodi.InputEvent(m_callbacks->toKodi.kodiInstance, &event);
+  }
 
 private:
-  void*        m_handle;
-  CB_GameLib*  m_callbacks;
-  void*        m_libKODI_game;
-
-  struct cb_array
-  {
-    const char* libBasePath;
-  };
+  AddonCB* m_handle;
+  AddonInstance_Game* m_callbacks;
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
index b699fa0..d6f0f4f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
@@ -28,416 +28,1068 @@
 
 typedef void* GUIHANDLE;
 
-#define GUI_HELPER_DLL KODI_DLL("guilib")
-#define GUI_HELPER_DLL_NAME KODI_DLL_NAME("guilib")
+namespace KodiAPI
+{
+namespace GUI
+{
 
-/* current ADDONGUI API version */
-#define KODI_GUILIB_API_VERSION "5.11.0"
+typedef struct CB_GUILib
+{
+  void (*Lock)();
+  void (*Unlock)();
+  int (*GetScreenHeight)();
+  int (*GetScreenWidth)();
+  int (*GetVideoResolution)();
+  GUIHANDLE (*Window_New)(void *addonData, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
+  void (*Window_Delete)(void *addonData, GUIHANDLE handle);
+  void (*Window_SetCallbacks)(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*)(GUIHANDLE handle), bool (*)(GUIHANDLE handle, int), bool (*)(GUIHANDLE handle, int), bool (*)(GUIHANDLE handle, int));
+  bool (*Window_Show)(void *addonData, GUIHANDLE handle);
+  bool (*Window_Close)(void *addonData, GUIHANDLE handle);
+  bool (*Window_DoModal)(void *addonData, GUIHANDLE handle);
+  bool (*Window_SetFocusId)(void *addonData, GUIHANDLE handle, int iControlId);
+  int (*Window_GetFocusId)(void *addonData, GUIHANDLE handle);
+  bool (*Window_SetCoordinateResolution)(void *addonData, GUIHANDLE handle, int res);
+  void (*Window_SetProperty)(void *addonData, GUIHANDLE handle, const char *key, const char *value);
+  void (*Window_SetPropertyInt)(void *addonData, GUIHANDLE handle, const char *key, int value);
+  void (*Window_SetPropertyBool)(void *addonData, GUIHANDLE handle, const char *key, bool value);
+  void (*Window_SetPropertyDouble)(void *addonData, GUIHANDLE handle, const char *key, double value);
+  const char* (*Window_GetProperty)(void *addonData, GUIHANDLE handle, const char *key);
+  int (*Window_GetPropertyInt)(void *addonData, GUIHANDLE handle, const char *key);
+  bool (*Window_GetPropertyBool)(void *addonData, GUIHANDLE handle, const char *key);
+  double (*Window_GetPropertyDouble)(void *addonData, GUIHANDLE handle, const char *key);
+  void (*Window_ClearProperties)(void *addonData, GUIHANDLE handle);
+  int (*Window_GetListSize)(void *addonData, GUIHANDLE handle);
+  void (*Window_ClearList)(void *addonData, GUIHANDLE handle);
+  GUIHANDLE (*Window_AddItem)(void *addonData, GUIHANDLE handle, GUIHANDLE item, int itemPosition);
+  GUIHANDLE (*Window_AddStringItem)(void *addonData, GUIHANDLE handle, const char *itemName, int itemPosition);
+  void (*Window_RemoveItem)(void *addonData, GUIHANDLE handle, int itemPosition);
+  GUIHANDLE (*Window_GetListItem)(void *addonData, GUIHANDLE handle, int listPos);
+  void (*Window_SetCurrentListPosition)(void *addonData, GUIHANDLE handle, int listPos);
+  int (*Window_GetCurrentListPosition)(void *addonData, GUIHANDLE handle);
+  GUIHANDLE (*Window_GetControl_Spin)(void *addonData, GUIHANDLE handle, int controlId);
+  GUIHANDLE (*Window_GetControl_Button)(void *addonData, GUIHANDLE handle, int controlId);
+  GUIHANDLE (*Window_GetControl_RadioButton)(void *addonData, GUIHANDLE handle, int controlId);
+  GUIHANDLE (*Window_GetControl_Edit)(void *addonData, GUIHANDLE handle, int controlId);
+  GUIHANDLE (*Window_GetControl_Progress)(void *addonData, GUIHANDLE handle, int controlId);
+  GUIHANDLE (*Window_GetControl_RenderAddon)(void *addonData, GUIHANDLE handle, int controlId);
+  void (*Window_SetControlLabel)(void *addonData, GUIHANDLE handle, int controlId, const char *label);
+  void (*Window_MarkDirtyRegion)(void *addonData, GUIHANDLE handle);
+  void (*Control_Spin_SetVisible)(void *addonData, GUIHANDLE spinhandle, bool yesNo);
+  void (*Control_Spin_SetText)(void *addonData, GUIHANDLE spinhandle, const char *label);
+  void (*Control_Spin_Clear)(void *addonData, GUIHANDLE spinhandle);
+  void (*Control_Spin_AddLabel)(void *addonData, GUIHANDLE spinhandle, const char *label, int iValue);
+  int (*Control_Spin_GetValue)(void *addonData, GUIHANDLE spinhandle);
+  void (*Control_Spin_SetValue)(void *addonData, GUIHANDLE spinhandle, int iValue);
+  void (*Control_RadioButton_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
+  void (*Control_RadioButton_SetText)(void *addonData, GUIHANDLE handle, const char *label);
+  void (*Control_RadioButton_SetSelected)(void *addonData, GUIHANDLE handle, bool yesNo);
+  bool (*Control_RadioButton_IsSelected)(void *addonData, GUIHANDLE handle);
+  void (*Control_Progress_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
+  float (*Control_Progress_GetPercentage)(void *addonData, GUIHANDLE handle);
+  void (*Control_Progress_SetInfo)(void *addonData, GUIHANDLE handle, int iInfo);
+  int (*Control_Progress_GetInfo)(void *addonData, GUIHANDLE handle);
+  const char* (*Control_Progress_GetDescription)(void *addonData, GUIHANDLE handle);
+  GUIHANDLE (*Window_GetControl_Slider)(void *addonData, GUIHANDLE handle, int controlId);
+  void (*Control_Slider_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
+  const char *(*Control_Slider_GetDescription)(void *addonData, GUIHANDLE handle);
+  void (*Control_Slider_SetIntRange)(void *addonData, GUIHANDLE handle, int iStart, int iEnd);
+  void (*Control_Slider_SetIntValue)(void *addonData, GUIHANDLE handle, int iValue);
+  int (*Control_Slider_GetIntValue)(void *addonData, GUIHANDLE handle);
+  void (*Control_Slider_SetIntInterval)(void *addonData, GUIHANDLE handle, int iInterval);
+  void (*Control_Slider_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
+  float (*Control_Slider_GetPercentage)(void *addonData, GUIHANDLE handle);
+  void (*Control_Slider_SetFloatRange)(void *addonData, GUIHANDLE handle, float fStart, float fEnd);
+  void (*Control_Slider_SetFloatValue)(void *addonData, GUIHANDLE handle, float fValue);
+  float (*Control_Slider_GetFloatValue)(void *addonData, GUIHANDLE handle);
+  void (*Control_Slider_SetFloatInterval)(void *addonData, GUIHANDLE handle, float fInterval);
+  GUIHANDLE (*Window_GetControl_SettingsSlider)(void *addonData, GUIHANDLE handle, int controlId);
+  void (*Control_SettingsSlider_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
+  void (*Control_SettingsSlider_SetText)(void *addonData, GUIHANDLE handle, const char *label);
+  const char *(*Control_SettingsSlider_GetDescription)(void *addonData, GUIHANDLE handle);
+  void (*Control_SettingsSlider_SetIntRange)(void *addonData, GUIHANDLE handle, int iStart, int iEnd);
+  void (*Control_SettingsSlider_SetIntValue)(void *addonData, GUIHANDLE handle, int iValue);
+  int (*Control_SettingsSlider_GetIntValue)(void *addonData, GUIHANDLE handle);
+  void (*Control_SettingsSlider_SetIntInterval)(void *addonData, GUIHANDLE handle, int iInterval);
+  void (*Control_SettingsSlider_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
+  float (*Control_SettingsSlider_GetPercentage)(void *addonData, GUIHANDLE handle);
+  void (*Control_SettingsSlider_SetFloatRange)(void *addonData, GUIHANDLE handle, float fStart, float fEnd);
+  void (*Control_SettingsSlider_SetFloatValue)(void *addonData, GUIHANDLE handle, float fValue);
+  float (*Control_SettingsSlider_GetFloatValue)(void *addonData, GUIHANDLE handle);
+  void (*Control_SettingsSlider_SetFloatInterval)(void *addonData, GUIHANDLE handle, float fInterval);
+  GUIHANDLE (*ListItem_Create)(void *addonData, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
+  const char* (*ListItem_GetLabel)(void *addonData, GUIHANDLE handle);
+  void (*ListItem_SetLabel)(void *addonData, GUIHANDLE handle, const char *label);
+  const char* (*ListItem_GetLabel2)(void *addonData, GUIHANDLE handle);
+  void (*ListItem_SetLabel2)(void *addonData, GUIHANDLE handle, const char *label);
+  void (*ListItem_SetIconImage)(void *addonData, GUIHANDLE handle, const char *image);
+  void (*ListItem_SetThumbnailImage)(void *addonData, GUIHANDLE handle, const char *image);
+  void (*ListItem_SetInfo)(void *addonData, GUIHANDLE handle, const char *info);
+  void (*ListItem_SetProperty)(void *addonData, GUIHANDLE handle, const char *key, const char *value);
+  const char* (*ListItem_GetProperty)(void *addonData, GUIHANDLE handle, const char *key);
+  void (*ListItem_SetPath)(void *addonData, GUIHANDLE handle, const char *path);
+  void (*RenderAddon_SetCallbacks)(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*createCB)(GUIHANDLE,int,int,int,int,void*), void (*renderCB)(GUIHANDLE), void (*stopCB)(GUIHANDLE), bool (*dirtyCB)(GUIHANDLE));
+  void (*RenderAddon_Delete)(void *addonData, GUIHANDLE handle);
+  void (*RenderAddon_MarkDirty)(void *addonData, GUIHANDLE handle);
+
+  bool (*Dialog_Keyboard_ShowAndGetInputWithHead)(char &strTextString, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndGetInput)(char &strTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndGetNewPasswordWithHead)(char &newPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndGetNewPassword)(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead)(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmpty, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndVerifyNewPassword)(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
+  int (*Dialog_Keyboard_ShowAndVerifyPassword)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_ShowAndGetFilter)(char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs);
+  bool (*Dialog_Keyboard_SendTextToActiveKeyboard)(const char *aTextString, bool closeKeyboard);
+  bool (*Dialog_Keyboard_isKeyboardActivated)();
+
+  bool (*Dialog_Numeric_ShowAndVerifyNewPassword)(char &strNewPassword, unsigned int iMaxStringSize);
+  int (*Dialog_Numeric_ShowAndVerifyPassword)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries);
+  bool (*Dialog_Numeric_ShowAndVerifyInput)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput);
+  bool (*Dialog_Numeric_ShowAndGetTime)(tm &time, const char *strHeading);
+  bool (*Dialog_Numeric_ShowAndGetDate)(tm &date, const char *strHeading);
+  bool (*Dialog_Numeric_ShowAndGetIPAddress)(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading);
+  bool (*Dialog_Numeric_ShowAndGetNumber)(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs);
+  bool (*Dialog_Numeric_ShowAndGetSeconds)(char &timeString, unsigned int iMaxStringSize, const char *strHeading);
+
+  bool (*Dialog_FileBrowser_ShowAndGetFile)(const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList);
+
+  void (*Dialog_OK_ShowAndGetInputSingleText)(const char *heading, const char *text);
+  void (*Dialog_OK_ShowAndGetInputLineText)(const char *heading, const char *line0, const char *line1, const char *line2);
+
+  bool (*Dialog_YesNo_ShowAndGetInputSingleText)(const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel);
+  bool (*Dialog_YesNo_ShowAndGetInputLineText)(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel);
+  bool (*Dialog_YesNo_ShowAndGetInputLineButtonText)(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel);
+
+  void (*Dialog_TextViewer)(const char *heading, const char *text);
+
+  int (*Dialog_Select)(const char *heading, const char *entries[], unsigned int size, int selected);
+} CB_GUILib;
+
+} /* namespace GUI */
+} /* namespace KodiAPI */
 
-/* min. ADDONGUI API version */
-#define KODI_GUILIB_MIN_API_VERSION "5.10.0"
 
 #define ADDON_ACTION_PREVIOUS_MENU          10
 #define ADDON_ACTION_CLOSE_DIALOG           51
 #define ADDON_ACTION_NAV_BACK               92
 
-class CAddonGUIWindow;
-class CAddonGUISpinControl;
-class CAddonGUIRadioButton;
-class CAddonGUIProgressControl;
-class CAddonListItem;
-class CAddonGUIRenderingControl;
-class CAddonGUISliderControl;
-class CAddonGUISettingsSliderControl;
+class CAddonGUIControlBase
+{
+public:
+  GUIHANDLE GetControlHandle() const { return m_controlHandle; }
 
-class CHelper_libKODI_guilib
+protected:
+  CAddonGUIControlBase(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIControlBase* window)
+  : m_controlHandle(nullptr), m_Handle(hdl), m_cb(cb), m_Window(window) {}
+  virtual ~CAddonGUIControlBase() = default;
+
+  GUIHANDLE m_controlHandle;
+  AddonCB* m_Handle;
+  KodiAPI::GUI::CB_GUILib* m_cb;
+  CAddonGUIControlBase* m_Window;
+
+private:
+  CAddonGUIControlBase() = delete;
+  CAddonGUIControlBase(const CAddonGUIControlBase&) = delete;
+  CAddonGUIControlBase &operator=(const CAddonGUIControlBase&) = delete;
+};
+
+class CAddonListItem : public CAddonGUIControlBase
 {
 public:
-  CHelper_libKODI_guilib()
+  CAddonListItem(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
+    : CAddonGUIControlBase(hdl, cb, nullptr)
   {
-    m_libKODI_guilib = NULL;
-    m_Handle = NULL;
+    m_controlHandle = m_cb->ListItem_Create(m_Handle->addonData, label, label2, iconImage, thumbnailImage, path);
   }
 
-  ~CHelper_libKODI_guilib()
+  virtual ~CAddonListItem() = default;
+
+  const char *GetLabel()
+  {
+    if (!m_controlHandle)
+      return "";
+
+    return m_cb->ListItem_GetLabel(m_Handle->addonData, m_controlHandle);
+  }
+
+  void SetLabel(const char *label)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetLabel(m_Handle->addonData, m_controlHandle, label);
+  }
+
+  const char *GetLabel2()
+  {
+    if (!m_controlHandle)
+      return "";
+
+    return m_cb->ListItem_GetLabel2(m_Handle->addonData, m_controlHandle);
+  }
+
+  void SetLabel2(const char *label)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetLabel2(m_Handle->addonData, m_controlHandle, label);
+  }
+
+  void SetIconImage(const char *image)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetIconImage(m_Handle->addonData, m_controlHandle, image);
+  }
+
+  void SetThumbnailImage(const char *image)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetThumbnailImage(m_Handle->addonData, m_controlHandle, image);
+  }
+
+  void SetInfo(const char *Info)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetInfo(m_Handle->addonData, m_controlHandle, Info);
+  }
+
+  void SetProperty(const char *key, const char *value)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetProperty(m_Handle->addonData, m_controlHandle, key, value);
+  }
+
+  const char *GetProperty(const char *key) const
+  {
+    if (!m_controlHandle)
+      return "";
+
+    return m_cb->ListItem_GetProperty(m_Handle->addonData, m_controlHandle, key);
+  }
+
+  void SetPath(const char *Path)
+  {
+    if (m_controlHandle)
+      m_cb->ListItem_SetPath(m_Handle->addonData, m_controlHandle, Path);
+  }
+};
+
+class CAddonGUIWindow : public CAddonGUIControlBase
+{
+public:
+  CAddonGUIWindow(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
+    : CAddonGUIControlBase(hdl, cb, nullptr)
+    , m_cbhdl(nullptr)
+    , CBOnInit(nullptr)
+    , CBOnFocus(nullptr)
+    , CBOnClick(nullptr)
+    , CBOnAction(nullptr)
+  {
+    if (hdl && cb)
+    {
+      m_controlHandle = m_cb->Window_New(m_Handle->addonData, xmlFilename, defaultSkin, forceFallback, asDialog);
+      if (!m_controlHandle)
+        fprintf(stderr, "libKODI_guilib: ERROR: Can't create window class !!!\n");
+
+      m_cb->Window_SetCallbacks(m_Handle->addonData, m_controlHandle, this, OnInitCB, OnClickCB, OnFocusCB, OnActionCB);
+    }
+  }
+
+  virtual ~CAddonGUIWindow()
   {
-    if (m_libKODI_guilib)
+    if (m_Handle && m_cb && m_controlHandle)
     {
-      GUI_unregister_me(m_Handle, m_Callbacks);
-      dlclose(m_libKODI_guilib);
+      m_cb->Window_Delete(m_Handle->addonData, m_controlHandle);
+      m_controlHandle = nullptr;
     }
   }
 
-  bool RegisterMe(void *Handle)
+  bool Show()
   {
-    m_Handle = Handle;
+    return m_cb->Window_Show(m_Handle->addonData, m_controlHandle);
+  }
 
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_Handle)->libPath;
-    libBasePath += GUI_HELPER_DLL;
+  void Close()
+  {
+    m_cb->Window_Close(m_Handle->addonData, m_controlHandle);
+  }
 
-    m_libKODI_guilib = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libKODI_guilib == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
+  void DoModal()
+  {
+    m_cb->Window_DoModal(m_Handle->addonData, m_controlHandle);
+  }
+
+  bool SetFocusId(int iControlId)
+  {
+    return m_cb->Window_SetFocusId(m_Handle->addonData, m_controlHandle, iControlId);
+  }
+
+  int GetFocusId()
+  {
+    return m_cb->Window_GetFocusId(m_Handle->addonData, m_controlHandle);
+  }
+
+  bool SetCoordinateResolution(int res)
+  {
+    return m_cb->Window_SetCoordinateResolution(m_Handle->addonData, m_controlHandle, res);
+  }
+
+  void SetProperty(const char *key, const char *value)
+  {
+    m_cb->Window_SetProperty(m_Handle->addonData, m_controlHandle, key, value);
+  }
+
+  void SetPropertyInt(const char *key, int value)
+  {
+    m_cb->Window_SetPropertyInt(m_Handle->addonData, m_controlHandle, key, value);
+  }
+
+  void SetPropertyBool(const char *key, bool value)
+  {
+    m_cb->Window_SetPropertyBool(m_Handle->addonData, m_controlHandle, key, value);
+  }
+
+  void SetPropertyDouble(const char *key, double value)
+  {
+    m_cb->Window_SetPropertyDouble(m_Handle->addonData, m_controlHandle, key, value);
+  }
+
+  const char *GetProperty(const char *key) const
+  {
+    return m_cb->Window_GetProperty(m_Handle->addonData, m_controlHandle, key);
+  }
+
+  int GetPropertyInt(const char *key) const
+  {
+    return m_cb->Window_GetPropertyInt(m_Handle->addonData, m_controlHandle, key);
+  }
+
+  bool GetPropertyBool(const char *key) const
+  {
+    return m_cb->Window_GetPropertyBool(m_Handle->addonData, m_controlHandle, key);
+  }
+
+  double GetPropertyDouble(const char *key) const
+  {
+    return m_cb->Window_GetPropertyDouble(m_Handle->addonData, m_controlHandle, key);
+  }
+
+  void ClearProperties()
+  {
+    m_cb->Window_ClearProperties(m_Handle->addonData, m_controlHandle);
+  }
+
+  int GetListSize()
+  {
+    return m_cb->Window_GetListSize(m_Handle->addonData, m_controlHandle);
+  }
+
+  void ClearList()
+  {
+    m_cb->Window_ClearList(m_Handle->addonData, m_controlHandle);
+  }
+
+  GUIHANDLE AddStringItem(const char *name, int itemPosition = -1)
+  {
+    return m_cb->Window_AddStringItem(m_Handle->addonData, m_controlHandle, name, itemPosition);
+  }
+
+  void AddItem(GUIHANDLE item, int itemPosition = -1)
+  {
+    m_cb->Window_AddItem(m_Handle->addonData, m_controlHandle, item, itemPosition);
+  }
+
+  void AddItem(CAddonListItem *item, int itemPosition = -1)
+  {
+    m_cb->Window_AddItem(m_Handle->addonData, m_controlHandle, item->GetControlHandle(), itemPosition);
+  }
+
+  void RemoveItem(int itemPosition)
+  {
+    m_cb->Window_RemoveItem(m_Handle->addonData, m_controlHandle, itemPosition);
+  }
+
+  GUIHANDLE GetListItem(int listPos)
+  {
+    return m_cb->Window_GetListItem(m_Handle->addonData, m_controlHandle, listPos);
+  }
+
+  void SetCurrentListPosition(int listPos)
+  {
+    m_cb->Window_SetCurrentListPosition(m_Handle->addonData, m_controlHandle, listPos);
+  }
+
+  int GetCurrentListPosition()
+  {
+    return m_cb->Window_GetCurrentListPosition(m_Handle->addonData, m_controlHandle);
+  }
+
+  void SetControlLabel(int controlId, const char *label)
+  {
+    m_cb->Window_SetControlLabel(m_Handle->addonData, m_controlHandle, controlId, label);
+  }
+
+  void MarkDirtyRegion()
+  {
+    m_cb->Window_MarkDirtyRegion(m_Handle->addonData, m_controlHandle);
+  }
+
+  bool OnClick(int controlId)
+  {
+    if (!CBOnClick)
       return false;
-    }
 
-    GUI_register_me = (void* (*)(void *HANDLE))
-      dlsym(m_libKODI_guilib, "GUI_register_me");
-    if (GUI_register_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return CBOnClick(m_cbhdl, controlId);
+  }
+
+  bool OnFocus(int controlId)
+  {
+    if (!CBOnFocus)
+      return false;
+
+    return CBOnFocus(m_cbhdl, controlId);
+  }
+
+  bool OnInit()
+  {
+    if (!CBOnInit)
+      return false;
+
+    return CBOnInit(m_cbhdl);
+  }
+
+  bool OnAction(int actionId)
+  {
+    if (!CBOnAction)
+      return false;
+
+    return CBOnAction(m_cbhdl, actionId);
+  }
+
+  GUIHANDLE m_cbhdl;
+  bool (*CBOnInit)(GUIHANDLE cbhdl);
+  bool (*CBOnFocus)(GUIHANDLE cbhdl, int controlId);
+  bool (*CBOnClick)(GUIHANDLE cbhdl, int controlId);
+  bool (*CBOnAction)(GUIHANDLE cbhdl, int actionId);
+
+protected:
+  static bool OnInitCB(GUIHANDLE cbhdl);
+  static bool OnFocusCB(GUIHANDLE cbhdl, int controlId);
+  static bool OnClickCB(GUIHANDLE cbhdl, int controlId);
+  static bool OnActionCB(GUIHANDLE cbhdl, int actionId);
+};
+
+
+inline bool CAddonGUIWindow::OnInitCB(GUIHANDLE cbhdl)
+{
+  return static_cast<CAddonGUIWindow*>(cbhdl)->OnInit();
+}
+
+inline bool CAddonGUIWindow::OnClickCB(GUIHANDLE cbhdl, int controlId)
+{
+  return static_cast<CAddonGUIWindow*>(cbhdl)->OnClick(controlId);
+}
+
+inline bool CAddonGUIWindow::OnFocusCB(GUIHANDLE cbhdl, int controlId)
+{
+  return static_cast<CAddonGUIWindow*>(cbhdl)->OnFocus(controlId);
+}
+
+inline bool CAddonGUIWindow::OnActionCB(GUIHANDLE cbhdl, int actionId)
+{
+  return static_cast<CAddonGUIWindow*>(cbhdl)->OnAction(actionId);
+}
+
+class CAddonGUISpinControl: public CAddonGUIControlBase
+{
+public:
+  CAddonGUISpinControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+  {
+    m_controlHandle = m_cb->Window_GetControl_Spin(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
+  ~CAddonGUISpinControl(void) {}
+
+  void SetVisible(bool yesNo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Spin_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
+  }
+
+  void SetText(const char *label)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Spin_SetText(m_Handle->addonData, m_controlHandle, label);
+  }
+
+  void Clear()
+  {
+    if (m_controlHandle)
+      m_cb->Control_Spin_Clear(m_Handle->addonData, m_controlHandle);
+  }
+
+  void AddLabel(const char *label, int iValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Spin_AddLabel(m_Handle->addonData, m_controlHandle, label, iValue);
+  }
+
+  int GetValue()
+  {
+    if (!m_controlHandle)
+      return -1;
+
+    return m_cb->Control_Spin_GetValue(m_Handle->addonData, m_controlHandle);
+  }
+  
+  void SetValue(int iValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Spin_SetValue(m_Handle->addonData, m_controlHandle, iValue);
+  }
+};
+
+class CAddonGUIRadioButton : public CAddonGUIControlBase
+{
+public:
+  CAddonGUIRadioButton(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+  {
+    m_controlHandle = m_cb->Window_GetControl_RadioButton(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
+  ~CAddonGUIRadioButton() {}
+
+  void SetVisible(bool yesNo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_RadioButton_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
+  }
+
+  void SetText(const char *label)
+  {
+    if (m_controlHandle)
+      m_cb->Control_RadioButton_SetText(m_Handle->addonData, m_controlHandle, label);
+  }
+
+  void SetSelected(bool yesNo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_RadioButton_SetSelected(m_Handle->addonData, m_controlHandle, yesNo);
+  }
+
+  bool IsSelected()
+  {
+    if (!m_controlHandle)
+      return false;
+
+    return m_cb->Control_RadioButton_IsSelected(m_Handle->addonData, m_controlHandle);
+  }
+};
+
+class CAddonGUIProgressControl : public CAddonGUIControlBase
+{
+public:
+  CAddonGUIProgressControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+  {
+    m_controlHandle = m_cb->Window_GetControl_Progress(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
+
+  ~CAddonGUIProgressControl(void) {}
+
+  void SetPercentage(float fPercent)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Progress_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
+  }
+
+  float GetPercentage() const
+  {
+    if (!m_controlHandle)
+      return 0.0f;
+
+    return m_cb->Control_Progress_GetPercentage(m_Handle->addonData, m_controlHandle);
+  }
+
+  void SetInfo(int iInfo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Progress_SetInfo(m_Handle->addonData, m_controlHandle, iInfo);
+  }
+
+  int GetInfo() const
+  {
+    if (!m_controlHandle)
+      return -1;
+
+    return m_cb->Control_Progress_GetInfo(m_Handle->addonData, m_controlHandle);
+  }
+
+  std::string GetDescription() const
+  {
+    if (!m_controlHandle)
+      return "";
 
-    GUI_unregister_me = (void (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_unregister_me");
-    if (GUI_unregister_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return m_cb->Control_Progress_GetDescription(m_Handle->addonData, m_controlHandle);
+  }
+};
 
-    GUI_lock = (void (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_lock");
-    if (GUI_lock == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+class CAddonGUISliderControl : public CAddonGUIControlBase
+{
+public:
+  CAddonGUISliderControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+  {
+    m_controlHandle = m_cb->Window_GetControl_Slider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
+
+  ~CAddonGUISliderControl(void) {}
+
+  void SetVisible(bool yesNo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
+  }
+
+  std::string GetDescription() const
+  {
+    if (!m_controlHandle)
+      return "";
 
-    GUI_unlock = (void (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_unlock");
-    if (GUI_unlock == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return m_cb->Control_Slider_GetDescription(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_get_screen_height = (int (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_get_screen_height");
-    if (GUI_get_screen_height == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntRange(int iStart, int iEnd)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetIntRange(m_Handle->addonData, m_controlHandle, iStart, iEnd);
+  }
 
-    GUI_get_screen_width = (int (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_get_screen_width");
-    if (GUI_get_screen_width == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntValue(int iValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetIntValue(m_Handle->addonData, m_controlHandle, iValue);
+  }
 
-    GUI_get_video_resolution = (int (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_get_video_resolution");
-    if (GUI_get_video_resolution == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  int GetIntValue() const
+  {
+    if (!m_controlHandle)
+      return 0;
+    return m_cb->Control_Slider_GetIntValue(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_Window_create = (CAddonGUIWindow* (*)(void *HANDLE, void *CB, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog))
-      dlsym(m_libKODI_guilib, "GUI_Window_create");
-    if (GUI_Window_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntInterval(int iInterval)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetIntInterval(m_Handle->addonData, m_controlHandle, iInterval);
+  }
 
-    GUI_Window_destroy = (void (*)(CAddonGUIWindow* p))
-      dlsym(m_libKODI_guilib, "GUI_Window_destroy");
-    if (GUI_Window_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetPercentage(float fPercent)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
+  }
 
-    GUI_control_get_spin = (CAddonGUISpinControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_spin");
-    if (GUI_control_get_spin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  float GetPercentage() const
+  {
+    if (!m_controlHandle)
+      return 0.0f;
 
-    GUI_control_release_spin = (void (*)(CAddonGUISpinControl* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_spin");
-    if (GUI_control_release_spin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return m_cb->Control_Slider_GetPercentage(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_control_get_radiobutton  = (CAddonGUIRadioButton* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_radiobutton");
-    if (GUI_control_get_radiobutton == NULL)      { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatRange(float fStart, float fEnd)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetFloatRange(m_Handle->addonData, m_controlHandle, fStart, fEnd);
+  }
 
-    GUI_control_release_radiobutton = (void (*)(CAddonGUIRadioButton* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_radiobutton");
-    if (GUI_control_release_radiobutton == NULL)  { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatValue(float fValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetFloatValue(m_Handle->addonData, m_controlHandle, fValue);
+  }
 
-    GUI_control_get_progress     = (CAddonGUIProgressControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_progress");
-    if (GUI_control_get_progress == NULL)  { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  float GetFloatValue() const
+  {
+    if (!m_controlHandle)
+      return 0.0f;
+    return m_cb->Control_Slider_GetFloatValue(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_control_release_progress = (void (*)(CAddonGUIProgressControl* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_progress");
-    if (GUI_control_release_progress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatInterval(float fInterval)
+  {
+    if (m_controlHandle)
+      m_cb->Control_Slider_SetFloatInterval(m_Handle->addonData, m_controlHandle, fInterval);
+  }
+};
 
-    GUI_ListItem_create = (CAddonListItem* (*)(void *HANDLE, void *CB, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path))
-      dlsym(m_libKODI_guilib, "GUI_ListItem_create");
-    if (GUI_ListItem_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+class CAddonGUISettingsSliderControl : public CAddonGUIControlBase
+{
+public:
+  CAddonGUISettingsSliderControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+  {
+    m_controlHandle = m_cb->Window_GetControl_SettingsSlider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
+  
+  ~CAddonGUISettingsSliderControl(void) {}
 
-    GUI_ListItem_destroy = (void (*)(CAddonListItem* p))
-      dlsym(m_libKODI_guilib, "GUI_ListItem_destroy");
-    if (GUI_ListItem_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetVisible(bool yesNo)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
+  }
 
-    GUI_control_get_rendering = (CAddonGUIRenderingControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_rendering");
-    if (GUI_control_get_rendering == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetText(const char *label)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetText(m_Handle->addonData, m_controlHandle, label);
+  }
 
-    GUI_control_release_rendering = (void (*)(CAddonGUIRenderingControl* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_rendering");
-    if (GUI_control_release_rendering == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  std::string GetDescription() const
+  {
+    if (!m_controlHandle)
+      return "";
 
-    GUI_control_get_slider = (CAddonGUISliderControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_slider");
-    if (GUI_control_get_slider == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return m_cb->Control_SettingsSlider_GetDescription(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_control_release_slider = (void (*)(CAddonGUISliderControl* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_slider");
-    if (GUI_control_release_slider == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntRange(int iStart, int iEnd)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetIntRange(m_Handle->addonData, m_controlHandle, iStart, iEnd);
+  }
 
-    GUI_control_get_settings_slider = (CAddonGUISettingsSliderControl* (*)(void *HANDLE, void *CB, CAddonGUIWindow *window, int controlId))
-      dlsym(m_libKODI_guilib, "GUI_control_get_settings_slider");
-    if (GUI_control_get_settings_slider == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntValue(int iValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetIntValue(m_Handle->addonData, m_controlHandle, iValue);
+  }
 
-    GUI_control_release_settings_slider = (void (*)(CAddonGUISettingsSliderControl* p))
-      dlsym(m_libKODI_guilib, "GUI_control_release_settings_slider");
-    if (GUI_control_release_settings_slider == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  int GetIntValue() const
+  {
+    if (!m_controlHandle)
+      return 0;
+    return m_cb->Control_SettingsSlider_GetIntValue(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_dialog_keyboard_show_and_get_input_with_head = (bool (*)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_get_input_with_head");
-    if (GUI_dialog_keyboard_show_and_get_input_with_head == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetIntInterval(int iInterval)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetIntInterval(m_Handle->addonData, m_controlHandle, iInterval);
+  }
 
-    GUI_dialog_keyboard_show_and_get_input = (bool (*)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_get_input");
-    if (GUI_dialog_keyboard_show_and_get_input == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetPercentage(float fPercent)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
+  }
 
-    GUI_dialog_keyboard_show_and_get_new_password_with_head = (bool (*)(void *HANDLE, void *CB, char &newPassword, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_get_new_password_with_head");
-    if (GUI_dialog_keyboard_show_and_get_new_password_with_head == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  float GetPercentage() const
+  {
+    if (!m_controlHandle)
+      return 0.0f;
 
-    GUI_dialog_keyboard_show_and_get_new_password = (bool (*)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_get_new_password");
-    if (GUI_dialog_keyboard_show_and_get_new_password == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return m_cb->Control_SettingsSlider_GetPercentage(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_dialog_keyboard_show_and_verify_new_password_with_head = (bool (*)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_verify_new_password_with_head");
-    if (GUI_dialog_keyboard_show_and_verify_new_password_with_head == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatRange(float fStart, float fEnd)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetFloatRange(m_Handle->addonData, m_controlHandle, fStart, fEnd);
+  }
 
-    GUI_dialog_keyboard_show_and_verify_new_password = (bool (*)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_verify_new_password");
-    if (GUI_dialog_keyboard_show_and_verify_new_password == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatValue(float fValue)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetFloatValue(m_Handle->addonData, m_controlHandle, fValue);
+  }
 
-    GUI_dialog_keyboard_show_and_verify_password = (int (*)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_verify_password");
-    if (GUI_dialog_keyboard_show_and_verify_password == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  float GetFloatValue() const
+  {
+    if (!m_controlHandle)
+      return 0.0f;
+    return m_cb->Control_SettingsSlider_GetFloatValue(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_dialog_keyboard_show_and_get_filter = (bool (*)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_show_and_get_filter");
-    if (GUI_dialog_keyboard_show_and_get_filter == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void SetFloatInterval(float fInterval)
+  {
+    if (m_controlHandle)
+      m_cb->Control_SettingsSlider_SetFloatInterval(m_Handle->addonData, m_controlHandle, fInterval);
+  }
+};
 
-    GUI_dialog_keyboard_send_text_to_active_keyboard = (bool (*)(void *HANDLE, void *CB, const char *aTextString, bool closeKeyboard))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_send_text_to_active_keyboard");
-    if (GUI_dialog_keyboard_send_text_to_active_keyboard == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+class CAddonGUIRenderingControl : public CAddonGUIControlBase
+{
+public:
+  CAddonGUIRenderingControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
+    : CAddonGUIControlBase(hdl, cb, window)
+    , m_cbhdl(nullptr)
+    , CBCreate(nullptr)
+    , CBRender(nullptr)
+    , CBStop(nullptr)
+    , CBDirty(nullptr)
+  {
+    m_controlHandle = m_cb->Window_GetControl_RenderAddon(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
+  }
 
-    GUI_dialog_keyboard_is_activated = (bool (*)(void *HANDLE, void *CB))
-      dlsym(m_libKODI_guilib, "GUI_dialog_keyboard_is_activated");
-    if (GUI_dialog_keyboard_is_activated == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  virtual ~CAddonGUIRenderingControl()
+  {
+    m_cb->RenderAddon_Delete(m_Handle->addonData, m_controlHandle);
+  }
 
-    GUI_dialog_numeric_show_and_verify_new_password = (bool (*)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_verify_new_password");
-    if (GUI_dialog_numeric_show_and_verify_new_password == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void Init()
+  {
+    m_cb->RenderAddon_SetCallbacks(m_Handle->addonData, m_controlHandle, this, OnCreateCB, OnRenderCB, OnStopCB, OnDirtyCB);
+  }
 
-    GUI_dialog_numeric_show_and_verify_password = (int (*)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_verify_password");
-    if (GUI_dialog_numeric_show_and_verify_password == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  bool Create(int x, int y, int w, int h, void *device)
+  {
+    if (!CBCreate)
+      return false;
 
-    GUI_dialog_numeric_show_and_verify_input = (bool (*)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_verify_input");
-    if (GUI_dialog_numeric_show_and_verify_input == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return CBCreate(m_cbhdl, x, y, w, h, device);
+  }
 
-    GUI_dialog_numeric_show_and_get_time = (bool (*)(void *HANDLE, void *CB, tm &time, const char *strHeading))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_get_time");
-    if (GUI_dialog_numeric_show_and_get_time == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void Render()
+  {
+    if (!CBRender)
+      return;
 
-    GUI_dialog_numeric_show_and_get_date = (bool (*)(void *HANDLE, void *CB, tm &date, const char *strHeading))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_get_date");
-    if (GUI_dialog_numeric_show_and_get_date == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    CBRender(m_cbhdl);
+  }
 
-    GUI_dialog_numeric_show_and_get_ipaddress = (bool (*)(void *HANDLE, void *CB, char &IPAddress, unsigned int iMaxStringSize, const char *strHeading))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_get_ipaddress");
-    if (GUI_dialog_numeric_show_and_get_ipaddress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  void Stop()
+  {
+    if (!CBStop)
+      return;
 
-    GUI_dialog_numeric_show_and_get_number = (bool (*)(void *HANDLE, void *CB, char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_get_number");
-    if (GUI_dialog_numeric_show_and_get_number == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    CBStop(m_cbhdl);
+  }
 
-    GUI_dialog_numeric_show_and_get_seconds = (bool (*)(void *HANDLE, void *CB, char &strTime, unsigned int iMaxStringSize, const char *strHeading))
-      dlsym(m_libKODI_guilib, "GUI_dialog_numeric_show_and_get_seconds");
-    if (GUI_dialog_numeric_show_and_get_seconds == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  bool Dirty()
+  {
+    if (!CBDirty)
+      return true;
 
-    GUI_dialog_filebrowser_show_and_get_file = (bool (*)(void *HANDLE, void *CB, const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList))
-      dlsym(m_libKODI_guilib, "GUI_dialog_filebrowser_show_and_get_file");
-    if (GUI_dialog_filebrowser_show_and_get_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+    return CBDirty(m_cbhdl);
+  }
 
-    GUI_dialog_ok_show_and_get_input_single_text = (void (*)(void *HANDLE, void *CB, const char *heading, const char *text))
-      dlsym(m_libKODI_guilib, "GUI_dialog_ok_show_and_get_input_single_text");
-    if (GUI_dialog_ok_show_and_get_input_single_text == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  GUIHANDLE m_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);
 
-    GUI_dialog_ok_show_and_get_input_line_text = (void (*)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2))
-      dlsym(m_libKODI_guilib, "GUI_dialog_ok_show_and_get_input_line_text");
-    if (GUI_dialog_ok_show_and_get_input_line_text == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+private:
+  static bool OnCreateCB(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device);
+  static void OnRenderCB(GUIHANDLE cbhdl);
+  static void OnStopCB(GUIHANDLE cbhdl);
+  static bool OnDirtyCB(GUIHANDLE cbhdl);
+};
 
-    GUI_dialog_yesno_show_and_get_input_singletext = (bool (*)(void *HANDLE, void *CB, const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel))
-      dlsym(m_libKODI_guilib, "GUI_dialog_yesno_show_and_get_input_singletext");
-    if (GUI_dialog_yesno_show_and_get_input_singletext == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+inline bool CAddonGUIRenderingControl::OnCreateCB(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device)
+{
+  return static_cast<CAddonGUIRenderingControl*>(cbhdl)->Create(x, y, w, h, device);
+}
 
-    GUI_dialog_yesno_show_and_get_input_linetext = (bool (*)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel))
-      dlsym(m_libKODI_guilib, "GUI_dialog_yesno_show_and_get_input_linetext");
-    if (GUI_dialog_yesno_show_and_get_input_linetext == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+inline void CAddonGUIRenderingControl::OnRenderCB(GUIHANDLE cbhdl)
+{
+  static_cast<CAddonGUIRenderingControl*>(cbhdl)->Render();
+}
 
-    GUI_dialog_yesno_show_and_get_input_linebuttontext = (bool (*)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel))
-      dlsym(m_libKODI_guilib, "GUI_dialog_yesno_show_and_get_input_linebuttontext");
-    if (GUI_dialog_yesno_show_and_get_input_linebuttontext == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+inline void CAddonGUIRenderingControl::OnStopCB(GUIHANDLE cbhdl)
+{
+  static_cast<CAddonGUIRenderingControl*>(cbhdl)->Stop();
+}
 
-    GUI_dialog_text_viewer = (void (*)(void *hdl, void *cb, const char *heading, const char *text))
-      dlsym(m_libKODI_guilib, "GUI_dialog_text_viewer");
-    if (GUI_dialog_text_viewer == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+inline bool CAddonGUIRenderingControl::OnDirtyCB(GUIHANDLE cbhdl)
+{
+  return static_cast<CAddonGUIRenderingControl*>(cbhdl)->Dirty();
+}
+  
+class CHelper_libKODI_guilib
+{
+public:
+  CHelper_libKODI_guilib()
+  {
+    m_Handle = nullptr;
+    m_Callbacks = nullptr;
+  }
 
-    GUI_dialog_select = (int (*)(void *hdl, void *cb, const char *heading, const char *entries[], unsigned int size, int selected))
-      dlsym(m_libKODI_guilib, "GUI_dialog_select");
-    if (GUI_dialog_select == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+  ~CHelper_libKODI_guilib()
+  {
+    if (m_Handle && m_Callbacks)
+    {
+      m_Handle->GUILib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
+    }
+  }
 
-    m_Callbacks = GUI_register_me(m_Handle);
-    return m_Callbacks != NULL;
+  bool RegisterMe(void *handle)
+  {
+    m_Handle = static_cast<AddonCB*>(handle);
+    if (m_Handle)
+      m_Callbacks = (KodiAPI::GUI::CB_GUILib*)m_Handle->GUILib_RegisterMe(m_Handle->addonData);
+    if (!m_Callbacks)
+      fprintf(stderr, "libKODI_guilib-ERROR: GUILib_RegisterMe can't get callback table from Kodi !!!\n");
+  
+    return m_Callbacks != nullptr;
   }
 
   void Lock()
   {
-    return GUI_lock(m_Handle, m_Callbacks);
+    m_Callbacks->Lock();
   }
 
   void Unlock()
   {
-    return GUI_unlock(m_Handle, m_Callbacks);
+    m_Callbacks->Unlock();
   }
 
   int GetScreenHeight()
   {
-    return GUI_get_screen_height(m_Handle, m_Callbacks);
+    return m_Callbacks->GetScreenHeight();
   }
 
   int GetScreenWidth()
   {
-    return GUI_get_screen_width(m_Handle, m_Callbacks);
+    return m_Callbacks->GetScreenWidth();
   }
 
   int GetVideoResolution()
   {
-    return GUI_get_video_resolution(m_Handle, m_Callbacks);
+    return m_Callbacks->GetVideoResolution();
   }
 
   CAddonGUIWindow* Window_create(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
   {
-    return GUI_Window_create(m_Handle, m_Callbacks, xmlFilename, defaultSkin, forceFallback, asDialog);
+    return new CAddonGUIWindow(m_Handle, m_Callbacks, xmlFilename, defaultSkin, forceFallback, asDialog);
   }
 
   void Window_destroy(CAddonGUIWindow* p)
   {
-    return GUI_Window_destroy(p);
+    delete p;
   }
 
   CAddonGUISpinControl* Control_getSpin(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_spin(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUISpinControl(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseSpin(CAddonGUISpinControl* p)
   {
-    return GUI_control_release_spin(p);
+    delete p;
   }
 
   CAddonGUIRadioButton* Control_getRadioButton(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_radiobutton(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUIRadioButton(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseRadioButton(CAddonGUIRadioButton* p)
   {
-    return GUI_control_release_radiobutton(p);
+    delete p;
   }
 
   CAddonGUIProgressControl* Control_getProgress(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_progress(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUIProgressControl(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseProgress(CAddonGUIProgressControl* p)
   {
-    return GUI_control_release_progress(p);
+    delete p;
   }
 
   CAddonListItem* ListItem_create(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
   {
-    return GUI_ListItem_create(m_Handle, m_Callbacks, label, label2, iconImage, thumbnailImage, path);
+    return new CAddonListItem(m_Handle, m_Callbacks, label, label2, iconImage, thumbnailImage, path);
   }
 
   void ListItem_destroy(CAddonListItem* p)
   {
-    return GUI_ListItem_destroy(p);
+    delete p;
   }
 
   CAddonGUIRenderingControl* Control_getRendering(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_rendering(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUIRenderingControl(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseRendering(CAddonGUIRenderingControl* p)
   {
-    return GUI_control_release_rendering(p);
+    delete p;
   }
 
   CAddonGUISliderControl* Control_getSlider(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_slider(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUISliderControl(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseSlider(CAddonGUISliderControl* p)
   {
-    return GUI_control_release_slider(p);
+    delete p;
   }
 
   CAddonGUISettingsSliderControl* Control_getSettingsSlider(CAddonGUIWindow *window, int controlId)
   {
-    return GUI_control_get_settings_slider(m_Handle, m_Callbacks, window, controlId);
+    return new CAddonGUISettingsSliderControl(m_Handle, m_Callbacks, window, controlId);
   }
 
   void Control_releaseSettingsSlider(CAddonGUISettingsSliderControl* p)
   {
-    return GUI_control_release_settings_slider(p);
+    delete p;
   }
 
   /*! @name GUI Keyboard functions */
   //@{
   bool Dialog_Keyboard_ShowAndGetInput(char &strText, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_get_input_with_head(m_Handle, m_Callbacks, strText, iMaxStringSize, strHeading, allowEmptyResult, hiddenInput, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndGetInputWithHead(strText, iMaxStringSize, strHeading, allowEmptyResult, hiddenInput, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndGetInput(char &strText, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_get_input(m_Handle, m_Callbacks, strText, iMaxStringSize, allowEmptyResult, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndGetInput(strText, iMaxStringSize, allowEmptyResult, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_get_new_password_with_head(m_Handle, m_Callbacks, strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndGetNewPasswordWithHead(strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_get_new_password(m_Handle, m_Callbacks, strNewPassword, iMaxStringSize, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndGetNewPassword(strNewPassword, iMaxStringSize, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_verify_new_password_with_head(m_Handle, m_Callbacks, strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead(strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_verify_new_password(m_Handle, m_Callbacks, strNewPassword, iMaxStringSize, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyNewPassword(strNewPassword, iMaxStringSize, autoCloseMs);
   }
 
   int Dialog_Keyboard_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_verify_password(m_Handle, m_Callbacks, strPassword, iMaxStringSize, strHeading, iRetries, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyPassword(strPassword, iMaxStringSize, strHeading, iRetries, autoCloseMs);
   }
 
   bool Dialog_Keyboard_ShowAndGetFilter(char &strText, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs = 0)
   {
-    return GUI_dialog_keyboard_show_and_get_filter(m_Handle, m_Callbacks, strText, iMaxStringSize, searching, autoCloseMs);
+    return m_Callbacks->Dialog_Keyboard_ShowAndGetFilter(strText, iMaxStringSize, searching, autoCloseMs);
   }
 
   bool Dialog_Keyboard_SendTextToActiveKeyboard(const char *aTextString, bool closeKeyboard = false)
   {
-    return GUI_dialog_keyboard_send_text_to_active_keyboard(m_Handle, m_Callbacks, aTextString, closeKeyboard);
+    return m_Callbacks->Dialog_Keyboard_SendTextToActiveKeyboard(aTextString, closeKeyboard);
   }
 
   bool Dialog_Keyboard_isKeyboardActivated()
   {
-    return GUI_dialog_keyboard_is_activated(m_Handle, m_Callbacks);
+    return m_Callbacks->Dialog_Keyboard_isKeyboardActivated();
   }
   //@}
 
@@ -445,42 +1097,42 @@ public:
   //@{
   bool Dialog_Numeric_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize)
   {
-    return GUI_dialog_numeric_show_and_verify_new_password(m_Handle, m_Callbacks, strNewPassword, iMaxStringSize);
+    return m_Callbacks->Dialog_Numeric_ShowAndVerifyNewPassword(strNewPassword, iMaxStringSize);
   }
 
   int Dialog_Numeric_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries)
   {
-    return GUI_dialog_numeric_show_and_verify_password(m_Handle, m_Callbacks, strPassword, iMaxStringSize, strHeading, iRetries);
+    return m_Callbacks->Dialog_Numeric_ShowAndVerifyPassword(strPassword, iMaxStringSize, strHeading, iRetries);
   }
 
   bool Dialog_Numeric_ShowAndVerifyInput(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput)
   {
-    return GUI_dialog_numeric_show_and_verify_input(m_Handle, m_Callbacks, strPassword, iMaxStringSize, strHeading, bGetUserInput);
+    return m_Callbacks->Dialog_Numeric_ShowAndVerifyInput(strPassword, iMaxStringSize, strHeading, bGetUserInput);
   }
 
   bool Dialog_Numeric_ShowAndGetTime(tm &time, const char *strHeading)
   {
-    return GUI_dialog_numeric_show_and_get_time(m_Handle, m_Callbacks, time, strHeading);
+    return m_Callbacks->Dialog_Numeric_ShowAndGetTime(time, strHeading);
   }
 
   bool Dialog_Numeric_ShowAndGetDate(tm &date, const char *strHeading)
   {
-    return GUI_dialog_numeric_show_and_get_date(m_Handle, m_Callbacks, date, strHeading);
+    return m_Callbacks->Dialog_Numeric_ShowAndGetDate(date, strHeading);
   }
 
   bool Dialog_Numeric_ShowAndGetIPAddress(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading)
   {
-    return GUI_dialog_numeric_show_and_get_ipaddress(m_Handle, m_Callbacks, strIPAddress, iMaxStringSize, strHeading);
+    return m_Callbacks->Dialog_Numeric_ShowAndGetIPAddress(strIPAddress, iMaxStringSize, strHeading);
   }
 
   bool Dialog_Numeric_ShowAndGetNumber(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs = 0)
   {
-    return GUI_dialog_numeric_show_and_get_number(m_Handle, m_Callbacks, strInput, iMaxStringSize, strHeading, iAutoCloseTimeoutMs);
+    return m_Callbacks->Dialog_Numeric_ShowAndGetNumber(strInput, iMaxStringSize, strHeading, iAutoCloseTimeoutMs);
   }
 
   bool Dialog_Numeric_ShowAndGetSeconds(char &strTime, unsigned int iMaxStringSize, const char *strHeading)
   {
-    return GUI_dialog_numeric_show_and_get_seconds(m_Handle, m_Callbacks, strTime, iMaxStringSize, strHeading);
+    return m_Callbacks->Dialog_Numeric_ShowAndGetSeconds(strTime, iMaxStringSize, strHeading);
   }
   //@}
 
@@ -488,7 +1140,7 @@ public:
   //@{
   bool Dialog_FileBrowser_ShowAndGetFile(const char *directory, const char *mask, const char *heading, char &strPath, unsigned int iMaxStringSize, bool useThumbs = false, bool useFileDirectories = false, bool singleList = false)
   {
-    return GUI_dialog_filebrowser_show_and_get_file(m_Handle, m_Callbacks, directory, mask, heading, strPath, iMaxStringSize, useThumbs, useFileDirectories, singleList);
+    return m_Callbacks->Dialog_FileBrowser_ShowAndGetFile(directory, mask, heading, strPath, iMaxStringSize, useThumbs, useFileDirectories, singleList);
   }
   //@}
 
@@ -496,12 +1148,12 @@ public:
   //@{
   void Dialog_OK_ShowAndGetInput(const char *heading, const char *text)
   {
-    GUI_dialog_ok_show_and_get_input_single_text(m_Handle, m_Callbacks, heading, text);
+    return m_Callbacks->Dialog_OK_ShowAndGetInputSingleText(heading, text);
   }
 
   void Dialog_OK_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2)
   {
-    GUI_dialog_ok_show_and_get_input_line_text(m_Handle, m_Callbacks, heading, line0, line1, line2);
+    return m_Callbacks->Dialog_OK_ShowAndGetInputLineText(heading, line0, line1, line2);
   }
   //@}
 
@@ -509,17 +1161,17 @@ public:
   //@{
   bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *text, bool& bCanceled, const char *noLabel = "", const char *yesLabel = "")
   {
-    return GUI_dialog_yesno_show_and_get_input_singletext(m_Handle, m_Callbacks, heading, text, bCanceled, noLabel, yesLabel);
+    return m_Callbacks->Dialog_YesNo_ShowAndGetInputSingleText(heading, text, bCanceled, noLabel, yesLabel);
   }
 
   bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel = "", const char *yesLabel = "")
   {
-    return GUI_dialog_yesno_show_and_get_input_linetext(m_Handle, m_Callbacks, heading, line0, line1, line2, noLabel, yesLabel);
+    return m_Callbacks->Dialog_YesNo_ShowAndGetInputLineText(heading, line0, line1, line2, noLabel, yesLabel);
   }
 
   bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel = "", const char *yesLabel = "")
   {
-    return GUI_dialog_yesno_show_and_get_input_linebuttontext(m_Handle, m_Callbacks, heading, line0, line1, line2, bCanceled, noLabel, yesLabel);
+    return m_Callbacks->Dialog_YesNo_ShowAndGetInputLineButtonText(heading, line0, line1, line2, bCanceled, noLabel, yesLabel);
   }
   //@}
 
@@ -527,7 +1179,7 @@ public:
   //@{
   void Dialog_TextViewer(const char *heading, const char *text)
   {
-    return GUI_dialog_text_viewer(m_Handle, m_Callbacks, heading, text);
+    return m_Callbacks->Dialog_TextViewer(heading, text);
   }
   //@}
 
@@ -535,292 +1187,11 @@ public:
   //@{
   int Dialog_Select(const char *heading, const char *entries[], unsigned int size, int selected = -1)
   {
-    return GUI_dialog_select(m_Handle, m_Callbacks, heading, entries, size, selected);
+    return m_Callbacks->Dialog_Select(heading, entries, size, selected);
   }
   //@}
 
-protected:
-  void* (*GUI_register_me)(void *HANDLE);
-  void (*GUI_unregister_me)(void *HANDLE, void* CB);
-  void (*GUI_lock)(void *HANDLE, void* CB);
-  void (*GUI_unlock)(void *HANDLE, void* CB);
-  int (*GUI_get_screen_height)(void *HANDLE, void* CB);
-  int (*GUI_get_screen_width)(void *HANDLE, void* CB);
-  int (*GUI_get_video_resolution)(void *HANDLE, void* CB);
-  CAddonGUIWindow* (*GUI_Window_create)(void *HANDLE, void* CB, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
-  void (*GUI_Window_destroy)(CAddonGUIWindow* p);
-  CAddonGUISpinControl* (*GUI_control_get_spin)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_spin)(CAddonGUISpinControl* p);
-  CAddonGUIRadioButton* (*GUI_control_get_radiobutton)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_radiobutton)(CAddonGUIRadioButton* p);
-  CAddonGUIProgressControl* (*GUI_control_get_progress)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_progress)(CAddonGUIProgressControl* p);
-  CAddonListItem* (*GUI_ListItem_create)(void *HANDLE, void* CB, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
-  void (*GUI_ListItem_destroy)(CAddonListItem* p);
-  CAddonGUIRenderingControl* (*GUI_control_get_rendering)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_rendering)(CAddonGUIRenderingControl* p);
-  CAddonGUISliderControl* (*GUI_control_get_slider)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_slider)(CAddonGUISliderControl* p);
-  CAddonGUISettingsSliderControl* (*GUI_control_get_settings_slider)(void *HANDLE, void* CB, CAddonGUIWindow *window, int controlId);
-  void (*GUI_control_release_settings_slider)(CAddonGUISettingsSliderControl* p);
-  bool (*GUI_dialog_keyboard_show_and_get_input_with_head)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_get_input)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_get_new_password_with_head)(void *HANDLE, void *CB, char &newPassword, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_get_new_password)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_verify_new_password_with_head)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_verify_new_password)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
-  int (*GUI_dialog_keyboard_show_and_verify_password)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_show_and_get_filter)(void *HANDLE, void *CB, char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs);
-  bool (*GUI_dialog_keyboard_send_text_to_active_keyboard)(void *HANDLE, void *CB, const char *aTextString, bool closeKeyboard);
-  bool (*GUI_dialog_keyboard_is_activated)(void *HANDLE, void *CB);
-  bool (*GUI_dialog_numeric_show_and_verify_new_password)(void *HANDLE, void *CB, char &strNewPassword, unsigned int iMaxStringSize);
-  int (*GUI_dialog_numeric_show_and_verify_password)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries);
-  bool (*GUI_dialog_numeric_show_and_verify_input)(void *HANDLE, void *CB, char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput);
-  bool (*GUI_dialog_numeric_show_and_get_time)(void *HANDLE, void *CB, tm &time, const char *strHeading);
-  bool (*GUI_dialog_numeric_show_and_get_date)(void *HANDLE, void *CB, tm &date, const char *strHeading);
-  bool (*GUI_dialog_numeric_show_and_get_ipaddress)(void *HANDLE, void *CB, char &IPAddress, unsigned int iMaxStringSize, const char *strHeading);
-  bool (*GUI_dialog_numeric_show_and_get_number)(void *HANDLE, void *CB, char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs);
-  bool (*GUI_dialog_numeric_show_and_get_seconds)(void *HANDLE, void *CB, char &strTime, unsigned int iMaxStringSize, const char *strHeading);
-  bool (*GUI_dialog_filebrowser_show_and_get_file)(void *HANDLE, void *CB, const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList);
-  void (*GUI_dialog_ok_show_and_get_input_single_text)(void *HANDLE, void *CB, const char *heading, const char *text);
-  void (*GUI_dialog_ok_show_and_get_input_line_text)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2);
-  bool (*GUI_dialog_yesno_show_and_get_input_singletext)(void *HANDLE, void *CB, const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel);
-  bool (*GUI_dialog_yesno_show_and_get_input_linetext)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel);
-  bool (*GUI_dialog_yesno_show_and_get_input_linebuttontext)(void *HANDLE, void *CB, const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel);
-  void (*GUI_dialog_text_viewer)(void *hdl, void *cb, const char *heading, const char *text);
-  int (*GUI_dialog_select)(void *hdl, void *cb, const char *heading, const char *entries[], unsigned int size, int selected);
-
-private:
-  void *m_libKODI_guilib;
-  void *m_Handle;
-  void *m_Callbacks;
-  struct cb_array
-  {
-    const char* libPath;
-  };
-};
-
-class CAddonGUISpinControl
-{
-public:
-  CAddonGUISpinControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUISpinControl(void) {}
-
-  virtual void SetVisible(bool yesNo);
-  virtual void SetText(const char *label);
-  virtual void Clear();
-  virtual void AddLabel(const char *label, int iValue);
-  virtual int GetValue();
-  virtual void SetValue(int iValue);
-
-private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_SpinHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUIRadioButton
-{
-public:
-  CAddonGUIRadioButton(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUIRadioButton() {}
-
-  virtual void SetVisible(bool yesNo);
-  virtual void SetText(const char *label);
-  virtual void SetSelected(bool yesNo);
-  virtual bool IsSelected();
-
-private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_ButtonHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUIProgressControl
-{
-public:
-  CAddonGUIProgressControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUIProgressControl(void) {}
-
-  virtual void SetPercentage(float fPercent);
-  virtual float GetPercentage() const;
-  virtual void SetInfo(int iInfo);
-  virtual int GetInfo() const;
-  virtual std::string GetDescription() const;
-
-private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_ProgressHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUISliderControl
-{
-public:
-  CAddonGUISliderControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUISliderControl(void) {}
-
-  virtual void        SetVisible(bool yesNo);
-  virtual std::string GetDescription() const;
-
-  virtual void        SetIntRange(int iStart, int iEnd);
-  virtual void        SetIntValue(int iValue);
-  virtual int         GetIntValue() const;
-  virtual void        SetIntInterval(int iInterval);
-
-  virtual void        SetPercentage(float fPercent);
-  virtual float       GetPercentage() const;
-
-  virtual void        SetFloatRange(float fStart, float fEnd);
-  virtual void        SetFloatValue(float fValue);
-  virtual float       GetFloatValue() const;
-  virtual void        SetFloatInterval(float fInterval);
-
-private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_SliderHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUISettingsSliderControl
-{
-public:
-  CAddonGUISettingsSliderControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUISettingsSliderControl(void) {}
-
-  virtual void        SetVisible(bool yesNo);
-  virtual void        SetText(const char *label);
-  virtual std::string GetDescription() const;
-
-  virtual void        SetIntRange(int iStart, int iEnd);
-  virtual void        SetIntValue(int iValue);
-  virtual int         GetIntValue() const;
-  virtual void        SetIntInterval(int iInterval);
-
-  virtual void        SetPercentage(float fPercent);
-  virtual float       GetPercentage() const;
-
-  virtual void        SetFloatRange(float fStart, float fEnd);
-  virtual void        SetFloatValue(float fValue);
-  virtual float       GetFloatValue() const;
-  virtual void        SetFloatInterval(float fInterval);
-
-private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_SettingsSliderHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonListItem
-{
-friend class CAddonGUIWindow;
-
-public:
-  CAddonListItem(void *hdl, void *cb, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
-  virtual ~CAddonListItem(void) {}
-
-  virtual const char  *GetLabel();
-  virtual void         SetLabel(const char *label);
-  virtual const char  *GetLabel2();
-  virtual void         SetLabel2(const char *label);
-  virtual void         SetIconImage(const char *image);
-  virtual void         SetThumbnailImage(const char *image);
-  virtual void         SetInfo(const char *Info);
-  virtual void         SetProperty(const char *key, const char *value);
-  virtual const char  *GetProperty(const char *key) const;
-  virtual void         SetPath(const char *Path);
-
-//    {(char*)"select();
-//    {(char*)"isSelected();
-protected:
-  GUIHANDLE   m_ListItemHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUIWindow
-{
-friend class CAddonGUISpinControl;
-friend class CAddonGUIRadioButton;
-friend class CAddonGUIProgressControl;
-friend class CAddonGUIRenderingControl;
-friend class CAddonGUISliderControl;
-friend class CAddonGUISettingsSliderControl;
-
-public:
-  CAddonGUIWindow(void *hdl, void *cb, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
-  virtual ~CAddonGUIWindow();
-
-  virtual bool         Show();
-  virtual void         Close();
-  virtual void         DoModal();
-  virtual bool         SetFocusId(int iControlId);
-  virtual int          GetFocusId();
-  virtual bool         SetCoordinateResolution(int res);
-  virtual void         SetProperty(const char *key, const char *value);
-  virtual void         SetPropertyInt(const char *key, int value);
-  virtual void         SetPropertyBool(const char *key, bool value);
-  virtual void         SetPropertyDouble(const char *key, double value);
-  virtual const char  *GetProperty(const char *key) const;
-  virtual int          GetPropertyInt(const char *key) const;
-  virtual bool         GetPropertyBool(const char *key) const;
-  virtual double       GetPropertyDouble(const char *key) const;
-  virtual void         ClearProperties();
-  virtual int          GetListSize();
-  virtual void         ClearList();
-  virtual GUIHANDLE    AddStringItem(const char *name, int itemPosition = -1);
-  virtual void         AddItem(GUIHANDLE item, int itemPosition = -1);
-  virtual void         AddItem(CAddonListItem *item, int itemPosition = -1);
-  virtual void         RemoveItem(int itemPosition);
-  virtual GUIHANDLE    GetListItem(int listPos);
-  virtual void         SetCurrentListPosition(int listPos);
-  virtual int          GetCurrentListPosition();
-  virtual void         SetControlLabel(int controlId, const char *label);
-  virtual void         MarkDirtyRegion();
-
-  virtual bool         OnClick(int controlId);
-  virtual bool         OnFocus(int controlId);
-  virtual bool         OnInit();
-  virtual bool         OnAction(int actionId);
-
-  GUIHANDLE m_cbhdl;
-  bool (*CBOnInit)(GUIHANDLE cbhdl);
-  bool (*CBOnFocus)(GUIHANDLE cbhdl, int controlId);
-  bool (*CBOnClick)(GUIHANDLE cbhdl, int controlId);
-  bool (*CBOnAction)(GUIHANDLE cbhdl, int actionId);
-
-protected:
-  GUIHANDLE m_WindowHandle;
-  void *m_Handle;
-  void *m_cb;
-};
-
-class CAddonGUIRenderingControl
-{
-public:
-  CAddonGUIRenderingControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId);
-  virtual ~CAddonGUIRenderingControl();
-  virtual void Init();
-
-  virtual bool Create(int x, int y, int w, int h, void *device);
-  virtual void Render();
-  virtual void Stop();
-  virtual bool Dirty();
-
-  GUIHANDLE m_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);
-
 private:
-  CAddonGUIWindow *m_Window;
-  GUIHANDLE   m_RenderingHandle;
-  void *m_Handle;
-  void *m_cb;
+  AddonCB* m_Handle;
+  KodiAPI::GUI::CB_GUILib* m_Callbacks;
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
index c55a42b..d37d24e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
@@ -25,7 +25,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "libXBMC_addon.h"
+
+#include "kodi_inputstream_types.h"
+#include "versions.h"
 
 #ifdef BUILD_KODI_ADDON
 #include "DVDDemuxPacket.h"
@@ -33,26 +35,6 @@
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
 #endif
 
-/* current input stream API version */
-#define KODI_INPUTSTREAM_API_VERSION "1.0.0"
-
-namespace KodiAPI
-{
-namespace V1
-{
-namespace InputStream
-{
-
-typedef struct CB_INPUTSTREAMLib
-{
-  void (*FreeDemuxPacket)(void *addonData, DemuxPacket* pPacket);
-  DemuxPacket* (*AllocateDemuxPacket)(void *addonData, int iDataSize);
-} CB_INPUTSTREAMLib;
-
-} /* namespace InputStream */
-} /* namespace V1 */
-} /* namespace KodiAPI */
-
 class CHelper_libKODI_inputstream
 {
 public:
@@ -64,10 +46,6 @@ public:
 
   ~CHelper_libKODI_inputstream(void)
   {
-    if (m_Handle && m_Callbacks)
-    {
-      m_Handle->INPUTSTREAMLib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
-    }
   }
 
   /*!
@@ -79,7 +57,7 @@ public:
   {
     m_Handle = static_cast<AddonCB*>(handle);
     if (m_Handle)
-      m_Callbacks = (KodiAPI::V1::InputStream::CB_INPUTSTREAMLib*)m_Handle->INPUTSTREAMLib_RegisterMe(m_Handle->addonData);
+      m_Callbacks = (AddonInstance_InputStream*)m_Handle->INPUTSTREAMLib_RegisterMe(m_Handle->addonData);
     if (!m_Callbacks)
       fprintf(stderr, "libKODI_inputstream-ERROR: InputStream_RegisterMe can't get callback table from Kodi !!!\n");
 
@@ -93,7 +71,7 @@ public:
    */
   DemuxPacket* AllocateDemuxPacket(int iDataSize)
   {
-    return m_Callbacks->AllocateDemuxPacket(m_Handle->addonData, iDataSize);
+    return m_Callbacks->toKodi.AllocateDemuxPacket(m_Callbacks->toKodi.kodiInstance, iDataSize);
   }
 
   /*!
@@ -102,10 +80,10 @@ public:
    */
   void FreeDemuxPacket(DemuxPacket* pPacket)
   {
-    return m_Callbacks->FreeDemuxPacket(m_Handle->addonData, pPacket);
+    return m_Callbacks->toKodi.FreeDemuxPacket(m_Callbacks->toKodi.kodiInstance, pPacket);
   }
 
 private:
   AddonCB* m_Handle;
-  KodiAPI::V1::InputStream::CB_INPUTSTREAMLib* m_Callbacks;
+  AddonInstance_InputStream* m_Callbacks;
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
index a28e48d..d1d8e4b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "libXBMC_addon.h"
-#include "kodi_peripheral_callbacks.h"
+#include "kodi_peripheral_types.h"
 
 #include <string>
 #include <stdio.h>
@@ -29,16 +29,6 @@
   #include <sys/stat.h>
 #endif
 
-#ifdef _WIN32
-  #define PERIPHERAL_HELPER_DLL "\\library.kodi.peripheral\\libKODI_peripheral" ADDON_HELPER_EXT
-#else
-  #define PERIPHERAL_HELPER_DLL_NAME "libKODI_peripheral-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
-  #define PERIPHERAL_HELPER_DLL "/library.kodi.peripheral/" PERIPHERAL_HELPER_DLL_NAME
-#endif
-
-#define PERIPHERAL_REGISTER_SYMBOL(dll, functionPtr) \
-  CHelper_libKODI_peripheral::RegisterSymbol(dll, functionPtr, #functionPtr)
-
 namespace ADDON
 {
 
@@ -47,29 +37,12 @@ class CHelper_libKODI_peripheral
 public:
   CHelper_libKODI_peripheral(void)
   {
-    m_handle       = NULL;
-    m_callbacks    = NULL;
-    m_libKODI_peripheral = NULL;
+    m_Handle = nullptr;
+    m_Callbacks = nullptr;
   }
 
   ~CHelper_libKODI_peripheral(void)
   {
-    if (m_libKODI_peripheral)
-    {
-      PERIPHERAL_unregister_me(m_handle, m_callbacks);
-      dlclose(m_libKODI_peripheral);
-    }
-  }
-
-  template <typename T>
-  static bool RegisterSymbol(void* dll, T& functionPtr, const char* strFunctionPtr)
-  {
-    if ((functionPtr = (T)dlsym(dll, strFunctionPtr)) == NULL)
-    {
-      fprintf(stderr, "ERROR: Unable to assign function %s: %s\n", strFunctionPtr, dlerror());
-      return false;
-    }
-    return true;
   }
 
   /*!
@@ -79,69 +52,52 @@ public:
     */
   bool RegisterMe(void* handle)
   {
-    m_handle = handle;
-
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_handle)->libPath;
-    libBasePath += PERIPHERAL_HELPER_DLL;
-
-#if defined(ANDROID)
-      struct stat st;
-      if (stat(libBasePath.c_str(),&st) != 0)
-      {
-        std::string tempbin = getenv("XBMC_ANDROID_LIBS");
-        libBasePath = tempbin + "/" + PERIPHERAL_HELPER_DLL_NAME;
-      }
-#endif
-
-    m_libKODI_peripheral = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libKODI_peripheral == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
-      return false;
-    }
-
-    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_register_me)) return false;
-    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_unregister_me)) return false;
-    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_trigger_scan)) return false;
-    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_refresh_button_maps)) return false;
-    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_feature_count)) return false;
+    m_Handle = static_cast<AddonCB*>(handle);
+    if (m_Handle)
+      m_Callbacks = (AddonInstance_Peripheral*)m_Handle->PeripheralLib_RegisterMe(m_Handle->addonData);
+    if (!m_Callbacks)
+      fprintf(stderr, "libKODI_peripheral-ERROR: PeripheralLib_register_me can't get callback table from Kodi !!!\n");
 
-    m_callbacks = PERIPHERAL_register_me(m_handle);
-    return m_callbacks != NULL;
+    return m_Callbacks != nullptr;
   }
 
+  /*!
+   * @brief Trigger a scan for peripherals
+   *
+   * The add-on calls this if a change in hardware is detected.
+   */
   void TriggerScan(void)
   {
-    return PERIPHERAL_trigger_scan(m_handle, m_callbacks);
+    return m_Callbacks->toKodi.TriggerScan(m_Callbacks->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& strDeviceName = "", const std::string& strControllerId = "")
   {
-    return PERIPHERAL_refresh_button_maps(m_handle, m_callbacks, strDeviceName.c_str(), strControllerId.c_str());
+    return m_Callbacks->toKodi.RefreshButtonMaps(m_Callbacks->toKodi.kodiInstance, strDeviceName.c_str(), strControllerId.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& strControllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
   {
-    return PERIPHERAL_feature_count(m_handle, m_callbacks, strControllerId.c_str(), type);
+    return m_Callbacks->toKodi.FeatureCount(m_Callbacks->toKodi.kodiInstance, strControllerId.c_str(), type);
   }
 
-protected:
-    CB_PeripheralLib* (*PERIPHERAL_register_me)(void* handle);
-    void (*PERIPHERAL_unregister_me)(void* handle, CB_PeripheralLib* cb);
-    void (*PERIPHERAL_trigger_scan)(void* handle, CB_PeripheralLib* cb);
-    void (*PERIPHERAL_refresh_button_maps)(void* handle, CB_PeripheralLib* cb, const char* deviceName, const char* controllerId);
-    unsigned int (*PERIPHERAL_feature_count)(void* handle, CB_PeripheralLib* cb, const char* controllerId, JOYSTICK_FEATURE_TYPE type);
-
 private:
-  void*             m_handle;
-  CB_PeripheralLib* m_callbacks;
-  void*             m_libKODI_peripheral;
-
-  struct cb_array
-  {
-    const char* libPath;
-  };
+  AddonCB* m_Handle;
+  AddonInstance_Peripheral* m_Callbacks;
 };
 
-}
+} /* namespace ADDON */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
index d9f72c1..8b02e33 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 
+#include "versions.h"
 #if defined(BUILD_KODI_ADDON)
 #include "IFileTypes.h"
 #else
@@ -44,62 +45,11 @@ typedef intptr_t      ssize_t;
 
 #if defined(BUILD_KODI_ADDON)
 #include "p8-platform/windows/dlfcn-win32.h"
-#else
-#include "dlfcn-win32.h"
 #endif
-
-#define ADDON_HELPER_EXT        ".dll"
-#define ADDON_HELPER_PATHSEP    "\\"
-#define ADDON_HELPER_ARCHSEP    ""
-#define ADDON_HELPER_ARCH       ""
-
 #else // windows
-#define ADDON_HELPER_PATHSEP    "/"
-#define ADDON_HELPER_ARCHSEP    "-"
-// the ADDON_HELPER_ARCH is the platform dependend name which is used
-// as part of the name of dynamic addon libraries. It has to match the 
-// strings which are set in configure.ac for the "ARCH" variable.
-#if defined(__APPLE__)          // osx
-#if defined(__arm__) || defined(__aarch64__)
-#define ADDON_HELPER_ARCH       "arm-osx"
-#else
-#define ADDON_HELPER_ARCH       "x86-osx"
-#endif
-#define ADDON_HELPER_EXT        ".dylib"
-#else                           // linux
-#if defined(__x86_64__)
-#define ADDON_HELPER_ARCH       "x86_64-linux"
-#elif defined(_POWERPC)
-#define ADDON_HELPER_ARCH       "powerpc-linux"
-#elif defined(_POWERPC64)
-#define ADDON_HELPER_ARCH       "powerpc64-linux"
-#elif defined(__ARMEL__)
-#define ADDON_HELPER_ARCH       "arm"
-#elif defined(__aarch64__)
-#define ADDON_HELPER_ARCH       "aarch64"
-#elif defined(__mips__)
-#define ADDON_HELPER_ARCH       "mips"
-#else
-#define ADDON_HELPER_ARCH       "i486-linux"
-#endif
-#define ADDON_HELPER_EXT        ".so"
-#endif
 #include <dlfcn.h>              // linux+osx
 #endif
 
-#define KODI_DLL_NAME(name) "libKODI_" name ADDON_HELPER_ARCHSEP ADDON_HELPER_ARCH ADDON_HELPER_EXT
-#define XBMC_DLL_NAME(name) "libXBMC_" name ADDON_HELPER_ARCHSEP ADDON_HELPER_ARCH ADDON_HELPER_EXT
-#if defined(ANDROID)
-#define KODI_DLL(name) ADDON_HELPER_PATHSEP KODI_DLL_NAME(name)
-#define XBMC_DLL(name) ADDON_HELPER_PATHSEP XBMC_DLL_NAME(name)
-#else
-#define KODI_DLL(name) ADDON_HELPER_PATHSEP "library.kodi." name ADDON_HELPER_PATHSEP KODI_DLL_NAME(name)
-#define XBMC_DLL(name) ADDON_HELPER_PATHSEP "library.xbmc." name ADDON_HELPER_PATHSEP XBMC_DLL_NAME(name)
-#endif
-
-#define ADDON_DLL_NAME XBMC_DLL_NAME("addon")
-#define ADDON_DLL XBMC_DLL("addon")
-
 #ifdef LOG_DEBUG
 #undef LOG_DEBUG
 #endif
@@ -113,9 +63,6 @@ typedef intptr_t      ssize_t;
 #undef LOG_ERROR
 #endif
 
-/* current addon API version */
-#define KODI_ADDON_API_VERSION "1.0.0"
-
 typedef void* (*KODIAddOnLib_RegisterMe)(void *addonData);
 typedef void (*KODIAddOnLib_UnRegisterMe)(void *addonData, void *cbTable);
 typedef void* (*KODIAudioEngineLib_RegisterMe)(void *addonData);
@@ -175,186 +122,82 @@ namespace ADDON
     QUEUE_WARNING,
     QUEUE_ERROR
   } queue_msg_t;
+}
+
+namespace KodiAPI
+{
+namespace AddOn
+{
+typedef struct CB_AddOn
+{
+  void (*Log)(void *addonData, const ADDON::addon_log_t loglevel, const char *msg);
+  void (*QueueNotification)(void *addonData, const ADDON::queue_msg_t type, const char *msg);
+  bool (*WakeOnLan)(const char* mac);
+  bool (*GetSetting)(void *addonData, const char *settingName, void *settingValue);
+  char* (*TranslateSpecialProtocol)(const char *strSource);
+  char* (*UnknownToUTF8)(const char *sourceDest);
+  char* (*GetLocalizedString)(const void* addonData, long dwCode);
+  char* (*GetDVDMenuLanguage)(const void* addonData);
+  void (*FreeString)(const void* addonData, char* str);
+
+  void* (*OpenFile)(const void* addonData, const char* strFileName, unsigned int flags);
+  void* (*OpenFileForWrite)(const void* addonData, const char* strFileName, bool bOverWrite);
+  ssize_t (*ReadFile)(const void* addonData, void* file, void* lpBuf, size_t uiBufSize);
+  bool (*ReadFileString)(const void* addonData, void* file, char *szLine, int iLineLength);
+  ssize_t (*WriteFile)(const void* addonData, void* file, const void* lpBuf, size_t uiBufSize);
+  void (*FlushFile)(const void* addonData, void* file);
+  int64_t (*SeekFile)(const void* addonData, void* file, int64_t iFilePosition, int iWhence);
+  int (*TruncateFile)(const void* addonData, void* file, int64_t iSize);
+  int64_t (*GetFilePosition)(const void* addonData, void* file);
+  int64_t (*GetFileLength)(const void* addonData, void* file);
+  double (*GetFileDownloadSpeed)(const void* addonData, void* file);
+  void (*CloseFile)(const void* addonData, void* file);
+  int (*GetFileChunkSize)(const void* addonData, void* file);
+  bool (*FileExists)(const void* addonData, const char *strFileName, bool bUseCache);
+  int (*StatFile)(const void* addonData, const char *strFileName, struct __stat64* buffer);
+  bool (*DeleteFile)(const void* addonData, const char *strFileName);
+  bool (*CanOpenDirectory)(const void* addonData, const char* strURL);
+  bool (*CreateDirectory)(const void* addonData, const char *strPath);
+  bool (*DirectoryExists)(const void* addonData, const char *strPath);
+  bool (*RemoveDirectory)(const void* addonData, const char *strPath);
+  bool (*GetDirectory)(const void* addonData, const char *strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items);
+  void (*FreeDirectory)(const void* addonData, VFSDirEntry* items, unsigned int num_items);
+  void* (*CURLCreate)(const void* addonData, const char* strURL);
+  bool (*CURLAddOption)(const void* addonData, void* file, XFILE::CURLOPTIONTYPE type, const char* name, const char * value);
+  bool (*CURLOpen)(const void* addonData, void* file, unsigned int flags);
+} CB_AddOnLib;
+
+} /* namespace AddOn */
+} /* namespace KodiAPI */
 
+namespace ADDON
+{
   class CHelper_libXBMC_addon
   {
   public:
     CHelper_libXBMC_addon()
     {
-      m_libXBMC_addon = NULL;
-      m_Handle        = NULL;
+      m_Handle = nullptr;
+      m_Callbacks = nullptr;
     }
 
     ~CHelper_libXBMC_addon()
     {
-      if (m_libXBMC_addon)
+      if (m_Handle && m_Callbacks)
       {
-        XBMC_unregister_me(m_Handle, m_Callbacks);
-        dlclose(m_libXBMC_addon);
+        m_Handle->AddOnLib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
       }
     }
 
-    bool RegisterMe(void *Handle)
+    bool RegisterMe(void *handle)
     {
-      m_Handle = Handle;
-
-      std::string libBasePath;
-      libBasePath  = ((cb_array*)m_Handle)->libPath;
-      libBasePath += ADDON_DLL;
-
-      m_libXBMC_addon = dlopen(libBasePath.c_str(), RTLD_LAZY);
-      if (m_libXBMC_addon == NULL)
-      {
-        fprintf(stderr, "Unable to load %s\n", dlerror());
-        return false;
-      }
-
-      XBMC_register_me = (void* (*)(void *HANDLE))
-        dlsym(m_libXBMC_addon, "XBMC_register_me");
-      if (XBMC_register_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_unregister_me = (void (*)(void* HANDLE, void* CB))
-        dlsym(m_libXBMC_addon, "XBMC_unregister_me");
-      if (XBMC_unregister_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_log = (void (*)(void* HANDLE, void* CB, const addon_log_t loglevel, const char *msg))
-        dlsym(m_libXBMC_addon, "XBMC_log");
-      if (XBMC_log == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_setting = (bool (*)(void* HANDLE, void* CB, const char* settingName, void *settingValue))
-        dlsym(m_libXBMC_addon, "XBMC_get_setting");
-      if (XBMC_get_setting == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_translate_special = (char* (*)(void* HANDLE, void* CB, const char* source))
-        dlsym(m_libXBMC_addon, "XBMC_translate_special");
-      if (XBMC_translate_special == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_queue_notification = (void (*)(void* HANDLE, void* CB, const queue_msg_t loglevel, const char *msg))
-        dlsym(m_libXBMC_addon, "XBMC_queue_notification");
-      if (XBMC_queue_notification == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_wake_on_lan = (bool (*)(void* HANDLE, void *CB, const char *mac))
-        dlsym(m_libXBMC_addon, "XBMC_wake_on_lan");
-      if (XBMC_wake_on_lan == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_unknown_to_utf8 = (char* (*)(void* HANDLE, void* CB, const char* str))
-        dlsym(m_libXBMC_addon, "XBMC_unknown_to_utf8");
-      if (XBMC_unknown_to_utf8 == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_localized_string = (char* (*)(void* HANDLE, void* CB, int dwCode))
-        dlsym(m_libXBMC_addon, "XBMC_get_localized_string");
-      if (XBMC_get_localized_string == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_free_string = (void (*)(void* HANDLE, void* CB, char* str))
-        dlsym(m_libXBMC_addon, "XBMC_free_string");
-      if (XBMC_free_string == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_dvd_menu_language = (char* (*)(void* HANDLE, void* CB))
-        dlsym(m_libXBMC_addon, "XBMC_get_dvd_menu_language");
-      if (XBMC_get_dvd_menu_language == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_open_file = (void* (*)(void* HANDLE, void* CB, const char* strFileName, unsigned int flags))
-        dlsym(m_libXBMC_addon, "XBMC_open_file");
-      if (XBMC_open_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_open_file_for_write = (void* (*)(void* HANDLE, void* CB, const char* strFileName, bool bOverWrite))
-        dlsym(m_libXBMC_addon, "XBMC_open_file_for_write");
-      if (XBMC_open_file_for_write == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_read_file = (ssize_t (*)(void* HANDLE, void* CB, void* file, void* lpBuf, size_t uiBufSize))
-        dlsym(m_libXBMC_addon, "XBMC_read_file");
-      if (XBMC_read_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_read_file_string = (bool (*)(void* HANDLE, void* CB, void* file, char *szLine, int iLineLength))
-        dlsym(m_libXBMC_addon, "XBMC_read_file_string");
-      if (XBMC_read_file_string == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_write_file = (ssize_t (*)(void* HANDLE, void* CB, void* file, const void* lpBuf, size_t uiBufSize))
-        dlsym(m_libXBMC_addon, "XBMC_write_file");
-      if (XBMC_write_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_flush_file = (void (*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_flush_file");
-      if (XBMC_flush_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_seek_file = (int64_t (*)(void* HANDLE, void* CB, void* file, int64_t iFilePosition, int iWhence))
-        dlsym(m_libXBMC_addon, "XBMC_seek_file");
-      if (XBMC_seek_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_truncate_file = (int (*)(void* HANDLE, void* CB, void* file, int64_t iSize))
-        dlsym(m_libXBMC_addon, "XBMC_truncate_file");
-      if (XBMC_truncate_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_file_position = (int64_t (*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_get_file_position");
-      if (XBMC_get_file_position == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_file_length = (int64_t (*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_get_file_length");
-      if (XBMC_get_file_length == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_file_download_speed = (double(*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_get_file_download_speed");
-      if (XBMC_get_file_download_speed == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_close_file = (void (*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_close_file");
-      if (XBMC_close_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_file_chunk_size = (int (*)(void* HANDLE, void* CB, void* file))
-        dlsym(m_libXBMC_addon, "XBMC_get_file_chunk_size");
-      if (XBMC_get_file_chunk_size == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_file_exists = (bool (*)(void* HANDLE, void* CB, const char *strFileName, bool bUseCache))
-        dlsym(m_libXBMC_addon, "XBMC_file_exists");
-      if (XBMC_file_exists == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_stat_file = (int (*)(void* HANDLE, void* CB, const char *strFileName, struct __stat64* buffer))
-        dlsym(m_libXBMC_addon, "XBMC_stat_file");
-      if (XBMC_stat_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_delete_file = (bool (*)(void* HANDLE, void* CB, const char *strFileName))
-        dlsym(m_libXBMC_addon, "XBMC_delete_file");
-      if (XBMC_delete_file == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_can_open_directory = (bool (*)(void* HANDLE, void* CB, const char* strURL))
-        dlsym(m_libXBMC_addon, "XBMC_can_open_directory");
-      if (XBMC_can_open_directory == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_create_directory = (bool (*)(void* HANDLE, void* CB, const char* strPath))
-        dlsym(m_libXBMC_addon, "XBMC_create_directory");
-      if (XBMC_create_directory == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_directory_exists = (bool (*)(void* HANDLE, void* CB, const char* strPath))
-        dlsym(m_libXBMC_addon, "XBMC_directory_exists");
-      if (XBMC_directory_exists == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_remove_directory = (bool (*)(void* HANDLE, void* CB, const char* strPath))
-        dlsym(m_libXBMC_addon, "XBMC_remove_directory");
-      if (XBMC_remove_directory == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_get_directory = (bool (*)(void* HANDLE, void* CB, const char* strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items))
-        dlsym(m_libXBMC_addon, "XBMC_get_directory");
-      if (XBMC_get_directory == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_free_directory = (void (*)(void* HANDLE, void* CB, VFSDirEntry* items, unsigned int num_items))
-        dlsym(m_libXBMC_addon, "XBMC_free_directory");
-      if (XBMC_free_directory == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_curl_create = (void* (*)(void *HANDLE, void* CB, const char* strURL))
-        dlsym(m_libXBMC_addon, "XBMC_curl_create");
-      if (XBMC_curl_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_curl_add_option = (bool (*)(void *HANDLE, void* CB, void *file, XFILE::CURLOPTIONTYPE type, const char* name, const char *value))
-        dlsym(m_libXBMC_addon, "XBMC_curl_add_option");
-      if (XBMC_curl_add_option == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      XBMC_curl_open = (bool (*)(void *HANDLE, void* CB, void *file, unsigned int flags))
-        dlsym(m_libXBMC_addon, "XBMC_curl_open");
-      if (XBMC_curl_open == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-      m_Callbacks = XBMC_register_me(m_Handle);
-      return m_Callbacks != NULL;
+      m_Handle = static_cast<AddonCB*>(handle);
+      if (m_Handle)
+        m_Callbacks = (KodiAPI::AddOn::CB_AddOnLib*)m_Handle->AddOnLib_RegisterMe(m_Handle->addonData);
+      if (!m_Callbacks)
+        fprintf(stderr, "libXBMC_addon-ERROR: AddOnLib_RegisterMe can't get callback table from Kodi !!!\n");
+    
+      return m_Callbacks != nullptr;
     }
 
     /*!
@@ -369,7 +212,7 @@ namespace ADDON
       va_start (args, format);
       vsprintf (buffer, format, args);
       va_end (args);
-      return XBMC_log(m_Handle, m_Callbacks, loglevel, buffer);
+      m_Callbacks->Log(m_Handle->addonData, loglevel, buffer);
     }
 
     /*!
@@ -380,7 +223,7 @@ namespace ADDON
      */
     bool GetSetting(const char* settingName, void *settingValue)
     {
-      return XBMC_get_setting(m_Handle, m_Callbacks, settingName, settingValue);
+      return m_Callbacks->GetSetting(m_Handle->addonData, settingName, settingValue);
     }
 
     /*!
@@ -390,7 +233,7 @@ namespace ADDON
     */
     char *TranslateSpecialProtocol(const char *source)
     {
-      return XBMC_translate_special(m_Handle, m_Callbacks, source);
+      return m_Callbacks->TranslateSpecialProtocol(source);
     }
 
     /*!
@@ -405,7 +248,7 @@ namespace ADDON
       va_start (args, format);
       vsprintf (buffer, format, args);
       va_end (args);
-      return XBMC_queue_notification(m_Handle, m_Callbacks, type, buffer);
+      m_Callbacks->QueueNotification(m_Handle->addonData, type, buffer);
     }
 
     /*!
@@ -415,7 +258,7 @@ namespace ADDON
      */
     bool WakeOnLan(const char* mac)
     {
-      return XBMC_wake_on_lan(m_Handle, m_Callbacks, mac);
+      return m_Callbacks->WakeOnLan(mac);
     }
 
     /*!
@@ -425,7 +268,7 @@ namespace ADDON
      */
     char* UnknownToUTF8(const char* str)
     {
-      return XBMC_unknown_to_utf8(m_Handle, m_Callbacks, str);
+      return m_Callbacks->UnknownToUTF8(str);
     }
 
     /*!
@@ -435,17 +278,16 @@ namespace ADDON
      */
     char* GetLocalizedString(int dwCode)
     {
-      return XBMC_get_localized_string(m_Handle, m_Callbacks, dwCode);
+      return m_Callbacks->GetLocalizedString(m_Handle->addonData, dwCode);
     }
 
-
     /*!
      * @brief Get the DVD menu language.
      * @return The language. Must be freed by calling FreeString() when done.
      */
     char* GetDVDMenuLanguage()
     {
-      return XBMC_get_dvd_menu_language(m_Handle, m_Callbacks);
+      return m_Callbacks->GetDVDMenuLanguage(m_Handle->addonData);
     }
 
     /*!
@@ -454,7 +296,7 @@ namespace ADDON
      */
     void FreeString(char* str)
     {
-      return XBMC_free_string(m_Handle, m_Callbacks, str);
+      m_Callbacks->FreeString(m_Handle->addonData, str);
     }
 
     /*!
@@ -465,7 +307,7 @@ namespace ADDON
      */
     void* OpenFile(const char* strFileName, unsigned int flags)
     {
-      return XBMC_open_file(m_Handle, m_Callbacks, strFileName, flags);
+      return m_Callbacks->OpenFile(m_Handle->addonData, strFileName, flags);
     }
 
     /*!
@@ -476,7 +318,7 @@ namespace ADDON
      */
     void* OpenFileForWrite(const char* strFileName, bool bOverWrite)
     {
-      return XBMC_open_file_for_write(m_Handle, m_Callbacks, strFileName, bOverWrite);
+      return m_Callbacks->OpenFileForWrite(m_Handle->addonData, strFileName, bOverWrite);
     }
 
     /*!
@@ -490,7 +332,7 @@ namespace ADDON
      */
     ssize_t ReadFile(void* file, void* lpBuf, size_t uiBufSize)
     {
-      return XBMC_read_file(m_Handle, m_Callbacks, file, lpBuf, uiBufSize);
+      return m_Callbacks->ReadFile(m_Handle->addonData, file, lpBuf, uiBufSize);
     }
 
     /*!
@@ -502,7 +344,7 @@ namespace ADDON
      */
     bool ReadFileString(void* file, char *szLine, int iLineLength)
     {
-      return XBMC_read_file_string(m_Handle, m_Callbacks, file, szLine, iLineLength);
+      return m_Callbacks->ReadFileString(m_Handle->addonData, file, szLine, iLineLength);
     }
 
     /*!
@@ -516,7 +358,7 @@ namespace ADDON
      */
     ssize_t WriteFile(void* file, const void* lpBuf, size_t uiBufSize)
     {
-      return XBMC_write_file(m_Handle, m_Callbacks, file, lpBuf, uiBufSize);
+      return m_Callbacks->WriteFile(m_Handle->addonData, file, lpBuf, uiBufSize);
     }
 
     /*!
@@ -525,7 +367,7 @@ namespace ADDON
      */
     void FlushFile(void* file)
     {
-       return XBMC_flush_file(m_Handle, m_Callbacks, file);
+       m_Callbacks->FlushFile(m_Handle->addonData, file);
     }
 
     /*!
@@ -537,7 +379,7 @@ namespace ADDON
      */
     int64_t SeekFile(void* file, int64_t iFilePosition, int iWhence)
     {
-      return XBMC_seek_file(m_Handle, m_Callbacks, file, iFilePosition, iWhence);
+      return m_Callbacks->SeekFile(m_Handle->addonData, file, iFilePosition, iWhence);
     }
 
     /*!
@@ -548,7 +390,7 @@ namespace ADDON
      */
     int TruncateFile(void* file, int64_t iSize)
     {
-      return XBMC_truncate_file(m_Handle, m_Callbacks, file, iSize);
+      return m_Callbacks->TruncateFile(m_Handle->addonData, file, iSize);
     }
 
     /*!
@@ -558,7 +400,7 @@ namespace ADDON
      */
     int64_t GetFilePosition(void* file)
     {
-      return XBMC_get_file_position(m_Handle, m_Callbacks, file);
+      return m_Callbacks->GetFilePosition(m_Handle->addonData, file);
     }
 
     /*!
@@ -568,7 +410,7 @@ namespace ADDON
      */
     int64_t GetFileLength(void* file)
     {
-      return XBMC_get_file_length(m_Handle, m_Callbacks, file);
+      return m_Callbacks->GetFileLength(m_Handle->addonData, file);
     }
 
     /*!
@@ -578,7 +420,7 @@ namespace ADDON
     */
     double GetFileDownloadSpeed(void* file)
     {
-      return XBMC_get_file_download_speed(m_Handle, m_Callbacks, file);
+      return m_Callbacks->GetFileDownloadSpeed(m_Handle->addonData, file);
     }
 
     /*!
@@ -587,7 +429,7 @@ namespace ADDON
      */
     void CloseFile(void* file)
     {
-      return XBMC_close_file(m_Handle, m_Callbacks, file);
+      m_Callbacks->CloseFile(m_Handle->addonData, file);
     }
 
     /*!
@@ -597,7 +439,7 @@ namespace ADDON
      */
     int GetFileChunkSize(void* file)
     {
-      return XBMC_get_file_chunk_size(m_Handle, m_Callbacks, file);
+      return m_Callbacks->GetFileChunkSize(m_Handle->addonData, file);
     }
 
     /*!
@@ -608,7 +450,7 @@ namespace ADDON
      */
     bool FileExists(const char *strFileName, bool bUseCache)
     {
-      return XBMC_file_exists(m_Handle, m_Callbacks, strFileName, bUseCache);
+      return m_Callbacks->FileExists(m_Handle->addonData, strFileName, bUseCache);
     }
 
     /*!
@@ -619,7 +461,7 @@ namespace ADDON
      */
     int StatFile(const char *strFileName, struct __stat64* buffer)
     {
-      return XBMC_stat_file(m_Handle, m_Callbacks, strFileName, buffer);
+      return m_Callbacks->StatFile(m_Handle->addonData, strFileName, buffer);
     }
 
     /*!
@@ -629,7 +471,7 @@ namespace ADDON
      */
     bool DeleteFile(const char *strFileName)
     {
-      return XBMC_delete_file(m_Handle, m_Callbacks, strFileName);
+      return m_Callbacks->DeleteFile(m_Handle->addonData, strFileName);
     }
 
     /*!
@@ -639,7 +481,7 @@ namespace ADDON
      */
     bool CanOpenDirectory(const char* strUrl)
     {
-      return XBMC_can_open_directory(m_Handle, m_Callbacks, strUrl);
+      return m_Callbacks->CanOpenDirectory(m_Handle->addonData, strUrl);
     }
 
     /*!
@@ -649,7 +491,7 @@ namespace ADDON
      */
     bool CreateDirectory(const char *strPath)
     {
-      return XBMC_create_directory(m_Handle, m_Callbacks, strPath);
+      return m_Callbacks->CreateDirectory(m_Handle->addonData, strPath);
     }
 
     /*!
@@ -659,7 +501,7 @@ namespace ADDON
      */
     bool DirectoryExists(const char *strPath)
     {
-      return XBMC_directory_exists(m_Handle, m_Callbacks, strPath);
+      return m_Callbacks->DirectoryExists(m_Handle->addonData, strPath);
     }
 
     /*!
@@ -669,7 +511,7 @@ namespace ADDON
      */
     bool RemoveDirectory(const char *strPath)
     {
-      return XBMC_remove_directory(m_Handle, m_Callbacks, strPath);
+      return m_Callbacks->RemoveDirectory(m_Handle->addonData, strPath);
     }
 
     /*!
@@ -682,7 +524,7 @@ namespace ADDON
      */
     bool GetDirectory(const char *strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items)
     {
-      return XBMC_get_directory(m_Handle, m_Callbacks, strPath, mask, items, num_items);
+      return m_Callbacks->GetDirectory(m_Handle->addonData, strPath, mask, items, num_items);
     }
 
     /*!
@@ -692,7 +534,7 @@ namespace ADDON
      */
     void FreeDirectory(VFSDirEntry* items, unsigned int num_items)
     {
-      return XBMC_free_directory(m_Handle, m_Callbacks, items, num_items);
+      m_Callbacks->FreeDirectory(m_Handle->addonData, items, num_items);
     }
 
     /*!
@@ -701,7 +543,7 @@ namespace ADDON
     */
     void* CURLCreate(const char* strURL)
     {
-      return XBMC_curl_create(m_Handle, m_Callbacks, strURL);
+      return m_Callbacks->CURLCreate(m_Handle->addonData, strURL);
     }
 
     /*!
@@ -713,7 +555,7 @@ namespace ADDON
     */
     bool CURLAddOption(void* file, XFILE::CURLOPTIONTYPE type, const char* name, const char * value)
     {
-      return XBMC_curl_add_option(m_Handle, m_Callbacks, file, type, name, value);
+      return m_Callbacks->CURLAddOption(m_Handle->addonData, file, type, name, value);
     }
 
     /*!
@@ -723,54 +565,11 @@ namespace ADDON
     */
     bool CURLOpen(void* file, unsigned int flags)
     {
-      return XBMC_curl_open(m_Handle, m_Callbacks, file, flags);
-    }
-
-  protected:
-    void* (*XBMC_register_me)(void *HANDLE);
-    void (*XBMC_unregister_me)(void *HANDLE, void* CB);
-    void (*XBMC_log)(void *HANDLE, void* CB, const addon_log_t loglevel, const char *msg);
-    bool (*XBMC_get_setting)(void *HANDLE, void* CB, const char* settingName, void *settingValue);
-    char*(*XBMC_translate_special)(void *HANDLE, void* CB, const char* source);
-    void (*XBMC_queue_notification)(void *HANDLE, void* CB, const queue_msg_t type, const char *msg);
-    bool (*XBMC_wake_on_lan)(void *HANDLE, void* CB, const char* mac);
-    char* (*XBMC_unknown_to_utf8)(void *HANDLE, void* CB, const char* str);
-    char* (*XBMC_get_localized_string)(void *HANDLE, void* CB, int dwCode);
-    char* (*XBMC_get_dvd_menu_language)(void *HANDLE, void* CB);
-    void (*XBMC_free_string)(void *HANDLE, void* CB, char* str);
-    void* (*XBMC_open_file)(void *HANDLE, void* CB, const char* strFileName, unsigned int flags);
-    void* (*XBMC_open_file_for_write)(void *HANDLE, void* CB, const char* strFileName, bool bOverWrite);
-    ssize_t (*XBMC_read_file)(void *HANDLE, void* CB, void* file, void* lpBuf, size_t uiBufSize);
-    bool (*XBMC_read_file_string)(void *HANDLE, void* CB, void* file, char *szLine, int iLineLength);
-    ssize_t(*XBMC_write_file)(void *HANDLE, void* CB, void* file, const void* lpBuf, size_t uiBufSize);
-    void (*XBMC_flush_file)(void *HANDLE, void* CB, void* file);
-    int64_t (*XBMC_seek_file)(void *HANDLE, void* CB, void* file, int64_t iFilePosition, int iWhence);
-    int (*XBMC_truncate_file)(void *HANDLE, void* CB, void* file, int64_t iSize);
-    int64_t (*XBMC_get_file_position)(void *HANDLE, void* CB, void* file);
-    int64_t (*XBMC_get_file_length)(void *HANDLE, void* CB, void* file);
-    double(*XBMC_get_file_download_speed)(void *HANDLE, void* CB, void* file);
-    void (*XBMC_close_file)(void *HANDLE, void* CB, void* file);
-    int (*XBMC_get_file_chunk_size)(void *HANDLE, void* CB, void* file);
-    bool (*XBMC_file_exists)(void *HANDLE, void* CB, const char *strFileName, bool bUseCache);
-    int (*XBMC_stat_file)(void *HANDLE, void* CB, const char *strFileName, struct __stat64* buffer);
-    bool (*XBMC_delete_file)(void *HANDLE, void* CB, const char *strFileName);
-    bool (*XBMC_can_open_directory)(void *HANDLE, void* CB, const char* strURL);
-    bool (*XBMC_create_directory)(void *HANDLE, void* CB, const char* strPath);
-    bool (*XBMC_directory_exists)(void *HANDLE, void* CB, const char* strPath);
-    bool (*XBMC_remove_directory)(void *HANDLE, void* CB, const char* strPath);
-    bool (*XBMC_get_directory)(void *HANDLE, void* CB, const char* strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items);
-    void (*XBMC_free_directory)(void *HANDLE, void* CB, VFSDirEntry* items, unsigned int num_items);
-    void* (*XBMC_curl_create)(void *HANDLE, void* CB, const char* strURL);
-    bool (*XBMC_curl_add_option)(void *HANDLE, void* CB, void *file, XFILE::CURLOPTIONTYPE type, const char* name, const char *value);
-    bool (*XBMC_curl_open)(void *m_Handle, void *m_Callbacks, void *file, unsigned int flags);
+      return m_Callbacks->CURLOpen(m_Handle->addonData, file, flags);
+    }
 
   private:
-    void *m_libXBMC_addon;
-    void *m_Handle;
-    void *m_Callbacks;
-    struct cb_array
-    {
-      const char* libPath;
-    };
+    AddonCB* m_Handle;
+    KodiAPI::AddOn::CB_AddOnLib *m_Callbacks;
   };
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
deleted file mode 100644
index 0e64b11..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "xbmc_codec_types.h"
-#include "libXBMC_addon.h"
-
-#define CODEC_HELPER_DLL_NAME XBMC_DLL_NAME("codec")
-#define CODEC_HELPER_DLL XBMC_DLL("codec")
-
-class CHelper_libXBMC_codec
-{
-public:
-  CHelper_libXBMC_codec(void)
-  {
-    m_libXBMC_codec = NULL;
-    m_Handle        = NULL;
-  }
-
-  ~CHelper_libXBMC_codec(void)
-  {
-    if (m_libXBMC_codec)
-    {
-      CODEC_unregister_me(m_Handle, m_Callbacks);
-      dlclose(m_libXBMC_codec);
-    }
-  }
-
-  /*!
-   * @brief Resolve all callback methods
-   * @param handle Pointer to the add-on
-   * @return True when all methods were resolved, false otherwise.
-   */
-  bool RegisterMe(void* handle)
-  {
-    m_Handle = handle;
-
-    std::string libBasePath;
-    libBasePath  = ((cb_array*)m_Handle)->libPath;
-    libBasePath += CODEC_HELPER_DLL;
-
-    m_libXBMC_codec = dlopen(libBasePath.c_str(), RTLD_LAZY);
-    if (m_libXBMC_codec == NULL)
-    {
-      fprintf(stderr, "Unable to load %s\n", dlerror());
-      return false;
-    }
-
-    CODEC_register_me = (void* (*)(void *HANDLE))
-      dlsym(m_libXBMC_codec, "CODEC_register_me");
-    if (CODEC_register_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    CODEC_unregister_me = (void (*)(void* HANDLE, void* CB))
-      dlsym(m_libXBMC_codec, "CODEC_unregister_me");
-    if (CODEC_unregister_me == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    CODEC_get_codec_by_name = (xbmc_codec_t (*)(void* HANDLE, void* CB, const char* strCodecName))
-        dlsym(m_libXBMC_codec, "CODEC_get_codec_by_name");
-    if (CODEC_get_codec_by_name == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
-
-    m_Callbacks = CODEC_register_me(m_Handle);
-    return m_Callbacks != NULL;
-  }
-
-  /*!
-   * @brief Get the codec id used by XBMC
-   * @param strCodecName The name of the codec
-   * @return The codec_id, or a codec_id with 0 values when not supported
-   */
-  xbmc_codec_t GetCodecByName(const char* strCodecName)
-  {
-    return CODEC_get_codec_by_name(m_Handle, m_Callbacks, strCodecName);
-  }
-
-protected:
-  void* (*CODEC_register_me)(void*);
-  void (*CODEC_unregister_me)(void*, void*);
-  xbmc_codec_t (*CODEC_get_codec_by_name)(void *HANDLE, void* CB, const char* strCodecName);
-
-private:
-  void* m_libXBMC_codec;
-  void* m_Handle;
-  void* m_Callbacks;
-  struct cb_array
-  {
-    const char* libPath;
-  };
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
index 3ae30a7..6a9145e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
@@ -32,41 +32,6 @@
 //! @todo original definition is in DVDClock.h
 #define DVD_NOPTS_VALUE 0xFFF0000000000000
 
-namespace KodiAPI
-{
-namespace V1
-{
-namespace PVR
-{
-
-typedef struct CB_PVRLib
-{
-  void (*TransferEpgEntry)(void *userData, const ADDON_HANDLE handle, const EPG_TAG *epgentry);
-  void (*TransferChannelEntry)(void *userData, const ADDON_HANDLE handle, const PVR_CHANNEL *chan);
-  void (*TransferTimerEntry)(void *userData, const ADDON_HANDLE handle, const PVR_TIMER *timer);
-  void (*TransferRecordingEntry)(void *userData, const ADDON_HANDLE handle, const PVR_RECORDING *recording);
-  void (*AddMenuHook)(void *addonData, PVR_MENUHOOK *hook);
-  void (*Recording)(void *addonData, const char *Name, const char *FileName, bool On);
-  void (*TriggerChannelUpdate)(void *addonData);
-  void (*TriggerTimerUpdate)(void *addonData);
-  void (*TriggerRecordingUpdate)(void *addonData);
-  void (*TriggerChannelGroupsUpdate)(void *addonData);
-  void (*TriggerEpgUpdate)(void *addonData, unsigned int iChannelUid);
-
-  void (*TransferChannelGroup)(void *addonData, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP *group);
-  void (*TransferChannelGroupMember)(void *addonData, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP_MEMBER *member);
-
-  void (*FreeDemuxPacket)(void *addonData, DemuxPacket* pPacket);
-  DemuxPacket* (*AllocateDemuxPacket)(void *addonData, int iDataSize);
-  
-  void (*ConnectionStateChange)(void* addonData, const char* strConnectionString, PVR_CONNECTION_STATE newState, const char *strMessage);
-  void (*EpgEventStateChange)(void* addonData, EPG_TAG* tag, unsigned int iUniqueChannelId, EPG_EVENT_STATE newState);
-} CB_PVRLib;
-
-} /* namespace PVR */
-} /* namespace V1 */
-} /* namespace KodiAPI */
-
 class CHelper_libXBMC_pvr
 {
 public:
@@ -93,7 +58,7 @@ public:
   {
     m_Handle = static_cast<AddonCB*>(handle);
     if (m_Handle)
-      m_Callbacks = (KodiAPI::V1::PVR::CB_PVRLib*)m_Handle->PVRLib_RegisterMe(m_Handle->addonData);
+      m_Callbacks = (AddonInstance_PVR*)m_Handle->PVRLib_RegisterMe(m_Handle->addonData);
     if (!m_Callbacks)
       fprintf(stderr, "libXBMC_pvr-ERROR: PVRLib_register_me can't get callback table from Kodi !!!\n");
   
@@ -107,7 +72,7 @@ public:
    */
   void TransferEpgEntry(const ADDON_HANDLE handle, const EPG_TAG* entry)
   {
-    return m_Callbacks->TransferEpgEntry(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferEpgEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -117,7 +82,7 @@ public:
    */
   void TransferChannelEntry(const ADDON_HANDLE handle, const PVR_CHANNEL* entry)
   {
-    return m_Callbacks->TransferChannelEntry(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferChannelEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -127,7 +92,7 @@ public:
    */
   void TransferTimerEntry(const ADDON_HANDLE handle, const PVR_TIMER* entry)
   {
-    return m_Callbacks->TransferTimerEntry(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferTimerEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -137,7 +102,7 @@ public:
    */
   void TransferRecordingEntry(const ADDON_HANDLE handle, const PVR_RECORDING* entry)
   {
-    return m_Callbacks->TransferRecordingEntry(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferRecordingEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -147,7 +112,7 @@ public:
    */
   void TransferChannelGroup(const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP* entry)
   {
-    return m_Callbacks->TransferChannelGroup(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferChannelGroup(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -157,7 +122,7 @@ public:
    */
   void TransferChannelGroupMember(const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP_MEMBER* entry)
   {
-    return m_Callbacks->TransferChannelGroupMember(m_Handle->addonData, handle, entry);
+    return m_Callbacks->toKodi.TransferChannelGroupMember(m_Callbacks->toKodi.kodiInstance, handle, entry);
   }
 
   /*!
@@ -166,7 +131,7 @@ public:
    */
   void AddMenuHook(PVR_MENUHOOK* hook)
   {
-    return m_Callbacks->AddMenuHook(m_Handle->addonData, hook);
+    return m_Callbacks->toKodi.AddMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
   }
 
   /*!
@@ -177,7 +142,7 @@ public:
    */
   void Recording(const char* strRecordingName, const char* strFileName, bool bOn)
   {
-    return m_Callbacks->Recording(m_Handle->addonData, strRecordingName, strFileName, bOn);
+    return m_Callbacks->toKodi.Recording(m_Callbacks->toKodi.kodiInstance, strRecordingName, strFileName, bOn);
   }
 
   /*!
@@ -185,7 +150,7 @@ public:
    */
   void TriggerTimerUpdate(void)
   {
-    return m_Callbacks->TriggerTimerUpdate(m_Handle->addonData);
+    return m_Callbacks->toKodi.TriggerTimerUpdate(m_Callbacks->toKodi.kodiInstance);
   }
 
   /*!
@@ -193,7 +158,7 @@ public:
    */
   void TriggerRecordingUpdate(void)
   {
-    return m_Callbacks->TriggerRecordingUpdate(m_Handle->addonData);
+    return m_Callbacks->toKodi.TriggerRecordingUpdate(m_Callbacks->toKodi.kodiInstance);
   }
 
   /*!
@@ -201,7 +166,7 @@ public:
    */
   void TriggerChannelUpdate(void)
   {
-    return m_Callbacks->TriggerChannelUpdate(m_Handle->addonData);
+    return m_Callbacks->toKodi.TriggerChannelUpdate(m_Callbacks->toKodi.kodiInstance);
   }
 
   /*!
@@ -210,7 +175,7 @@ public:
    */
   void TriggerEpgUpdate(unsigned int iChannelUid)
   {
-    return m_Callbacks->TriggerEpgUpdate(m_Handle->addonData, iChannelUid);
+    return m_Callbacks->toKodi.TriggerEpgUpdate(m_Callbacks->toKodi.kodiInstance, iChannelUid);
   }
 
   /*!
@@ -218,7 +183,7 @@ public:
    */
   void TriggerChannelGroupsUpdate(void)
   {
-    return m_Callbacks->TriggerChannelGroupsUpdate(m_Handle->addonData);
+    return m_Callbacks->toKodi.TriggerChannelGroupsUpdate(m_Callbacks->toKodi.kodiInstance);
   }
 
 #ifdef USE_DEMUX
@@ -228,7 +193,7 @@ public:
    */
   void FreeDemuxPacket(DemuxPacket* pPacket)
   {
-    return m_Callbacks->FreeDemuxPacket(m_Handle->addonData, pPacket);
+    return m_Callbacks->toKodi.FreeDemuxPacket(m_Callbacks->toKodi.kodiInstance, pPacket);
   }
 
   /*!
@@ -238,7 +203,7 @@ public:
    */
   DemuxPacket* AllocateDemuxPacket(int iDataSize)
   {
-    return m_Callbacks->AllocateDemuxPacket(m_Handle->addonData, iDataSize);
+    return m_Callbacks->toKodi.AllocateDemuxPacket(m_Callbacks->toKodi.kodiInstance, iDataSize);
   }
 #endif
 
@@ -251,7 +216,7 @@ public:
    */
   void ConnectionStateChange(const char *strConnectionString, PVR_CONNECTION_STATE newState, const char *strMessage)
   {
-    return m_Callbacks->ConnectionStateChange(m_Handle->addonData, strConnectionString, newState, strMessage);
+    return m_Callbacks->toKodi.ConnectionStateChange(m_Callbacks->toKodi.kodiInstance, strConnectionString, newState, strMessage);
   }
 
   /*!
@@ -263,10 +228,20 @@ public:
    */
   void EpgEventStateChange(EPG_TAG *tag, unsigned int iUniqueChannelId, EPG_EVENT_STATE newState)
   {
-    return m_Callbacks->EpgEventStateChange(m_Handle->addonData, tag, iUniqueChannelId, newState);
+    return m_Callbacks->toKodi.EpgEventStateChange(m_Callbacks->toKodi.kodiInstance, tag, iUniqueChannelId, newState);
+  }
+
+  /*!
+   * @brief Get the codec id used by XBMC
+   * @param strCodecName The name of the codec
+   * @return The codec_id, or a codec_id with 0 values when not supported
+   */
+  xbmc_codec_t GetCodecByName(const char* strCodecName)
+  {
+    return m_Callbacks->toKodi.GetCodecByName(m_Callbacks->toKodi.kodiInstance, strCodecName);
   }
 
 private:
   AddonCB* m_Handle;
-  KodiAPI::V1::PVR::CB_PVRLib *m_Callbacks;
+  AddonInstance_PVR *m_Callbacks;
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
new file mode 100644
index 0000000..fa90f77
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -0,0 +1,436 @@
+#pragma once
+/*
+ *      Copyright (C) 2016-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+
+/*
+ *------------------------------------------------------------------------------
+ * Some parts on headers are only be used for Kodi itself and internally (not
+ * for add-on development).
+ *
+ * For this reason also no doxygen part with "///" defined there.
+ * -----------------------------------------------------------------------------
+ */
+
+/*
+ * Versions of all add-on globals and instances are defined below.
+ *
+ * This is added here and not in related header to prevent not
+ * needed includes during compile. Also have it here a better
+ * overview.
+ */
+
+#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.7"
+#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.2"
+#define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
+#define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
+                                                      "xbmc_addon_dll.h" \
+                                                      "xbmc_addon_types.h" \
+                                                      "libXBMC_addon.h" \
+                                                      "addon-instance/"
+
+#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.0"
+#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.0"
+#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.11.0"
+#define ADDON_GLOBAL_VERSION_GUI_MIN                  "5.10.0"
+#define ADDON_GLOBAL_VERSION_GUI_XML_ID               "kodi.binary.global.gui"
+#define ADDON_GLOBAL_VERSION_GUI_DEPENDS              "libKODI_guilib.h"
+
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE              "1.0.0"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE_MIN          "1.0.0"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE_XML_ID       "kodi.binary.global.audioengine"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE_DEPENDS      "AudioEngine.h"
+
+#define ADDON_GLOBAL_VERSION_FILESYSTEM               "1.0.0"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM_MIN           "1.0.0"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM_XML_ID        "kodi.binary.global.filesystem"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM_DEPENDS       "Filesystem.h"
+
+#define ADDON_GLOBAL_VERSION_NETWORK                  "1.0.0"
+#define ADDON_GLOBAL_VERSION_NETWORK_MIN              "1.0.0"
+#define ADDON_GLOBAL_VERSION_NETWORK_XML_ID           "kodi.binary.global.network"
+#define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h"
+
+#define ADDON_INSTANCE_VERSION_ADSP                   "0.1.10"
+#define ADDON_INSTANCE_VERSION_ADSP_MIN               "0.1.10"
+#define ADDON_INSTANCE_VERSION_ADSP_XML_ID            "kodi.binary.instance.adsp"
+#define ADDON_INSTANCE_VERSION_ADSP_DEPENDS           "kodi_adsp_dll.h" \
+                                                      "kodi_adsp_types.h" \
+                                                      "libKODI_adsp.h"
+
+#define ADDON_INSTANCE_VERSION_AUDIODECODER           "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_XML_ID    "kodi.binary.instance.audiodecoder"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "kodi_audiodec_dll.h" \
+                                                      "kodi_audiodec_types.h"
+
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "xbmc_audioenc_dll.h" \
+                                                      "xbmc_audioenc_types.h"
+
+#define ADDON_INSTANCE_VERSION_GAME                   "1.0.32"
+#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.32"
+#define ADDON_INSTANCE_VERSION_GAME_XML_ID            "kodi.binary.instance.game"
+#define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "kodi_game_dll.h" \
+                                                      "kodi_game_types.h" \
+                                                      "libKODI_game.h"
+
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "1.0.1"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "kodi_imagedec_dll.h" \
+                                                      "kodi_imagedec_types.h"
+
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "1.0.8"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "1.0.8"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "libKODI_inputstream.h" \
+                                                      "kodi_inputstream_dll.h" \
+                                                      "kodi_inputstream_types.h"
+
+#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.3"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.3"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "kodi_peripheral_dll.h" \
+                                                      "kodi_peripheral_types.h" \
+                                                      "kodi_peripheral_utils.hpp" \
+                                                      "libKODI_peripheral.h"
+
+#define ADDON_INSTANCE_VERSION_PVR                    "5.2.4"
+#define ADDON_INSTANCE_VERSION_PVR_MIN                "5.2.4"
+#define ADDON_INSTANCE_VERSION_PVR_XML_ID             "kodi.binary.instance.pvr"
+#define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "xbmc_pvr_dll.h" \
+                                                      "xbmc_pvr_types.h" \
+                                                      "xbmc_epg_types.h" \
+                                                      "libXBMC_pvr.h"
+
+#define ADDON_INSTANCE_VERSION_SCREENSAVER            "2.0.0"
+#define ADDON_INSTANCE_VERSION_SCREENSAVER_MIN        "2.0.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_VFS                    "1.0.1"
+#define ADDON_INSTANCE_VERSION_VFS_MIN                "1.0.1"
+#define ADDON_INSTANCE_VERSION_VFS_XML_ID             "kodi.binary.instance.vfs"
+#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "kodi_vfs_dll.h" \
+                                                      "kodi_vfs_types.h" \
+                                                      "kodi_vfs_utils.hpp"
+
+#define ADDON_INSTANCE_VERSION_VISUALIZATION          "1.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "1.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_XML_ID   "kodi.binary.instance.visualization"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "xbmc_vis_dll.h" \
+                                                      "xbmc_vis_types.h"
+
+///
+/// The currently available instance types for Kodi add-ons
+///
+/// \internal
+/// @note For add of new types take a new number on end. To change
+/// existing numbers can be make problems on already compiled add-ons.
+/// \endinternal
+///
+typedef enum ADDON_TYPE
+{
+  /* addon global parts */
+  ADDON_GLOBAL_MAIN = 0,
+  ADDON_GLOBAL_GUI = 1,
+  ADDON_GLOBAL_AUDIOENGINE = 2,
+  ADDON_GLOBAL_GENERAL = 3,
+  ADDON_GLOBAL_NETWORK = 4,
+  ADDON_GLOBAL_FILESYSTEM = 5,
+  ADDON_GLOBAL_MAX = 5, // Last used global id, used in loops to check versions. Need to change if new global type becomes added.
+
+  /* addon type instances */
+  ADDON_INSTANCE_ADSP = 101,
+  ADDON_INSTANCE_AUDIODECODER = 102,
+  ADDON_INSTANCE_AUDIOENCODER = 103,
+  ADDON_INSTANCE_GAME = 104,
+  ADDON_INSTANCE_INPUTSTREAM = 105,
+  ADDON_INSTANCE_PERIPHERAL = 106,
+  ADDON_INSTANCE_PVR = 107,
+  ADDON_INSTANCE_SCREENSAVER = 108,
+  ADDON_INSTANCE_VISUALIZATION = 109,
+  ADDON_INSTANCE_VFS = 110,
+  ADDON_INSTANCE_IMAGEDECODER = 111,
+} ADDON_TYPE;
+
+#ifdef __cplusplus
+extern "C" {
+namespace kodi {
+namespace addon {
+#endif
+
+///
+/// This is used from Kodi to get the active version of add-on parts.
+/// It is compiled in add-on and also in Kodi itself, with this can be Kodi
+/// compare the version from him with them on add-on.
+///
+/// @param[in] type The with 'enum ADDON_TYPE' type to ask
+/// @return version The current version of asked type
+///
+inline const char* GetTypeVersion(int type)
+{
+  /*
+   * #ifdef's below becomes set by cmake, no set by hand needed.
+   */
+  switch (type)
+  {
+    /* addon global parts */
+    case ADDON_GLOBAL_MAIN:
+      return ADDON_GLOBAL_VERSION_MAIN;
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_GENERAL_USED)
+    case ADDON_GLOBAL_GENERAL:
+      return ADDON_GLOBAL_VERSION_GENERAL;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_GUI_USED)
+    case ADDON_GLOBAL_GUI:
+      return ADDON_GLOBAL_VERSION_GUI;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_AUDIOENGINE_USED)
+    case ADDON_GLOBAL_AUDIOENGINE:
+      return ADDON_GLOBAL_VERSION_AUDIOENGINE;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_FILESYSTEM_USED)
+    case ADDON_GLOBAL_FILESYSTEM:
+      return ADDON_GLOBAL_VERSION_FILESYSTEM;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_NETWORK_USED)
+    case ADDON_GLOBAL_NETWORK:
+      return ADDON_GLOBAL_VERSION_NETWORK;
+#endif
+
+    /* addon type instances */
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_ADSP_USED)
+    case ADDON_INSTANCE_ADSP:
+      return ADDON_INSTANCE_VERSION_ADSP;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_AUDIODECODER_USED)
+    case ADDON_INSTANCE_AUDIODECODER:
+      return ADDON_INSTANCE_VERSION_AUDIODECODER;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_AUDIOENCODER_USED)
+    case ADDON_INSTANCE_AUDIOENCODER:
+      return ADDON_INSTANCE_VERSION_AUDIOENCODER;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_GAME_USED)
+    case ADDON_INSTANCE_GAME:
+      return ADDON_INSTANCE_VERSION_GAME;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_IMAGEDECODER_USED)
+    case ADDON_INSTANCE_IMAGEDECODER:
+      return ADDON_INSTANCE_VERSION_IMAGEDECODER;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_INPUTSTREAM_USED)
+    case ADDON_INSTANCE_INPUTSTREAM:
+      return ADDON_INSTANCE_VERSION_INPUTSTREAM;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_PERIPHERAL_USED)
+    case ADDON_INSTANCE_PERIPHERAL:
+      return ADDON_INSTANCE_VERSION_PERIPHERAL;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_PVR_USED)
+    case ADDON_INSTANCE_PVR:
+      return ADDON_INSTANCE_VERSION_PVR;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_SCREENSAVER_USED)
+    case ADDON_INSTANCE_SCREENSAVER:
+      return ADDON_INSTANCE_VERSION_SCREENSAVER;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_VFS_USED)
+    case ADDON_INSTANCE_VFS:
+      return ADDON_INSTANCE_VERSION_VFS;
+#endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_VISUALIZATION_USED)
+    case ADDON_INSTANCE_VISUALIZATION:
+      return ADDON_INSTANCE_VERSION_VISUALIZATION;
+#endif
+  }
+  return "0.0.0";
+}
+
+///
+/// This is used from Kodi to get the minimum supported version of add-on parts.
+/// It is compiled in add-on and also in Kodi itself, with this can be Kodi
+/// compare the version from him with them on add-on.
+///
+/// @param[in] type The with 'enum ADDON_TYPE' type to ask
+/// @return version The minimum version of asked type
+///
+inline const char* GetTypeMinVersion(int type)
+{
+  switch (type)
+  {
+    /* addon global parts */
+    case ADDON_GLOBAL_MAIN:
+      return ADDON_GLOBAL_VERSION_MAIN_MIN;
+    case ADDON_GLOBAL_GUI:
+      return ADDON_GLOBAL_VERSION_GUI_MIN;
+    case ADDON_GLOBAL_GENERAL:
+      return ADDON_GLOBAL_VERSION_GENERAL_MIN;
+    case ADDON_GLOBAL_AUDIOENGINE:
+      return ADDON_GLOBAL_VERSION_AUDIOENGINE_MIN;
+    case ADDON_GLOBAL_FILESYSTEM:
+      return ADDON_GLOBAL_VERSION_FILESYSTEM_MIN;
+    case ADDON_GLOBAL_NETWORK:
+      return ADDON_GLOBAL_VERSION_NETWORK_MIN;
+
+    /* addon type instances */
+    case ADDON_INSTANCE_ADSP:
+      return ADDON_INSTANCE_VERSION_ADSP_MIN;
+    case ADDON_INSTANCE_AUDIODECODER:
+      return ADDON_INSTANCE_VERSION_AUDIODECODER_MIN;
+    case ADDON_INSTANCE_AUDIOENCODER:
+      return ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN;
+    case ADDON_INSTANCE_GAME:
+      return ADDON_INSTANCE_VERSION_GAME_MIN;
+    case ADDON_INSTANCE_IMAGEDECODER:
+      return ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN;
+    case ADDON_INSTANCE_INPUTSTREAM:
+      return ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN;
+    case ADDON_INSTANCE_PERIPHERAL:
+      return ADDON_INSTANCE_VERSION_PERIPHERAL_MIN;
+    case ADDON_INSTANCE_PVR:
+      return ADDON_INSTANCE_VERSION_PVR_MIN;
+    case ADDON_INSTANCE_SCREENSAVER:
+      return ADDON_INSTANCE_VERSION_SCREENSAVER_MIN;
+    case ADDON_INSTANCE_VFS:
+      return ADDON_INSTANCE_VERSION_VFS_MIN;
+    case ADDON_INSTANCE_VISUALIZATION:
+      return ADDON_INSTANCE_VERSION_VISUALIZATION_MIN;
+  }
+  return "0.0.0";
+}
+
+///
+/// Function used internally on add-on and in Kodi itself to get name
+/// about given type.
+///
+/// @param[in] type The with 'enum ADDON_TYPE' defined type to ask
+/// @return Name of the asked instance type
+///
+inline const char* GetTypeName(int type)
+{
+  switch (type)
+  {
+    /* addon global parts */
+    case ADDON_GLOBAL_MAIN:
+      return "Addon";
+    case ADDON_GLOBAL_GUI:
+      return "GUI";
+    case ADDON_GLOBAL_GENERAL:
+      return "General";
+    case ADDON_GLOBAL_AUDIOENGINE:
+      return "AudioEngine";
+    case ADDON_GLOBAL_FILESYSTEM:
+      return "Filesystem";
+    case ADDON_GLOBAL_NETWORK:
+      return "Network";
+
+    /* addon type instances */
+    case ADDON_INSTANCE_ADSP:
+      return "ADSP";
+    case ADDON_INSTANCE_AUDIODECODER:
+      return "AudioDecoder";
+    case ADDON_INSTANCE_AUDIOENCODER:
+      return "AudioEncoder";
+    case ADDON_INSTANCE_GAME:
+      return "Game";
+    case ADDON_INSTANCE_IMAGEDECODER:
+      return "ImageDecoder";
+    case ADDON_INSTANCE_INPUTSTREAM:
+      return "Inputstream";
+    case ADDON_INSTANCE_PERIPHERAL:
+      return "Peripheral";
+    case ADDON_INSTANCE_PVR:
+      return "PVR";
+    case ADDON_INSTANCE_SCREENSAVER:
+      return "ScreenSaver";
+    case ADDON_INSTANCE_VISUALIZATION:
+      return "Visualization";
+  }
+  return "unknown";
+}
+
+///
+/// Function used internally on add-on and in Kodi itself to get id number
+/// about given type name.
+///
+/// @param[in] name The type name string to ask
+/// @return Id number of the asked instance type
+///
+/// @warning String must be lower case here!
+///
+inline int GetTypeId(const char* name)
+{
+  if (name)
+  {
+    if (strcmp(name, "addon") == 0)
+      return ADDON_GLOBAL_MAIN;
+    else if (strcmp(name, "general") == 0)
+      return ADDON_GLOBAL_GENERAL;
+    else if (strcmp(name, "gui") == 0)
+      return ADDON_GLOBAL_GUI;
+    else if (strcmp(name, "audioengine") == 0)
+      return ADDON_GLOBAL_AUDIOENGINE;
+    else if (strcmp(name, "filesystem") == 0)
+      return ADDON_GLOBAL_FILESYSTEM;
+    else if (strcmp(name, "network") == 0)
+      return ADDON_GLOBAL_NETWORK;
+    else if (strcmp(name, "adsp") == 0)
+      return ADDON_INSTANCE_ADSP;
+    else if (strcmp(name, "audiodecoder") == 0)
+      return ADDON_INSTANCE_AUDIODECODER;
+    else if (strcmp(name, "audioencoder") == 0)
+      return ADDON_INSTANCE_AUDIOENCODER;
+    else if (strcmp(name, "game") == 0)
+      return ADDON_INSTANCE_GAME;
+    else if (strcmp(name, "imagedecoder") == 0)
+      return ADDON_INSTANCE_IMAGEDECODER;
+    else if (strcmp(name, "inputstream") == 0)
+      return ADDON_INSTANCE_INPUTSTREAM;
+    else if (strcmp(name, "peripheral") == 0)
+      return ADDON_INSTANCE_PERIPHERAL;
+    else if (strcmp(name, "pvr") == 0)
+      return ADDON_INSTANCE_PVR;
+    else if (strcmp(name, "screensaver") == 0)
+      return ADDON_INSTANCE_SCREENSAVER;
+    else if (strcmp(name, "vfs") == 0)
+      return ADDON_INSTANCE_VFS;
+    else if (strcmp(name, "visualization") == 0)
+      return ADDON_INSTANCE_VISUALIZATION;
+  }
+  return -1;
+}
+
+#ifdef __cplusplus
+} /* namespace addon */
+} /* namespace kodi */
+} /* extern "C" */
+#endif
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h
deleted file mode 100644
index 2eb972e..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "xbmc_addon_types.h"
-
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-
-class DllSetting
-{
-public:
-  enum SETTING_TYPE { NONE=0, CHECK, SPIN };
-
-  DllSetting(SETTING_TYPE t, const char *n, const char *l)
-  {
-    id = NULL;
-    label = NULL;
-    if (n)
-    {
-      id = new char[strlen(n)+1];
-      strcpy(id, n);
-    }
-    if (l)
-    {
-      label = new char[strlen(l)+1];
-      strcpy(label, l);
-    }
-    current = 0;
-    type = t;
-  }
-
-  DllSetting(const DllSetting &rhs) // copy constructor
-  {
-    id = NULL;
-    label = NULL;
-    if (rhs.id)
-    {
-      id = new char[strlen(rhs.id)+1];
-      strcpy(id, rhs.id);
-    }
-    if (rhs.label)
-    {
-      label = new char[strlen(rhs.label)+1];
-      strcpy(label, rhs.label);
-    }
-    current = rhs.current;
-    type = rhs.type;
-    for (unsigned int i = 0; i < rhs.entry.size(); i++)
-    {
-      char *lab = new char[strlen(rhs.entry[i]) + 1];
-      strcpy(lab, rhs.entry[i]);
-      entry.push_back(lab);
-    }
-  }
-
-  ~DllSetting()
-  {
-    delete[] id;
-    delete[] label;
-    for (unsigned int i=0; i < entry.size(); i++)
-      delete[] entry[i];
-  }
-
-  void AddEntry(const char *label)
-  {
-    if (!label || type != SPIN) return;
-    char *lab = new char[strlen(label) + 1];
-    strcpy(lab, label);
-    entry.push_back(lab);
-  }
-
-  // data members
-  SETTING_TYPE type;
-  char*        id;
-  char*        label;
-  int          current;
-  std::vector<const char *> entry;
-};
-
-class DllUtils
-{
-public:
-
-  static unsigned int VecToStruct(std::vector<DllSetting> &vecSet, ADDON_StructSetting*** sSet) 
-  {
-    *sSet = NULL;
-    if (vecSet.empty())
-      return 0;
-
-    unsigned int uiElements=0;
-
-    *sSet = (ADDON_StructSetting**)malloc(vecSet.size()*sizeof(ADDON_StructSetting*));
-    for(unsigned int i=0;i<vecSet.size();i++)
-    {
-      (*sSet)[i] = NULL;
-      (*sSet)[i] = (ADDON_StructSetting*)malloc(sizeof(ADDON_StructSetting));
-      (*sSet)[i]->id = NULL;
-      (*sSet)[i]->label = NULL;
-      uiElements++;
-
-      if (vecSet[i].id && vecSet[i].label)
-      {
-        (*sSet)[i]->id = strdup(vecSet[i].id);
-        (*sSet)[i]->label = strdup(vecSet[i].label);
-        (*sSet)[i]->type = vecSet[i].type;
-        (*sSet)[i]->current = vecSet[i].current;
-        (*sSet)[i]->entry_elements = 0;
-        (*sSet)[i]->entry = NULL;
-        if(vecSet[i].type == DllSetting::SPIN && !vecSet[i].entry.empty())
-        {
-          (*sSet)[i]->entry = (char**)malloc(vecSet[i].entry.size()*sizeof(char**));
-          for(unsigned int j=0;j<vecSet[i].entry.size();j++)
-          {
-            if(strlen(vecSet[i].entry[j]) > 0)
-            {
-              (*sSet)[i]->entry[j] = strdup(vecSet[i].entry[j]);
-              (*sSet)[i]->entry_elements++;
-            }
-          }
-        }
-      }
-    }
-    return uiElements;
-  }
-
-  static void StructToVec(unsigned int iElements, ADDON_StructSetting*** sSet, std::vector<DllSetting> *vecSet) 
-  {
-    if(iElements == 0)
-      return;
-
-    vecSet->clear();
-    for(unsigned int i=0;i<iElements;i++)
-    {
-      DllSetting vSet((DllSetting::SETTING_TYPE)(*sSet)[i]->type, (*sSet)[i]->id, (*sSet)[i]->label);
-      if((*sSet)[i]->type == DllSetting::SPIN)
-      {
-        for(unsigned int j=0;j<(*sSet)[i]->entry_elements;j++)
-        {
-            vSet.AddEntry((*sSet)[i]->entry[j]);
-        }
-      }
-      vSet.current = (*sSet)[i]->current;
-      vecSet->push_back(vSet);
-    }
-  }
-
-  static void FreeStruct(unsigned int iElements, ADDON_StructSetting*** sSet)
-  {
-    if(iElements == 0)
-      return;
-
-    for(unsigned int i=0;i<iElements;i++)
-    {
-      if((*sSet)[i]->type == DllSetting::SPIN)
-      {
-        for(unsigned int j=0;j<(*sSet)[i]->entry_elements;j++)
-        {
-          free((*sSet)[i]->entry[j]);
-        }
-        free((*sSet)[i]->entry);
-      }
-      free((*sSet)[i]->id);
-      free((*sSet)[i]->label);
-      free((*sSet)[i]);
-    }
-    free(*sSet);
-  }
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
index e3c8785..f8247d9 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
@@ -20,31 +20,20 @@
  *
  */
 
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include "xbmc_addon_types.h"
+#include "AddonBase.h"
 
 #ifdef __cplusplus
-extern "C" { 
+extern "C" {
 #endif
 
   ADDON_STATUS __declspec(dllexport) ADDON_Create(void *callbacks, void* props);
-  void         __declspec(dllexport) ADDON_Stop();
   void         __declspec(dllexport) ADDON_Destroy();
   ADDON_STATUS __declspec(dllexport) ADDON_GetStatus();
-  bool         __declspec(dllexport) ADDON_HasSettings();
-  unsigned int __declspec(dllexport) ADDON_GetSettings(ADDON_StructSetting ***sSet);
   ADDON_STATUS __declspec(dllexport) ADDON_SetSetting(const char *settingName, const void *settingValue);
-  void         __declspec(dllexport) ADDON_FreeSettings();
+  __declspec(dllexport) const char* ADDON_GetTypeVersion(int type)
+  {
+    return kodi::addon::GetTypeVersion(type);
+  }
 
 #ifdef __cplusplus
 };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
index 2ceb5c5..d1e7a50 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
@@ -20,43 +20,4 @@
  *
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum ADDON_STATUS
-{
-  ADDON_STATUS_OK,
-  ADDON_STATUS_LOST_CONNECTION,
-  ADDON_STATUS_NEED_RESTART,
-  ADDON_STATUS_NEED_SETTINGS,
-  ADDON_STATUS_UNKNOWN,
-  ADDON_STATUS_NEED_SAVEDSETTINGS,
-  ADDON_STATUS_PERMANENT_FAILURE   /**< permanent failure, like failing to resolve methods */
-};
-
-typedef struct
-{
-  int           type;
-  char*         id;
-  char*         label;
-  int           current;
-  char**        entry;
-  unsigned int  entry_elements;
-} ADDON_StructSetting;
-
-/*!
- * @brief Handle used to return data from the PVR add-on to CPVRClient
- */
-struct ADDON_HANDLE_STRUCT
-{
-  void *callerAddress;  /*!< address of the caller */
-  void *dataAddress;    /*!< address to store data in */
-  int   dataIdentifier; /*!< parameter to pass back when calling the callback */
-};
-typedef ADDON_HANDLE_STRUCT *ADDON_HANDLE;
-
-#ifdef __cplusplus
-};
-#endif
-
+#include "AddonBase.h" // compatibility fallback
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h
index 932d34f..9ba259c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h
@@ -46,13 +46,15 @@ extern "C"
   void Free(void* context);
 
   // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(struct AudioEncoder* pScr)
+  void __declspec(dllexport) get_addon(void* enc)
   {
-    pScr->Create = Create;
-    pScr->Start  = Start;
-    pScr->Encode = Encode;
-    pScr->Finish = Finish;
-    pScr->Free   = Free;
+    AddonInstance_AudioEncoder* pScr = static_cast<AddonInstance_AudioEncoder*>(enc);
+
+    pScr->toAddon.Create = Create;
+    pScr->toAddon.Start  = Start;
+    pScr->toAddon.Encode = Encode;
+    pScr->toAddon.Finish = Finish;
+    pScr->toAddon.Free   = Free;
   };
 };
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h
index df5164e..25142c2 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
+#ifndef TARGET_WINDOWS
 #ifndef __cdecl
 #define __cdecl
 #endif
@@ -31,6 +29,7 @@
 #endif
 #endif
 
+#include "xbmc_addon_types.h"
 #include <stdint.h>
 
 extern "C"
@@ -40,11 +39,6 @@ extern "C"
     int dummy;
   };
 
-  struct AUDIOENC_PROPS
-  {
-    int dummy;
-  };
-
   typedef int (*audioenc_write_callback)(void* opaque, uint8_t* data, int len);
   typedef int64_t (*audioenc_seek_callback)(void* opaque, int64_t pos, int whence);
 
@@ -55,7 +49,17 @@ extern "C"
     audioenc_seek_callback  seek;
   } audioenc_callbacks;
 
-  struct AudioEncoder
+  typedef struct AddonProps_AudioEncoder
+  {
+    int dummy;
+  } AddonProps_AudioEncoder;
+
+  typedef struct AddonToKodiFuncTable_AudioEncoder
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_AudioEncoder;
+
+  typedef struct KodiToAddonFuncTable_AudioEncoder
   {
     /*! \brief Create encoder context
      \param callbacks Pointer to audioenc_callbacks structure.
@@ -105,6 +109,13 @@ extern "C"
      \param context Encoder context to free.
      */
     void (__cdecl* Free)(void* context);
-  };
+  } KodiToAddonFuncTable_AudioEncoder;
+
+  typedef struct AddonInstance_AudioEncoder
+  {
+    AddonProps_AudioEncoder props;
+    AddonToKodiFuncTable_AudioEncoder toKodi;
+    KodiToAddonFuncTable_AudioEncoder toAddon;
+  } AddonInstance_AudioEncoder;
 }
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h
deleted file mode 100644
index b1f43f9..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* current codec API version */
-#define KODI_CODEC_API_VERSION "1.0.0"
-
-typedef unsigned int xbmc_codec_id_t;
-
-typedef enum
-{
-    XBMC_CODEC_TYPE_UNKNOWN = -1,
-    XBMC_CODEC_TYPE_VIDEO,
-    XBMC_CODEC_TYPE_AUDIO,
-    XBMC_CODEC_TYPE_DATA,
-    XBMC_CODEC_TYPE_SUBTITLE,
-    XBMC_CODEC_TYPE_RDS,
-    XBMC_CODEC_TYPE_NB
-} xbmc_codec_type_t;
-
-typedef struct
-{
-  xbmc_codec_type_t codec_type;
-  xbmc_codec_id_t   codec_id;
-} xbmc_codec_t;
-
-#define XBMC_INVALID_CODEC_ID   0
-#define XBMC_INVALID_CODEC      { XBMC_CODEC_TYPE_UNKNOWN, XBMC_INVALID_CODEC_ID }
-
-#ifdef __cplusplus
-};
-#endif
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
index 57bb129..d504f4b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
@@ -34,40 +34,6 @@ extern "C"
   /*! @name PVR add-on methods */
   //@{
   /*!
-   * Get the XBMC_PVR_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with XBMC.
-   * @return The XBMC_PVR_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetPVRAPIVersion(void);
-
-  /*!
-   * Get the XBMC_PVR_MIN_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with XBMC.
-   * @return The XBMC_PVR_MIN_API_VERSION that was used to compile this add-on.
-   * @remarks Valid implementation required.
-   */
-  const char* GetMininumPVRAPIVersion(void);
-
-  /*!
-   * Get the XBMC_GUI_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with XBMC.
-   * @return The XBMC_GUI_API_VERSION that was used to compile this add-on or empty string if this add-on does not depend on Kodi GUI API.
-   * @remarks Valid implementation required.
-   * @note see libKODI_guilib.h about related parts
-   */
-  const char* GetGUIAPIVersion(void);
-
-  /*!
-   * Get the XBMC_GUI_MIN_API_VERSION that was used to compile this add-on.
-   * Used to check if this add-on is compatible with XBMC.
-   * @return The XBMC_GUI_MIN_API_VERSION that was used to compile this add-on or empty string if this add-on does not depend on Kodi GUI API.
-   * @remarks Valid implementation required.
-   * @note see libKODI_guilib.h about related parts
-   */
-  const char* GetMininumGUIAPIVersion(void);
-
-  /*!
    * Get the list of features that this add-on provides.
    * Called by XBMC to query the add-on's capabilities.
    * Used to check which options should be presented in the UI, which methods to call, etc.
@@ -657,98 +623,98 @@ extern "C"
 
   /*!
    * Called by XBMC to assign the function pointers of this add-on to pClient.
-   * @param pClient The struct to assign the function pointers to.
+   * @param ptr The struct to assign the function pointers to.
    */
-  void __declspec(dllexport) get_addon(struct PVRClient* pClient)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pClient->GetPVRAPIVersion               = GetPVRAPIVersion;
-    pClient->GetMininumPVRAPIVersion        = GetMininumPVRAPIVersion;
-    pClient->GetGUIAPIVersion               = GetGUIAPIVersion;
-    pClient->GetMininumGUIAPIVersion        = GetMininumGUIAPIVersion;
-    pClient->GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->GetStreamProperties            = GetStreamProperties;
-    pClient->GetConnectionString            = GetConnectionString;
-    pClient->GetBackendName                 = GetBackendName;
-    pClient->GetBackendVersion              = GetBackendVersion;
-    pClient->GetDriveSpace                  = GetDriveSpace;
-    pClient->OpenDialogChannelScan          = OpenDialogChannelScan;
-    pClient->MenuHook                       = CallMenuHook;
-
-    pClient->GetEpg                         = GetEPGForChannel;
-
-    pClient->GetChannelGroupsAmount         = GetChannelGroupsAmount;
-    pClient->GetChannelGroups               = GetChannelGroups;
-    pClient->GetChannelGroupMembers         = GetChannelGroupMembers;
-
-    pClient->GetChannelsAmount              = GetChannelsAmount;
-    pClient->GetChannels                    = GetChannels;
-    pClient->DeleteChannel                  = DeleteChannel;
-    pClient->RenameChannel                  = RenameChannel;
-    pClient->MoveChannel                    = MoveChannel;
-    pClient->OpenDialogChannelSettings      = OpenDialogChannelSettings;
-    pClient->OpenDialogChannelAdd           = OpenDialogChannelAdd;
-
-    pClient->GetRecordingsAmount            = GetRecordingsAmount;
-    pClient->GetRecordings                  = GetRecordings;
-    pClient->DeleteRecording                = DeleteRecording;
-    pClient->UndeleteRecording              = UndeleteRecording;
-    pClient->DeleteAllRecordingsFromTrash   = DeleteAllRecordingsFromTrash;
-    pClient->RenameRecording                = RenameRecording;
-    pClient->SetRecordingPlayCount          = SetRecordingPlayCount;
-    pClient->SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
-    pClient->GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
-    pClient->GetRecordingEdl                = GetRecordingEdl;
-
-    pClient->GetTimerTypes                  = GetTimerTypes;
-    pClient->GetTimersAmount                = GetTimersAmount;
-    pClient->GetTimers                      = GetTimers;
-    pClient->AddTimer                       = AddTimer;
-    pClient->DeleteTimer                    = DeleteTimer;
-    pClient->UpdateTimer                    = UpdateTimer;
-
-    pClient->OpenLiveStream                 = OpenLiveStream;
-    pClient->CloseLiveStream                = CloseLiveStream;
-    pClient->ReadLiveStream                 = ReadLiveStream;
-    pClient->SeekLiveStream                 = SeekLiveStream;
-    pClient->PositionLiveStream             = PositionLiveStream;
-    pClient->LengthLiveStream               = LengthLiveStream;
-    pClient->SwitchChannel                  = SwitchChannel;
-    pClient->SignalStatus                   = SignalStatus;
-    pClient->GetLiveStreamURL               = GetLiveStreamURL;
-    pClient->GetChannelSwitchDelay          = GetChannelSwitchDelay;
-    pClient->CanPauseStream                 = CanPauseStream;
-    pClient->PauseStream                    = PauseStream;
-    pClient->CanSeekStream                  = CanSeekStream;
-    pClient->SeekTime                       = SeekTime;
-    pClient->SetSpeed                       = SetSpeed;
-
-    pClient->OpenRecordedStream             = OpenRecordedStream;
-    pClient->CloseRecordedStream            = CloseRecordedStream;
-    pClient->ReadRecordedStream             = ReadRecordedStream;
-    pClient->SeekRecordedStream             = SeekRecordedStream;
-    pClient->PositionRecordedStream         = PositionRecordedStream;
-    pClient->LengthRecordedStream           = LengthRecordedStream;
-
-    pClient->DemuxReset                     = DemuxReset;
-    pClient->DemuxAbort                     = DemuxAbort;
-    pClient->DemuxFlush                     = DemuxFlush;
-    pClient->DemuxRead                      = DemuxRead;
-
-    pClient->GetPlayingTime                 = GetPlayingTime;
-    pClient->GetBufferTimeStart             = GetBufferTimeStart;
-    pClient->GetBufferTimeEnd               = GetBufferTimeEnd;
-
-    pClient->GetBackendHostname             = GetBackendHostname;
-
-    pClient->IsTimeshifting                 = IsTimeshifting;
-    pClient->IsRealTimeStream               = IsRealTimeStream;
-
-    pClient->SetEPGTimeFrame                = SetEPGTimeFrame;
-
-    pClient->OnSystemSleep                  = OnSystemSleep;
-    pClient->OnSystemWake                   = OnSystemWake;
-    pClient->OnPowerSavingActivated         = OnPowerSavingActivated;
-    pClient->OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
+    AddonInstance_PVR* pClient = static_cast<AddonInstance_PVR*>(ptr);
+
+    pClient->toAddon.addonInstance = nullptr; // used in future
+
+    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
+    pClient->toAddon.GetStreamProperties            = GetStreamProperties;
+    pClient->toAddon.GetConnectionString            = GetConnectionString;
+    pClient->toAddon.GetBackendName                 = GetBackendName;
+    pClient->toAddon.GetBackendVersion              = GetBackendVersion;
+    pClient->toAddon.GetDriveSpace                  = GetDriveSpace;
+    pClient->toAddon.OpenDialogChannelScan          = OpenDialogChannelScan;
+    pClient->toAddon.MenuHook                       = CallMenuHook;
+
+    pClient->toAddon.GetEpg                         = GetEPGForChannel;
+
+    pClient->toAddon.GetChannelGroupsAmount         = GetChannelGroupsAmount;
+    pClient->toAddon.GetChannelGroups               = GetChannelGroups;
+    pClient->toAddon.GetChannelGroupMembers         = GetChannelGroupMembers;
+
+    pClient->toAddon.GetChannelsAmount              = GetChannelsAmount;
+    pClient->toAddon.GetChannels                    = GetChannels;
+    pClient->toAddon.DeleteChannel                  = DeleteChannel;
+    pClient->toAddon.RenameChannel                  = RenameChannel;
+    pClient->toAddon.MoveChannel                    = MoveChannel;
+    pClient->toAddon.OpenDialogChannelSettings      = OpenDialogChannelSettings;
+    pClient->toAddon.OpenDialogChannelAdd           = OpenDialogChannelAdd;
+
+    pClient->toAddon.GetRecordingsAmount            = GetRecordingsAmount;
+    pClient->toAddon.GetRecordings                  = GetRecordings;
+    pClient->toAddon.DeleteRecording                = DeleteRecording;
+    pClient->toAddon.UndeleteRecording              = UndeleteRecording;
+    pClient->toAddon.DeleteAllRecordingsFromTrash   = DeleteAllRecordingsFromTrash;
+    pClient->toAddon.RenameRecording                = RenameRecording;
+    pClient->toAddon.SetRecordingPlayCount          = SetRecordingPlayCount;
+    pClient->toAddon.SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
+    pClient->toAddon.GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
+    pClient->toAddon.GetRecordingEdl                = GetRecordingEdl;
+
+    pClient->toAddon.GetTimerTypes                  = GetTimerTypes;
+    pClient->toAddon.GetTimersAmount                = GetTimersAmount;
+    pClient->toAddon.GetTimers                      = GetTimers;
+    pClient->toAddon.AddTimer                       = AddTimer;
+    pClient->toAddon.DeleteTimer                    = DeleteTimer;
+    pClient->toAddon.UpdateTimer                    = UpdateTimer;
+
+    pClient->toAddon.OpenLiveStream                 = OpenLiveStream;
+    pClient->toAddon.CloseLiveStream                = CloseLiveStream;
+    pClient->toAddon.ReadLiveStream                 = ReadLiveStream;
+    pClient->toAddon.SeekLiveStream                 = SeekLiveStream;
+    pClient->toAddon.PositionLiveStream             = PositionLiveStream;
+    pClient->toAddon.LengthLiveStream               = LengthLiveStream;
+    pClient->toAddon.SwitchChannel                  = SwitchChannel;
+    pClient->toAddon.SignalStatus                   = SignalStatus;
+    pClient->toAddon.GetLiveStreamURL               = GetLiveStreamURL;
+    pClient->toAddon.GetChannelSwitchDelay          = GetChannelSwitchDelay;
+    pClient->toAddon.CanPauseStream                 = CanPauseStream;
+    pClient->toAddon.PauseStream                    = PauseStream;
+    pClient->toAddon.CanSeekStream                  = CanSeekStream;
+    pClient->toAddon.SeekTime                       = SeekTime;
+    pClient->toAddon.SetSpeed                       = SetSpeed;
+
+    pClient->toAddon.OpenRecordedStream             = OpenRecordedStream;
+    pClient->toAddon.CloseRecordedStream            = CloseRecordedStream;
+    pClient->toAddon.ReadRecordedStream             = ReadRecordedStream;
+    pClient->toAddon.SeekRecordedStream             = SeekRecordedStream;
+    pClient->toAddon.PositionRecordedStream         = PositionRecordedStream;
+    pClient->toAddon.LengthRecordedStream           = LengthRecordedStream;
+
+    pClient->toAddon.DemuxReset                     = DemuxReset;
+    pClient->toAddon.DemuxAbort                     = DemuxAbort;
+    pClient->toAddon.DemuxFlush                     = DemuxFlush;
+    pClient->toAddon.DemuxRead                      = DemuxRead;
+
+    pClient->toAddon.GetPlayingTime                 = GetPlayingTime;
+    pClient->toAddon.GetBufferTimeStart             = GetBufferTimeStart;
+    pClient->toAddon.GetBufferTimeEnd               = GetBufferTimeEnd;
+
+    pClient->toAddon.GetBackendHostname             = GetBackendHostname;
+
+    pClient->toAddon.IsTimeshifting                 = IsTimeshifting;
+    pClient->toAddon.IsRealTimeStream               = IsRealTimeStream;
+
+    pClient->toAddon.SetEPGTimeFrame                = SetEPGTimeFrame;
+
+    pClient->toAddon.OnSystemSleep                  = OnSystemSleep;
+    pClient->toAddon.OnSystemWake                   = OnSystemWake;
+    pClient->toAddon.OnPowerSavingActivated         = OnPowerSavingActivated;
+    pClient->toAddon.OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
   };
 };
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
index dbc7217..f3a4ccf 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef TARGET_WINDOWS
-#include <windows.h>
-#else
+#ifndef TARGET_WINDOWS
 #ifndef __cdecl
 #define __cdecl
 #endif
@@ -36,7 +34,6 @@
 
 #include "xbmc_addon_types.h"
 #include "xbmc_epg_types.h"
-#include "xbmc_codec_types.h"
 
 /*! @note Define "USE_DEMUX" at compile time if demuxing in the PVR add-on is used.
  *        Also XBMC's "DVDDemuxPacket.h" file must be in the include path of the add-on,
@@ -74,19 +71,35 @@ struct DemuxPacket;
 #define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL 128
 #define PVR_ADDON_TIMERTYPE_STRING_LENGTH     64
 
+#define XBMC_INVALID_CODEC_ID   0
+#define XBMC_INVALID_CODEC      { XBMC_CODEC_TYPE_UNKNOWN, XBMC_INVALID_CODEC_ID }
+
 /* using the default avformat's MAX_STREAMS value to be safe */
 #define PVR_STREAM_MAX_STREAMS 20
 
-/* current PVR API version */
-#define XBMC_PVR_API_VERSION "5.2.1"
-
-/* min. PVR API version */
-#define XBMC_PVR_MIN_API_VERSION "5.2.1"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+  typedef unsigned int xbmc_codec_id_t;
+
+  typedef enum
+  {
+      XBMC_CODEC_TYPE_UNKNOWN = -1,
+      XBMC_CODEC_TYPE_VIDEO,
+      XBMC_CODEC_TYPE_AUDIO,
+      XBMC_CODEC_TYPE_DATA,
+      XBMC_CODEC_TYPE_SUBTITLE,
+      XBMC_CODEC_TYPE_RDS,
+      XBMC_CODEC_TYPE_NB
+  } xbmc_codec_type_t;
+
+  typedef struct
+  {
+    xbmc_codec_type_t codec_type;
+    xbmc_codec_id_t   codec_id;
+  } xbmc_codec_t;
+
   /*!
    * @brief numeric PVR timer type definitions (PVR_TIMER.iTimerType values)
    */
@@ -122,7 +135,7 @@ extern "C" {
   const unsigned int PVR_TIMER_TYPE_IS_READONLY                       = 0x00000004; /*!< @brief timers of this type must not be edited by Kodi */
   const unsigned int PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES             = 0x00000008; /*!< @brief timers of this type must not be created by Kodi. All other operations are allowed, though */
 
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE           = 0x00000010; /*!< @brief this type supports enabling/disabling of the timer (PVR_TIMER.state SCHEDULED|DISBALED) */
+  const unsigned int PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE           = 0x00000010; /*!< @brief this type supports enabling/disabling of the timer (PVR_TIMER.state SCHEDULED|DISABLED) */
   const unsigned int PVR_TIMER_TYPE_SUPPORTS_CHANNELS                 = 0x00000020; /*!< @brief this type supports channels (PVR_TIMER.iClientChannelUid) */
   const unsigned int PVR_TIMER_TYPE_SUPPORTS_START_TIME               = 0x00000040; /*!< @brief this type supports a recording start time (PVR_TIMER.startTime) */
   const unsigned int PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH          = 0x00000080; /*!< @brief this type supports matching epg episode title using PVR_TIMER.strEpgSearchString */
@@ -166,7 +179,7 @@ extern "C" {
   /*!
    * @brief special PVR_TIMER.iClientChannelUid and PVR_RECORDING.iChannelUid value to indicate that no channel uid is available.
    */
-  const int PVR_CHANNEL_INVALID_UID = -1; /*!< @brief denotes that no channel uid is avaliable. */
+  const int PVR_CHANNEL_INVALID_UID = -1; /*!< @brief denotes that no channel uid is available. */
 
   /*!
    * @brief PVR add-on error codes
@@ -254,7 +267,7 @@ extern "C" {
 
   /*!
    * @brief PVR add-on capabilities. All capabilities are set to "false" as default.
-   * If a capabilty is set to true, then the corresponding methods from xbmc_pvr_dll.h need to be implemented.
+   * If a capability is set to true, then the corresponding methods from xbmc_pvr_dll.h need to be implemented.
    */
   typedef struct PVR_ADDON_CAPABILITIES
   {
@@ -500,7 +513,7 @@ extern "C" {
    */
   typedef enum
   {
-    PVR_EDL_TYPE_CUT      = 0, /*!< @brief cut (completly remove content) */
+    PVR_EDL_TYPE_CUT      = 0, /*!< @brief cut (completely remove content) */
     PVR_EDL_TYPE_MUTE     = 1, /*!< @brief mute audio */
     PVR_EDL_TYPE_SCENE    = 2, /*!< @brief scene markers (chapter seeking) */
     PVR_EDL_TYPE_COMBREAK = 3  /*!< @brief commercial breaks */
@@ -527,87 +540,120 @@ extern "C" {
     } data;
   } ATTRIBUTE_PACKED PVR_MENUHOOK_DATA;
 
+  typedef struct AddonToKodiFuncTable_PVR
+  {
+    KODI_HANDLE kodiInstance;
+
+    void (*TransferEpgEntry)(void* kodiInstance, const ADDON_HANDLE handle, const EPG_TAG *epgentry);
+    void (*TransferChannelEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL *chan);
+    void (*TransferTimerEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_TIMER *timer);
+    void (*TransferRecordingEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_RECORDING *recording);
+    void (*AddMenuHook)(void* kodiInstance, PVR_MENUHOOK *hook);
+    void (*Recording)(void* kodiInstance, const char *Name, const char *FileName, bool On);
+    void (*TriggerChannelUpdate)(void* kodiInstance);
+    void (*TriggerTimerUpdate)(void* kodiInstance);
+    void (*TriggerRecordingUpdate)(void* kodiInstance);
+    void (*TriggerChannelGroupsUpdate)(void* kodiInstance);
+    void (*TriggerEpgUpdate)(void* kodiInstance, unsigned int iChannelUid);
+
+    void (*TransferChannelGroup)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP *group);
+    void (*TransferChannelGroupMember)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP_MEMBER *member);
+
+    void (*FreeDemuxPacket)(void* kodiInstance, DemuxPacket* pPacket);
+    DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
+    
+    void (*ConnectionStateChange)(void* kodiInstance, const char* strConnectionString, PVR_CONNECTION_STATE newState, const char *strMessage);
+    void (*EpgEventStateChange)(void* kodiInstance, EPG_TAG* tag, unsigned int iUniqueChannelId, EPG_EVENT_STATE newState);
+
+    xbmc_codec_t (*GetCodecByName)(const void* kodiInstance, const char* strCodecName);
+  } AddonToKodiFuncTable_PVR;
+
   /*!
    * @brief Structure to transfer the methods from xbmc_pvr_dll.h to XBMC
    */
-  typedef struct PVRClient
+  typedef struct KodiToAddonFuncTable_PVR
   {
-    const char*  (__cdecl* GetPVRAPIVersion)(void);
-    const char*  (__cdecl* GetMininumPVRAPIVersion)(void);
-    const char*  (__cdecl* GetGUIAPIVersion)(void);
-    const char*  (__cdecl* GetMininumGUIAPIVersion)(void);
-    PVR_ERROR    (__cdecl* GetAddonCapabilities)(PVR_ADDON_CAPABILITIES*);
-    PVR_ERROR    (__cdecl* GetStreamProperties)(PVR_STREAM_PROPERTIES*);
-    const char*  (__cdecl* GetBackendName)(void);
-    const char*  (__cdecl* GetBackendVersion)(void);
-    const char*  (__cdecl* GetConnectionString)(void);
-    PVR_ERROR    (__cdecl* GetDriveSpace)(long long*, long long*);
-    PVR_ERROR    (__cdecl* MenuHook)(const PVR_MENUHOOK&, const PVR_MENUHOOK_DATA&);
-    PVR_ERROR    (__cdecl* GetEpg)(ADDON_HANDLE, const PVR_CHANNEL&, time_t, time_t);
-    int          (__cdecl* GetChannelGroupsAmount)(void);
-    PVR_ERROR    (__cdecl* GetChannelGroups)(ADDON_HANDLE, bool);
-    PVR_ERROR    (__cdecl* GetChannelGroupMembers)(ADDON_HANDLE, const PVR_CHANNEL_GROUP&);
-    PVR_ERROR    (__cdecl* OpenDialogChannelScan)(void);
-    int          (__cdecl* GetChannelsAmount)(void);
-    PVR_ERROR    (__cdecl* GetChannels)(ADDON_HANDLE, bool);
-    PVR_ERROR    (__cdecl* DeleteChannel)(const PVR_CHANNEL&);
-    PVR_ERROR    (__cdecl* RenameChannel)(const PVR_CHANNEL&);
-    PVR_ERROR    (__cdecl* MoveChannel)(const PVR_CHANNEL&);
-    PVR_ERROR    (__cdecl* OpenDialogChannelSettings)(const PVR_CHANNEL&);
-    PVR_ERROR    (__cdecl* OpenDialogChannelAdd)(const PVR_CHANNEL&);
-    int          (__cdecl* GetRecordingsAmount)(bool);
-    PVR_ERROR    (__cdecl* GetRecordings)(ADDON_HANDLE, bool);
-    PVR_ERROR    (__cdecl* DeleteRecording)(const PVR_RECORDING&);
-    PVR_ERROR    (__cdecl* UndeleteRecording)(const PVR_RECORDING&);
-    PVR_ERROR    (__cdecl* DeleteAllRecordingsFromTrash)(void);
-    PVR_ERROR    (__cdecl* RenameRecording)(const PVR_RECORDING&);
-    PVR_ERROR    (__cdecl* SetRecordingPlayCount)(const PVR_RECORDING&, int);
-    PVR_ERROR    (__cdecl* SetRecordingLastPlayedPosition)(const PVR_RECORDING&, int);
-    int          (__cdecl* GetRecordingLastPlayedPosition)(const PVR_RECORDING&);
-    PVR_ERROR    (__cdecl* GetRecordingEdl)(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*);
-    PVR_ERROR    (__cdecl* GetTimerTypes)(PVR_TIMER_TYPE[], int*);
-    int          (__cdecl* GetTimersAmount)(void);
-    PVR_ERROR    (__cdecl* GetTimers)(ADDON_HANDLE);
-    PVR_ERROR    (__cdecl* AddTimer)(const PVR_TIMER&);
-    PVR_ERROR    (__cdecl* DeleteTimer)(const PVR_TIMER&, bool);
-    PVR_ERROR    (__cdecl* UpdateTimer)(const PVR_TIMER&);
-    bool         (__cdecl* OpenLiveStream)(const PVR_CHANNEL&);
-    void         (__cdecl* CloseLiveStream)(void);
-    int          (__cdecl* ReadLiveStream)(unsigned char*, unsigned int);
-    long long    (__cdecl* SeekLiveStream)(long long, int);
-    long long    (__cdecl* PositionLiveStream)(void);
-    long long    (__cdecl* LengthLiveStream)(void);
-    bool         (__cdecl* SwitchChannel)(const PVR_CHANNEL&);
-    PVR_ERROR    (__cdecl* SignalStatus)(PVR_SIGNAL_STATUS&);
+    KODI_HANDLE addonInstance;
+
+    PVR_ERROR (__cdecl* GetAddonCapabilities)(PVR_ADDON_CAPABILITIES*);
+    PVR_ERROR (__cdecl* GetStreamProperties)(PVR_STREAM_PROPERTIES*);
+    const char* (__cdecl* GetBackendName)(void);
+    const char* (__cdecl* GetBackendVersion)(void);
+    const char* (__cdecl* GetConnectionString)(void);
+    PVR_ERROR (__cdecl* GetDriveSpace)(long long*, long long*);
+    PVR_ERROR (__cdecl* MenuHook)(const PVR_MENUHOOK&, const PVR_MENUHOOK_DATA&);
+    PVR_ERROR (__cdecl* GetEpg)(ADDON_HANDLE, const PVR_CHANNEL&, time_t, time_t);
+    int (__cdecl* GetChannelGroupsAmount)(void);
+    PVR_ERROR (__cdecl* GetChannelGroups)(ADDON_HANDLE, bool);
+    PVR_ERROR (__cdecl* GetChannelGroupMembers)(ADDON_HANDLE, const PVR_CHANNEL_GROUP&);
+    PVR_ERROR (__cdecl* OpenDialogChannelScan)(void);
+    int (__cdecl* GetChannelsAmount)(void);
+    PVR_ERROR (__cdecl* GetChannels)(ADDON_HANDLE, bool);
+    PVR_ERROR (__cdecl* DeleteChannel)(const PVR_CHANNEL&);
+    PVR_ERROR (__cdecl* RenameChannel)(const PVR_CHANNEL&);
+    PVR_ERROR (__cdecl* MoveChannel)(const PVR_CHANNEL&);
+    PVR_ERROR (__cdecl* OpenDialogChannelSettings)(const PVR_CHANNEL&);
+    PVR_ERROR (__cdecl* OpenDialogChannelAdd)(const PVR_CHANNEL&);
+    int (__cdecl* GetRecordingsAmount)(bool);
+    PVR_ERROR (__cdecl* GetRecordings)(ADDON_HANDLE, bool);
+    PVR_ERROR (__cdecl* DeleteRecording)(const PVR_RECORDING&);
+    PVR_ERROR (__cdecl* UndeleteRecording)(const PVR_RECORDING&);
+    PVR_ERROR (__cdecl* DeleteAllRecordingsFromTrash)(void);
+    PVR_ERROR (__cdecl* RenameRecording)(const PVR_RECORDING&);
+    PVR_ERROR (__cdecl* SetRecordingPlayCount)(const PVR_RECORDING&, int);
+    PVR_ERROR (__cdecl* SetRecordingLastPlayedPosition)(const PVR_RECORDING&, int);
+    int (__cdecl* GetRecordingLastPlayedPosition)(const PVR_RECORDING&);
+    PVR_ERROR (__cdecl* GetRecordingEdl)(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*);
+    PVR_ERROR (__cdecl* GetTimerTypes)(PVR_TIMER_TYPE[], int*);
+    int (__cdecl* GetTimersAmount)(void);
+    PVR_ERROR (__cdecl* GetTimers)(ADDON_HANDLE);
+    PVR_ERROR (__cdecl* AddTimer)(const PVR_TIMER&);
+    PVR_ERROR (__cdecl* DeleteTimer)(const PVR_TIMER&, bool);
+    PVR_ERROR (__cdecl* UpdateTimer)(const PVR_TIMER&);
+    bool (__cdecl* OpenLiveStream)(const PVR_CHANNEL&);
+    void (__cdecl* CloseLiveStream)(void);
+    int (__cdecl* ReadLiveStream)(unsigned char*, unsigned int);
+    long long (__cdecl* SeekLiveStream)(long long, int);
+    long long (__cdecl* PositionLiveStream)(void);
+    long long (__cdecl* LengthLiveStream)(void);
+    bool (__cdecl* SwitchChannel)(const PVR_CHANNEL&);
+    PVR_ERROR (__cdecl* SignalStatus)(PVR_SIGNAL_STATUS&);
     const char*  (__cdecl* GetLiveStreamURL)(const PVR_CHANNEL&);
-    bool         (__cdecl* OpenRecordedStream)(const PVR_RECORDING&);
-    void         (__cdecl* CloseRecordedStream)(void);
-    int          (__cdecl* ReadRecordedStream)(unsigned char*, unsigned int);
-    long long    (__cdecl* SeekRecordedStream)(long long, int);
-    long long    (__cdecl* PositionRecordedStream)(void);
-    long long    (__cdecl* LengthRecordedStream)(void);
-    void         (__cdecl* DemuxReset)(void);
-    void         (__cdecl* DemuxAbort)(void);
-    void         (__cdecl* DemuxFlush)(void);
+    bool (__cdecl* OpenRecordedStream)(const PVR_RECORDING&);
+    void (__cdecl* CloseRecordedStream)(void);
+    int (__cdecl* ReadRecordedStream)(unsigned char*, unsigned int);
+    long long (__cdecl* SeekRecordedStream)(long long, int);
+    long long (__cdecl* PositionRecordedStream)(void);
+    long long (__cdecl* LengthRecordedStream)(void);
+    void (__cdecl* DemuxReset)(void);
+    void (__cdecl* DemuxAbort)(void);
+    void (__cdecl* DemuxFlush)(void);
     DemuxPacket* (__cdecl* DemuxRead)(void);
     unsigned int (__cdecl* GetChannelSwitchDelay)(void);
-    bool         (__cdecl* CanPauseStream)(void);
-    void         (__cdecl* PauseStream)(bool);
-    bool         (__cdecl* CanSeekStream)(void);
-    bool         (__cdecl* SeekTime)(double, bool, double*);
-    void         (__cdecl* SetSpeed)(int);
-    time_t       (__cdecl* GetPlayingTime)(void);
-    time_t       (__cdecl* GetBufferTimeStart)(void);
-    time_t       (__cdecl* GetBufferTimeEnd)(void);
-    const char*  (__cdecl* GetBackendHostname)(void);
-    bool         (__cdecl* IsTimeshifting)(void);
-    bool         (__cdecl* IsRealTimeStream)(void);
-    PVR_ERROR    (__cdecl* SetEPGTimeFrame)(int);
-    void         (__cdecl* OnSystemSleep)(void);
-    void         (__cdecl* OnSystemWake)(void);
-    void         (__cdecl* OnPowerSavingActivated)(void);
-    void         (__cdecl* OnPowerSavingDeactivated)(void);
-  } PVRClient;
+    bool (__cdecl* CanPauseStream)(void);
+    void (__cdecl* PauseStream)(bool);
+    bool (__cdecl* CanSeekStream)(void);
+    bool (__cdecl* SeekTime)(double, bool, double*);
+    void (__cdecl* SetSpeed)(int);
+    time_t (__cdecl* GetPlayingTime)(void);
+    time_t (__cdecl* GetBufferTimeStart)(void);
+    time_t (__cdecl* GetBufferTimeEnd)(void);
+    const char* (__cdecl* GetBackendHostname)(void);
+    bool (__cdecl* IsTimeshifting)(void);
+    bool (__cdecl* IsRealTimeStream)(void);
+    PVR_ERROR (__cdecl* SetEPGTimeFrame)(int);
+    void (__cdecl* OnSystemSleep)(void);
+    void (__cdecl* OnSystemWake)(void);
+    void (__cdecl* OnPowerSavingActivated)(void);
+    void (__cdecl* OnPowerSavingDeactivated)(void);
+  } KodiToAddonFuncTable_PVR;
+
+  typedef struct AddonInstance_PVR
+  {
+    PVR_PROPERTIES props;
+    AddonToKodiFuncTable_PVR toKodi;
+    KodiToAddonFuncTable_PVR toAddon;
+  } AddonInstance_PVR;
 
 #ifdef __cplusplus
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
deleted file mode 100644
index 8652a0a..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "xbmc_addon_dll.h"
-#include "xbmc_scr_types.h"
-
-extern "C"
-{
-
-  // Functions that your visualisation must implement
-  void Start();
-  void Render();
-  void GetInfo(SCR_INFO* pInfo);
-
-  // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(struct ScreenSaver* pScr)
-  {
-    pScr->Start = Start;
-    pScr->Render = Render;
-    pScr->GetInfo = GetInfo;
-  };
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h
deleted file mode 100644
index 5785b25..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-extern "C"
-{
-  struct SCR_INFO
-  {
-    int dummy;
-  };
-
-  struct SCR_PROPS
-  {
-    void *device;
-    int x;
-    int y;
-    int width;
-    int height;
-    float pixelRatio;
-    const char *name;
-    const char *presets;
-    const char *profile;
-  };
-
-  struct ScreenSaver
-  {
-    void (__cdecl* Start) ();
-    void (__cdecl* Render) ();
-    void (__cdecl* GetInfo)(SCR_INFO *info);
-  };
-}
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_stream_utils.hpp b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_stream_utils.hpp
deleted file mode 100644
index 099776a..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_stream_utils.hpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "xbmc_pvr_types.h"
-#include <algorithm>
-#include <map>
-
-namespace ADDON
-{
-  /**
-   * Represents a single stream. It extends the PODS to provide some operators 
-   * overloads.
-   */
-  class XbmcPvrStream : public PVR_STREAM_PROPERTIES::PVR_STREAM
-  {
-  public:
-    XbmcPvrStream()
-    {
-      Clear();
-    }
-    
-    XbmcPvrStream(const XbmcPvrStream &other)
-    {
-      memcpy(this, &other, sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM));
-    }
-    
-    XbmcPvrStream& operator=(const XbmcPvrStream &other)
-    {
-      memcpy(this, &other, sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM));
-      return *this;
-    }
-    
-    /**
-     * Compares this stream based on another stream
-     * @param other
-     * @return
-     */
-    inline bool operator==(const XbmcPvrStream &other) const
-    {
-      return iPhysicalId == other.iPhysicalId && iCodecId == other.iCodecId;
-    }
-
-    /**
-     * Compares this stream with another one so that video streams are sorted
-     * before any other streams and the others are sorted by the physical ID
-     * @param other
-     * @return
-     */
-    bool operator<(const XbmcPvrStream &other) const
-    {
-      if (iCodecType == XBMC_CODEC_TYPE_VIDEO)
-        return true;
-      else if (other.iCodecType != XBMC_CODEC_TYPE_VIDEO)
-        return iPhysicalId < other.iPhysicalId;
-      else
-        return false;
-    }
-    
-    /**
-     * Clears the stream
-     */
-    void Clear()
-    {
-      memset(this, 0, sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM));
-      iCodecId = XBMC_INVALID_CODEC_ID;
-      iCodecType = XBMC_CODEC_TYPE_UNKNOWN;
-    }
-    
-    /**
-     * Checks whether the stream has been cleared
-     * @return 
-     */
-    inline bool IsCleared() const
-    {
-      return iCodecId   == XBMC_INVALID_CODEC_ID &&
-             iCodecType == XBMC_CODEC_TYPE_UNKNOWN;
-    }
-  };
-  
-  class XbmcStreamProperties
-  {
-  public:
-    typedef std::vector<XbmcPvrStream> stream_vector;
-    
-    XbmcStreamProperties(void)
-    {
-      // make sure the vector won't have to resize itself later
-      m_streamVector = new stream_vector();
-      m_streamVector->reserve(PVR_STREAM_MAX_STREAMS);
-    }
-
-    virtual ~XbmcStreamProperties(void)
-    {
-      delete m_streamVector;
-    }
-    
-    /**
-     * Resets the streams
-     */
-    void Clear(void)
-    {
-      m_streamVector->clear();
-      m_streamIndex.clear();
-    }
-
-    /**
-     * Returns the index of the stream with the specified physical ID, or -1 if 
-     * there no stream is found. This method is called very often which is why 
-     * we keep a separate map for this.
-     * @param iPhysicalId
-     * @return
-     */
-    int GetStreamId(unsigned int iPhysicalId) const
-    {
-      std::map<unsigned int, int>::const_iterator it = m_streamIndex.find(iPhysicalId);
-      if (it != m_streamIndex.end())
-        return it->second;
-
-      return -1;
-    }
-    
-    /**
-     * Returns the stream with the specified physical ID, or null if no such 
-     * stream exists
-     * @param iPhysicalId
-     * @return
-     */
-    XbmcPvrStream* GetStreamById(unsigned int iPhysicalId) const
-    {
-      int position = GetStreamId(iPhysicalId);
-      return position != -1 ? &m_streamVector->at(position) : NULL;
-    }
-
-    /**
-     * Populates the specified stream with the stream having the specified 
-     * physical ID. If the stream is not found only target stream's physical ID 
-     * will be populated.
-     * @param iPhysicalId
-     * @param stream
-     */
-    void GetStreamData(unsigned int iPhysicalId, XbmcPvrStream* stream)
-    {
-      XbmcPvrStream *foundStream = GetStreamById(iPhysicalId);
-      if (foundStream)
-        *stream = *foundStream;
-      else
-      {
-        stream->iIdentifier = -1;
-        stream->iPhysicalId = iPhysicalId;
-      }
-    }
-
-    /**
-     * Populates props with the current streams and returns whether there are 
-     * any streams at the moment or not.
-     * @param props
-     * @return
-     */
-    bool GetProperties(PVR_STREAM_PROPERTIES* props)
-    {
-      unsigned int i = 0;
-      for (stream_vector::const_iterator it = m_streamVector->begin(); 
-           it != m_streamVector->end(); ++it, ++i)
-      {
-        memcpy(&props->stream[i], &(*it), sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM));
-      }
-      
-      props->iStreamCount = m_streamVector->size();
-      return (props->iStreamCount > 0);
-    }
-
-    /**
-     * Merges new streams into the current list of streams. Identical streams 
-     * will retain their respective indexes and new streams will replace unused 
-     * indexes or be appended.
-     * @param newStreams
-     */
-    void UpdateStreams(stream_vector &newStreams)
-    {
-      // sort the new streams
-      std::sort(newStreams.begin(), newStreams.end());
-      
-      // ensure we never have more than PVR_STREAMS_MAX_STREAMS streams
-      if (newStreams.size() > PVR_STREAM_MAX_STREAMS)
-      {
-        while (newStreams.size() > PVR_STREAM_MAX_STREAMS)
-          newStreams.pop_back();
-        
-        XBMC->Log(LOG_ERROR, "%s - max amount of streams reached", __FUNCTION__);
-      }
-      
-      stream_vector::iterator newStreamPosition;
-      for (stream_vector::iterator it = m_streamVector->begin(); it != m_streamVector->end(); ++it)
-      {
-        newStreamPosition = std::find(newStreams.begin(), newStreams.end(), *it);
-
-        // if the current stream no longer exists we clear it, otherwise we 
-        // copy it and remove it from newStreams
-        if (newStreamPosition == newStreams.end())
-          it->Clear();
-        else
-        {
-          *it = *newStreamPosition;
-          newStreams.erase(newStreamPosition);
-        }
-      }
-
-      // replace cleared streams with new streams
-      for (stream_vector::iterator it = m_streamVector->begin();
-           it != m_streamVector->end() && !newStreams.empty(); ++it)
-      {
-        if (it->IsCleared())
-        {
-          *it = newStreams.front();
-          newStreams.erase(newStreams.begin());
-        }
-      }
-
-      // append any remaining new streams
-      m_streamVector->insert(m_streamVector->end(), newStreams.begin(), newStreams.end());
-      
-      // remove trailing cleared streams
-      while (m_streamVector->back().IsCleared())
-        m_streamVector->pop_back();
-      
-      // update the index
-      UpdateIndex();
-    }
-
-  private:
-    stream_vector               *m_streamVector;
-    std::map<unsigned int, int> m_streamIndex;
-    
-    /**
-     * Updates the stream index
-     */
-    void UpdateIndex()
-    {
-      m_streamIndex.clear();
-      
-      int i = 0;
-      for (stream_vector::const_iterator it = m_streamVector->begin(); it != m_streamVector->end(); ++it, ++i)
-        m_streamIndex[it->iPhysicalId] = i;
-    }
-  };
-}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
index 50452c2..7252721 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
@@ -27,6 +27,7 @@ extern "C"
 {
   // Functions that your visualisation must implement
   void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName);
+  void Stop();
   void AudioData(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength);
   void Render();
   bool OnAction(long action, const void *param);
@@ -37,17 +38,20 @@ extern "C"
   bool IsLocked();
 
   // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(struct Visualisation* pVisz)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pVisz->Start = Start;
-    pVisz->AudioData = AudioData;
-    pVisz->Render = Render;
-    pVisz->OnAction = OnAction;
-    pVisz->GetInfo = GetInfo;
-    pVisz->GetPresets = GetPresets;
-    pVisz->GetPreset = GetPreset;
-    pVisz->GetSubModules = GetSubModules;
-    pVisz->IsLocked = IsLocked;
+    AddonInstance_Visualization* pVisz = static_cast<AddonInstance_Visualization*>(ptr);
+
+    pVisz->toAddon.Start = Start;
+    pVisz->toAddon.Stop = Stop;
+    pVisz->toAddon.AudioData = AudioData;
+    pVisz->toAddon.Render = Render;
+    pVisz->toAddon.OnAction = OnAction;
+    pVisz->toAddon.GetInfo = GetInfo;
+    pVisz->toAddon.GetPresets = GetPresets;
+    pVisz->toAddon.GetPreset = GetPreset;
+    pVisz->toAddon.GetSubModules = GetSubModules;
+    pVisz->toAddon.IsLocked = IsLocked;
   };
 };
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
index 708ffef..be11c89 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
@@ -24,6 +24,7 @@
   Common data structures shared between Kodi and Kodi's visualisations
  */
 
+#include "xbmc_addon_types.h"
 #include <cstddef>
 
 extern "C"
@@ -34,20 +35,6 @@ extern "C"
     int iSyncDelay;
   };
 
-  struct VIS_PROPS
-  {
-    void *device;
-    int x;
-    int y;
-    int width;
-    int height;
-    float pixelRatio;
-    const char *name;
-    const char *presets;
-    const char *profile;
-    const char *submodule;
-  };
-
   enum VIS_ACTION
   { 
     VIS_ACTION_NONE = 0,
@@ -93,9 +80,29 @@ extern "C"
     int        reserved4;
   };
 
-  struct Visualisation
+  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;
+    const char *submodule;
+  } AddonProps_Visualization;
+
+  typedef struct AddonToKodiFuncTable_Visualization /* internal */
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_Visualization;
+
+  typedef struct KodiToAddonFuncTable_Visualization /* internal */
   {
     void (__cdecl* Start)(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName);
+    void (__cdecl* Stop)();
     void (__cdecl* AudioData)(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength);
     void (__cdecl* Render) ();
     void (__cdecl* GetInfo)(VIS_INFO *info);
@@ -105,6 +112,13 @@ extern "C"
     unsigned int (__cdecl *GetPreset)();
     unsigned int (__cdecl *GetSubModules)(char ***modules);
     bool (__cdecl* IsLocked)();
-  };
+  } KodiToAddonFuncTable_Visualization;
+
+  typedef struct AddonInstance_Visualization /* internal */
+  {
+    AddonProps_Visualization props;
+    AddonToKodiFuncTable_Visualization toKodi;
+    KodiToAddonFuncTable_Visualization toAddon;
+  } AddonInstance_Visualization;
 }