diff --git a/xbmc/AppParamParser.cpp b/xbmc/AppParamParser.cpp
index 491f7a8e70ca5..064671e9f4c52 100644
--- a/xbmc/AppParamParser.cpp
+++ b/xbmc/AppParamParser.cpp
@@ -35,6 +35,7 @@
 #ifndef TARGET_WINDOWS
 #include "linux/XTimeUtils.h"
 #endif
+#include <stdlib.h>
 
 CAppParamParser::CAppParamParser()
 {
diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp
index 2a3c337a0d8d8..19b43a3624167 100644
--- a/xbmc/Autorun.cpp
+++ b/xbmc/Autorun.cpp
@@ -21,6 +21,7 @@
 #include "system.h"
 
 #ifdef HAS_DVD_DRIVE
+#include <stdlib.h>
 
 #include "Autorun.h"
 #include "Application.h"
@@ -46,7 +47,6 @@
 #include "cdrip/CDDARipper.h"
 #endif
 
-using namespace std;
 using namespace XFILE;
 using namespace PLAYLIST;
 using namespace MEDIA_DETECT;
@@ -109,7 +109,7 @@ bool CAutorun::PlayDisc(const std::string& path, bool bypassSettings, bool start
     mediaPath = g_mediaManager.GetDiscPath();
 
   const CURL pathToUrl(mediaPath);
-  unique_ptr<IDirectory> pDir ( CDirectoryFactory::Create( pathToUrl ));
+  std::unique_ptr<IDirectory> pDir ( CDirectoryFactory::Create( pathToUrl ));
   bool bPlaying = RunDisc(pDir.get(), mediaPath, nAddedToPlaylist, true, bypassSettings, startFromBeginning);
 
   if ( !bPlaying && nAddedToPlaylist > 0 )
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index 5475570688603..06e45991dd0db 100644
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -41,6 +41,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "Util.h"
+#include <cassert>
 
 extern "C" {
 #include "libavutil/crc.h"
diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index aa413b95afd3e..d5d94efc2eb24 100644
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -39,6 +39,7 @@
 #include "utils/URIUtils.h"
 #include "windowing/WindowingFactory.h"
 #include "Application.h"
+#include <cassert>
 
 #ifdef _DEBUG
 #define CheckError() m_result = eglGetError(); if (m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result);
diff --git a/xbmc/guilib/TransformMatrix.h b/xbmc/guilib/TransformMatrix.h
index bb5e8d7355878..bf1650cb143ae 100644
--- a/xbmc/guilib/TransformMatrix.h
+++ b/xbmc/guilib/TransformMatrix.h
@@ -24,6 +24,7 @@
 #include <memory>
 #include <string.h>
 #include <stdint.h>
+#include <algorithm>
 
 #ifdef __GNUC__
 // under gcc, inline will only take place if optimizations are applied (-O). this will force inline even whith optimizations.
diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
index 0be1ae76908ff..37130d86f5209 100644
--- a/xbmc/linux/LinuxTimezone.cpp
+++ b/xbmc/linux/LinuxTimezone.cpp
@@ -38,6 +38,7 @@
 #include "XBDateTime.h"
 #include "settings/lib/Setting.h"
 #include "settings/Settings.h"
+#include <stdlib.h>
 
 #include <algorithm>
 
diff --git a/xbmc/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp
index b13efcb982de2..4ba2e4bc4b1b4 100644
--- a/xbmc/linux/OMXCore.cpp
+++ b/xbmc/linux/OMXCore.cpp
@@ -33,6 +33,7 @@
 
 #include "OMXClock.h"
 #include "xbmc/linux/RBP.h"
+#include <cassert>
 
 #ifdef TARGET_LINUX
 #include "XMemUtils.h"
diff --git a/xbmc/main/main.cpp b/xbmc/main/main.cpp
index ec86426a417cf..87fe2fd4c5d51 100644
--- a/xbmc/main/main.cpp
+++ b/xbmc/main/main.cpp
@@ -35,6 +35,7 @@
   #ifdef HAS_SDL
     #include <SDL/SDL.h>
   #endif
+#include <locale.h>
 #endif
 #ifdef HAS_LIRC
 #include "input/linux/LIRC.h"
diff --git a/xbmc/storage/osx/DarwinStorageProvider.cpp b/xbmc/storage/osx/DarwinStorageProvider.cpp
index 9b7802a0952d7..6be9ab13cd9e9 100644
--- a/xbmc/storage/osx/DarwinStorageProvider.cpp
+++ b/xbmc/storage/osx/DarwinStorageProvider.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include <stdlib.h>
 #include "DarwinStorageProvider.h"
 #include "utils/RegExp.h"
 #include "Util.h"
diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
index c58c28a3f4ddd..749de8df4b40a 100644
--- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
+++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
@@ -28,6 +28,7 @@
 #include "linux/RBP.h"
 #include "utils/StringUtils.h"
 #include "settings/Settings.h"
+#include <cassert>
 
 #ifndef __VIDEOCORE4__
 #define __VIDEOCORE4__