diff -Nru kodi-game-libretro-1.1.0/appveyor.yml kodi-game-libretro-1.1.1/appveyor.yml
--- kodi-game-libretro-1.1.0/appveyor.yml	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/appveyor.yml	2018-05-22 19:00:00.000000000 +0000
@@ -17,7 +17,7 @@
 
 build_script:
   - cd ..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - cd %app_id%
   - mkdir build
   - cd build
diff -Nru kodi-game-libretro-1.1.0/CMakeLists.txt kodi-game-libretro-1.1.1/CMakeLists.txt
--- kodi-game-libretro-1.1.0/CMakeLists.txt	2019-01-30 15:36:55.000000000 +0000
+++ kodi-game-libretro-1.1.1/CMakeLists.txt	2018-05-22 19:00:00.000000000 +0000
@@ -1,18 +1,18 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 project(game.libretro)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
-find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
+find_package(TinyXML REQUIRED)
 
 include_directories(${KODI_INCLUDE_DIR}
-                    ${kodiplatform_INCLUDE_DIRS}
                     ${p8-platform_INCLUDE_DIRS}
-                    ${PROJECT_SOURCE_DIR}/src)
+                    ${PROJECT_SOURCE_DIR}/src
+                    ${TINYXML_INCLUDE_DIRS})
 
-list(APPEND DEPLIBS ${kodiplatform_LIBRARIES} ${p8-platform_LIBRARIES})
+list(APPEND DEPLIBS ${p8-platform_LIBRARIES} ${TINYXML_LIBRARIES})
 
 set(LIBRETRO_SOURCES src/client.cpp
                      src/audio/AudioStream.cpp
diff -Nru kodi-game-libretro-1.1.0/debian/changelog kodi-game-libretro-1.1.1/debian/changelog
--- kodi-game-libretro-1.1.0/debian/changelog	2019-01-31 11:04:22.000000000 +0000
+++ kodi-game-libretro-1.1.1/debian/changelog	2018-05-22 19:00:00.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-game-libretro (1.1.0-2~bionic) bionic; urgency=low
+kodi-game-libretro (1.1.1-1~bionic) bionic; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-game-libretro-1.1.0/debian/control kodi-game-libretro-1.1.1/debian/control
--- kodi-game-libretro-1.1.0/debian/control	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/debian/control	2018-05-22 19:00:00.000000000 +0000
@@ -1,8 +1,8 @@
 Source: kodi-game-libretro
 Priority: extra
 Maintainer: Garrett Brown <themagnificentmrb@gmail.com>
-Build-Depends: debhelper (>= 9.0.0), cmake, libkodiplatform-dev (>= 17.0.0),
-               kodi-addon-dev
+Build-Depends: debhelper (>= 9.0.0), cmake,
+               kodi-addon-dev, libp8-platform-dev, libtinyxml-dev
 Standards-Version: 3.9.4
 Section: libs
 
diff -Nru kodi-game-libretro-1.1.0/FindTinyXML.cmake kodi-game-libretro-1.1.1/FindTinyXML.cmake
--- kodi-game-libretro-1.1.0/FindTinyXML.cmake	1970-01-01 00:00:00.000000000 +0000
+++ kodi-game-libretro-1.1.1/FindTinyXML.cmake	2018-05-22 19:00:00.000000000 +0000
@@ -0,0 +1,35 @@
+# FindTinyXML
+# -----------
+# Finds the TinyXML library
+#
+# This will define the following variables::
+#
+# TINYXML_FOUND - system has TinyXML
+# TINYXML_INCLUDE_DIRS - the TinyXML include directory
+# TINYXML_LIBRARIES - the TinyXML libraries
+#
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_TINYXML tinyxml QUIET)
+endif()
+
+find_path(TINYXML_INCLUDE_DIR tinyxml.h
+                              PATH_SUFFIXES tinyxml
+                              PATHS ${PC_TINYXML_INCLUDEDIR})
+
+find_library(TINYXML_LIBRARY NAMES tinyxml tinyxmlSTL
+                             PATH_SUFFIXES tinyxml
+                             PATHS ${PC_TINYXML_LIBDIR})
+set(TINYXML_VERSION ${PC_TINYXML_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TinyXML
+                                  REQUIRED_VARS TINYXML_LIBRARY TINYXML_INCLUDE_DIR
+                                  VERSION_VAR TINYXML_VERSION)
+
+if(TINYXML_FOUND)
+  set(TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
+  set(TINYXML_LIBRARIES ${TINYXML_LIBRARY})
+endif()
+
+mark_as_advanced(TINYXML_INCLUDE_DIR TINYXML_LIBRARY)
diff -Nru kodi-game-libretro-1.1.0/game.libretro/addon.xml.in kodi-game-libretro-1.1.1/game.libretro/addon.xml.in
--- kodi-game-libretro-1.1.0/game.libretro/addon.xml.in	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/game.libretro/addon.xml.in	2018-05-22 19:00:00.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="game.libretro"
        name="Libretro Compatibility"
-       version="1.1.0"
-       provider-name="Team-Kodi">
+       version="1.1.1"
+       provider-name="Team Kodi">
   <backwards-compatibility abi="1.0.0"/>
   <requires>@ADDON_DEPENDS@</requires>
   <extension point="kodi.gameclient"
diff -Nru kodi-game-libretro-1.1.0/Jenkinsfile kodi-game-libretro-1.1.1/Jenkinsfile
--- kodi-game-libretro-1.1.0/Jenkinsfile	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/Jenkinsfile	2018-05-22 19:00:00.000000000 +0000
@@ -1 +1 @@
-buildPlugin()
+buildPlugin(version: "Leia")
diff -Nru kodi-game-libretro-1.1.0/Readme.md kodi-game-libretro-1.1.1/Readme.md
--- kodi-game-libretro-1.1.0/Readme.md	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/Readme.md	2018-05-22 19:00:00.000000000 +0000
@@ -2,7 +2,7 @@
 
 This add-on provides a wrapper that allows Libretro cores to be loaded as game add-ons. Libretro cores are shared libraries that use the Libretro API, so the wrapper is responsible for translating function calls between the Libretro API and the Game API.
 
-This add-on depends on the Game API, which is not part of Kodi yet. This most recent version of the Game API currently exists on garbear's `retroplayer-15.2` branch.
+This add-on depends on the Game API, which was added in Kodi 18 (Leia).
 
 [![Build Status](https://travis-ci.org/kodi-game/game.libretro.svg?branch=master)](https://travis-ci.org/kodi-game/game.libretro)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/kodi-game/game.libretro?svg=true)](https://ci.appveyor.com/project/kodi-game/game-libretro)
diff -Nru kodi-game-libretro-1.1.0/src/input/ButtonMapper.cpp kodi-game-libretro-1.1.1/src/input/ButtonMapper.cpp
--- kodi-game-libretro-1.1.0/src/input/ButtonMapper.cpp	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/src/input/ButtonMapper.cpp	2018-05-22 19:00:00.000000000 +0000
@@ -29,7 +29,7 @@
 #include "libretro/libretro.h"
 #include "log/Log.h"
 
-#include "tinyxml.h"
+#include <tinyxml.h>
 
 #include <algorithm>
 #include <sstream>
diff -Nru kodi-game-libretro-1.1.0/src/input/ControllerTopology.cpp kodi-game-libretro-1.1.1/src/input/ControllerTopology.cpp
--- kodi-game-libretro-1.1.0/src/input/ControllerTopology.cpp	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/src/input/ControllerTopology.cpp	2018-05-22 19:00:00.000000000 +0000
@@ -25,7 +25,7 @@
 #include "log/Log.h"
 
 #include "kodi_game_types.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
 
 #include <algorithm>
 #include <sstream>
diff -Nru kodi-game-libretro-1.1.0/src/input/LibretroDevice.cpp kodi-game-libretro-1.1.1/src/input/LibretroDevice.cpp
--- kodi-game-libretro-1.1.0/src/input/LibretroDevice.cpp	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/src/input/LibretroDevice.cpp	2018-05-22 19:00:00.000000000 +0000
@@ -26,7 +26,7 @@
 #include "libretro/libretro.h"
 #include "log/Log.h"
 
-#include "tinyxml.h"
+#include <tinyxml.h>
 
 #include <sstream>
 
diff -Nru kodi-game-libretro-1.1.0/.travis.yml kodi-game-libretro-1.1.1/.travis.yml
--- kodi-game-libretro-1.1.0/.travis.yml	2018-11-10 11:53:13.000000000 +0000
+++ kodi-game-libretro-1.1.1/.travis.yml	2018-05-22 19:00:00.000000000 +0000
@@ -32,7 +32,7 @@
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - cd ${app_id} && mkdir build && cd build
   - mkdir -p definition/${app_id}
   - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt