Merge pull request #9981 from Paxxi/vector

[xbmc][cleanup] Add missing vector includes

169 files changed, 377 insertions, 6 deletions

diff --git a/xbmc/Application.h b/xbmc/Application.h
index 5510f6aea5..5d38663767 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -29,10 +29,11 @@
 #include "messaging/IMessageTarget.h"
 #include "ServiceManager.h"
 
+#include <atomic>
 #include <map>
 #include <memory>
 #include <string>
-#include <atomic>
+#include <vector>
 
 class CAction;
 class CFileItem;
diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h
index d1a62e3538..1cde0dafd8 100644
--- a/xbmc/ApplicationPlayer.h
+++ b/xbmc/ApplicationPlayer.h
@@ -21,6 +21,9 @@
  */
 
 #include <memory>
+#include <string>
+#include <vector>
+
 #include "threads/CriticalSection.h"
 #include "threads/SystemClock.h"
 #include "guilib/Resolution.h"
diff --git a/xbmc/CueDocument.h b/xbmc/CueDocument.h
index 838bdd825b..d48c9879cd 100644
--- a/xbmc/CueDocument.h
+++ b/xbmc/CueDocument.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "music/Song.h"
 
 #define MAX_PATH_SIZE 1024
diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index c2deb97826..1d08e8d872 100644
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -40,6 +40,7 @@
 
 #include <list>
 #include <map>
+#include <vector>
 
 namespace MUSIC_INFO
 {
diff --git a/xbmc/GUILargeTextureManager.h b/xbmc/GUILargeTextureManager.h
index cc6cb3e897..87ba9275ab 100644
--- a/xbmc/GUILargeTextureManager.h
+++ b/xbmc/GUILargeTextureManager.h
@@ -21,6 +21,7 @@
  */
 
 #include <utility>
+#include <vector>
 
 #include "guilib/TextureManager.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/TextureDatabase.h b/xbmc/TextureDatabase.h
index 75676e4c9d..9df9ca1eb5 100644
--- a/xbmc/TextureDatabase.h
+++ b/xbmc/TextureDatabase.h
@@ -20,6 +20,9 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "dbwrappers/Database.h"
 #include "TextureCacheJob.h"
 #include "dbwrappers/DatabaseQuery.h"
diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
index cc3c24a358..3058fe8b58 100644
--- a/xbmc/addons/AddonDll.h
+++ b/xbmc/addons/AddonDll.h
@@ -20,6 +20,7 @@
  */
 #include <math.h>
 #include <string>
+#include <vector>
 
 #include "Addon.h"
 #include "DllAddon.h"
diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h
index 6cd78683e3..02c71855d4 100644
--- a/xbmc/addons/AddonInstaller.h
+++ b/xbmc/addons/AddonInstaller.h
@@ -19,7 +19,9 @@
  *
  */
 
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "addons/Addon.h"
 #include "addons/Repository.h"
diff --git a/xbmc/addons/ContextMenuAddon.h b/xbmc/addons/ContextMenuAddon.h
index 63cd172635..a3f9be221e 100644
--- a/xbmc/addons/ContextMenuAddon.h
+++ b/xbmc/addons/ContextMenuAddon.h
@@ -21,6 +21,9 @@
 
 #include <list>
 #include <memory>
+#include <string>
+#include <vector>
+
 #include "Addon.h"
 #include "ContextMenuItem.h"
 
diff --git a/xbmc/addons/GUIDialogAddonInfo.h b/xbmc/addons/GUIDialogAddonInfo.h
index f16cd0ada8..aa998000c8 100644
--- a/xbmc/addons/GUIDialogAddonInfo.h
+++ b/xbmc/addons/GUIDialogAddonInfo.h
@@ -20,6 +20,10 @@
  *
  */
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "guilib/GUIDialog.h"
 #include "addons/IAddon.h"
 
diff --git a/xbmc/addons/GUIDialogAddonSettings.h b/xbmc/addons/GUIDialogAddonSettings.h
index 2b25c53151..be85195d52 100644
--- a/xbmc/addons/GUIDialogAddonSettings.h
+++ b/xbmc/addons/GUIDialogAddonSettings.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <map>
+#include <string>
+#include <vector>
+
 #include "dialogs/GUIDialogBoxBase.h"
 #include "IAddon.h"
 
diff --git a/xbmc/addons/GUIWindowAddonBrowser.h b/xbmc/addons/GUIWindowAddonBrowser.h
index 894d3f2953..0831fd9dd1 100644
--- a/xbmc/addons/GUIWindowAddonBrowser.h
+++ b/xbmc/addons/GUIWindowAddonBrowser.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "addons/Addon.h"
 #include "windows/GUIMediaWindow.h"
 #include "ThumbLoader.h"
diff --git a/xbmc/addons/PVRClient.h b/xbmc/addons/PVRClient.h
index 33942781f9..5eef0ebc00 100644
--- a/xbmc/addons/PVRClient.h
+++ b/xbmc/addons/PVRClient.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "addons/Addon.h"
 #include "addons/AddonDll.h"
 #include "addons/DllPVRClient.h"
diff --git a/xbmc/addons/Repository.h b/xbmc/addons/Repository.h
index b3cac90c1a..5ceabc48ba 100644
--- a/xbmc/addons/Repository.h
+++ b/xbmc/addons/Repository.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "Addon.h"
 #include "utils/Job.h"
 #include "utils/ProgressJob.h"
diff --git a/xbmc/addons/Scraper.h b/xbmc/addons/Scraper.h
index 2e9357b62f..081aace5d1 100644
--- a/xbmc/addons/Scraper.h
+++ b/xbmc/addons/Scraper.h
@@ -18,6 +18,11 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "addons/Addon.h"
 #include "XBDateTime.h"
 #include "utils/ScraperUrl.h"
diff --git a/xbmc/addons/Visualisation.h b/xbmc/addons/Visualisation.h
index 10bcb64205..f5aee2f45c 100644
--- a/xbmc/addons/Visualisation.h
+++ b/xbmc/addons/Visualisation.h
@@ -29,6 +29,7 @@
 #include <map>
 #include <list>
 #include <memory>
+#include <vector>
 
 #define AUDIO_BUFFER_SIZE 512 // MUST BE A POWER OF 2!!!
 #define MAX_AUDIO_BUFFERS 16
diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.h b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.h
index 4210394db3..8732ba7d92 100644
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.h
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "addons/Addon.h"
 #include "addons/AddonDll.h"
 #include "addons/DllAudioDSP.h"
diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.h b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.h
index e2c9ecb759..f92a82478f 100644
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.h
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "ActiveAEDSPMode.h"
 
 class CAudioSettings;
diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPMode.h b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPMode.h
index a6ded932af..f0094d55bf 100644
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPMode.h
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPMode.h
@@ -19,7 +19,10 @@
  *
  */
 
+#include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "ActiveAEDSPAddon.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
index add5e535fa..2a31a6e3c0 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <list>
+#include <string>
+#include <vector>
+
 #include "system.h"
 #include "threads/Thread.h"
 
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
index 7f12391bc8..defd18d487 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "cores/AudioEngine/Utils/AEDeviceInfo.h"
 #include "cores/AudioEngine/Sinks/osx/CoreAudioDevice.h"
 
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
index 331b876312..68cde14354 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h
@@ -23,7 +23,9 @@
 
 #if defined(TARGET_DARWIN_OSX)
 
+#include <list>
 #include <string>
+#include <vector>
 
 #include "cores/AudioEngine/Sinks/osx/CoreAudioStream.h"
 
diff --git a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
index 3fb01c1684..3f01060e85 100644
--- a/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
+++ b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h
@@ -28,6 +28,7 @@
 #include <IOKit/audio/IOAudioTypes.h>
 
 #include <list>
+#include <vector>
 
 // not defined in 10.6 sdk
 #ifndef kIOAudioDeviceTransportTypeThunderbolt
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index 484dcde810..771355c398 100644
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -22,6 +22,7 @@
 
 #include "system.h" // until we get sane int types used here
 #include <memory>
+#include <vector>
 #include "IPlayerCallback.h"
 #include "guilib/Geometry.h"
 #include "guilib/Resolution.h"
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h
index a659191876..ef6da1bc2e 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMax.h
@@ -26,6 +26,8 @@
 #include "threads/Event.h"
 
 #include <queue>
+#include <string>
+#include <vector>
 #include <semaphore.h>
 #include <OMX_Core.h>
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h
index 26062402b6..cf569c0d89 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h
@@ -20,6 +20,8 @@
  */
 
 #if defined(HAVE_LIBOPENMAX)
+#include <queue>
+#include <vector>
 
 #include "OpenMax.h"
 #include <EGL/egl.h>
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
index 6f74a72245..cc744c7434 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
@@ -37,6 +37,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <vector>
 #include <va/va.h>
 #include "linux/sse4/DllLibSSE4.h"
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
index 8cc4683e02..56601a177c 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h
@@ -57,8 +57,10 @@
 #include "threads/Thread.h"
 #include "utils/ActorProtocol.h"
 #include "guilib/Geometry.h"
+#include <deque>
 #include <list>
 #include <map>
+#include <vector>
 
 extern "C" {
 #include "libavutil/avutil.h"
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
index e6c9bfd761..af6a599c22 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h
@@ -21,6 +21,7 @@
 
 #include "DVDDemux.h"
 #include <map>
+#include <vector>
 
 extern "C" {
 #include "libavcodec/avcodec.h"
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h
index 2f2b43ea71..65e57e7664 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h
@@ -21,6 +21,8 @@
  */
 
 #include <string>
+#include <vector>
+
 #include "FileItem.h"
 
 class CDVDInputStream;
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h
index a00fed43e6..3ff964e1ef 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h
@@ -22,6 +22,7 @@
 
 #include "DVDInputStream.h"
 #include <memory>
+#include <vector>
 
 class CDVDInputStreamStack : public CDVDInputStream
 {
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h
index f0d0d492b7..57fb8870af 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h
@@ -20,6 +20,9 @@
 
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "DVDInputStream.h"
 #include "addons/InputStream.h"
 
diff --git a/xbmc/cores/VideoPlayer/IVideoPlayer.h b/xbmc/cores/VideoPlayer/IVideoPlayer.h
index 6cd95bb83b..6610893bad 100644
--- a/xbmc/cores/VideoPlayer/IVideoPlayer.h
+++ b/xbmc/cores/VideoPlayer/IVideoPlayer.h
@@ -20,6 +20,10 @@
  *
  */
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "DVDClock.h"
 
 #define VideoPlayer_AUDIO    1
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.h b/xbmc/cores/VideoPlayer/VideoPlayer.h
index 40573c62ed..b9138ecc5f 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.h
@@ -22,6 +22,7 @@
 
 #include <atomic>
 #include <utility>
+#include <vector>
 #include "cores/IPlayer.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "threads/Thread.h"
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
index 62d19d2e97..e2c0223836 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
@@ -20,6 +20,8 @@
  *
  */
 
+#include <vector>
+
 #include "guilib/GraphicContext.h"
 #include "../RenderFlags.h"
 #include "../RenderFormats.h"
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
index 41a696d5f4..e92010b5ef 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
@@ -23,6 +23,8 @@
 #include "system.h"
 
 #ifdef HAS_GL
+#include <vector>
+
 #include "system_gl.h"
 
 #include "FrameBufferObject.h"
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
index 8af1ad328b..afc130e91f 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
@@ -22,6 +22,7 @@
  */
 
 #if HAS_GLES == 2
+#include <vector>
 
 #include "system_gl.h"
 
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
index 554dda2a0d..f349cf74cd 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h
@@ -21,6 +21,8 @@
  */
 
 #ifdef HAS_DX
+#include <string>
+#include <vector>
 
 #include "../../guilib/Geometry.h"
 #include "../WinRenderer.h"
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
index d4f3984d77..e7adc1c914 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
@@ -21,6 +21,7 @@
  */
 
 #if !defined(TARGET_POSIX) && !defined(HAS_GL)
+#include <vector>
 
 #include "BaseRenderer.h"
 #include "HwDecRender/DXVAHD.h"
diff --git a/xbmc/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h
index 5c85f2e5cd..b82a8740df 100644
--- a/xbmc/cores/paplayer/PAPlayer.h
+++ b/xbmc/cores/paplayer/PAPlayer.h
@@ -21,6 +21,7 @@
  */
 
 #include <list>
+#include <vector>
 
 #include "cores/IPlayer.h"
 #include "threads/Thread.h"
diff --git a/xbmc/cores/playercorefactory/PlayerSelectionRule.h b/xbmc/cores/playercorefactory/PlayerSelectionRule.h
index c7cf3eba74..536cea6e8f 100644
--- a/xbmc/cores/playercorefactory/PlayerSelectionRule.h
+++ b/xbmc/cores/playercorefactory/PlayerSelectionRule.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "FileItem.h"
 #include "PlayerCoreFactory.h"
 
diff --git a/xbmc/dbwrappers/dataset.h b/xbmc/dbwrappers/dataset.h
index 101ea5a8ac..133b63abef 100644
--- a/xbmc/dbwrappers/dataset.h
+++ b/xbmc/dbwrappers/dataset.h
@@ -29,9 +29,10 @@
  **********************************************************************/
 
 #include <cstdio>
-#include <string>
-#include <map>
 #include <list>
+#include <map>
+#include <string>
+#include <vector>
 #include "qry_dat.h"
 #include <stdarg.h>
 
diff --git a/xbmc/dialogs/GUIDialogContextMenu.h b/xbmc/dialogs/GUIDialogContextMenu.h
index 4c4a14087b..5c3316ca5a 100644
--- a/xbmc/dialogs/GUIDialogContextMenu.h
+++ b/xbmc/dialogs/GUIDialogContextMenu.h
@@ -20,7 +20,9 @@
  *
  */
 
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "guilib/GUIDialog.h"
 
diff --git a/xbmc/dialogs/GUIDialogExtendedProgressBar.h b/xbmc/dialogs/GUIDialogExtendedProgressBar.h
index 59a1692934..24759b7bd7 100644
--- a/xbmc/dialogs/GUIDialogExtendedProgressBar.h
+++ b/xbmc/dialogs/GUIDialogExtendedProgressBar.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIDialog.h"
 
 class CGUIDialogProgressBarHandle
diff --git a/xbmc/dialogs/GUIDialogFileBrowser.h b/xbmc/dialogs/GUIDialogFileBrowser.h
index d4788e0f09..1850a6482c 100644
--- a/xbmc/dialogs/GUIDialogFileBrowser.h
+++ b/xbmc/dialogs/GUIDialogFileBrowser.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIDialog.h"
 #include "filesystem/VirtualDirectory.h"
 #include "filesystem/DirectoryHistory.h"
diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.h b/xbmc/dialogs/GUIDialogKeyboardGeneric.h
index 356abeb186..1694733dbe 100644
--- a/xbmc/dialogs/GUIDialogKeyboardGeneric.h
+++ b/xbmc/dialogs/GUIDialogKeyboardGeneric.h
@@ -20,6 +20,9 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIKeyboard.h"
 #include "guilib/GUIDialog.h"
 #include "input/KeyboardLayout.h"
diff --git a/xbmc/dialogs/GUIDialogMediaFilter.h b/xbmc/dialogs/GUIDialogMediaFilter.h
index b6f5647edb..6995fe327d 100644
--- a/xbmc/dialogs/GUIDialogMediaFilter.h
+++ b/xbmc/dialogs/GUIDialogMediaFilter.h
@@ -22,6 +22,7 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "dbwrappers/Database.h"
 #include "dbwrappers/DatabaseQuery.h"
diff --git a/xbmc/dialogs/GUIDialogMediaSource.h b/xbmc/dialogs/GUIDialogMediaSource.h
index 66ec95a1ab..2694a41d37 100644
--- a/xbmc/dialogs/GUIDialogMediaSource.h
+++ b/xbmc/dialogs/GUIDialogMediaSource.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIDialog.h"
 
 class CFileItemList;
diff --git a/xbmc/dialogs/GUIDialogSelect.h b/xbmc/dialogs/GUIDialogSelect.h
index eabd9fe9e3..9b4c1f4a6b 100644
--- a/xbmc/dialogs/GUIDialogSelect.h
+++ b/xbmc/dialogs/GUIDialogSelect.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "GUIDialogBoxBase.h"
 #include "view/GUIViewControl.h"
 
diff --git a/xbmc/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h
index 3f5d080a7d..b16c8375f4 100644
--- a/xbmc/epg/EpgInfoTag.h
+++ b/xbmc/epg/EpgInfoTag.h
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "XBDateTime.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
diff --git a/xbmc/epg/GUIEPGGridContainer.h b/xbmc/epg/GUIEPGGridContainer.h
index a47a452a48..e867f16834 100644
--- a/xbmc/epg/GUIEPGGridContainer.h
+++ b/xbmc/epg/GUIEPGGridContainer.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "XBDateTime.h"
 #include "FileItem.h"
 #include "guilib/GUIControl.h"
diff --git a/xbmc/filesystem/MultiPathDirectory.h b/xbmc/filesystem/MultiPathDirectory.h
index 481c2f88e2..68e2586ba3 100644
--- a/xbmc/filesystem/MultiPathDirectory.h
+++ b/xbmc/filesystem/MultiPathDirectory.h
@@ -21,6 +21,8 @@
 
 #include <set>
 #include <string>
+#include <vector>
+
 #include "IDirectory.h"
 
 namespace XFILE
diff --git a/xbmc/filesystem/PipeFile.h b/xbmc/filesystem/PipeFile.h
index 62c945dd60..ae307ebb7f 100644
--- a/xbmc/filesystem/PipeFile.h
+++ b/xbmc/filesystem/PipeFile.h
@@ -28,6 +28,8 @@
 #define AFX_FILEPIPE_H__DD2B0A9E_4971_4A29_B525_78CEFCDAF4A1__INCLUDED_
 
 #pragma once
+#include <string>
+#include <vector>
 
 #include "IFile.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/filesystem/SourcesDirectory.h b/xbmc/filesystem/SourcesDirectory.h
index 3d6dc2d568..a5c6780e30 100644
--- a/xbmc/filesystem/SourcesDirectory.h
+++ b/xbmc/filesystem/SourcesDirectory.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "IDirectory.h"
 
 class CMediaSource;
diff --git a/xbmc/filesystem/StackDirectory.h b/xbmc/filesystem/StackDirectory.h
index e3697f5ca9..ee3236c44f 100644
--- a/xbmc/filesystem/StackDirectory.h
+++ b/xbmc/filesystem/StackDirectory.h
@@ -22,6 +22,7 @@
 #include "IDirectory.h"
 #include "utils/RegExp.h"
 #include <string>
+#include <vector>
 
 namespace XFILE
 {
diff --git a/xbmc/filesystem/XbtFile.h b/xbmc/filesystem/XbtFile.h
index 05ab78a0cc..116c6f2369 100644
--- a/xbmc/filesystem/XbtFile.h
+++ b/xbmc/filesystem/XbtFile.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "IFile.h"
 #include "URL.h"
 #include "guilib/XBTF.h"
diff --git a/xbmc/filesystem/XbtManager.h b/xbmc/filesystem/XbtManager.h
index 0e15889e8b..8932c06ac0 100644
--- a/xbmc/filesystem/XbtManager.h
+++ b/xbmc/filesystem/XbtManager.h
@@ -22,6 +22,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "guilib/XBTFReader.h"
 
diff --git a/xbmc/games/controllers/windows/IConfigurationWindow.h b/xbmc/games/controllers/windows/IConfigurationWindow.h
index 423514274a..b6ef34c6d9 100644
--- a/xbmc/games/controllers/windows/IConfigurationWindow.h
+++ b/xbmc/games/controllers/windows/IConfigurationWindow.h
@@ -23,6 +23,7 @@
 #include "input/joysticks/JoystickTypes.h"
 
 #include <string>
+#include <vector>
 
 class CEvent;
 
diff --git a/xbmc/guilib/GUIBaseContainer.h b/xbmc/guilib/GUIBaseContainer.h
index b941689259..52960bf538 100644
--- a/xbmc/guilib/GUIBaseContainer.h
+++ b/xbmc/guilib/GUIBaseContainer.h
@@ -26,6 +26,7 @@
  */
 
 #include <utility>
+#include <vector>
 
 #include "GUIListItemLayout.h"
 #include "IGUIContainer.h"
diff --git a/xbmc/guilib/GUIControl.h b/xbmc/guilib/GUIControl.h
index 0293bd66c6..29858fc87d 100644
--- a/xbmc/guilib/GUIControl.h
+++ b/xbmc/guilib/GUIControl.h
@@ -27,6 +27,8 @@
  *
  */
 
+#include <vector>
+
 #include "GraphicContext.h" // needed by any rendering operation (all controls)
 #include "GUIMessage.h"     // needed by practically all controls
 #include "VisibleEffect.h"  // needed for the CAnimation members
diff --git a/xbmc/guilib/GUIControlFactory.h b/xbmc/guilib/GUIControlFactory.h
index 3ae86dfc16..ce9177e3d0 100644
--- a/xbmc/guilib/GUIControlFactory.h
+++ b/xbmc/guilib/GUIControlFactory.h
@@ -28,6 +28,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "GUIControl.h"
 
 class CTextureInfo; // forward
diff --git a/xbmc/guilib/GUIControlGroup.h b/xbmc/guilib/GUIControlGroup.h
index 0b38a56d88..ea1d8fc65c 100644
--- a/xbmc/guilib/GUIControlGroup.h
+++ b/xbmc/guilib/GUIControlGroup.h
@@ -25,6 +25,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIControl.h"
 
 /*!
diff --git a/xbmc/guilib/GUIControlProfiler.h b/xbmc/guilib/GUIControlProfiler.h
index b62ebb352a..c432b019e0 100644
--- a/xbmc/guilib/GUIControlProfiler.h
+++ b/xbmc/guilib/GUIControlProfiler.h
@@ -22,6 +22,8 @@
 #define GUILIB_GUICONTROLPROFILER_H__
 #pragma once
 
+#include <vector>
+
 #include "GUIControl.h"
 
 class CGUIControlProfiler;
diff --git a/xbmc/guilib/GUIFadeLabelControl.h b/xbmc/guilib/GUIFadeLabelControl.h
index 6cae459084..f17c14dd67 100644
--- a/xbmc/guilib/GUIFadeLabelControl.h
+++ b/xbmc/guilib/GUIFadeLabelControl.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIControl.h"
 #include "GUILabel.h"
 
diff --git a/xbmc/guilib/GUIFontManager.h b/xbmc/guilib/GUIFontManager.h
index 5d1a07b1fd..5f8745da24 100644
--- a/xbmc/guilib/GUIFontManager.h
+++ b/xbmc/guilib/GUIFontManager.h
@@ -29,6 +29,7 @@
  */
 
 #include <utility>
+#include <vector>
 
 #include "GraphicContext.h"
 #include "IMsgTargetCallback.h"
diff --git a/xbmc/guilib/GUIFontTTFDX.h b/xbmc/guilib/GUIFontTTFDX.h
index af7f557bbd..c66ce34273 100644
--- a/xbmc/guilib/GUIFontTTFDX.h
+++ b/xbmc/guilib/GUIFontTTFDX.h
@@ -30,6 +30,7 @@
 #include "D3DResource.h"
 #include "GUIFontTTF.h"
 #include <list>
+#include <vector>
 
 #define ELEMENT_ARRAY_MAX_CHAR_INDEX (2000)
 
diff --git a/xbmc/guilib/GUIFontTTFGL.h b/xbmc/guilib/GUIFontTTFGL.h
index bcde308bcd..88c5f4091e 100644
--- a/xbmc/guilib/GUIFontTTFGL.h
+++ b/xbmc/guilib/GUIFontTTFGL.h
@@ -28,6 +28,9 @@
 #pragma once
 
 
+#include <string>
+#include <vector>
+
 #include "GUIFontTTF.h"
 #include "system.h"
 #include "system_gl.h"
diff --git a/xbmc/guilib/GUIImage.h b/xbmc/guilib/GUIImage.h
index 27f9fd9cc3..8eb80970b1 100644
--- a/xbmc/guilib/GUIImage.h
+++ b/xbmc/guilib/GUIImage.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIControl.h"
 #include "GUITexture.h"
 
diff --git a/xbmc/guilib/GUIMultiImage.h b/xbmc/guilib/GUIMultiImage.h
index e4af967ae1..84535c5ef3 100644
--- a/xbmc/guilib/GUIMultiImage.h
+++ b/xbmc/guilib/GUIMultiImage.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIImage.h"
 #include "utils/Stopwatch.h"
 #include "utils/Job.h"
diff --git a/xbmc/guilib/GUIRSSControl.h b/xbmc/guilib/GUIRSSControl.h
index 33dc2f78af..583ea20734 100644
--- a/xbmc/guilib/GUIRSSControl.h
+++ b/xbmc/guilib/GUIRSSControl.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIControl.h"
 #include "GUILabel.h"
 #include "utils/IRssObserver.h"
diff --git a/xbmc/guilib/GUISpinControl.h b/xbmc/guilib/GUISpinControl.h
index fee7875eec..83866d7244 100644
--- a/xbmc/guilib/GUISpinControl.h
+++ b/xbmc/guilib/GUISpinControl.h
@@ -28,6 +28,8 @@
  *
  */
 
+#include <vector>
+
 #include "GUIControl.h"
 #include "GUITexture.h"
 #include "GUILabel.h"
diff --git a/xbmc/guilib/GUIStaticItem.h b/xbmc/guilib/GUIStaticItem.h
index 20c71823dc..a3f268efa5 100644
--- a/xbmc/guilib/GUIStaticItem.h
+++ b/xbmc/guilib/GUIStaticItem.h
@@ -26,6 +26,7 @@
  */
 
 #include <utility>
+#include <vector>
 
 #include "GUIAction.h"
 #include "GUIInfoTypes.h"
diff --git a/xbmc/guilib/GUIWindowManager.h b/xbmc/guilib/GUIWindowManager.h
index 150765d37c..85c81fced2 100644
--- a/xbmc/guilib/GUIWindowManager.h
+++ b/xbmc/guilib/GUIWindowManager.h
@@ -30,6 +30,7 @@
 
 #include <list>
 #include <utility>
+#include <vector>
 
 #include "DirtyRegionTracker.h"
 #include "guilib/WindowIDs.h"
diff --git a/xbmc/input/InputCodingTableBaiduPY.h b/xbmc/input/InputCodingTableBaiduPY.h
index 032d39856a..3f7c3bb251 100644
--- a/xbmc/input/InputCodingTableBaiduPY.h
+++ b/xbmc/input/InputCodingTableBaiduPY.h
@@ -22,6 +22,9 @@
 
 #include <deque>
 #include <map>
+#include <string>
+#include <vector>
+
 #include "InputCodingTable.h"
 #include "threads/Thread.h"
 
diff --git a/xbmc/input/InputCodingTableBasePY.h b/xbmc/input/InputCodingTableBasePY.h
index 7d9f6dabf7..10a5463768 100644
--- a/xbmc/input/InputCodingTableBasePY.h
+++ b/xbmc/input/InputCodingTableBasePY.h
@@ -23,6 +23,7 @@
 #include "InputCodingTable.h"
 #include <map>
 #include <string>
+#include <vector>
 
 class CInputCodingTableBasePY : public IInputCodingTable
 {
diff --git a/xbmc/input/InputCodingTableKorean.h b/xbmc/input/InputCodingTableKorean.h
index d2d3d9b4f9..7cff581f5d 100644
--- a/xbmc/input/InputCodingTableKorean.h
+++ b/xbmc/input/InputCodingTableKorean.h
@@ -23,6 +23,7 @@
 #include "InputCodingTable.h"
 #include <map>
 #include <string>
+#include <vector>
 
 class CInputCodingTableKorean : public IInputCodingTable
 {
diff --git a/xbmc/input/KeyboardLayoutManager.h b/xbmc/input/KeyboardLayoutManager.h
index 351eb93445..cfe7ad905a 100644
--- a/xbmc/input/KeyboardLayoutManager.h
+++ b/xbmc/input/KeyboardLayoutManager.h
@@ -22,6 +22,7 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "input/KeyboardLayout.h"
 
diff --git a/xbmc/interfaces/generic/LanguageInvokerThread.h b/xbmc/interfaces/generic/LanguageInvokerThread.h
index b3bf52eec1..65a77651cf 100644
--- a/xbmc/interfaces/generic/LanguageInvokerThread.h
+++ b/xbmc/interfaces/generic/LanguageInvokerThread.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "interfaces/generic/ILanguageInvoker.h"
 #include "threads/Thread.h"
 
diff --git a/xbmc/interfaces/generic/ScriptInvocationManager.h b/xbmc/interfaces/generic/ScriptInvocationManager.h
index a9ebc9c29b..aa5a162884 100644
--- a/xbmc/interfaces/generic/ScriptInvocationManager.h
+++ b/xbmc/interfaces/generic/ScriptInvocationManager.h
@@ -20,8 +20,9 @@
  */
 
 #include <map>
-#include <set>
 #include <memory>
+#include <set>
+#include <vector>
 
 #include "addons/IAddon.h"
 #include "interfaces/generic/ILanguageInvoker.h"
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.h b/xbmc/interfaces/json-rpc/AudioLibrary.h
index 33c05de5ee..6b4a2dd09c 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.h
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.h
@@ -20,6 +20,8 @@
  */
 
 #include <set>
+#include <string>
+#include <vector>
 
 #include "JSONRPC.h"
 #include "FileItemHandler.h"
diff --git a/xbmc/interfaces/json-rpc/JSONUtils.h b/xbmc/interfaces/json-rpc/JSONUtils.h
index a3c9a0bafe..0e1cd1c55d 100644
--- a/xbmc/interfaces/json-rpc/JSONUtils.h
+++ b/xbmc/interfaces/json-rpc/JSONUtils.h
@@ -21,6 +21,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <vector>
 
 #include "JSONRPCUtils.h"
 #include "XBDateTime.h"
diff --git a/xbmc/interfaces/json-rpc/SettingsOperations.h b/xbmc/interfaces/json-rpc/SettingsOperations.h
index c221129139..c4680aef91 100644
--- a/xbmc/interfaces/json-rpc/SettingsOperations.h
+++ b/xbmc/interfaces/json-rpc/SettingsOperations.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JSONRPC.h"
 
 class CVariant;
diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.h b/xbmc/interfaces/json-rpc/VideoLibrary.h
index 4e5e7b5b31..f1bac0bdae 100644
--- a/xbmc/interfaces/json-rpc/VideoLibrary.h
+++ b/xbmc/interfaces/json-rpc/VideoLibrary.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "utils/DatabaseUtils.h"
 #include "JSONRPC.h"
 #include "FileItemHandler.h"
diff --git a/xbmc/interfaces/legacy/Control.h b/xbmc/interfaces/legacy/Control.h
index 7da4249e40..ac7b848d1f 100644
--- a/xbmc/interfaces/legacy/Control.h
+++ b/xbmc/interfaces/legacy/Control.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "guilib/GUIControl.h"
 #include "guilib/GUIFont.h"
 #include "input/Key.h"
diff --git a/xbmc/interfaces/legacy/ModuleXbmcplugin.h b/xbmc/interfaces/legacy/ModuleXbmcplugin.h
index 39d56d1ebb..184ada94ec 100644
--- a/xbmc/interfaces/legacy/ModuleXbmcplugin.h
+++ b/xbmc/interfaces/legacy/ModuleXbmcplugin.h
@@ -18,6 +18,8 @@
  *
  */
 
+#include <vector>
+
 #include "Tuple.h"
 #include "AddonString.h"
 #include "ListItem.h"
diff --git a/xbmc/interfaces/legacy/Player.h b/xbmc/interfaces/legacy/Player.h
index 717fabc28f..29ee6fcb12 100644
--- a/xbmc/interfaces/legacy/Player.h
+++ b/xbmc/interfaces/legacy/Player.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "ListItem.h"
 #include "PlayList.h"
 #include "InfoTagVideo.h"
diff --git a/xbmc/interfaces/legacy/Window.h b/xbmc/interfaces/legacy/Window.h
index af26b17b7a..746692c726 100644
--- a/xbmc/interfaces/legacy/Window.h
+++ b/xbmc/interfaces/legacy/Window.h
@@ -20,6 +20,7 @@
 
 #pragma once
 #include <limits.h>
+#include <vector>
 
 #include "AddonCallback.h"
 #include "Control.h"
diff --git a/xbmc/interfaces/legacy/WindowXML.h b/xbmc/interfaces/legacy/WindowXML.h
index 97088d4bdb..d2fa2c7050 100644
--- a/xbmc/interfaces/legacy/WindowXML.h
+++ b/xbmc/interfaces/legacy/WindowXML.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <limits.h>
+#include <vector>
 
 #include "Window.h"
 #include "windows/GUIMediaWindow.h"
diff --git a/xbmc/interfaces/legacy/wsgi/WsgiResponse.h b/xbmc/interfaces/legacy/wsgi/WsgiResponse.h
index a679faabe2..a74163134c 100644
--- a/xbmc/interfaces/legacy/wsgi/WsgiResponse.h
+++ b/xbmc/interfaces/legacy/wsgi/WsgiResponse.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "interfaces/legacy/AddonClass.h"
 #include "interfaces/legacy/Tuple.h"
 #include "interfaces/legacy/wsgi/WsgiResponseBody.h"
diff --git a/xbmc/interfaces/python/PythonInvoker.h b/xbmc/interfaces/python/PythonInvoker.h
index 6dab1df59e..11fb396c2f 100644
--- a/xbmc/interfaces/python/PythonInvoker.h
+++ b/xbmc/interfaces/python/PythonInvoker.h
@@ -21,6 +21,7 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "interfaces/generic/ILanguageInvoker.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/linux/OMXCore.h b/xbmc/linux/OMXCore.h
index 2d7355a1a3..5536cb9201 100644
--- a/xbmc/linux/OMXCore.h
+++ b/xbmc/linux/OMXCore.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <queue>
+#include <vector>
 
 //! @todo should this be in configure
 #ifndef OMX_SKIP64BIT
diff --git a/xbmc/linux/PosixMountProvider.h b/xbmc/linux/PosixMountProvider.h
index d34247f67c..df4cabe93c 100644
--- a/xbmc/linux/PosixMountProvider.h
+++ b/xbmc/linux/PosixMountProvider.h
@@ -18,6 +18,9 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <string>
+#include <vector>
+ 
 #include "storage/IStorageProvider.h"
 
 class CPosixMountProvider : public IStorageProvider
diff --git a/xbmc/listproviders/DirectoryProvider.h b/xbmc/listproviders/DirectoryProvider.h
index d8dad254bd..d72a30fc1a 100644
--- a/xbmc/listproviders/DirectoryProvider.h
+++ b/xbmc/listproviders/DirectoryProvider.h
@@ -21,6 +21,8 @@
 #pragma once
 
 #include <string>
+#include <vector>
+
 #include "IListProvider.h"
 #include "guilib/GUIStaticItem.h"
 #include "utils/Job.h"
diff --git a/xbmc/listproviders/StaticProvider.h b/xbmc/listproviders/StaticProvider.h
index 5a869e8cad..9dd78d3600 100644
--- a/xbmc/listproviders/StaticProvider.h
+++ b/xbmc/listproviders/StaticProvider.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "IListProvider.h"
 #include "guilib/GUIStaticItem.h"
 
diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h
index 12c0d969ea..0a23add5ad 100644
--- a/xbmc/music/MusicDatabase.h
+++ b/xbmc/music/MusicDatabase.h
@@ -23,6 +23,7 @@
 */
 #pragma once
 #include <utility>
+#include <vector>
 
 #include "addons/Scraper.h"
 #include "Album.h"
diff --git a/xbmc/music/infoscanner/MusicInfoScraper.h b/xbmc/music/infoscanner/MusicInfoScraper.h
index fa9a977f8b..b5f3188d36 100644
--- a/xbmc/music/infoscanner/MusicInfoScraper.h
+++ b/xbmc/music/infoscanner/MusicInfoScraper.h
@@ -20,6 +20,8 @@
  *
  */
 
+#include <vector>
+
 #include "MusicAlbumInfo.h"
 #include "MusicArtistInfo.h"
 #include "addons/Scraper.h"
diff --git a/xbmc/music/windows/GUIWindowMusicBase.h b/xbmc/music/windows/GUIWindowMusicBase.h
index 11c22da159..6d26e8d97a 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.h
+++ b/xbmc/music/windows/GUIWindowMusicBase.h
@@ -23,6 +23,8 @@
  *
  */
 
+#include <vector>
+
 #include "windows/GUIMediaWindow.h"
 #include "music/MusicDatabase.h"
 #include "music/infoscanner/MusicInfoScraper.h"
diff --git a/xbmc/network/AirPlayServer.h b/xbmc/network/AirPlayServer.h
index 971d464418..46f80d6ebb 100644
--- a/xbmc/network/AirPlayServer.h
+++ b/xbmc/network/AirPlayServer.h
@@ -26,6 +26,7 @@
 #ifdef HAS_AIRPLAY
 
 #include <map>
+#include <vector>
 #include <sys/socket.h>
 #include "threads/Thread.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/network/UdpClient.h b/xbmc/network/UdpClient.h
index 576849be4b..ef018c4946 100644
--- a/xbmc/network/UdpClient.h
+++ b/xbmc/network/UdpClient.h
@@ -24,6 +24,7 @@
  */
 
 #include <string>
+#include <vector>
 #include "threads/Thread.h"
 #include "threads/CriticalSection.h"
 #include <sys/socket.h>
diff --git a/xbmc/network/WakeOnAccess.h b/xbmc/network/WakeOnAccess.h
index 47f86b4815..27ab58167f 100644
--- a/xbmc/network/WakeOnAccess.h
+++ b/xbmc/network/WakeOnAccess.h
@@ -24,6 +24,7 @@
 #include "settings/lib/ISettingCallback.h"
 #include "settings/lib/ISettingsHandler.h"
 #include <string>
+#include <vector>
 
 class CWakeOnAccess : private IJobCallback, public ISettingCallback, public ISettingsHandler
 {
diff --git a/xbmc/network/linux/ZeroconfBrowserAvahi.h b/xbmc/network/linux/ZeroconfBrowserAvahi.h
index 4e56ad92f0..a20028e09a 100644
--- a/xbmc/network/linux/ZeroconfBrowserAvahi.h
+++ b/xbmc/network/linux/ZeroconfBrowserAvahi.h
@@ -24,6 +24,7 @@
 
 #include <memory>
 #include <map>
+#include <vector>
 
 #include "network/ZeroconfBrowser.h"
 #include "threads/Thread.h"
diff --git a/xbmc/network/mdns/ZeroconfBrowserMDNS.h b/xbmc/network/mdns/ZeroconfBrowserMDNS.h
index fb35106760..83206b4196 100644
--- a/xbmc/network/mdns/ZeroconfBrowserMDNS.h
+++ b/xbmc/network/mdns/ZeroconfBrowserMDNS.h
@@ -22,6 +22,7 @@
 #include <map>
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <dns_sd.h>
 
diff --git a/xbmc/network/mdns/ZeroconfMDNS.h b/xbmc/network/mdns/ZeroconfMDNS.h
index e6360abb2c..fdad063ba3 100644
--- a/xbmc/network/mdns/ZeroconfMDNS.h
+++ b/xbmc/network/mdns/ZeroconfMDNS.h
@@ -25,7 +25,9 @@
 #include "threads/Thread.h"
 
 #include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
 class CZeroconfMDNS : public CZeroconf,public CThread
 {
diff --git a/xbmc/network/osx/ZeroconfBrowserOSX.h b/xbmc/network/osx/ZeroconfBrowserOSX.h
index ba9067d0de..f787f68b8c 100644
--- a/xbmc/network/osx/ZeroconfBrowserOSX.h
+++ b/xbmc/network/osx/ZeroconfBrowserOSX.h
@@ -21,6 +21,8 @@
 
 #include <memory>
 #include <map>
+#include <string>
+#include <vector>
 
 #include "network/ZeroconfBrowser.h"
 #include "threads/Thread.h"
diff --git a/xbmc/peripherals/EventScanner.h b/xbmc/peripherals/EventScanner.h
index a645c0009f..fd9b0356c6 100644
--- a/xbmc/peripherals/EventScanner.h
+++ b/xbmc/peripherals/EventScanner.h
@@ -19,6 +19,8 @@
  */
 #pragma once
 
+#include <vector>
+
 #include "EventScanRate.h"
 #include "threads/CriticalSection.h"
 #include "threads/Event.h"
diff --git a/xbmc/peripherals/Peripherals.h b/xbmc/peripherals/Peripherals.h
index f851c6bb29..ed886df652 100644
--- a/xbmc/peripherals/Peripherals.h
+++ b/xbmc/peripherals/Peripherals.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "EventScanner.h"
 #include "bus/PeripheralBus.h"
 #include "devices/Peripheral.h"
diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusAddon.h b/xbmc/peripherals/bus/virtual/PeripheralBusAddon.h
index 36c76ff1ec..2f09b5acb3 100644
--- a/xbmc/peripherals/bus/virtual/PeripheralBusAddon.h
+++ b/xbmc/peripherals/bus/virtual/PeripheralBusAddon.h
@@ -29,6 +29,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 namespace PERIPHERALS
 {
diff --git a/xbmc/peripherals/devices/Peripheral.h b/xbmc/peripherals/devices/Peripheral.h
index 1b9da9b8b5..646f588c29 100644
--- a/xbmc/peripherals/devices/Peripheral.h
+++ b/xbmc/peripherals/devices/Peripheral.h
@@ -22,6 +22,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 #include "peripherals/PeripheralTypes.h"
 
 class TiXmlDocument;
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.h b/xbmc/peripherals/devices/PeripheralCecAdapter.h
index 2f1aa12b1d..e7f769f416 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.h
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.h
@@ -50,6 +50,7 @@ namespace PERIPHERALS
 #include "threads/Thread.h"
 #include "threads/CriticalSection.h"
 #include <queue>
+#include <vector>
 
 // undefine macro isset, it collides with function in cectypes.h
 #ifdef isset
diff --git a/xbmc/platform/android/jni/ApplicationInfo.h b/xbmc/platform/android/jni/ApplicationInfo.h
index edf6ccfdde..7c22aaed3e 100644
--- a/xbmc/platform/android/jni/ApplicationInfo.h
+++ b/xbmc/platform/android/jni/ApplicationInfo.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 #include "PackageItemInfo.h"
 
diff --git a/xbmc/platform/android/jni/ByteBuffer.h b/xbmc/platform/android/jni/ByteBuffer.h
index e74a78b582..83286b3616 100644
--- a/xbmc/platform/android/jni/ByteBuffer.h
+++ b/xbmc/platform/android/jni/ByteBuffer.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "Buffer.h"
 
 class CJNIByteBuffer : public CJNIBuffer
diff --git a/xbmc/platform/android/jni/ConnectivityManager.h b/xbmc/platform/android/jni/ConnectivityManager.h
index 38433ce971..87a9c7bdd7 100644
--- a/xbmc/platform/android/jni/ConnectivityManager.h
+++ b/xbmc/platform/android/jni/ConnectivityManager.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNINetworkInfo;
diff --git a/xbmc/platform/android/jni/ContentResolver.h b/xbmc/platform/android/jni/ContentResolver.h
index 8c63f2514b..5f9a1d120a 100644
--- a/xbmc/platform/android/jni/ContentResolver.h
+++ b/xbmc/platform/android/jni/ContentResolver.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNICursor;
diff --git a/xbmc/platform/android/jni/Cursor.h b/xbmc/platform/android/jni/Cursor.h
index 30521ca5fb..c626cd1032 100644
--- a/xbmc/platform/android/jni/Cursor.h
+++ b/xbmc/platform/android/jni/Cursor.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 #include "MediaStore.h"
 
diff --git a/xbmc/platform/android/jni/Display.h b/xbmc/platform/android/jni/Display.h
index 536a753bd0..8d9012a1d3 100644
--- a/xbmc/platform/android/jni/Display.h
+++ b/xbmc/platform/android/jni/Display.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNIDisplay : public CJNIBase
diff --git a/xbmc/platform/android/jni/InputManager.h b/xbmc/platform/android/jni/InputManager.h
index 5ac9630bb6..88e857c5ee 100644
--- a/xbmc/platform/android/jni/InputManager.h
+++ b/xbmc/platform/android/jni/InputManager.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 #include "View.h"
 
diff --git a/xbmc/platform/android/jni/MediaCodec.h b/xbmc/platform/android/jni/MediaCodec.h
index a0b63b1f3e..a1660ec0f2 100644
--- a/xbmc/platform/android/jni/MediaCodec.h
+++ b/xbmc/platform/android/jni/MediaCodec.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 #include "ByteBuffer.h"
 #include "MediaCodecBufferInfo.h"
diff --git a/xbmc/platform/android/jni/MediaCodecCryptoInfo.h b/xbmc/platform/android/jni/MediaCodecCryptoInfo.h
index ada3f076cd..0be6a52ba6 100644
--- a/xbmc/platform/android/jni/MediaCodecCryptoInfo.h
+++ b/xbmc/platform/android/jni/MediaCodecCryptoInfo.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNIMediaCodecCryptoInfo : public CJNIBase
diff --git a/xbmc/platform/android/jni/MediaCodecInfo.h b/xbmc/platform/android/jni/MediaCodecInfo.h
index 6810e13128..f669a89e1b 100644
--- a/xbmc/platform/android/jni/MediaCodecInfo.h
+++ b/xbmc/platform/android/jni/MediaCodecInfo.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNIMediaCodecInfoCodecProfileLevel : public CJNIBase
diff --git a/xbmc/platform/android/jni/Os.h b/xbmc/platform/android/jni/Os.h
index 2469c60b3a..07eb302664 100644
--- a/xbmc/platform/android/jni/Os.h
+++ b/xbmc/platform/android/jni/Os.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNIOsVibrator : public CJNIBase
diff --git a/xbmc/platform/android/jni/ScanResult.h b/xbmc/platform/android/jni/ScanResult.h
index 0cb0fd83e3..194cdad8d2 100644
--- a/xbmc/platform/android/jni/ScanResult.h
+++ b/xbmc/platform/android/jni/ScanResult.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 
 class CJNIScanResult : public CJNIBase
diff --git a/xbmc/platform/android/jni/WifiConfiguration.h b/xbmc/platform/android/jni/WifiConfiguration.h
index 9252efb593..4d7b8af0ef 100644
--- a/xbmc/platform/android/jni/WifiConfiguration.h
+++ b/xbmc/platform/android/jni/WifiConfiguration.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "JNIBase.h"
 #include "BitSet.h"
 
diff --git a/xbmc/playlists/PlayList.h b/xbmc/playlists/PlayList.h
index 20fb964760..1126992176 100644
--- a/xbmc/playlists/PlayList.h
+++ b/xbmc/playlists/PlayList.h
@@ -22,6 +22,7 @@
 #include "FileItem.h"
 #include <memory>
 #include <string>
+#include <vector>
 
 namespace PLAYLIST
 {
diff --git a/xbmc/playlists/PlayListPLS.h b/xbmc/playlists/PlayListPLS.h
index 49769c4f92..eb9cb21746 100644
--- a/xbmc/playlists/PlayListPLS.h
+++ b/xbmc/playlists/PlayListPLS.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "PlayList.h"
 
 namespace PLAYLIST
diff --git a/xbmc/pvr/PVRDatabase.h b/xbmc/pvr/PVRDatabase.h
index 4aa8c0bbd3..4e8900ee5d 100644
--- a/xbmc/pvr/PVRDatabase.h
+++ b/xbmc/pvr/PVRDatabase.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "dbwrappers/Database.h"
 #include "utils/log.h"
 
diff --git a/xbmc/pvr/PVRGUIInfo.h b/xbmc/pvr/PVRGUIInfo.h
index 6245dc8dbf..a5529fc554 100644
--- a/xbmc/pvr/PVRGUIInfo.h
+++ b/xbmc/pvr/PVRGUIInfo.h
@@ -27,6 +27,8 @@
 #include "utils/Observer.h"
 
 #include <atomic>
+#include <memory>
+#include <vector>
 
 namespace EPG
 {
diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h
index a688d7ff37..bcf971c596 100644
--- a/xbmc/pvr/PVRManager.h
+++ b/xbmc/pvr/PVRManager.h
@@ -32,6 +32,7 @@
 
 #include <map>
 #include <memory>
+#include <vector>
 
 class CGUIDialogProgressBarHandle;
 class CStopWatch;
diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h
index 30594bc9f6..3023466c75 100644
--- a/xbmc/pvr/channels/PVRChannelGroup.h
+++ b/xbmc/pvr/channels/PVRChannelGroup.h
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 class CDateTime;
 class CFileItem;
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
index 9b9584bfe6..c84246faeb 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 #include "dialogs/GUIDialogContextMenu.h"
 #include "guilib/GUIDialog.h"
 #include "view/GUIViewControl.h"
diff --git a/xbmc/pvr/recordings/PVRRecording.h b/xbmc/pvr/recordings/PVRRecording.h
index c12c7d35de..2e01728b89 100644
--- a/xbmc/pvr/recordings/PVRRecording.h
+++ b/xbmc/pvr/recordings/PVRRecording.h
@@ -35,6 +35,10 @@
  *
  */
 
+#include <string>
+#include <memory>
+#include <vector>
+
 #include "XBDateTime.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
 #include "video/VideoInfoTag.h"
diff --git a/xbmc/pvr/timers/PVRTimers.h b/xbmc/pvr/timers/PVRTimers.h
index 7faadf8cbc..a3c0263558 100644
--- a/xbmc/pvr/timers/PVRTimers.h
+++ b/xbmc/pvr/timers/PVRTimers.h
@@ -21,6 +21,7 @@
 
 #include <map>
 #include <memory>
+#include <vector>
 
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
 #include "PVRTimerInfoTag.h"
diff --git a/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h b/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h
index c573098a65..67fb34d853 100644
--- a/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.h
@@ -20,6 +20,7 @@
  */
 
 #include <utility>
+#include <vector>
 
 #include "cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.h"
 #include "settings/dialogs/GUIDialogSettingsManualBase.h"
diff --git a/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h
index 3798dcd162..47022ae3ec 100644
--- a/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h
+++ b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h
@@ -21,6 +21,8 @@
  */
 
 #include <map>
+#include <string>
+#include <vector>
 
 #include "addons/IAddon.h"
 #include "settings/dialogs/GUIDialogSettingsManagerBase.h"
diff --git a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
index 671c09bed7..34d5af4a0c 100644
--- a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
+++ b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
@@ -20,6 +20,8 @@
  *
  */
 
+#include <vector>
+
 #include "guilib/GUIWindow.h"
 
 class CGUIWindowSettingsScreenCalibration : public CGUIWindow
diff --git a/xbmc/storage/IStorageProvider.h b/xbmc/storage/IStorageProvider.h
index 0325b0b9e5..c02c7c2c5b 100644
--- a/xbmc/storage/IStorageProvider.h
+++ b/xbmc/storage/IStorageProvider.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "system.h"
 #include "MediaSource.h"
 #ifdef HAS_DVD_DRIVE
diff --git a/xbmc/storage/MediaManager.h b/xbmc/storage/MediaManager.h
index a2c71a5ec0..3ea422ff02 100644
--- a/xbmc/storage/MediaManager.h
+++ b/xbmc/storage/MediaManager.h
@@ -19,8 +19,10 @@
  *
  */
 
-#include "MediaSource.h" // for VECSOURCES
 #include <map>
+#include <vector>
+
+#include "MediaSource.h" // for VECSOURCES
 #include "utils/Job.h"
 #include "IStorageProvider.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/storage/android/AndroidStorageProvider.h b/xbmc/storage/android/AndroidStorageProvider.h
index d405c206ed..33628d9dc3 100644
--- a/xbmc/storage/android/AndroidStorageProvider.h
+++ b/xbmc/storage/android/AndroidStorageProvider.h
@@ -20,6 +20,9 @@
  */
 
 #include <set>
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 
 class CAndroidStorageProvider : public IStorageProvider
diff --git a/xbmc/storage/linux/DeviceKitDisksProvider.h b/xbmc/storage/linux/DeviceKitDisksProvider.h
index 2902fe5d2f..4888eda020 100644
--- a/xbmc/storage/linux/DeviceKitDisksProvider.h
+++ b/xbmc/storage/linux/DeviceKitDisksProvider.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 #ifdef HAS_DBUS
 #include "DBusUtil.h"
diff --git a/xbmc/storage/linux/LinuxStorageProvider.h b/xbmc/storage/linux/LinuxStorageProvider.h
index 6cda86086e..b4794abe64 100644
--- a/xbmc/storage/linux/LinuxStorageProvider.h
+++ b/xbmc/storage/linux/LinuxStorageProvider.h
@@ -18,6 +18,9 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 #include "DeviceKitDisksProvider.h"
 #include "UDevProvider.h"
diff --git a/xbmc/storage/linux/UDevProvider.h b/xbmc/storage/linux/UDevProvider.h
index 35ae37e075..5c890cfc3d 100644
--- a/xbmc/storage/linux/UDevProvider.h
+++ b/xbmc/storage/linux/UDevProvider.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 
 #ifdef HAVE_LIBUDEV
diff --git a/xbmc/storage/linux/UDisksProvider.h b/xbmc/storage/linux/UDisksProvider.h
index 572103fe2a..cbc824355e 100644
--- a/xbmc/storage/linux/UDisksProvider.h
+++ b/xbmc/storage/linux/UDisksProvider.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 #ifdef HAS_DBUS
 #include "DBusUtil.h"
diff --git a/xbmc/storage/osx/DarwinStorageProvider.h b/xbmc/storage/osx/DarwinStorageProvider.h
index e337432241..4d50d268c0 100644
--- a/xbmc/storage/osx/DarwinStorageProvider.h
+++ b/xbmc/storage/osx/DarwinStorageProvider.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 
 class CDarwinStorageProvider : public IStorageProvider
diff --git a/xbmc/storage/windows/Win32StorageProvider.h b/xbmc/storage/windows/Win32StorageProvider.h
index 2b123e9144..cce1a390f3 100644
--- a/xbmc/storage/windows/Win32StorageProvider.h
+++ b/xbmc/storage/windows/Win32StorageProvider.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "storage/IStorageProvider.h"
 #include "utils/Job.h"
 
diff --git a/xbmc/utils/IRssObserver.h b/xbmc/utils/IRssObserver.h
index eb930b6a60..ef2a64d221 100644
--- a/xbmc/utils/IRssObserver.h
+++ b/xbmc/utils/IRssObserver.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <vector>
+
 typedef uint32_t character_t;
 typedef std::vector<character_t> vecText;
 
diff --git a/xbmc/utils/JSONVariantParser.h b/xbmc/utils/JSONVariantParser.h
index 7682bd5ca0..38ea9182e8 100644
--- a/xbmc/utils/JSONVariantParser.h
+++ b/xbmc/utils/JSONVariantParser.h
@@ -19,6 +19,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "utils/Variant.h"
 
 #include <yajl/yajl_parse.h>
diff --git a/xbmc/utils/SortUtils.h b/xbmc/utils/SortUtils.h
index e9999cad22..e49c4fe32e 100644
--- a/xbmc/utils/SortUtils.h
+++ b/xbmc/utils/SortUtils.h
@@ -20,8 +20,9 @@
  */
 
 #include <map>
-#include <string>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "DatabaseUtils.h"
 #include "SortFileItem.h"
diff --git a/xbmc/video/Episode.h b/xbmc/video/Episode.h
index de29450817..22cd76b25c 100644
--- a/xbmc/video/Episode.h
+++ b/xbmc/video/Episode.h
@@ -18,6 +18,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include "utils/ScraperUrl.h"
 #include "XBDateTime.h"
 
diff --git a/xbmc/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h
index f3e56280b7..3747886a9c 100644
--- a/xbmc/video/VideoDatabase.h
+++ b/xbmc/video/VideoDatabase.h
@@ -22,6 +22,7 @@
 #include <memory>
 #include <set>
 #include <utility>
+#include <vector>
 
 #include "addons/Scraper.h"
 #include "Bookmark.h"
diff --git a/xbmc/video/VideoInfoDownloader.h b/xbmc/video/VideoInfoDownloader.h
index 5698f3bb6f..ee85c536fd 100644
--- a/xbmc/video/VideoInfoDownloader.h
+++ b/xbmc/video/VideoInfoDownloader.h
@@ -26,6 +26,7 @@
 #include "Episode.h"
 #include "filesystem/CurlFile.h"
 #include <string>
+#include <vector>
 
 // forward declarations
 class CXBMCTinyXML;
diff --git a/xbmc/video/VideoInfoScanner.h b/xbmc/video/VideoInfoScanner.h
index 68d89eb1fe..d7ca10b660 100644
--- a/xbmc/video/VideoInfoScanner.h
+++ b/xbmc/video/VideoInfoScanner.h
@@ -18,6 +18,11 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <set>
+#include <string>
+#include <vector>
+
 #include "InfoScanner.h"
 #include "NfoFile.h"
 #include "VideoDatabase.h"
diff --git a/xbmc/video/VideoThumbLoader.h b/xbmc/video/VideoThumbLoader.h
index 569bbd2b7a..4f425aeb1b 100644
--- a/xbmc/video/VideoThumbLoader.h
+++ b/xbmc/video/VideoThumbLoader.h
@@ -20,6 +20,7 @@
  */
 
 #include <map>
+#include <vector>
 #include "ThumbLoader.h"
 #include "utils/JobManager.h"
 #include "FileItem.h"
diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
index b27cba7cfa..ecca0bc146 100644
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h
@@ -20,7 +20,9 @@
  *
  */
 
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "settings/dialogs/GUIDialogSettingsManualBase.h"
 
diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.h b/xbmc/video/dialogs/GUIDialogVideoSettings.h
index bb9c31ac2a..adad488d6e 100644
--- a/xbmc/video/dialogs/GUIDialogVideoSettings.h
+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.h
@@ -20,6 +20,10 @@
  *
  */
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "settings/dialogs/GUIDialogSettingsManualBase.h"
 
 class CGUIDialogVideoSettings : public CGUIDialogSettingsManualBase
diff --git a/xbmc/view/GUIViewState.h b/xbmc/view/GUIViewState.h
index 55d2eb2ad9..4ae382ad18 100644
--- a/xbmc/view/GUIViewState.h
+++ b/xbmc/view/GUIViewState.h
@@ -20,6 +20,8 @@
  *
  */
 
+#include <vector>
+
 #include "utils/LabelFormatter.h"
 #include "utils/SortUtils.h"
 #include "MediaSource.h"
diff --git a/xbmc/win32/WIN32Util.h b/xbmc/win32/WIN32Util.h
index 7079e81330..8687b90d39 100644
--- a/xbmc/win32/WIN32Util.h
+++ b/xbmc/win32/WIN32Util.h
@@ -20,6 +20,8 @@
  *
  */
 
+#include <vector>
+
 #include "URL.h"
 #include "Cfgmgr32.h"
 #include "MediaSource.h"
diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h
index a263fc5a27..5f14863f57 100644
--- a/xbmc/windowing/X11/WinSystemX11.h
+++ b/xbmc/windowing/X11/WinSystemX11.h
@@ -20,6 +20,9 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "windowing/WinSystem.h"
 #include "utils/Stopwatch.h"
 #include "threads/CriticalSection.h"
diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.h b/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.h
index 688753717e..188217cb82 100644
--- a/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.h
+++ b/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "EGLNativeTypeAndroid.h"
 class CEGLNativeTypeAmlAndroid : public CEGLNativeTypeAndroid
 {
diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h
index 6867c380c3..cfb33ca812 100644
--- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h
+++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "EGLNativeType.h"
 class CEGLNativeTypeAmlogic : public CEGLNativeType
 {
diff --git a/xbmc/windowing/egl/EGLNativeTypeAndroid.h b/xbmc/windowing/egl/EGLNativeTypeAndroid.h
index f26215d8cd..b88eb57ffd 100644
--- a/xbmc/windowing/egl/EGLNativeTypeAndroid.h
+++ b/xbmc/windowing/egl/EGLNativeTypeAndroid.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "EGLNativeType.h"
 class CEGLNativeTypeAndroid : public CEGLNativeType
 {
diff --git a/xbmc/windowing/egl/EGLNativeTypeIMX.h b/xbmc/windowing/egl/EGLNativeTypeIMX.h
index 84ff268e91..53cbc2e177 100644
--- a/xbmc/windowing/egl/EGLNativeTypeIMX.h
+++ b/xbmc/windowing/egl/EGLNativeTypeIMX.h
@@ -19,6 +19,10 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
+#include <string>
+#include <vector>
+
 #include <linux/fb.h>
 
 #include <EGL/egl.h>
diff --git a/xbmc/windowing/egl/EGLNativeTypeRKAndroid.h b/xbmc/windowing/egl/EGLNativeTypeRKAndroid.h
index 69baaed48e..98b89f17ea 100644
--- a/xbmc/windowing/egl/EGLNativeTypeRKAndroid.h
+++ b/xbmc/windowing/egl/EGLNativeTypeRKAndroid.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "EGLNativeTypeAndroid.h"
 class CEGLNativeTypeRKAndroid : public CEGLNativeTypeAndroid
 {
diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h
index e5bcae7705..b524bb4404 100644
--- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h
+++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "EGLNativeType.h"
 #if defined(TARGET_RASPBERRY_PI)
 #include <semaphore.h>
diff --git a/xbmc/windowing/egl/EGLWrapper.h b/xbmc/windowing/egl/EGLWrapper.h
index f133d86fd4..5a748685de 100644
--- a/xbmc/windowing/egl/EGLWrapper.h
+++ b/xbmc/windowing/egl/EGLWrapper.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/Resolution.h"
 #include <EGL/egl.h>
 class CEGLNativeType;
diff --git a/xbmc/windowing/egl/WinSystemEGL.h b/xbmc/windowing/egl/WinSystemEGL.h
index aae4767cc3..c24bb356b9 100644
--- a/xbmc/windowing/egl/WinSystemEGL.h
+++ b/xbmc/windowing/egl/WinSystemEGL.h
@@ -23,6 +23,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "rendering/gles/RenderSystemGLES.h"
 #include "utils/GlobalsHandling.h"
 #include <EGL/egl.h>
diff --git a/xbmc/windowing/osx/WinSystemIOS.h b/xbmc/windowing/osx/WinSystemIOS.h
index eda4b7edcf..7ecdf672a7 100644
--- a/xbmc/windowing/osx/WinSystemIOS.h
+++ b/xbmc/windowing/osx/WinSystemIOS.h
@@ -24,6 +24,9 @@
 #define WINDOW_SYSTEM_IOSEGL_H
 
 #if defined(TARGET_DARWIN_IOS)
+#include <string>
+#include <vector>
+
 #include "windowing/WinSystem.h"
 #include "rendering/gles/RenderSystemGLES.h"
 #include "utils/GlobalsHandling.h"
diff --git a/xbmc/windowing/osx/WinSystemOSX.h b/xbmc/windowing/osx/WinSystemOSX.h
index dbc9245436..1360fc833b 100644
--- a/xbmc/windowing/osx/WinSystemOSX.h
+++ b/xbmc/windowing/osx/WinSystemOSX.h
@@ -22,6 +22,9 @@
 
 #if defined(TARGET_DARWIN_OSX)
 
+#include <string>
+#include <vector>
+
 #include "windowing/WinSystem.h"
 #include "threads/CriticalSection.h"
 #include "threads/Timer.h"
diff --git a/xbmc/windowing/windows/WinSystemWin32.h b/xbmc/windowing/windows/WinSystemWin32.h
index 59e78f4e03..4de378cb4b 100644
--- a/xbmc/windowing/windows/WinSystemWin32.h
+++ b/xbmc/windowing/windows/WinSystemWin32.h
@@ -26,6 +26,7 @@
 #include "threads/SystemClock.h"
 #include "windowing/WinSystem.h"
 #include <string>
+#include <vector>
 
 struct MONITOR_DETAILS
 {
diff --git a/xbmc/windows/GUIWindowFileManager.h b/xbmc/windows/GUIWindowFileManager.h
index 36197ad913..1f35d2f5f3 100644
--- a/xbmc/windows/GUIWindowFileManager.h
+++ b/xbmc/windows/GUIWindowFileManager.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIWindow.h"
 #include "filesystem/VirtualDirectory.h"
 #include "filesystem/DirectoryHistory.h"
diff --git a/xbmc/windows/GUIWindowSystemInfo.h b/xbmc/windows/GUIWindowSystemInfo.h
index 751995d32e..2fed1f5938 100644
--- a/xbmc/windows/GUIWindowSystemInfo.h
+++ b/xbmc/windows/GUIWindowSystemInfo.h
@@ -20,6 +20,9 @@
  *
  */
 
+#include <string>
+#include <vector>
+
 #include "guilib/GUIWindow.h"
 
 class CGUIWindowSystemInfo : public CGUIWindow