changed: reduce header dependency pollution

Gives about about 5% faster compile time for xbmc/ and xbmc/filesystem on my system.

40 files changed, 58 insertions, 19 deletions

diff --git a/xbmc/Favourites.cpp b/xbmc/Favourites.cpp
index 1bc1e68d56..1527812266 100644
--- a/xbmc/Favourites.cpp
+++ b/xbmc/Favourites.cpp
@@ -29,6 +29,7 @@
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "settings/AdvancedSettings.h"
+#include "video/VideoInfoTag.h"
 
 bool CFavourites::Load(CFileItemList &items)
 {
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index a655deab53..8f2fdd0c75 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -3073,7 +3073,7 @@ CStdString CFileItem::FindTrailer() const
   return strTrailer;
 }
 
-VIDEODB_CONTENT_TYPE CFileItem::GetVideoContentType() const
+int CFileItem::GetVideoContentType() const
 {
   VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_MOVIES;
   if (HasVideoInfoTag() && !GetVideoInfoTag()->m_strShowTitle.IsEmpty()) // tvshow
diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h
index 460ddce3d0..1f5673e46d 100644
--- a/xbmc/FileItem.h
+++ b/xbmc/FileItem.h
@@ -33,7 +33,6 @@
 #include "utils/LabelFormatter.h"
 #include "GUIPassword.h"
 #include "threads/CriticalSection.h"
-#include "video/VideoDatabase.h"
 
 #include <vector>
 #include "boost/shared_ptr.hpp"
@@ -147,7 +146,7 @@ public:
   void SetFileSizeLabel();
   virtual void SetLabel(const CStdString &strLabel);
   CURL GetAsUrl() const;
-  VIDEODB_CONTENT_TYPE GetVideoContentType() const;
+  int GetVideoContentType() const; /* return VIDEODB_CONTENT_TYPE, but don't want to include videodb in this header */
   bool IsLabelPreformated() const { return m_bLabelPreformated; }
   void SetLabelPreformated(bool bYesNo) { m_bLabelPreformated=bYesNo; }
   bool SortsOnTop() const { return m_specialSort == SORT_ON_TOP; }
diff --git a/xbmc/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp
index c859c71c98..0e4d007397 100644
--- a/xbmc/PartyModeManager.cpp
+++ b/xbmc/PartyModeManager.cpp
@@ -23,6 +23,7 @@
 #include "PlayListPlayer.h"
 #include "music/MusicDatabase.h"
 #include "music/windows/GUIWindowMusicPlaylist.h"
+#include "video/VideoDatabase.h"
 #include "playlists/SmartPlayList.h"
 #include "dialogs/GUIDialogProgress.h"
 #include "GUIUserMessages.h"
diff --git a/xbmc/SortFileItem.cpp b/xbmc/SortFileItem.cpp
index c1ffc32f83..b558b16516 100644
--- a/xbmc/SortFileItem.cpp
+++ b/xbmc/SortFileItem.cpp
@@ -26,6 +26,7 @@
 #include "FileItem.h"
 #include "URL.h"
 #include "utils/log.h"
+#include "video/VideoInfoTag.h"
 
 #define RETURN_IF_NULL(x,y) if ((x) == NULL) { CLog::Log(LOGWARNING, "%s, sort item is null", __FUNCTION__); return y; }
 
diff --git a/xbmc/TextureDatabase.cpp b/xbmc/TextureDatabase.cpp
index c3bc971c92..a9fc7a4278 100644
--- a/xbmc/TextureDatabase.cpp
+++ b/xbmc/TextureDatabase.cpp
@@ -23,6 +23,7 @@
 #include "utils/log.h"
 #include "utils/Crc32.h"
 #include "DateTime.h"
+#include "dbwrappers/dataset.h"
 
 CTextureDatabase::CTextureDatabase()
 {
diff --git a/xbmc/ThumbLoader.cpp b/xbmc/ThumbLoader.cpp
index 2c3d393cf1..23adbf8ec8 100644
--- a/xbmc/ThumbLoader.cpp
+++ b/xbmc/ThumbLoader.cpp
@@ -33,6 +33,7 @@
 #include "TextureCache.h"
 #include "utils/log.h"
 #include "programs/Shortcut.h"
+#include "video/VideoInfoTag.h"
 
 #include "cores/dvdplayer/DVDFileInfo.h"
 
diff --git a/xbmc/ViewDatabase.cpp b/xbmc/ViewDatabase.cpp
index ced353e0f6..0776d615ee 100644
--- a/xbmc/ViewDatabase.cpp
+++ b/xbmc/ViewDatabase.cpp
@@ -27,6 +27,8 @@
 #ifdef _LINUX
 #include "linux/ConvUtils.h" // GetLastError()
 #endif
+#include "dbwrappers/dataset.h"
+
 
 //********************************************************************************************************************************
 CViewDatabase::CViewDatabase(void)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 08c632cf38..6a202c632e 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -32,6 +32,7 @@
 #include "utils/URIUtils.h"
 #include <vector>
 #include <string.h>
+#include <ostream>
 
 using XFILE::CDirectory;
 using XFILE::CFile;
diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
index 6a13f8c72b..53dff2694b 100644
--- a/xbmc/addons/Addon.h
+++ b/xbmc/addons/Addon.h
@@ -25,7 +25,6 @@
 #include "Util.h"
 #include "URL.h"
 #include "guilib/LocalizeStrings.h"
-#include <ostream>
 
 class CURL;
 class TiXmlElement;
diff --git a/xbmc/addons/AddonDatabase.cpp b/xbmc/addons/AddonDatabase.cpp
index e3dd716fc6..db01e09090 100644
--- a/xbmc/addons/AddonDatabase.cpp
+++ b/xbmc/addons/AddonDatabase.cpp
@@ -24,6 +24,7 @@
 #include "utils/log.h"
 #include "DateTime.h"
 #include "addons/Service.h"
+#include "dbwrappers/dataset.h"
 
 using namespace ADDON;
 using namespace std;
diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h
index d3305bf806..fdd03c2a37 100644
--- a/xbmc/addons/AddonInstaller.h
+++ b/xbmc/addons/AddonInstaller.h
@@ -21,7 +21,7 @@
  */
 
 #include "utils/FileOperationJob.h"
-#include "addons/IAddon.h"
+#include "addons/Addon.h"
 #include "utils/Stopwatch.h"
 #include "threads/Event.h"
 
diff --git a/xbmc/addons/Scraper.h b/xbmc/addons/Scraper.h
index 734149b05e..7afc7d8474 100644
--- a/xbmc/addons/Scraper.h
+++ b/xbmc/addons/Scraper.h
@@ -20,7 +20,6 @@
  *
  */
 #include "addons/Addon.h"
-#include "utils/ScraperUrl.h"
 #include "DateTime.h"
 #include "utils/ScraperParser.h"
 
@@ -34,6 +33,13 @@ typedef enum
   CONTENT_NONE,
 } CONTENT_TYPE;
 
+namespace XFILE
+{
+  class CFileCurl;
+}
+
+class CScraperUrl;
+
 namespace ADDON
 {
   class CScraper;
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index d90996f823..eb81d36364 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -66,6 +66,7 @@
 #include "storage/MediaManager.h"
 #include "dialogs/GUIDialogBusy.h"
 #include "utils/StringUtils.h"
+#include "Util.h"
 
 using namespace std;
 
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
index 11052dafc8..0ee901be9d 100644
--- a/xbmc/dbwrappers/Database.cpp
+++ b/xbmc/dbwrappers/Database.cpp
@@ -29,6 +29,9 @@
 #include "utils/AutoPtrHandle.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "mysqldataset.h"
+#include "sqlitedataset.h"
+
 
 using namespace AUTOPTR;
 using namespace dbiplus;
diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h
index 24d6fa0b57..bf53de91bf 100644
--- a/xbmc/dbwrappers/Database.h
+++ b/xbmc/dbwrappers/Database.h
@@ -22,8 +22,11 @@
  */
 
 #include "utils/StdString.h"
-#include "mysqldataset.h"
-#include "sqlitedataset.h"
+
+namespace dbiplus {
+  class Database;
+  class Dataset;
+}
 
 #include <memory>
 
diff --git a/xbmc/filesystem/DirectoryCache.cpp b/xbmc/filesystem/DirectoryCache.cpp
index e3fbe45935..e3fb399c4d 100644
--- a/xbmc/filesystem/DirectoryCache.cpp
+++ b/xbmc/filesystem/DirectoryCache.cpp
@@ -25,6 +25,7 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "climits"
 
 using namespace std;
 using namespace XFILE;
diff --git a/xbmc/filesystem/FTPDirectory.cpp b/xbmc/filesystem/FTPDirectory.cpp
index 215384935c..275a0bb94f 100644
--- a/xbmc/filesystem/FTPDirectory.cpp
+++ b/xbmc/filesystem/FTPDirectory.cpp
@@ -27,6 +27,7 @@
 #include "FileItem.h"
 #include "utils/StringUtils.h"
 #include "utils/CharsetConverter.h"
+#include "climits"
 
 using namespace XFILE;
 
diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp
index 32cfb47181..dc63b05497 100644
--- a/xbmc/filesystem/File.cpp
+++ b/xbmc/filesystem/File.cpp
@@ -26,6 +26,7 @@
 #include "FileCache.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "utils/BitstreamStats.h"
 #include "Util.h"
 
 #ifndef _LINUX
diff --git a/xbmc/filesystem/File.h b/xbmc/filesystem/File.h
index c76906d041..a444a22e4f 100644
--- a/xbmc/filesystem/File.h
+++ b/xbmc/filesystem/File.h
@@ -32,8 +32,8 @@
 #include <iostream>
 #include "IFile.h"
 #include "utils/StdString.h"
-#include "../utils/BitstreamStats.h"
 
+class BitstreamStats;
 class CURL;
 
 namespace XFILE
diff --git a/xbmc/filesystem/HDHomeRun.cpp b/xbmc/filesystem/HDHomeRun.cpp
index a35a40031b..486e75df82 100644
--- a/xbmc/filesystem/HDHomeRun.cpp
+++ b/xbmc/filesystem/HDHomeRun.cpp
@@ -27,6 +27,7 @@
 #include "utils/TimeUtils.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "Util.h"
 
 using namespace XFILE;
 using namespace std;
diff --git a/xbmc/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp
index 05877d5103..ea569f214a 100644
--- a/xbmc/filesystem/HTTPDirectory.cpp
+++ b/xbmc/filesystem/HTTPDirectory.cpp
@@ -29,6 +29,7 @@
 #include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "climits"
 
 using namespace XFILE;
 
diff --git a/xbmc/filesystem/RSSDirectory.cpp b/xbmc/filesystem/RSSDirectory.cpp
index b9b5eba324..995ab7caa7 100644
--- a/xbmc/filesystem/RSSDirectory.cpp
+++ b/xbmc/filesystem/RSSDirectory.cpp
@@ -32,6 +32,7 @@
 #include "utils/log.h"
 #include "URL.h"
 #include "settings/GUISettings.h"
+#include "climits"
 
 using namespace XFILE;
 using namespace std;
diff --git a/xbmc/filesystem/SAPDirectory.cpp b/xbmc/filesystem/SAPDirectory.cpp
index 07246933c3..0d5469dca3 100644
--- a/xbmc/filesystem/SAPDirectory.cpp
+++ b/xbmc/filesystem/SAPDirectory.cpp
@@ -26,6 +26,7 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
+#include "URL.h"
 #ifdef __APPLE__
 #include "OSXGNUReplacements.h" // strnlen
 #endif
diff --git a/xbmc/filesystem/VTPFile.cpp b/xbmc/filesystem/VTPFile.cpp
index 6b8c3ce1f4..a90fc6c754 100644
--- a/xbmc/filesystem/VTPFile.cpp
+++ b/xbmc/filesystem/VTPFile.cpp
@@ -25,6 +25,7 @@
 #include "utils/URIUtils.h"
 #include "URL.h"
 #include "utils/log.h"
+#include "video/VideoInfoTag.h"
 
 #ifdef _LINUX
 #define SD_BOTH SHUT_RDWR
diff --git a/xbmc/filesystem/VTPFile.h b/xbmc/filesystem/VTPFile.h
index 5f4b70b278..a217b8b0ee 100644
--- a/xbmc/filesystem/VTPFile.h
+++ b/xbmc/filesystem/VTPFile.h
@@ -22,7 +22,6 @@
 
 #include "IFile.h"
 #include "ILiveTV.h"
-#include "video/VideoInfoTag.h"
 
 
 class CVTPSession;
diff --git a/xbmc/guilib/Key.h b/xbmc/guilib/Key.h
index 25ae788286..2a1c310097 100644
--- a/xbmc/guilib/Key.h
+++ b/xbmc/guilib/Key.h
@@ -29,7 +29,6 @@
  *
  */
 
-#include "input/XBIRRemote.h"
 #include "utils/StdString.h"
 
 // Analogue - don't change order
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index 6a76657692..b6df9caf97 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -31,6 +31,7 @@
 #include "utils/StringUtils.h"
 #include "utils/log.h"
 #include "tinyXML/tinyxml.h"
+#include "XBIRRemote.h"
 
 using namespace std;
 using namespace XFILE;
diff --git a/xbmc/interfaces/AnnouncementManager.cpp b/xbmc/interfaces/AnnouncementManager.cpp
index 99c736276b..a6d3d28cfb 100644
--- a/xbmc/interfaces/AnnouncementManager.cpp
+++ b/xbmc/interfaces/AnnouncementManager.cpp
@@ -26,6 +26,7 @@
 #include "utils/Variant.h"
 #include "FileItem.h"
 #include "music/tags/MusicInfoTag.h"
+#include "video/VideoDatabase.h"
 
 using namespace std;
 using namespace ANNOUNCEMENT;
@@ -81,7 +82,7 @@ void CAnnouncementManager::Announce(EAnnouncementFlag flag, const char *sender,
 
   if (item->HasVideoInfoTag())
   {
-    CVideoDatabase::VideoContentTypeToString(item->GetVideoContentType(), type);
+    CVideoDatabase::VideoContentTypeToString((VIDEODB_CONTENT_TYPE)item->GetVideoContentType(), type);
     id = item->GetVideoInfoTag()->m_iDbId;
   }
   else if (item->HasMusicInfoTag())
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index 0105b1742f..27b28c748b 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -27,6 +27,9 @@
 #include "utils/URIUtils.h"
 #include "utils/ISerializable.h"
 #include "utils/Variant.h"
+#include "video/VideoInfoTag.h"
+#include "music/tags/MusicInfoTag.h"
+
 
 using namespace MUSIC_INFO;
 using namespace Json;
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.h b/xbmc/interfaces/json-rpc/FileItemHandler.h
index 378c2fc985..2be8a3282d 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.h
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.h
@@ -24,8 +24,6 @@
 #include "JSONRPC.h"
 #include "JSONUtils.h"
 #include "FileItem.h"
-#include "video/VideoInfoTag.h"
-#include "music/tags/MusicInfoTag.h"
 
 namespace JSONRPC
 {
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index dfddab3326..28f0da60a0 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -60,6 +60,7 @@
 #include "addons/AddonInstaller.h"
 #include "utils/AutoPtrHandle.h"
 #include "interfaces/AnnouncementManager.h"
+#include "dbwrappers/dataset.h"
 
 using namespace std;
 using namespace AUTOPTR;
diff --git a/xbmc/programs/ProgramDatabase.cpp b/xbmc/programs/ProgramDatabase.cpp
index 3b53af0724..9d3714c191 100644
--- a/xbmc/programs/ProgramDatabase.cpp
+++ b/xbmc/programs/ProgramDatabase.cpp
@@ -27,6 +27,7 @@
 #include "settings/Settings.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "dbwrappers/dataset.h"
 
 using namespace XFILE;
 
diff --git a/xbmc/storage/DetectDVDType.cpp b/xbmc/storage/DetectDVDType.cpp
index f61b456dd9..ffe0382737 100644
--- a/xbmc/storage/DetectDVDType.cpp
+++ b/xbmc/storage/DetectDVDType.cpp
@@ -49,6 +49,9 @@
 #include "filesystem/File.h"
 #include "FileItem.h"
 #include "Application.h"
+#include "IoSupport.h"
+#include "cdioSupport.h"
+
 
 using namespace XFILE;
 using namespace MEDIA_DETECT;
diff --git a/xbmc/storage/DetectDVDType.h b/xbmc/storage/DetectDVDType.h
index c23c3b744a..3c9cda1e3a 100644
--- a/xbmc/storage/DetectDVDType.h
+++ b/xbmc/storage/DetectDVDType.h
@@ -33,14 +33,14 @@
 
 #ifdef HAS_DVD_DRIVE
 
-#include "IoSupport.h"
-#include "cdioSupport.h"
 #include "threads/CriticalSection.h"
 
 #include "threads/Thread.h"
 
 namespace MEDIA_DETECT
 {
+class CCdInfo;
+class CLibcdio;
 
 class CDetectDVDMedia : public CThread
 {
diff --git a/xbmc/utils/LabelFormatter.h b/xbmc/utils/LabelFormatter.h
index fb3ce48341..3d89fc7667 100644
--- a/xbmc/utils/LabelFormatter.h
+++ b/xbmc/utils/LabelFormatter.h
@@ -31,9 +31,9 @@ namespace MUSIC_INFO
 
 class CFileItem;  // forward
 
-typedef struct _LABEL_MASKS
+struct LABEL_MASKS
 {
-  _LABEL_MASKS(const CStdString& strLabelFile="", const CStdString& strLabel2File="", const CStdString& strLabelFolder="", const CStdString& strLabel2Folder="")
+  LABEL_MASKS(const CStdString& strLabelFile="", const CStdString& strLabel2File="", const CStdString& strLabelFolder="", const CStdString& strLabel2Folder="")
   {
     m_strLabelFile=strLabelFile;
     m_strLabel2File=strLabel2File;
@@ -44,7 +44,7 @@ typedef struct _LABEL_MASKS
   CStdString m_strLabel2File;
   CStdString m_strLabelFolder;
   CStdString m_strLabel2Folder;
-} LABEL_MASKS;
+};
 
 class CLabelFormatter
 {
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
index ed9fd99cc8..b8a570b0b7 100644
--- a/xbmc/video/VideoDatabase.cpp
+++ b/xbmc/video/VideoDatabase.cpp
@@ -48,6 +48,7 @@
 #include "TextureCache.h"
 #include "addons/AddonInstaller.h"
 #include "interfaces/AnnouncementManager.h"
+#include "dbwrappers/dataset.h"
 
 using namespace std;
 using namespace dbiplus;
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.h b/xbmc/video/dialogs/GUIDialogVideoInfo.h
index 8ad1feda81..47b09e5f5b 100644
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.h
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.h
@@ -24,6 +24,7 @@
 #include "guilib/GUIDialog.h"
 #include "guilib/GUIListItem.h"
 #include "ThumbLoader.h"
+#include "video/VideoDatabase.h"
 
 class CFileItem;
 
diff --git a/xbmc/win32/WINSMBDirectory.cpp b/xbmc/win32/WINSMBDirectory.cpp
index f9fc6724c6..c75b542cbf 100644
--- a/xbmc/win32/WINSMBDirectory.cpp
+++ b/xbmc/win32/WINSMBDirectory.cpp
@@ -30,6 +30,7 @@
 #include "log.h"
 #include "CharsetConverter.h"
 #include "PasswordManager.h"
+#include "Util.h"
 
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES ((DWORD) -1)
diff --git a/xbmc/windowing/WindowingFactory.h b/xbmc/windowing/WindowingFactory.h
index de04b6f12c..cbd6cc8005 100644
--- a/xbmc/windowing/WindowingFactory.h
+++ b/xbmc/windowing/WindowingFactory.h
@@ -22,6 +22,8 @@
 #ifndef WINDOWING_FACTORY_H
 #define WINDOWING_FACTORY_H
 
+#include "system.h"
+
 #if defined(_WIN32) && defined(HAS_GL)
 #include "windows/WinSystemWin32GL.h"
 #endif