5 files changed, 2 insertions, 16 deletions

diff --git a/project/cmake/treedata/common/addons.txt b/project/cmake/treedata/common/addons.txt
index f29e086..76410b7 100644
--- a/project/cmake/treedata/common/addons.txt
+++ b/project/cmake/treedata/common/addons.txt
@@ -1,7 +1,8 @@
 lib/addons/library.kodi.adsp        KODI_adsp
 lib/addons/library.kodi.audioengine KODI_audioengine
-lib/addons/library.kodi.game        KODI_game
 lib/addons/library.kodi.guilib      KODI_guilib
+lib/addons/library.kodi.inputstream KODI_inputstream
 lib/addons/library.kodi.peripheral  KODI_peripheral
 lib/addons/library.xbmc.addon       XBMC_addon
 lib/addons/library.xbmc.codec       XBMC_codec
+lib/addons/library.xbmc.pvr         XBMC_pvr
diff --git a/project/cmake/treedata/common/cores.txt b/project/cmake/treedata/common/cores.txt
index 8d79dd1..d23939d 100644
--- a/project/cmake/treedata/common/cores.txt
+++ b/project/cmake/treedata/common/cores.txt
@@ -6,4 +6,3 @@ xbmc/cores/DllLoader/exports/util      cores/dll-loader/exports/util
 xbmc/cores/ExternalPlayer              cores/externalplayer
 xbmc/cores/paplayer                    cores/paplayer
 xbmc/cores/playercorefactory           cores/playercorefactory
-xbmc/cores/RetroPlayer                 cores/RetroPlayer
diff --git a/project/cmake/treedata/common/games.txt b/project/cmake/treedata/common/games.txt
index 03d42bc..b622f5a 100644
--- a/project/cmake/treedata/common/games.txt
+++ b/project/cmake/treedata/common/games.txt
@@ -1,12 +1,4 @@
-xbmc/games                         games
-xbmc/games/addons                  games/addons
-xbmc/games/addons/playback         games/addons/playback
-xbmc/games/addons/savestates       games/addons/savestates
 xbmc/games/controllers             games/controllers
 xbmc/games/controllers/dialogs     games/controllers/dialogs
 xbmc/games/controllers/guicontrols games/controllers/guicontrols
 xbmc/games/controllers/windows     games/controllers/windows
-xbmc/games/dialogs                 games/dialogs
-xbmc/games/ports                   games/ports
-xbmc/games/tags                    games/tags
-xbmc/games/windows                 games/windows
diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt
index af91611..e2bca7e 100644
--- a/project/cmake/treedata/common/subdirs.txt
+++ b/project/cmake/treedata/common/subdirs.txt
@@ -5,7 +5,6 @@ xbmc/addons/binary/interfaces/api1/Addon        api1AddonCallbacks_Addon
 xbmc/addons/binary/interfaces/api1/AudioDSP     api1AddonCallbacks_AudioDSP
 xbmc/addons/binary/interfaces/api1/AudioEngine  api1AddonCallbacks_AudioEngine
 xbmc/addons/binary/interfaces/api1/Codec        api1AddonCallbacks_Codec
-xbmc/addons/binary/interfaces/api1/Game         api1AddonCallbacks_Game
 xbmc/addons/binary/interfaces/api1/GUI          api1AddonCallbacks_GUI
 xbmc/addons/binary/interfaces/api1/InputStream  api1AddonCallbacks_InputStream
 xbmc/addons/binary/interfaces/api1/Peripheral   api1AddonCallbacks_Peripheral
@@ -19,10 +18,6 @@ xbmc/input                                      input
 xbmc/input/joysticks                            input/joysticks
 xbmc/input/joysticks/dialogs                    input/joysticks/dialogs
 xbmc/input/joysticks/generic                    input/joysticks/generic
-xbmc/input/keyboard                             input/keyboard
-xbmc/input/keyboard/generic                     input/keyboard/generic
-xbmc/input/mouse                                input/mouse
-xbmc/input/mouse/generic                        input/mouse/generic
 xbmc/listproviders                              listproviders
 xbmc/media                                      media
 xbmc/messaging                                  messaging
diff --git a/project/cmake/treedata/optional/common/mir.txt b/project/cmake/treedata/optional/common/mir.txt
deleted file mode 100644
index d681e8b..0000000
--- a/project/cmake/treedata/optional/common/mir.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/windowing/mir windowing/mir # MIR