[addons] remove not needed binary and api1 folder from source

52 files changed, 74 insertions, 90 deletions

diff --git a/.gitignore b/.gitignore
index 65c34ece8d..d6305916d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -383,7 +383,7 @@ lib/cpluff/stamp-h1
 
 # /xbmc/addons/
 /xbmc/addons/Makefile
-/xbmc/addons/binary/interfaces/Makefile
+/xbmc/addons/interfaces/Makefile
 
 # /xbmc/platform/android
 /xbmc/platform/android/Makefile
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index 5f9192c6c9..53861700a7 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -2916,8 +2916,8 @@
 		6890C2211DDBDCBC00F8F362 /* DllLibCPluff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibCPluff.h; sourceTree = "<group>"; };
 		6890C2221DDBDCC900F8F362 /* DllPeripheral.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllPeripheral.h; sourceTree = "<group>"; };
 		6890C2231DDBDCCE00F8F362 /* DllPVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllPVRClient.h; sourceTree = "<group>"; };
-		6890C2251DDBDCF500F8F362 /* AddonCallbacksGame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksGame.cpp; path = addons/binary/interfaces/api1/Game/AddonCallbacksGame.cpp; sourceTree = "<group>"; };
-		6890C2261DDBDCF500F8F362 /* AddonCallbacksGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksGame.h; path = addons/binary/interfaces/api1/Game/AddonCallbacksGame.h; sourceTree = "<group>"; };
+		6890C2251DDBDCF500F8F362 /* AddonCallbacksGame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksGame.cpp; path = addons/interfaces/Game/AddonCallbacksGame.cpp; sourceTree = "<group>"; };
+		6890C2261DDBDCF500F8F362 /* AddonCallbacksGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksGame.h; path = addons/interfaces/Game/AddonCallbacksGame.h; sourceTree = "<group>"; };
 		6890C22A1DDBDD0900F8F362 /* kodi_game_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_game_dll.h; path = "kodi-addon-dev-kit/include/kodi/kodi_game_dll.h"; sourceTree = "<group>"; };
 		6890C22B1DDBDD0900F8F362 /* kodi_game_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_game_types.h; path = "kodi-addon-dev-kit/include/kodi/kodi_game_types.h"; sourceTree = "<group>"; };
 		6890C22C1DDBDD2D00F8F362 /* GameTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GameTypes.h; path = games/GameTypes.h; sourceTree = "<group>"; };
@@ -2956,8 +2956,8 @@
 		6890C2821DDBE03900F8F362 /* GUIWindowGames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIWindowGames.cpp; path = games/windows/GUIWindowGames.cpp; sourceTree = "<group>"; };
 		6890C2831DDBE03900F8F362 /* GUIWindowGames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIWindowGames.h; path = games/windows/GUIWindowGames.h; sourceTree = "<group>"; };
 		68AE5BA01C923E5300C4D527 /* kodi_vfs_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_vfs_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp"; sourceTree = "<group>"; };
-		68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPeripheral.cpp; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp; sourceTree = "<group>"; };
-		68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPeripheral.h; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h; sourceTree = "<group>"; };
+		68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPeripheral.cpp; path = addons/interfaces/Peripheral/AddonCallbacksPeripheral.cpp; sourceTree = "<group>"; };
+		68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPeripheral.h; path = addons/interfaces/Peripheral/AddonCallbacksPeripheral.h; sourceTree = "<group>"; };
 		68AE5BA81C92414B00C4D527 /* kodi_peripheral_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_dll.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h"; sourceTree = "<group>"; };
 		68AE5BA91C92414B00C4D527 /* kodi_peripheral_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_types.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"; sourceTree = "<group>"; };
 		68AE5BAA1C92414B00C4D527 /* kodi_peripheral_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_peripheral_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"; sourceTree = "<group>"; };
@@ -3052,10 +3052,10 @@
 		6E97BDC10DA2B620003A2A89 /* EventServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventServer.h; sourceTree = "<group>"; };
 		6E97BDC30DA2B620003A2A89 /* Fanart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fanart.h; sourceTree = "<group>"; };
 		6E97BDC40DA2B620003A2A89 /* Socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Socket.h; sourceTree = "<group>"; };
-		7611708C1C8B85F8006C6366 /* AddonGUIRenderingControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonGUIRenderingControl.cpp; path = addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.cpp; sourceTree = "<group>"; };
-		7611708D1C8B85F8006C6366 /* AddonGUIRenderingControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonGUIRenderingControl.h; path = addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.h; sourceTree = "<group>"; };
-		7611708E1C8B85F8006C6366 /* AddonGUIWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonGUIWindow.cpp; path = addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp; sourceTree = "<group>"; };
-		7611708F1C8B85F8006C6366 /* AddonGUIWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonGUIWindow.h; path = addons/binary/interfaces/api1/GUI/AddonGUIWindow.h; sourceTree = "<group>"; };
+		7611708C1C8B85F8006C6366 /* AddonGUIRenderingControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonGUIRenderingControl.cpp; path = addons/interfaces/GUI/AddonGUIRenderingControl.cpp; sourceTree = "<group>"; };
+		7611708D1C8B85F8006C6366 /* AddonGUIRenderingControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonGUIRenderingControl.h; path = addons/interfaces/GUI/AddonGUIRenderingControl.h; sourceTree = "<group>"; };
+		7611708E1C8B85F8006C6366 /* AddonGUIWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonGUIWindow.cpp; path = addons/interfaces/GUI/AddonGUIWindow.cpp; sourceTree = "<group>"; };
+		7611708F1C8B85F8006C6366 /* AddonGUIWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonGUIWindow.h; path = addons/interfaces/GUI/AddonGUIWindow.h; sourceTree = "<group>"; };
 		76EC19BC1D15514200D4AF19 /* ActiveAEDSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ActiveAEDSP.cpp; path = AudioDSPAddons/ActiveAEDSP.cpp; sourceTree = "<group>"; };
 		76EC19BD1D15514200D4AF19 /* ActiveAEDSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActiveAEDSP.h; path = AudioDSPAddons/ActiveAEDSP.h; sourceTree = "<group>"; };
 		76EC19BE1D15514200D4AF19 /* ActiveAEDSPAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ActiveAEDSPAddon.cpp; path = AudioDSPAddons/ActiveAEDSPAddon.cpp; sourceTree = "<group>"; };
@@ -3066,8 +3066,8 @@
 		76EC19C31D15514200D4AF19 /* ActiveAEDSPMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActiveAEDSPMode.h; path = AudioDSPAddons/ActiveAEDSPMode.h; sourceTree = "<group>"; };
 		76EC19C41D15514200D4AF19 /* ActiveAEDSPProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ActiveAEDSPProcess.cpp; path = AudioDSPAddons/ActiveAEDSPProcess.cpp; sourceTree = "<group>"; };
 		76EC19C51D15514200D4AF19 /* ActiveAEDSPProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActiveAEDSPProcess.h; path = AudioDSPAddons/ActiveAEDSPProcess.h; sourceTree = "<group>"; };
-		76F4C37C1C8E92E000A1E64B /* AddonCallbacksInputStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksInputStream.cpp; path = addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.cpp; sourceTree = "<group>"; };
-		76F4C37D1C8E92E000A1E64B /* AddonCallbacksInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksInputStream.h; path = addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h; sourceTree = "<group>"; };
+		76F4C37C1C8E92E000A1E64B /* AddonCallbacksInputStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksInputStream.cpp; path = addons/interfaces/InputStream/AddonCallbacksInputStream.cpp; sourceTree = "<group>"; };
+		76F4C37D1C8E92E000A1E64B /* AddonCallbacksInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksInputStream.h; path = addons/interfaces/InputStream/AddonCallbacksInputStream.h; sourceTree = "<group>"; };
 		7C0B98A1154B79C30065A238 /* AEDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AEDeviceInfo.cpp; sourceTree = "<group>"; };
 		7C0B98A2154B79C30065A238 /* AEDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEDeviceInfo.h; sourceTree = "<group>"; };
 		7C14096F183224B8009F9411 /* ISetting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ISetting.cpp; path = lib/ISetting.cpp; sourceTree = "<group>"; };
@@ -5038,21 +5038,21 @@
 		EDE8C7231C7F618500A86ECC /* xbmc_scr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xbmc_scr_types.h; path = "kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h"; sourceTree = "<group>"; };
 		EDE8C7251C7F618500A86ECC /* xbmc_vis_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xbmc_vis_dll.h; path = "kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h"; sourceTree = "<group>"; };
 		EDE8C7261C7F618500A86ECC /* xbmc_vis_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xbmc_vis_types.h; path = "kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h"; sourceTree = "<group>"; };
-		EDED2E861C878DE8000F5E80 /* AddonCallbacksPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPVR.cpp; path = addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.cpp; sourceTree = "<group>"; };
-		EDED2E871C878DE8000F5E80 /* AddonCallbacksPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPVR.h; path = addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h; sourceTree = "<group>"; };
-		EDED2E891C878E62000F5E80 /* AddonCallbacksGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksGUI.cpp; path = addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.cpp; sourceTree = "<group>"; };
-		EDED2E8A1C878E62000F5E80 /* AddonCallbacksGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksGUI.h; path = addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h; sourceTree = "<group>"; };
-		EDED2E8C1C878E97000F5E80 /* AddonCallbacksCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksCodec.cpp; path = addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.cpp; sourceTree = "<group>"; };
-		EDED2E8D1C878E97000F5E80 /* AddonCallbacksCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksCodec.h; path = addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h; sourceTree = "<group>"; };
-		EDED2E8F1C878EB8000F5E80 /* AddonCallbacksAudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAudioEngine.cpp; path = addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.cpp; sourceTree = "<group>"; };
-		EDED2E901C878EB8000F5E80 /* AddonCallbacksAudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAudioEngine.h; path = addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h; sourceTree = "<group>"; };
-		EDED2E921C878EE0000F5E80 /* AddonCallbacksAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAddon.cpp; path = addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.cpp; sourceTree = "<group>"; };
-		EDED2E931C878EE0000F5E80 /* AddonCallbacksAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAddon.h; path = addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h; sourceTree = "<group>"; };
-		EDED2E951C878EF8000F5E80 /* AddonCallbacksAudioDSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAudioDSP.cpp; path = addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.cpp; sourceTree = "<group>"; };
-		EDED2E961C878EF8000F5E80 /* AddonCallbacksAudioDSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAudioDSP.h; path = addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h; sourceTree = "<group>"; };
-		EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonInterfaces.cpp; path = addons/binary/interfaces/AddonInterfaces.cpp; sourceTree = "<group>"; };
-		EDED2E9A1C878F61000F5E80 /* AddonInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonInterfaces.h; path = addons/binary/interfaces/AddonInterfaces.h; sourceTree = "<group>"; };
-		EDED2E9C1C878F70000F5E80 /* IAddonInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAddonInterface.h; path = addons/binary/interfaces/IAddonInterface.h; sourceTree = "<group>"; };
+		EDED2E861C878DE8000F5E80 /* AddonCallbacksPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPVR.cpp; path = addons/interfaces/PVR/AddonCallbacksPVR.cpp; sourceTree = "<group>"; };
+		EDED2E871C878DE8000F5E80 /* AddonCallbacksPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPVR.h; path = addons/interfaces/PVR/AddonCallbacksPVR.h; sourceTree = "<group>"; };
+		EDED2E891C878E62000F5E80 /* AddonCallbacksGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksGUI.cpp; path = addons/interfaces/GUI/AddonCallbacksGUI.cpp; sourceTree = "<group>"; };
+		EDED2E8A1C878E62000F5E80 /* AddonCallbacksGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksGUI.h; path = addons/interfaces/GUI/AddonCallbacksGUI.h; sourceTree = "<group>"; };
+		EDED2E8C1C878E97000F5E80 /* AddonCallbacksCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksCodec.cpp; path = addons/interfaces/Codec/AddonCallbacksCodec.cpp; sourceTree = "<group>"; };
+		EDED2E8D1C878E97000F5E80 /* AddonCallbacksCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksCodec.h; path = addons/interfaces/Codec/AddonCallbacksCodec.h; sourceTree = "<group>"; };
+		EDED2E8F1C878EB8000F5E80 /* AddonCallbacksAudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAudioEngine.cpp; path = addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.cpp; sourceTree = "<group>"; };
+		EDED2E901C878EB8000F5E80 /* AddonCallbacksAudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAudioEngine.h; path = addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.h; sourceTree = "<group>"; };
+		EDED2E921C878EE0000F5E80 /* AddonCallbacksAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAddon.cpp; path = addons/interfaces/Addon/AddonCallbacksAddon.cpp; sourceTree = "<group>"; };
+		EDED2E931C878EE0000F5E80 /* AddonCallbacksAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAddon.h; path = addons/interfaces/Addon/AddonCallbacksAddon.h; sourceTree = "<group>"; };
+		EDED2E951C878EF8000F5E80 /* AddonCallbacksAudioDSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksAudioDSP.cpp; path = addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp; sourceTree = "<group>"; };
+		EDED2E961C878EF8000F5E80 /* AddonCallbacksAudioDSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksAudioDSP.h; path = addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.h; sourceTree = "<group>"; };
+		EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonInterfaces.cpp; path = addons/interfaces/AddonInterfaces.cpp; sourceTree = "<group>"; };
+		EDED2E9A1C878F61000F5E80 /* AddonInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonInterfaces.h; path = addons/interfaces/AddonInterfaces.h; sourceTree = "<group>"; };
+		EDED2E9C1C878F70000F5E80 /* IAddonInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAddonInterface.h; path = addons/interfaces/IAddonInterface.h; sourceTree = "<group>"; };
 		F500E35517F3412C004FC217 /* WinEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WinEvents.cpp; sourceTree = "<group>"; };
 		F500E35917F34132004FC217 /* WinEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinEvents.h; sourceTree = "<group>"; };
 		F502BFDA160F34B900C96C76 /* CallbackHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CallbackHandler.cpp; path = python/CallbackHandler.cpp; sourceTree = "<group>"; };
@@ -5351,7 +5351,7 @@
 		18B49FF01152BEEB001AF8A6 /* addons */ = {
 			isa = PBXGroup;
 			children = (
-				EDED2E7D1C878BDF000F5E80 /* binary */,
+				EDED2E7E1C878C5F000F5E80 /* interfaces */,
 				EDE8C7091C7F60C200A86ECC /* kodi-addon-dev-kit */,
 				18B49FF11152BFA5001AF8A6 /* Addon.cpp */,
 				18B49FF21152BFA5001AF8A6 /* Addon.h */,
@@ -9577,29 +9577,9 @@
 			name = kodi;
 			sourceTree = "<group>";
 		};
-		EDED2E7D1C878BDF000F5E80 /* binary */ = {
-			isa = PBXGroup;
-			children = (
-				EDED2E7E1C878C5F000F5E80 /* interfaces */,
-			);
-			name = binary;
-			path = ..;
-			sourceTree = "<group>";
-		};
 		EDED2E7E1C878C5F000F5E80 /* interfaces */ = {
 			isa = PBXGroup;
 			children = (
-				EDED2E7F1C878C87000F5E80 /* api1 */,
-				EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */,
-				EDED2E9A1C878F61000F5E80 /* AddonInterfaces.h */,
-				EDED2E9C1C878F70000F5E80 /* IAddonInterface.h */,
-			);
-			name = interfaces;
-			sourceTree = "<group>";
-		};
-		EDED2E7F1C878C87000F5E80 /* api1 */ = {
-			isa = PBXGroup;
-			children = (
 				EDED2E841C878D1D000F5E80 /* Addon */,
 				EDED2E851C878D3F000F5E80 /* AudioDSP */,
 				EDED2E831C878D04000F5E80 /* AudioEngine */,
@@ -9609,8 +9589,12 @@
 				76F4C37B1C8E927A00A1E64B /* InputStream */,
 				68AE5BA21C92410300C4D527 /* Peripheral */,
 				EDED2E811C878CC1000F5E80 /* PVR */,
+				EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */,
+				EDED2E9A1C878F61000F5E80 /* AddonInterfaces.h */,
+				EDED2E9C1C878F70000F5E80 /* IAddonInterface.h */,
 			);
-			name = api1;
+			name = interfaces;
+			path = ..;
 			sourceTree = "<group>";
 		};
 		EDED2E801C878CB4000F5E80 /* GUI */ = {
diff --git a/Makefile.in b/Makefile.in
index e9f3ed553a..d969646cc4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,16 +25,16 @@ VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
 
 DIRECTORY_ARCHIVES=$(VideoPlayer_ARCHIVES) \
                    xbmc/addons/addons.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/Game/addon-callbacks-game.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/addons/interfaces/addon-interfaces.a \
+                   xbmc/addons/interfaces/Addon/addon-callbacks-addon.a \
+                   xbmc/addons/interfaces/AudioDSP/addon-callbacks-audiodsp.a \
+                   xbmc/addons/interfaces/AudioEngine/addon-callbacks-audioengine.a \
+                   xbmc/addons/interfaces/Codec/addon-callbacks-codec.a \
+                   xbmc/addons/interfaces/Game/addon-callbacks-game.a \
+                   xbmc/addons/interfaces/GUI/addon-callbacks-gui.a \
+                   xbmc/addons/interfaces/InputStream/addon-callbacks-inputstream.a \
+                   xbmc/addons/interfaces/Peripheral/addon-callbacks-peripheral.a \
+                   xbmc/addons/interfaces/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
index 3d5327ba25..f4b90ea017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2153,7 +2153,7 @@ OUTPUT_FILES="Makefile \
     addons/skin.estuary/media/Makefile \
     addons/skin.estouchy/media/Makefile \
     xbmc/Makefile \
-    xbmc/addons/binary/interfaces/Makefile \
+    xbmc/addons/interfaces/Makefile \
     xbmc/cdrip/Makefile \
     xbmc/cores/Makefile \
     xbmc/cores/VideoPlayer/VideoRenderers/Makefile \
diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt
index af916110a4..bc74c0466a 100644
--- a/project/cmake/treedata/common/subdirs.txt
+++ b/project/cmake/treedata/common/subdirs.txt
@@ -1,15 +1,15 @@
 xbmc                                            xbmc
 xbmc/addons                                     addons
-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/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
-xbmc/addons/binary/interfaces/api1/PVR          api1AddonCallbacks_PVR
+xbmc/addons/interfaces                          addonsBinaryInterfaces
+xbmc/addons/interfaces/Addon                    api1AddonCallbacks_Addon
+xbmc/addons/interfaces/AudioDSP                 api1AddonCallbacks_AudioDSP
+xbmc/addons/interfaces/AudioEngine              api1AddonCallbacks_AudioEngine
+xbmc/addons/interfaces/Codec                    api1AddonCallbacks_Codec
+xbmc/addons/interfaces/Game                     api1AddonCallbacks_Game
+xbmc/addons/interfaces/GUI                      api1AddonCallbacks_GUI
+xbmc/addons/interfaces/InputStream              api1AddonCallbacks_InputStream
+xbmc/addons/interfaces/Peripheral               api1AddonCallbacks_Peripheral
+xbmc/addons/interfaces/PVR                      api1AddonCallbacks_PVR
 xbmc/commons                                    commons
 xbmc/dbwrappers                                 dbwrappers
 xbmc/dialogs                                    dialogs
diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
index 35823a8320..4f4c64a360 100644
--- 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/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogOK.h"
 #include "utils/URIUtils.h"
diff --git a/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.cpp b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp
index b828479698..b828479698 100644
--- a/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.cpp
+++ b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.h
index 747f113ab7..a67eaadc0c 100644
--- a/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h
+++ b/xbmc/addons/interfaces/Addon/AddonCallbacksAddon.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h"
 
 struct VFSDirEntry;
diff --git a/xbmc/addons/binary/interfaces/api1/Addon/CMakeLists.txt b/xbmc/addons/interfaces/Addon/CMakeLists.txt
index 5fd0aa5f04..5fd0aa5f04 100644
--- a/xbmc/addons/binary/interfaces/api1/Addon/CMakeLists.txt
+++ b/xbmc/addons/interfaces/Addon/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/Addon/Makefile b/xbmc/addons/interfaces/Addon/Makefile
index 09ea40efa2..09ea40efa2 100644
--- a/xbmc/addons/binary/interfaces/api1/Addon/Makefile
+++ b/xbmc/addons/interfaces/Addon/Makefile
diff --git a/xbmc/addons/binary/interfaces/AddonInterfaces.cpp b/xbmc/addons/interfaces/AddonInterfaces.cpp
index a8bbb14b10..e527e47257 100644
--- a/xbmc/addons/binary/interfaces/AddonInterfaces.cpp
+++ b/xbmc/addons/interfaces/AddonInterfaces.cpp
@@ -23,16 +23,16 @@
 
 #include "addons/Addon.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/Game/AddonCallbacksGame.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 "addons/interfaces/Addon/AddonCallbacksAddon.h"
+#include "addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.h"
+#include "addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.h"
+#include "addons/interfaces/Codec/AddonCallbacksCodec.h"
+#include "addons/interfaces/Game/AddonCallbacksGame.h"
+#include "addons/interfaces/GUI/AddonCallbacksGUI.h"
+#include "addons/interfaces/GUI/AddonGUIWindow.h"
+#include "addons/interfaces/InputStream/AddonCallbacksInputStream.h"
+#include "addons/interfaces/Peripheral/AddonCallbacksPeripheral.h"
+#include "addons/interfaces/PVR/AddonCallbacksPVR.h"
 #include "filesystem/SpecialProtocol.h"
 #include "messaging/ApplicationMessenger.h"
 #include "utils/log.h"
diff --git a/xbmc/addons/binary/interfaces/AddonInterfaces.h b/xbmc/addons/interfaces/AddonInterfaces.h
index 99f0367b03..99f0367b03 100644
--- a/xbmc/addons/binary/interfaces/AddonInterfaces.h
+++ b/xbmc/addons/interfaces/AddonInterfaces.h
diff --git a/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.cpp b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp
index feafb72708..feafb72708 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.cpp
+++ b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.h
index 525ce82168..4805a3bcb6 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h
+++ b/xbmc/addons/interfaces/AudioDSP/AddonCallbacksAudioDSP.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h"
 
 namespace ActiveAE
diff --git a/xbmc/addons/binary/interfaces/api1/AudioDSP/CMakeLists.txt b/xbmc/addons/interfaces/AudioDSP/CMakeLists.txt
index 020e076128..020e076128 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioDSP/CMakeLists.txt
+++ b/xbmc/addons/interfaces/AudioDSP/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/AudioDSP/Makefile b/xbmc/addons/interfaces/AudioDSP/Makefile
index 16d077b089..16d077b089 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioDSP/Makefile
+++ b/xbmc/addons/interfaces/AudioDSP/Makefile
diff --git a/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.cpp b/xbmc/addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.cpp
index 6e51b145e8..6e51b145e8 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.cpp
+++ b/xbmc/addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h b/xbmc/addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.h
index b71105dab1..d8b3feff53 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h
+++ b/xbmc/addons/interfaces/AudioEngine/AddonCallbacksAudioEngine.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/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/xbmc/addons/binary/interfaces/api1/AudioEngine/CMakeLists.txt b/xbmc/addons/interfaces/AudioEngine/CMakeLists.txt
index f0eb70ceb2..f0eb70ceb2 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioEngine/CMakeLists.txt
+++ b/xbmc/addons/interfaces/AudioEngine/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/AudioEngine/Makefile b/xbmc/addons/interfaces/AudioEngine/Makefile
index 74bf8a9058..74bf8a9058 100644
--- a/xbmc/addons/binary/interfaces/api1/AudioEngine/Makefile
+++ b/xbmc/addons/interfaces/AudioEngine/Makefile
diff --git a/xbmc/addons/binary/interfaces/CMakeLists.txt b/xbmc/addons/interfaces/CMakeLists.txt
index 83a64ef4ab..83a64ef4ab 100644
--- a/xbmc/addons/binary/interfaces/CMakeLists.txt
+++ b/xbmc/addons/interfaces/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.cpp b/xbmc/addons/interfaces/Codec/AddonCallbacksCodec.cpp
index da92e40a59..da92e40a59 100644
--- a/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.cpp
+++ b/xbmc/addons/interfaces/Codec/AddonCallbacksCodec.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h b/xbmc/addons/interfaces/Codec/AddonCallbacksCodec.h
index 8424eb8ca8..6ad7ae595e 100644
--- a/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h
+++ b/xbmc/addons/interfaces/Codec/AddonCallbacksCodec.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h"
 
 namespace KodiAPI
diff --git a/xbmc/addons/binary/interfaces/api1/Codec/CMakeLists.txt b/xbmc/addons/interfaces/Codec/CMakeLists.txt
index 0fe6925278..0fe6925278 100644
--- a/xbmc/addons/binary/interfaces/api1/Codec/CMakeLists.txt
+++ b/xbmc/addons/interfaces/Codec/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/Codec/Makefile b/xbmc/addons/interfaces/Codec/Makefile
index f2cba21609..f2cba21609 100644
--- a/xbmc/addons/binary/interfaces/api1/Codec/Makefile
+++ b/xbmc/addons/interfaces/Codec/Makefile
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.cpp b/xbmc/addons/interfaces/GUI/AddonCallbacksGUI.cpp
index aade70fcac..aade70fcac 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.cpp
+++ b/xbmc/addons/interfaces/GUI/AddonCallbacksGUI.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h b/xbmc/addons/interfaces/GUI/AddonCallbacksGUI.h
index b04e3ec24e..49539ac970 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h
+++ b/xbmc/addons/interfaces/GUI/AddonCallbacksGUI.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h"
 
 namespace ADDON
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.cpp b/xbmc/addons/interfaces/GUI/AddonGUIRenderingControl.cpp
index daa77195c5..daa77195c5 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.cpp
+++ b/xbmc/addons/interfaces/GUI/AddonGUIRenderingControl.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.h b/xbmc/addons/interfaces/GUI/AddonGUIRenderingControl.h
index 6467573870..6467573870 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.h
+++ b/xbmc/addons/interfaces/GUI/AddonGUIRenderingControl.h
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp b/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp
index 91d873f67f..91d873f67f 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp
+++ b/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.h b/xbmc/addons/interfaces/GUI/AddonGUIWindow.h
index c8b124dd7e..c8b124dd7e 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.h
+++ b/xbmc/addons/interfaces/GUI/AddonGUIWindow.h
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/CMakeLists.txt b/xbmc/addons/interfaces/GUI/CMakeLists.txt
index d3c0868f19..d3c0868f19 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/CMakeLists.txt
+++ b/xbmc/addons/interfaces/GUI/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/GUI/Makefile b/xbmc/addons/interfaces/GUI/Makefile
index 8832ee9694..8832ee9694 100644
--- a/xbmc/addons/binary/interfaces/api1/GUI/Makefile
+++ b/xbmc/addons/interfaces/GUI/Makefile
diff --git a/xbmc/addons/binary/interfaces/api1/Game/AddonCallbacksGame.cpp b/xbmc/addons/interfaces/Game/AddonCallbacksGame.cpp
index 7961eaf57f..7961eaf57f 100644
--- a/xbmc/addons/binary/interfaces/api1/Game/AddonCallbacksGame.cpp
+++ b/xbmc/addons/interfaces/Game/AddonCallbacksGame.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/Game/AddonCallbacksGame.h b/xbmc/addons/interfaces/Game/AddonCallbacksGame.h
index 49c1271e72..3757ccf780 100644
--- a/xbmc/addons/binary/interfaces/api1/Game/AddonCallbacksGame.h
+++ b/xbmc/addons/interfaces/Game/AddonCallbacksGame.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h"
 
 namespace GAME { class CGameClient; }
diff --git a/xbmc/addons/binary/interfaces/api1/Game/CMakeLists.txt b/xbmc/addons/interfaces/Game/CMakeLists.txt
index 48e3cfc1f3..48e3cfc1f3 100644
--- a/xbmc/addons/binary/interfaces/api1/Game/CMakeLists.txt
+++ b/xbmc/addons/interfaces/Game/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/Game/Makefile b/xbmc/addons/interfaces/Game/Makefile
index 460425b058..460425b058 100644
--- a/xbmc/addons/binary/interfaces/api1/Game/Makefile
+++ b/xbmc/addons/interfaces/Game/Makefile
diff --git a/xbmc/addons/binary/interfaces/IAddonInterface.h b/xbmc/addons/interfaces/IAddonInterface.h
index 07b608e216..07b608e216 100644
--- a/xbmc/addons/binary/interfaces/IAddonInterface.h
+++ b/xbmc/addons/interfaces/IAddonInterface.h
diff --git a/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.cpp b/xbmc/addons/interfaces/InputStream/AddonCallbacksInputStream.cpp
index a9f14e19e2..a9f14e19e2 100644
--- a/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.cpp
+++ b/xbmc/addons/interfaces/InputStream/AddonCallbacksInputStream.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h b/xbmc/addons/interfaces/InputStream/AddonCallbacksInputStream.h
index de2cba26db..bdffca2f78 100644
--- a/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h
+++ b/xbmc/addons/interfaces/InputStream/AddonCallbacksInputStream.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h"
 
diff --git a/xbmc/addons/binary/interfaces/api1/InputStream/CMakeLists.txt b/xbmc/addons/interfaces/InputStream/CMakeLists.txt
index b3e51a37bd..b3e51a37bd 100644
--- a/xbmc/addons/binary/interfaces/api1/InputStream/CMakeLists.txt
+++ b/xbmc/addons/interfaces/InputStream/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/InputStream/Makefile b/xbmc/addons/interfaces/InputStream/Makefile
index 59a422a94d..59a422a94d 100644
--- a/xbmc/addons/binary/interfaces/api1/InputStream/Makefile
+++ b/xbmc/addons/interfaces/InputStream/Makefile
diff --git a/xbmc/addons/binary/interfaces/Makefile.in b/xbmc/addons/interfaces/Makefile.in
index 4f5e9bbfed..4f5e9bbfed 100644
--- a/xbmc/addons/binary/interfaces/Makefile.in
+++ b/xbmc/addons/interfaces/Makefile.in
diff --git a/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.cpp b/xbmc/addons/interfaces/PVR/AddonCallbacksPVR.cpp
index 0302e26558..0302e26558 100644
--- a/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.cpp
+++ b/xbmc/addons/interfaces/PVR/AddonCallbacksPVR.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h b/xbmc/addons/interfaces/PVR/AddonCallbacksPVR.h
index dfc553f9be..b1558af69a 100644
--- a/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h
+++ b/xbmc/addons/interfaces/PVR/AddonCallbacksPVR.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/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"
 #include "addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h"
diff --git a/xbmc/addons/binary/interfaces/api1/PVR/CMakeLists.txt b/xbmc/addons/interfaces/PVR/CMakeLists.txt
index dfcac827a9..dfcac827a9 100644
--- a/xbmc/addons/binary/interfaces/api1/PVR/CMakeLists.txt
+++ b/xbmc/addons/interfaces/PVR/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/PVR/Makefile b/xbmc/addons/interfaces/PVR/Makefile
index a3dedd1bff..a3dedd1bff 100644
--- a/xbmc/addons/binary/interfaces/api1/PVR/Makefile
+++ b/xbmc/addons/interfaces/PVR/Makefile
diff --git a/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp b/xbmc/addons/interfaces/Peripheral/AddonCallbacksPeripheral.cpp
index 50aa3a9b30..50aa3a9b30 100644
--- a/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp
+++ b/xbmc/addons/interfaces/Peripheral/AddonCallbacksPeripheral.cpp
diff --git a/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h b/xbmc/addons/interfaces/Peripheral/AddonCallbacksPeripheral.h
index e76b083bad..27cddc99f2 100644
--- a/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h
+++ b/xbmc/addons/interfaces/Peripheral/AddonCallbacksPeripheral.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h"
 
 namespace PERIPHERALS { class CPeripheralAddon; }
diff --git a/xbmc/addons/binary/interfaces/api1/Peripheral/CMakeLists.txt b/xbmc/addons/interfaces/Peripheral/CMakeLists.txt
index 086519b127..086519b127 100644
--- a/xbmc/addons/binary/interfaces/api1/Peripheral/CMakeLists.txt
+++ b/xbmc/addons/interfaces/Peripheral/CMakeLists.txt
diff --git a/xbmc/addons/binary/interfaces/api1/Peripheral/Makefile b/xbmc/addons/interfaces/Peripheral/Makefile
index 2f629d17da..2f629d17da 100644
--- a/xbmc/addons/binary/interfaces/api1/Peripheral/Makefile
+++ b/xbmc/addons/interfaces/Peripheral/Makefile
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index 9f2969192d..b835c355ce 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -145,7 +145,7 @@
 #include "settings/dialogs/GUIDialogAudioDSPSettings.h"
 
 #include "peripherals/dialogs/GUIDialogPeripheralSettings.h"
-#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/interfaces/AddonInterfaces.h"
 
 /* Game related include files */
 #include "games/controllers/windows/GUIControllerWindow.h"