Merge remote branch 'mine/ext-python'

[vuplus_xbmc] / project / VS2010Express / XBMC.vcxproj

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 2841fa8..410f994 100644 (file)
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -102,8 +102,8 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;..\..\lib\pcre</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;USE_EXTERNAL_PYTHON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -126,7 +126,7 @@
       <OutputFile>$(OutDir)XBMC.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib\libSDL-WIN32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;libssh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -146,8 +146,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\lib\libcurl-mingw32\include;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\lib\libSDL-WIN32\include;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;..\..\lib\pcre;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;Py_NO_ENABLE_SHARED;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores;..\..\xbmc\cores\dvdplayer;..\..\xbmc\dialogs;..\..\xbmc\FileSystem;..\..\xbmc\guilib\;..\..\xbmc\utils;..\..\xbmc\win32;..\..\xbmc\windowing;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libflac\flac-1.2.1\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;USE_EXTERNAL_PYTHON;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -169,7 +169,7 @@
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;libssh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -192,10 +192,10 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\lib\libcurl-mingw32\include;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\lib\libSDL-WIN32\include;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;..\..\lib\pcre;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;USE_EXTERNAL_PYTHON;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
+      <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
@@ -204,8 +204,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>pch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <ShowIncludes>false</ShowIncludes>
@@ -216,7 +215,7 @@
       <OutputFile>$(OutDir)XBMC.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib\libSDL-WIN32\lib;..\..\xbmc\cores\DSPlayer\Libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;libssh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -236,8 +235,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;..\..\lib\pcre</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;Py_NO_ENABLE_SHARED;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;USE_EXTERNAL_PYTHON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -259,7 +258,7 @@
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;libssh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -277,63 +276,471 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\AddonDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonHelpers_Addon.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonHelpers_GUI.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonHelpers_local.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonHelpers_PVR.cpp" />
+    <ClCompile Include="..\..\lib\jsoncpp\src\lib_json\json_reader.cpp" />
+    <ClCompile Include="..\..\lib\jsoncpp\src\lib_json\json_value.cpp" />
+    <ClCompile Include="..\..\lib\jsoncpp\src\lib_json\json_writer.cpp" />
+    <ClCompile Include="..\..\lib\tinyXML\tinystr.cpp" />
+    <ClCompile Include="..\..\lib\tinyXML\tinyxml.cpp" />
+    <ClCompile Include="..\..\lib\tinyXML\tinyxmlerror.cpp" />
+    <ClCompile Include="..\..\lib\tinyXML\tinyxmlparser.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\AddonDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\GUIWindowAddonBrowser.cpp" />
     <ClCompile Include="..\..\xbmc\addons\PluginSource.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\PVRClient.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Repository.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Service.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Skin.cpp" />
+    <ClCompile Include="..\..\xbmc\Application.cpp" />
+    <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
+    <ClCompile Include="..\..\xbmc\Autorun.cpp" />
+    <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
+    <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\CrystalHD.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp" />
+    <ClCompile Include="..\..\xbmc\CueDocument.cpp" />
+    <ClCompile Include="..\..\xbmc\dbwrappers\Database.cpp" />
+    <ClCompile Include="..\..\xbmc\dbwrappers\dataset.cpp" />
+    <ClCompile Include="..\..\xbmc\dbwrappers\mysqldataset.cpp" />
+    <ClCompile Include="..\..\xbmc\dbwrappers\qry_dat.cpp" />
+    <ClCompile Include="..\..\xbmc\dbwrappers\sqlitedataset.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogBoxBase.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogBusy.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogButtonMenu.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogCache.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogContextMenu.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogFavourites.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogFileBrowser.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogGamepad.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogKaiToast.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogKeyboard.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMediaSource.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMuteBug.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogNumeric.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogOK.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogPlayEject.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogPlayerControls.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogProgress.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSeekBar.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSelect.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSlider.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistEditor.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistRule.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSubMenu.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogTextViewer.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogVolumeBar.cpp" />
+    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogYesNo.cpp" />
+    <ClCompile Include="..\..\xbmc\DynamicDll.cpp" />
+    <ClCompile Include="..\..\xbmc\Favourites.cpp" />
+    <ClCompile Include="..\..\xbmc\FileItem.cpp" />
+    <ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp" />
+    <ClCompile Include="..\..\xbmc\FileSystem\iso9660.cpp" />
+    <ClCompile Include="..\..\xbmc\FileSystem\ISO9660Directory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FileUDF.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\PVRDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\PVRFile.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\udf25.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\UDFDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeCountry.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogAddonInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRChannelManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRChannelsOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRCutterOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRDirectorOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRGroupManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRGuideInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRGuideOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRGuideSearch.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRRecordingInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRTimerSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPVRUpdateProgressBar.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogTextViewer.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStateAddonBrowser.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStateTV.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSystemInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowTV.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AudioLibrary.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonAddon.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\xbmcaddonmodule.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRChannel.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRChannelGroup.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRChannelGroups.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRChannels.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRChannelsContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVREpg.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVREpgInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVREpgs.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVREpgSearchFilter.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRManager.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRRecordings.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRTimerInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRTimers.cpp" />
-    <ClCompile Include="..\..\xbmc\RenderSystemGLES.cpp" />
+    <ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp" />
+    <ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
+    <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\AnimatedGif.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\AudioContext.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\D3DResource.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\DDSImage.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\DirectXGraphics.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\FrameBufferObject.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GraphicContext.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIAudioManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIBaseContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIBorderedImage.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIButtonControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIButtonScroller.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUICheckMarkControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIColorManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIControlFactory.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIControlGroup.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIControlGroupList.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIControlProfiler.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIDialog.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIEditControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFontTTF.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFDX.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFGL.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIImage.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIIncludes.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIInfoTypes.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUILabel.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUILabelControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIListContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIListGroup.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIListItem.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIListItemLayout.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIListLabel.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIMessage.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIMoverControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIMultiImage.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIMultiSelectText.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIPanelContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIProgressControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIRadioButtonControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIRenderingControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIResizeControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIRSSControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIScrollBarControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISelectButtonControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISettingsSliderControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIShader.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISliderControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISound.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISpinControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUISpinControlEx.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIStandardWindow.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIStaticItem.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITextBox.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITextLayout.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITexture.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITextureD3D.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITextureGL.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUITextureGLES.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIToggleButtonControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIVideoControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIVisualisationControl.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIWindow.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIWindowManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\GUIWrappingListContainer.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\IWindowManagerCallback.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\Key.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\LocalizeStrings.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\MatrixGLES.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\Shader.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\Texture.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureBundle.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureBundleXBT.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureBundleXPR.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureDX.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureGL.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\TextureManager.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\VisibleEffect.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\XBTF.cpp" />
+    <ClCompile Include="..\..\xbmc\guilib\XBTFReader.cpp" />
+    <ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
+    <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
+    <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
+    <ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp" />
+    <ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
+    <ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp" />
+    <ClCompile Include="..\..\xbmc\input\MouseStat.cpp" />
+    <ClCompile Include="..\..\xbmc\input\SDLJoystick.cpp" />
+    <ClCompile Include="..\..\xbmc\input\windows\IRServerSuite.cpp" />
+    <ClCompile Include="..\..\xbmc\input\windows\IrssMessage.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\AnnouncementManager.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\Builtins.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\http-api\HttpApi.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\http-api\XBMChttp.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AVPlayerOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AVPlaylistOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileItemHandler.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONRPC.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PicturePlayerOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlayerOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlaylistOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\SystemOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\VideoLibrary.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\XBMCOperations.cpp" />
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\action.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\control.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlbutton.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlcheckmark.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlfadelabel.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlgroup.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlimage.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controllabel.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controllist.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlprogress.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlradiobutton.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlslider.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controlspin.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\controltextbox.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\dialog.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindow.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowDialog.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowXML.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowXMLDialog.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\infotagmusic.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\infotagvideo.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\keyboard.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\listitem.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\player.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyplaylist.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\PythonAddon.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\PythonPlayer.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyutil.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\window.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\winxml.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\winxmldialog.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcaddonmodule.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcguimodule.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcmodule.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcplugin.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\xbmcvfsmodule.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\XBPython.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\interfaces\python\XBPyThread.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\LangInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
+    <ClCompile Include="..\..\xbmc\music\Album.cpp" />
+    <ClCompile Include="..\..\xbmc\music\Artist.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.cpp" />
+    <ClCompile Include="..\..\xbmc\music\GUIViewStateMusic.cpp" />
+    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicAlbumInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicArtistInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicInfoScanner.cpp" />
+    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicInfoScraper.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\GUIDialogKaraokeSongSelector.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\GUIWindowKaraokeLyrics.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyrics.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricscdg.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricsfactory.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricsmanager.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstext.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextkar.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextlrc.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextustar.cpp" />
+    <ClCompile Include="..\..\xbmc\music\karaoke\karaokewindowbackground.cpp" />
+    <ClCompile Include="..\..\xbmc\music\LastFmManager.cpp" />
+    <ClCompile Include="..\..\xbmc\music\MusicDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\music\MusicInfoLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\music\Song.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\APEv2Tag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\FlacTag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\Id3Tag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderAAC.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderApe.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderASAP.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderCDDA.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFactory.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFlac.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMidi.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMod.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMP3.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMP4.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMPC.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderOgg.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWavPack.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWMA.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\OggTag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\tags\VorbisTag.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicBase.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicNav.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylist.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylistEditor.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicSongs.cpp" />
+    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowVisualisation.cpp" />
+    <ClCompile Include="..\..\xbmc\network\cddb.cpp" />
+    <ClCompile Include="..\..\xbmc\network\DNSNameCache.cpp" />
+    <ClCompile Include="..\..\xbmc\network\EventClient.cpp" />
+    <ClCompile Include="..\..\xbmc\network\EventPacket.cpp" />
+    <ClCompile Include="..\..\xbmc\network\EventServer.cpp" />
+    <ClCompile Include="..\..\xbmc\network\GUIDialogAccessPoints.cpp" />
+    <ClCompile Include="..\..\xbmc\network\GUIDialogNetworkSetup.cpp" />
+    <ClCompile Include="..\..\xbmc\network\libscrobbler\lastfmscrobbler.cpp" />
+    <ClCompile Include="..\..\xbmc\network\libscrobbler\librefmscrobbler.cpp" />
+    <ClCompile Include="..\..\xbmc\network\libscrobbler\scrobbler.cpp" />
+    <ClCompile Include="..\..\xbmc\network\Network.cpp" />
+    <ClCompile Include="..\..\xbmc\network\Socket.cpp" />
+    <ClCompile Include="..\..\xbmc\network\TCPServer.cpp" />
+    <ClCompile Include="..\..\xbmc\network\UdpClient.cpp" />
+    <ClCompile Include="..\..\xbmc\network\UPnP.cpp" />
+    <ClCompile Include="..\..\xbmc\network\WebServer.cpp" />
+    <ClCompile Include="..\..\xbmc\network\windows\NetworkWin32.cpp" />
+    <ClCompile Include="..\..\xbmc\network\Zeroconf.cpp" />
+    <ClCompile Include="..\..\xbmc\network\ZeroconfBrowser.cpp" />
+    <ClCompile Include="..\..\xbmc\NfoFile.cpp" />
+    <ClCompile Include="..\..\xbmc\PartyModeManager.cpp" />
+    <ClCompile Include="..\..\xbmc\PasswordManager.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\GUIDialogPictureInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\GUIViewStatePictures.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\GUIWindowPictures.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\GUIWindowSlideShow.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\Picture.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\PictureInfoLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\PictureInfoTag.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\PictureThumbLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\pictures\SlideShowPicture.cpp" />
+    <ClCompile Include="..\..\xbmc\PlayListPlayer.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayList.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListB4S.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListFactory.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListM3U.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListPLS.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListURL.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListWPL.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\PlayListXML.cpp" />
+    <ClCompile Include="..\..\xbmc\playlists\SmartPlayList.cpp" />
+    <ClCompile Include="..\..\xbmc\powermanagement\DPMSSupport.cpp" />
+    <ClCompile Include="..\..\xbmc\powermanagement\PowerManager.cpp" />
+    <ClCompile Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.cpp" />
+    <ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp" />
+    <ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp" />
+    <ClCompile Include="..\..\xbmc\programs\ProgramDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\programs\Shortcut.cpp" />
+    <ClCompile Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.cpp" />
+    <ClCompile Include="..\..\xbmc\rendering\dx\RenderSystemDX.cpp" />
+    <ClCompile Include="..\..\xbmc\rendering\gl\GUIWindowTestPatternGL.cpp" />
+    <ClCompile Include="..\..\xbmc\rendering\gl\RenderSystemGL.cpp" />
+    <ClCompile Include="..\..\xbmc\rendering\RenderSystem.cpp" />
+    <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\AdvancedSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIDialogContentSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIDialogLockSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIDialogProfileSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIDialogSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUISettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIWindowSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIWindowSettingsCategory.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIWindowSettingsProfile.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIWindowSettingsScreenCalibration.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\GUIWindowTestPattern.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\Profile.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\Settings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingsControls.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\SortFileItem.cpp" />
+    <ClCompile Include="..\..\xbmc\storage\AutorunMediaJob.cpp" />
+    <ClCompile Include="..\..\xbmc\storage\cdioSupport.cpp" />
+    <ClCompile Include="..\..\xbmc\storage\IoSupport.cpp" />
+    <ClCompile Include="..\..\xbmc\storage\MediaManager.cpp" />
+    <ClCompile Include="..\..\xbmc\storage\windows\Win32StorageProvider.cpp" />
     <ClCompile Include="..\..\xbmc\SystemGlobals.cpp" />
+    <ClCompile Include="..\..\xbmc\Temperature.cpp" />
+    <ClCompile Include="..\..\xbmc\TextureCache.cpp" />
+    <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\Atomics.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\CriticalSection.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\Event.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\LockFree.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\Mutex.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\SharedSection.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\SingleLock.cpp" />
+    <ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
+    <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
+    <ClCompile Include="..\..\xbmc\URL.cpp" />
+    <ClCompile Include="..\..\xbmc\Util.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\AlarmClock.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\AliasShortcutUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Archive.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\AsyncFileCopy.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\AutoPtrHandle.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\BitstreamStats.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\CharsetConverter.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\CPUInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Crc32.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\DownloadQueue.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\DownloadQueueManager.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Fanart.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\fft.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\FileOperationJob.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\FileUtils.cpp" />
     <ClCompile Include="..\..\xbmc\utils\fstrcmp.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">CompileAsCpp</CompileAs>
@@ -341,20 +748,72 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Observer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\TextSearch.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\GLUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\HTMLTable.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\HTMLUtil.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\HttpHeader.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\InfoLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\JobManager.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\LabelFormatter.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\LangCodeExpander.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\LCD.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\log.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\md5.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\PCMAmplifier.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\PerformanceSample.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\PerformanceStats.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\RegExp.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\RingBuffer.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\RssReader.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\ScraperParser.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\ScraperUrl.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Splash.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\ssrc.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Stopwatch.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\StreamDetails.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\StringUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\SystemInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\TimeUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\TuxBoxUtil.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\URIUtils.cpp" />
     <ClCompile Include="..\..\xbmc\utils\Variant.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\NetworkWin32.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Weather.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\Win32Exception.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\video\Bookmark.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.cpp" />
+    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp" />
+    <ClCompile Include="..\..\xbmc\video\Teletext.cpp" />
+    <ClCompile Include="..\..\xbmc\video\VideoDatabase.cpp" />
+    <ClCompile Include="..\..\xbmc\video\VideoInfoDownloader.cpp" />
+    <ClCompile Include="..\..\xbmc\video\VideoInfoScanner.cpp" />
+    <ClCompile Include="..\..\xbmc\video\VideoInfoTag.cpp" />
+    <ClCompile Include="..\..\xbmc\video\VideoReferenceClock.cpp" />
+    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowFullScreen.cpp" />
+    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoBase.cpp" />
+    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoNav.cpp" />
+    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.cpp" />
+    <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
     <ClCompile Include="..\..\xbmc\win32\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\win32\stat_utf8.cpp" />
+    <ClCompile Include="..\..\xbmc\win32\stdio_utf8.cpp" />
     <ClCompile Include="..\..\xbmc\win32\strverscmp.cpp" />
     <ClCompile Include="..\..\xbmc\win32\Win32DelayedDllLoad.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\Win32PowerSyscall.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\Win32StorageProvider.cpp" />
+    <ClCompile Include="..\..\xbmc\win32\win32env.cpp" />
     <ClCompile Include="..\..\xbmc\win32\WIN32Util.cpp" />
     <ClCompile Include="..\..\xbmc\win32\WINDirectSound.cpp" />
     <ClCompile Include="..\..\xbmc\win32\WindowHelper.cpp" />
@@ -362,9 +821,7 @@
     <ClCompile Include="..\..\xbmc\win32\WINSMBDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\win32\XBMC_PC.cpp" />
     <ClCompile Include="..\..\xbmc\win32\XCriticalSection.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dlgcache.cpp" />
     <ClCompile Include="..\..\xbmc\cores\DummyVideoPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\ssrc.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDAudio.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDClock.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.cpp" />
@@ -389,7 +846,6 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibFaad.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibMad.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.cpp" />
@@ -423,7 +879,6 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMMS.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp" />
@@ -439,16 +894,12 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\AC3CDDACodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\AC3Codec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\ADPCMCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\AIFFcodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\ASAPCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\AudioDecoder.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\CDDAcodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\CodecFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DTSCDDACodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DTSCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\FLACcodec.cpp" />
     <ClCompile Include="..\..\xbmc\cores\paplayer\ModplugCodec.cpp" />
@@ -520,266 +971,11 @@
     <ClCompile Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.cpp" />
     <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.cpp" />
     <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.cpp" />
-    <ClCompile Include="..\..\xbmc\Application.cpp" />
-    <ClCompile Include="..\..\xbmc\CueDocument.cpp" />
-    <ClCompile Include="..\..\xbmc\AdvancedSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUISettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSettingsCategory.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSettingsProfile.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSettingsScreenCalibration.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowTestPattern.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowTestPatternDX.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowTestPatternGL.cpp" />
-    <ClCompile Include="..\..\xbmc\Settings.cpp" />
-    <ClCompile Include="..\..\xbmc\SettingsControls.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogMusicScan.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSmartPlaylistEditor.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSmartPlaylistRule.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSongInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStateMusic.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicBase.cpp" />
-    <ClCompile Include="..\..\xbmc\GuiWindowMusicInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicNav.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicOverlay.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicPlaylist.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicPlaylistEditor.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowMusicSongs.cpp" />
-    <ClCompile Include="..\..\xbmc\SmartPlaylist.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogVideoScan.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStateVideo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoBase.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoFiles.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoNav.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoOverlay.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVideoPlaylist.cpp" />
-    <ClCompile Include="..\..\xbmc\VideoInfoScanner.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayList.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListB4S.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListM3U.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListPLS.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListURL.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListWPL.cpp" />
-    <ClCompile Include="..\..\xbmc\PlayListXML.cpp" />
-    <ClCompile Include="..\..\xbmc\APEv2Tag.cpp" />
-    <ClCompile Include="..\..\xbmc\FlacTag.cpp" />
-    <ClCompile Include="..\..\xbmc\Id3Tag.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoScanner.cpp" />
-    <ClCompile Include="..\..\xbmc\musicInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderAAC.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderApe.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderASAP.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderCDDA.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\musicInfoTagLoaderFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderFlac.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderMidi.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderMod.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderMP3.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderMP4.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderMPC.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderNSF.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderOgg.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderShn.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderSPC.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderWav.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderWavPack.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderWMA.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicInfoTagLoaderYM.cpp" />
-    <ClCompile Include="..\..\xbmc\OggTag.cpp" />
-    <ClCompile Include="..\..\xbmc\VorbisTag.cpp" />
-    <ClCompile Include="..\..\xbmc\PictureInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\PictureInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\AlarmClock.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\AliasShortcutUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\AnnouncementManager.cpp" />
-    <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ArabicShaping.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Archive.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\AsyncFileCopy.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Atomics.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\AutoPtrHandle.cpp" />
-    <ClCompile Include="..\..\xbmc\Autorun.cpp" />
-    <ClCompile Include="..\..\xbmc\AutorunMediaJob.cpp" />
-    <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\BitstreamStats.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Builtins.cpp" />
-    <ClCompile Include="..\..\xbmc\ButtonTranslator.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\CharsetConverter.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\CPUInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\Crc32.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\CriticalSection.cpp" />
-    <ClCompile Include="..\..\xbmc\DateTime.cpp" />
-    <ClCompile Include="..\..\xbmc\DNSNameCache.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\DownloadQueue.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\DownloadQueueManager.cpp" />
-    <ClCompile Include="..\..\xbmc\DPMSSupport.cpp" />
-    <ClCompile Include="..\..\xbmc\DynamicDll.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Event.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\EventClient.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\EventPacket.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\EventServer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Fanart.cpp" />
-    <ClCompile Include="..\..\xbmc\Favourites.cpp" />
-    <ClCompile Include="..\..\xbmc\FileItem.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\FileOperationJob.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\FileUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\GUIInfoManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HTMLTable.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HTMLUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HttpHeader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\IMDB.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\InfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\JobManager.cpp" />
-    <ClCompile Include="..\..\xbmc\KeyboardLayoutConfiguration.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\LabelFormatter.cpp" />
-    <ClCompile Include="..\..\xbmc\LangCodeExpander.cpp" />
-    <ClCompile Include="..\..\xbmc\LangInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\LastFmManager.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\log.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\md5.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\MediaManager.cpp" />
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\MusicAlbumInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\MusicArtistInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\MusicInfoScraper.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Mutex.cpp" />
-    <ClCompile Include="..\..\xbmc\NfoFile.cpp" />
-    <ClCompile Include="..\..\xbmc\PartyModeManager.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PasswordManager.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PCMAmplifier.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PerformanceSample.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PerformanceStats.cpp" />
-    <ClCompile Include="..\..\xbmc\PowerManager.cpp" />
-    <ClCompile Include="..\..\xbmc\Profile.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RegExp.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RingBuffer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RssReader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ScraperParser.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ScraperUrl.cpp" />
-    <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SharedSection.cpp" />
-    <ClCompile Include="..\..\xbmc\Shortcut.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SingleLock.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Socket.cpp" />
-    <ClCompile Include="..\..\xbmc\SortFileItem.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Splash.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Stopwatch.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\StreamDetails.cpp" />
-    <ClCompile Include="..\..\xbmc\StringUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SystemInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Teletext.cpp" />
-    <ClCompile Include="..\..\xbmc\Temperature.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureCache.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Thread.cpp" />
-    <ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\TimeUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\TuxBoxUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\UdpClient.cpp" />
-    <ClCompile Include="..\..\xbmc\URL.cpp" />
-    <ClCompile Include="..\..\xbmc\Util.cpp" />
-    <ClCompile Include="..\..\xbmc\VideoInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\VideoReferenceClock.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Weather.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\WebServer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Win32Exception.cpp" />
-    <ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
-    <ClCompile Include="..\..\xbmc\Zeroconf.cpp" />
-    <ClCompile Include="..\..\xbmc\Album.cpp" />
-    <ClCompile Include="..\..\xbmc\Artist.cpp" />
-    <ClCompile Include="..\..\xbmc\Bookmark.cpp" />
-    <ClCompile Include="..\..\xbmc\Database.cpp" />
-    <ClCompile Include="..\..\xbmc\MusicDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\ProgramDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\Song.cpp" />
-    <ClCompile Include="..\..\xbmc\VideoDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogAccessPoints.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogAddonSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogAudioSubtitleSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogBoxBase.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogBusy.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogButtonMenu.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogContentSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogContextMenu.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogFavourites.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogFileBrowser.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogFileStacking.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogFullScreenInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogGamepad.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogKaiToast.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\GUIDialogKaraokeSongSelector.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogKeyboard.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogLockSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogMediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogMusicOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogMuteBug.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogNetworkSetup.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogNumeric.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogOK.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPictureInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogPlayerControls.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogProfileSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogProgress.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSeekBar.cpp" />
-    <ClCompile Include="..\..\xbmc\GuiDialogSelect.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSlider.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogSubMenu.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogTeletext.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogVideoBookmarks.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogVideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogVisualisationPresetList.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogVolumeBar.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIDialogYesNo.cpp" />
-    <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIMediaWindow.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStatePictures.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIViewStatePrograms.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowAddonBrowser.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowFileManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowFullScreen.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowHome.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\GUIWindowKaraokeLyrics.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowLoginScreen.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowPictures.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowPointer.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowPrograms.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowScreensaver.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowSlideShow.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowStartup.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowVisualisation.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIWindowWeather.cpp" />
-    <ClCompile Include="..\..\xbmc\SlideShowPicture.cpp" />
-    <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\PictureThumbLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\AddonsDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\ASAPFileDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\CacheMemBuffer.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\CacheStrategy.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\CDDADirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\cddb.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\cdioSupport.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\DAAPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\DAVDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\Directory.cpp" />
@@ -806,7 +1002,6 @@
     <ClCompile Include="..\..\xbmc\FileSystem\FileShoutcast.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FileSpecialProtocol.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FileTuxBox.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\FileXBMSP.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FileZip.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FTPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\FTPParse.cpp" />
@@ -817,8 +1012,6 @@
     <ClCompile Include="..\..\xbmc\FileSystem\HTTPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\IDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\IFile.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\iso9660.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\ISO9660Directory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\LastFMDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\MultiPathDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\MultiPathFile.cpp" />
@@ -846,6 +1039,7 @@
     <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocol.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\StackDirectory.cpp" />
+    <ClCompile Include="..\..\xbmc\FileSystem\SourcesDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\UPnPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\VirtualDirectory.cpp" />
@@ -853,7 +1047,6 @@
     <ClCompile Include="..\..\xbmc\FileSystem\VTPDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\VTPFile.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\VTPSession.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\XBMSDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\ZipDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\ZipManager.cpp" />
     <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp" />
@@ -930,82 +1123,12 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\IoSupport.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Network.cpp" />
-    <ClCompile Include="..\..\xbmc\UPnP.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyrics.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricscdg.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricsfactory.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricsmanager.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricstext.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricstextkar.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricstextlrc.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokelyricstextustar.cpp" />
-    <ClCompile Include="..\..\xbmc\karaoke\karaokewindowbackground.cpp" />
-    <ClCompile Include="..\..\xbmc\KeyboardStat.cpp" />
-    <ClCompile Include="..\..\xbmc\WinSystem.cpp" />
-    <ClCompile Include="..\..\xbmc\WinSystemWin32.cpp" />
-    <ClCompile Include="..\..\xbmc\WinSystemWin32DX.cpp" />
-    <ClCompile Include="..\..\xbmc\WinSystemWin32GL.cpp" />
-    <ClCompile Include="..\..\xbmc\MouseStat.cpp" />
-    <ClCompile Include="..\..\xbmc\WinEventsSDL.cpp" />
-    <ClCompile Include="..\..\xbmc\WinEventsWin32.cpp" />
-    <ClCompile Include="..\..\xbmc\RenderSystem.cpp" />
-    <ClCompile Include="..\..\xbmc\RenderSystemDX.cpp" />
-    <ClCompile Include="..\..\xbmc\RenderSystemGL.cpp" />
-    <ClCompile Include="..\..\xbmc\Picture.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Addon.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonManager.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonStatusHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\fft.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Scraper.cpp" />
     <ClCompile Include="..\..\xbmc\addons\ScreenSaver.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Visualisation.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\WIN32XBPythonDll.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\XBPython.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\XBPyThread.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\action.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\control.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlbutton.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlcheckmark.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlfadelabel.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlgroup.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlimage.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controllabel.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controllist.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlprogress.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlradiobutton.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlslider.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controlspin.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\controltextbox.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\dialog.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindow.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowDialog.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowXML.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowXMLDialog.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\infotagmusic.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\infotagvideo.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\keyboard.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\listitem.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\player.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\pyplaylist.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\pyutil.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\window.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\winxml.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\winxmldialog.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\xbmcguimodule.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\xbmcmodule.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\xbmcplugin.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libhttpapi\HttpApi.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libhttpapi\XBMChttp.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\sqLite\dataset.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\sqLite\mysqldataset.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\sqLite\qry_dat.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\sqLite\sqlitedataset.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libscrobbler\lastfmscrobbler.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libscrobbler\librefmscrobbler.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libscrobbler\scrobbler.cpp" />
     <ClCompile Include="..\..\xbmc\cdrip\CDDAReader.cpp" />
     <ClCompile Include="..\..\xbmc\cdrip\CDDARipper.cpp" />
     <ClCompile Include="..\..\xbmc\cdrip\Encoder.cpp" />
@@ -1013,99 +1136,527 @@
     <ClCompile Include="..\..\xbmc\cdrip\EncoderLame.cpp" />
     <ClCompile Include="..\..\xbmc\cdrip\EncoderVorbis.cpp" />
     <ClCompile Include="..\..\xbmc\cdrip\EncoderWav.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AVPlaylistOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\FileItemHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\FileOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\JSONRPC.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\PicturePlayerOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\PlayerOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\PlaylistOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\SystemOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\TCPServer.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\VideoLibrary.cpp" />
-    <ClCompile Include="..\..\xbmc\lib\libjsonrpc\XBMCOperations.cpp" />
-    <ClCompile Include="..\..\lib\jsoncpp\jsoncpp\src\lib_json\json_reader.cpp" />
-    <ClCompile Include="..\..\lib\jsoncpp\jsoncpp\src\lib_json\json_value.cpp" />
-    <ClCompile Include="..\..\lib\jsoncpp\jsoncpp\src\lib_json\json_writer.cpp" />
-    <ClCompile Include="..\..\xbmc\URIUtils.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\windows\WinEventsWin32.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32DX.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32GL.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\WinEventsSDL.cpp" />
+    <ClCompile Include="..\..\xbmc\windowing\WinSystem.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIMediaWindow.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowFileManager.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowHome.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowLoginScreen.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowPointer.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowScreensaver.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowStartup.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowSystemInfo.cpp" />
+    <ClCompile Include="..\..\xbmc\windows\GUIWindowWeather.cpp" />
+    <ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
+    <ClCompile Include="..\..\xbmc\XBDateTime.cpp" />
+    <ClCompile Include="..\..\xbmc\xbmc.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\AddonDatabase.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonHelpers_Addon.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonHelpers_GUI.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonHelpers_local.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonHelpers_PVR.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllPVRClient.h" />
+    <ClInclude Include="..\..\lib\ffmpeg\include-xbmc-win32\libavutil\avconfig.h" />
+    <ClInclude Include="..\..\lib\tinyXML\tinystr.h" />
+    <ClInclude Include="..\..\lib\tinyXML\tinyxml.h" />
+    <ClInclude Include="..\..\xbmc\addons\AddonDatabase.h" />
+    <ClInclude Include="..\..\xbmc\addons\AddonInstaller.h" />
+    <ClInclude Include="..\..\xbmc\addons\DllLibCPluff.h" />
+    <ClInclude Include="..\..\xbmc\addons\GUIDialogAddonInfo.h" />
+    <ClInclude Include="..\..\xbmc\addons\GUIDialogAddonSettings.h" />
+    <ClInclude Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.h" />
+    <ClInclude Include="..\..\xbmc\addons\GUIWindowAddonBrowser.h" />
     <ClInclude Include="..\..\xbmc\addons\PluginSource.h" />
-    <ClInclude Include="..\..\xbmc\addons\PVRClient.h" />
     <ClInclude Include="..\..\xbmc\addons\Repository.h" />
     <ClInclude Include="..\..\xbmc\addons\Service.h" />
     <ClInclude Include="..\..\xbmc\addons\Skin.h" />
+    <ClInclude Include="..\..\xbmc\Application.h" />
+    <ClInclude Include="..\..\xbmc\ApplicationMessenger.h" />
+    <ClInclude Include="..\..\xbmc\Autorun.h" />
+    <ClInclude Include="..\..\xbmc\AutoSwitch.h" />
+    <ClInclude Include="..\..\xbmc\BackgroundInfoLoader.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\CrystalHD.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.h" />
+    <ClInclude Include="..\..\xbmc\CueDocument.h" />
+    <ClInclude Include="..\..\xbmc\dbwrappers\Database.h" />
+    <ClInclude Include="..\..\xbmc\dbwrappers\dataset.h" />
+    <ClInclude Include="..\..\xbmc\dbwrappers\mysqldataset.h" />
+    <ClInclude Include="..\..\xbmc\dbwrappers\qry_dat.h" />
+    <ClInclude Include="..\..\xbmc\dbwrappers\sqlitedataset.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogBoxBase.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogBusy.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogButtonMenu.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogCache.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogContextMenu.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogFavourites.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogFileBrowser.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogGamepad.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKaiToast.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKeyboard.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaSource.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMuteBug.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogNumeric.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogOK.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogPlayEject.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogPlayerControls.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogProgress.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSeekBar.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSelect.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSlider.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistEditor.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistRule.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSubMenu.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogTextViewer.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogVolumeBar.h" />
+    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogYesNo.h" />
+    <ClInclude Include="..\..\xbmc\DynamicDll.h" />
+    <ClInclude Include="..\..\xbmc\Favourites.h" />
+    <ClInclude Include="..\..\xbmc\FileItem.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\CacheCircular.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\Directory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\FactoryDirectory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\File.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\FileHD.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\HDDirectory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\IFile.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\iso9660.h" />
+    <ClInclude Include="..\..\xbmc\FileSystem\ISO9660Directory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FileUDF.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\PVRDirectory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\PVRFile.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\udf25.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\UDFDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeCountry.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogAddonInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRChannelManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRChannelsOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRCutterOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRDirectorOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRGroupManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRGuideInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRGuideOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRGuideSearch.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRRecordingInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRTimerSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPVRUpdateProgressBar.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogTextViewer.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStateAddonBrowser.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStateTV.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowTV.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AudioLibrary.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonAddon.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRChannel.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRChannelGroup.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRChannelGroups.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRChannels.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRChannelsContainer.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRDatabase.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVREpg.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVREpgInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVREpgs.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVREpgSearchFilter.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRManager.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRRecordings.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRTimerInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRTimers.h" />
-    <ClInclude Include="..\..\xbmc\RenderSystemGLES.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\zconf.h" />
+    <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h" />
+    <ClInclude Include="..\..\xbmc\GUIInfoManager.h" />
+    <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\AnimatedGif.h" />
+    <ClInclude Include="..\..\xbmc\guilib\AudioContext.h" />
+    <ClInclude Include="..\..\xbmc\guilib\D3DResource.h" />
+    <ClInclude Include="..\..\xbmc\guilib\DDSImage.h" />
+    <ClInclude Include="..\..\xbmc\guilib\DirectXGraphics.h" />
+    <ClInclude Include="..\..\xbmc\guilib\FrameBufferObject.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Geometry.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GraphicContext.h" />
+    <ClInclude Include="..\..\xbmc\guilib\gui3d.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIActionDescriptor.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIAudioManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIBaseContainer.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIBorderedImage.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIButtonControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIButtonScroller.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUICallback.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUICheckMarkControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIColorManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIControlFactory.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIControlGroup.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIControlGroupList.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIControlProfiler.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIDialog.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIEditControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFont.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFontTTF.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFDX.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFGL.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIImage.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIIncludes.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIInfoTypes.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUILabel.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUILabelControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIListContainer.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIListGroup.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIListItem.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIListItemLayout.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIListLabel.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIMessage.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIMoverControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIMultiImage.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIMultiSelectText.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIPanelContainer.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIProgressControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIRadioButtonControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIRenderingControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIResizeControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIRSSControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIScrollBarControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISelectButtonControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISettingsSliderControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIShader.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISliderControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISound.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISpinControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUISpinControlEx.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIStandardWindow.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIStaticItem.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITextBox.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITextLayout.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITexture.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITextureD3D.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITextureGL.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUITextureGLES.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIToggleButtonControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIVideoControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIVisualisationControl.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIWindow.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIWindowManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\GUIWrappingListContainer.h" />
+    <ClInclude Include="..\..\xbmc\guilib\IAudioDeviceChangedCallback.h" />
+    <ClInclude Include="..\..\xbmc\guilib\IMsgTargetCallback.h" />
+    <ClInclude Include="..\..\xbmc\guilib\IWindowManagerCallback.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Key.h" />
+    <ClInclude Include="..\..\xbmc\guilib\LocalizeStrings.h" />
+    <ClInclude Include="..\..\xbmc\guilib\MatrixGLES.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Resolution.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Shader.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Texture.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureBundle.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureBundleXBT.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureBundleXPR.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureDX.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureGL.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TextureManager.h" />
+    <ClInclude Include="..\..\xbmc\guilib\TransformMatrix.h" />
+    <ClInclude Include="..\..\xbmc\guilib\Tween.h" />
+    <ClInclude Include="..\..\xbmc\guilib\VisibleEffect.h" />
+    <ClInclude Include="..\..\xbmc\guilib\XBTF.h" />
+    <ClInclude Include="..\..\xbmc\guilib\XBTFReader.h" />
+    <ClInclude Include="..\..\xbmc\GUIPassword.h" />
+    <ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
+    <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
+    <ClInclude Include="..\..\xbmc\GUIViewState.h" />
+    <ClInclude Include="..\..\xbmc\input\ButtonTranslator.h" />
+    <ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h" />
+    <ClInclude Include="..\..\xbmc\input\KeyboardStat.h" />
+    <ClInclude Include="..\..\xbmc\input\MouseStat.h" />
+    <ClInclude Include="..\..\xbmc\input\SDLJoystick.h" />
+    <ClInclude Include="..\..\xbmc\input\windows\IRServerSuite.h" />
+    <ClInclude Include="..\..\xbmc\input\windows\IrssMessage.h" />
+    <ClInclude Include="..\..\xbmc\input\XBIRRemote.h" />
+    <ClInclude Include="..\..\xbmc\input\XBMC_keyboard.h" />
+    <ClInclude Include="..\..\xbmc\input\XBMC_keysym.h" />
+    <ClInclude Include="..\..\xbmc\input\XBMC_mouse.h" />
+    <ClInclude Include="..\..\xbmc\input\XBMC_vkeys.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\AnnouncementManager.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\Builtins.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\http-api\HttpApi.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\http-api\XBMChttp.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\IAnnouncer.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AVPlayerOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AVPlaylistOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FileItemHandler.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FileOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\IClient.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ITransportLayer.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONRPC.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONUtils.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PicturePlayerOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PlayerOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PlaylistOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ServiceDescription.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\SystemOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\VideoLibrary.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\XBMCOperations.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\action.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\control.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\dialog.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindow.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowDialog.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowXML.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\GUIPythonWindowXMLDialog.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\infotagmusic.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\infotagvideo.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\keyboard.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\listitem.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\player.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pyjsonrpc.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pyplaylist.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\PythonAddon.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\PythonPlayer.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pyutil.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\window.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\winxml.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\XBPythonDll.h" />
+    <ClInclude Include="..\..\xbmc\interfaces\python\XBPyThread.h" />
+    <ClInclude Include="..\..\xbmc\IProgressCallback.h" />
+    <ClInclude Include="..\..\xbmc\LangInfo.h" />
+    <ClInclude Include="..\..\xbmc\MediaSource.h" />
+    <ClInclude Include="..\..\xbmc\music\Album.h" />
+    <ClInclude Include="..\..\xbmc\music\Artist.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h" />
+    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.h" />
+    <ClInclude Include="..\..\xbmc\music\GUIViewStateMusic.h" />
+    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicAlbumInfo.h" />
+    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicArtistInfo.h" />
+    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicInfoScanner.h" />
+    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicInfoScraper.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\cdgdata.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\GUIDialogKaraokeSongSelector.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\GUIWindowKaraokeLyrics.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyrics.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricscdg.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricsfactory.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricsmanager.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstext.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextkar.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextlrc.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextustar.h" />
+    <ClInclude Include="..\..\xbmc\music\karaoke\karaokewindowbackground.h" />
+    <ClInclude Include="..\..\xbmc\music\LastFmManager.h" />
+    <ClInclude Include="..\..\xbmc\music\MusicDatabase.h" />
+    <ClInclude Include="..\..\xbmc\music\MusicInfoLoader.h" />
+    <ClInclude Include="..\..\xbmc\music\Song.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\APEv2Tag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\DllLibapetag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\DllLibid3tag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\FlacTag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\Id3Tag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\id3v1genre.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\ImusicInfoTagLoader.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderAAC.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderApe.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderASAP.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderCDDA.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderDatabase.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFactory.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFlac.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMidi.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMod.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMP3.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMP4.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMPC.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderOgg.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWavPack.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWMA.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\OggTag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\Tag.h" />
+    <ClInclude Include="..\..\xbmc\music\tags\VorbisTag.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicBase.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicNav.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylist.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylistEditor.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicSongs.h" />
+    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowVisualisation.h" />
+    <ClInclude Include="..\..\xbmc\network\cddb.h" />
+    <ClInclude Include="..\..\xbmc\network\DNSNameCache.h" />
+    <ClInclude Include="..\..\xbmc\network\EventClient.h" />
+    <ClInclude Include="..\..\xbmc\network\EventPacket.h" />
+    <ClInclude Include="..\..\xbmc\network\EventServer.h" />
+    <ClInclude Include="..\..\xbmc\network\GUIDialogAccessPoints.h" />
+    <ClInclude Include="..\..\xbmc\network\GUIDialogNetworkSetup.h" />
+    <ClInclude Include="..\..\xbmc\network\libscrobbler\errors.h" />
+    <ClInclude Include="..\..\xbmc\network\libscrobbler\lastfmscrobbler.h" />
+    <ClInclude Include="..\..\xbmc\network\libscrobbler\librefmscrobbler.h" />
+    <ClInclude Include="..\..\xbmc\network\libscrobbler\scrobbler.h" />
+    <ClInclude Include="..\..\xbmc\network\Network.h" />
+    <ClInclude Include="..\..\xbmc\network\Socket.h" />
+    <ClInclude Include="..\..\xbmc\network\TCPServer.h" />
+    <ClInclude Include="..\..\xbmc\network\UdpClient.h" />
+    <ClInclude Include="..\..\xbmc\network\UPnP.h" />
+    <ClInclude Include="..\..\xbmc\network\WebServer.h" />
+    <ClInclude Include="..\..\xbmc\network\windows\NetworkWin32.h" />
+    <ClInclude Include="..\..\xbmc\network\Zeroconf.h" />
+    <ClInclude Include="..\..\xbmc\network\ZeroconfBrowser.h" />
+    <ClInclude Include="..\..\xbmc\NfoFile.h" />
+    <ClInclude Include="..\..\xbmc\PartyModeManager.h" />
+    <ClInclude Include="..\..\xbmc\PasswordManager.h" />
+    <ClInclude Include="..\..\xbmc\pictures\DllImageLib.h" />
+    <ClInclude Include="..\..\xbmc\pictures\DllLibExif.h" />
+    <ClInclude Include="..\..\xbmc\pictures\GUIDialogPictureInfo.h" />
+    <ClInclude Include="..\..\xbmc\pictures\GUIViewStatePictures.h" />
+    <ClInclude Include="..\..\xbmc\pictures\GUIWindowPictures.h" />
+    <ClInclude Include="..\..\xbmc\pictures\GUIWindowSlideShow.h" />
+    <ClInclude Include="..\..\xbmc\pictures\Picture.h" />
+    <ClInclude Include="..\..\xbmc\pictures\PictureInfoLoader.h" />
+    <ClInclude Include="..\..\xbmc\pictures\PictureInfoTag.h" />
+    <ClInclude Include="..\..\xbmc\pictures\PictureThumbLoader.h" />
+    <ClInclude Include="..\..\xbmc\pictures\SlideShowPicture.h" />
+    <ClInclude Include="..\..\xbmc\PlayListPlayer.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayList.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListB4S.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListFactory.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListM3U.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListPLS.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListURL.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListWPL.h" />
+    <ClInclude Include="..\..\xbmc\playlists\PlayListXML.h" />
+    <ClInclude Include="..\..\xbmc\playlists\SmartPlayList.h" />
+    <ClInclude Include="..\..\xbmc\powermanagement\DPMSSupport.h" />
+    <ClInclude Include="..\..\xbmc\powermanagement\IPowerSyscall.h" />
+    <ClInclude Include="..\..\xbmc\powermanagement\PowerManager.h" />
+    <ClInclude Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.h" />
+    <ClInclude Include="..\..\xbmc\programs\GUIViewStatePrograms.h" />
+    <ClInclude Include="..\..\xbmc\programs\GUIWindowPrograms.h" />
+    <ClInclude Include="..\..\xbmc\programs\ProgramDatabase.h" />
+    <ClInclude Include="..\..\xbmc\programs\Shortcut.h" />
+    <ClInclude Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.h" />
+    <ClInclude Include="..\..\xbmc\rendering\dx\RenderSystemDX.h" />
+    <ClInclude Include="..\..\xbmc\rendering\gl\GUIWindowTestPatternGL.h" />
+    <ClInclude Include="..\..\xbmc\rendering\gl\RenderSystemGL.h" />
+    <ClInclude Include="..\..\xbmc\rendering\RenderSystem.h" />
+    <ClInclude Include="..\..\xbmc\SectionLoader.h" />
+    <ClInclude Include="..\..\xbmc\settings\AdvancedSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIDialogContentSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIDialogLockSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIDialogProfileSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIDialogSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUISettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIWindowSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIWindowSettingsCategory.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIWindowSettingsProfile.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIWindowSettingsScreenCalibration.h" />
+    <ClInclude Include="..\..\xbmc\settings\GUIWindowTestPattern.h" />
+    <ClInclude Include="..\..\xbmc\settings\Profile.h" />
+    <ClInclude Include="..\..\xbmc\settings\Settings.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingsControls.h" />
+    <ClInclude Include="..\..\xbmc\settings\VideoSettings.h" />
+    <ClInclude Include="..\..\xbmc\SortFileItem.h" />
+    <ClInclude Include="..\..\xbmc\storage\AutorunMediaJob.h" />
+    <ClInclude Include="..\..\xbmc\storage\cdioSupport.h" />
+    <ClInclude Include="..\..\xbmc\storage\IoSupport.h" />
+    <ClInclude Include="..\..\xbmc\storage\IStorageProvider.h" />
+    <ClInclude Include="..\..\xbmc\storage\MediaManager.h" />
+    <ClInclude Include="..\..\xbmc\storage\windows\Win32StorageProvider.h" />
+    <ClInclude Include="..\..\xbmc\system.h" />
+    <ClInclude Include="..\..\xbmc\Temperature.h" />
+    <ClInclude Include="..\..\xbmc\TextureCache.h" />
+    <ClInclude Include="..\..\xbmc\TextureDatabase.h" />
+    <ClInclude Include="..\..\xbmc\threads\Atomics.h" />
+    <ClInclude Include="..\..\xbmc\threads\CriticalSection.h" />
+    <ClInclude Include="..\..\xbmc\threads\Event.h" />
+    <ClInclude Include="..\..\xbmc\threads\LockFree.h" />
+    <ClInclude Include="..\..\xbmc\threads\Mutex.h" />
+    <ClInclude Include="..\..\xbmc\threads\SharedSection.h" />
+    <ClInclude Include="..\..\xbmc\threads\SingleLock.h" />
+    <ClInclude Include="..\..\xbmc\threads\Thread.h" />
+    <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
+    <ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
+    <ClInclude Include="..\..\xbmc\URL.h" />
+    <ClInclude Include="..\..\xbmc\Util.h" />
+    <ClInclude Include="..\..\xbmc\utils\AlarmClock.h" />
+    <ClInclude Include="..\..\xbmc\utils\AliasShortcutUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\Archive.h" />
+    <ClInclude Include="..\..\xbmc\utils\AsyncFileCopy.h" />
+    <ClInclude Include="..\..\xbmc\utils\AutoPtrHandle.h" />
+    <ClInclude Include="..\..\xbmc\utils\BitstreamStats.h" />
+    <ClInclude Include="..\..\xbmc\utils\CharsetConverter.h" />
+    <ClInclude Include="..\..\xbmc\utils\CPUInfo.h" />
+    <ClInclude Include="..\..\xbmc\utils\Crc32.h" />
+    <ClInclude Include="..\..\xbmc\utils\DownloadQueue.h" />
+    <ClInclude Include="..\..\xbmc\utils\DownloadQueueManager.h" />
+    <ClInclude Include="..\..\xbmc\utils\EndianSwap.h" />
+    <ClInclude Include="..\..\xbmc\utils\Fanart.h" />
+    <ClInclude Include="..\..\xbmc\utils\fft.h" />
+    <ClInclude Include="..\..\xbmc\utils\FileOperationJob.h" />
+    <ClInclude Include="..\..\xbmc\utils\FileUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\fstrcmp.h" />
+    <ClInclude Include="..\..\xbmc\utils\GlobalsHandling.h" />
+    <ClInclude Include="..\..\xbmc\utils\GLUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\HTMLTable.h" />
+    <ClInclude Include="..\..\xbmc\utils\HTMLUtil.h" />
+    <ClInclude Include="..\..\xbmc\utils\HttpHeader.h" />
+    <ClInclude Include="..\..\xbmc\utils\InfoLoader.h" />
     <ClInclude Include="..\..\xbmc\utils\ISerializable.h" />
-    <ClInclude Include="..\..\xbmc\utils\Observer.h" />
-    <ClInclude Include="..\..\xbmc\utils\TextSearch.h" />
+    <ClInclude Include="..\..\xbmc\utils\Job.h" />
+    <ClInclude Include="..\..\xbmc\utils\JobManager.h" />
+    <ClInclude Include="..\..\xbmc\utils\LabelFormatter.h" />
+    <ClInclude Include="..\..\xbmc\utils\LangCodeExpander.h" />
+    <ClInclude Include="..\..\xbmc\utils\LCD.h" />
+    <ClInclude Include="..\..\xbmc\utils\log.h" />
+    <ClInclude Include="..\..\xbmc\utils\MathUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\md5.h" />
+    <ClInclude Include="..\..\xbmc\utils\PCMAmplifier.h" />
+    <ClInclude Include="..\..\xbmc\utils\PerformanceSample.h" />
+    <ClInclude Include="..\..\xbmc\utils\PerformanceStats.h" />
+    <ClInclude Include="..\..\xbmc\utils\RegExp.h" />
+    <ClInclude Include="..\..\xbmc\utils\RingBuffer.h" />
+    <ClInclude Include="..\..\xbmc\utils\RssReader.h" />
+    <ClInclude Include="..\..\xbmc\utils\SaveFileStateJob.h" />
+    <ClInclude Include="..\..\xbmc\utils\ScraperParser.h" />
+    <ClInclude Include="..\..\xbmc\utils\ScraperUrl.h" />
+    <ClInclude Include="..\..\xbmc\utils\Splash.h" />
+    <ClInclude Include="..\..\xbmc\utils\ssrc.h" />
+    <ClInclude Include="..\..\xbmc\utils\StdString.h" />
+    <ClInclude Include="..\..\xbmc\utils\Stopwatch.h" />
+    <ClInclude Include="..\..\xbmc\utils\StreamDetails.h" />
+    <ClInclude Include="..\..\xbmc\utils\StringUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\SystemInfo.h" />
+    <ClInclude Include="..\..\xbmc\utils\TimeUtils.h" />
+    <ClInclude Include="..\..\xbmc\utils\TuxBoxUtil.h" />
+    <ClInclude Include="..\..\xbmc\utils\URIUtils.h" />
     <ClInclude Include="..\..\xbmc\utils\Variant.h" />
-    <ClInclude Include="..\..\xbmc\win32\NetworkWin32.h" />
+    <ClInclude Include="..\..\xbmc\utils\Weather.h" />
+    <ClInclude Include="..\..\xbmc\utils\Win32Exception.h" />
+    <ClInclude Include="..\..\xbmc\utils\XMLUtils.h" />
+    <ClInclude Include="..\..\xbmc\video\Bookmark.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.h" />
+    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h" />
+    <ClInclude Include="..\..\xbmc\video\GUIViewStateVideo.h" />
+    <ClInclude Include="..\..\xbmc\video\Teletext.h" />
+    <ClInclude Include="..\..\xbmc\video\TeletextDefines.h" />
+    <ClInclude Include="..\..\xbmc\video\VideoDatabase.h" />
+    <ClInclude Include="..\..\xbmc\video\VideoInfoDownloader.h" />
+    <ClInclude Include="..\..\xbmc\video\VideoInfoScanner.h" />
+    <ClInclude Include="..\..\xbmc\video\VideoInfoTag.h" />
+    <ClInclude Include="..\..\xbmc\video\VideoReferenceClock.h" />
+    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowFullScreen.h" />
+    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoBase.h" />
+    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoNav.h" />
+    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.h" />
+    <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
+    <ClInclude Include="..\..\xbmc\ViewState.h" />
     <ClInclude Include="..\..\xbmc\win32\pch.h" />
     <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
-    <ClInclude Include="..\..\xbmc\win32\PlatformInclude.h" />
-    <ClInclude Include="..\..\xbmc\win32\Win32PowerSyscall.h" />
-    <ClInclude Include="..\..\xbmc\win32\Win32StorageProvider.h" />
+    <ClInclude Include="..\..\xbmc\XBDateTime.h" />
+    <CustomBuild Include="..\..\xbmc\win32\PlatformInclude.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">update_git_rev.bat</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">..\..\xbmc\win32\git_rev.h;%(Outputs)</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">..\..\git\HEAD;..\..\xbmc\win32\git_rev.tmpl</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">update_git_rev.bat</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">..\..\xbmc\win32\git_rev.h;%(Outputs)</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">..\..\git\HEAD;..\..\xbmc\win32\git_rev.tmpl</AdditionalInputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\xbmc\win32\stat_utf8.h" />
+    <ClInclude Include="..\..\xbmc\win32\stdio_utf8.h" />
     <ClInclude Include="..\..\xbmc\win32\WIN32Util.h" />
     <ClInclude Include="..\..\xbmc\win32\WINDirectSound.h" />
     <ClInclude Include="..\..\xbmc\win32\WindowHelper.h" />
     <ClInclude Include="..\..\xbmc\win32\WINFileSMB.h" />
     <ClInclude Include="..\..\xbmc\win32\WINSMBDirectory.h" />
     <ClInclude Include="..\..\xbmc\win32\XCriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\cores\dlgcache.h" />
     <ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h" />
     <ClInclude Include="..\..\xbmc\cores\IPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\ssrc.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\dvd_config.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h" />
@@ -1132,13 +1683,9 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecs.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLiba52.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibDts.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibFaad.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DllLibMad.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibFaad.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibMad.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.h" />
@@ -1177,18 +1724,16 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMMS.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllAvFormat.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllPostProc.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\DllSwScale.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include\libavutil\avconfig.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avformat.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavformat\avio.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\libavutil\common.h" />
+    <ClInclude Include="..\..\lib\DllAvCodec.h" />
+    <ClInclude Include="..\..\lib\DllAvFormat.h" />
+    <ClInclude Include="..\..\lib\DllPostProc.h" />
+    <ClInclude Include="..\..\lib\DllSwScale.h" />
+    <ClInclude Include="..\..\lib\ffmpeg\libavformat\avformat.h" />
+    <ClInclude Include="..\..\lib\ffmpeg\libavformat\avio.h" />
+    <ClInclude Include="..\..\lib\ffmpeg\libavutil\common.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h" />
@@ -1212,28 +1757,21 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\AC3CDDACodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\AC3Codec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\ADPCMCodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\AIFFcodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\ASAPCodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\AudioDecoder.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\CDDAcodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllAc3codec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllAdpcm.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllASAP.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllDCACodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllLibFlac.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllNosefart.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllSidplay2.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllStSound.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllTimidity.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllVorbisfile.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllWAVPack.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DllWMA.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCDDACodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DTSCodec.h" />
+    <ClInclude Include="..\..\lib\DllAdpcm.h" />
+    <ClInclude Include="..\..\lib\DllASAP.h" />
+    <ClInclude Include="..\..\lib\DllLibFlac.h" />
+    <ClInclude Include="..\..\lib\DllNosefart.h" />
+    <ClInclude Include="..\..\lib\DllSidplay2.h" />
+    <ClInclude Include="..\..\lib\DllStSound.h" />
+    <ClInclude Include="..\..\lib\DllTimidity.h" />
+    <ClInclude Include="..\..\lib\DllVorbisfile.h" />
+    <ClInclude Include="..\..\lib\DllWAVPack.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\FLACcodec.h" />
     <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h" />
@@ -1292,136 +1830,6 @@
     <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreConfig.h" />
     <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.h" />
     <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.h" />
-    <ClInclude Include="..\..\xbmc\Application.h" />
-    <ClInclude Include="..\..\xbmc\AdvancedSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowTestPattern.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowTestPatternDX.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowTestPatternGL.h" />
-    <ClInclude Include="..\..\xbmc\settings\VideoSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSmartPlaylistEditor.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSmartPlaylistRule.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSongInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewState.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStateMusic.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowMusicNav.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowMusicPlaylistEditor.h" />
-    <ClInclude Include="..\..\xbmc\SmartPlaylist.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogVideoScan.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStateVideo.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowVideoNav.h" />
-    <ClInclude Include="..\..\xbmc\VideoInfoScanner.h" />
-    <ClInclude Include="..\..\xbmc\APEv2Tag.h" />
-    <ClInclude Include="..\..\xbmc\FlacTag.h" />
-    <ClInclude Include="..\..\xbmc\Id3Tag.h" />
-    <ClInclude Include="..\..\xbmc\musicInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderAAC.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderApe.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderASAP.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderDatabase.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderMidi.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderMod.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderMPC.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderNSF.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderShn.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderSPC.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderWav.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderWavPack.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderYM.h" />
-    <ClInclude Include="..\..\xbmc\OggTag.h" />
-    <ClInclude Include="..\..\xbmc\Tag.h" />
-    <ClInclude Include="..\..\xbmc\VorbisTag.h" />
-    <ClInclude Include="..\..\xbmc\PictureInfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\PictureInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\utils\AliasShortcutUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\AnnouncementManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\ArabicShaping.h" />
-    <ClInclude Include="..\..\xbmc\utils\AsyncFileCopy.h" />
-    <ClInclude Include="..\..\xbmc\utils\Atomics.h" />
-    <ClInclude Include="..\..\xbmc\utils\BitstreamStats.h" />
-    <ClInclude Include="..\..\xbmc\utils\Builtins.h" />
-    <ClInclude Include="..\..\xbmc\utils\CPUInfo.h" />
-    <ClInclude Include="..\..\xbmc\DPMSSupport.h" />
-    <ClInclude Include="..\..\xbmc\utils\EventClient.h" />
-    <ClInclude Include="..\..\xbmc\utils\EventPacket.h" />
-    <ClInclude Include="..\..\xbmc\utils\EventServer.h" />
-    <ClInclude Include="..\..\xbmc\utils\Fanart.h" />
-    <ClInclude Include="..\..\xbmc\utils\fastmemcpy.h" />
-    <ClInclude Include="..\..\xbmc\Favourites.h" />
-    <ClInclude Include="..\..\xbmc\utils\FileOperationJob.h" />
-    <ClInclude Include="..\..\xbmc\utils\FileUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\Job.h" />
-    <ClInclude Include="..\..\xbmc\utils\JobManager.h" />
-    <ClInclude Include="..\..\xbmc\KeyboardLayoutConfiguration.h" />
-    <ClInclude Include="..\..\xbmc\utils\LabelFormatter.h" />
-    <ClInclude Include="..\..\xbmc\LastFmManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\md5.h" />
-    <ClInclude Include="..\..\xbmc\MediaSource.h" />
-    <ClInclude Include="..\..\xbmc\utils\MusicArtistInfo.h" />
-    <ClInclude Include="..\..\xbmc\utils\Mutex.h" />
-    <ClInclude Include="..\..\xbmc\utils\PasswordManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\PCMAmplifier.h" />
-    <ClInclude Include="..\..\xbmc\PowerManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\RingBuffer.h" />
-    <ClInclude Include="..\..\xbmc\utils\ScraperParser.h" />
-    <ClInclude Include="..\..\xbmc\utils\ScraperUrl.h" />
-    <ClInclude Include="..\..\xbmc\utils\Socket.h" />
-    <ClInclude Include="..\..\xbmc\utils\Stopwatch.h" />
-    <ClInclude Include="..\..\xbmc\utils\StreamDetails.h" />
-    <ClInclude Include="..\..\xbmc\utils\SystemInfo.h" />
-    <ClInclude Include="..\..\xbmc\utils\Teletext.h" />
-    <ClInclude Include="..\..\xbmc\TextureCache.h" />
-    <ClInclude Include="..\..\xbmc\TextureDatabase.h" />
-    <ClInclude Include="..\..\xbmc\utils\TimeUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\TuxBoxUtil.h" />
-    <ClInclude Include="..\..\xbmc\VideoInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\VideoReferenceClock.h" />
-    <ClInclude Include="..\..\xbmc\utils\WebServer.h" />
-    <ClInclude Include="..\..\xbmc\Zeroconf.h" />
-    <ClInclude Include="..\..\xbmc\Album.h" />
-    <ClInclude Include="..\..\xbmc\Artist.h" />
-    <ClInclude Include="..\..\xbmc\Bookmark.h" />
-    <ClInclude Include="..\..\xbmc\Database.h" />
-    <ClInclude Include="..\..\xbmc\MusicDatabase.h" />
-    <ClInclude Include="..\..\xbmc\ProgramDatabase.h" />
-    <ClInclude Include="..\..\xbmc\VideoDatabase.h" />
-    <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogAccessPoints.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogAddonSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogAudioSubtitleSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogBoxBase.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogBusy.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogContentSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogFavourites.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogFileBrowser.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogFullScreenInfo.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\GUIDialogKaraokeSongSelector.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogLockSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogMediaSource.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogMusicOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogNetworkSetup.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPictureInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogPlayerControls.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogProfileSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSeekBar.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSlider.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogTeletext.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogVideoBookmarks.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogVideoSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogVisualisationPresetList.h" />
-    <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIMediaWindow.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStatePictures.h" />
-    <ClInclude Include="..\..\xbmc\GUIViewStatePrograms.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowAddonBrowser.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\GUIWindowKaraokeLyrics.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowLoginScreen.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowStartup.h" />
-    <ClInclude Include="..\..\xbmc\SlideShowPicture.h" />
-    <ClInclude Include="..\..\xbmc\BackgroundInfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\PictureThumbLoader.h" />
-    <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\AddonsDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\ASAPFileDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\CacheMemBuffer.h" />
@@ -1448,7 +1856,6 @@
     <ClInclude Include="..\..\xbmc\FileSystem\FileShoutcast.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FileSpecialProtocol.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FileTuxBox.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\FileXBMSP.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FileZip.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FTPDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\FTPParse.h" />
@@ -1456,7 +1863,6 @@
     <ClInclude Include="..\..\xbmc\FileSystem\HTSPDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\HTSPSession.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\HTTPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\ISO9660Directory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\LastFMDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\MultiPathDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\MultiPathFile.h" />
@@ -1483,13 +1889,13 @@
     <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocol.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\StackDirectory.h" />
+    <ClInclude Include="..\..\xbmc\FileSystem\SourcesDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\UPnPDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VirtualPathDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VTPDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VTPFile.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VTPSession.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\XBMSDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\ZipDirectory.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\ZipManager.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.h" />
@@ -1536,289 +1942,15 @@
     <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeYear.h" />
     <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\QueryParams.h" />
-    <ClInclude Include="..\..\xbmc\utils\Network.h" />
-    <ClInclude Include="..\..\xbmc\UPnP.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyrics.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricscdg.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricsfactory.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricsmanager.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricstext.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricstextkar.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricstextlrc.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokelyricstextustar.h" />
-    <ClInclude Include="..\..\xbmc\karaoke\karaokewindowbackground.h" />
-    <ClInclude Include="..\..\xbmc\KeyboardStat.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_keyboard.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_keysym.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_vkeys.h" />
-    <ClInclude Include="..\..\xbmc\WindowingFactory.h" />
-    <ClInclude Include="..\..\xbmc\WinSystem.h" />
-    <ClInclude Include="..\..\xbmc\WinSystemWin32.h" />
-    <ClInclude Include="..\..\xbmc\WinSystemWin32DX.h" />
-    <ClInclude Include="..\..\xbmc\WinSystemWin32GL.h" />
-    <ClInclude Include="..\..\xbmc\MouseStat.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_mouse.h" />
-    <ClInclude Include="..\..\xbmc\WinEvents.h" />
-    <ClInclude Include="..\..\xbmc\WinEventsSDL.h" />
-    <ClInclude Include="..\..\xbmc\WinEventsWin32.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_events.h" />
-    <ClInclude Include="..\..\xbmc\XBMC_stdinc.h" />
-    <ClInclude Include="..\..\xbmc\RenderSystem.h" />
-    <ClInclude Include="..\..\xbmc\RenderSystemDX.h" />
-    <ClInclude Include="..\..\xbmc\RenderSystemGL.h" />
-    <ClInclude Include="..\..\xbmc\Picture.h" />
     <ClInclude Include="..\..\xbmc\addons\Addon.h" />
     <ClInclude Include="..\..\xbmc\addons\AddonDll.h" />
     <ClInclude Include="..\..\xbmc\addons\AddonManager.h" />
     <ClInclude Include="..\..\xbmc\addons\AddonStatusHandler.h" />
     <ClInclude Include="..\..\xbmc\addons\DllAddon.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllScreenSaver.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllVisualisation.h" />
-    <ClInclude Include="..\..\xbmc\addons\fft.h" />
     <ClInclude Include="..\..\xbmc\addons\IAddon.h" />
     <ClInclude Include="..\..\xbmc\addons\Scraper.h" />
     <ClInclude Include="..\..\xbmc\addons\ScreenSaver.h" />
     <ClInclude Include="..\..\xbmc\addons\Visualisation.h" />
-    <ClInclude Include="..\..\xbmc\utils\AlarmClock.h" />
-    <ClInclude Include="..\..\xbmc\ApplicationMessenger.h" />
-    <ClInclude Include="..\..\xbmc\utils\Archive.h" />
-    <ClInclude Include="..\..\xbmc\utils\AutoPtrHandle.h" />
-    <ClInclude Include="..\..\xbmc\Autorun.h" />
-    <ClInclude Include="..\..\xbmc\AutorunMediaJob.h" />
-    <ClInclude Include="..\..\xbmc\AutoSwitch.h" />
-    <ClInclude Include="..\..\xbmc\ButtonTranslator.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\cddb.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\cdioSupport.h" />
-    <ClInclude Include="..\..\xbmc\utils\CharsetConverter.h" />
-    <ClInclude Include="..\..\xbmc\Crc32.h" />
-    <ClInclude Include="..\..\xbmc\utils\CriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\CueDocument.h" />
-    <ClInclude Include="..\..\xbmc\DateTime.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\Directory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\DirectoryHistory.h" />
-    <ClInclude Include="..\..\xbmc\DllImageLib.h" />
-    <ClInclude Include="..\..\xbmc\DNSNameCache.h" />
-    <ClInclude Include="..\..\xbmc\utils\DownloadQueue.h" />
-    <ClInclude Include="..\..\xbmc\utils\DownloadQueueManager.h" />
-    <ClInclude Include="..\..\xbmc\DynamicDll.h" />
-    <ClInclude Include="..\..\xbmc\utils\Event.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\FactoryDirectory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\File.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\FileFactory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\FileHD.h" />
-    <ClInclude Include="..\..\xbmc\FileItem.h" />
-    <ClInclude Include="..\..\xbmc\utils\fstrcmp.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogButtonMenu.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogContextMenu.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogFileStacking.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogGamepad.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogKaiToast.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogKeyboard.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogMusicScan.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogMuteBug.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogNumeric.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogOK.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogProgress.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSelect.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogSubMenu.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogVolumeBar.h" />
-    <ClInclude Include="..\..\xbmc\GUIDialogYesNo.h" />
-    <ClInclude Include="..\..\xbmc\utils\GUIInfoManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIPassword.h" />
-    <ClInclude Include="..\..\xbmc\GUISettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowFileManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowFullScreen.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowHome.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowMusicBase.h" />
-    <ClInclude Include="..\..\xbmc\GuiWindowMusicInfo.h" />
-    <ClInclude Include="..\..\xbmc\GuiWindowMusicOverlay.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowMusicPlaylist.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowMusicSongs.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowOSD.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowPictures.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowPointer.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowPrograms.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowScreensaver.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSettings.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSettingsCategory.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSettingsProfile.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSettingsScreenCalibration.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSlideShow.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowSystemInfo.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowVideoBase.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowVideoFiles.h" />
-    <ClInclude Include="..\..\xbmc\GuiWindowVideoInfo.h" />
-    <ClInclude Include="..\..\xbmc\GuiWindowVideoOverlay.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowVideoPlaylist.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowVisualisation.h" />
-    <ClInclude Include="..\..\xbmc\GUIWindowWeather.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\HDDirectory.h" />
-    <ClInclude Include="..\..\xbmc\utils\HTMLTable.h" />
-    <ClInclude Include="..\..\xbmc\utils\HTMLUtil.h" />
-    <ClInclude Include="..\..\xbmc\utils\HttpHeader.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\IDirectory.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\IFile.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\IFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\utils\IMDB.h" />
-    <ClInclude Include="..\..\xbmc\ImusicInfoTagLoader.h" />
-    <ClInclude Include="..\..\xbmc\utils\InfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\utils\IoSupport.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\iso9660.h" />
-    <ClInclude Include="..\..\xbmc\LangCodeExpander.h" />
-    <ClInclude Include="..\..\xbmc\LangInfo.h" />
-    <ClInclude Include="..\..\xbmc\utils\log.h" />
-    <ClInclude Include="..\..\xbmc\MediaManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\MusicAlbumInfo.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoScanner.h" />
-    <ClInclude Include="..\..\xbmc\utils\MusicInfoScraper.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderCDDA.h" />
-    <ClInclude Include="..\..\xbmc\musicInfoTagLoaderFactory.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderFlac.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderMP3.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderMP4.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderOgg.h" />
-    <ClInclude Include="..\..\xbmc\MusicInfoTagLoaderWMA.h" />
-    <ClInclude Include="..\..\xbmc\NfoFile.h" />
-    <ClInclude Include="..\..\xbmc\PartyModeManager.h" />
-    <ClInclude Include="..\..\xbmc\PlayList.h" />
-    <ClInclude Include="..\..\xbmc\PlayListB4S.h" />
-    <ClInclude Include="..\..\xbmc\PlayListFactory.h" />
-    <ClInclude Include="..\..\xbmc\PlayListM3U.h" />
-    <ClInclude Include="..\..\xbmc\PlayListPlayer.h" />
-    <ClInclude Include="..\..\xbmc\PlayListPLS.h" />
-    <ClInclude Include="..\..\xbmc\PlayListURL.h" />
-    <ClInclude Include="..\..\xbmc\PlayListWPL.h" />
-    <ClInclude Include="..\..\xbmc\PlayListXML.h" />
-    <ClInclude Include="..\..\xbmc\Profile.h" />
-    <ClInclude Include="..\..\xbmc\utils\RegExp.h" />
-    <ClInclude Include="..\..\xbmc\utils\RssReader.h" />
-    <ClInclude Include="..\..\xbmc\SectionLoader.h" />
-    <ClInclude Include="..\..\xbmc\Settings.h" />
-    <ClInclude Include="..\..\xbmc\SettingsControls.h" />
-    <ClInclude Include="..\..\xbmc\utils\SharedSection.h" />
-    <ClInclude Include="..\..\xbmc\Shortcut.h" />
-    <ClInclude Include="..\..\xbmc\utils\SingleLock.h" />
-    <ClInclude Include="..\..\xbmc\Song.h" />
-    <ClInclude Include="..\..\xbmc\SortFileItem.h" />
-    <ClInclude Include="..\..\xbmc\utils\Splash.h" />
-    <ClInclude Include="..\..\xbmc\StringUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\TeletextDefines.h" />
-    <ClInclude Include="..\..\xbmc\Temperature.h" />
-    <ClInclude Include="..\..\xbmc\utils\Thread.h" />
-    <ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
-    <ClInclude Include="..\..\xbmc\utils\UdpClient.h" />
-    <ClInclude Include="..\..\xbmc\URL.h" />
-    <ClInclude Include="..\..\xbmc\Util.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VirtualDirectory.h" />
-    <ClInclude Include="..\..\xbmc\utils\Weather.h" />
-    <ClInclude Include="..\..\xbmc\utils\Win32Exception.h" />
-    <ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\XBPython.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\XBPythonDll.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\XBPyThread.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\action.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\control.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\dialog.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindow.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowDialog.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowXML.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\GUIPythonWindowXMLDialog.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\infotagmusic.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\infotagvideo.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\keyboard.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\listitem.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\player.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\pyplaylist.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonPlayer.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\pyutil.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\window.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\winxml.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\abstract.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\bitset.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\boolobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\bufferobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\cellobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\ceval.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\classobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\cobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\codecs.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\compile.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\complexobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\cStringIO.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\datetime.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\descrobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\dictobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\enumobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\errcode.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\eval.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\fileobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\floatobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\frameobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\funcobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\genobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\graminit.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\grammar.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\import.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\intobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\intrcheck.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\iterobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\listobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\longintrepr.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\longobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\marshal.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\metagrammar.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\methodobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\modsupport.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\moduleobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\node.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\object.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\objimpl.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\opcode.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\osdefs.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\parsetok.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\patchlevel.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pgen.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pgenheaders.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\py_curses.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pydebug.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pyerrors.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pyfpe.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pygetopt.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pymactoolbox.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pymem.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pyport.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pystate.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pystrtod.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\Python.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pythonrun.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\pythread.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\rangeobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\setobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\sliceobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\stringobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\structmember.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\structseq.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\symtable.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\sysmodule.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\timefuncs.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\token.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\traceback.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\tupleobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\ucnhash.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\unicodeobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libPython\Python\Include\weakrefobject.h" />
-    <ClInclude Include="..\..\xbmc\lib\libhttpapi\HttpApi.h" />
-    <ClInclude Include="..\..\xbmc\lib\libhttpapi\XBMChttp.h" />
-    <ClInclude Include="..\..\xbmc\lib\sqLite\dataset.h" />
-    <ClInclude Include="..\..\xbmc\lib\sqLite\mysqldataset.h" />
-    <ClInclude Include="..\..\xbmc\lib\sqLite\qry_dat.h" />
-    <ClInclude Include="..\..\xbmc\lib\sqLite\sqlite3.h" />
-    <ClInclude Include="..\..\xbmc\lib\sqLite\sqlitedataset.h" />
-    <ClInclude Include="..\..\xbmc\lib\libscrobbler\lastfmscrobbler.h" />
-    <ClInclude Include="..\..\xbmc\lib\libscrobbler\librefmscrobbler.h" />
-    <ClInclude Include="..\..\xbmc\lib\libscrobbler\scrobbler.h" />
     <ClInclude Include="..\..\xbmc\cdrip\CDDAReader.h" />
     <ClInclude Include="..\..\xbmc\cdrip\CDDARipper.h" />
     <ClInclude Include="..\..\xbmc\cdrip\DllLameenc.h" />
@@ -1831,21 +1963,25 @@
     <ClInclude Include="..\..\xbmc\cdrip\EncoderLame.h" />
     <ClInclude Include="..\..\xbmc\cdrip\EncoderVorbis.h" />
     <ClInclude Include="..\..\xbmc\cdrip\EncoderWav.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AVPlaylistOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\FileItemHandler.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\FileOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\IClient.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\ITransportLayer.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\JSONRPC.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\PicturePlayerOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\PlayerOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\PlaylistOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\SystemOperations.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\TCPServer.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\VideoLibrary.h" />
-    <ClInclude Include="..\..\xbmc\lib\libjsonrpc\XBMCOperations.h" />
-    <ClInclude Include="..\..\xbmc\URIUtils.h" />
+    <ClInclude Include="..\..\xbmc\windowing\WindowingFactory.h" />
+    <ClInclude Include="..\..\xbmc\windowing\windows\WinEventsWin32.h" />
+    <ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32.h" />
+    <ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32DX.h" />
+    <ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32GL.h" />
+    <ClInclude Include="..\..\xbmc\windowing\WinEvents.h" />
+    <ClInclude Include="..\..\xbmc\windowing\WinEventsSDL.h" />
+    <ClInclude Include="..\..\xbmc\windowing\WinSystem.h" />
+    <ClInclude Include="..\..\xbmc\windowing\XBMC_events.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIMediaWindow.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowFileManager.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowHome.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowLoginScreen.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowPointer.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowScreensaver.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowStartup.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowSystemInfo.h" />
+    <ClInclude Include="..\..\xbmc\windows\GUIWindowWeather.h" />
+    <ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\xbmc\win32\XBMC.ico" />
@@ -1862,11 +1998,7 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\fribidi\libfridibidi\libfridibidi.vcxproj">
-      <Project>{f7c8ae15-b8c1-4f93-a414-ec908f0592b4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\libcdio\libcdio.vcxproj">
+    <ProjectReference Include="..\..\lib\win32\libcdio\libcdio.vcxproj">
       <Project>{e465056a-c6f3-45ee-b791-caf8e0ce629d}</Project>
       <Private>true</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1874,27 +2006,23 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\libiconv\libiconv_win32\libiconv_win32.vcxproj">
+    <ProjectReference Include="..\..\lib\win32\libiconv\libiconv_win32\libiconv_win32.vcxproj">
       <Project>{7a74ed4b-2bf5-47d7-b43e-c80f714417fb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\pcre\libpcre\libpcre.vcxproj">
+    <ProjectReference Include="..\..\lib\win32\pcre\libpcre\libpcre.vcxproj">
       <Project>{d8097c41-605d-4917-8957-9df7f44a18cd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libapetag\libapetag.vcxproj">
+    <ProjectReference Include="..\..\lib\libapetag\libapetag.vcxproj">
       <Project>{bdd2cb99-93c5-4a70-acbf-396ffb961ad3}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libhts\Win32\libhts_2010.vcxproj">
+    <ProjectReference Include="..\..\lib\libhts\Win32\libhts_2010.vcxproj">
       <Project>{00700e12-a63b-4e54-b962-4011a90584bd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libmms\libmms_win32\msvc++\libmms.vcxproj">
-      <Project>{3a575cf0-45b3-41cc-85e2-9f9ce8c56b38}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libRTV\libRTV.vcxproj">
+    <ProjectReference Include="..\..\lib\libRTV\libRTV.vcxproj">
       <Project>{dd4818ae-7e35-40b7-a6a0-0ff83aa1c916}</Project>
       <Private>true</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1902,11 +2030,7 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libsamplerate\libsamplerate_win32\libsamplerate_win32.vcxproj">
-      <Project>{5013769a-0784-4ce8-9d9d-09ac7f731b4f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libsquish\vs7\squish\squish_2010.vcxproj">
+    <ProjectReference Include="..\..\lib\libsquish\vs7\squish\squish_2010.vcxproj">
       <Project>{6a8518c3-d81a-4428-bd7f-c37933088ac1}</Project>
       <Private>true</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1914,22 +2038,14 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libXBMS\libXBMS\libXBMS.vcxproj">
+    <ProjectReference Include="..\..\lib\libXBMS\libXBMS\libXBMS.vcxproj">
       <Project>{706163e2-5422-4a94-8464-082ada8c2769}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\libXDAAP\libXDAAP_win32\libXDAAP_win32.vcxproj">
+    <ProjectReference Include="..\..\lib\libXDAAP\libXDAAP_win32\libXDAAP_win32.vcxproj">
       <Project>{19b16cd0-3b47-47b7-ab0e-81ef2bf1b187}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\xbmc\lib\sqLite\sqlite\libsqlite_win32\libsqlite_win32.vcxproj">
-      <Project>{9e74df3b-9343-4689-b0ec-4451617f9489}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="guilib.vcxproj">
-      <Project>{510441ac-b9e1-4b31-9c0c-eb3ad39d90c4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="libPlatinum.vcxproj">
       <Project>{b2975495-fbe4-4f94-aac5-b21a9842bf50}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>