Revert "[addons] move ./xbmc/addons/binary/interfaces one down and re…

…move binary folder"
Jalle19 · Sep 6, 2016 · 0ae4705 · 0ae4705
1 parent 07b0f62
commit 0ae4705
Show file tree

Hide file tree

Showing 56 changed files with 70 additions and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -398,7 +398,7 @@ lib/cpluff/stamp-h1
 
 # /xbmc/addons/
 /xbmc/addons/Makefile
-/xbmc/addons/interfaces/Makefile
+/xbmc/addons/binary/interfaces/Makefile
 
 # /xbmc/platform/android
 /xbmc/platform/android/Makefile

diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
diff --git a/Makefile.in b/Makefile.in
@@ -25,15 +25,15 @@ VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
 
 DIRECTORY_ARCHIVES=$(VideoPlayer_ARCHIVES) \
                    xbmc/addons/addons.a \
-                   xbmc/addons/interfaces/addon-interfaces.a \
-                   xbmc/addons/interfaces/api1/Addon/addon-callbacks-addon.a \
-                   xbmc/addons/interfaces/api1/AudioDSP/addon-callbacks-audiodsp.a \
-                   xbmc/addons/interfaces/api1/AudioEngine/addon-callbacks-audioengine.a \
-                   xbmc/addons/interfaces/api1/Codec/addon-callbacks-codec.a \
-                   xbmc/addons/interfaces/api1/GUI/addon-callbacks-gui.a \
-                   xbmc/addons/interfaces/api1/InputStream/addon-callbacks-inputstream.a \
-                   xbmc/addons/interfaces/api1/Peripheral/addon-callbacks-peripheral.a \
-                   xbmc/addons/interfaces/api1/PVR/addon-callbacks-pvr.a \
+                   xbmc/addons/binary/interfaces/addon-interfaces.a \
+                   xbmc/addons/binary/interfaces/api1/Addon/addon-callbacks-addon.a \
+                   xbmc/addons/binary/interfaces/api1/AudioDSP/addon-callbacks-audiodsp.a \
+                   xbmc/addons/binary/interfaces/api1/AudioEngine/addon-callbacks-audioengine.a \
+                   xbmc/addons/binary/interfaces/api1/Codec/addon-callbacks-codec.a \
+                   xbmc/addons/binary/interfaces/api1/GUI/addon-callbacks-gui.a \
+                   xbmc/addons/binary/interfaces/api1/InputStream/addon-callbacks-inputstream.a \
+                   xbmc/addons/binary/interfaces/api1/Peripheral/addon-callbacks-peripheral.a \
+                   xbmc/addons/binary/interfaces/api1/PVR/addon-callbacks-pvr.a \
                    xbmc/contrib/kissfft/kissfft.a \
                    xbmc/cores/AudioEngine/audioengine.a \
                    xbmc/cores/DllLoader/dllloader.a \

diff --git a/configure.ac b/configure.ac
@@ -2132,7 +2132,7 @@ OUTPUT_FILES="Makefile \
     addons/skin.estuary/media/Makefile \
     addons/skin.estouchy/media/Makefile \
     xbmc/Makefile \
-    xbmc/addons/interfaces/Makefile \
+    xbmc/addons/binary/interfaces/Makefile \
     xbmc/cdrip/Makefile \
     xbmc/cores/Makefile \
     xbmc/cores/VideoPlayer/VideoRenderers/Makefile \

diff --git a/lib/addons/library.kodi.adsp/libKODI_adsp.cpp b/lib/addons/library.kodi.adsp/libKODI_adsp.cpp
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <string>
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h"
-#include "addons/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h"
+#include "addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp b/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string>
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h"
-#include "addons/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h"
+#include "addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/lib/addons/library.kodi.guilib/libKODI_guilib.cpp b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include "addons/interfaces/api1/GUI/AddonCallbacksGUI.h"
+#include "addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/lib/addons/library.kodi.inputstream/libKODI_inputstream.cpp b/lib/addons/library.kodi.inputstream/libKODI_inputstream.cpp
@@ -24,7 +24,7 @@
 #include <stdarg.h>
 #include <string>
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h"
-#include "addons/interfaces/api1/InputStream/AddonCallbacksInputStream.h"
+#include "addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/lib/addons/library.kodi.peripheral/libKODI_peripheral.cpp b/lib/addons/library.kodi.peripheral/libKODI_peripheral.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h"
 
 #include <stdio.h>

diff --git a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h"
-#include "addons/interfaces/api1/Addon/AddonCallbacksAddon.h"
+#include "addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/lib/addons/library.xbmc.codec/libXBMC_codec.cpp b/lib/addons/library.xbmc.codec/libXBMC_codec.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string>
-#include "addons/interfaces/api1/Codec/AddonCallbacksCodec.h"
+#include "addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h"
 
 #ifdef _WIN32

diff --git a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string>
-#include "addons/interfaces/api1/PVR/AddonCallbacksPVR.h"
+#include "addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h"
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
 

diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt
@@ -1,14 +1,14 @@
 xbmc                                            xbmc
 xbmc/addons                                     addons
-xbmc/addons/interfaces                          addonsBinaryInterfaces
-xbmc/addons/interfaces/api1/Addon               api1AddonCallbacks_Addon
-xbmc/addons/interfaces/api1/AudioDSP            api1AddonCallbacks_AudioDSP
-xbmc/addons/interfaces/api1/AudioEngine         api1AddonCallbacks_AudioEngine
-xbmc/addons/interfaces/api1/Codec               api1AddonCallbacks_Codec
-xbmc/addons/interfaces/api1/GUI                 api1AddonCallbacks_GUI
-xbmc/addons/interfaces/api1/InputStream         api1AddonCallbacks_InputStream
-xbmc/addons/interfaces/api1/Peripheral          api1AddonCallbacks_Peripheral
-xbmc/addons/interfaces/api1/PVR                 api1AddonCallbacks_PVR
+xbmc/addons/binary/interfaces                   addonsBinaryInterfaces
+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/GUI          api1AddonCallbacks_GUI
+xbmc/addons/binary/interfaces/api1/InputStream  api1AddonCallbacks_InputStream
+xbmc/addons/binary/interfaces/api1/Peripheral   api1AddonCallbacks_Peripheral
+xbmc/addons/binary/interfaces/api1/PVR          api1AddonCallbacks_PVR
 xbmc/commons                                    commons
 xbmc/cdrip                                      cdrip
 xbmc/dbwrappers                                 dbwrappers

diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
@@ -26,7 +26,7 @@
 #include "DllAddon.h"
 #include "AddonManager.h"
 #include "AddonStatusHandler.h"
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogOK.h"
 #include "utils/URIUtils.h"

diff --git a/xbmc/addons/interfaces/AddonInterfaces.cpp → ...ons/binary/interfaces/AddonInterfaces.cpp b/xbmc/addons/interfaces/AddonInterfaces.cpp → ...ons/binary/interfaces/AddonInterfaces.cpp
@@ -23,15 +23,15 @@
 
 #include "addons/Addon.h"
 
-#include "addons/interfaces/api1/Addon/AddonCallbacksAddon.h"
-#include "addons/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h"
-#include "addons/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h"
-#include "addons/interfaces/api1/Codec/AddonCallbacksCodec.h"
-#include "addons/interfaces/api1/GUI/AddonCallbacksGUI.h"
-#include "addons/interfaces/api1/GUI/AddonGUIWindow.h"
-#include "addons/interfaces/api1/InputStream/AddonCallbacksInputStream.h"
-#include "addons/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h"
-#include "addons/interfaces/api1/PVR/AddonCallbacksPVR.h"
+#include "addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h"
+#include "addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h"
+#include "addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h"
+#include "addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h"
+#include "addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h"
+#include "addons/binary/interfaces/api1/GUI/AddonGUIWindow.h"
+#include "addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h"
+#include "addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h"
+#include "addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h"
 #include "filesystem/SpecialProtocol.h"
 #include "messaging/ApplicationMessenger.h"
 #include "utils/log.h"

diff --git a/xbmc/addons/interfaces/AddonInterfaces.h → ...ddons/binary/interfaces/AddonInterfaces.h b/xbmc/addons/interfaces/AddonInterfaces.h → ...ddons/binary/interfaces/AddonInterfaces.h
diff --git a/xbmc/addons/interfaces/CMakeLists.txt → xbmc/addons/binary/interfaces/CMakeLists.txt b/xbmc/addons/interfaces/CMakeLists.txt → xbmc/addons/binary/interfaces/CMakeLists.txt
diff --git a/xbmc/addons/interfaces/IAddonInterface.h → ...ddons/binary/interfaces/IAddonInterface.h b/xbmc/addons/interfaces/IAddonInterface.h → ...ddons/binary/interfaces/IAddonInterface.h
diff --git a/xbmc/addons/interfaces/Makefile.in → xbmc/addons/binary/interfaces/Makefile.in b/xbmc/addons/interfaces/Makefile.in → xbmc/addons/binary/interfaces/Makefile.in
diff --git a/...rfaces/api1/Addon/AddonCallbacksAddon.cpp → ...rfaces/api1/Addon/AddonCallbacksAddon.cpp b/...rfaces/api1/Addon/AddonCallbacksAddon.cpp → ...rfaces/api1/Addon/AddonCallbacksAddon.cpp
diff --git a/...terfaces/api1/Addon/AddonCallbacksAddon.h → ...terfaces/api1/Addon/AddonCallbacksAddon.h b/...terfaces/api1/Addon/AddonCallbacksAddon.h → ...terfaces/api1/Addon/AddonCallbacksAddon.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h"
 
 struct VFSDirEntry;

diff --git a/...dons/interfaces/api1/Addon/CMakeLists.txt → ...nary/interfaces/api1/Addon/CMakeLists.txt b/...dons/interfaces/api1/Addon/CMakeLists.txt → ...nary/interfaces/api1/Addon/CMakeLists.txt
diff --git a/xbmc/addons/interfaces/api1/Addon/Makefile → ...ons/binary/interfaces/api1/Addon/Makefile b/xbmc/addons/interfaces/api1/Addon/Makefile → ...ons/binary/interfaces/api1/Addon/Makefile
diff --git a/.../api1/AudioDSP/AddonCallbacksAudioDSP.cpp → .../api1/AudioDSP/AddonCallbacksAudioDSP.cpp b/.../api1/AudioDSP/AddonCallbacksAudioDSP.cpp → .../api1/AudioDSP/AddonCallbacksAudioDSP.cpp
diff --git a/...es/api1/AudioDSP/AddonCallbacksAudioDSP.h → ...es/api1/AudioDSP/AddonCallbacksAudioDSP.h b/...es/api1/AudioDSP/AddonCallbacksAudioDSP.h → ...es/api1/AudioDSP/AddonCallbacksAudioDSP.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h"
 
 namespace ActiveAE

diff --git a/...s/interfaces/api1/AudioDSP/CMakeLists.txt → ...y/interfaces/api1/AudioDSP/CMakeLists.txt b/...s/interfaces/api1/AudioDSP/CMakeLists.txt → ...y/interfaces/api1/AudioDSP/CMakeLists.txt
diff --git a/.../addons/interfaces/api1/AudioDSP/Makefile → .../binary/interfaces/api1/AudioDSP/Makefile b/.../addons/interfaces/api1/AudioDSP/Makefile → .../binary/interfaces/api1/AudioDSP/Makefile
diff --git a/...AudioEngine/AddonCallbacksAudioEngine.cpp → ...AudioEngine/AddonCallbacksAudioEngine.cpp b/...AudioEngine/AddonCallbacksAudioEngine.cpp → ...AudioEngine/AddonCallbacksAudioEngine.cpp
diff --git a/...1/AudioEngine/AddonCallbacksAudioEngine.h → ...1/AudioEngine/AddonCallbacksAudioEngine.h b/...1/AudioEngine/AddonCallbacksAudioEngine.h → ...1/AudioEngine/AddonCallbacksAudioEngine.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h"
 

diff --git a/...nterfaces/api1/AudioEngine/CMakeLists.txt → ...nterfaces/api1/AudioEngine/CMakeLists.txt b/...nterfaces/api1/AudioEngine/CMakeLists.txt → ...nterfaces/api1/AudioEngine/CMakeLists.txt
diff --git a/...dons/interfaces/api1/AudioEngine/Makefile → ...nary/interfaces/api1/AudioEngine/Makefile b/...dons/interfaces/api1/AudioEngine/Makefile → ...nary/interfaces/api1/AudioEngine/Makefile
diff --git a/...rfaces/api1/Codec/AddonCallbacksCodec.cpp → ...rfaces/api1/Codec/AddonCallbacksCodec.cpp b/...rfaces/api1/Codec/AddonCallbacksCodec.cpp → ...rfaces/api1/Codec/AddonCallbacksCodec.cpp
diff --git a/...terfaces/api1/Codec/AddonCallbacksCodec.h → ...terfaces/api1/Codec/AddonCallbacksCodec.h b/...terfaces/api1/Codec/AddonCallbacksCodec.h → ...terfaces/api1/Codec/AddonCallbacksCodec.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h"
 
 namespace V1

diff --git a/...dons/interfaces/api1/Codec/CMakeLists.txt → ...nary/interfaces/api1/Codec/CMakeLists.txt b/...dons/interfaces/api1/Codec/CMakeLists.txt → ...nary/interfaces/api1/Codec/CMakeLists.txt
diff --git a/xbmc/addons/interfaces/api1/Codec/Makefile → ...ons/binary/interfaces/api1/Codec/Makefile b/xbmc/addons/interfaces/api1/Codec/Makefile → ...ons/binary/interfaces/api1/Codec/Makefile
diff --git a/...interfaces/api1/GUI/AddonCallbacksGUI.cpp → ...interfaces/api1/GUI/AddonCallbacksGUI.cpp b/...interfaces/api1/GUI/AddonCallbacksGUI.cpp → ...interfaces/api1/GUI/AddonCallbacksGUI.cpp
diff --git a/...s/interfaces/api1/GUI/AddonCallbacksGUI.h → ...y/interfaces/api1/GUI/AddonCallbacksGUI.h b/...s/interfaces/api1/GUI/AddonCallbacksGUI.h → ...y/interfaces/api1/GUI/AddonCallbacksGUI.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h"
 
 namespace ADDON

diff --git a/...ces/api1/GUI/AddonGUIRenderingControl.cpp → ...ces/api1/GUI/AddonGUIRenderingControl.cpp b/...ces/api1/GUI/AddonGUIRenderingControl.cpp → ...ces/api1/GUI/AddonGUIRenderingControl.cpp
diff --git a/...faces/api1/GUI/AddonGUIRenderingControl.h → ...faces/api1/GUI/AddonGUIRenderingControl.h b/...faces/api1/GUI/AddonGUIRenderingControl.h → ...faces/api1/GUI/AddonGUIRenderingControl.h
diff --git a/...ns/interfaces/api1/GUI/AddonGUIWindow.cpp → ...ry/interfaces/api1/GUI/AddonGUIWindow.cpp b/...ns/interfaces/api1/GUI/AddonGUIWindow.cpp → ...ry/interfaces/api1/GUI/AddonGUIWindow.cpp
diff --git a/...dons/interfaces/api1/GUI/AddonGUIWindow.h → ...nary/interfaces/api1/GUI/AddonGUIWindow.h b/...dons/interfaces/api1/GUI/AddonGUIWindow.h → ...nary/interfaces/api1/GUI/AddonGUIWindow.h
diff --git a/...addons/interfaces/api1/GUI/CMakeLists.txt → ...binary/interfaces/api1/GUI/CMakeLists.txt b/...addons/interfaces/api1/GUI/CMakeLists.txt → ...binary/interfaces/api1/GUI/CMakeLists.txt
diff --git a/xbmc/addons/interfaces/api1/GUI/Makefile → ...ddons/binary/interfaces/api1/GUI/Makefile b/xbmc/addons/interfaces/api1/GUI/Makefile → ...ddons/binary/interfaces/api1/GUI/Makefile
diff --git a/...InputStream/AddonCallbacksInputStream.cpp → ...InputStream/AddonCallbacksInputStream.cpp b/...InputStream/AddonCallbacksInputStream.cpp → ...InputStream/AddonCallbacksInputStream.cpp
diff --git a/...1/InputStream/AddonCallbacksInputStream.h → ...1/InputStream/AddonCallbacksInputStream.h b/...1/InputStream/AddonCallbacksInputStream.h → ...1/InputStream/AddonCallbacksInputStream.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h"
 

diff --git a/...nterfaces/api1/InputStream/CMakeLists.txt → ...nterfaces/api1/InputStream/CMakeLists.txt b/...nterfaces/api1/InputStream/CMakeLists.txt → ...nterfaces/api1/InputStream/CMakeLists.txt
diff --git a/...dons/interfaces/api1/InputStream/Makefile → ...nary/interfaces/api1/InputStream/Makefile b/...dons/interfaces/api1/InputStream/Makefile → ...nary/interfaces/api1/InputStream/Makefile
diff --git a/...interfaces/api1/PVR/AddonCallbacksPVR.cpp → ...interfaces/api1/PVR/AddonCallbacksPVR.cpp b/...interfaces/api1/PVR/AddonCallbacksPVR.cpp → ...interfaces/api1/PVR/AddonCallbacksPVR.cpp
diff --git a/...s/interfaces/api1/PVR/AddonCallbacksPVR.h → ...y/interfaces/api1/PVR/AddonCallbacksPVR.h b/...s/interfaces/api1/PVR/AddonCallbacksPVR.h → ...y/interfaces/api1/PVR/AddonCallbacksPVR.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
 

diff --git a/...addons/interfaces/api1/PVR/CMakeLists.txt → ...binary/interfaces/api1/PVR/CMakeLists.txt b/...addons/interfaces/api1/PVR/CMakeLists.txt → ...binary/interfaces/api1/PVR/CMakeLists.txt
diff --git a/xbmc/addons/interfaces/api1/PVR/Makefile → ...ddons/binary/interfaces/api1/PVR/Makefile b/xbmc/addons/interfaces/api1/PVR/Makefile → ...ddons/binary/interfaces/api1/PVR/Makefile
diff --git a/...1/Peripheral/AddonCallbacksPeripheral.cpp → ...1/Peripheral/AddonCallbacksPeripheral.cpp b/...1/Peripheral/AddonCallbacksPeripheral.cpp → ...1/Peripheral/AddonCallbacksPeripheral.cpp
diff --git a/...pi1/Peripheral/AddonCallbacksPeripheral.h → ...pi1/Peripheral/AddonCallbacksPeripheral.h b/...pi1/Peripheral/AddonCallbacksPeripheral.h → ...pi1/Peripheral/AddonCallbacksPeripheral.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 
 namespace PERIPHERALS { class CPeripheralAddon; }
 

diff --git a/...interfaces/api1/Peripheral/CMakeLists.txt → ...interfaces/api1/Peripheral/CMakeLists.txt b/...interfaces/api1/Peripheral/CMakeLists.txt → ...interfaces/api1/Peripheral/CMakeLists.txt
diff --git a/...ddons/interfaces/api1/Peripheral/Makefile → ...inary/interfaces/api1/Peripheral/Makefile b/...ddons/interfaces/api1/Peripheral/Makefile → ...inary/interfaces/api1/Peripheral/Makefile
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
@@ -144,7 +144,7 @@
 #include "settings/dialogs/GUIDialogAudioDSPSettings.h"
 
 #include "peripherals/dialogs/GUIDialogPeripheralSettings.h"
-#include "addons/interfaces/AddonInterfaces.h"
+#include "addons/binary/interfaces/AddonInterfaces.h"
 
 /* Game related include files */
 #include "games/controllers/windows/GUIControllerWindow.h"