Merge pull request #3880 from ace20022/includes_1

Cleanup some includes

12 files changed, 3 insertions, 27 deletions

diff --git a/xbmc/AppParamParser.cpp b/xbmc/AppParamParser.cpp
index f2edd0d8f9..877914aa0f 100644
--- a/xbmc/AppParamParser.cpp
+++ b/xbmc/AppParamParser.cpp
@@ -21,7 +21,6 @@
 #include "AppParamParser.h"
 #include "GUIInfoManager.h"
 #include "PlayListPlayer.h"
-#include "FileItem.h"
 #include "Application.h"
 #include "ApplicationMessenger.h"
 #include "settings/AdvancedSettings.h"
diff --git a/xbmc/Application.h b/xbmc/Application.h
index ca2d0c50b0..b788471bc5 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -24,7 +24,6 @@
 #include "XBApplicationEx.h"
 
 #include "guilib/IMsgTargetCallback.h"
-#include "threads/Condition.h"
 #include "utils/GlobalsHandling.h"
 #include "utils/StdString.h"
 
diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
index 1ff19abef4..c4d4f38c6a 100644
--- a/xbmc/ApplicationMessenger.h
+++ b/xbmc/ApplicationMessenger.h
@@ -20,11 +20,9 @@
  *
  */
 
-#include "threads/CriticalSection.h"
 #include "utils/StdString.h"
 #include "guilib/WindowIDs.h"
 #include "threads/Thread.h"
-#include "threads/Event.h"
 #include <boost/shared_ptr.hpp>
 
 #include <queue>
diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h
index 30359cbe85..013ec365db 100644
--- a/xbmc/FileItem.h
+++ b/xbmc/FileItem.h
@@ -30,7 +30,6 @@
 #include "utils/ISortable.h"
 #include "XBDateTime.h"
 #include "utils/SortUtils.h"
-#include "utils/LabelFormatter.h"
 #include "GUIPassword.h"
 #include "threads/CriticalSection.h"
 
diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index b9867dd678..f1cff8ba94 100644
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -666,7 +666,6 @@ namespace INFO
 #define COMBINED_VALUES_START        100000
 
 // forward
-class CInfoLabel;
 class CGUIWindow;
 namespace EPG { class CEpgInfoTag; }
 
diff --git a/xbmc/NfoFile.h b/xbmc/NfoFile.h
index 4193a2ec75..fd41d5c656 100644
--- a/xbmc/NfoFile.h
+++ b/xbmc/NfoFile.h
@@ -26,10 +26,8 @@
 
 #pragma once
 
-#include "utils/XBMCTinyXML.h"
 #include "addons/Scraper.h"
 #include "utils/CharsetConverter.h"
-#include "utils/XMLUtils.h"
 #include "utils/StdString.h"
 
 class CNfoFile
diff --git a/xbmc/TextureDatabase.h b/xbmc/TextureDatabase.h
index 088199cbbc..0bb84022ef 100644
--- a/xbmc/TextureDatabase.h
+++ b/xbmc/TextureDatabase.h
@@ -22,7 +22,8 @@
 
 #include "dbwrappers/Database.h"
 #include "TextureCacheJob.h"
-#include "playlists/SmartPlayList.h"
+#include "dbwrappers/DatabaseQuery.h"
+#include "utils/DatabaseUtils.h"
 
 class CVariant;
 
diff --git a/xbmc/ThumbnailCache.h b/xbmc/ThumbnailCache.h
index dc99ea6c83..af7ecd32bc 100644
--- a/xbmc/ThumbnailCache.h
+++ b/xbmc/ThumbnailCache.h
@@ -19,19 +19,9 @@
  *
  */
 
-#include "utils/StdString.h"
-
 #include <map>
 
 class CCriticalSection;
-class CVideoInfoTag;
-namespace MUSIC_INFO 
-{
-  class CMusicInfoTag;
-}
-class CAlbum;
-class CArtist;
-class CFileItem;
 
 class CThumbnailCache
 {
diff --git a/xbmc/Util.h b/xbmc/Util.h
index 643a44e07c..8183677fae 100644
--- a/xbmc/Util.h
+++ b/xbmc/Util.h
@@ -34,12 +34,6 @@
 #define LEGAL_WIN32_COMPAT    1
 #define LEGAL_FATX            2
 
-namespace XFILE
-{
-  class IFileCallback;
-}
-
-class CFileItem;
 class CFileItemList;
 class CURL;
 
diff --git a/xbmc/addons/AddonCallbacks.h b/xbmc/addons/AddonCallbacks.h
index b2ffe1c5c1..16b014707a 100644
--- a/xbmc/addons/AddonCallbacks.h
+++ b/xbmc/addons/AddonCallbacks.h
@@ -22,7 +22,6 @@
 #include "cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h"
 #include "addons/include/xbmc_pvr_types.h"
 #include "addons/include/xbmc_codec_types.h"
-#include "../../addons/library.xbmc.addon/libXBMC_addon.h"
 #include "../../addons/library.xbmc.gui/libXBMC_gui.h"
 
 typedef void (*AddOnLogCallback)(void *addonData, const ADDON::addon_log_t loglevel, const char *msg);
diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp
index 735cd2ab6c..63dc063b37 100644
--- a/xbmc/addons/GUIDialogAddonSettings.cpp
+++ b/xbmc/addons/GUIDialogAddonSettings.cpp
@@ -51,6 +51,7 @@
 #include "utils/log.h"
 #include "Util.h"
 #include "URL.h"
+#include "utils/XMLUtils.h"
 
 using namespace std;
 using namespace ADDON;
diff --git a/xbmc/addons/Skin.h b/xbmc/addons/Skin.h
index fa4b0e8fb4..1d1c09b0ae 100644
--- a/xbmc/addons/Skin.h
+++ b/xbmc/addons/Skin.h
@@ -27,7 +27,6 @@
 #include "guilib/GUIIncludes.h"    // needed for the GUIInclude member
 #define CREDIT_LINE_LENGTH 50
 
-class TiXmlNode;
 class CSetting;
 
 namespace ADDON