diff --git a/xbmc/pictures/GUIDialogPictureInfo.cpp b/xbmc/pictures/GUIDialogPictureInfo.cpp
index 8d626e960e17a..cf86c45c92c26 100644
--- a/xbmc/pictures/GUIDialogPictureInfo.cpp
+++ b/xbmc/pictures/GUIDialogPictureInfo.cpp
@@ -99,7 +99,7 @@ void CGUIDialogPictureInfo::UpdatePictureInfo()
     if (info == SLIDE_EXIF_DATE || info == SLIDE_EXIF_LONG_DATE || info == SLIDE_EXIF_LONG_DATE_TIME )
       continue;
 
-    CStdString picInfo = g_infoManager.GetLabel(info);
+    std::string picInfo = g_infoManager.GetLabel(info);
     if (!picInfo.empty())
     {
       CFileItemPtr item(new CFileItem(g_localizeStrings.Get(SLIDE_STRING_BASE + info)));
diff --git a/xbmc/pictures/GUIDialogPictureInfo.h b/xbmc/pictures/GUIDialogPictureInfo.h
index 3c95b7919124f..a0b78dc2ed941 100644
--- a/xbmc/pictures/GUIDialogPictureInfo.h
+++ b/xbmc/pictures/GUIDialogPictureInfo.h
@@ -40,5 +40,5 @@ class CGUIDialogPictureInfo :
   void UpdatePictureInfo();
 
   CFileItemList* m_pictureInfo;
-  CStdString    m_currentPicture;
+  std::string    m_currentPicture;
 };
diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 278ea87ea77a0..fd2f0b69d209c 100644
--- a/xbmc/pictures/GUIWindowPictures.cpp
+++ b/xbmc/pictures/GUIWindowPictures.cpp
@@ -72,7 +72,7 @@ void CGUIWindowPictures::OnInitWindow()
   if (m_slideShowStarted)
   {
     CGUIWindowSlideShow* wndw = (CGUIWindowSlideShow*)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
-    CStdString path;
+    std::string path;
     if (wndw && wndw->GetCurrentSlide())
       path = URIUtils::GetDirectory(wndw->GetCurrentSlide()->GetPath());
     if (m_vecItems->IsPath(path))
@@ -268,7 +268,7 @@ bool CGUIWindowPictures::Update(const std::string &strDirectory, bool updateFilt
     m_thumbLoader.Load(*m_vecItems);
 
   CPictureThumbLoader thumbLoader;
-  CStdString thumb = thumbLoader.GetCachedImage(*m_vecItems, "thumb");
+  std::string thumb = thumbLoader.GetCachedImage(*m_vecItems, "thumb");
   m_vecItems->SetArt("thumb", thumb);
 
   return true;
@@ -301,7 +301,7 @@ bool CGUIWindowPictures::GetDirectory(const std::string &strDirectory, CFileItem
   if (!CGUIMediaWindow::GetDirectory(strDirectory, items))
     return false;
 
-  CStdString label;
+  std::string label;
   if (items.GetLabel().empty() && m_rootDir.IsSource(items.GetPath(), CMediaSourceSettings::Get().GetSources("pictures"), &label)) 
     items.SetLabel(label);
 
@@ -320,7 +320,7 @@ bool CGUIWindowPictures::ShowPicture(int iItem, bool startSlideShow)
 {
   if ( iItem < 0 || iItem >= (int)m_vecItems->Size() ) return false;
   CFileItemPtr pItem = m_vecItems->Get(iItem);
-  CStdString strPicture = pItem->GetPath();
+  std::string strPicture = pItem->GetPath();
 
 #ifdef HAS_DVD_DRIVE
   if (pItem->IsDVD())
@@ -370,7 +370,7 @@ bool CGUIWindowPictures::ShowPicture(int iItem, bool startSlideShow)
   return true;
 }
 
-void CGUIWindowPictures::OnShowPictureRecursive(const CStdString& strPath)
+void CGUIWindowPictures::OnShowPictureRecursive(const std::string& strPath)
 {
   CGUIWindowSlideShow *pSlideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
   if (pSlideShow)
@@ -390,12 +390,12 @@ void CGUIWindowPictures::OnShowPictureRecursive(const CStdString& strPath)
   }
 }
 
-void CGUIWindowPictures::OnSlideShowRecursive(const CStdString &strPicture)
+void CGUIWindowPictures::OnSlideShowRecursive(const std::string &strPicture)
 {
   CGUIWindowSlideShow *pSlideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
   if (pSlideShow)
   {   
-    CStdString strExtensions;
+    std::string strExtensions;
     CFileItemList items;
     CGUIViewState* viewState=CGUIViewState::GetViewState(GetID(), items);
     if (viewState)
@@ -416,7 +416,7 @@ void CGUIWindowPictures::OnSlideShowRecursive(const CStdString &strPicture)
 
 void CGUIWindowPictures::OnSlideShowRecursive()
 {
-  CStdString strEmpty = "";
+  std::string strEmpty = "";
   OnSlideShowRecursive(m_vecItems->GetPath());
 }
 
@@ -425,12 +425,12 @@ void CGUIWindowPictures::OnSlideShow()
   OnSlideShow(m_vecItems->GetPath());
 }
 
-void CGUIWindowPictures::OnSlideShow(const CStdString &strPicture)
+void CGUIWindowPictures::OnSlideShow(const std::string &strPicture)
 {
   CGUIWindowSlideShow *pSlideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
   if (pSlideShow)
   {    
-    CStdString strExtensions;
+    std::string strExtensions;
     CFileItemList items;
     CGUIViewState* viewState=CGUIViewState::GetViewState(GetID(), items);
     if (viewState)
diff --git a/xbmc/pictures/GUIWindowPictures.h b/xbmc/pictures/GUIWindowPictures.h
index 868cb06009e03..c9be44164085f 100644
--- a/xbmc/pictures/GUIWindowPictures.h
+++ b/xbmc/pictures/GUIWindowPictures.h
@@ -49,10 +49,10 @@ class CGUIWindowPictures : public CGUIMediaWindow, public IBackgroundLoaderObser
   void OnRegenerateThumbs();
   virtual bool OnPlayMedia(int iItem);
   bool ShowPicture(int iItem, bool startSlideShow);
-  void OnShowPictureRecursive(const CStdString& strPath);
-  void OnSlideShow(const CStdString& strPicture);
+  void OnShowPictureRecursive(const std::string& strPath);
+  void OnSlideShow(const std::string& strPicture);
   void OnSlideShow();
-  void OnSlideShowRecursive(const CStdString& strPicture);
+  void OnSlideShowRecursive(const std::string& strPicture);
   void OnSlideShowRecursive();
   virtual void OnItemLoaded(CFileItem* pItem);
   virtual void LoadPlayList(const std::string& strPlayList);
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
index 3ca0c76e56d9d..0ce46565fc265 100644
--- a/xbmc/pictures/GUIWindowSlideShow.cpp
+++ b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -131,7 +131,7 @@ void CBackgroundPicLoader::Process()
               count, totalTime, totalTime / count);
 }
 
-void CBackgroundPicLoader::LoadPic(int iPic, int iSlideNumber, const CStdString &strFileName, const int maxWidth, const int maxHeight)
+void CBackgroundPicLoader::LoadPic(int iPic, int iSlideNumber, const std::string &strFileName, const int maxWidth, const int maxHeight)
 {
   m_iPic = iPic;
   m_iSlideNumber = iSlideNumber;
@@ -332,7 +332,7 @@ void CGUIWindowSlideShow::ShowPrevious()
 }
 
 
-void CGUIWindowSlideShow::Select(const CStdString& strPicture)
+void CGUIWindowSlideShow::Select(const std::string& strPicture)
 {
   for (int i = 0; i < m_slides->Size(); ++i)
   {
@@ -504,7 +504,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
   if (!m_Image[m_iCurrentPic].IsLoaded() && !m_pBackgroundLoader->IsLoading())
   { // load first image
     CFileItemPtr item = m_slides->Get(m_iCurrentSlide);
-    CStdString picturePath = GetPicturePath(item.get());
+    std::string picturePath = GetPicturePath(item.get());
     if (!picturePath.empty())
     {
       if (item->IsVideo())
@@ -532,7 +532,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re
   { // load the next image
     m_iLastFailedNextSlide = -1;
     CFileItemPtr item = m_slides->Get(m_iNextSlide);
-    CStdString picturePath = GetPicturePath(item.get());
+    std::string picturePath = GetPicturePath(item.get());
     if (!picturePath.empty() && (!item->IsVideo() || !m_bSlideShow || m_bPause))
     {
       if (item->IsVideo())
@@ -940,7 +940,7 @@ bool CGUIWindowSlideShow::OnMessage(CGUIMessage& message)
 
   case GUI_MSG_SHOW_PICTURE:
     {
-      CStdString strFile = message.GetStringParam();
+      std::string strFile = message.GetStringParam();
       Reset();
       CFileItem item(strFile, false);
       Add(&item);
@@ -950,7 +950,7 @@ bool CGUIWindowSlideShow::OnMessage(CGUIMessage& message)
 
   case GUI_MSG_START_SLIDESHOW:
     {
-      CStdString strFolder = message.GetStringParam();
+      std::string strFolder = message.GetStringParam();
       unsigned int iParams = message.GetParam1();
       std::string beginSlidePath = message.GetStringParam(1);
       //decode params
@@ -1129,7 +1129,7 @@ CSlideShowPic::DISPLAY_EFFECT CGUIWindowSlideShow::GetDisplayEffect(int iSlideNu
     return CSlideShowPic::EFFECT_NO_TIMEOUT;
 }
 
-void CGUIWindowSlideShow::OnLoadPic(int iPic, int iSlideNumber, const CStdString &strFileName, CBaseTexture* pTexture, bool bFullSize)
+void CGUIWindowSlideShow::OnLoadPic(int iPic, int iSlideNumber, const std::string &strFileName, CBaseTexture* pTexture, bool bFullSize)
 {
   if (pTexture)
   {
@@ -1148,7 +1148,7 @@ void CGUIWindowSlideShow::OnLoadPic(int iPic, int iSlideNumber, const CStdString
     if (URIUtils::IsInRAR(m_slides->Get(m_iCurrentSlide)->GetPath()) || URIUtils::IsInZIP(m_slides->Get(m_iCurrentSlide)->GetPath())) // move to top for cbr/cbz
     {
       CURL url(m_slides->Get(m_iCurrentSlide)->GetPath());
-      CStdString strHostName = url.GetHostName();
+      std::string strHostName = url.GetHostName();
       if (URIUtils::HasExtension(strHostName, ".cbr|.cbz"))
       {
         m_Image[iPic].m_bIsComic = true;
@@ -1188,10 +1188,10 @@ int CGUIWindowSlideShow::CurrentSlide() const
   return m_iCurrentSlide + 1;
 }
 
-void CGUIWindowSlideShow::AddFromPath(const CStdString &strPath,
+void CGUIWindowSlideShow::AddFromPath(const std::string &strPath,
                                       bool bRecursive, 
                                       SortBy method, SortOrder order, SortAttribute sortAttributes,
-                                      const CStdString &strExtensions)
+                                      const std::string &strExtensions)
 {
   if (strPath!="")
   {
@@ -1208,12 +1208,12 @@ void CGUIWindowSlideShow::AddFromPath(const CStdString &strPath,
   }
 }
 
-void CGUIWindowSlideShow::RunSlideShow(const CStdString &strPath, 
+void CGUIWindowSlideShow::RunSlideShow(const std::string &strPath, 
                                        bool bRecursive /* = false */, bool bRandom /* = false */,
-                                       bool bNotRandom /* = false */, const CStdString &beginSlidePath /* = "" */,
+                                       bool bNotRandom /* = false */, const std::string &beginSlidePath /* = "" */,
                                        bool startSlideShow /* = true */, SortBy method /* = SortByLabel */, 
                                        SortOrder order /* = SortOrderAscending */, SortAttribute sortAttributes /* = SortAttributeNone */,
-                                       const CStdString &strExtensions)
+                                       const std::string &strExtensions)
 {
   // stop any video
   if (g_application.m_pPlayer->IsPlayingVideo())
@@ -1249,12 +1249,12 @@ void CGUIWindowSlideShow::RunSlideShow(const CStdString &strPath,
   g_windowManager.ActivateWindow(WINDOW_SLIDESHOW);
 }
 
-void CGUIWindowSlideShow::AddItems(const CStdString &strPath, path_set *recursivePaths, SortBy method, SortOrder order, SortAttribute sortAttributes)
+void CGUIWindowSlideShow::AddItems(const std::string &strPath, path_set *recursivePaths, SortBy method, SortOrder order, SortAttribute sortAttributes)
 {
   // check whether we've already added this path
   if (recursivePaths)
   {
-    CStdString path(strPath);
+    std::string path(strPath);
     URIUtils::RemoveSlashAtEnd(path);
     if (recursivePaths->find(path) != recursivePaths->end())
       return;
@@ -1289,10 +1289,10 @@ void CGUIWindowSlideShow::GetCheckedSize(float width, float height, int &maxWidt
   maxHeight = g_Windowing.GetMaxTextureSize();
 }
 
-CStdString CGUIWindowSlideShow::GetPicturePath(CFileItem *item)
+std::string CGUIWindowSlideShow::GetPicturePath(CFileItem *item)
 {
   bool isVideo = item->IsVideo();
-  CStdString picturePath = item->GetPath();
+  std::string picturePath = item->GetPath();
   if (isVideo)
   {
     picturePath = item->GetArt("thumb");
diff --git a/xbmc/pictures/GUIWindowSlideShow.h b/xbmc/pictures/GUIWindowSlideShow.h
index b59b4ee1349df..da928542926c6 100644
--- a/xbmc/pictures/GUIWindowSlideShow.h
+++ b/xbmc/pictures/GUIWindowSlideShow.h
@@ -41,7 +41,7 @@ class CBackgroundPicLoader : public CThread
   ~CBackgroundPicLoader();
 
   void Create(CGUIWindowSlideShow *pCallback);
-  void LoadPic(int iPic, int iSlideNumber, const CStdString &strFileName, const int maxWidth, const int maxHeight);
+  void LoadPic(int iPic, int iSlideNumber, const std::string &strFileName, const int maxWidth, const int maxHeight);
   bool IsLoading() { return m_isLoading;};
   int SlideNumber() const { return m_iSlideNumber; }
   int Pic() const { return m_iPic; }
@@ -50,7 +50,7 @@ class CBackgroundPicLoader : public CThread
   void Process();
   int m_iPic;
   int m_iSlideNumber;
-  CStdString m_strFileName;
+  std::string m_strFileName;
   int m_maxWidth;
   int m_maxHeight;
 
@@ -71,22 +71,22 @@ class CGUIWindowSlideShow : public CGUIWindow
   bool IsPlaying() const;
   void ShowNext();
   void ShowPrevious();
-  void Select(const CStdString& strPicture);
+  void Select(const std::string& strPicture);
   const CFileItemList &GetSlideShowContents();
   void GetSlideShowContents(CFileItemList &list);
   const CFileItemPtr GetCurrentSlide();
-  void RunSlideShow(const CStdString &strPath, bool bRecursive = false,
+  void RunSlideShow(const std::string &strPath, bool bRecursive = false,
                     bool bRandom = false, bool bNotRandom = false,
-                    const CStdString &beginSlidePath="", bool startSlideShow = true,
+                    const std::string &beginSlidePath="", bool startSlideShow = true,
                     SortBy method = SortByLabel,
                     SortOrder order = SortOrderAscending,
                     SortAttribute sortAttributes = SortAttributeNone,
-                    const CStdString &strExtensions="");
-  void AddFromPath(const CStdString &strPath, bool bRecursive,
+                    const std::string &strExtensions="");
+  void AddFromPath(const std::string &strPath, bool bRecursive,
                    SortBy method = SortByLabel, 
                    SortOrder order = SortOrderAscending,
                    SortAttribute sortAttributes = SortAttributeNone,
-                   const CStdString &strExtensions="");
+                   const std::string &strExtensions="");
   void StartSlideShow();
   bool InSlideShow() const;
   virtual bool OnMessage(CGUIMessage& message);
@@ -95,7 +95,7 @@ class CGUIWindowSlideShow : public CGUIWindow
   virtual void Render();
   virtual void Process(unsigned int currentTime, CDirtyRegionList &regions);
   virtual void OnDeinitWindow(int nextWindowID);
-  void OnLoadPic(int iPic, int iSlideNumber, const CStdString &strFileName, CBaseTexture* pTexture, bool bFullSize);
+  void OnLoadPic(int iPic, int iSlideNumber, const std::string &strFileName, CBaseTexture* pTexture, bool bFullSize);
   int NumSlides() const;
   int CurrentSlide() const;
   void Shuffle();
@@ -104,8 +104,8 @@ class CGUIWindowSlideShow : public CGUIWindow
   int GetDirection() const { return m_iDirection; }
   void SetDirection(int direction); // -1: rewind, 1: forward
 private:
-  typedef std::set<CStdString> path_set;  // set to track which paths we're adding
-  void AddItems(const CStdString &strPath, path_set *recursivePaths,
+  typedef std::set<std::string> path_set;  // set to track which paths we're adding
+  void AddItems(const std::string &strPath, path_set *recursivePaths,
                 SortBy method = SortByLabel,
                 SortOrder order = SortOrderAscending,
                 SortAttribute sortAttributes = SortAttributeNone);
@@ -118,7 +118,7 @@ class CGUIWindowSlideShow : public CGUIWindow
   void ZoomRelative(float fZoom, bool immediate = false);
   void Move(float fX, float fY);
   void GetCheckedSize(float width, float height, int &maxWidth, int &maxHeight);
-  CStdString GetPicturePath(CFileItem *item);
+  std::string GetPicturePath(CFileItem *item);
   int  GetNextSlide();
 
   void AnnouncePlayerPlay(const CFileItemPtr& item);
@@ -156,6 +156,6 @@ class CGUIWindowSlideShow : public CGUIWindow
   DllImageLib m_ImageLib;
   RESOLUTION m_Resolution;
   CCriticalSection m_slideSection;
-  CStdString m_strExtensions;
+  std::string m_strExtensions;
   CPoint m_firstGesturePoint;
 };
diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
index 34ae62db7d15d..7a776fca49adc 100644
--- a/xbmc/pictures/Picture.cpp
+++ b/xbmc/pictures/Picture.cpp
@@ -43,7 +43,7 @@ extern "C" {
 
 using namespace XFILE;
 
-bool CPicture::CreateThumbnailFromSurface(const unsigned char *buffer, int width, int height, int stride, const CStdString &thumbFile)
+bool CPicture::CreateThumbnailFromSurface(const unsigned char *buffer, int width, int height, int stride, const std::string &thumbFile)
 {
   CLog::Log(LOGDEBUG, "cached image '%s' size %dx%d", thumbFile.c_str(), width, height);
   if (URIUtils::HasExtension(thumbFile, ".jpg"))
@@ -72,7 +72,7 @@ bool CPicture::CreateThumbnailFromSurface(const unsigned char *buffer, int width
   return ret;
 }
 
-CThumbnailWriter::CThumbnailWriter(unsigned char* buffer, int width, int height, int stride, const CStdString& thumbFile)
+CThumbnailWriter::CThumbnailWriter(unsigned char* buffer, int width, int height, int stride, const std::string& thumbFile)
 {
   m_buffer    = buffer;
   m_width     = width;
diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
index b5e42b283ab96..2eb041ac1d1e4 100644
--- a/xbmc/pictures/Picture.h
+++ b/xbmc/pictures/Picture.h
@@ -18,15 +18,16 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
-#include "utils/StdString.h"
 #include "utils/Job.h"
+#include <string>
+#include <vector>
 
 class CBaseTexture;
 
 class CPicture
 {
 public:
-  static bool CreateThumbnailFromSurface(const unsigned char* buffer, int width, int height, int stride, const CStdString &thumbFile);
+  static bool CreateThumbnailFromSurface(const unsigned char* buffer, int width, int height, int stride, const std::string &thumbFile);
 
   /*! \brief Create a tiled thumb of the given files
    \param files the files to create the thumb from
@@ -64,7 +65,7 @@ class CThumbnailWriter : public CJob
 {
   public:
     //WARNING: buffer is deleted from DoWork()
-    CThumbnailWriter(unsigned char* buffer, int width, int height, int stride, const CStdString& thumbFile);
+    CThumbnailWriter(unsigned char* buffer, int width, int height, int stride, const std::string& thumbFile);
     ~CThumbnailWriter();
     bool DoWork();
 
@@ -73,6 +74,6 @@ class CThumbnailWriter : public CJob
     int            m_width;
     int            m_height;
     int            m_stride;
-    CStdString     m_thumbFile;
+    std::string    m_thumbFile;
 };
 
diff --git a/xbmc/pictures/PictureInfoLoader.h b/xbmc/pictures/PictureInfoLoader.h
index 48e787162b36f..2a022ff0ff66d 100644
--- a/xbmc/pictures/PictureInfoLoader.h
+++ b/xbmc/pictures/PictureInfoLoader.h
@@ -20,7 +20,7 @@
  */
 
 #include "BackgroundInfoLoader.h"
-#include "utils/StdString.h"
+#include <string>
 
 class CPictureInfoLoader : public CBackgroundInfoLoader
 {
@@ -28,7 +28,7 @@ class CPictureInfoLoader : public CBackgroundInfoLoader
   CPictureInfoLoader();
   virtual ~CPictureInfoLoader();
 
-  void UseCacheOnHD(const CStdString& strFileName);
+  void UseCacheOnHD(const std::string& strFileName);
   virtual bool LoadItem(CFileItem* pItem);
   virtual bool LoadItemCached(CFileItem* pItem);
   virtual bool LoadItemLookup(CFileItem* pItem);
diff --git a/xbmc/pictures/PictureInfoTag.cpp b/xbmc/pictures/PictureInfoTag.cpp
index 832902131ed0d..9704a4b77f852 100644
--- a/xbmc/pictures/PictureInfoTag.cpp
+++ b/xbmc/pictures/PictureInfoTag.cpp
@@ -48,7 +48,7 @@ const CPictureInfoTag& CPictureInfoTag::operator=(const CPictureInfoTag& right)
   return *this;
 }
 
-bool CPictureInfoTag::Load(const CStdString &path)
+bool CPictureInfoTag::Load(const std::string &path)
 {
   m_isLoaded = false;
 
@@ -71,12 +71,12 @@ void CPictureInfoTag::Archive(CArchive& ar)
     ar << m_isLoaded;
     ar << m_isInfoSetExternally;
     ar << m_exifInfo.ApertureFNumber;
-    ar << CStdString(m_exifInfo.CameraMake);
-    ar << CStdString(m_exifInfo.CameraModel);
+    ar << std::string(m_exifInfo.CameraMake);
+    ar << std::string(m_exifInfo.CameraModel);
     ar << m_exifInfo.CCDWidth;
     ar << GetInfo(SLIDE_EXIF_COMMENT); // Store and restore the comment charset converted
-    ar << CStdString(m_exifInfo.Description);
-    ar << CStdString(m_exifInfo.DateTime);
+    ar << std::string(m_exifInfo.Description);
+    ar << std::string(m_exifInfo.DateTime);
     for (int i = 0; i < 10; i++)
       ar << m_exifInfo.DateTimeOffsets[i];
     ar << m_exifInfo.DigitalZoomRatio;
@@ -89,9 +89,9 @@ void CPictureInfoTag::Archive(CArchive& ar)
     ar << m_exifInfo.FocalLength;
     ar << m_exifInfo.FocalLength35mmEquiv;
     ar << m_exifInfo.GpsInfoPresent;
-    ar << CStdString(m_exifInfo.GpsAlt);
-    ar << CStdString(m_exifInfo.GpsLat);
-    ar << CStdString(m_exifInfo.GpsLong);
+    ar << std::string(m_exifInfo.GpsAlt);
+    ar << std::string(m_exifInfo.GpsLat);
+    ar << std::string(m_exifInfo.GpsLong);
     ar << m_exifInfo.Height;
     ar << m_exifInfo.IsColor;
     ar << m_exifInfo.ISOequivalent;
@@ -109,30 +109,30 @@ void CPictureInfoTag::Archive(CArchive& ar)
     ar << m_exifInfo.Width;
     ar << m_dateTimeTaken;
 
-    ar << CStdString(m_iptcInfo.Author);
-    ar << CStdString(m_iptcInfo.Byline);
-    ar << CStdString(m_iptcInfo.BylineTitle);
-    ar << CStdString(m_iptcInfo.Caption);
-    ar << CStdString(m_iptcInfo.Category);
-    ar << CStdString(m_iptcInfo.City);
-    ar << CStdString(m_iptcInfo.Urgency);
-    ar << CStdString(m_iptcInfo.CopyrightNotice);
-    ar << CStdString(m_iptcInfo.Country);
-    ar << CStdString(m_iptcInfo.CountryCode);
-    ar << CStdString(m_iptcInfo.Credit);
-    ar << CStdString(m_iptcInfo.Date);
-    ar << CStdString(m_iptcInfo.Headline);
-    ar << CStdString(m_iptcInfo.Keywords);
-    ar << CStdString(m_iptcInfo.ObjectName);
-    ar << CStdString(m_iptcInfo.ReferenceService);
-    ar << CStdString(m_iptcInfo.Source);
-    ar << CStdString(m_iptcInfo.SpecialInstructions);
-    ar << CStdString(m_iptcInfo.State);
-    ar << CStdString(m_iptcInfo.SupplementalCategories);
-    ar << CStdString(m_iptcInfo.TransmissionReference);
-    ar << CStdString(m_iptcInfo.TimeCreated);
-    ar << CStdString(m_iptcInfo.SubLocation);
-    ar << CStdString(m_iptcInfo.ImageType);
+    ar << std::string(m_iptcInfo.Author);
+    ar << std::string(m_iptcInfo.Byline);
+    ar << std::string(m_iptcInfo.BylineTitle);
+    ar << std::string(m_iptcInfo.Caption);
+    ar << std::string(m_iptcInfo.Category);
+    ar << std::string(m_iptcInfo.City);
+    ar << std::string(m_iptcInfo.Urgency);
+    ar << std::string(m_iptcInfo.CopyrightNotice);
+    ar << std::string(m_iptcInfo.Country);
+    ar << std::string(m_iptcInfo.CountryCode);
+    ar << std::string(m_iptcInfo.Credit);
+    ar << std::string(m_iptcInfo.Date);
+    ar << std::string(m_iptcInfo.Headline);
+    ar << std::string(m_iptcInfo.Keywords);
+    ar << std::string(m_iptcInfo.ObjectName);
+    ar << std::string(m_iptcInfo.ReferenceService);
+    ar << std::string(m_iptcInfo.Source);
+    ar << std::string(m_iptcInfo.SpecialInstructions);
+    ar << std::string(m_iptcInfo.State);
+    ar << std::string(m_iptcInfo.SupplementalCategories);
+    ar << std::string(m_iptcInfo.TransmissionReference);
+    ar << std::string(m_iptcInfo.TimeCreated);
+    ar << std::string(m_iptcInfo.SubLocation);
+    ar << std::string(m_iptcInfo.ImageType);
   }
   else
   {
@@ -208,12 +208,12 @@ void CPictureInfoTag::Archive(CArchive& ar)
 void CPictureInfoTag::Serialize(CVariant& value) const
 {
   value["aperturefnumber"] = m_exifInfo.ApertureFNumber;
-  value["cameramake"] = CStdString(m_exifInfo.CameraMake);
-  value["cameramodel"] = CStdString(m_exifInfo.CameraModel);
+  value["cameramake"] = std::string(m_exifInfo.CameraMake);
+  value["cameramodel"] = std::string(m_exifInfo.CameraModel);
   value["ccdwidth"] = m_exifInfo.CCDWidth;
   value["comments"] = GetInfo(SLIDE_EXIF_COMMENT); // Charset conversion
-  value["description"] = CStdString(m_exifInfo.Description);
-  value["datetime"] = CStdString(m_exifInfo.DateTime);
+  value["description"] = std::string(m_exifInfo.Description);
+  value["datetime"] = std::string(m_exifInfo.DateTime);
   for (int i = 0; i < 10; i++)
     value["datetimeoffsets"][i] = m_exifInfo.DateTimeOffsets[i];
   value["digitalzoomratio"] = m_exifInfo.DigitalZoomRatio;
@@ -226,9 +226,9 @@ void CPictureInfoTag::Serialize(CVariant& value) const
   value["focallength"] = m_exifInfo.FocalLength;
   value["focallength35mmequiv"] = m_exifInfo.FocalLength35mmEquiv;
   value["gpsinfopresent"] = m_exifInfo.GpsInfoPresent;
-  value["gpsinfo"]["alt"] = CStdString(m_exifInfo.GpsAlt);
-  value["gpsinfo"]["lat"] = CStdString(m_exifInfo.GpsLat);
-  value["gpsinfo"]["long"] = CStdString(m_exifInfo.GpsLong);
+  value["gpsinfo"]["alt"] = std::string(m_exifInfo.GpsAlt);
+  value["gpsinfo"]["lat"] = std::string(m_exifInfo.GpsLat);
+  value["gpsinfo"]["long"] = std::string(m_exifInfo.GpsLong);
   value["height"] = m_exifInfo.Height;
   value["iscolor"] = m_exifInfo.IsColor;
   value["isoequivalent"] = m_exifInfo.ISOequivalent;
@@ -245,30 +245,30 @@ void CPictureInfoTag::Serialize(CVariant& value) const
   value["whitebalance"] = m_exifInfo.Whitebalance;
   value["width"] = m_exifInfo.Width;
 
-  value["author"] = CStdString(m_iptcInfo.Author);
-  value["byline"] = CStdString(m_iptcInfo.Byline);
-  value["bylinetitle"] = CStdString(m_iptcInfo.BylineTitle);
-  value["caption"] = CStdString(m_iptcInfo.Caption);
-  value["category"] = CStdString(m_iptcInfo.Category);
-  value["city"] = CStdString(m_iptcInfo.City);
-  value["urgency"] = CStdString(m_iptcInfo.Urgency);
-  value["copyrightnotice"] = CStdString(m_iptcInfo.CopyrightNotice);
-  value["country"] = CStdString(m_iptcInfo.Country);
-  value["countrycode"] = CStdString(m_iptcInfo.CountryCode);
-  value["credit"] = CStdString(m_iptcInfo.Credit);
-  value["date"] = CStdString(m_iptcInfo.Date);
-  value["headline"] = CStdString(m_iptcInfo.Headline);
-  value["keywords"] = CStdString(m_iptcInfo.Keywords);
-  value["objectname"] = CStdString(m_iptcInfo.ObjectName);
-  value["referenceservice"] = CStdString(m_iptcInfo.ReferenceService);
-  value["source"] = CStdString(m_iptcInfo.Source);
-  value["specialinstructions"] = CStdString(m_iptcInfo.SpecialInstructions);
-  value["state"] = CStdString(m_iptcInfo.State);
-  value["supplementalcategories"] = CStdString(m_iptcInfo.SupplementalCategories);
-  value["transmissionreference"] = CStdString(m_iptcInfo.TransmissionReference);
-  value["timecreated"] = CStdString(m_iptcInfo.TimeCreated);
-  value["sublocation"] = CStdString(m_iptcInfo.SubLocation);
-  value["imagetype"] = CStdString(m_iptcInfo.ImageType);
+  value["author"] = std::string(m_iptcInfo.Author);
+  value["byline"] = std::string(m_iptcInfo.Byline);
+  value["bylinetitle"] = std::string(m_iptcInfo.BylineTitle);
+  value["caption"] = std::string(m_iptcInfo.Caption);
+  value["category"] = std::string(m_iptcInfo.Category);
+  value["city"] = std::string(m_iptcInfo.City);
+  value["urgency"] = std::string(m_iptcInfo.Urgency);
+  value["copyrightnotice"] = std::string(m_iptcInfo.CopyrightNotice);
+  value["country"] = std::string(m_iptcInfo.Country);
+  value["countrycode"] = std::string(m_iptcInfo.CountryCode);
+  value["credit"] = std::string(m_iptcInfo.Credit);
+  value["date"] = std::string(m_iptcInfo.Date);
+  value["headline"] = std::string(m_iptcInfo.Headline);
+  value["keywords"] = std::string(m_iptcInfo.Keywords);
+  value["objectname"] = std::string(m_iptcInfo.ObjectName);
+  value["referenceservice"] = std::string(m_iptcInfo.ReferenceService);
+  value["source"] = std::string(m_iptcInfo.Source);
+  value["specialinstructions"] = std::string(m_iptcInfo.SpecialInstructions);
+  value["state"] = std::string(m_iptcInfo.State);
+  value["supplementalcategories"] = std::string(m_iptcInfo.SupplementalCategories);
+  value["transmissionreference"] = std::string(m_iptcInfo.TransmissionReference);
+  value["timecreated"] = std::string(m_iptcInfo.TimeCreated);
+  value["sublocation"] = std::string(m_iptcInfo.SubLocation);
+  value["imagetype"] = std::string(m_iptcInfo.ImageType);
 }
 
 void CPictureInfoTag::ToSortable(SortItem& sortable, Field field) const
@@ -279,7 +279,7 @@ void CPictureInfoTag::ToSortable(SortItem& sortable, Field field) const
 
 void CPictureInfoTag::GetStringFromArchive(CArchive &ar, char *string, size_t length)
 {
-  CStdString temp;
+  std::string temp;
   ar >> temp;
   length = min((size_t)temp.size(), length - 1);
   if (!temp.empty())
@@ -287,12 +287,12 @@ void CPictureInfoTag::GetStringFromArchive(CArchive &ar, char *string, size_t le
   string[length] = 0;
 }
 
-const CStdString CPictureInfoTag::GetInfo(int info) const
+const std::string CPictureInfoTag::GetInfo(int info) const
 {
   if (!m_isLoaded && !m_isInfoSetExternally) // If no metadata has been loaded from the picture file or set with SetInfo(), just return
     return "";
 
-  CStdString value;
+  std::string value;
   switch (info)
   {
   case SLIDE_RESOLUTION:
@@ -541,72 +541,72 @@ const CStdString CPictureInfoTag::GetInfo(int info) const
   return value;
 }
 
-int CPictureInfoTag::TranslateString(const CStdString &info)
+int CPictureInfoTag::TranslateString(const std::string &info)
 {
-  if (info.Equals("filename")) return SLIDE_FILE_NAME;
-  else if (info.Equals("path")) return SLIDE_FILE_PATH;
-  else if (info.Equals("filesize")) return SLIDE_FILE_SIZE;
-  else if (info.Equals("filedate")) return SLIDE_FILE_DATE;
-  else if (info.Equals("slideindex")) return SLIDE_INDEX;
-  else if (info.Equals("resolution")) return SLIDE_RESOLUTION;
-  else if (info.Equals("slidecomment")) return SLIDE_COMMENT;
-  else if (info.Equals("colour")) return SLIDE_COLOUR;
-  else if (info.Equals("process")) return SLIDE_PROCESS;
-  else if (info.Equals("exiftime")) return SLIDE_EXIF_DATE_TIME;
-  else if (info.Equals("exifdate")) return SLIDE_EXIF_DATE;
-  else if (info.Equals("longexiftime")) return SLIDE_EXIF_LONG_DATE_TIME;
-  else if (info.Equals("longexifdate")) return SLIDE_EXIF_LONG_DATE;
-  else if (info.Equals("exifdescription")) return SLIDE_EXIF_DESCRIPTION;
-  else if (info.Equals("cameramake")) return SLIDE_EXIF_CAMERA_MAKE;
-  else if (info.Equals("cameramodel")) return SLIDE_EXIF_CAMERA_MODEL;
-  else if (info.Equals("exifcomment")) return SLIDE_EXIF_COMMENT;
-  else if (info.Equals("exifsoftware")) return SLIDE_EXIF_SOFTWARE;
-  else if (info.Equals("aperture")) return SLIDE_EXIF_APERTURE;
-  else if (info.Equals("focallength")) return SLIDE_EXIF_FOCAL_LENGTH;
-  else if (info.Equals("focusdistance")) return SLIDE_EXIF_FOCUS_DIST;
-  else if (info.Equals("exposure")) return SLIDE_EXIF_EXPOSURE;
-  else if (info.Equals("exposuretime")) return SLIDE_EXIF_EXPOSURE_TIME;
-  else if (info.Equals("exposurebias")) return SLIDE_EXIF_EXPOSURE_BIAS;
-  else if (info.Equals("exposuremode")) return SLIDE_EXIF_EXPOSURE_MODE;
-  else if (info.Equals("flashused")) return SLIDE_EXIF_FLASH_USED;
-  else if (info.Equals("whitebalance")) return SLIDE_EXIF_WHITE_BALANCE;
-  else if (info.Equals("lightsource")) return SLIDE_EXIF_LIGHT_SOURCE;
-  else if (info.Equals("meteringmode")) return SLIDE_EXIF_METERING_MODE;
-  else if (info.Equals("isoequivalence")) return SLIDE_EXIF_ISO_EQUIV;
-  else if (info.Equals("digitalzoom")) return SLIDE_EXIF_DIGITAL_ZOOM;
-  else if (info.Equals("ccdwidth")) return SLIDE_EXIF_CCD_WIDTH;
-  else if (info.Equals("orientation")) return SLIDE_EXIF_ORIENTATION;
-  else if (info.Equals("supplementalcategories")) return SLIDE_IPTC_SUP_CATEGORIES;
-  else if (info.Equals("keywords")) return SLIDE_IPTC_KEYWORDS;
-  else if (info.Equals("caption")) return SLIDE_IPTC_CAPTION;
-  else if (info.Equals("author")) return SLIDE_IPTC_AUTHOR;
-  else if (info.Equals("headline")) return SLIDE_IPTC_HEADLINE;
-  else if (info.Equals("specialinstructions")) return SLIDE_IPTC_SPEC_INSTR;
-  else if (info.Equals("category")) return SLIDE_IPTC_CATEGORY;
-  else if (info.Equals("byline")) return SLIDE_IPTC_BYLINE;
-  else if (info.Equals("bylinetitle")) return SLIDE_IPTC_BYLINE_TITLE;
-  else if (info.Equals("credit")) return SLIDE_IPTC_CREDIT;
-  else if (info.Equals("source")) return SLIDE_IPTC_SOURCE;
-  else if (info.Equals("copyrightnotice")) return SLIDE_IPTC_COPYRIGHT_NOTICE;
-  else if (info.Equals("objectname")) return SLIDE_IPTC_OBJECT_NAME;
-  else if (info.Equals("city")) return SLIDE_IPTC_CITY;
-  else if (info.Equals("state")) return SLIDE_IPTC_STATE;
-  else if (info.Equals("country")) return SLIDE_IPTC_COUNTRY;
-  else if (info.Equals("transmissionreference")) return SLIDE_IPTC_TX_REFERENCE;
-  else if (info.Equals("iptcdate")) return SLIDE_IPTC_DATE;
-  else if (info.Equals("urgency")) return SLIDE_IPTC_URGENCY;
-  else if (info.Equals("countrycode")) return SLIDE_IPTC_COUNTRY_CODE;
-  else if (info.Equals("referenceservice")) return SLIDE_IPTC_REF_SERVICE;
-  else if (info.Equals("latitude")) return SLIDE_EXIF_GPS_LATITUDE;
-  else if (info.Equals("longitude")) return SLIDE_EXIF_GPS_LONGITUDE;
-  else if (info.Equals("altitude")) return SLIDE_EXIF_GPS_ALTITUDE;
-  else if (info.Equals("timecreated")) return SLIDE_IPTC_TIMECREATED;
-  else if (info.Equals("sublocation")) return SLIDE_IPTC_SUBLOCATION;
-  else if (info.Equals("imagetype")) return SLIDE_IPTC_IMAGETYPE;
+  if (StringUtils::EqualsNoCase(info, "filename")) return SLIDE_FILE_NAME;
+  else if (StringUtils::EqualsNoCase(info, "path")) return SLIDE_FILE_PATH;
+  else if (StringUtils::EqualsNoCase(info, "filesize")) return SLIDE_FILE_SIZE;
+  else if (StringUtils::EqualsNoCase(info, "filedate")) return SLIDE_FILE_DATE;
+  else if (StringUtils::EqualsNoCase(info, "slideindex")) return SLIDE_INDEX;
+  else if (StringUtils::EqualsNoCase(info, "resolution")) return SLIDE_RESOLUTION;
+  else if (StringUtils::EqualsNoCase(info, "slidecomment")) return SLIDE_COMMENT;
+  else if (StringUtils::EqualsNoCase(info, "colour")) return SLIDE_COLOUR;
+  else if (StringUtils::EqualsNoCase(info, "process")) return SLIDE_PROCESS;
+  else if (StringUtils::EqualsNoCase(info, "exiftime")) return SLIDE_EXIF_DATE_TIME;
+  else if (StringUtils::EqualsNoCase(info, "exifdate")) return SLIDE_EXIF_DATE;
+  else if (StringUtils::EqualsNoCase(info, "longexiftime")) return SLIDE_EXIF_LONG_DATE_TIME;
+  else if (StringUtils::EqualsNoCase(info, "longexifdate")) return SLIDE_EXIF_LONG_DATE;
+  else if (StringUtils::EqualsNoCase(info, "exifdescription")) return SLIDE_EXIF_DESCRIPTION;
+  else if (StringUtils::EqualsNoCase(info, "cameramake")) return SLIDE_EXIF_CAMERA_MAKE;
+  else if (StringUtils::EqualsNoCase(info, "cameramodel")) return SLIDE_EXIF_CAMERA_MODEL;
+  else if (StringUtils::EqualsNoCase(info, "exifcomment")) return SLIDE_EXIF_COMMENT;
+  else if (StringUtils::EqualsNoCase(info, "exifsoftware")) return SLIDE_EXIF_SOFTWARE;
+  else if (StringUtils::EqualsNoCase(info, "aperture")) return SLIDE_EXIF_APERTURE;
+  else if (StringUtils::EqualsNoCase(info, "focallength")) return SLIDE_EXIF_FOCAL_LENGTH;
+  else if (StringUtils::EqualsNoCase(info, "focusdistance")) return SLIDE_EXIF_FOCUS_DIST;
+  else if (StringUtils::EqualsNoCase(info, "exposure")) return SLIDE_EXIF_EXPOSURE;
+  else if (StringUtils::EqualsNoCase(info, "exposuretime")) return SLIDE_EXIF_EXPOSURE_TIME;
+  else if (StringUtils::EqualsNoCase(info, "exposurebias")) return SLIDE_EXIF_EXPOSURE_BIAS;
+  else if (StringUtils::EqualsNoCase(info, "exposuremode")) return SLIDE_EXIF_EXPOSURE_MODE;
+  else if (StringUtils::EqualsNoCase(info, "flashused")) return SLIDE_EXIF_FLASH_USED;
+  else if (StringUtils::EqualsNoCase(info, "whitebalance")) return SLIDE_EXIF_WHITE_BALANCE;
+  else if (StringUtils::EqualsNoCase(info, "lightsource")) return SLIDE_EXIF_LIGHT_SOURCE;
+  else if (StringUtils::EqualsNoCase(info, "meteringmode")) return SLIDE_EXIF_METERING_MODE;
+  else if (StringUtils::EqualsNoCase(info, "isoequivalence")) return SLIDE_EXIF_ISO_EQUIV;
+  else if (StringUtils::EqualsNoCase(info, "digitalzoom")) return SLIDE_EXIF_DIGITAL_ZOOM;
+  else if (StringUtils::EqualsNoCase(info, "ccdwidth")) return SLIDE_EXIF_CCD_WIDTH;
+  else if (StringUtils::EqualsNoCase(info, "orientation")) return SLIDE_EXIF_ORIENTATION;
+  else if (StringUtils::EqualsNoCase(info, "supplementalcategories")) return SLIDE_IPTC_SUP_CATEGORIES;
+  else if (StringUtils::EqualsNoCase(info, "keywords")) return SLIDE_IPTC_KEYWORDS;
+  else if (StringUtils::EqualsNoCase(info, "caption")) return SLIDE_IPTC_CAPTION;
+  else if (StringUtils::EqualsNoCase(info, "author")) return SLIDE_IPTC_AUTHOR;
+  else if (StringUtils::EqualsNoCase(info, "headline")) return SLIDE_IPTC_HEADLINE;
+  else if (StringUtils::EqualsNoCase(info, "specialinstructions")) return SLIDE_IPTC_SPEC_INSTR;
+  else if (StringUtils::EqualsNoCase(info, "category")) return SLIDE_IPTC_CATEGORY;
+  else if (StringUtils::EqualsNoCase(info, "byline")) return SLIDE_IPTC_BYLINE;
+  else if (StringUtils::EqualsNoCase(info, "bylinetitle")) return SLIDE_IPTC_BYLINE_TITLE;
+  else if (StringUtils::EqualsNoCase(info, "credit")) return SLIDE_IPTC_CREDIT;
+  else if (StringUtils::EqualsNoCase(info, "source")) return SLIDE_IPTC_SOURCE;
+  else if (StringUtils::EqualsNoCase(info, "copyrightnotice")) return SLIDE_IPTC_COPYRIGHT_NOTICE;
+  else if (StringUtils::EqualsNoCase(info, "objectname")) return SLIDE_IPTC_OBJECT_NAME;
+  else if (StringUtils::EqualsNoCase(info, "city")) return SLIDE_IPTC_CITY;
+  else if (StringUtils::EqualsNoCase(info, "state")) return SLIDE_IPTC_STATE;
+  else if (StringUtils::EqualsNoCase(info, "country")) return SLIDE_IPTC_COUNTRY;
+  else if (StringUtils::EqualsNoCase(info, "transmissionreference")) return SLIDE_IPTC_TX_REFERENCE;
+  else if (StringUtils::EqualsNoCase(info, "iptcdate")) return SLIDE_IPTC_DATE;
+  else if (StringUtils::EqualsNoCase(info, "urgency")) return SLIDE_IPTC_URGENCY;
+  else if (StringUtils::EqualsNoCase(info, "countrycode")) return SLIDE_IPTC_COUNTRY_CODE;
+  else if (StringUtils::EqualsNoCase(info, "referenceservice")) return SLIDE_IPTC_REF_SERVICE;
+  else if (StringUtils::EqualsNoCase(info, "latitude")) return SLIDE_EXIF_GPS_LATITUDE;
+  else if (StringUtils::EqualsNoCase(info, "longitude")) return SLIDE_EXIF_GPS_LONGITUDE;
+  else if (StringUtils::EqualsNoCase(info, "altitude")) return SLIDE_EXIF_GPS_ALTITUDE;
+  else if (StringUtils::EqualsNoCase(info, "timecreated")) return SLIDE_IPTC_TIMECREATED;
+  else if (StringUtils::EqualsNoCase(info, "sublocation")) return SLIDE_IPTC_SUBLOCATION;
+  else if (StringUtils::EqualsNoCase(info, "imagetype")) return SLIDE_IPTC_IMAGETYPE;
   return 0;
 }
 
-void CPictureInfoTag::SetInfo(int info, const CStdString& value)
+void CPictureInfoTag::SetInfo(int info, const std::string& value)
 {
   switch (info)
   {
@@ -643,7 +643,7 @@ void CPictureInfoTag::ConvertDateTime()
 {
   if (strlen(m_exifInfo.DateTime) >= 19 && m_exifInfo.DateTime[0] != ' ')
   {
-    CStdString dateTime = m_exifInfo.DateTime;
+    std::string dateTime = m_exifInfo.DateTime;
     int year  = atoi(dateTime.substr(0, 4).c_str());
     int month = atoi(dateTime.substr(5, 2).c_str());
     int day   = atoi(dateTime.substr(8, 2).c_str());
diff --git a/xbmc/pictures/PictureInfoTag.h b/xbmc/pictures/PictureInfoTag.h
index 859f33ebc3ca3..06846128b1466 100644
--- a/xbmc/pictures/PictureInfoTag.h
+++ b/xbmc/pictures/PictureInfoTag.h
@@ -98,14 +98,14 @@ class CPictureInfoTag : public IArchivable, public ISerializable, public ISortab
   virtual void Serialize(CVariant& value) const;
   virtual void ToSortable(SortItem& sortable, Field field) const;
   const CPictureInfoTag& operator=(const CPictureInfoTag& item);
-  const CStdString GetInfo(int info) const;
+  const std::string GetInfo(int info) const;
 
   bool Loaded() const { return m_isLoaded; };
-  bool Load(const CStdString &path);
+  bool Load(const std::string &path);
 
-  static int TranslateString(const CStdString &info);
+  static int TranslateString(const std::string &info);
 
-  void SetInfo(int info, const CStdString& value);
+  void SetInfo(int info, const std::string& value);
 
   /**
    * GetDateTimeTaken() -- Returns the EXIF DateTimeOriginal for current picture
diff --git a/xbmc/pictures/PictureThumbLoader.cpp b/xbmc/pictures/PictureThumbLoader.cpp
index d14b360af30f6..6d2f1233b7d13 100644
--- a/xbmc/pictures/PictureThumbLoader.cpp
+++ b/xbmc/pictures/PictureThumbLoader.cpp
@@ -77,7 +77,7 @@ bool CPictureThumbLoader::LoadItemCached(CFileItem* pItem)
     pItem->SetArt("thumb", "");
   }
 
-  CStdString thumb;
+  std::string thumb;
   if (pItem->IsPicture() && !pItem->IsZIP() && !pItem->IsRAR() && !pItem->IsCBZ() && !pItem->IsCBR() && !pItem->IsPlayList())
   { // load the thumb from the image file
     thumb = pItem->HasArt("thumb") ? pItem->GetArt("thumb") : CTextureUtils::GetWrappedThumbURL(pItem->GetPath());
@@ -87,7 +87,7 @@ bool CPictureThumbLoader::LoadItemCached(CFileItem* pItem)
     CVideoThumbLoader loader;
     if (!loader.FillThumb(*pItem))
     {
-      CStdString thumbURL = CVideoThumbLoader::GetEmbeddedThumbURL(*pItem);
+      std::string thumbURL = CVideoThumbLoader::GetEmbeddedThumbURL(*pItem);
       if (CTextureCache::Get().HasCachedImage(thumbURL))
       {
         thumb = thumbURL;
@@ -141,7 +141,7 @@ void CPictureThumbLoader::ProcessFoldersAndArchives(CFileItem *pItem)
   db.Open();
   if (pItem->IsCBR() || pItem->IsCBZ())
   {
-    CStdString strTBN(URIUtils::ReplaceExtension(pItem->GetPath(),".tbn"));
+    std::string strTBN(URIUtils::ReplaceExtension(pItem->GetPath(),".tbn"));
     if (CFile::Exists(strTBN))
     {
       db.SetTextureForPath(pItem->GetPath(), "thumb", strTBN);
@@ -154,7 +154,7 @@ void CPictureThumbLoader::ProcessFoldersAndArchives(CFileItem *pItem)
       && !pItem->IsParentFolder() && !pItem->IsPath("add"))
   {
     // first check for a folder.jpg
-    CStdString thumb = "folder.jpg";
+    std::string thumb = "folder.jpg";
     CURL pathToUrl = pItem->GetURL();
     if (pItem->IsCBR())
     {
@@ -224,7 +224,7 @@ void CPictureThumbLoader::ProcessFoldersAndArchives(CFileItem *pItem)
       if (items.Size() < 4 || pItem->IsCBR() || pItem->IsCBZ())
       { // less than 4 items, so just grab the first thumb
         items.Sort(SortByLabel, SortOrderAscending);
-        CStdString thumb = CTextureUtils::GetWrappedThumbURL(items[0]->GetPath());
+        std::string thumb = CTextureUtils::GetWrappedThumbURL(items[0]->GetPath());
         db.SetTextureForPath(pItem->GetPath(), "thumb", thumb);
         CTextureCache::Get().BackgroundCacheImage(thumb);
         pItem->SetArt("thumb", thumb);
@@ -236,8 +236,8 @@ void CPictureThumbLoader::ProcessFoldersAndArchives(CFileItem *pItem)
         vector<string> files;
         for (int thumb = 0; thumb < 4; thumb++)
           files.push_back(items[thumb]->GetPath());
-        CStdString thumb = CTextureUtils::GetWrappedImageURL(pItem->GetPath(), "picturefolder");
-        CStdString relativeCacheFile = CTextureCache::GetCacheFile(thumb) + ".png";
+        std::string thumb = CTextureUtils::GetWrappedImageURL(pItem->GetPath(), "picturefolder");
+        std::string relativeCacheFile = CTextureCache::GetCacheFile(thumb) + ".png";
         if (CPicture::CreateTiledThumb(files, CTextureCache::GetCachedPath(relativeCacheFile)))
         {
           CTextureDetails details;
diff --git a/xbmc/pictures/PictureThumbLoader.h b/xbmc/pictures/PictureThumbLoader.h
index 31580d98f04f4..e8df6a92bf022 100644
--- a/xbmc/pictures/PictureThumbLoader.h
+++ b/xbmc/pictures/PictureThumbLoader.h
@@ -19,7 +19,6 @@
  *
  */
 
-#include "utils/StdString.h"
 #include "utils/JobManager.h"
 #include "ThumbLoader.h"
 
diff --git a/xbmc/pictures/SlideShowPicture.h b/xbmc/pictures/SlideShowPicture.h
index 369b34ebd344e..ffc995f12f100 100644
--- a/xbmc/pictures/SlideShowPicture.h
+++ b/xbmc/pictures/SlideShowPicture.h
@@ -21,8 +21,8 @@
 
 #include "threads/CriticalSection.h"
 #include "guilib/gui3d.h"
-#include "utils/StdString.h"
 #include "guilib/DirtyRegion.h"
+#include <string>
 
 typedef uint32_t color_t;
 
@@ -97,7 +97,7 @@ class CSlideShowPic
   bool m_bIsFinished;
   bool m_bDrawNextImage;
   bool m_bIsDirty;
-  CStdString m_strFileName;
+  std::string m_strFileName;
   float m_fWidth;
   float m_fHeight;
   color_t m_alpha;