Input: Move action source files to 'input/actions/' subfolder

38 files changed, 67 insertions, 59 deletions

diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
index 368f473e8b..4a5f3a8434 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -20,6 +20,7 @@ xbmc/favourites                                 favourites
 xbmc/guilib                                     guilib
 xbmc/guilib/guiinfo                             guilib_guiinfo
 xbmc/input                                      input
+xbmc/input/actions                              input/actions
 xbmc/input/joysticks                            input/joysticks
 xbmc/input/joysticks/dialogs                    input/joysticks/dialogs
 xbmc/input/joysticks/generic                    input/joysticks/generic
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index e536f3c4a9..c6441673a9 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -45,7 +45,7 @@
 #ifdef HAS_PYTHON
 #include "interfaces/python/XBPython.h"
 #endif
-#include "input/ActionTranslator.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/ButtonTranslator.h"
 #include "guilib/GUIAudioManager.h"
 #include "GUIPassword.h"
diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake
index 213b3e2782..53a980173a 100644
--- a/xbmc/addons/AddonBindings.cmake
+++ b/xbmc/addons/AddonBindings.cmake
@@ -6,7 +6,7 @@
 set(CORE_ADDON_BINDINGS_FILES
     ${CORE_SOURCE_DIR}/xbmc/cores/AudioEngine/Utils/AEChannelData.h
     ${CORE_SOURCE_DIR}/xbmc/filesystem/IFileTypes.h
-    ${CORE_SOURCE_DIR}/xbmc/input/ActionIDs.h
+    ${CORE_SOURCE_DIR}/xbmc/input/actions/ActionIDs.h
     ${CORE_SOURCE_DIR}/xbmc/input/XBMC_vkeys.h
 )
 
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
index f188f3493e..e7a8a05136 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -14,7 +14,7 @@
 #ifdef BUILD_KODI_ADDON
 #include "../ActionIDs.h"
 #else
-#include "input/ActionIDs.h"
+#include "input/actions/ActionIDs.h"
 #endif
 
 namespace kodi
diff --git a/xbmc/cores/RetroPlayer/RetroPlayer.cpp b/xbmc/cores/RetroPlayer/RetroPlayer.cpp
index f35a6dc362..7dd20513b7 100644
--- a/xbmc/cores/RetroPlayer/RetroPlayer.cpp
+++ b/xbmc/cores/RetroPlayer/RetroPlayer.cpp
@@ -33,8 +33,8 @@
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "messaging/ApplicationMessenger.h"
 #include "settings/MediaSettings.h"
 #include "threads/SingleLock.h"
diff --git a/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp
index 2baed1d9f5..cfdb554ec4 100644
--- a/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp
+++ b/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp
@@ -18,8 +18,8 @@
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h" //! @todo Remove me
 #include "guilib/WindowIDs.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "Application.h" //! @todo Remove me
 #include "ApplicationPlayer.h" //! @todo Remove me
 #include "GUIInfoManager.h" //! @todo Remove me
diff --git a/xbmc/dialogs/GUIDialogTextViewer.cpp b/xbmc/dialogs/GUIDialogTextViewer.cpp
index 6610187d3a..fd4673d5ea 100644
--- a/xbmc/dialogs/GUIDialogTextViewer.cpp
+++ b/xbmc/dialogs/GUIDialogTextViewer.cpp
@@ -11,8 +11,8 @@
 #include "filesystem/File.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "ServiceBroker.h"
diff --git a/xbmc/games/addons/GameClient.cpp b/xbmc/games/addons/GameClient.cpp
index f92413e913..44dc939c37 100644
--- a/xbmc/games/addons/GameClient.cpp
+++ b/xbmc/games/addons/GameClient.cpp
@@ -23,8 +23,8 @@
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "messaging/ApplicationMessenger.h"
 #include "messaging/helpers/DialogOKHelper.h"
 #include "threads/SingleLock.h"
diff --git a/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp b/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
index 02e50aa6a9..372b4fae9d 100644
--- a/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
+++ b/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.cpp
@@ -8,10 +8,10 @@
 
 #include "GUIDialogButtonCapture.h"
 #include "games/controllers/ControllerIDs.h"
+#include "input/actions/ActionIDs.h"
 #include "input/joysticks/interfaces/IButtonMap.h"
 #include "input/joysticks/JoystickUtils.h"
 #include "input/IKeymap.h"
-#include "input/ActionIDs.h"
 #include "messaging/helpers/DialogOKHelper.h"
 #include "peripherals/Peripherals.h"
 #include "utils/Variant.h"
diff --git a/xbmc/games/dialogs/osd/DialogGameOSD.cpp b/xbmc/games/dialogs/osd/DialogGameOSD.cpp
index 2aaaf0bc52..553befbf17 100644
--- a/xbmc/games/dialogs/osd/DialogGameOSD.cpp
+++ b/xbmc/games/dialogs/osd/DialogGameOSD.cpp
@@ -11,8 +11,8 @@
 #include "games/GameServices.h"
 #include "games/GameSettings.h"
 #include "guilib/WindowIDs.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "ServiceBroker.h"
 
 using namespace KODI;
diff --git a/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp b/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
index 2779e15298..b05e60ed0e 100644
--- a/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
+++ b/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp
@@ -14,7 +14,7 @@
 #include "guilib/GUIMessage.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
-#include "input/ActionIDs.h"
+#include "input/actions/ActionIDs.h"
 #include "settings/GameSettings.h"
 #include "settings/MediaSettings.h"
 #include "settings/Settings.h"
diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp
index a6ee81a198..97d2e9fd43 100644
--- a/xbmc/guilib/GUIAudioManager.cpp
+++ b/xbmc/guilib/GUIAudioManager.cpp
@@ -8,8 +8,8 @@
 
 #include "GUIAudioManager.h"
 #include "ServiceBroker.h"
-#include "input/ActionIDs.h"
-#include "input/ActionTranslator.h"
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/Key.h"
 #include "input/WindowTranslator.h"
 #include "settings/lib/Setting.h"
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index bb895400a5..501ee61ccc 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -11,8 +11,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "ActionIDs.h"
-#include "ActionTranslator.h"
 #include "AppTranslator.h"
 #include "CustomControllerTranslator.h"
 #include "GamepadTranslator.h"
@@ -23,6 +21,8 @@
 #include "WindowTranslator.h"
 #include "filesystem/Directory.h"
 #include "guilib/WindowIDs.h"
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/mouse/MouseTranslator.h"
 #include "utils/log.h"
 #include "utils/XBMCTinyXML.h"
diff --git a/xbmc/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h
index 0cf3ad06cb..74f8c46ee3 100644
--- a/xbmc/input/ButtonTranslator.h
+++ b/xbmc/input/ButtonTranslator.h
@@ -12,8 +12,7 @@
 #include <set>
 #include <string>
 
-#include "Action.h"
-
+#include "input/actions/Action.h"
 #include "network/EventClient.h"
 
 class CKey;
diff --git a/xbmc/input/CMakeLists.txt b/xbmc/input/CMakeLists.txt
index 54fa86cd0c..c835a29eca 100644
--- a/xbmc/input/CMakeLists.txt
+++ b/xbmc/input/CMakeLists.txt
@@ -1,6 +1,4 @@
-set(SOURCES Action.cpp
-            ActionTranslator.cpp
-            AppTranslator.cpp
+set(SOURCES AppTranslator.cpp
             ButtonTranslator.cpp
             CustomControllerTranslator.cpp
             GamepadTranslator.cpp
@@ -27,9 +25,6 @@ set(SOURCES Action.cpp
 
 set(HEADERS hardware/IHardwareInput.h
             remote/IRRemote.h
-            Action.h
-            ActionIDs.h
-            ActionTranslator.h
             AppTranslator.h
             ButtonTranslator.h
             CustomControllerTranslator.h
diff --git a/xbmc/input/CustomControllerTranslator.cpp b/xbmc/input/CustomControllerTranslator.cpp
index 315629ba67..8a384b3d1e 100644
--- a/xbmc/input/CustomControllerTranslator.cpp
+++ b/xbmc/input/CustomControllerTranslator.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "CustomControllerTranslator.h"
-#include "ActionIDs.h"
-#include "ActionTranslator.h"
 #include "WindowTranslator.h" //! @todo
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "utils/log.h"
 #include "utils/XBMCTinyXML.h"
 
diff --git a/xbmc/input/InputManager.h b/xbmc/input/InputManager.h
index 68ff6ea88b..6f4fc131ac 100644
--- a/xbmc/input/InputManager.h
+++ b/xbmc/input/InputManager.h
@@ -13,8 +13,9 @@
 #include <string>
 #include <vector>
 
-#include "Action.h"
 #include "windowing/XBMC_events.h"
+#include "input/actions/Action.h"
+#include "input/mouse/interfaces/IMouseInputProvider.h"
 #include "input/mouse/MouseStat.h"
 #include "input/KeyboardStat.h"
 #include "interfaces/IActionListener.h"
diff --git a/xbmc/input/JoystickMapper.cpp b/xbmc/input/JoystickMapper.cpp
index 01dfa0ea31..5bcbbbbace 100644
--- a/xbmc/input/JoystickMapper.cpp
+++ b/xbmc/input/JoystickMapper.cpp
@@ -7,8 +7,8 @@
  */
 
 #include "JoystickMapper.h"
-#include "ActionIDs.h"
-#include "ActionTranslator.h"
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/joysticks/JoystickTranslator.h"
 #include "input/joysticks/JoystickUtils.h"
 #include "input/WindowKeymap.h"
diff --git a/xbmc/input/Key.h b/xbmc/input/Key.h
index 32a15ebb74..bdf07bf4d4 100644
--- a/xbmc/input/Key.h
+++ b/xbmc/input/Key.h
@@ -14,8 +14,8 @@
  */
 
 //! @todo Remove dependence on CAction
-#include "Action.h"
-#include "ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 
 #include <string>
 #include <stdint.h>
diff --git a/xbmc/input/TouchTranslator.cpp b/xbmc/input/TouchTranslator.cpp
index 3e8a08d192..810aef30e2 100644
--- a/xbmc/input/TouchTranslator.cpp
+++ b/xbmc/input/TouchTranslator.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "TouchTranslator.h"
-#include "ActionIDs.h"
-#include "ActionTranslator.h"
 #include "WindowTranslator.h" //! @todo
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/XBMCTinyXML.h"
diff --git a/xbmc/input/Action.cpp b/xbmc/input/actions/Action.cpp
index c45e8ad99c..e808041df0 100644
--- a/xbmc/input/Action.cpp
+++ b/xbmc/input/actions/Action.cpp
@@ -9,7 +9,7 @@
 #include "Action.h"
 #include "ActionIDs.h"
 #include "ActionTranslator.h"
-#include "Key.h"
+#include "input/Key.h"
 
 CAction::CAction() :
   m_id(ACTION_NONE)
diff --git a/xbmc/input/Action.h b/xbmc/input/actions/Action.h
index 78d96bb042..78d96bb042 100644
--- a/xbmc/input/Action.h
+++ b/xbmc/input/actions/Action.h
diff --git a/xbmc/input/ActionIDs.h b/xbmc/input/actions/ActionIDs.h
index 12a5334e67..12a5334e67 100644
--- a/xbmc/input/ActionIDs.h
+++ b/xbmc/input/actions/ActionIDs.h
diff --git a/xbmc/input/ActionTranslator.cpp b/xbmc/input/actions/ActionTranslator.cpp
index e189321d32..e189321d32 100644
--- a/xbmc/input/ActionTranslator.cpp
+++ b/xbmc/input/actions/ActionTranslator.cpp
diff --git a/xbmc/input/ActionTranslator.h b/xbmc/input/actions/ActionTranslator.h
index e4ada87c86..e4ada87c86 100644
--- a/xbmc/input/ActionTranslator.h
+++ b/xbmc/input/actions/ActionTranslator.h
diff --git a/xbmc/input/actions/CMakeLists.txt b/xbmc/input/actions/CMakeLists.txt
new file mode 100644
index 0000000000..a7a4d8749e
--- /dev/null
+++ b/xbmc/input/actions/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(SOURCES Action.cpp
+            ActionTranslator.cpp
+)
+
+set(HEADERS Action.h
+            ActionIDs.h
+            ActionTranslator.h
+)
+
+core_add_library(input_actions)
diff --git a/xbmc/input/joysticks/keymaps/KeyHandler.cpp b/xbmc/input/joysticks/keymaps/KeyHandler.cpp
index c3b3448d10..3c2aa8aff3 100644
--- a/xbmc/input/joysticks/keymaps/KeyHandler.cpp
+++ b/xbmc/input/joysticks/keymaps/KeyHandler.cpp
@@ -7,10 +7,10 @@
  */
 
 #include "KeyHandler.h"
+#include "input/actions/ActionIDs.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/joysticks/interfaces/IKeymapHandler.h"
 #include "input/joysticks/JoystickUtils.h"
-#include "input/ActionIDs.h"
-#include "input/ActionTranslator.h"
 #include "input/IKeymap.h"
 #include "interfaces/IActionListener.h"
 
diff --git a/xbmc/input/joysticks/keymaps/KeyHandler.h b/xbmc/input/joysticks/keymaps/KeyHandler.h
index 336dba7507..876fbe78ab 100644
--- a/xbmc/input/joysticks/keymaps/KeyHandler.h
+++ b/xbmc/input/joysticks/keymaps/KeyHandler.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "input/actions/Action.h"
 #include "input/joysticks/interfaces/IKeyHandler.h"
 #include "input/joysticks/JoystickTypes.h"
-#include "input/Action.h"
 
 #include <map>
 #include <string>
diff --git a/xbmc/input/keyboard/KeymapActionMap.cpp b/xbmc/input/keyboard/KeymapActionMap.cpp
index 40be2c24d5..26fc0370a2 100644
--- a/xbmc/input/keyboard/KeymapActionMap.cpp
+++ b/xbmc/input/keyboard/KeymapActionMap.cpp
@@ -9,7 +9,7 @@
 #include "KeymapActionMap.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
-#include "input/Action.h"
+#include "input/actions/Action.h"
 #include "input/InputManager.h"
 #include "input/Key.h"
 #include "ServiceBroker.h"
diff --git a/xbmc/input/keyboard/interfaces/IActionMap.h b/xbmc/input/keyboard/interfaces/IActionMap.h
index 0bbabd907a..8dcf00226b 100644
--- a/xbmc/input/keyboard/interfaces/IActionMap.h
+++ b/xbmc/input/keyboard/interfaces/IActionMap.h
@@ -27,7 +27,7 @@ namespace KEYBOARD
      *
      * \param key The key to look up
      *
-     * \return The action ID from Action.h, or ACTION_NONE if no action is
+     * \return The action ID from ActionIDs.h, or ACTION_NONE if no action is
      *         mapped to the specified key
      */
     virtual unsigned int GetActionID(const CKey& key) = 0;
diff --git a/xbmc/interfaces/builtins/GUIBuiltins.cpp b/xbmc/interfaces/builtins/GUIBuiltins.cpp
index 089801d482..15ce8291b3 100644
--- a/xbmc/interfaces/builtins/GUIBuiltins.cpp
+++ b/xbmc/interfaces/builtins/GUIBuiltins.cpp
@@ -14,7 +14,7 @@
 #include "dialogs/GUIDialogKaiToast.h"
 #include "dialogs/GUIDialogNumeric.h"
 #include "filesystem/Directory.h"
-#include "input/ActionTranslator.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/WindowTranslator.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
diff --git a/xbmc/interfaces/json-rpc/InputOperations.cpp b/xbmc/interfaces/json-rpc/InputOperations.cpp
index c866a12a58..8f47222b3f 100644
--- a/xbmc/interfaces/json-rpc/InputOperations.cpp
+++ b/xbmc/interfaces/json-rpc/InputOperations.cpp
@@ -13,7 +13,7 @@
 #include "guilib/GUIWindow.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/GUIKeyboardFactory.h"
-#include "input/ActionTranslator.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/Key.h"
 #include "utils/Variant.h"
 
diff --git a/xbmc/interfaces/json-rpc/JSONRPC.cpp b/xbmc/interfaces/json-rpc/JSONRPC.cpp
index 9d179631e5..1db3c9f6f3 100644
--- a/xbmc/interfaces/json-rpc/JSONRPC.cpp
+++ b/xbmc/interfaces/json-rpc/JSONRPC.cpp
@@ -13,7 +13,7 @@
 #include "addons/Addon.h"
 #include "addons/IAddon.h"
 #include "dbwrappers/DatabaseQuery.h"
-#include "input/ActionTranslator.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/WindowTranslator.h"
 #include "interfaces/AnnouncementManager.h"
 #include "playlists/SmartPlayList.h"
diff --git a/xbmc/interfaces/swig/AddonModuleXbmcgui.i b/xbmc/interfaces/swig/AddonModuleXbmcgui.i
index 36bfb30abb..fc4a76b78d 100644
--- a/xbmc/interfaces/swig/AddonModuleXbmcgui.i
+++ b/xbmc/interfaces/swig/AddonModuleXbmcgui.i
@@ -20,7 +20,7 @@
 #include "interfaces/legacy/WindowDialog.h"
 #include "interfaces/legacy/Dialog.h"
 #include "interfaces/legacy/WindowXML.h"
-#include "input/ActionIDs.h"
+#include "input/actions/ActionIDs.h"
 #include "input/Key.h"
 
 using namespace XBMCAddon;
@@ -109,5 +109,5 @@ using namespace xbmcgui;
 
 %include "interfaces/legacy/WindowXML.h"
 
-%include "input/ActionIDs.h"
+%include "input/actions/ActionIDs.h"
 %include "input/Key.h"
diff --git a/xbmc/network/EventServer.cpp b/xbmc/network/EventServer.cpp
index 5a31aeca0f..76355e5fa1 100644
--- a/xbmc/network/EventServer.cpp
+++ b/xbmc/network/EventServer.cpp
@@ -7,22 +7,24 @@
  */
 
 #include "EventServer.h"
-#include "EventPacket.h"
 #include "EventClient.h"
+#include "EventPacket.h"
 #include "Socket.h"
-#include "Application.h"
-#include "ServiceBroker.h"
-#include "interfaces/builtins/Builtins.h"
-#include "input/ActionTranslator.h"
-#include "threads/SingleLock.h"
 #include "Zeroconf.h"
 #include "guilib/GUIAudioManager.h"
+#include "input/actions/ActionTranslator.h"
 #include "input/Key.h"
+#include "interfaces/builtins/Builtins.h"
+#include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "utils/SystemInfo.h"
+#include "Application.h"
+#include "ServiceBroker.h"
+#include "Util.h"
+
+#include <cassert>
 #include <map>
 #include <queue>
-#include <cassert>
 
 using namespace EVENTSERVER;
 using namespace EVENTPACKET;
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp b/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp
index 3618495403..e0e7c9ee82 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRItemsViewBase.cpp
@@ -12,8 +12,8 @@
 #include "FileItem.h"
 #include "ServiceBroker.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "view/ViewState.h"
 
 #include "pvr/PVRGUIActions.h"
diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
index 09a3d900e8..a23d65da30 100644
--- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
@@ -12,7 +12,7 @@
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/WindowIDs.h"
-#include "input/ActionIDs.h"
+#include "input/actions/ActionIDs.h"
 #include "input/InputManager.h"
 #include "ServiceBroker.h"
 
diff --git a/xbmc/windowing/win10/WinEventsWin10.cpp b/xbmc/windowing/win10/WinEventsWin10.cpp
index 506fc7c474..12a810ae2c 100644
--- a/xbmc/windowing/win10/WinEventsWin10.cpp
+++ b/xbmc/windowing/win10/WinEventsWin10.cpp
@@ -11,10 +11,10 @@
 #include "AppInboundProtocol.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
+#include "input/actions/Action.h"
+#include "input/actions/ActionIDs.h"
 #include "input/mouse/MouseStat.h"
 #include "input/touch/generic/GenericTouchInputHandler.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
 #include "interfaces/AnnouncementManager.h"
 #include "messaging/ApplicationMessenger.h"
 #include "platform/win10/input/RemoteControlXbox.h"