change xbmc/ path to src/ in all files
authorFneufneu <fneufneu@xbmc.org>
Fri, 10 Oct 2014 14:02:41 +0000 (16:02 +0200)
committerFneufneu <fneufneu@xbmc.org>
Mon, 15 Dec 2014 20:38:21 +0000 (21:38 +0100)
95 files changed:
.gitignore
Kodi.xcodeproj/project.pbxproj
Makefile.in
Makefile.include.in
bootstrap.mk
codegenerator.mk
configure.in
language/English/strings.po
lib/addons/library.xbmc.addon/Makefile.in
lib/addons/library.xbmc.addon/libXBMC_addon.cpp
lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
lib/addons/library.xbmc.codec/Makefile.in
lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
lib/addons/library.xbmc.gui/Makefile.in
lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
lib/addons/library.xbmc.pvr/Makefile.in
lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
lib/asap/Makefile.in
lib/cmyth/Win32/libcmyth.vcxproj
lib/libdvd/Makefile.in
lib/libexif/Makefile.in
lib/libhdhomerun/Makefile.in
lib/libsidplay2/Makefile.in
lib/nosefart/Makefile.in
lib/snesapu/SNES/SNESAPU/Makefile.in
lib/stsound/StSoundLibrary/Makefile.in
lib/timidity/Makefile.in
lib/vgmstream/Makefile.in
project/VS2010Express/UnrarXLib.vcxproj
project/VS2010Express/XBMC for Windows.sln
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
project/VS2010Express/XbmcCommons.vcxproj
project/VS2010Express/XbmcCommons.vcxproj.filters
project/VS2010Express/XbmcThreads.vcxproj
project/VS2010Express/XbmcThreads.vcxproj.filters
project/VS2010Express/test-XbmcThreads.vcxproj
project/VS2010Express/test-XbmcThreads.vcxproj.filters
project/cmake/scripts/common/prepare-env.cmake
src/ApplicationMessenger.cpp
src/addons/addon-bindings.mk
src/cores/AudioEngine/Makefile.in
src/cores/VideoRenderers/LinuxRendererGLES.cpp
src/cores/VideoRenderers/LinuxRendererGLES.h
src/cores/VideoRenderers/MMALRenderer.cpp
src/cores/VideoRenderers/RenderCapture.h
src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
src/cores/dvdplayer/DVDCodecs/Makefile.in
src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in
src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h
src/cores/dvdplayer/DVDCodecs/Video/Makefile.in
src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp
src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
src/cores/dvdplayer/DVDDemuxers/Makefile.in
src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
src/cores/dvdplayer/DVDPlayer.cpp
src/cores/dvdplayer/DVDSubtitles/Makefile.in
src/cores/omxplayer/OMXPlayerAudio.h
src/cores/omxplayer/OMXVideo.cpp
src/cores/omxplayer/OMXVideo.h
src/filesystem/AndroidAppDirectory.cpp
src/guilib/GUIStaticItem.h
src/interfaces/python/Makefile.in
src/linux/OMXCore.cpp
src/network/upnp/UPnPServer.cpp
src/osx/IOSEAGLView.mm
src/osx/IOSScreenManager.mm
src/osx/Makefile.in
src/pvr/channels/PVRChannel.h
src/rendering/gles/RenderSystemGLES.h
src/utils/Screenshot.cpp
src/visualizations/Goom/Makefile.in
src/visualizations/OpenGLSpectrum/Makefile.in
src/visualizations/WaveForm/Makefile.in
src/visualizations/WaveForm/Waveform.vcxproj
src/visualizations/XBMCProjectM/Makefile.in
src/windowing/WinEventsWayland.cpp
src/windowing/X11/XRandR.cpp
src/windows/GUIMediaWindow.cpp
tools/TexturePacker/Makefile.in
tools/TexturePacker/Win32/MakeDDS.vcxproj
tools/TexturePacker/Win32/MakeDDS.vcxproj.filters
tools/TexturePacker/Win32/TexturePacker.vcxproj
tools/TexturePacker/Win32/TexturePacker.vcxproj.filters
tools/codegenerator/GenerateSWIGBindings.bat
tools/darwin/Configurations/App.xcconfig.in
tools/darwin/Support/CopyRootFiles-atv2.command
tools/darwin/Support/CopyRootFiles-ios.command
tools/darwin/Support/CopyRootFiles-osx.command
tools/darwin/Support/copyframeworks-atv2.command
tools/darwin/Support/copyframeworks-ios.command
tools/darwin/Support/copyframeworks-osx.command
tools/darwin/Support/makepythoninterface.command
tools/windows/CompileInfo.bat
tools/windows/JsonSchemaBuilder.bat

index 912434e..b5a0f82 100644 (file)
@@ -509,215 +509,215 @@ lib/cpluff/stamp-h1
 /userdata/cache
 /userdata/guisettings.xml
 
-# /xbmc/
-/xbmc/.GitRevision
-/xbmc/config.h
-/xbmc/config.h.in
-/xbmc/config.h.in~
-/xbmc/CompileInfo.cpp
-/xbmc/DllPaths_generated.h
-/xbmc/DllPaths_generated_android.h
-/xbmc/Makefile
-/xbmc/stamp-h1
-
-# /xbmc/addons/
-/xbmc/addons/Makefile
-/xbmc/addons/visualization.waveform
-
-# /xbmc/android
-/xbmc/android/Makefile
-/xbmc/android/activity/Makefile
-/xbmc/android/loader/Makefile
-/xbmc/android/jni/Makefile
-
-# /xbmc/cdrip/
-/xbmc/cdrip/Makefile
-
-# /xbmc/cores/
-/xbmc/cores/AudioEngine/Makefile
-/xbmc/cores/DllLoader/exports/build_wrapper.sh
-/xbmc/cores/DllLoader/exports/wrapper.def
-/xbmc/cores/DllLoader/Makefile
-/xbmc/cores/DllLoader/exports/Makefile
-/xbmc/cores/dvdplayer/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile
-/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
-/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
-/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
-/xbmc/cores/omxplayer/Makefile
-/xbmc/cores/paplayer/Makefile
-/xbmc/cores/playercorefactory/Makefile
-/xbmc/cores/Makefile
-/xbmc/cores/VideoRenderers/Makefile
-
-# /xbmc/filesystem/
-/xbmc/filesystem/Makefile
-
-# /xbmc/freebsd/
-/xbmc/freebsd/Makefile
-
-# /xbmc/guilib/
-/xbmc/guilib/Makefile
-/xbmc/guilib/*.obj
-/xbmc/guilib/*.idb
-/xbmc/guilib/*.pdb
-/xbmc/guilib/*.bak
-/xbmc/guilib/Debug (Win32)
-/xbmc/guilib/Release (Win32)
-/xbmc/guilib/Release
-/xbmc/guilib/Release_LTCG
-/xbmc/guilib/Debug
-/xbmc/guilib/Profile
-/xbmc/guilib/Profile_FastCap
-
-# /xbmc/input
-/xbmc/input/linux/Makefile
-
-# /xbmc/interfaces/
-/xbmc/interfaces/Makefile
-/xbmc/interfaces/json-rpc/ServiceDescription.h
-/xbmc/interfaces/python/Makefile
-/xbmc/interfaces/python/generated/
-/xbmc/interfaces/python/test/Makefile
-
-# /xbmc/linux/
-/xbmc/linux/Makefile
-/xbmc/linux/sse4/Makefile
-
-# /xbmc/main/
-/xbmc/main/Makefile
-
-# /xbmc/music/
-/xbmc/music/karaoke/Makefile
-
-# /xbmc/network/
-/xbmc/network/Makefile
-/xbmc/network/upnp/Makefile
-
-# /xbmc/osx/
-/xbmc/osx/Makefile
-/xbmc/osx/Info.plist
-/xbmc/osx/ios/XBMCIOS-Info.plist
-/xbmc/osx/atv2/XBMCATV2-Info.plist
-
-# /xbmc/peripherals/
-/xbmc/peripherals/bus/Makefile
-/xbmc/peripherals/devices/Makefile
-
-#/xbmc/screensavers/
-/xbmc/screensavers/Makefile
-/xbmc/screensavers/rsxs-0.9/Makefile
-/xbmc/screensavers/rsxs-0.9/configure
-/xbmc/screensavers/rsxs-0.9/config.h
-/xbmc/screensavers/rsxs-0.9/config.log
-/xbmc/screensavers/rsxs-0.9/config/Makefile
-/xbmc/screensavers/rsxs-0.9/lib/Makefile
-/xbmc/screensavers/rsxs-0.9/libltdl/Makefile
-/xbmc/screensavers/rsxs-0.9/src/Makefile
-/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile
-/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile
-/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile
-/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile
-/xbmc/screensavers/rsxs-0.9/src/flux/Makefile
-/xbmc/screensavers/rsxs-0.9/src/helios/Makefile
-/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile
-/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile
-/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile
-/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile
-/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile
-/xbmc/screensavers/rsxs-0.9/xbmc/Makefile
-/xbmc/screensavers/rsxs-0.9/autom4te.cache/
-/xbmc/screensavers/rsxs-0.9/lib/alloca.h
-/xbmc/screensavers/rsxs-0.9/lib/argz.h
-/xbmc/screensavers/rsxs-0.9/lib/getopt.h
-/xbmc/screensavers/rsxs-0.9/rsxs.spec
-/xbmc/screensavers/rsxs-0.9/src/.dirstamp
-/xbmc/screensavers/rsxs-0.9/src/euphoria/rs-euphoria
-/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma
-/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
-/xbmc/screensavers/rsxs-0.9/stamp-h1
-/xbmc/screensavers/rsxs-0.9/aclocal.m4
-/xbmc/screensavers/rsxs-0.9/compile
-/xbmc/screensavers/rsxs-0.9/config.guess
-/xbmc/screensavers/rsxs-0.9/config.h.in
-/xbmc/screensavers/rsxs-0.9/config.h.in~
-/xbmc/screensavers/rsxs-0.9/config.sub
-/xbmc/screensavers/rsxs-0.9/config/Makefile.in
-/xbmc/screensavers/rsxs-0.9/depcomp
-/xbmc/screensavers/rsxs-0.9/INSTALL
-/xbmc/screensavers/rsxs-0.9/install-sh
-/xbmc/screensavers/rsxs-0.9/lib/Makefile.in
-/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in
-/xbmc/screensavers/rsxs-0.9/Makefile.in
-/xbmc/screensavers/rsxs-0.9/missing
-/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
-/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
-
-#/xbmc/utils
-/xbmc/utils/Makefile
-
-#/xbmc/visualizations/
-/xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
-/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
-/xbmc/visualizations/EGLHelpers/Makefile
-/xbmc/visualizations/fishBMC/Makefile
-/xbmc/visualizations/Goom/Makefile
-/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
-/xbmc/visualizations/Goom/goom2k4-0/compile
-/xbmc/visualizations/Goom/goom2k4-0/configure
-/xbmc/visualizations/Goom/goom2k4-0/INSTALL
-/xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs
-/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
-/xbmc/visualizations/Goom/goom2k4-0/config.guess
-/xbmc/visualizations/Goom/goom2k4-0/config.sub
-/xbmc/visualizations/Goom/goom2k4-0/depcomp
-/xbmc/visualizations/Goom/goom2k4-0/install-sh
-/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
-/xbmc/visualizations/Goom/goom2k4-0/missing
-/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
-/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
-/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
-/xbmc/visualizations/Goom/goom2k4-0/ylwrap
-/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h
-/xbmc/visualizations/Milkdrop/Debug
-/xbmc/visualizations/Milkdrop/Release
-/xbmc/visualizations/OpenGLSpectrum/Makefile
-/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj
-/xbmc/visualizations/WaveForm/Makefile
-/xbmc/visualizations/WaveForm/Debug (DirectX)
-/xbmc/visualizations/WaveForm/Release (DirectX)
-/xbmc/visualizations/XBMCProjectM/Makefile
-/xbmc/visualizations/XBMCProjectM/libprojectM/Makefile
-/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt
-/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeFiles/
-/xbmc/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake
-/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp
-
-#/xbmc/win32/
-/xbmc/win32/XBMC_PC.rc
+# /src/
+/src/.GitRevision
+/src/config.h
+/src/config.h.in
+/src/config.h.in~
+/src/CompileInfo.cpp
+/src/DllPaths_generated.h
+/src/DllPaths_generated_android.h
+/src/Makefile
+/src/stamp-h1
+
+# /src/addons/
+/src/addons/Makefile
+/src/addons/visualization.waveform
+
+# /src/android
+/src/android/Makefile
+/src/android/activity/Makefile
+/src/android/loader/Makefile
+/src/android/jni/Makefile
+
+# /src/cdrip/
+/src/cdrip/Makefile
+
+# /src/cores/
+/src/cores/AudioEngine/Makefile
+/src/cores/DllLoader/exports/build_wrapper.sh
+/src/cores/DllLoader/exports/wrapper.def
+/src/cores/DllLoader/Makefile
+/src/cores/DllLoader/exports/Makefile
+/src/cores/dvdplayer/Makefile
+/src/cores/dvdplayer/DVDCodecs/Audio/Makefile
+/src/cores/dvdplayer/DVDCodecs/Makefile
+/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile
+/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile
+/src/cores/dvdplayer/DVDCodecs/Video/Makefile
+/src/cores/dvdplayer/DVDDemuxers/Makefile
+/src/cores/dvdplayer/DVDSubtitles/Makefile
+/src/cores/omxplayer/Makefile
+/src/cores/paplayer/Makefile
+/src/cores/playercorefactory/Makefile
+/src/cores/Makefile
+/src/cores/VideoRenderers/Makefile
+
+# /src/filesystem/
+/src/filesystem/Makefile
+
+# /src/freebsd/
+/src/freebsd/Makefile
+
+# /src/guilib/
+/src/guilib/Makefile
+/src/guilib/*.obj
+/src/guilib/*.idb
+/src/guilib/*.pdb
+/src/guilib/*.bak
+/src/guilib/Debug (Win32)
+/src/guilib/Release (Win32)
+/src/guilib/Release
+/src/guilib/Release_LTCG
+/src/guilib/Debug
+/src/guilib/Profile
+/src/guilib/Profile_FastCap
+
+# /src/input
+/src/input/linux/Makefile
+
+# /src/interfaces/
+/src/interfaces/Makefile
+/src/interfaces/json-rpc/ServiceDescription.h
+/src/interfaces/python/Makefile
+/src/interfaces/python/generated/
+/src/interfaces/python/test/Makefile
+
+# /src/linux/
+/src/linux/Makefile
+/src/linux/sse4/Makefile
+
+# /src/main/
+/src/main/Makefile
+
+# /src/music/
+/src/music/karaoke/Makefile
+
+# /src/network/
+/src/network/Makefile
+/src/network/upnp/Makefile
+
+# /src/osx/
+/src/osx/Makefile
+/src/osx/Info.plist
+/src/osx/ios/XBMCIOS-Info.plist
+/src/osx/atv2/XBMCATV2-Info.plist
+
+# /src/peripherals/
+/src/peripherals/bus/Makefile
+/src/peripherals/devices/Makefile
+
+#/src/screensavers/
+/src/screensavers/Makefile
+/src/screensavers/rsxs-0.9/Makefile
+/src/screensavers/rsxs-0.9/configure
+/src/screensavers/rsxs-0.9/config.h
+/src/screensavers/rsxs-0.9/config.log
+/src/screensavers/rsxs-0.9/config/Makefile
+/src/screensavers/rsxs-0.9/lib/Makefile
+/src/screensavers/rsxs-0.9/libltdl/Makefile
+/src/screensavers/rsxs-0.9/src/Makefile
+/src/screensavers/rsxs-0.9/src/cyclone/Makefile
+/src/screensavers/rsxs-0.9/src/euphoria/Makefile
+/src/screensavers/rsxs-0.9/src/fieldlines/Makefile
+/src/screensavers/rsxs-0.9/src/flocks/Makefile
+/src/screensavers/rsxs-0.9/src/flux/Makefile
+/src/screensavers/rsxs-0.9/src/helios/Makefile
+/src/screensavers/rsxs-0.9/src/hyperspace/Makefile
+/src/screensavers/rsxs-0.9/src/lattice/Makefile
+/src/screensavers/rsxs-0.9/src/plasma/Makefile
+/src/screensavers/rsxs-0.9/src/skyrocket/Makefile
+/src/screensavers/rsxs-0.9/src/solarwinds/Makefile
+/src/screensavers/rsxs-0.9/xbmc/Makefile
+/src/screensavers/rsxs-0.9/autom4te.cache/
+/src/screensavers/rsxs-0.9/lib/alloca.h
+/src/screensavers/rsxs-0.9/lib/argz.h
+/src/screensavers/rsxs-0.9/lib/getopt.h
+/src/screensavers/rsxs-0.9/rsxs.spec
+/src/screensavers/rsxs-0.9/src/.dirstamp
+/src/screensavers/rsxs-0.9/src/euphoria/rs-euphoria
+/src/screensavers/rsxs-0.9/src/plasma/rs-plasma
+/src/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
+/src/screensavers/rsxs-0.9/stamp-h1
+/src/screensavers/rsxs-0.9/aclocal.m4
+/src/screensavers/rsxs-0.9/compile
+/src/screensavers/rsxs-0.9/config.guess
+/src/screensavers/rsxs-0.9/config.h.in
+/src/screensavers/rsxs-0.9/config.h.in~
+/src/screensavers/rsxs-0.9/config.sub
+/src/screensavers/rsxs-0.9/config/Makefile.in
+/src/screensavers/rsxs-0.9/depcomp
+/src/screensavers/rsxs-0.9/INSTALL
+/src/screensavers/rsxs-0.9/install-sh
+/src/screensavers/rsxs-0.9/lib/Makefile.in
+/src/screensavers/rsxs-0.9/libltdl/Makefile.in
+/src/screensavers/rsxs-0.9/Makefile.in
+/src/screensavers/rsxs-0.9/missing
+/src/screensavers/rsxs-0.9/src/cyclone/Makefile.in
+/src/screensavers/rsxs-0.9/src/euphoria/Makefile.in
+/src/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
+/src/screensavers/rsxs-0.9/src/flocks/Makefile.in
+/src/screensavers/rsxs-0.9/src/flux/Makefile.in
+/src/screensavers/rsxs-0.9/src/helios/Makefile.in
+/src/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
+/src/screensavers/rsxs-0.9/src/lattice/Makefile.in
+/src/screensavers/rsxs-0.9/src/Makefile.in
+/src/screensavers/rsxs-0.9/src/plasma/Makefile.in
+/src/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
+/src/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
+
+#/src/utils
+/src/utils/Makefile
+
+#/src/visualizations/
+/src/visualizations/DirectXSpectrum/Debug (DirectX)
+/src/visualizations/DirectXSpectrum/Release (DirectX)
+/src/visualizations/EGLHelpers/Makefile
+/src/visualizations/fishBMC/Makefile
+/src/visualizations/Goom/Makefile
+/src/visualizations/Goom/goom2k4-0/aclocal.m4
+/src/visualizations/Goom/goom2k4-0/compile
+/src/visualizations/Goom/goom2k4-0/configure
+/src/visualizations/Goom/goom2k4-0/INSTALL
+/src/visualizations/Goom/goom2k4-0/mkinstalldirs
+/src/visualizations/Goom/goom2k4-0/Makefile.in
+/src/visualizations/Goom/goom2k4-0/config.guess
+/src/visualizations/Goom/goom2k4-0/config.sub
+/src/visualizations/Goom/goom2k4-0/depcomp
+/src/visualizations/Goom/goom2k4-0/install-sh
+/src/visualizations/Goom/goom2k4-0/ltmain.sh
+/src/visualizations/Goom/goom2k4-0/missing
+/src/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
+/src/visualizations/Goom/goom2k4-0/src/Makefile.in
+/src/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
+/src/visualizations/Goom/goom2k4-0/ylwrap
+/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h
+/src/visualizations/Milkdrop/Debug
+/src/visualizations/Milkdrop/Release
+/src/visualizations/OpenGLSpectrum/Makefile
+/src/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj
+/src/visualizations/WaveForm/Makefile
+/src/visualizations/WaveForm/Debug (DirectX)
+/src/visualizations/WaveForm/Release (DirectX)
+/src/visualizations/XBMCProjectM/Makefile
+/src/visualizations/XBMCProjectM/libprojectM/Makefile
+/src/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt
+/src/visualizations/XBMCProjectM/libprojectM/CMakeFiles/
+/src/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake
+/src/visualizations/XBMCProjectM/libprojectM/config.inp
+
+#/src/win32/
+/src/win32/XBMC_PC.rc
 # no longer used
-/xbmc/win32/git_rev.h
-
-# /xbmc/windowing/
-/xbmc/windowing/Makefile
-/xbmc/windowing/egl/Makefile
-/xbmc/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h
-/xbmc/windowing/tests/wayland/xbmc_wayland_test_protocol.c
-/xbmc/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h
-/xbmc/windowing/tests/wayland/Makefile
+/src/win32/git_rev.h
+
+# /src/windowing/
+/src/windowing/Makefile
+/src/windowing/egl/Makefile
+/src/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h
+/src/windowing/tests/wayland/xbmc_wayland_test_protocol.c
+/src/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h
+/src/windowing/tests/wayland/Makefile
 
 # /lib/libdvd/
 /lib/libdvd/Makefile
index 6dd3cf2..517b27f 100644 (file)
                7C779E51104A58F900F444C4 /* GUIWindowTestPatternGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowTestPatternGL.h; sourceTree = "<group>"; };
                7C7B2B2E1134F36400713D6D /* mysqldataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mysqldataset.cpp; sourceTree = "<group>"; };
                7C7B2B2F1134F36400713D6D /* mysqldataset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mysqldataset.h; sourceTree = "<group>"; };
-               7C7BCDBF17727951004842FB /* IListProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IListProvider.cpp; path = xbmc/listproviders/IListProvider.cpp; sourceTree = SOURCE_ROOT; };
-               7C7BCDC217727951004842FB /* StaticProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticProvider.h; path = xbmc/listproviders/StaticProvider.h; sourceTree = SOURCE_ROOT; };
-               7C7BCDC317727951004842FB /* StaticProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticProvider.cpp; path = xbmc/listproviders/StaticProvider.cpp; sourceTree = SOURCE_ROOT; };
-               7C7BCDC417727951004842FB /* IListProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IListProvider.h; path = xbmc/listproviders/IListProvider.h; sourceTree = SOURCE_ROOT; };
+               7C7BCDBF17727951004842FB /* IListProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IListProvider.cpp; path = src/listproviders/IListProvider.cpp; sourceTree = SOURCE_ROOT; };
+               7C7BCDC217727951004842FB /* StaticProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticProvider.h; path = src/listproviders/StaticProvider.h; sourceTree = SOURCE_ROOT; };
+               7C7BCDC317727951004842FB /* StaticProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticProvider.cpp; path = src/listproviders/StaticProvider.cpp; sourceTree = SOURCE_ROOT; };
+               7C7BCDC417727951004842FB /* IListProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IListProvider.h; path = src/listproviders/IListProvider.h; sourceTree = SOURCE_ROOT; };
                7C7CEAEF165629530059C9EB /* AELimiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AELimiter.cpp; sourceTree = "<group>"; };
                7C7CEAF0165629530059C9EB /* AELimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AELimiter.h; sourceTree = "<group>"; };
-               7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
-               7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
+               7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = src/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
+               7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = src/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
                7C87B2CC162CE39600EF897D /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = "<group>"; };
                7C87B2CD162CE39600EF897D /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = "<group>"; };
                7C89619013B6A16F003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
                7C8AE84C189DE3CD00C33786 /* CoreAudioStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CoreAudioStream.cpp; path = Sinks/osx/CoreAudioStream.cpp; sourceTree = "<group>"; };
                7C8AE852189DE47400C33786 /* CoreAudioHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CoreAudioHelpers.cpp; path = Sinks/osx/CoreAudioHelpers.cpp; sourceTree = "<group>"; };
                7C8AE853189DE47700C33786 /* CoreAudioHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreAudioHelpers.h; path = Sinks/osx/CoreAudioHelpers.h; sourceTree = "<group>"; };
-               7C8FC6EC1829A4580045153D /* DirectoryProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryProvider.cpp; path = xbmc/listproviders/DirectoryProvider.cpp; sourceTree = SOURCE_ROOT; };
-               7C8FC6ED1829A4580045153D /* DirectoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryProvider.h; path = xbmc/listproviders/DirectoryProvider.h; sourceTree = SOURCE_ROOT; };
+               7C8FC6EC1829A4580045153D /* DirectoryProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryProvider.cpp; path = src/listproviders/DirectoryProvider.cpp; sourceTree = SOURCE_ROOT; };
+               7C8FC6ED1829A4580045153D /* DirectoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryProvider.h; path = src/listproviders/DirectoryProvider.h; sourceTree = SOURCE_ROOT; };
                7C908892196358A8003D0619 /* auto_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = auto_buffer.cpp; sourceTree = "<group>"; };
                7C908893196358A8003D0619 /* auto_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auto_buffer.h; sourceTree = "<group>"; };
                7C920CF7181669FF00DA1477 /* TextureOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureOperations.cpp; sourceTree = "<group>"; };
                F50FE04D11A3411A00C8B8CD /* EncoderFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderFFmpeg.cpp; sourceTree = "<group>"; };
                F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OSXGNUReplacements.c; sourceTree = "<group>"; };
                F51CEEF00F5C5D28004F4602 /* OSXGNUReplacements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSXGNUReplacements.h; sourceTree = "<group>"; };
-               F51CEF860F5C64A5004F4602 /* DVDInputStreamHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDInputStreamHTSP.cpp; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp; sourceTree = SOURCE_ROOT; };
-               F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; };
+               F51CEF860F5C64A5004F4602 /* DVDInputStreamHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDInputStreamHTSP.cpp; path = src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp; sourceTree = SOURCE_ROOT; };
+               F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; };
                F51CF2CE0F6055A4004F4602 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
                F51CF2CF0F6055A4004F4602 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; };
                F52A733C1560BC34005B1A0B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
                F52B063911869862004B1D66 /* Skin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skin.h; sourceTree = "<group>"; };
                F52B063A11869862004B1D66 /* Skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skin.cpp; sourceTree = "<group>"; };
-               F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; };
-               F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDVideoCodecVDA.h; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h; sourceTree = SOURCE_ROOT; };
+               F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; };
+               F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDVideoCodecVDA.h; path = src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h; sourceTree = SOURCE_ROOT; };
                F52BFFD9115D5574004B1D66 /* AddonStatusHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonStatusHandler.h; sourceTree = "<group>"; };
                F52BFFDA115D5574004B1D66 /* AddonStatusHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonStatusHandler.cpp; sourceTree = "<group>"; };
                F52CC5EE1713AAA200113454 /* DirectoryNodeGrouped.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryNodeGrouped.cpp; sourceTree = "<group>"; };
                F54C51E20F1E787700D46E3C /* karaokelyricsfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricsfactory.cpp; sourceTree = "<group>"; };
                F54C51E30F1E787700D46E3C /* karaokelyricstextlrc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricstextlrc.cpp; sourceTree = "<group>"; };
                F54C51E40F1E787700D46E3C /* karaokelyricstext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricstext.cpp; sourceTree = "<group>"; };
-               F55110430F5C3C0000955236 /* DVDDemuxHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDDemuxHTSP.h; path = xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h; sourceTree = SOURCE_ROOT; };
-               F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDDemuxHTSP.cpp; path = xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp; sourceTree = SOURCE_ROOT; };
+               F55110430F5C3C0000955236 /* DVDDemuxHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDDemuxHTSP.h; path = src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h; sourceTree = SOURCE_ROOT; };
+               F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDDemuxHTSP.cpp; path = src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp; sourceTree = SOURCE_ROOT; };
                F551106C0F5C424700955236 /* hts_strtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hts_strtab.h; sourceTree = "<group>"; };
                F551106D0F5C424700955236 /* htsatomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = htsatomic.c; sourceTree = "<group>"; };
                F551106E0F5C424700955236 /* htsatomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = htsatomic.h; sourceTree = "<group>"; };
                F5EA021B0F6DA7E8005C2EC5 /* PowerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PowerManager.h; sourceTree = "<group>"; };
                F5EA02200F6DA85C005C2EC5 /* CocoaPowerSyscall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocoaPowerSyscall.cpp; sourceTree = "<group>"; };
                F5EA02210F6DA85C005C2EC5 /* CocoaPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaPowerSyscall.h; sourceTree = "<group>"; };
-               F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CocoaInterface.mm; path = xbmc/osx/CocoaInterface.mm; sourceTree = SOURCE_ROOT; };
-               F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocoaInterface.h; path = xbmc/osx/CocoaInterface.h; sourceTree = SOURCE_ROOT; };
+               F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CocoaInterface.mm; path = src/osx/CocoaInterface.mm; sourceTree = SOURCE_ROOT; };
+               F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocoaInterface.h; path = src/osx/CocoaInterface.h; sourceTree = SOURCE_ROOT; };
                F5ED8D6A1551F91400842059 /* BlurayDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlurayDirectory.cpp; sourceTree = "<group>"; };
                F5ED8D6B1551F91400842059 /* BlurayDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurayDirectory.h; sourceTree = "<group>"; };
                F5ED908615538DCE00842059 /* XBMCTinyXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCTinyXML.cpp; sourceTree = "<group>"; };
                                DFFA43CE19104BFA00C3923B /* media */,
                                C6859E96029091FE04C91782 /* docs */,
                                E38E185C0D25F9FA00618676 /* lib */,
-                               E38E14610D25F9F900618676 /* xbmc */,
+                               E38E14610D25F9F900618676 /* src */,
                        );
                        name = Source;
                        sourceTree = "<group>";
                        path = osx;
                        sourceTree = "<group>";
                };
-               E38E14610D25F9F900618676 /* xbmc */ = {
+               E38E14610D25F9F900618676 /* src */ = {
                        isa = PBXGroup;
                        children = (
                                18B49FF01152BEEB001AF8A6 /* addons */,
                                EC720A9B1550927000FFD782 /* XbmcContext.cpp */,
                                EC720A9C1550927000FFD782 /* XbmcContext.h */,
                        );
-                       path = xbmc;
+                       path = src;
                        sourceTree = "<group>";
                };
                E38E147F0D25F9F900618676 /* cdrip */ = {
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/linux,
-                                       xbmc/osx,
-                                       xbmc/cores/dvdplayer,
+                                       src,
+                                       src/linux,
+                                       src/osx,
+                                       src/cores/dvdplayer,
                                        lib,
                                        lib/ffmpeg,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
+                               INFOPLIST_FILE = $SRCROOT/src/osx/Info.plist;
                                INSTALL_PATH = /usr/local/bin;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SRCROOT)/lib/cmyth/librefmem",
                                        "$(SRCROOT)/lib/libsquish",
                                        "$(SRCROOT)/lib/SlingboxLib",
-                                       "$(SRCROOT)/xbmc/interfaces/json-rpc",
-                                       "\"$(SRCROOT)/xbmc/interfaces/python\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/legacy\"",
+                                       "$(SRCROOT)/src/interfaces/json-rpc",
+                                       "\"$(SRCROOT)/src/interfaces/python\"",
+                                       "\"$(SRCROOT)/src/interfaces/legacy\"",
                                );
                                LINK_WITH_STANDARD_LIBRARIES = YES;
                                OTHER_CPLUSPLUSFLAGS = (
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/linux,
-                                       xbmc/osx,
-                                       xbmc/cores/dvdplayer,
+                                       src,
+                                       src/linux,
+                                       src/osx,
+                                       src/cores/dvdplayer,
                                        lib,
                                        lib/ffmpeg,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
+                               INFOPLIST_FILE = $SRCROOT/src/osx/Info.plist;
                                INSTALL_PATH = /usr/local/bin;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SRCROOT)/lib/cmyth/librefmem",
                                        "$(SRCROOT)/lib/libsquish",
                                        "$(SRCROOT)/lib/SlingboxLib",
-                                       "$(SRCROOT)/xbmc/interfaces/json-rpc",
-                                       "\"$(SRCROOT)/xbmc/interfaces/python\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/legacy\"",
+                                       "$(SRCROOT)/src/interfaces/json-rpc",
+                                       "\"$(SRCROOT)/src/interfaces/python\"",
+                                       "\"$(SRCROOT)/src/interfaces/legacy\"",
                                );
                                LINK_WITH_STANDARD_LIBRARIES = YES;
                                OTHER_CPLUSPLUSFLAGS = (
                                GCC_VERSION = 4.2;
                                HEADER_SEARCH_PATHS = (
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/osx,
-                                       xbmc/linux,
-                                       xbmc/cores/dvdplayer,
-                                       xbmc/cores/AudioEngine,
-                                       xbmc/cores/AudioEngine/Utils,
+                                       src,
+                                       src/osx,
+                                       src/linux,
+                                       src/cores/dvdplayer,
+                                       src/cores/AudioEngine,
+                                       src/cores/AudioEngine/Utils,
                                        lib,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist";
+                               INFOPLIST_FILE = "$SRCROOT/src/osx/atv2/XBMCATV2-Info.plist";
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
                                IPHONEOS_DEPLOYMENT_TARGET = 4.2;
                                LIBRARY_SEARCH_PATHS = (
                                        "\"$(SRCROOT)/lib/cmyth/librefmem\"",
                                        "\"$(SRCROOT)/lib/libsquish\"",
                                        "\"$(SRCROOT)/lib/SlingboxLib\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/legacy\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/python\"",
+                                       "\"$(SRCROOT)/src/interfaces/json-rpc\"",
+                                       "\"$(SRCROOT)/src/interfaces/legacy\"",
+                                       "\"$(SRCROOT)/src/interfaces/python\"",
                                );
                                PLIST_FILE_OUTPUT_FORMAT = xml;
                                PREBINDING = NO;
                                GCC_VERSION = 4.2;
                                HEADER_SEARCH_PATHS = (
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/osx,
-                                       xbmc/linux,
-                                       xbmc/cores/dvdplayer,
-                                       xbmc/cores/AudioEngine,
-                                       xbmc/cores/AudioEngine/Utils,
+                                       src,
+                                       src/osx,
+                                       src/linux,
+                                       src/cores/dvdplayer,
+                                       src/cores/AudioEngine,
+                                       src/cores/AudioEngine/Utils,
                                        lib,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist";
+                               INFOPLIST_FILE = "$SRCROOT/src/osx/atv2/XBMCATV2-Info.plist";
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
                                IPHONEOS_DEPLOYMENT_TARGET = 4.2;
                                LIBRARY_SEARCH_PATHS = (
                                        "\"$(SRCROOT)/lib/cmyth/librefmem\"",
                                        "\"$(SRCROOT)/lib/libsquish\"",
                                        "\"$(SRCROOT)/lib/SlingboxLib\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/legacy\"",
-                                       "\"$(SRCROOT)/xbmc/interfaces/python\"",
+                                       "\"$(SRCROOT)/src/interfaces/json-rpc\"",
+                                       "\"$(SRCROOT)/src/interfaces/legacy\"",
+                                       "\"$(SRCROOT)/src/interfaces/python\"",
                                );
                                PLIST_FILE_OUTPUT_FORMAT = xml;
                                PREBINDING = NO;
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/linux,
-                                       xbmc/osx,
-                                       xbmc/cores/dvdplayer,
+                                       src,
+                                       src/linux,
+                                       src/osx,
+                                       src/cores/dvdplayer,
                                        lib,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = "$SRCROOT/xbmc/osx/ios/XBMCIOS-Info.plist";
+                               INFOPLIST_FILE = "$SRCROOT/src/osx/ios/XBMCIOS-Info.plist";
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
                                TARGETED_DEVICE_FAMILY = "1,2";
                                WRAPPER_EXTENSION = app;
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        $SRCROOT,
-                                       xbmc,
-                                       xbmc/linux,
-                                       xbmc/osx,
-                                       xbmc/cores/dvdplayer,
+                                       src,
+                                       src/linux,
+                                       src/osx,
+                                       src/cores/dvdplayer,
                                        lib,
                                        addons/library.xbmc.addon,
                                        $XBMC_DEPENDS/include,
                                        $XBMC_DEPENDS/include/python2.6,
                                        $XBMC_DEPENDS/include/libxml2,
                                );
-                               INFOPLIST_FILE = "xbmc/osx/ios/XBMCIOS-Info.plist";
+                               INFOPLIST_FILE = "src/osx/ios/XBMCIOS-Info.plist";
                                SDKROOT = iphoneos;
                                TARGETED_DEVICE_FAMILY = "1,2";
                                WRAPPER_EXTENSION = app;
index f88c88b..baa0eee 100644 (file)
@@ -17,17 +17,17 @@ DVDPCODECS_DIRS= \
        lib/libdvd 
 
 ifeq (@USE_LIBSTAGEFRIGHT@,1)
-DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+DVDPCODECS_DIRS += src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
 endif
 
-DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
-                   xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
-                   xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
-                   xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
-                   xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
+DVDPLAYER_ARCHIVES=src/cores/dvdplayer/DVDPlayer.a \
+                   src/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
+                   src/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
+                   src/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
+                   src/cores/dvdplayer/DVDCodecs/Video/Video.a \
+                   src/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
+                   src/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
+                   src/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
 
 DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    lib/SlingboxLib/SlingboxLib.a \
@@ -35,115 +35,115 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    lib/libXDAAP/libxdaap.a \
                    lib/libhts/libhts.a \
                    lib/libsquish/libsquish.a \
-                   xbmc/addons/addons.a \
-                   xbmc/cdrip/cdrip.a \
-                   xbmc/cores/AudioEngine/audioengine.a \
-                   xbmc/cores/DllLoader/dllloader.a \
-                   xbmc/cores/DllLoader/exports/exports.a \
-                   xbmc/cores/DllLoader/exports/util/exports_utils.a \
-                   xbmc/cores/ExternalPlayer/ExternalPlayer.a \
-                   xbmc/cores/VideoRenderers/VideoRenderer.a \
-                   xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
-                   xbmc/cores/cores.a \
-                   xbmc/cores/paplayer/paplayer.a \
-                   xbmc/cores/playercorefactory/playercorefactory.a \
-                   xbmc/dbwrappers/dbwrappers.a \
-                   xbmc/dialogs/dialogs.a \
-                   xbmc/epg/epg.a \
-                   xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
-                   xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
-                   xbmc/filesystem/filesystem.a \
-                   xbmc/guilib/guilib.a \
-                   xbmc/input/input.a \
-                   xbmc/interfaces/generic/interfaces-generic.a \
-                   xbmc/interfaces/info/info.a \
-                   xbmc/interfaces/interfaces.a \
-                   xbmc/interfaces/json-rpc/json-rpc.a \
-                   xbmc/linux/linux.a \
-                   xbmc/listproviders/listproviders.a \
-                   xbmc/media/media.a \
-                   xbmc/music/dialogs/musicdialogs.a \
-                   xbmc/music/infoscanner/musicscanner.a \
-                   xbmc/music/karaoke/karaoke.a \
-                   xbmc/music/music.a \
-                   xbmc/music/tags/musictags.a \
-                   xbmc/music/windows/musicwindows.a \
-                   xbmc/network/websocket/websocket.a \
-                   xbmc/network/network.a \
-                   xbmc/peripherals/bus/peripheral-bus.a \
-                   xbmc/peripherals/devices/peripheral-devices.a \
-                   xbmc/peripherals/dialogs/peripheral-dialogs.a \
-                   xbmc/peripherals/peripherals.a \
-                   xbmc/pictures/pictures.a \
-                   xbmc/playlists/playlists.a \
-                   xbmc/powermanagement/powermanagement.a \
-                   xbmc/profiles/profiles.a \
-                   xbmc/profiles/dialogs/profiles_dialogs.a \
-                   xbmc/profiles/windows/profiles_windows.a \
-                   xbmc/programs/programs.a \
-                   xbmc/pvr/addons/pvraddons.a \
-                   xbmc/pvr/channels/pvrchannels.a \
-                   xbmc/pvr/dialogs/pvrdialogs.a \
-                   xbmc/pvr/pvr.a \
-                   xbmc/pvr/recordings/pvrrecordings.a \
-                   xbmc/pvr/timers/pvrtimers.a \
-                   xbmc/pvr/windows/pvrwindows.a \
-                   xbmc/rendering/rendering.a \
-                   xbmc/settings/settings.a \
-                   xbmc/settings/dialogs/settings_dialogs.a \
-                   xbmc/settings/lib/settings_lib.a \
-                   xbmc/settings/windows/settings_windows.a \
-                   xbmc/storage/storage.a \
-                   xbmc/utils/utils.a \
-                   xbmc/video/dialogs/videodialogs.a \
-                   xbmc/video/videosync/videosync.a \
-                   xbmc/video/video.a \
-                   xbmc/video/windows/videowindows.a \
-                   xbmc/view/view.a \
-                   xbmc/windowing/windowing.a \
-                   xbmc/windows/windows.a \
-                   xbmc/xbmc.a \
-
-NWAOBJSXBMC=   xbmc/threads/threads.a \
-               xbmc/commons/commons.a
+                   src/addons/addons.a \
+                   src/cdrip/cdrip.a \
+                   src/cores/AudioEngine/audioengine.a \
+                   src/cores/DllLoader/dllloader.a \
+                   src/cores/DllLoader/exports/exports.a \
+                   src/cores/DllLoader/exports/util/exports_utils.a \
+                   src/cores/ExternalPlayer/ExternalPlayer.a \
+                   src/cores/VideoRenderers/VideoRenderer.a \
+                   src/cores/VideoRenderers/VideoShaders/VideoShaders.a \
+                   src/cores/cores.a \
+                   src/cores/paplayer/paplayer.a \
+                   src/cores/playercorefactory/playercorefactory.a \
+                   src/dbwrappers/dbwrappers.a \
+                   src/dialogs/dialogs.a \
+                   src/epg/epg.a \
+                   src/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
+                   src/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
+                   src/filesystem/filesystem.a \
+                   src/guilib/guilib.a \
+                   src/input/input.a \
+                   src/interfaces/generic/interfaces-generic.a \
+                   src/interfaces/info/info.a \
+                   src/interfaces/interfaces.a \
+                   src/interfaces/json-rpc/json-rpc.a \
+                   src/linux/linux.a \
+                   src/listproviders/listproviders.a \
+                   src/media/media.a \
+                   src/music/dialogs/musicdialogs.a \
+                   src/music/infoscanner/musicscanner.a \
+                   src/music/karaoke/karaoke.a \
+                   src/music/music.a \
+                   src/music/tags/musictags.a \
+                   src/music/windows/musicwindows.a \
+                   src/network/websocket/websocket.a \
+                   src/network/network.a \
+                   src/peripherals/bus/peripheral-bus.a \
+                   src/peripherals/devices/peripheral-devices.a \
+                   src/peripherals/dialogs/peripheral-dialogs.a \
+                   src/peripherals/peripherals.a \
+                   src/pictures/pictures.a \
+                   src/playlists/playlists.a \
+                   src/powermanagement/powermanagement.a \
+                   src/profiles/profiles.a \
+                   src/profiles/dialogs/profiles_dialogs.a \
+                   src/profiles/windows/profiles_windows.a \
+                   src/programs/programs.a \
+                   src/pvr/addons/pvraddons.a \
+                   src/pvr/channels/pvrchannels.a \
+                   src/pvr/dialogs/pvrdialogs.a \
+                   src/pvr/pvr.a \
+                   src/pvr/recordings/pvrrecordings.a \
+                   src/pvr/timers/pvrtimers.a \
+                   src/pvr/windows/pvrwindows.a \
+                   src/rendering/rendering.a \
+                   src/settings/settings.a \
+                   src/settings/dialogs/settings_dialogs.a \
+                   src/settings/lib/settings_lib.a \
+                   src/settings/windows/settings_windows.a \
+                   src/storage/storage.a \
+                   src/utils/utils.a \
+                   src/video/dialogs/videodialogs.a \
+                   src/video/videosync/videosync.a \
+                   src/video/video.a \
+                   src/video/windows/videowindows.a \
+                   src/view/view.a \
+                   src/windowing/windowing.a \
+                   src/windows/windows.a \
+                   src/xbmc.a \
+
+NWAOBJSXBMC=   src/threads/threads.a \
+               src/commons/commons.a
 
 
 ifeq (@USE_WEB_SERVER@,1)
-DIRECTORY_ARCHIVES += xbmc/network/httprequesthandler/httprequesthandlers.a
+DIRECTORY_ARCHIVES += src/network/httprequesthandler/httprequesthandlers.a
 endif
 
-DIRECTORY_ARCHIVES += xbmc/interfaces/legacy/legacy.a
-DIRECTORY_ARCHIVES += xbmc/interfaces/python/python_binding.a
+DIRECTORY_ARCHIVES += src/interfaces/legacy/legacy.a
+DIRECTORY_ARCHIVES += src/interfaces/python/python_binding.a
 
 ifeq (@USE_OPENGL@,1)
-DIRECTORY_ARCHIVES += xbmc/rendering/gl/rendering_gl.a
+DIRECTORY_ARCHIVES += src/rendering/gl/rendering_gl.a
 endif
 
 ifeq (@USE_OPENGLES@,1)
-DIRECTORY_ARCHIVES += xbmc/rendering/gles/rendering_gles.a
-DIRECTORY_ARCHIVES += xbmc/windowing/egl/windowing_egl.a
-DIRECTORY_ARCHIVES += xbmc/visualizations/EGLHelpers/eglhelpers.a
+DIRECTORY_ARCHIVES += src/rendering/gles/rendering_gles.a
+DIRECTORY_ARCHIVES += src/windowing/egl/windowing_egl.a
+DIRECTORY_ARCHIVES += src/visualizations/EGLHelpers/eglhelpers.a
 endif
 
 ifeq (@USE_UPNP@,1)
 DIRECTORY_ARCHIVES += lib/libUPnP/libupnp.a \
-                      xbmc/network/upnp/upnp.a
+                      src/network/upnp/upnp.a
 endif
 
 ifeq (@USE_MDNSEMBEDDED@,1)
-DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a
+DIRECTORY_ARCHIVES += src/network/mdns/mdns.a
 endif
 
 INSTALL_FILTER = .*visualization\.dxspectrum.*
 INSTALL_FILTER += .*visualization\.milkdrop.*
 
 ifeq ($(findstring osx,@ARCH@),osx)
-DIRECTORY_ARCHIVES += xbmc/osx/osx.a
-DIRECTORY_ARCHIVES += xbmc/network/osx/network.a
-DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
-DIRECTORY_ARCHIVES += xbmc/powermanagement/osx/powermanagement.a
-DIRECTORY_ARCHIVES += xbmc/storage/osx/storage.a
-DIRECTORY_ARCHIVES += xbmc/windowing/osx/windowing_osx.a
+DIRECTORY_ARCHIVES += src/osx/osx.a
+DIRECTORY_ARCHIVES += src/network/osx/network.a
+DIRECTORY_ARCHIVES += src/network/linux/network_linux.a
+DIRECTORY_ARCHIVES += src/powermanagement/osx/powermanagement.a
+DIRECTORY_ARCHIVES += src/storage/osx/storage.a
+DIRECTORY_ARCHIVES += src/windowing/osx/windowing_osx.a
 INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
 INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
 INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
@@ -152,25 +152,25 @@ INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.*
 INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
 INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.*
 ifeq (@USE_ANDROID@,1)
-DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
-DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
-DIRECTORY_ARCHIVES += xbmc/input/touch/generic/input_touch_generic.a
-DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
-DIRECTORY_ARCHIVES += xbmc/powermanagement/android/powermanagement_android.a
-DIRECTORY_ARCHIVES += xbmc/storage/android/storage_android.a
-DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
+DIRECTORY_ARCHIVES += src/input/linux/input_linux.a
+DIRECTORY_ARCHIVES += src/input/touch/input_touch.a
+DIRECTORY_ARCHIVES += src/input/touch/generic/input_touch_generic.a
+DIRECTORY_ARCHIVES += src/network/linux/network_linux.a
+DIRECTORY_ARCHIVES += src/powermanagement/android/powermanagement_android.a
+DIRECTORY_ARCHIVES += src/storage/android/storage_android.a
+DIRECTORY_ARCHIVES += src/windowing/X11/windowing_X11.a
 else
-DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
-DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
-DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a
-DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
-DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
+DIRECTORY_ARCHIVES += src/input/linux/input_linux.a
+DIRECTORY_ARCHIVES += src/network/linux/network_linux.a
+DIRECTORY_ARCHIVES += src/powermanagement/linux/powermanagement_linux.a
+DIRECTORY_ARCHIVES += src/storage/linux/storage_linux.a
+DIRECTORY_ARCHIVES += src/windowing/X11/windowing_X11.a
 INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.*
 endif
 endif
 
 ifeq ($(findstring freebsd,@ARCH@),freebsd)
-DIRECTORY_ARCHIVES += xbmc/freebsd/freebsd.a
+DIRECTORY_ARCHIVES += src/freebsd/freebsd.a
 endif
 
 ifeq (@HAVE_XBMC_NONFREE@,1)
@@ -178,14 +178,14 @@ DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a
 endif
 
 ifeq (@USE_ANDROID@,1)
-DIRECTORY_ARCHIVES += xbmc/android/loader/AndroidDyload.a
-DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
-DIRECTORY_ARCHIVES += xbmc/android/bionic_supplement/bionic_supplement.a
-DIRECTORY_ARCHIVES += xbmc/android/jni/jni.a
+DIRECTORY_ARCHIVES += src/android/loader/AndroidDyload.a
+DIRECTORY_ARCHIVES += src/windowing/android/windowing_android.a
+DIRECTORY_ARCHIVES += src/android/bionic_supplement/bionic_supplement.a
+DIRECTORY_ARCHIVES += src/android/jni/jni.a
 endif
 
 ifeq (@USE_OMXPLAYER@,1)
-DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a
+DIRECTORY_ARCHIVES += src/cores/omxplayer/omxplayer.a
 endif
 
 PAPCODECS_DIRS= \
@@ -215,37 +215,37 @@ endif
 
 SS_DIRS=
 ifneq (@DISABLE_RSXS@,1)
-  SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+  SS_DIRS+= src/screensavers/rsxs-0.9/xbmc
 else
   INSTALL_FILTER+= .*screensaver\.rsxs.*
 endif
 
 ifneq (@DISABLE_SPECTRUM@,1)
-  VIS_DIRS+= xbmc/visualizations/OpenGLSpectrum
+  VIS_DIRS+= src/visualizations/OpenGLSpectrum
 else
   INSTALL_FILTER+= .*visualization\.glspectrum.*
 endif
 
 ifneq (@DISABLE_WAVEFORM@,1)
-  VIS_DIRS+= xbmc/visualizations/WaveForm
+  VIS_DIRS+= src/visualizations/WaveForm
 else
   INSTALL_FILTER+= .*visualization\.waveform.*
 endif
 
 ifneq (@DISABLE_FISHBMC@,1)
-  VIS_DIRS+= xbmc/visualizations/fishBMC
+  VIS_DIRS+= src/visualizations/fishBMC
 else
   INSTALL_FILTER+= .*visualization\.fishbmc.*
 endif
 
 ifneq (@DISABLE_PROJECTM@,1)
-  VIS_DIRS+= xbmc/visualizations/XBMCProjectM
+  VIS_DIRS+= src/visualizations/XBMCProjectM
 else
   INSTALL_FILTER+= .*visualization\.projectm.*
 endif
 
 ifneq (@DISABLE_GOOM@,1)
-  VIS_DIRS+=xbmc/visualizations/Goom
+  VIS_DIRS+=src/visualizations/Goom
 else
   INSTALL_FILTER+= .*visualization\.goom.*
 endif
@@ -290,30 +290,30 @@ GTEST_DIR = lib/gtest
 GTEST_INCLUDES = -I$(GTEST_DIR)/include
 GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a
 
-CHECK_DIRS = xbmc/addons/test \
-             xbmc/filesystem/test \
-             xbmc/music/tags/test \
-             xbmc/utils/test \
-             xbmc/video/test \
-             xbmc/threads/test \
-             xbmc/interfaces/python/test \
-             xbmc/cores/AudioEngine/Sinks/test \
-             xbmc/test
-CHECK_LIBS = xbmc/addons/test/addonsTest.a \
-             xbmc/filesystem/test/filesystemTest.a \
-             xbmc/music/tags/test/tagsTest.a \
-             xbmc/utils/test/utilsTest.a \
-             xbmc/video/test/videoTest.a \
-             xbmc/threads/test/threadTest.a \
-             xbmc/interfaces/python/test/pythonSwigTest.a \
-             xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a \
-             xbmc/test/xbmc-test.a
+CHECK_DIRS = src/addons/test \
+             src/filesystem/test \
+             src/music/tags/test \
+             src/utils/test \
+             src/video/test \
+             src/threads/test \
+             src/interfaces/python/test \
+             src/cores/AudioEngine/Sinks/test \
+             src/test
+CHECK_LIBS = src/addons/test/addonsTest.a \
+             src/filesystem/test/filesystemTest.a \
+             src/music/tags/test/tagsTest.a \
+             src/utils/test/utilsTest.a \
+             src/video/test/videoTest.a \
+             src/threads/test/threadTest.a \
+             src/interfaces/python/test/pythonSwigTest.a \
+             src/cores/AudioEngine/Sinks/test/AESinkTest.a \
+             src/test/xbmc-test.a
 
 ifeq (@USE_WAYLAND@,1)
-CHECK_LIBS += xbmc/windowing/tests/wayland/test_wayland.a
+CHECK_LIBS += src/windowing/tests/wayland/test_wayland.a
 
 ifeq (@USE_WAYLAND_TEST_EXTENSION@,1)
-WAYLAND_TEST_MODULE = xbmc/windowing/tests/wayland/xbmc-wayland-test-extension.so
+WAYLAND_TEST_MODULE = src/windowing/tests/wayland/xbmc-wayland-test-extension.so
 $(WAYLAND_TEST_MODULE): force
        $(MAKE) -C $(@D) $(@F)
 CHECK_EXTENSIONS = $(WAYLAND_TEST_MODULE)
@@ -324,7 +324,7 @@ endif
 ifeq (@USE_SSE4@,1)
 LIBSSE4+=sse4
 sse4 : force
-       $(MAKE) -C xbmc/linux/sse4
+       $(MAKE) -C src/linux/sse4
 endif
 
 CHECK_PROGRAMS = @APP_NAME_LC@-test
@@ -362,7 +362,7 @@ skins:
 endif
 
 # Setup some dependencies for subdir makes
-xbmc/cores/paplayer/paplayer.a: papcodecs
+src/cores/paplayer/paplayer.a: papcodecs
 $(DVDPLAYER_ARCHIVES)         : dvdpcodecs
 
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
@@ -377,15 +377,15 @@ ifeq ($(findstring osx,@ARCH@), osx)
 else
        $(CXX) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $< \
                -Wl,--no-whole-archive  \
-               `cat xbmc/cores/DllLoader/exports/wrapper.def` xbmc/cores/DllLoader/exports/wrapper.o -lexpat
+               `cat src/cores/DllLoader/exports/wrapper.def` src/cores/DllLoader/exports/wrapper.o -lexpat
 endif
 
-exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a
-       $(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
-dllloader: exports xbmc/cores/DllLoader/dllloader.a
+exports: src/cores/DllLoader/exports/exports.a src/cores/DllLoader/exports/util/exports_utils.a
+       $(MAKE) -C src/cores/DllLoader/exports wrapper.def
+dllloader: exports src/cores/DllLoader/dllloader.a
 
 ifeq (@USE_OPENGLES@,1)
-EGLHELPERS=xbmc/visualizations/EGLHelpers/eglhelpers.a
+EGLHELPERS=src/visualizations/EGLHelpers/eglhelpers.a
 endif
 
 $(VIS_DIRS): force exports $(EGLHELPERS)
@@ -408,7 +408,7 @@ dvdpcodecs: dllloader
 
 ifeq (@USE_LIBSTAGEFRIGHT@,1)
 dvdpextcodecs: lib@APP_NAME_LC@.so
-       $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
+       $(MAKE) -C src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
 else
 dvdpextcodecs:
 endif
@@ -466,20 +466,20 @@ xcode_depends: \
        lib/SlingboxLib/SlingboxLib.a
 
 DYNOBJSXBMC= \
-       xbmc/linux/linux.a \
-       xbmc/network/network.a \
-       xbmc/video/windows/videowindows.a \
-       xbmc/utils/utils.a \
-       xbmc/cores/DllLoader/exports/util/exports_utils.a \
-       xbmc/cores/DllLoader/exports/exports.a \
-       xbmc/settings/settings.a \
-       xbmc/video/video.a \
-       xbmc/pvr/addons/pvraddons.a \
-       xbmc/pvr/windows/pvrwindows.a \
-       xbmc/guilib/guilib.a # must be dynamic to avoid linker errors
+       src/linux/linux.a \
+       src/network/network.a \
+       src/video/windows/videowindows.a \
+       src/utils/utils.a \
+       src/cores/DllLoader/exports/util/exports_utils.a \
+       src/cores/DllLoader/exports/exports.a \
+       src/settings/settings.a \
+       src/video/video.a \
+       src/pvr/addons/pvraddons.a \
+       src/pvr/windows/pvrwindows.a \
+       src/guilib/guilib.a # must be dynamic to avoid linker errors
 
 ifeq ($(findstring freebsd,@ARCH@),freebsd)
-DYNOBJSXBMC+= xbmc/freebsd/freebsd.a
+DYNOBJSXBMC+= src/freebsd/freebsd.a
 endif
 
 ifeq (@USE_STATIC_FFMPEG@,1)
@@ -497,9 +497,9 @@ $(FFMPEGOBJS): dvdpcodecs
 endif
 
 ifeq (@USE_ANDROID@,1)
-MAINOBJS+=xbmc/android/activity/activity.a
+MAINOBJS+=src/android/activity/activity.a
 else
-MAINOBJS+=xbmc/main/main.a
+MAINOBJS+=src/main/main.a
 endif # USE_ANDROID
 
 
@@ -509,13 +509,13 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
 BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))
 
 DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
-       $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
+       $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) src/main
 
 $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
        @$(MAKE) $(if $(V),,-s) -C $(@D)
 
 # Binary Addon bindings
-include xbmc/addons/addon-bindings.mk
+include src/addons/addon-bindings.mk
 
 lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
 ifeq ($(findstring osx,@ARCH@), osx)
@@ -540,7 +540,7 @@ else
        $(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o @APP_NAME_LC@-xrandr xbmc-xrandr.c -lXrandr -lX11 -lm
 endif
 
-tools/TexturePacker/TexturePacker: xbmc/guilib/XBTF.h
+tools/TexturePacker/TexturePacker: src/guilib/XBTF.h
        $(MAKE) -C tools/TexturePacker/
 
 
index 481da57..7a82e70 100644 (file)
@@ -38,14 +38,14 @@ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
 LDFLAGS+=@LDFLAGS@
 LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
 INCLUDES+=-I@abs_top_srcdir@/lib
-INCLUDES+=-I@abs_top_srcdir@/xbmc
+INCLUDES+=-I@abs_top_srcdir@/src
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 INCLUDES+=$(sort @INCLUDES@)
-INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/linux
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 DEFINES+= \
        @ARCH_DEFINES@ \
        -D_FILE_DEFINED \
@@ -57,7 +57,7 @@ DEFINES+= \
        @DEFS@ \
 
 ifeq ($(findstring osx,$(ARCH)), osx)
-       INCLUDES+=-I@abs_top_srcdir@/xbmc/osx
+       INCLUDES+=-I@abs_top_srcdir@/src/osx
 endif
 
 ifeq ($(ARCH), powerpc-osx)
index 8bc4795..0a30fee 100644 (file)
@@ -1,6 +1,6 @@
 BOOTSTRAP_SUBDIRS += configure.in
-BOOTSTRAP_SUBDIRS += xbmc/screensavers/rsxs-0.9/configure.ac
-BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.in
+BOOTSTRAP_SUBDIRS += src/screensavers/rsxs-0.9/configure.ac
+BOOTSTRAP_SUBDIRS += src/visualizations/Goom/goom2k4-0/configure.in
 BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac
 BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
 
index 5ecb0c0..a037bfe 100644 (file)
@@ -1,5 +1,5 @@
 TOPDIR ?= .
-INTERFACES_DIR ?= xbmc/interfaces
+INTERFACES_DIR ?= src/interfaces
 
 JAVA ?= $(shell which java)
 ifeq ($(JAVA),)
@@ -35,7 +35,7 @@ GENERATED += $(GENDIR)/AddonModuleXbmcplugin.cpp
 GENERATED += $(GENDIR)/AddonModuleXbmcaddon.cpp
 GENERATED += $(GENDIR)/AddonModuleXbmcvfs.cpp
 
-GENERATE_DEPS += $(TOPDIR)/xbmc/interfaces/legacy/*.h $(TOPDIR)/xbmc/interfaces/python/typemaps/*.intm $(TOPDIR)/xbmc/interfaces/python/typemaps/*.outtm
+GENERATE_DEPS += $(TOPDIR)/src/interfaces/legacy/*.h $(TOPDIR)/src/interfaces/python/typemaps/*.intm $(TOPDIR)/src/interfaces/python/typemaps/*.outtm
 
 vpath %.i $(INTERFACES_DIR)/swig
 
@@ -49,7 +49,7 @@ $(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH)
 
 $(GENDIR)/%.xml: %.i $(SWIG) $(JAVA) $(GENERATE_DEPS)
        mkdir -p $(GENDIR)
-       $(SWIG) -w401 -c++ -o $@ -xml -I$(TOPDIR)/xbmc -xmllang python $<
+       $(SWIG) -w401 -c++ -o $@ -xml -I$(TOPDIR)/src -xmllang python $<
 
 codegenerated: $(DOXYGEN) $(SWIG) $(JAVA) $(GENERATED) $(GENERATED_JSON) $(GENERATED_ADDON_JSON)
 
index 6cfe954..60bdd04 100644 (file)
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([kodi], [14.9.701], [http://issues.kodi.tv])
-AC_CONFIG_HEADERS([xbmc/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AH_TOP([#pragma once])
 m4_include([m4/ax_prog_cc_for_build.m4])
 m4_include([m4/ax_prog_cxx_for_build.m4])
@@ -788,7 +788,7 @@ if echo "$ARCH" | grep -q "freebsd" ; then
 fi
 if test "$host_vendor" = "apple" ; then
   # standard application paths
-  INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx"
+  INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/src/osx"
   if test "$use_arch" != "arm"; then
     LIBS="$LIBS -framework ApplicationServices"
     LIBS="$LIBS -framework AudioUnit"
@@ -2421,23 +2421,23 @@ fi
 OUTPUT_FILES="Makefile \
     Makefile.include \
     addons/skin.confluence/media/Makefile \
-    xbmc/Makefile \
-    xbmc/cdrip/Makefile \
-    xbmc/cores/Makefile \
-    xbmc/cores/VideoRenderers/Makefile \
-    xbmc/cores/dvdplayer/Makefile \
+    src/Makefile \
+    src/cdrip/Makefile \
+    src/cores/Makefile \
+    src/cores/VideoRenderers/Makefile \
+    src/cores/dvdplayer/Makefile \
     lib/libdvd/Makefile \
-    xbmc/cores/DllLoader/Makefile \
-    xbmc/cores/DllLoader/exports/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile \
-    xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile \
-    xbmc/cores/dvdplayer/DVDDemuxers/Makefile \
-    xbmc/cores/dvdplayer/DVDSubtitles/Makefile \
-    xbmc/cores/AudioEngine/Makefile \
-    xbmc/cores/paplayer/Makefile \
-    xbmc/cores/omxplayer/Makefile \
+    src/cores/DllLoader/Makefile \
+    src/cores/DllLoader/exports/Makefile \
+    src/cores/dvdplayer/DVDCodecs/Makefile \
+    src/cores/dvdplayer/DVDCodecs/Audio/Makefile \
+    src/cores/dvdplayer/DVDCodecs/Overlay/Makefile \
+    src/cores/dvdplayer/DVDCodecs/Video/Makefile \
+    src/cores/dvdplayer/DVDDemuxers/Makefile \
+    src/cores/dvdplayer/DVDSubtitles/Makefile \
+    src/cores/AudioEngine/Makefile \
+    src/cores/paplayer/Makefile \
+    src/cores/omxplayer/Makefile \
     lib/timidity/Makefile \
     lib/asap/Makefile \
     lib/nosefart/Makefile \
@@ -2445,14 +2445,14 @@ OUTPUT_FILES="Makefile \
     lib/vgmstream/Makefile \
     lib/snesapu/SNES/SNESAPU/Makefile \
     lib/stsound/StSoundLibrary/Makefile \
-    xbmc/cores/playercorefactory/Makefile \
-    xbmc/music/karaoke/Makefile \
-    xbmc/osx/Makefile \
-    xbmc/guilib/Makefile \
-    xbmc/input/linux/Makefile \
-    xbmc/interfaces/Makefile \
-    xbmc/network/Makefile \
-    xbmc/network/upnp/Makefile \
+    src/cores/playercorefactory/Makefile \
+    src/music/karaoke/Makefile \
+    src/osx/Makefile \
+    src/guilib/Makefile \
+    src/input/linux/Makefile \
+    src/interfaces/Makefile \
+    src/network/Makefile \
+    src/network/upnp/Makefile \
     lib/libRTV/Makefile \
     lib/libexif/Makefile \
     lib/libXDAAP/Makefile \
@@ -2461,24 +2461,24 @@ OUTPUT_FILES="Makefile \
     lib/libsquish/Makefile \
     lib/cximage-6.0/Makefile \
     lib/libUPnP/Makefile \
-    xbmc/DllPaths_generated.h \
-    xbmc/DllPaths_generated_android.h \
-    xbmc/freebsd/Makefile \
-    xbmc/linux/Makefile \
-    xbmc/filesystem/Makefile \
-    xbmc/screensavers/rsxs-0.9/xbmc/Makefile \
-    xbmc/visualizations/XBMCProjectM/Makefile \
-    xbmc/visualizations/Goom/Makefile \
-    xbmc/visualizations/OpenGLSpectrum/Makefile \
-    xbmc/visualizations/fishBMC/Makefile \
-    xbmc/visualizations/WaveForm/Makefile \
-    xbmc/windowing/Makefile \
-    xbmc/windowing/egl/Makefile \
+    src/DllPaths_generated.h \
+    src/DllPaths_generated_android.h \
+    src/freebsd/Makefile \
+    src/linux/Makefile \
+    src/filesystem/Makefile \
+    src/screensavers/rsxs-0.9/xbmc/Makefile \
+    src/visualizations/XBMCProjectM/Makefile \
+    src/visualizations/Goom/Makefile \
+    src/visualizations/OpenGLSpectrum/Makefile \
+    src/visualizations/fishBMC/Makefile \
+    src/visualizations/WaveForm/Makefile \
+    src/windowing/Makefile \
+    src/windowing/egl/Makefile \
     lib/addons/library.xbmc.addon/Makefile \
     lib/addons/library.xbmc.codec/Makefile \
     lib/addons/library.xbmc.gui/Makefile \
     lib/addons/library.xbmc.pvr/Makefile \
-    xbmc/visualizations/EGLHelpers/Makefile \
+    src/visualizations/EGLHelpers/Makefile \
     tools/Linux/${APP_NAME_LC}.sh \
     tools/Linux/${APP_NAME_LC}-standalone.sh \
     tools/Linux/${APP_NAME_LC}-xsession.desktop \
@@ -2487,13 +2487,13 @@ OUTPUT_FILES="Makefile \
     tools/TexturePacker/Makefile \
     tools/EventClients/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
-    xbmc/peripherals/bus/Makefile \
-    xbmc/peripherals/devices/Makefile \
-    xbmc/android/activity/Makefile \
-    xbmc/android/loader/Makefile \
-    xbmc/android/jni/Makefile \
-    xbmc/utils/Makefile \
-    xbmc/main/Makefile \
+    src/peripherals/bus/Makefile \
+    src/peripherals/devices/Makefile \
+    src/android/activity/Makefile \
+    src/android/loader/Makefile \
+    src/android/jni/Makefile \
+    src/utils/Makefile \
+    src/main/Makefile \
     tools/darwin/Configurations/App.xcconfig \
     tools/darwin/Configurations/Common.xcconfig \
     tools/darwin/packaging/ios/mkdeb-ios.sh \
@@ -2501,9 +2501,9 @@ OUTPUT_FILES="Makefile \
     tools/darwin/packaging/osx/mkdmg-osx.sh \
     tools/darwin/packaging/migrate_to_kodi_ios.sh \
     tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh \
-    xbmc/osx/Info.plist \
-    xbmc/osx/ios/XBMCIOS-Info.plist \
-    xbmc/osx/atv2/XBMCATV2-Info.plist \
+    src/osx/Info.plist \
+    src/osx/ios/XBMCIOS-Info.plist \
+    src/osx/atv2/XBMCATV2-Info.plist \
     project/cmake/kodi-config.cmake \
     project/cmake/xbmc-config.cmake \
     tools/android/packaging/xbmc/AndroidManifest.xml \
@@ -2516,7 +2516,7 @@ OUTPUT_FILES="Makefile \
     addons/xbmc.addon/addon.xml"
 
 if test "$use_wayland" = "yes"; then
-OUTPUT_FILES="$OUTPUT_FILES xbmc/windowing/tests/wayland/Makefile"
+OUTPUT_FILES="$OUTPUT_FILES src/windowing/tests/wayland/Makefile"
 fi
 
 if test "$use_touch_skin" = "yes"; then
@@ -2524,16 +2524,16 @@ OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile"
 fi
 
 if test "$use_codec_libstagefright" = "yes"; then
-OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile"
+OUTPUT_FILES="$OUTPUT_FILES src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile"
 fi
 
 if test "$use_sse4" = "yes"; then
-OUTPUT_FILES="$OUTPUT_FILES xbmc/linux/sse4/Makefile"
+OUTPUT_FILES="$OUTPUT_FILES src/linux/sse4/Makefile"
 fi
 
 OUTPUT_FILES="$OUTPUT_FILES \
-  xbmc/interfaces/python/Makefile \
-  xbmc/interfaces/python/test/Makefile"
+  src/interfaces/python/Makefile \
+  src/interfaces/python/test/Makefile"
 
 # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
 # .dummy.am does nothing.
@@ -2705,7 +2705,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
     --cc="$CC"
 ], [0])
 
-XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
+XB_CONFIG_MODULE([src/visualizations/XBMCProjectM/libprojectM],[
   set -x
   rm -f CMakeCache.txt &&                              \
   CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \
@@ -2727,7 +2727,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
   set +x
 ], [$DISABLE_PROJECTM])
 
-XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
+XB_CONFIG_MODULE([src/visualizations/Goom/goom2k4-0],[
   ./configure  \
     CFLAGS="$CFLAGS" \ 
     CXXFLAGS="$CXXFLAGS" \
@@ -2740,7 +2740,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
     --with-pic
 ], [$DISABLE_GOOM])
 
-XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [
+XB_CONFIG_MODULE([src/screensavers/rsxs-0.9/], [
   if test "$host_vendor" = "apple"; then
     # clang treats inlines different
     case $CC in
index 15090fc..4546f11 100755 (executable)
@@ -13,7 +13,7 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 #: system/settings/settings.xml
 msgctxt "#0"
 msgid "Programs"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: Used in Confluence
 #: system/settings/settings.xml
-#: xbmc/media/MediaTypes.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#3"
 msgid "Videos"
 msgstr ""
@@ -42,13 +42,13 @@ msgid "TV-Guide"
 msgstr ""
 
 #: Used in Confluence
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#5"
 msgid "Settings"
 msgstr ""
 
 #: Unknown
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#6"
 msgid "Kodi SVN"
 msgstr ""
@@ -383,12 +383,12 @@ msgctxt "#105"
 msgid "Sort by: Size"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogYesNo.cpp
+#: src/dialogs/GUIDialogYesNo.cpp
 msgctxt "#106"
 msgid "No"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogYesNo.cpp
+#: src/dialogs/GUIDialogYesNo.cpp
 msgctxt "#107"
 msgid "Yes"
 msgstr ""
@@ -413,86 +413,86 @@ msgctxt "#112"
 msgid "Paused"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#113"
 msgid "Update failed"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#114"
 msgid "Installation failed"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#115"
 msgid "Copy"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#116"
 msgid "Move"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#117"
 msgid "Delete"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#118"
 msgid "Rename"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#119"
 msgid "New folder"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#120"
 msgid "Confirm file copy"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#121"
 msgid "Confirm file move"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#122"
 msgid "Confirm delete"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#123"
 msgid "Copy these files?"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#124"
 msgid "Move these files?"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#125"
 msgid "Delete these files? - Deleting files cannot be undone!"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#126"
 msgid "Status"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSelect.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogSelect.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#127"
 msgid "Objects"
 msgstr ""
 
-#: xbmc/addons/guidialogaddonsettings.cpp
+#: src/addons/guidialogaddonsettings.cpp
 #: system/settings/settings.xml
 msgctxt "#128"
 msgid "General"
@@ -511,38 +511,38 @@ msgctxt "#131"
 msgid "Display"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#132"
 msgid "Albums"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#133"
 msgid "Artists"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#134"
 msgid "Songs"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
 msgctxt "#135"
 msgid "Genres"
 msgstr ""
@@ -551,7 +551,7 @@ msgctxt "#136"
 msgid "Playlists"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#137"
 msgid "Search"
 msgstr ""
@@ -600,12 +600,12 @@ msgctxt "#148"
 msgid "DHCP"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#149"
 msgid "MAC address"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#150"
 msgid "IP address"
 msgstr ""
@@ -638,7 +638,7 @@ msgctxt "#157"
 msgid "Video"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#158"
 msgid "Free memory"
 msgstr ""
@@ -671,19 +671,19 @@ msgctxt "#165"
 msgid "Disc present"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 #: system/settings/settings.xml
 msgctxt "#166"
 msgid "Skin"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#167"
 msgid "Cancel file operations"
 msgstr ""
 
-#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+#: src/settings/windows/GUIWindowSettingsCategory.cpp
 msgctxt "#168"
 msgid "%s- %s"
 msgstr ""
@@ -698,8 +698,8 @@ msgctxt "#170"
 msgid "Adjust display refresh rate to match video"
 msgstr ""
 
-#: xbmc/playlists/SmartPlayList.cpp
-#: xbmc/utils/SortUtils.cpp
+#: src/playlists/SmartPlayList.cpp
+#: src/utils/SortUtils.cpp
 msgctxt "#171"
 msgid "Sort title"
 msgstr ""
@@ -715,26 +715,26 @@ msgstr ""
 
 #empty string with id 174
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#175"
 msgid "Moods"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#176"
 msgid "Styles"
 msgstr ""
 
 #empty strings from id 177 to 178
 
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp
+#: src/media/MediaTypes.cpp
+#: src/music/karaoke/GUIDialogKaraokeSongSelector.cpp
 msgctxt "#179"
 msgid "Song"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#180"
 msgid "Duration"
 msgstr ""
@@ -743,13 +743,13 @@ msgctxt "#181"
 msgid "Select album"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#182"
 msgid "Tracks"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#183"
 msgid "Review"
 msgstr ""
@@ -762,8 +762,8 @@ msgctxt "#185"
 msgid "Searching album"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/dialogs/GUIDialogSelect.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/dialogs/GUIDialogSelect.cpp
 msgctxt "#186"
 msgid "OK"
 msgstr ""
@@ -772,7 +772,7 @@ msgctxt "#187"
 msgid "No albums found!"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#188"
 msgid "Select all"
 msgstr ""
@@ -801,7 +801,7 @@ msgctxt "#194"
 msgid "Searching..."
 msgstr ""
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#195"
 msgid "No info found!"
 msgstr ""
@@ -818,7 +818,7 @@ msgctxt "#198"
 msgid "Loading movie details"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 #: system/settings/settings.xml
 msgctxt "#199"
 msgid "Web interface"
@@ -830,19 +830,19 @@ msgstr ""
 
 #empty string with id 201
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#202"
 msgid "Tagline"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#203"
 msgid "Plot outline"
 msgstr ""
 
 #empty string with id 204
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#205"
 msgid "Votes"
 msgstr ""
@@ -851,12 +851,12 @@ msgctxt "#206"
 msgid "Cast"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#207"
 msgid "Plot"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogPlayEject.cpp
+#: src/dialogs/GUIDialogPlayEject.cpp
 #: system/settings/settings.xml
 msgctxt "#208"
 msgid "Play"
@@ -879,7 +879,7 @@ msgid "Calibrate user interface..."
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#214"
 msgid "Video calibration..."
 msgstr ""
@@ -888,41 +888,41 @@ msgctxt "#215"
 msgid "Soften"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#216"
 msgid "Zoom amount"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#217"
 msgid "Pixel ratio"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#218"
 msgid "DVD drive"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
-#: xbmc/dialogs/GUIDialogPlayEject.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogPlayEject.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#219"
 msgid "Please insert disc"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#220"
 msgid "Remote share"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#221"
 msgid "Network is not connected"
 msgstr ""
@@ -937,7 +937,7 @@ msgctxt "#224"
 msgid "Speed"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#225"
 msgid "Vertical Shift"
 msgstr ""
@@ -965,9 +965,9 @@ msgid "Video filters"
 msgstr ""
 
 #: system/peripherals.xml
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
+#: src/playlists/SmartPlaylist.cpp
 #: system/settings/settings.xml
 msgctxt "#231"
 msgid "None"
@@ -1044,8 +1044,8 @@ msgctxt "#248"
 msgid "Language"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#249"
 msgid "Music"
 msgstr ""
@@ -1081,7 +1081,7 @@ msgctxt "#256"
 msgid "Fetching CD information"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#257"
 msgid "Error"
 msgstr ""
@@ -1140,7 +1140,7 @@ msgctxt "#270"
 msgid "Sort by: Album"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#271"
 msgid "Top 100"
 msgstr ""
@@ -1189,7 +1189,7 @@ msgctxt "#282"
 msgid "Found %i items"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#283"
 msgid "Search results"
 msgstr ""
@@ -1226,8 +1226,8 @@ msgctxt "#290"
 msgid "Dynamic range compression"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#291"
 msgid "Video"
 msgstr ""
@@ -1281,7 +1281,7 @@ msgid "Language"
 msgstr ""
 
 #: system/peripherals.xml
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 #: system/settings/settings.xml
 msgctxt "#305"
 msgid "Enabled"
@@ -1429,12 +1429,12 @@ msgctxt "#340"
 msgid "Various artists"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#341"
 msgid "Play disc"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#342"
 msgid "Movies"
 msgstr ""
@@ -1443,9 +1443,9 @@ msgctxt "#343"
 msgid "Adjust framerate"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#344"
 msgid "Actors"
 msgstr ""
@@ -1474,7 +1474,7 @@ msgctxt "#349"
 msgid "TrueHD capable receiver"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#350"
 msgid "Programs"
 msgstr ""
@@ -1515,7 +1515,7 @@ msgctxt "#358"
 msgid "All albums"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#359"
 msgid "Recently added albums"
 msgstr ""
@@ -1558,9 +1558,9 @@ msgctxt "#368"
 msgid "IMDb"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
 msgctxt "#369"
 msgid "Title"
 msgstr ""
@@ -1713,37 +1713,37 @@ msgctxt "#399"
 msgid "Speed units"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#400"
 msgid "Weather"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#401"
 msgid "Temp"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#402"
 msgid "Feels like"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#403"
 msgid "UV index"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#404"
 msgid "Wind"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#405"
 msgid "Dew point"
 msgstr ""
 
-#: xbmc/windows/GUIWindowWeather.cpp
+#: src/windows/GUIWindowWeather.cpp
 msgctxt "#406"
 msgid "Humidity"
 msgstr ""
@@ -1770,7 +1770,7 @@ msgctxt "#413"
 msgid "Manual"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#414"
 msgid "No review for this album"
 msgstr ""
@@ -1779,7 +1779,7 @@ msgctxt "#415"
 msgid "Downloading thumbnail..."
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#416"
 msgid "Not available"
 msgstr ""
@@ -1835,7 +1835,7 @@ msgctxt "#428"
 msgid "Insert correct CD/DVD"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogPlayEject.cpp
+#: src/dialogs/GUIDialogPlayEject.cpp
 msgctxt "#429"
 msgid "Please insert the following disc:"
 msgstr ""
@@ -1981,17 +1981,17 @@ msgctxt "#463"
 msgid "Backlight"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#464"
 msgid "Brightness"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#465"
 msgid "Contrast"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#466"
 msgid "Gamma"
 msgstr ""
@@ -2026,7 +2026,7 @@ msgctxt "#476"
 msgid "Music & video"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#477"
 msgid "Unable to load playlist"
 msgstr ""
@@ -2167,16 +2167,16 @@ msgctxt "#514"
 msgid "Manual settings"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#515"
 msgid "Genre"
 msgstr ""
 
 #empty string with id 516
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#517"
 msgid "Recently played albums"
 msgstr ""
@@ -2191,17 +2191,17 @@ msgstr ""
 
 #empty string with id 520
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#521"
 msgid "Compilations"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#522"
 msgid "Remove source"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#523"
 msgid "Switch media"
 msgstr ""
@@ -2300,7 +2300,7 @@ msgctxt "#546"
 msgid "Passthrough output device"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#547"
 msgid "No biography for this artist"
 msgstr ""
@@ -2309,18 +2309,18 @@ msgctxt "#548"
 msgid "Downmix multichannel audio to stereo"
 msgstr ""
 
-#: /xbmc/xbmc/pvr/windows/GUIViewStatePVR.cpp
-#: /xbmc/xbmc/utils/SortUtils.cpp
+#: /src/pvr/windows/GUIViewStatePVR.cpp
+#: /src/utils/SortUtils.cpp
 msgctxt "#549"
 msgid "Number"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#550"
 msgid "Sort by: %s"
 msgstr ""
 
-#: xbmc/view/GUIViewState.cpp
+#: src/view/GUIViewState.cpp
 msgctxt "#551"
 msgid "Name"
 msgstr ""
@@ -2329,13 +2329,13 @@ msgctxt "#552"
 msgid "Date"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 msgctxt "#553"
 msgid "Size"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/BlurayDirectory.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#554"
 msgid "Track"
 msgstr ""
@@ -2344,30 +2344,30 @@ msgctxt "#555"
 msgid "Time"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#556"
 msgid "Title"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#557"
 msgid "Artist"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#558"
 msgid "Album"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#559"
 msgid "Playlist"
 msgstr ""
@@ -2376,29 +2376,29 @@ msgctxt "#560"
 msgid "ID"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#561"
 msgid "File"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#562"
 msgid "Year"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#563"
 msgid "Rating"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#564"
 msgid "Type"
 msgstr ""
@@ -2407,57 +2407,57 @@ msgctxt "#565"
 msgid "Usage"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#566"
 msgid "Album artist"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#567"
 msgid "Play count"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#568"
 msgid "Last played"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#569"
 msgid "Comment"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#570"
 msgid "Date added"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#571"
 msgid "Default"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#572"
 msgid "Studio"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#573"
 msgid "Path"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#574"
 msgid "Country"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#575"
 msgid "In progress"
 msgstr ""
@@ -2512,7 +2512,7 @@ msgctxt "#589"
 msgid "Party mode"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#590"
 msgid "Random"
 msgstr ""
@@ -2604,7 +2604,7 @@ msgctxt "#613"
 msgid "Sample rate"
 msgstr ""
 
-#: xbmc/playlists/SmartPlayList.cpp
+#: src/playlists/SmartPlayList.cpp
 msgctxt "#614"
 msgid "Virtual folder"
 msgstr ""
@@ -2650,40 +2650,40 @@ msgid "View mode"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#630"
 msgid "Normal"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#631"
 msgid "Zoom"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#632"
 msgid "Stretch 4:3"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#633"
 msgid "Wide Zoom"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#634"
 msgid "Stretch 16:9"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#635"
 msgid "Original Size"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#636"
 msgid "Custom"
 msgstr ""
@@ -2756,8 +2756,8 @@ msgctxt "#651"
 msgid "Browse for library"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#652"
 msgid "Years"
 msgstr ""
@@ -2778,7 +2778,7 @@ msgctxt "#656"
 msgid "Browse for playlist"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
 msgctxt "#657"
 msgid "Browse for folder"
 msgstr ""
@@ -2787,7 +2787,7 @@ msgctxt "#658"
 msgid "Song information"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#659"
 msgid "Non-linear stretch"
 msgstr ""
@@ -2832,57 +2832,57 @@ msgctxt "#668"
 msgid "Specify component-specific logging..."
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#669"
 msgid "Verbose logging for SMB library"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#670"
 msgid "Verbose logging for CURL library (http, dav)"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#671"
 msgid "Verbose logging for CMYTH library"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#672"
 msgid "Verbose logging for FFMPEG libraries"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#673"
 msgid "Verbose logging for RTMP library"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#674"
 msgid "Verbose logging for DBUS calls"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#675"
 msgid "Verbose logging for JSON-RPC requests"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#676"
 msgid "Verbose logging for AUDIO component"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#677"
 msgid "Verbose logging for AirTunes library"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#678"
 msgid "Verbose logging for UPnP components"
 msgstr ""
 
-#: xbmc/settings/AdvancedSettings.cpp
+#: src/settings/AdvancedSettings.cpp
 msgctxt "#679"
 msgid "Verbose logging for CEC library"
 msgstr ""
@@ -3066,7 +3066,7 @@ msgctxt "#743"
 msgid "Yellow"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#744"
 msgid "Files"
 msgstr ""
@@ -3091,13 +3091,13 @@ msgctxt "#749"
 msgid "Mirror image"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#750"
 msgid "Are you sure?"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#751"
 msgid "Removing source"
 msgstr ""
@@ -3246,7 +3246,7 @@ msgctxt "#788"
 msgid "Network interface disabled successfully."
 msgstr ""
 
-#: xbmc/network/GUIDialogAccessPoints.cpp
+#: src/network/GUIDialogAccessPoints.cpp
 msgctxt "#789"
 msgid "Wireless network name (ESSID)"
 msgstr ""
@@ -3299,18 +3299,18 @@ msgctxt "#799"
 msgid "Library Update"
 msgstr ""
 
-#: xbmc/music/windows/GUIWindowMusicBase.cpp
+#: src/music/windows/GUIWindowMusicBase.cpp
 msgctxt "#800"
 msgid "Music library needs to rescan tags from files."
 msgstr ""
 
-#: xbmc/music/windows/GUIWindowMusicBase.cpp
+#: src/music/windows/GUIWindowMusicBase.cpp
 msgctxt "#801"
 msgid "Would you like to scan now?"
 msgstr ""
 
 #. Label of progess bar which shows the available/total space of pvr backend
-#: xbmc/pvr/PVRGUIInfo.cpp
+#: src/pvr/PVRGUIInfo.cpp
 msgctxt "#802"
 msgid "%s of %s available"
 msgstr ""
@@ -3331,17 +3331,17 @@ msgstr ""
 
 #empty strings from id 853 to 996
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#997"
 msgid "Add Pictures..."
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#998"
 msgid "Add Music..."
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#999"
 msgid "Add Videos..."
 msgstr ""
@@ -3351,7 +3351,7 @@ msgctxt "#1000"
 msgid "Preview"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1001"
 msgid "Unable to connect"
 msgstr ""
@@ -3360,12 +3360,12 @@ msgctxt "#1002"
 msgid "Kodi was unable to connect to the network location."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1003"
 msgid "This could be due to the network not being connected."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1004"
 msgid "Would you like to add it anyway?"
 msgstr ""
@@ -3384,22 +3384,22 @@ msgctxt "#1008"
 msgid "Protocol"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1009"
 msgid "Server address"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1010"
 msgid "Server name"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1011"
 msgid "Remote path"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1012"
 msgid "Shared folder"
 msgstr ""
@@ -3412,47 +3412,47 @@ msgctxt "#1014"
 msgid "Username"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1015"
 msgid "Browse for network server"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1016"
 msgid "Enter the network address of the server"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1017"
 msgid "Enter the path on the server"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1018"
 msgid "Enter the port number"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#1019"
 msgid "Enter the username"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1020"
 msgid "Add %s source"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1021"
 msgid "Enter the paths or browse for the media locations."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1022"
 msgid "Enter a name for this media Source."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#1023"
 msgid "Browse for new share"
 msgstr ""
@@ -3461,24 +3461,24 @@ msgctxt "#1024"
 msgid "Browse"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1025"
 msgid "Could not retrieve directory information."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#1026"
 msgid "Add source"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#1027"
 msgid "Edit source"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1028"
 msgid "Edit %s source"
 msgstr ""
@@ -3487,9 +3487,9 @@ msgctxt "#1029"
 msgid "Enter the new label"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/music/dialogs/GUIDialogSongInfo.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogSongInfo.cpp
 msgctxt "#1030"
 msgid "Browse for image"
 msgstr ""
@@ -3498,7 +3498,7 @@ msgctxt "#1031"
 msgid "Browse for image folder"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#1032"
 msgid "Add network location..."
 msgstr ""
@@ -3519,22 +3519,22 @@ msgctxt "#1036"
 msgid "Favourites"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#1037"
 msgid "Video Add-ons"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#1038"
 msgid "Music Add-ons"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#1039"
 msgid "Picture Add-ons"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#1040"
 msgid "Loading directory"
 msgstr ""
@@ -3547,7 +3547,7 @@ msgctxt "#1042"
 msgid "Retrieved %i of %i items"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#1043"
 msgid "Program Add-ons"
 msgstr ""
@@ -3556,7 +3556,7 @@ msgctxt "#1044"
 msgid "Set plug-in thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#1045"
 msgid "Add-on settings"
 msgstr ""
@@ -3565,7 +3565,7 @@ msgctxt "#1046"
 msgid "Access points"
 msgstr ""
 
-#: xbmc/network/GUIDialogAccessPoints.cpp
+#: src/network/GUIDialogAccessPoints.cpp
 msgctxt "#1047"
 msgid "Other..."
 msgstr ""
@@ -3579,7 +3579,7 @@ msgctxt "#1049"
 msgid "Script settings"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#1050"
 msgid "Singles"
 msgstr ""
@@ -3623,7 +3623,7 @@ msgstr ""
 #empty strings from id 1186 to 1199
 #strings 1186 to 1189 reserved for more proxy types
 
-#: xbmc/settings/win32.xml
+#: src/settings/win32.xml
 msgctxt "#1200"
 msgid "SMB client"
 msgstr ""
@@ -3668,7 +3668,7 @@ msgctxt "#1212"
 msgid "Video"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1213"
 msgid "Pictures"
 msgstr ""
@@ -3802,7 +3802,7 @@ msgid "AirTunes"
 msgstr ""
 
 #. Filter movies/tvshows/music/episodes/artists/musicvideos/albums/songs
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
 msgctxt "#1275"
 msgid "Filter %s"
 msgstr ""
@@ -4211,12 +4211,12 @@ msgstr ""
 
 #empty strings from id 2051 to 2079
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#2080"
 msgid "Empty list"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
+#: src/windows/GUIMediaWindow.cpp
 msgctxt "#2081"
 msgid "Went back to parent list because the active list has been emptied"
 msgstr ""
@@ -4233,48 +4233,48 @@ msgstr ""
 
 #empty strings from id 2102 to 9999
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10000"
 msgid "Home"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10001"
 msgid "Programs"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10002"
 msgid "Pictures"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10003"
 msgid "File manager"
 msgstr ""
 
-#: xbmc/addons/GUIDialogAddonSettings.cpp
-#: xbmc/guilib/WindowIDs.h
+#: src/addons/GUIDialogAddonSettings.cpp
+#: src/guilib/WindowIDs.h
 msgctxt "#10004"
 msgid "Settings"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10005"
 msgid "Music"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10006"
 msgid "Videos"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10007"
 msgid "System information"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10008"
 msgid "Settings - General"
 msgstr ""
@@ -4287,52 +4287,52 @@ msgctxt "#10010"
 msgid "Settings - Appearance - GUI Calibration"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10011"
 msgid "Settings - Videos - Screen Calibration"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10012"
 msgid "Settings - Pictures"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10013"
 msgid "Settings - Programs"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10014"
 msgid "Settings - Weather"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10015"
 msgid "Settings - Music"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10016"
 msgid "Settings - System"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10017"
 msgid "Settings - Videos"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10018"
 msgid "Settings - Network"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10019"
 msgid "Settings - Appearance"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10020"
 msgid "Scripts"
 msgstr ""
@@ -4343,26 +4343,26 @@ msgstr ""
 
 #empty strings from id 10022 to 10024
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10025"
 msgid "Videos"
 msgstr ""
 
 #empty strings from id 10026 to 10027
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10028"
 msgid "Videos/Playlist"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10029"
 msgid "Login screen"
 msgstr ""
 
 #empty strings from id 10030 to 10033
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10034"
 msgid "Settings - Profiles"
 msgstr ""
@@ -4387,17 +4387,17 @@ msgctxt "#10039"
 msgid "Expert"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10040"
 msgid "Add-on browser"
 msgstr ""
 
-#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+#: src/settings/windows/GUIWindowSettingsCategory.cpp
 msgctxt "#10041"
 msgid "Reset above settings to default"
 msgstr ""
 
-#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+#: src/settings/windows/GUIWindowSettingsCategory.cpp
 msgctxt "#10042"
 msgid "Are you sure you want to reset the settings in this category?"
 msgstr ""
@@ -4414,99 +4414,99 @@ msgctxt "#10045"
 msgid "Resets all the visible settings to their default values."
 msgstr ""
 
-#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+#: src/settings/windows/GUIWindowSettingsCategory.cpp
 msgctxt "#10046"
 msgid "No categories available"
 msgstr ""
 
-#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp
+#: src/settings/windows/GUIWindowSettingsCategory.cpp
 msgctxt "#10047"
 msgid "Try changing the setting level to see additional categories and settings."
 msgstr ""
 
 #empty strings from id 10048 to 10099
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10100"
 msgid "Yes/No dialogue"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10101"
 msgid "Progress dialogue"
 msgstr ""
 
 #empty strings from id 10102 to 10125
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10126"
 msgid "File browser"
 msgstr ""
 
 #empty string with id 10127
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10128"
 msgid "Network setup"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10129"
 msgid "Media source"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10130"
 msgid "Profile settings"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10131"
 msgid "Lock settings"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10132"
 msgid "Content settings"
 msgstr ""
 
 #empty string with id 10133
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10134"
 msgid "Favourites"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10135"
 msgid "Songs/Info"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10136"
 msgid "Smart playlist editor"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10137"
 msgid "Smart playlist rule editor"
 msgstr ""
 
 #empty string with id 10138
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10139"
 msgid "Pictures/Info"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10140"
 msgid "Add-on settings"
 msgstr ""
 
 #empty strings from id 10141 to 10145
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10146"
 msgid "Add-ons/Info"
 msgstr ""
@@ -4535,32 +4535,32 @@ msgstr ""
 
 #empty strings from id 10215 to 10499
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10500"
 msgid "Music/Playlist"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10501"
 msgid "Music/Files"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10502"
 msgid "Music/Library"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#10503"
 msgid "Playlist editor"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
 msgctxt "#10504"
 msgid "Top 100 songs"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
 msgctxt "#10505"
 msgid "Top 100 albums"
 msgstr ""
@@ -4615,22 +4615,22 @@ msgstr ""
 
 #empty strings from id 10525 to 11999
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12000"
 msgid "Select dialogue"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12001"
 msgid "Music/Info"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12002"
 msgid "Dialogue OK"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12003"
 msgid "Videos/Info"
 msgstr ""
@@ -4639,25 +4639,25 @@ msgctxt "#12004"
 msgid "Scripts/Info"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12005"
 msgid "Fullscreen video"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12006"
 msgid "Audio visualisation"
 msgstr ""
 
 #empty string with id 12007
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12008"
 msgid "File stacking dialogue"
 msgstr ""
 
 #. Does not match window ID description
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12009"
 msgid "Rebuild index..."
 msgstr ""
@@ -4759,7 +4759,7 @@ msgctxt "#12321"
 msgid "Ok"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
 msgctxt "#12322"
 msgid "*"
 msgstr ""
@@ -4771,7 +4771,7 @@ msgctxt "#12325"
 msgid "Locked! Enter code..."
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#12326"
 msgid "Enter password"
 msgstr ""
@@ -4791,17 +4791,17 @@ msgctxt "#12329"
 msgid "or press C to cancel"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
 msgctxt "#12330"
 msgid "Enter gamepad button combo and"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
 msgctxt "#12331"
 msgid "press OK, or Back to cancel"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#12332"
 msgid "Set lock"
 msgstr ""
@@ -4810,13 +4810,13 @@ msgctxt "#12333"
 msgid "Unlock"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#12334"
 msgid "Reset lock"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#12335"
 msgid "Remove lock"
 msgstr ""
@@ -4838,30 +4838,30 @@ msgctxt "#12339"
 msgid "Full-text password"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12340"
 msgid "Enter new password"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12341"
 msgid "Re-Enter new password"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12342"
 msgid "Incorrect password,"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12343"
 msgid "retries left "
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12344"
 msgid "Passwords entered did not match."
 msgstr ""
@@ -4886,51 +4886,51 @@ msgctxt "#12348"
 msgid "Item locked"
 msgstr ""
 
-#: xbmc/utils/EdenVideoArtUpdater.cpp
+#: src/utils/EdenVideoArtUpdater.cpp
 msgctxt "#12349"
 msgid "Updating video library art"
 msgstr ""
 
-#: xbmc/utils/EdenVideoArtUpdater.cpp
+#: src/utils/EdenVideoArtUpdater.cpp
 msgctxt "#12350"
 msgid "Processing %s"
 msgstr ""
 
-#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: src/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#12351"
 msgid "The art cache in your video library needs updating."
 msgstr ""
 
-#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: src/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#12352"
 msgid "No downloading is needed."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#12353"
 msgid "Reactivate lock"
 msgstr ""
 
-#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: src/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#12354"
 msgid "Would you like to update it now?"
 msgstr ""
 
 #empty string with id 12355
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#12356"
 msgid "Change lock"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12357"
 msgid "Source lock"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogGamepad.cpp
-#: xbmc/dialogs/GUIDialogNumeric.cpp
+#: src/dialogs/GUIDialogGamepad.cpp
+#: src/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12358"
 msgid "Password entry was blank. Try again."
 msgstr ""
@@ -5017,7 +5017,7 @@ msgstr ""
 
 #empty strings from id 12387 to 12389
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#12390"
 msgid "System uptime"
 msgstr ""
@@ -5040,49 +5040,49 @@ msgctxt "#12393"
 msgid "Days"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#12394"
 msgid "Total uptime"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#12395"
 msgid "Battery level"
 msgstr ""
 
 #. Used on the button to toggle add-on update mode in the Add-on Manager.
-#: xbmc/addons/GUIWindowAddonBrowser.cpp
+#: src/addons/GUIWindowAddonBrowser.cpp
 msgctxt "#12396"
 msgid "Auto updates: On"
 msgstr ""
 
 #. Used on the button to toggle add-on update mode in the Add-on Manager.
-#: xbmc/addons/GUIWindowAddonBrowser.cpp
+#: src/addons/GUIWindowAddonBrowser.cpp
 msgctxt "#12397"
 msgid "Auto updates: Notify"
 msgstr ""
 
 #. Used on the button to toggle add-on update mode in the Add-on Manager.
-#: xbmc/addons/GUIWindowAddonBrowser.cpp
+#: src/addons/GUIWindowAddonBrowser.cpp
 msgctxt "#12398"
 msgid "Auto updates: Never"
 msgstr ""
 
 #empty strings from id 12399 to 12599
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12600"
 msgid "Weather"
 msgstr ""
 
 #empty strings from id 12601 to 12899
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12900"
 msgid "Screensaver"
 msgstr ""
 
-#: xbmc/guilib/WindowIDs.h
+#: src/guilib/WindowIDs.h
 msgctxt "#12901"
 msgid "Fullscreen OSD"
 msgstr ""
@@ -5217,52 +5217,52 @@ msgctxt "#13026"
 msgid "Try to wake remote servers on access"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13027"
 msgid "Wake on Lan (%s)"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13028"
 msgid "Waiting for network to connect..."
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13029"
 msgid "Failed to execute Wake on Lan!"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13030"
 msgid "Waiting for server to wake up..."
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13031"
 msgid "Extended wait for server to wake up..."
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13032"
 msgid "Waiting for services to launch..."
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13033"
 msgid "MAC Discovery"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13034"
 msgid "Updated for %s"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13035"
 msgid "Found for %s"
 msgstr ""
 
-#: xbmc/network/WakeOnAccess.cpp
+#: src/network/WakeOnAccess.cpp
 msgctxt "#13036"
 msgid "Failed for %s"
 msgstr ""
@@ -5436,17 +5436,17 @@ msgstr ""
 
 #empty strings from id 13148 to 13158
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13159"
 msgid "Subnet mask"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13160"
 msgid "Gateway"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13161"
 msgid "Primary DNS"
 msgstr ""
@@ -5488,7 +5488,7 @@ msgstr ""
 #: skin.confluence
 #: skin.retouched
 #: xbmc\profiles\ProfilesManager.cpp
-#: xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+#: src/profiles/dialogs/GUIDialogProfileSettings.cpp
 msgctxt "#13200"
 msgid "Profiles"
 msgstr ""
@@ -5505,7 +5505,7 @@ msgctxt "#13204"
 msgid "Last loaded profile:"
 msgstr ""
 
-#: xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp
+#: src/music/karaoke/GUIDialogKaraokeSongSelector.cpp
 msgctxt "#13205"
 msgid "Unknown"
 msgstr ""
@@ -5574,7 +5574,7 @@ msgctxt "#13270"
 msgid "Hardware:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13271"
 msgid "CPU Usage:"
 msgstr ""
@@ -5615,12 +5615,12 @@ msgstr ""
 
 #empty string with id 13282
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13283"
 msgid "Operating system:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13284"
 msgid "CPU speed:"
 msgstr ""
@@ -5631,7 +5631,7 @@ msgctxt "#13286"
 msgid "Video encoder:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13287"
 msgid "Screen resolution:"
 msgstr ""
@@ -5648,7 +5648,7 @@ msgctxt "#13294"
 msgid "DVD region:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13295"
 msgid "Internet:"
 msgstr ""
@@ -5803,12 +5803,12 @@ msgctxt "#13331"
 msgid "Error: Out of memory"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
 msgctxt "#13332"
 msgid "Move up"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
 msgctxt "#13333"
 msgid "Move down"
 msgstr ""
@@ -5817,7 +5817,7 @@ msgctxt "#13334"
 msgid "Edit label"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#13335"
 msgid "Make default"
 msgstr ""
@@ -5984,8 +5984,8 @@ msgctxt "#13390"
 msgid "There are no settings available\nfor this visualisation"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/dialogs/GUIDialogPlayEject.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogPlayEject.cpp
 msgctxt "#13391"
 msgid "Eject/Load"
 msgstr ""
@@ -5995,12 +5995,12 @@ msgctxt "#13392"
 msgid "Use visualisation if playing audio"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#13393"
 msgid "Calculate size"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#13394"
 msgid "Calculating folder size"
 msgstr ""
@@ -6031,8 +6031,8 @@ msgctxt "#13400"
 msgid "Crossfade between songs on the same album"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
 msgctxt "#13401"
 msgid "Browse for %s"
 msgstr ""
@@ -6041,7 +6041,7 @@ msgctxt "#13402"
 msgid "Show track position"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#13403"
 msgid "Clear default"
 msgstr ""
@@ -6067,7 +6067,7 @@ msgctxt "#13408"
 msgid "(IMDb user rating)"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#13409"
 msgid "Top 250"
 msgstr ""
@@ -6084,7 +6084,7 @@ msgctxt "#13412"
 msgid "Play from here"
 msgstr ""
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#13413"
 msgid "Downloading"
 msgstr ""
@@ -6100,28 +6100,28 @@ msgid "Render method"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13416"
 msgid "Auto detect"
 msgstr ""
 
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13417"
 msgid "Basic shaders (ARB)"
 msgstr ""
 
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13418"
 msgid "Advanced shaders (GLSL)"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13419"
 msgid "Software"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
 msgctxt "#13420"
 msgid "Remove safely"
 msgstr ""
@@ -6174,7 +6174,7 @@ msgid "Allow hardware acceleration (OpenMax)"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#13431"
 msgid "Pixel Shaders"
 msgstr ""
@@ -6190,7 +6190,7 @@ msgid "Play the next video automatically"
 msgstr ""
 
 #. If autoplay next video is set true
-#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: src/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#13434"
 msgid "Play only this"
 msgstr ""
@@ -6200,7 +6200,7 @@ msgctxt "#13435"
 msgid "Enable HQ Scalers for scalings above"
 msgstr ""
 
-#: xbmc/settings/GUISettings.cpp
+#: src/settings/GUISettings.cpp
 msgctxt "#13436"
 msgid "Allow hardware acceleration (libstagefright)"
 msgstr ""
@@ -6381,32 +6381,32 @@ msgctxt "#13510"
 msgid "Sync playback to display"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13511"
 msgid "Choose art"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13512"
 msgid "Current art"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13513"
 msgid "Remote art"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13514"
 msgid "Local art"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13515"
 msgid "No art"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: src/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#13516"
 msgid "Add art"
 msgstr ""
@@ -6687,7 +6687,7 @@ msgid "%i ms"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#14047"
 msgid "%i %%"
 msgstr ""
@@ -6719,7 +6719,7 @@ msgctxt "#14053"
 msgid "GUI filters"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
+#: src/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
 msgctxt "#14054"
 msgid "%2.1f dB"
 msgstr ""
@@ -6805,14 +6805,14 @@ msgctxt "#14075"
 msgid "Use daylight saving time"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#14076"
 msgid "Add to favourites"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#14077"
 msgid "Remove from favourites"
 msgstr ""
@@ -6922,7 +6922,7 @@ msgctxt "#14099"
 msgid "Eject disc when CD ripping is complete"
 msgstr ""
 
-#: xbmc/music/windows/GUIWindowMusicSongs.cpp
+#: src/music/windows/GUIWindowMusicSongs.cpp
 msgctxt "#14100"
 msgid "Stop ripping CD"
 msgstr ""
@@ -6953,23 +6953,23 @@ msgstr ""
 
 #empty strings from id 14105 to 15011
 
-#: xbmc/video/VideoDatabase.cpp
+#: src/video/VideoDatabase.cpp
 msgctxt "#15012"
 msgid "Unavailable source"
 msgstr ""
 
-#: xbmc/video/VideoDatabase.cpp
+#: src/video/VideoDatabase.cpp
 msgctxt "#15013"
 msgid "What would you like to do with media items from %s"
 msgstr ""
 
-#: xbmc/video/VideoDatabase.cpp
+#: src/video/VideoDatabase.cpp
 msgctxt "#15014"
 msgid "Keep"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
-#: xbmc/video/VideoDatabase.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
+#: src/video/VideoDatabase.cpp
 msgctxt "#15015"
 msgid "Remove"
 msgstr ""
@@ -7000,28 +7000,28 @@ msgctxt "#15101"
 msgid "Database"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeCompilations.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyAdded.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyPlayed.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeCompilations.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyAdded.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyPlayed.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
 msgctxt "#15102"
 msgid "* All albums"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
 msgctxt "#15103"
 msgid "* All artists"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
 msgctxt "#15104"
 msgid "* All songs"
 msgstr ""
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
+#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
 msgctxt "#15105"
 msgid "* All genres"
 msgstr ""
@@ -7063,19 +7063,19 @@ msgstr ""
 
 #empty strings from id 15201 to 15206
 
-#: xbmc/GUIInfoManager.cpp
+#: src/GUIInfoManager.cpp
 msgctxt "#15207"
 msgid "Connected"
 msgstr ""
 
-#: xbmc/GUIInfoManager.cpp
+#: src/GUIInfoManager.cpp
 msgctxt "#15208"
 msgid "Not connected"
 msgstr ""
 
 #empty strings from id 15209 to 15212
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#15213"
 msgid "Play using..."
 msgstr ""
@@ -7094,14 +7094,14 @@ msgstr ""
 
 #empty strings from id 15217 to 15299
 
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#15300"
 msgid "Path not found or invalid"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#15301"
 msgid "Could not connect to network server"
 msgstr ""
@@ -7110,8 +7110,8 @@ msgctxt "#15302"
 msgid "No servers found"
 msgstr ""
 
-#: xbmc/windows/GUIMediaWindow.cpp
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIMediaWindow.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#15303"
 msgid "Workgroup not found"
 msgstr ""
@@ -7149,7 +7149,7 @@ msgstr ""
 
 #empty strings from id 16005 to 16007
 
-#: xbmc/dialogs/GUIDialogFavourites.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
 msgctxt "#16008"
 msgid "Enter new title"
 msgstr ""
@@ -7166,17 +7166,17 @@ msgctxt "#16011"
 msgid "Enter the album name"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#16012"
 msgid "Enter the playlist name"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#16013"
 msgid "Enter new filename"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16014"
 msgid "Enter folder name"
 msgstr ""
@@ -7189,40 +7189,40 @@ msgctxt "#16016"
 msgid "Available options: %A, %T, %N, %B, %D, %G, %Y, %F, %S"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#16017"
 msgid "Enter search string"
 msgstr ""
 
 #: system/settings/settings.xml
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#16018"
 msgid "None"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16019"
 msgid "Auto select"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16020"
 msgid "De-interlace"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16021"
 msgid "Bob"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16022"
 msgid "Bob (inverted)"
 msgstr ""
 
 #empty string with id 16023
 
-#: xbmc/dialogs/GUIDialogProgress.cpp
+#: src/dialogs/GUIDialogProgress.cpp
 msgctxt "#16024"
 msgid "Cancelling..."
 msgstr ""
@@ -7267,12 +7267,12 @@ msgctxt "#16034"
 msgid "Could not get songs from database."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#16035"
 msgid "Party mode playlist"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16036"
 msgid "De-interlace (Half)"
 msgstr ""
@@ -7281,22 +7281,22 @@ msgctxt "#16037"
 msgid "Deinterlace video"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16038"
 msgid "Deinterlace method"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16039"
 msgid "Off"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16040"
 msgid "Auto"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16041"
 msgid "On"
 msgstr ""
@@ -7337,189 +7337,189 @@ msgstr ""
 
 #empty strings from id 16108 to 16199
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16200"
 msgid "Operation was aborted"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16201"
 msgid "Copy failed"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16202"
 msgid "Failed to copy at least one file"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16203"
 msgid "Move failed"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16204"
 msgid "Failed to move at least one file"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16205"
 msgid "Delete failed"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#16206"
 msgid "Failed to delete at least one file"
 msgstr ""
 
 #empty strings from id 16207 to 16299
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16300"
 msgid "Video scaling method"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16301"
 msgid "Nearest neighbour"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16302"
 msgid "Bilinear"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16303"
 msgid "Bicubic"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16304"
 msgid "Lanczos2"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16305"
 msgid "Lanczos3"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16306"
 msgid "Sinc8"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16307"
 msgid "Bicubic (software)"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16308"
 msgid "Lanczos (software)"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16309"
 msgid "Sinc (software)"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16310"
 msgid "Temporal"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16311"
 msgid "Temporal/Spatial"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16312"
 msgid "(VDPAU)Noise Reduction"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16313"
 msgid "(VDPAU)Sharpness"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16314"
 msgid "Inverse Telecine"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16315"
 msgid "Lanczos3 optimised"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16316"
 msgid "Auto"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16317"
 msgid "Temporal (Half)"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16318"
 msgid "Temporal/Spatial (Half)"
 msgstr ""
 
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#16319"
 msgid "DXVA"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16320"
 msgid "DXVA Bob"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16321"
 msgid "DXVA Best"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16322"
 msgid "Spline36"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16323"
 msgid "Spline36 optimised"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16324"
 msgid "Software Blend"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16325"
 msgid "VDPAU - Bob"
 msgstr ""
 
-#: xbmc/cores/VideoRenderers/BaseRenderer.cpp
+#: src/cores/VideoRenderers/BaseRenderer.cpp
 msgctxt "#16326"
 msgid "DXVA-HD"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16327"
 msgid "VAAPI Bob"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16328"
 msgid "VAAPI Motion Adaptive"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16329"
 msgid "VAAPI Motion Compensated"
 msgstr ""
@@ -7550,7 +7550,7 @@ msgstr ""
 
 #empty strings from id 16334 to 16399
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#16400"
 msgid "Post-processing"
 msgstr ""
@@ -7594,15 +7594,15 @@ msgstr ""
 
 #. Label of the button / context menu entry to find similar programs in the PVR EPG data
 #: skin.confluence
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/windows/GUIWindowPVRGuide.cpp
-#: xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
-#: xbmc/pvr/windows/GUIWindowPVRTimers.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/windows/GUIWindowPVRGuide.cpp
+#: src/pvr/windows/GUIWindowPVRRecordings.cpp
+#: src/pvr/windows/GUIWindowPVRTimers.cpp
 msgctxt "#19003"
 msgid "Find similar"
 msgstr ""
 
-#: xbmc/epg/EpgContainer.cpp
+#: src/epg/EpgContainer.cpp
 msgctxt "#19004"
 msgid "Importing EPG from clients"
 msgstr ""
@@ -7635,7 +7635,7 @@ msgctxt "#19011"
 msgid "UNC"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19012"
 msgid "PVR Backend"
 msgstr ""
@@ -7656,7 +7656,7 @@ msgctxt "#19016"
 msgid "PVR Backend %i - %s"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#19017"
 msgid "Recordings"
 msgstr ""
@@ -7667,7 +7667,7 @@ msgctxt "#19018"
 msgid "Folder with channel icons"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 #: skin.confluence
 msgctxt "#19019"
 msgid "Channels"
@@ -7693,7 +7693,7 @@ msgctxt "#19024"
 msgid "Radio channels"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19025"
 msgid "Upcoming recordings"
 msgstr ""
@@ -7817,7 +7817,7 @@ msgctxt "#19054"
 msgid "Hide channel"
 msgstr ""
 
-#: xbmc/epg/EpgInfoTag.cpp
+#: src/epg/EpgInfoTag.cpp
 msgctxt "#19055"
 msgid "No information available"
 msgstr ""
@@ -7861,8 +7861,8 @@ msgstr ""
 #empty string with id 19065
 
 #. Name of a shortcut to a custom folder for channel icons
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp
 msgctxt "#19066"
 msgid "Channel icons"
 msgstr ""
@@ -7998,17 +7998,17 @@ msgctxt "#19098"
 msgid "Warning"
 msgstr ""
 
-#: xbmc/pvr/PVRGUIInfo.cpp
+#: src/pvr/PVRGUIInfo.cpp
 msgctxt "#19099"
 msgid "Service"
 msgstr ""
 
-#: xbmc/pvr/PVRGUIInfo.cpp
+#: src/pvr/PVRGUIInfo.cpp
 msgctxt "#19100"
 msgid "Mux"
 msgstr ""
 
-#: xbmc/pvr/PVRGUIInfo.cpp
+#: src/pvr/PVRGUIInfo.cpp
 msgctxt "#19101"
 msgid "Provider"
 msgstr ""
@@ -8018,7 +8018,7 @@ msgid "Please switch to another channel."
 msgstr ""
 
 #. Title of numeric dialog for choosing a channel by entering a number
-#: xbmc/pvr/windows/GUIWindowPVRCommon.cpp
+#: src/pvr/windows/GUIWindowPVRCommon.cpp
 msgctxt "#19103"
 msgid "Go to channel"
 msgstr ""
@@ -8061,17 +8061,17 @@ msgctxt "#19113"
 msgid "Delete all recordings in this folder?"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19114"
 msgid "Version"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19115"
 msgid "Address"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19116"
 msgid "Disksize"
 msgstr ""
@@ -8089,7 +8089,7 @@ msgctxt "#19119"
 msgid "On which server do you want to search?"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19120"
 msgid "Client number"
 msgstr ""
@@ -8170,7 +8170,7 @@ msgctxt "#19139"
 msgid "Name of the new group"
 msgstr ""
 
-#: xbmc/pvr/windows/GUIWindowPVRSearch.cpp
+#: src/pvr/windows/GUIWindowPVRSearch.cpp
 msgctxt "#19140"
 msgid "Search..."
 msgstr ""
@@ -8261,7 +8261,7 @@ msgctxt "#19162"
 msgid "Recording active"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19163"
 msgid "Recordings"
 msgstr ""
@@ -8274,7 +8274,7 @@ msgctxt "#19165"
 msgid "Switch"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#19166"
 msgid "PVR information"
 msgstr ""
@@ -8411,12 +8411,12 @@ msgctxt "#19196"
 msgid "PVR client specific actions"
 msgstr ""
 
-#: xbmc/addons/addoncallbackspvr.cpp
+#: src/addons/addoncallbackspvr.cpp
 msgctxt "#19197"
 msgid "Recording started on: %s"
 msgstr ""
 
-#: xbmc/addons/addoncallbackspvr.cpp
+#: src/addons/addoncallbackspvr.cpp
 msgctxt "#19198"
 msgid "Recording finished on: %s"
 msgstr ""
@@ -8636,7 +8636,7 @@ msgctxt "#19249"
 msgid "Filter channels"
 msgstr ""
 
-#: xbmc/epg/EpgContainer.cpp
+#: src/epg/EpgContainer.cpp
 msgctxt "#19250"
 msgid "Loading EPG from database"
 msgstr ""
@@ -8704,7 +8704,7 @@ msgctxt "#19265"
 msgid "The entered PIN number was incorrect."
 msgstr ""
 
-#: xbmc/epg/EpgInfoTag.cpp
+#: src/epg/EpgInfoTag.cpp
 msgctxt "#19266"
 msgid "Parental locked"
 msgstr ""
@@ -8745,22 +8745,22 @@ msgctxt "#19274"
 msgid "Please visit http://kodi.wiki/view/PVR to learn more."
 msgstr ""
 
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
+#: src/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19275"
 msgid "Conflict warning"
 msgstr ""
 
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
+#: src/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19276"
 msgid "Conflict error"
 msgstr ""
 
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
+#: src/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19277"
 msgid "Recording conflict"
 msgstr ""
 
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
+#: src/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19278"
 msgid "Recording error"
 msgstr ""
@@ -8781,41 +8781,41 @@ msgid "Confirm channel switches by pressing OK"
 msgstr ""
 
 #. Label for a select option or list item, representing an icon graphic (like a TV channel icon)
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp
 msgctxt "#19282"
 msgid "Current icon"
 msgstr ""
 
 #. Label for a select option or list item, representing an icon graphic (like a TV channel icon)
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp
 msgctxt "#19283"
 msgid "No icon"
 msgstr ""
 
 #. Label for a select/menu option to select an icon graphic
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp
 msgctxt "#19284"
 msgid "Choose icon"
 msgstr ""
 
 #. Label for a select/menu option to select an icon graphic
-#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
-#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
+#: src/pvr/windows/GUIWindowPVRChannels.cpp
+#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp
 msgctxt "#19285"
 msgid "Browse for icon"
 msgstr ""
 
 #. Notification message if process starts searching for missing channel icons
-#: xbmc/pvr/PVRManager.cpp
+#: src/pvr/PVRManager.cpp
 msgctxt "#19286"
 msgid "Searching for channel icons"
 msgstr ""
 
 #. Label for the default pvr channel group
-#: xbmc/pvr/windows/GUIWindowPVRCommon.cpp
+#: src/pvr/windows/GUIWindowPVRCommon.cpp
 msgctxt "#19287"
 msgid "All channels"
 msgstr ""
@@ -8827,195 +8827,195 @@ msgstr ""
 
 #empty strings from id 19289 to 19498
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19499"
 msgid "Other/Unknown"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19500"
 msgid "Movie/Drama"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19501"
 msgid "Detective/Thriller"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19502"
 msgid "Adventure/Western/War"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19503"
 msgid "Science Fiction/Fantasy/Horror"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19504"
 msgid "Comedy"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19505"
 msgid "Soap/Melodrama/Folkloric"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19506"
 msgid "Romance"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19507"
 msgid "Serious/Classical/Religious/Historical Movie/Drama"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19508"
 msgid "Adult Movie/Drama"
 msgstr ""
 
 #empty strings from id 19509 to 19515
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19516"
 msgid "News/Current Affairs"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19517"
 msgid "News/Weather Report"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19518"
 msgid "News Magazine"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19519"
 msgid "Documentary"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19520"
 msgid "Discussion/Interview/Debate"
 msgstr ""
 
 #empty strings from id 19521 to 19531
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19532"
 msgid "Show/Game Show"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19533"
 msgid "Game Show/Quiz/Contest"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19534"
 msgid "Variety Show"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19535"
 msgid "Talk Show"
 msgstr ""
 
 #empty strings from id 19536 to 19547
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19548"
 msgid "Sports"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19549"
 msgid "Special Event"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19550"
 msgid "Sport Magazine"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19551"
 msgid "Football"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19552"
 msgid "Tennis/Squash"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19553"
 msgid "Team Sports"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19554"
 msgid "Athletics"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19555"
 msgid "Motor Sport"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19556"
 msgid "Water Sport"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19557"
 msgid "Winter Sports"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19558"
 msgid "Equestrian"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19559"
 msgid "Martial Sports"
 msgstr ""
 
 #empty strings from id 19560 to 19563
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19564"
 msgid "Children's/Youth Programmes"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19565"
 msgid "Pre-school Children's Programmes"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19566"
 msgid "Entertainment Programmes for 6 to 14"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19567"
 msgid "Entertainment Programmes for 10 to 16"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19568"
 msgid "Informational/Educational/School Programme"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19569"
 msgid "Cartoons/Puppets"
 msgstr ""
@@ -9026,269 +9026,269 @@ msgctxt "#19580"
 msgid "Music/Ballet/Dance"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19581"
 msgid "Rock/Pop"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19582"
 msgid "Serious/Classical Music"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19583"
 msgid "Folk/Traditional Music"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19584"
 msgid "Musical/Opera"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19585"
 msgid "Ballet"
 msgstr ""
 
 #empty strings from id 19586 to 19595
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19596"
 msgid "Arts/Culture"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19597"
 msgid "Performing Arts"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19598"
 msgid "Fine Arts"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19599"
 msgid "Religion"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19600"
 msgid "Popular Culture/Traditional Arts"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19601"
 msgid "Literature"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19602"
 msgid "Film/Cinema"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19603"
 msgid "Experimental Film/Video"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19604"
 msgid "Broadcasting/Press"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19605"
 msgid "New Media"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19606"
 msgid "Arts/Culture Magazines"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19607"
 msgid "Fashion"
 msgstr ""
 
 #empty strings from id 19608 to 19611
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19612"
 msgid "Social/Political/Economics"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19613"
 msgid "Magazines/Reports/Documentary"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19614"
 msgid "Economics/Social Advisory"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19615"
 msgid "Remarkable People"
 msgstr ""
 
 #empty strings from id 19616 to 19627
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19628"
 msgid "Education/Science/Factual"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19629"
 msgid "Nature/Animals/Environment"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19630"
 msgid "Technology/Natural Sciences"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19631"
 msgid "Medicine/Physiology/Psychology"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19632"
 msgid "Foreign Countries/Expeditions"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19633"
 msgid "Social/Spiritual Sciences"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19634"
 msgid "Further Education"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19635"
 msgid "Languages"
 msgstr ""
 
 #empty strings from id 19636 to 19643
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19644"
 msgid "Leisure/Hobbies"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19645"
 msgid "Tourism/Travel"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19646"
 msgid "Handicraft"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19647"
 msgid "Motoring"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19648"
 msgid "Fitness & Health"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19649"
 msgid "Cooking"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19650"
 msgid "Advertisement/Shopping"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19651"
 msgid "Gardening"
 msgstr ""
 
 #empty strings from id 19652 to 19659
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19660"
 msgid "Special Characteristics"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19661"
 msgid "Original Language"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19662"
 msgid "Black & White"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19663"
 msgid "Unpublished"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19664"
 msgid "Live Broadcast"
 msgstr ""
 
 #empty strings from id 19665 to 19675
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19676"
 msgid "Drama"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19677"
 msgid "Detective/Thriller"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19678"
 msgid "Adventure/Western/War"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19679"
 msgid "Science Fiction/Fantasy/Horror"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19680"
 msgid "Comedy"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19681"
 msgid "Soap/Melodrama/Folkloric"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19682"
 msgid "Romance"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19683"
 msgid "Serious/ClassicalReligion/Historical"
 msgstr ""
 
-#: xbmc/epg/Epg.cpp
+#: src/epg/Epg.cpp
 msgctxt "#19684"
 msgid "Adult"
 msgstr ""
@@ -9328,7 +9328,7 @@ msgctxt "#20007"
 msgid "Recordings"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20008"
 msgid "Screenshots"
 msgstr ""
@@ -9339,12 +9339,12 @@ msgstr ""
 
 #empty string with id 20010
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20011"
 msgid "Music playlists"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20012"
 msgid "Video playlists"
 msgstr ""
@@ -9357,34 +9357,34 @@ msgctxt "#20014"
 msgid "Sort by: Playlist"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20015"
 msgid "Remote thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/music/dialogs/GUIDialogSongInfo.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogSongInfo.cpp
 msgctxt "#20016"
 msgid "Current thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/music/dialogs/GUIDialogSongInfo.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogSongInfo.cpp
 msgctxt "#20017"
 msgid "Local thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/music/dialogs/GUIDialogSongInfo.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogSongInfo.cpp
 msgctxt "#20018"
 msgid "No thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/dialogs/GUIDialogFavourites.cpp
+#: src/dialogs/GUIDialogContextMenu.cpp
+#: src/dialogs/GUIDialogFavourites.cpp
 msgctxt "#20019"
 msgid "Choose thumbnail"
 msgstr ""
@@ -9530,22 +9530,22 @@ msgctxt "#20066"
 msgid "Lock preferences"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20067"
 msgid "Edit profile"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20068"
 msgid "Profile lock"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20069"
 msgid "Could not create folder"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#20070"
 msgid "Profile directory"
 msgstr ""
@@ -9554,22 +9554,22 @@ msgctxt "#20071"
 msgid "Start with fresh media sources"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20072"
 msgid "Make sure the selected folder is writable"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20073"
 msgid "and that the new folder name is valid"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20074"
 msgid "MPAA rating"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20075"
 msgid "Enter master lock code"
 msgstr ""
@@ -9704,7 +9704,7 @@ msgctxt "#20107"
 msgid "Separate (locked)"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#20108"
 msgid "Root"
 msgstr ""
@@ -9722,22 +9722,22 @@ msgctxt "#20111"
 msgid "Autostart UPnP client"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20112"
 msgid "Last login: %s"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20113"
 msgid "Never logged on"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20114"
 msgid "Profile %i / %i"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20115"
 msgid "User login / Select a profile"
 msgstr ""
@@ -9746,7 +9746,7 @@ msgctxt "#20116"
 msgid "Use lock on login screen"
 msgstr ""
 
-#: xbmc/windows/GUIWindowLoginScreen.cpp
+#: src/windows/GUIWindowLoginScreen.cpp
 msgctxt "#20117"
 msgid "Invalid lock code."
 msgstr ""
@@ -9767,7 +9767,7 @@ msgctxt "#20121"
 msgid "Party on!"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20122"
 msgid "True"
 msgstr ""
@@ -9790,22 +9790,22 @@ msgstr ""
 
 #empty string with id 20127
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#20128"
 msgid "Go to root"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#20129"
 msgid "Weave"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#20130"
 msgid "Weave (inverted)"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#20131"
 msgid "Blend"
 msgstr ""
@@ -9814,12 +9814,12 @@ msgctxt "#20132"
 msgid "Restart video"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20133"
 msgid "Edit network location"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20134"
 msgid "Remove network location"
 msgstr ""
@@ -9848,7 +9848,7 @@ msgctxt "#20140"
 msgid "Lock screensaver"
 msgstr ""
 
-#: xbmc/media/MediaTypes.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20141"
 msgid "Set"
 msgstr ""
@@ -9897,17 +9897,17 @@ msgctxt "#20152"
 msgid "Lock preferences for %s"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20153"
 msgid "Browse..."
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20154"
 msgid "Summary information"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20155"
 msgid "Storage information"
 msgstr ""
@@ -9920,17 +9920,17 @@ msgctxt "#20157"
 msgid "DVD-ROM information"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20158"
 msgid "Network information"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20159"
 msgid "Video information"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20160"
 msgid "Hardware information"
 msgstr ""
@@ -9975,7 +9975,7 @@ msgctxt "#20170"
 msgid "Line"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20171"
 msgid "Windows network (SMB)"
 msgstr ""
@@ -9984,17 +9984,17 @@ msgctxt "#20172"
 msgid "XBMSP server"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20173"
 msgid "FTP server"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20174"
 msgid "iTunes music share (DAAP)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20175"
 msgid "UPnP server"
 msgstr ""
@@ -10049,7 +10049,7 @@ msgctxt "#20187"
 msgid "UPnP"
 msgstr ""
 
-#: xbmc/network/upnp/UPnPServer.cpp
+#: src/network/upnp/UPnPServer.cpp
 #: system/settings/settings.xml
 msgctxt "#20188"
 msgid "Announce library updates via UPnP"
@@ -10121,22 +10121,22 @@ msgstr ""
 
 #empty strings from id 20222 to 20239
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20240"
 msgid "Android music"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20241"
 msgid "Android videos"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20242"
 msgid "Android pictures"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20243"
 msgid "Android photos"
 msgstr ""
@@ -10159,12 +10159,12 @@ msgctxt "#20252"
 msgid "Filling glasses (videos)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20253"
 msgid "WebDAV server (HTTP)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20254"
 msgid "WebDAV server (HTTPS)"
 msgstr ""
@@ -10173,32 +10173,32 @@ msgctxt "#20255"
 msgid "First logon, edit your profile"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20256"
 msgid "HTS Tvheadend client"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20257"
 msgid "VDR Streamdev client"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20258"
 msgid "MythTV client"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20259"
 msgid "Network Filesystem (NFS)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20260"
 msgid "Secure Shell (SSH/SFTP)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20261"
 msgid "Apple Filing Protocol (AFP)"
 msgstr ""
@@ -10210,12 +10210,12 @@ msgstr ""
 
 #empty strings from id 20263 to 20299
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20300"
 msgid "Web server directory (HTTP)"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20301"
 msgid "Web server directory (HTTPS)"
 msgstr ""
@@ -10228,14 +10228,14 @@ msgctxt "#20303"
 msgid "Do you want to skip and proceed?"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20304"
 msgid "RSS Feed"
 msgstr ""
 
 #empty strings from id 20305 to 20306
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20307"
 msgid "Secondary DNS"
 msgstr ""
@@ -10244,7 +10244,7 @@ msgctxt "#20308"
 msgid "DHCP server:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowFileManager.cpp
+#: src/windows/GUIWindowFileManager.cpp
 msgctxt "#20309"
 msgid "Make new folder"
 msgstr ""
@@ -10289,7 +10289,7 @@ msgstr ""
 
 #empty string with id 20322
 
-#: xbmc/video/windows/GUIWindowVideoNav.cpp
+#: src/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#20323"
 msgid "Movie plot"
 msgstr ""
@@ -10346,21 +10346,21 @@ msgctxt "#20336"
 msgid "Unlock sources"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20337"
 msgid "Actor"
 msgstr ""
 
-#: xbmc/media/MediaTypes.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20338"
 msgid "Movie"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20339"
 msgid "Director"
 msgstr ""
@@ -10373,17 +10373,17 @@ msgctxt "#20341"
 msgid "this path from the Kodi library?"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20342"
 msgid "Movies"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#20343"
 msgid "TV shows"
 msgstr ""
@@ -10404,9 +10404,9 @@ msgctxt "#20347"
 msgid "as"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20348"
 msgid "Directors"
 msgstr ""
@@ -10447,22 +10447,22 @@ msgctxt "#20357"
 msgid "Enter the TV show name"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
 msgctxt "#20358"
 msgid "Season %i"
 msgstr ""
 
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20359"
 msgid "Episode"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20360"
 msgid "Episodes"
 msgstr ""
@@ -10479,7 +10479,7 @@ msgctxt "#20363"
 msgid "Remove TV show from library"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20364"
 msgid "TV show"
 msgstr ""
@@ -10488,8 +10488,8 @@ msgctxt "#20365"
 msgid "Episode plot"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
 msgctxt "#20366"
 msgid "* All seasons"
 msgstr ""
@@ -10519,8 +10519,8 @@ msgctxt "#20372"
 msgid "Season image"
 msgstr ""
 
-#: xbmc/media/MediaTypes.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/media/MediaTypes.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20373"
 msgid "Season"
 msgstr ""
@@ -10553,7 +10553,7 @@ msgctxt "#20380"
 msgid "Exclude selected folder from scans"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
 msgctxt "#20381"
 msgid "Specials"
 msgstr ""
@@ -10572,39 +10572,39 @@ msgctxt "#20385"
 msgid "Remove link to TV show"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#20386"
 msgid "Recently added movies"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#20387"
 msgid "Recently added episodes"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20388"
 msgid "Studios"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20389"
 msgid "Music videos"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
 msgctxt "#20390"
 msgid "Recently added music videos"
 msgstr ""
 
-#: xbmc/media/MediaTypes.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20391"
 msgid "Music video"
 msgstr ""
@@ -10621,7 +10621,7 @@ msgctxt "#20394"
 msgid "Loading music video information"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#20395"
 msgid "Mixed"
 msgstr ""
@@ -10659,7 +10659,7 @@ msgctxt "#20403"
 msgid "Set actor thumb"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+#: src/video/dialogs/GUIDialogVideoBookmarks.cpp
 msgctxt "#20404"
 msgid "Remove bookmark"
 msgstr ""
@@ -10709,19 +10709,19 @@ msgctxt "#20415"
 msgid "Scanning for new content"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20416"
 msgid "First aired"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20417"
 msgid "Writer"
 msgstr ""
 
-#: xbmc/playlists/SmartPlayList.cpp
+#: src/playlists/SmartPlayList.cpp
 msgctxt "#20418"
 msgid "Writers"
 msgstr ""
@@ -10746,12 +10746,12 @@ msgctxt "#20422"
 msgid "Always"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20423"
 msgid "Has trailer"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20424"
 msgid "False"
 msgstr ""
@@ -10793,9 +10793,9 @@ msgctxt "#20433"
 msgid "Extract thumbnails and video information"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#20434"
 msgid "Sets"
 msgstr ""
@@ -10809,27 +10809,27 @@ msgctxt "#20436"
 msgid "Export actor thumbs?"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20437"
 msgid "Choose fanart"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20438"
 msgid "Local fanart"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20439"
 msgid "No fanart"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20440"
 msgid "Current fanart"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20441"
 msgid "Remote fanart"
 msgstr ""
@@ -10846,7 +10846,7 @@ msgctxt "#20444"
 msgid "items within this path?"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20445"
 msgid "Fanart"
 msgstr ""
@@ -10871,8 +10871,8 @@ msgctxt "#20450"
 msgid "Would you like to continue scanning?"
 msgstr ""
 
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20451"
 msgid "Countries"
 msgstr ""
@@ -10898,7 +10898,7 @@ msgctxt "#20456"
 msgid "Flatten library hierarchy"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20457"
 msgid "Movie set"
 msgstr ""
@@ -10908,12 +10908,12 @@ msgctxt "#20458"
 msgid "Group movies in sets"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
-#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
+#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#20459"
 msgid "Tags"
 msgstr ""
@@ -10966,7 +10966,7 @@ msgctxt "#21330"
 msgid "Show hidden files and directories"
 msgstr ""
 
-#: xbmc/network/GUIDialogNetworkSetup.cpp
+#: src/network/GUIDialogNetworkSetup.cpp
 msgctxt "#21331"
 msgid "TuxBox client"
 msgstr ""
@@ -10987,7 +10987,7 @@ msgctxt "#21335"
 msgid "Are you sure to start the stream?"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#21336"
 msgid "Connecting to: %s"
 msgstr ""
@@ -10999,7 +10999,7 @@ msgstr ""
 #empty strings from id 21338 to 21358
 #up to 21355 is reserved for the TuxBox Client!! !
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#21359"
 msgid "Add media share..."
 msgstr ""
@@ -11013,22 +11013,22 @@ msgctxt "#21361"
 msgid "Look for remote UPnP players"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+#: src/video/dialogs/GUIDialogVideoBookmarks.cpp
 msgctxt "#21362"
 msgid "Bookmark created"
 msgstr ""
 
-#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+#: src/video/dialogs/GUIDialogVideoBookmarks.cpp
 msgctxt "#21363"
 msgid "Episode Bookmark created"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#21364"
 msgid "Edit media share"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
+#: src/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#21365"
 msgid "Remove media share"
 msgstr ""
@@ -11175,62 +11175,62 @@ msgctxt "#21399"
 msgid "Use tween animations"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21400"
 msgid "contains"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21401"
 msgid "does not contain"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21402"
 msgid "is"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21403"
 msgid "is not"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21404"
 msgid "starts with"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21405"
 msgid "ends with"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21406"
 msgid "greater than"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21407"
 msgid "less than"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21408"
 msgid "after"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21409"
 msgid "before"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21410"
 msgid "in the last"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21411"
 msgid "not in the last"
 msgstr ""
@@ -11269,7 +11269,7 @@ msgctxt "#21419"
 msgid "No scrapers present"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
+#: src/dialogs/GUIDialogSmartPlaylistRule.cpp
 msgctxt "#21420"
 msgid "Value to match"
 msgstr ""
@@ -11282,7 +11282,7 @@ msgctxt "#21422"
 msgid "Match items where"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#21423"
 msgid "New rule..."
 msgstr ""
@@ -11291,12 +11291,12 @@ msgctxt "#21424"
 msgid "Items must match"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#21425"
 msgid "all of the rules"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#21426"
 msgid "one or more of the rules"
 msgstr ""
@@ -11305,7 +11305,7 @@ msgctxt "#21427"
 msgid "Limit to"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#21428"
 msgid "No limit"
 msgstr ""
@@ -11338,7 +11338,7 @@ msgctxt "#21435"
 msgid "Edit"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
+#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp
 msgctxt "#21436"
 msgid "%i items"
 msgstr ""
@@ -11367,32 +11367,32 @@ msgctxt "#21442"
 msgid "Episode title"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21443"
 msgid "Video resolution"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21444"
 msgid "Audio channels"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21445"
 msgid "Video codec"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21446"
 msgid "Audio codec"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21447"
 msgid "Audio language"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21448"
 msgid "Subtitle language"
 msgstr ""
@@ -11411,8 +11411,8 @@ msgctxt "#21451"
 msgid "Internet connection required."
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#21452"
 msgid "Get More..."
 msgstr ""
@@ -11429,12 +11429,12 @@ msgctxt "#21455"
 msgid "Cache filled before reaching required amount for continous playback"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21456"
 msgid "External storage"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21457"
 msgid "Watched episode count"
 msgstr ""
@@ -11480,33 +11480,33 @@ msgstr ""
 #empty string with id 21466
 
 #. Filter (media data) from float value to float value
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
 msgctxt "#21467"
 msgid "%.1f to %.1f"
 msgstr ""
 
 #. Filter (media data) from int value to int value
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
 msgctxt "#21468"
 msgid "%d to %d"
 msgstr ""
 
 #. Filter (media data) from string value to string value
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
-#: xbmc/settings/SettingControl.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
+#: src/settings/SettingControl.cpp
 msgctxt "#21469"
 msgid "%s to %s"
 msgstr ""
 
 #. Field (e.g. "Genre") [count]
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
 msgctxt "#21470"
 msgid "%s [%d]"
 msgstr ""
 
 #empty strings from id 21471 to 21601
 
-#: xbmc/Util.cpp
+#: src/Util.cpp
 msgctxt "#21602"
 msgid "(External)"
 msgstr ""
@@ -11755,7 +11755,7 @@ msgctxt "#21882"
 msgid "Attempt to skip introduction before DVD menu"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: src/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#21883"
 msgid "Saved music"
 msgstr ""
@@ -11772,18 +11772,18 @@ msgctxt "#21886"
 msgid "Downloading artist information"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21887"
 msgid "Biography"
 msgstr ""
 
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#21888"
 msgid "Discography"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogMediaFilter.cpp
+#: src/dialogs/GUIDialogMediaFilter.cpp
 msgctxt "#21889"
 msgid "Searching artist"
 msgstr ""
@@ -11796,32 +11796,32 @@ msgctxt "#21891"
 msgid "Artist information"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21892"
 msgid "Instruments"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21893"
 msgid "Born"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21894"
 msgid "Formed"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21895"
 msgid "Themes"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21896"
 msgid "Disbanded"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21897"
 msgid "Died"
 msgstr ""
@@ -11830,7 +11830,7 @@ msgctxt "#21898"
 msgid "Years active"
 msgstr ""
 
-#: xbmc/playlists/SmartPlaylist.cpp
+#: src/playlists/SmartPlaylist.cpp
 msgctxt "#21899"
 msgid "Label"
 msgstr ""
@@ -11873,7 +11873,7 @@ msgctxt "#22006"
 msgid "Subtitle offset"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22007"
 msgid "OpenGL vendor:"
 msgstr ""
@@ -11882,22 +11882,22 @@ msgctxt "#22008"
 msgid "OpenGL renderer:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22009"
 msgid "OpenGL version:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22010"
 msgid "GPU temperature:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22011"
 msgid "CPU temperature:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22012"
 msgid "Total memory"
 msgstr ""
@@ -11933,7 +11933,7 @@ msgstr ""
 
 #. Electronic program guide, used as label in the menu of the PVR section and the MythDirectory
 #: addons/skin/confluence
-#: xbmc/filesystem/MythDirectory.cpp
+#: src/filesystem/MythDirectory.cpp
 msgctxt "#22020"
 msgid "Guide"
 msgstr ""
@@ -11948,12 +11948,12 @@ msgctxt "#22022"
 msgid "Show video files in listings"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22023"
 msgid "DirectX vendor:"
 msgstr ""
 
-#: xbmc/windows/GUIWindowSystemInfo.cpp
+#: src/windows/GUIWindowSystemInfo.cpp
 msgctxt "#22024"
 msgid "Direct3D version:"
 msgstr ""
@@ -12102,12 +12102,12 @@ msgstr ""
 #empty strings from id 23105 to 23999
 #strings 24000 thru 24299 reserved for the Add-ons framework
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24000"
 msgid "Add-on"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24001"
 msgid "Add-ons"
 msgstr ""
@@ -12122,74 +12122,74 @@ msgstr ""
 
 #empty string with id 24004
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24005"
 msgid "Media sources"
 msgstr ""
 
 #empty string with id 24006
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24007"
 msgid "Movie information"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24008"
 msgid "Screensaver"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24009"
 msgid "Script"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24010"
 msgid "Visualisation"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24011"
 msgid "Add-on repository"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24012"
 msgid "Subtitles"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24013"
 msgid "Lyrics"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24014"
 msgid "TV information"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24015"
 msgid "Music video information"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24016"
 msgid "Album information"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24017"
 msgid "Artist information"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24018"
 msgid "Services"
 msgstr ""
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24019"
 msgid "PVR clients"
 msgstr ""
@@ -12207,20 +12207,20 @@ msgid "Enable"
 msgstr ""
 
 #. Defines the state of the add-on in the add-on manager window
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24023"
 msgid "Disabled"
 msgstr ""
 
 #. Used as an error message (triggered from content dialog) on disabled scrapers
-#: xbmc/settings/dialogs/GUIDialogContentSettings.cpp
+#: src/settings/dialogs/GUIDialogContentSettings.cpp
 msgctxt "#24024"
 msgid "Add-on disabled"
 msgstr ""
 
 #empty strings from id 24025 to 24026
 
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24027"
 msgid "Weather"
 msgstr ""
@@ -12242,13 +12242,13 @@ msgctxt "#24031"
 msgid "Error loading settings"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24032"
 msgid "All Add-ons"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24033"
 msgid "Get Add-ons"
 msgstr ""
@@ -12273,45 +12273,45 @@ msgctxt "#24038"
 msgid "Install"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24039"
 msgid "Disabled Add-ons"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24040"
 msgid "(Clear the current setting)"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24041"
 msgid "Install from zip file"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24042"
 msgid "Downloading %i%%"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24043"
 msgid "Available Updates"
 msgstr ""
 
-#: xbmc/addons/AddonInstaller.cpp
-#: xbmc/addons/AddonsDatabase.cpp
+#: src/addons/AddonInstaller.cpp
+#: src/addons/AddonsDatabase.cpp
 msgctxt "#24044"
 msgid "Dependencies not met. Please contact Add-on author."
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24045"
 msgid "Add-on does not have the correct structure"
 msgstr ""
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#24046"
 msgid "%s is used by the following installed Add-on(s)"
 msgstr ""
@@ -12326,7 +12326,7 @@ msgctxt "#24048"
 msgid "Rollback"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24049"
 msgid "Incompatible"
 msgstr ""
@@ -12336,7 +12336,7 @@ msgctxt "#24050"
 msgid "Available Add-ons"
 msgstr ""
 
-#: xbmc/addons/addonversion.cpp
+#: src/addons/addonversion.cpp
 msgctxt "#24051"
 msgid "Version:"
 msgstr ""
@@ -12352,19 +12352,19 @@ msgctxt "#24053"
 msgid "License:"
 msgstr ""
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#24054"
 msgid "Changelog"
 msgstr ""
 
 #. Used in the Add-on Manager
-#: xbmc/addons/GUIViewStateAddonBrowser.cpp
+#: src/addons/GUIViewStateAddonBrowser.cpp
 msgctxt "#24055"
 msgid "Check for updates"
 msgstr ""
 
 #. Used in the Add-on Manager to specify last update time
-#: xbmc/addons/GUIViewStateAddonBrowser.cpp
+#: src/addons/GUIViewStateAddonBrowser.cpp
 msgctxt "#24056"
 msgid "Last updated %s"
 msgstr ""
@@ -12379,14 +12379,14 @@ msgctxt "#24060"
 msgid "Would you like to disable this Add-on?"
 msgstr ""
 
-#: xbmc/addons/Repository.cpp
+#: src/addons/Repository.cpp
 msgctxt "#24061"
 msgid "Add-on update available!"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
-#: xbmc/filesystem/AddonsDirectory.cpp
-#: xbmc/filesystem/AndroidAppDirectory.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
+#: src/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AndroidAppDirectory.cpp
 msgctxt "#24062"
 msgid "Enabled Add-ons"
 msgstr ""
@@ -12395,27 +12395,27 @@ msgctxt "#24063"
 msgid "Auto update"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24064"
 msgid "Add-on enabled"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24065"
 msgid "Add-on updated"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24066"
 msgid "Cancel Add-on download?"
 msgstr ""
 
-#: xbmc/addons/guiviewstateaddonbrowser.cpp
+#: src/addons/guiviewstateaddonbrowser.cpp
 msgctxt "#24067"
 msgid "Currently downloading Add-ons"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24068"
 msgid "Update available"
 msgstr ""
@@ -12448,7 +12448,7 @@ msgctxt "#24075"
 msgid "Disable"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24076"
 msgid "Add-on Required"
 msgstr ""
@@ -12460,25 +12460,25 @@ msgid "Try to reconnect?"
 msgstr ""
 
 #. The label in the add-ons manager for helper add-ons
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24081"
 msgid "Helper Add-ons"
 msgstr ""
 
 #. The label in the add-ons manager for add-on libraries
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24082"
 msgid "Add-on libraries"
 msgstr ""
 
 #. The label in the add-ons manager for information libraries
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24083"
 msgid "Information libraries"
 msgstr ""
 
 #. The label in the add-ons manager for visualisation libraries
-#: xbmc/addons/addon.cpp
+#: src/addons/addon.cpp
 msgctxt "#24084"
 msgid "Visualisation libraries"
 msgstr ""
@@ -12500,57 +12500,57 @@ msgstr ""
 
 #empty strings from id 24092 to 24093
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#24094"
 msgid "(current)"
 msgstr ""
 
-#: xbmc/addons/guidialogaddoninfo.cpp
+#: src/addons/guidialogaddoninfo.cpp
 msgctxt "#24095"
 msgid "(blacklisted)"
 msgstr ""
 
-#: xbmc/addons/Repository.cpp
+#: src/addons/Repository.cpp
 msgctxt "#24096"
 msgid "Add-on is incompatible or has been marked broken in repository."
 msgstr ""
 
-#: xbmc/addons/Repository.cpp
+#: src/addons/Repository.cpp
 msgctxt "#24097"
 msgid "Would you like to disable it on your system?"
 msgstr ""
 
-#: xbmc/filesystem/AddonsDirectory.cpp
+#: src/filesystem/AddonsDirectory.cpp
 msgctxt "#24098"
 msgid "Broken"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24099"
 msgid "Would you like to switch to this skin?"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24100"
 msgid "To use this feature you must download an Add-on:"
 msgstr ""
 
-#: xbmc/addons/addoninstaller.cpp
+#: src/addons/addoninstaller.cpp
 msgctxt "#24101"
 msgid "Would you like to download this Add-on?"
 msgstr ""
 
-#: xbmc/Application.cpp
+#: src/Application.cpp
 msgctxt "#24102"
 msgid "Unable to load skin"
 msgstr ""
 
-#: xbmc/Application.cpp
+#: src/Application.cpp
 msgctxt "#24103"
 msgid "Skin is missing some files"
 msgstr ""
 
-#: xbmc/addons/Repository.cpp
+#: src/addons/Repository.cpp
 msgctxt "#24104"
 msgid "Add-on is incompatible due to unmet dependencies."
 msgstr ""
@@ -12566,22 +12566,22 @@ msgctxt "#24106"
 msgid "Specify where downloaded subtitles should be saved, the same location as the video or a custom location."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24107"
 msgid "Searching for subtitles ..."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24108"
 msgid "%d subtitles found"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24109"
 msgid "No subtitles found"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24110"
 msgid "Downloading subtitles ..."
 msgstr ""
@@ -12597,12 +12597,12 @@ msgctxt "#24112"
 msgid "Set languages to use when searching for subtitles. Not all subtitle services will use all languages."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24113"
 msgid "Failed to download subtitle"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24114"
 msgid "No subtitle services installed"
 msgstr ""
@@ -12634,18 +12634,18 @@ msgctxt "#24119"
 msgid "Select service that will be used as default to search for Movie subtitles."
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24120"
 msgid "Manual search string"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogSubtitles.cpp
+#: src/dialogs/GUIDialogSubtitles.cpp
 msgctxt "#24121"
 msgid "Enter search string"
 msgstr ""
 
 #. Button in Add-on Manager -> Available Updates for updating all add-ons when auto-updating is off.
-#: xbmc/filesystem/AddonDirectory.cpp
+#: src/filesystem/AddonDirectory.cpp
 msgctxt "#24122"
 msgid "Update all"
 msgstr ""
@@ -12703,24 +12703,24 @@ msgctxt "#25001"
 msgid "Hide foreign"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 msgctxt "#25002"
 msgid "Select from all titles ..."
 msgstr ""
 
 #. A Blu-ray playback mode and a option in the simplified Blu-ray menu
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 #: system/settings/settings.xml
 msgctxt "#25003"
 msgid "Show Blu-ray menu"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 msgctxt "#25004"
 msgid "Play main title: %d"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 msgctxt "#25005"
 msgid "Title: %d"
 msgstr ""
@@ -12730,17 +12730,17 @@ msgctxt "#25006"
 msgid "Select playback item"
 msgstr ""
 
-#: xbmc/filesystem/BlurayDirectory.cpp
+#: src/filesystem/BlurayDirectory.cpp
 msgctxt "#25007"
 msgid "Chapters: %u - duration: %s"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDPlayer.cpp
+#: src/cores/dvdplayer/DVDPlayer.cpp
 msgctxt "#25008"
 msgid "Playback of Blu-ray failed"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDPlayer.cpp
+#: src/cores/dvdplayer/DVDPlayer.cpp
 msgctxt "#25009"
 msgid "The menu of this Blu-ray is not supported"
 msgstr ""
@@ -12964,7 +12964,7 @@ msgstr ""
 
 #: addons/skin.confluence/720p/script-globalsearch-main.xml
 #: xbmc\filesystem\VideoDatabaseDirectory.cpp
-#: xbmc/media/MediaTypes.cpp
+#: src/media/MediaTypes.cpp
 msgctxt "#33054"
 msgid "Seasons"
 msgstr ""
@@ -13119,23 +13119,23 @@ msgstr ""
 
 #empty strings from id 33085 to 33099
 
-#: xbmc/network/network.cpp
+#: src/network/network.cpp
 msgctxt "#33100"
 msgid "Failed to start"
 msgstr ""
 
-#: xbmc/network/network.cpp
+#: src/network/network.cpp
 #: system/settings/settings.xml
 msgctxt "#33101"
 msgid "Webserver"
 msgstr ""
 
-#: xbmc/network/network.cpp
+#: src/network/network.cpp
 msgctxt "#33102"
 msgid "Event Server"
 msgstr ""
 
-#: xbmc/network/network.cpp
+#: src/network/network.cpp
 msgctxt "#33103"
 msgid "Remote communication server"
 msgstr ""
@@ -13358,39 +13358,39 @@ msgctxt "#34401"
 msgid "Failed to init video filters/scalers, falling back to bilinear scaling"
 msgstr ""
 
-#: xbmc/cores/audioengine/sinks/aesinknull.cpp
+#: src/cores/audioengine/sinks/aesinknull.cpp
 msgctxt "#34402"
 msgid "Failed to initialise audio device"
 msgstr ""
 
-#: xbmc/cores/audioengine/sinks/aesinknull.cpp
+#: src/cores/audioengine/sinks/aesinknull.cpp
 msgctxt "#34403"
 msgid "Check your audiosettings"
 msgstr ""
 
 #description for the touchscreen when using the tvout feature on iDevices
 
-#: xbmc/osx/IOSExternalTouchController.mm
+#: src/osx/IOSExternalTouchController.mm
 msgctxt "#34404"
 msgid "Use gestures for navigation:"
 msgstr ""
 
-#: xbmc/osx/IOSExternalTouchController.mm
+#: src/osx/IOSExternalTouchController.mm
 msgctxt "#34405"
 msgid "1 finger swipe left,right,up,down for cursors"
 msgstr ""
 
-#: xbmc/osx/IOSExternalTouchController.mm
+#: src/osx/IOSExternalTouchController.mm
 msgctxt "#34406"
 msgid "2 finger swipe left for backspace"
 msgstr ""
 
-#: xbmc/osx/IOSExternalTouchController.mm
+#: src/osx/IOSExternalTouchController.mm
 msgctxt "#34407"
 msgid "1 finger single tap for enter"
 msgstr ""
 
-#: xbmc/osx/IOSExternalTouchController.mm
+#: src/osx/IOSExternalTouchController.mm
 msgctxt "#34408"
 msgid "2 finger single tap or 1 finger long press for contextmenu"
 msgstr ""
@@ -13403,18 +13403,18 @@ msgctxt "#35000"
 msgid "Peripherals"
 msgstr ""
 
-#: xbmc/pheripherals/devices/PeripheralHID.cpp
-#: xbmc/pheripherals/devices/Peripheralmon.cpp
+#: src/pheripherals/devices/PeripheralHID.cpp
+#: src/pheripherals/devices/Peripheralmon.cpp
 msgctxt "#35001"
 msgid "Generic HID device"
 msgstr ""
 
-#: xbmc/pheripherals/devices/PeripheralNIC.cpp
+#: src/pheripherals/devices/PeripheralNIC.cpp
 msgctxt "#35002"
 msgid "Generic network adaptor"
 msgstr ""
 
-#: xbmc/pheripherals/devices/PeripheralDisk.cpp
+#: src/pheripherals/devices/PeripheralDisk.cpp
 msgctxt "#35003"
 msgid "Generic disk"
 msgstr ""
@@ -13424,12 +13424,12 @@ msgctxt "#35004"
 msgid "There are no settings available\nfor this peripheral."
 msgstr ""
 
-#: xbmc/pheripherals/Peripherals.cpp
+#: src/pheripherals/Peripherals.cpp
 msgctxt "#35005"
 msgid "New device configured"
 msgstr ""
 
-#: xbmc/pheripherals/Peripherals.cpp
+#: src/pheripherals/Peripherals.cpp
 msgctxt "#35006"
 msgid "Device removed"
 msgstr ""
@@ -13492,7 +13492,7 @@ msgstr ""
 
 #empty strings from id 35505 to 35999
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36000"
 msgid "Pulse-Eight CEC adaptor"
 msgstr ""
@@ -13544,12 +13544,12 @@ msgctxt "#36010"
 msgid "Wake devices when deactivating screensaver"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36011"
 msgid "Could not detect the CEC com port. Set it up manually."
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36012"
 msgid "Could not initialise the CEC adaptor. Please check your settings."
 msgstr ""
@@ -13562,12 +13562,12 @@ msgid "HDMI port number"
 msgstr ""
 
 #. max. 13 characters
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36016"
 msgid "Connected"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36017"
 msgid "Could not initialise the CEC adaptor: libCEC was not found on your system."
 msgstr ""
@@ -13597,12 +13597,12 @@ msgctxt "#36022"
 msgid "COM port (leave empty unless needed)"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36023"
 msgid "Configuration updated"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36024"
 msgid "Failed to set the new configuration. Please check your settings."
 msgstr ""
@@ -13617,37 +13617,37 @@ msgctxt "#36026"
 msgid "Put devices in standby mode when putting the PC in standby"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36027"
 msgid "This device needs servicing"
 msgstr ""
 
 #. Label for a select option
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 #: system/peripherals.xml
 #: system/settings.xml
 msgctxt "#36028"
 msgid "Ignore"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 #: system/peripherals.xml
 msgctxt "#36029"
 msgid "When the TV is switched off"
 msgstr ""
 
-#: xbmc/addons/addonstatushandler.cpp
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/addons/addonstatushandler.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36030"
 msgid "Connection lost"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36031"
 msgid "This user does not have permissions to open the CEC adaptor"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36032"
 msgid "The port is busy. Only one program can access the CEC adaptor"
 msgstr ""
@@ -13671,31 +13671,31 @@ msgctxt "#36036"
 msgid "On start/stop"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 #: system/peripherals.xml
 msgctxt "#36037"
 msgid "TV"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 #: system/peripherals.xml
 msgctxt "#36038"
 msgid "Amplifier / AVR device"
 msgstr ""
 
-#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+#: src/peripherals/devices/PeripheralCecAdapter.cpp
 #: system/peripherals.xml
 msgctxt "#36039"
 msgid "TV and AVR device (explicit)"
 msgstr ""
 
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
+#: src/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36040"
 msgid "Unsupported libCEC interface version. %x is lower than the version Kodi supports (%x)"
 msgstr ""
 
-#: xbmc/video/dialogs/guidialogvideoinfo.cpp
-#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
+#: src/video/dialogs/guidialogvideoinfo.cpp
+#: src/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#36041"
 msgid "* Item folder"
 msgstr ""
@@ -15639,14 +15639,14 @@ msgstr ""
 
 #. name of a stereoscopic mode
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#36503"
 msgid "Over/Under"
 msgstr ""
 
 #. name of a stereoscopic mode
 #: system/settings/settings.xml
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#36504"
 msgid "Side by side"
 msgstr ""
@@ -15763,14 +15763,14 @@ msgstr ""
 
 #. label of a setting, allowing to specify the stereoscopic 3D mode of a video
 #: guilib/StereoscopicsManager.cpp
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#36535"
 msgid "Stereoscopic 3D mode of video"
 msgstr ""
 
 #. label of a toggle option that allows to invert the stereoscopic 3d mode
 #: guilib/StereoscopicsManager.cpp
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: src/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#36536"
 msgid "Invert Stereoscopic 3D mode (flip eyes)"
 msgstr ""
@@ -15877,156 +15877,156 @@ msgstr ""
 
 #empty strings from id 36604 to 36899
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36900"
 msgid "movie"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36901"
 msgid "movies"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36902"
 msgid "TV show"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36903"
 msgid "TV shows"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36904"
 msgid "season"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36905"
 msgid "seasons"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36906"
 msgid "episode"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36907"
 msgid "episodes"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36908"
 msgid "musicvideo"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36909"
 msgid "musicvideos"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36910"
 msgid "set"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36911"
 msgid "sets"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36912"
 msgid "video"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36913"
 msgid "videos"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36914"
 msgid "music"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36915"
 msgid "music"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36916"
 msgid "artist"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36917"
 msgid "artists"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36918"
 msgid "album"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36919"
 msgid "albums"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36920"
 msgid "song"
 msgstr ""
 
-#: xbmc/media/MediaType.cpp
+#: src/media/MediaType.cpp
 msgctxt "#36921"
 msgid "songs"
 msgstr ""
 
 #empty strings from id 36922 to 36999
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37000"
 msgid "(Visually Impaired)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37001"
 msgid "(Directors Comments)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37002"
 msgid "(Directors Comments 2)"
 msgstr ""
 
 #empty strings from id 37003 to 37010
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37011"
 msgid "(CC)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37012"
 msgid "(Forced)"
 msgstr ""
 
-#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#37013"
 msgid "(Directors Comments)"
 msgstr ""
 
-#: xbmc/GUIInfoManager.cpp
+#: src/GUIInfoManager.cpp
 msgctxt "#37014"
 msgid "Last used profile"
 msgstr ""
 
-#: xbmc/Windows/GUIMediaWindow.cpp
+#: src/Windows/GUIMediaWindow.cpp
 msgctxt "#37015"
 msgid "Browse Into"
 msgstr ""
@@ -16059,12 +16059,12 @@ msgctxt "#37021"
 msgid "Set GUI resolution limit"
 msgstr ""
 
-#: xbmc/network/upnp/UPnPPlayer.cpp
+#: src/network/upnp/UPnPPlayer.cpp
 msgctxt "#37022"
 msgid "UPnP Player"
 msgstr ""
 
-#: xbmc/network/upnp/UPnPPlayer.cpp
+#: src/network/upnp/UPnPPlayer.cpp
 msgctxt "#37023"
 msgid "Do you wish to stop playback on the remote device?"
 msgstr ""
index b9d327d..92094a0 100644 (file)
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc
+INCLUDES=-I. -I../../../src/addons/include -I../../../src
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libXBMC_addon
@@ -11,9 +11,9 @@ all: $(LIB_SHARED)
 
 $(LIB_SHARED): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
 endif
index 4dd4d5b..2c695b6 100644 (file)
@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string>
-#include "../../../xbmc/addons/include/xbmc_addon_types.h"
+#include "../../../src/addons/include/xbmc_addon_types.h"
 #include "../../../addons/library.xbmc.addon/libXBMC_addon.h"
-#include "../../../xbmc/addons/AddonCallbacks.h"
+#include "../../../src/addons/AddonCallbacks.h"
 
 #ifdef _WIN32
 #include <windows.h>
index 41120be..917d09d 100644 (file)
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
index 505c08f..83a6b50 100644 (file)
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include
+INCLUDES=-I. -I../../../src/addons/include
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libXBMC_codec
@@ -11,9 +11,9 @@ all: $(LIB_SHARED)
 
 $(LIB_SHARED): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
 endif
index 67f6c38..6519a33 100644 (file)
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
index 8a75239..2f5615f 100644 (file)
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libXBMC_gui
@@ -11,9 +11,9 @@ all: $(LIB_SHARED)
 
 $(LIB_SHARED): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
 endif
index fa88231..edd17d5 100644 (file)
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
index 8c10e0d..96f3713 100644 (file)
@@ -1,5 +1,5 @@
 ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers
 DEFINES+=
 CXXFLAGS=-fPIC
 LIBNAME=libXBMC_pvr
@@ -11,9 +11,9 @@ all: $(LIB_SHARED)
 
 $(LIB_SHARED): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
 endif
index b5da9b9..87dd972 100644 (file)
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <PrecompiledHeader>
index 7e6df0d..782c46d 100644 (file)
@@ -19,7 +19,7 @@ XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir`
 XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins
 MOC_INCLUDE = ../moc-2.4.4
 MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins
-XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/xbmc/cores/DllLoader/exports
+XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/src/cores/DllLoader/exports
 
 COMMON_C = asap.c acpu.c apokeysnd.c
 COMMON_H = asap.h asap_internal.h anylang.h players.h
@@ -51,8 +51,8 @@ libasap_decoder.so: moc/libasap_decoder.c $(COMMON_C) $(COMMON_H)
 
 asap-xbmc: mads/mads xasm/xasm @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so
 
-xbmc/xbmc_asap.o: xbmc/xbmc_asap.c
-       $(CC) -I. -O2 -o $@ -c xbmc/xbmc_asap.c
+src/xbmc_asap.o: src/xbmc_asap.c
+       $(CC) -I. -O2 -o $@ -c src/xbmc_asap.c
 
 asap.o: asap.c $(COMMON_H)
        $(CC) -I. -O2 -o $@ -c asap.c
@@ -63,8 +63,8 @@ acpu.o: acpu.c $(COMMON_H)
 apokeysnd.o: apokeysnd.c
        $(CC) -I. -O2 -o $@ -c apokeysnd.c
 
-@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: xbmc/xbmc_asap.o $(COMMON_O) $(COMMON_H)
-       $(CC) -shared -fPIC -o $@ -I. xbmc/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O)
+@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: src/xbmc_asap.o $(COMMON_O) $(COMMON_H)
+       $(CC) -shared -fPIC -o $@ -I. src/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O)
 
 players.h: files2anylang.pl $(PLAYERS_OBX)
        $(PERL) files2anylang.pl $(PLAYERS_OBX) >$@
@@ -149,7 +149,7 @@ players-clean:
 distclean: clean
 
 clean: players-clean
-       $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h xbmc/xbmc_asap.o
+       $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h src/xbmc_asap.o
 
 README.html: README INSTALL NEWS CREDITS
        $(ASCIIDOC) -o $@ -a asapsrc -a asapports README
index d075528..0e9428e 100644 (file)
@@ -53,7 +53,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -85,7 +85,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
index 54387cc..44aa4d3 100644 (file)
@@ -8,8 +8,8 @@ SOS= libdvdnav-$(ARCH).so
 DIRS=  libdvdread \
        libdvdnav
 
-WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
-WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+WRAPPER=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
+WRAPPER_MACH_ALIAS=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias
 
 ifeq ($(findstring osx,$(ARCH)),osx)
 LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
index cab9560..0a45c3b 100644 (file)
@@ -10,12 +10,12 @@ SLIB=@abs_top_srcdir@/system/$(SO)
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
 
 include @abs_top_srcdir@/Makefile.include
index ce909c1..da8f38e 100644 (file)
@@ -20,13 +20,13 @@ SLIB=$(SYSDIR)/$(SO)
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` \
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
        
 hdhomerun_dll : $(OBJS)
index 5dda4c9..cc1c6f5 100644 (file)
@@ -3,7 +3,7 @@ ARCH=@ARCH@
 SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
          -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
          -Ibuilders/resid-builder/include/sidplay/builders \
-         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC
+         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC
 CFLAGS += $(SIDFLAGS)
 CXXFLAGS += $(SIDFLAGS)
 ifeq ($(ARCH), powerpc-osx)
@@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+       $(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
 
 include @abs_top_srcdir@/Makefile.include
 
+%.o: %.cpp
+       @rm -f $@
+       $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \
+       && $(GEN_DEPS)
+
index 0da88b6..453d1c4 100644 (file)
@@ -27,12 +27,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/nosefart-@ARCH@.so
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
        $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
 
 include @abs_top_srcdir@/Makefile.include
index 89c9955..7d23efc 100644 (file)
@@ -17,12 +17,12 @@ SLIB=$(SYSDIR)/$(SO)
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
 
 %o : %Asm
index 595cf87..c190180 100644 (file)
@@ -20,12 +20,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/stsoundlibrary-@ARCH@.so
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 endif
 
 include @abs_top_srcdir@/Makefile.include
index 3e33e89..94c6061 100644 (file)
@@ -53,11 +53,11 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/timidity-@ARCH@.so
 
 $(SLIB): $(OBJS) exports.def
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias -bundle \
-       -undefined dynamic_lookup -read_only_relocs suppress -o $@ @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias -bundle \
+       -undefined dynamic_lookup -read_only_relocs suppress -o $@ @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` \
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o -Wl,--version-script=exports.def
 endif
  
 include @abs_top_srcdir@/Makefile.include
index edbacef..3455459 100644 (file)
@@ -195,12 +195,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/vgmstream-@ARCH@.so
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
        -bundle -undefined dynamic_lookup -read_only_relocs suppress  -o $@ \
-       @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+       @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
-               `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+               `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
 
 endif
 
index 2f8d090..99ef7c2 100644 (file)
@@ -54,7 +54,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32\;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32\;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32\;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32\;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <PrecompiledHeader>Use</PrecompiledHeader>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index ef8a998..c785502 100644 (file)
@@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnrarXLib", "UnrarXLib.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhts", "..\..\lib\libhts\Win32\libhts_2010.vcxproj", "{00700E12-A63B-4E54-B962-4011A90584BD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visMilkdrop", "..\..\xbmc\visualizations\Milkdrop\Plugin.vcxproj", "{5E479372-4F34-426D-AA1E-9879E94C105D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visMilkdrop", "..\..\src\visualizations\Milkdrop\Plugin.vcxproj", "{5E479372-4F34-426D-AA1E-9879E94C105D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\lib\cmyth\Win32\libcmyth.vcxproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}"
 EndProject
@@ -41,13 +41,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageLib_zlib", "..\..\lib\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexif_dll", "..\..\lib\libexif\libexif.vcxproj", "{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visDirectxSpectrum", "..\..\xbmc\visualizations\DirectXSpectrum\directx_spectrum.vcxproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visDirectxSpectrum", "..\..\src\visualizations\DirectXSpectrum\directx_spectrum.vcxproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmodplug_2010", "..\..\lib\libmodplug\libmodplug_2010.vcxproj", "{C15B374E-7126-48FF-B618-A375D7B17FCF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libRTV", "..\..\lib\libRTV\libRTV.vcxproj", "{DD4818AE-7E35-40B7-A6A0-0FF83AA1C916}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visWaveform", "..\..\xbmc\visualizations\WaveForm\Waveform.vcxproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visWaveform", "..\..\src\visualizations\WaveForm\Waveform.vcxproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squish", "..\..\lib\libsquish\vs7\squish\squish_2010.vcxproj", "{6A8518C3-D81A-4428-BD7F-C37933088AC1}"
 EndProject
@@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\lib\gtest\ms
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_codec", "..\..\lib\addons\library.xbmc.codec\project\VS2010Express\libXBMC_codec.vcxproj", "{F8F1290B-1188-4810-86C9-88178A31D2AF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visVortex", "..\..\xbmc\visualizations\Vortex\Vortex\Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visVortex", "..\..\src\visualizations\Vortex\Vortex\Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}"
        ProjectSection(ProjectDependencies) = postProject
                {034B1D02-CA92-455D-8866-DB95BEE49C10} = {034B1D02-CA92-455D-8866-DB95BEE49C10}
        EndProjectSection
index aca7b82..078931e 100644 (file)
@@ -75,7 +75,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;..\..\lib\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;..\..\lib\gtest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\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\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\lib\SlingboxLib\SlingboxLib.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacks.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAddon.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksGUI.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksPVR.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonVersion.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\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\ApplicationPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
-    <ClCompile Include="..\..\xbmc\Autorun.cpp" />
-    <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
-    <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\CompileInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Encoders\AEEncoderFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAE.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEChannelInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AELimiter.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DataCacheCore.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.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\FFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp" />
-    <ClCompile Include="..\..\xbmc\CueDocument.cpp" />
-    <ClCompile Include="..\..\xbmc\DbUrl.cpp" />
-    <ClCompile Include="..\..\xbmc\dbwrappers\Database.cpp" />
-    <ClCompile Include="..\..\xbmc\dbwrappers\DatabaseQuery.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\GUIDialogExtendedProgressBar.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\GUIDialogKeyboardGeneric.cpp" />
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.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\epg\Epg.cpp" />
-    <ClCompile Include="..\..\xbmc\epg\EpgContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\epg\EpgDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\epg\EpgInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\epg\EpgSearchFilter.cpp" />
-    <ClCompile Include="..\..\xbmc\epg\GUIEPGGridContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\FileItem.cpp" />
-    <ClCompile Include="..\..\xbmc\FileItemListModification.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\AddonsDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\AFPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\AFPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ASAPFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\BlurayDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\BlurayFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\CacheStrategy.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\CDDADirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\CDDAFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\CircularCache.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\CurlFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DAAPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DAAPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DAVCommon.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DAVDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DAVFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\Directory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryCache.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryHistory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\DllLibCurl.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\File.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FileCache.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FavouritesDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FileDirectoryFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FileFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FileReaderFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FTPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\FTPParse.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HTSPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HTSPSession.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HTTPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\HTTPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\IDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\IFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ImageFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\iso9660.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ISO9660Directory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ISOFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\LibraryDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MemBufferCache.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MultiPathDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MusicSearchDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MythDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MythFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\MythSession.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\NFSFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\NptXbmcFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\NSFFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\OGGFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PipeFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PVRDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PVRFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PlaylistDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PlaylistFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PluginDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RarDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RarFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RarManager.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RSSDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RTVDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\RTVFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SAPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SAPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SFTPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SFTPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ShoutcastFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SIDFileDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SlingboxDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SlingboxFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SourcesDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocol.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\StackDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestDirectory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestFile.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestFileFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestRarFile.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestZipFile.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\TuxBoxDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\TuxBoxFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\udf25.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\UDFDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\UDFFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\UPnPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\UPnPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32Directory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32SMBDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32File.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32SMBFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VirtualDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VTPDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VTPFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\VTPSession.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ZipDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ZipFile.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\ZipManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\AnimatedGif.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\cximage.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\D3DResource.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\DDSImage.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\DirectXGraphics.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\DirtyRegionSolvers.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\DirtyRegionTracker.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GraphicContext.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GUIAction.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\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\GUIImage.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GUIIncludes.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GUIInfoTypes.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GUIKeyboardFactory.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\GUISpinControl.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\GUISpinControlEx.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\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\imagefactory.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\IWindowManagerCallback.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\Key.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\LocalizeStrings.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\MatrixGLES.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\StereoscopicsManager.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\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\input\ButtonTranslator.cpp" />
-    <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\input\KeyboardLayout.cpp" />
-    <ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
-    <ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp" />
-    <ClCompile Include="..\..\xbmc\input\MouseStat.cpp" />
-    <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp" />
-    <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp" />
-    <ClCompile Include="..\..\xbmc\input\windows\IRServerSuite.cpp" />
-    <ClCompile Include="..\..\xbmc\input\windows\IrssMessage.cpp" />
-    <ClCompile Include="..\..\xbmc\input\windows\WINJoystick.cpp" />
-    <ClCompile Include="..\..\xbmc\input\XBMC_keytable.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\AnnouncementManager.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\Builtins.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\generic\LanguageInvokerThread.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\generic\ScriptInvocationManager.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\info\InfoBool.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\info\InfoExpression.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\info\SkinVariable.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileItemHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\GUIOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\InputOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONRPC.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlayerOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlaylistOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\ProfilesOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PVROperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\SettingsOperations.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\json-rpc\TextureOperations.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Addon.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonCallback.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonClass.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\CallbackFunction.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\CallbackHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Control.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Dialog.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\File.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\InfoTagMusic.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\InfoTagVideo.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Keyboard.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\LanguageHook.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ListItem.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmc.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcgui.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcplugin.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcvfs.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Monitor.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Player.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\PlayList.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\String.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Window.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowDialog.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowDialogMixin.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowXML.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\AddonPythonInvoker.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\CallbackHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmc.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcaddon.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcgui.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcplugin.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcvfs.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\LanguageHook.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\PyContext.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\PythonInvoker.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\swig.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\test\TestSwig.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\XBPython.cpp" />
-    <ClCompile Include="..\..\xbmc\LangInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\listproviders\IListProvider.cpp" />
-    <ClCompile Include="..\..\xbmc\listproviders\DirectoryProvider.cpp" />
-    <ClCompile Include="..\..\xbmc\listproviders\StaticProvider.cpp" />
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\media\MediaType.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\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\karaoke\karaokevideobackground.cpp" />
-    <ClCompile Include="..\..\xbmc\music\MusicDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\music\MusicDbUrl.cpp" />
-    <ClCompile Include="..\..\xbmc\music\MusicInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\music\Song.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTag.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\MusicInfoTagLoaderMidi.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\TagLibVFSStream.cpp" />
-    <ClCompile Include="..\..\xbmc\music\tags\TagLoaderTagLib.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\AirPlayServer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\AirTunesServer.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\httprequesthandler\HTTPImageHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPJsonRpcHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPVfsHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\network\mdns\ZeroconfBrowserMDNS.cpp" />
-    <ClCompile Include="..\..\xbmc\network\mdns\ZeroconfMDNS.cpp" />
-    <ClCompile Include="..\..\xbmc\network\Network.cpp" />
-    <ClCompile Include="..\..\xbmc\network\NetworkServices.cpp" />
-    <ClCompile Include="..\..\xbmc\network\Socket.cpp" />
-    <ClCompile Include="..\..\xbmc\network\TCPServer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\UdpClient.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnP.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPInternal.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPServer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\network\WakeOnAccess.cpp" />
-    <ClCompile Include="..\..\xbmc\network\WebServer.cpp" />
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocket.cpp" />
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketManager.cpp" />
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketV13.cpp" />
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketV8.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\peripherals\bus\PeripheralBus.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\bus\win32\PeripheralBusUSB.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\Peripheral.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralBluetooth.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralCecAdapter.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralDisk.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralHID.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralNIC.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralImon.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralTuner.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\peripherals\Peripherals.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\playlists\SmartPlaylistFileItemListModifier.cpp" />
-    <ClCompile Include="..\..\xbmc\powermanagement\DPMSSupport.cpp" />
-    <ClCompile Include="..\..\xbmc\powermanagement\PowerManager.cpp" />
-    <ClCompile Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.cpp" />
-    <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\profiles\Profile.cpp" />
-    <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp" />
-    <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp" />
-    <ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp" />
-    <ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClient.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClients.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannel.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroup.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroupInternal.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroups.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroupsContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelManager.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelsOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRCutterOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRDirectorOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGroupManager.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideOSD.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRGUIInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\PVRManager.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\recordings\PVRRecording.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\recordings\PVRRecordings.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\timers\PVRTimerInfoTag.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\timers\PVRTimers.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIViewStatePVR.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRBase.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRChannels.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRGuide.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRRecordings.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRSearch.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimers.cpp" />
-    <ClCompile Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.cpp" />
-    <ClCompile Include="..\..\xbmc\rendering\dx\RenderSystemDX.cpp" />
-    <ClCompile Include="..\..\xbmc\rendering\RenderSystem.cpp" />
-    <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\AdvancedSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsBase.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManagerBase.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManualBase.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\ISetting.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\ISettingControl.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\Setting.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingCategoryAccess.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingConditions.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingDependency.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingRequirement.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingSection.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingsManager.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingUpdate.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingAddon.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingConditions.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingControl.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingCreator.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingPath.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\Settings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SettingUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIControlSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.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\test\TestBasicEnvironment.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestFileItem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestTextureUtils.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestUtils.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\xbmc-test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\TextureCache.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureCacheJob.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\DatabaseManager.cpp" />
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksCodec.h" />
-    <ClInclude Include="..\..\xbmc\ApplicationPlayer.h" />
-    <ClInclude Include="..\..\xbmc\AppParamParser.h" />
-    <ClInclude Include="..\..\xbmc\CompileInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\DataCacheCore.h" />
-    <CustomBuild Include="..\..\xbmc\GitRevision.h">
+    <ClCompile Include="..\..\src\addons\AddonCallbacks.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonCallbacksAddon.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonCallbacksCodec.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonCallbacksGUI.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonCallbacksPVR.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonDatabase.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonInstaller.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonVersion.cpp" />
+    <ClCompile Include="..\..\src\addons\GUIDialogAddonInfo.cpp" />
+    <ClCompile Include="..\..\src\addons\GUIDialogAddonSettings.cpp" />
+    <ClCompile Include="..\..\src\addons\GUIViewStateAddonBrowser.cpp" />
+    <ClCompile Include="..\..\src\addons\GUIWindowAddonBrowser.cpp" />
+    <ClCompile Include="..\..\src\addons\PluginSource.cpp" />
+    <ClCompile Include="..\..\src\addons\Repository.cpp" />
+    <ClCompile Include="..\..\src\addons\Service.cpp" />
+    <ClCompile Include="..\..\src\addons\Skin.cpp" />
+    <ClCompile Include="..\..\src\Application.cpp" />
+    <ClCompile Include="..\..\src\ApplicationMessenger.cpp" />
+    <ClCompile Include="..\..\src\ApplicationPlayer.cpp" />
+    <ClCompile Include="..\..\src\AppParamParser.cpp" />
+    <ClCompile Include="..\..\src\Autorun.cpp" />
+    <ClCompile Include="..\..\src\AutoSwitch.cpp" />
+    <ClCompile Include="..\..\src\BackgroundInfoLoader.cpp" />
+    <ClCompile Include="..\..\src\CompileInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\AEFactory.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\AEResampleFactory.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\AESinkFactory.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Encoders\AEEncoderFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAE.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkDirectSound.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkNULL.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkWASAPI.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEBitstreamPacker.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEBuffer.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEChannelInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEDeviceInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AELimiter.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEPackIEC61937.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEStreamInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEUtil.cpp" />
+    <ClCompile Include="..\..\src\cores\DataCacheCore.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp" />
+    <ClCompile Include="..\..\src\cores\FFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererGUI.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderCapture.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp" />
+    <ClCompile Include="..\..\src\CueDocument.cpp" />
+    <ClCompile Include="..\..\src\DbUrl.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\Database.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\DatabaseQuery.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\dataset.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\mysqldataset.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\qry_dat.cpp" />
+    <ClCompile Include="..\..\src\dbwrappers\sqlitedataset.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogBoxBase.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogBusy.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogButtonMenu.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogCache.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogContextMenu.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogExtendedProgressBar.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogFavourites.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogFileBrowser.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogGamepad.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogKaiToast.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogKeyboardGeneric.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMediaFilter.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMediaSource.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMuteBug.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogNumeric.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogOK.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogPlayEject.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogPlayerControls.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogProgress.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSeekBar.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSelect.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSlider.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSmartPlaylistEditor.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSmartPlaylistRule.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSubMenu.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogTextViewer.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogVolumeBar.cpp" />
+    <ClCompile Include="..\..\src\dialogs\GUIDialogYesNo.cpp" />
+    <ClCompile Include="..\..\src\DynamicDll.cpp" />
+    <ClCompile Include="..\..\src\epg\Epg.cpp" />
+    <ClCompile Include="..\..\src\epg\EpgContainer.cpp" />
+    <ClCompile Include="..\..\src\epg\EpgDatabase.cpp" />
+    <ClCompile Include="..\..\src\epg\EpgInfoTag.cpp" />
+    <ClCompile Include="..\..\src\epg\EpgSearchFilter.cpp" />
+    <ClCompile Include="..\..\src\epg\GUIEPGGridContainer.cpp" />
+    <ClCompile Include="..\..\src\FileItem.cpp" />
+    <ClCompile Include="..\..\src\FileItemListModification.cpp" />
+    <ClCompile Include="..\..\src\filesystem\AddonsDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\AFPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\AFPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ASAPFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\BlurayDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\BlurayFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\CacheStrategy.cpp" />
+    <ClCompile Include="..\..\src\filesystem\CDDADirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\CDDAFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\CircularCache.cpp" />
+    <ClCompile Include="..\..\src\filesystem\CurlFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DAAPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DAAPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DAVCommon.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DAVDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DAVFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\Directory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DirectoryCache.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DirectoryFactory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DirectoryHistory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\DllLibCurl.cpp" />
+    <ClCompile Include="..\..\src\filesystem\File.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FileCache.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FavouritesDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FileDirectoryFactory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FileFactory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FileReaderFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FTPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\FTPParse.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HDHomeRunDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HDHomeRunFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HTSPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HTSPSession.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HTTPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\HTTPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\IDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\IFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ImageFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\iso9660.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ISO9660Directory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ISOFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\LibraryDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MemBufferCache.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MultiPathDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MultiPathFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MusicFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MusicSearchDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MythDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MythFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\MythSession.cpp" />
+    <ClCompile Include="..\..\src\filesystem\NFSDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\NFSFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\NptXbmcFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\NSFFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\OGGFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PipeFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PVRDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PVRFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PipesManager.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PlaylistDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PlaylistFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\PluginDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RarDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RarFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RarManager.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RSSDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RTVDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\RTVFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SAPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SAPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SFTPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SFTPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ShoutcastFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SIDFileDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SlingboxDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SlingboxFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SmartPlaylistDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SourcesDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocol.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocolDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocolFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\StackDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\test\TestDirectory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesystem\test\TestFile.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesystem\test\TestFileFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesystem\test\TestRarFile.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesystem\test\TestZipFile.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesystem\TuxBoxDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\TuxBoxFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\udf25.cpp" />
+    <ClCompile Include="..\..\src\filesystem\UDFDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\UDFFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\UPnPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\UPnPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VideoDatabaseDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp" />
+    <ClCompile Include="..\..\src\filesystem\win32\Win32Directory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\win32\Win32SMBDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\win32\Win32File.cpp" />
+    <ClCompile Include="..\..\src\filesystem\win32\Win32SMBFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VirtualDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VTPDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VTPFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\VTPSession.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ZeroconfDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ZipDirectory.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ZipFile.cpp" />
+    <ClCompile Include="..\..\src\filesystem\ZipManager.cpp" />
+    <ClCompile Include="..\..\src\GUIInfoManager.cpp" />
+    <ClCompile Include="..\..\src\GUILargeTextureManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\AnimatedGif.cpp" />
+    <ClCompile Include="..\..\src\guilib\cximage.cpp" />
+    <ClCompile Include="..\..\src\guilib\D3DResource.cpp" />
+    <ClCompile Include="..\..\src\guilib\DDSImage.cpp" />
+    <ClCompile Include="..\..\src\guilib\DirectXGraphics.cpp" />
+    <ClCompile Include="..\..\src\guilib\DirtyRegionSolvers.cpp" />
+    <ClCompile Include="..\..\src\guilib\DirtyRegionTracker.cpp" />
+    <ClCompile Include="..\..\src\guilib\GraphicContext.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIAction.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIAudioManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIBaseContainer.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIBorderedImage.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIButtonControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUICheckMarkControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIColorManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIControlFactory.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIControlGroup.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIControlGroupList.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIControlProfiler.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIDialog.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIEditControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFadeLabelControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFixedListContainer.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFont.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFontManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFontTTF.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIFontTTFDX.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIImage.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIIncludes.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIInfoTypes.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIKeyboardFactory.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUILabel.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUILabelControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIListContainer.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIListGroup.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIListItem.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIListItemLayout.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIListLabel.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIMessage.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIMoverControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIMultiImage.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIMultiSelectText.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIPanelContainer.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIProgressControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIRadioButtonControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIRenderingControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIResizeControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIRSSControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIScrollBarControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUISelectButtonControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUISettingsSliderControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIShader.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUISliderControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUISpinControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUISpinControlEx.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIStaticItem.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUITextBox.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUITextLayout.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUITexture.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUITextureD3D.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIToggleButtonControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIVideoControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIVisualisationControl.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIWindow.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIWindowManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\GUIWrappingListContainer.cpp" />
+    <ClCompile Include="..\..\src\guilib\imagefactory.cpp" />
+    <ClCompile Include="..\..\src\guilib\IWindowManagerCallback.cpp" />
+    <ClCompile Include="..\..\src\guilib\JpegIO.cpp" />
+    <ClCompile Include="..\..\src\guilib\Key.cpp" />
+    <ClCompile Include="..\..\src\guilib\LocalizeStrings.cpp" />
+    <ClCompile Include="..\..\src\guilib\MatrixGLES.cpp" />
+    <ClCompile Include="..\..\src\guilib\StereoscopicsManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\Texture.cpp" />
+    <ClCompile Include="..\..\src\guilib\TextureBundle.cpp" />
+    <ClCompile Include="..\..\src\guilib\TextureBundleXBT.cpp" />
+    <ClCompile Include="..\..\src\guilib\TextureBundleXPR.cpp" />
+    <ClCompile Include="..\..\src\guilib\TextureDX.cpp" />
+    <ClCompile Include="..\..\src\guilib\TextureManager.cpp" />
+    <ClCompile Include="..\..\src\guilib\VisibleEffect.cpp" />
+    <ClCompile Include="..\..\src\guilib\XBTF.cpp" />
+    <ClCompile Include="..\..\src\guilib\XBTFReader.cpp" />
+    <ClCompile Include="..\..\src\GUIPassword.cpp" />
+    <ClCompile Include="..\..\src\input\ButtonTranslator.cpp" />
+    <ClCompile Include="..\..\src\input\InertialScrollingHandler.cpp" />
+    <ClCompile Include="..\..\src\input\KeyboardLayout.cpp" />
+    <ClCompile Include="..\..\src\input\KeyboardLayoutConfiguration.cpp" />
+    <ClCompile Include="..\..\src\input\KeyboardStat.cpp" />
+    <ClCompile Include="..\..\src\input\MouseStat.cpp" />
+    <ClCompile Include="..\..\src\input\touch\generic\GenericTouchActionHandler.cpp" />
+    <ClCompile Include="..\..\src\input\touch\generic\GenericTouchSwipeDetector.cpp" />
+    <ClCompile Include="..\..\src\input\touch\ITouchInputHandling.cpp" />
+    <ClCompile Include="..\..\src\input\windows\IRServerSuite.cpp" />
+    <ClCompile Include="..\..\src\input\windows\IrssMessage.cpp" />
+    <ClCompile Include="..\..\src\input\windows\WINJoystick.cpp" />
+    <ClCompile Include="..\..\src\input\XBMC_keytable.cpp" />
+    <ClCompile Include="..\..\src\interfaces\AnnouncementManager.cpp" />
+    <ClCompile Include="..\..\src\interfaces\Builtins.cpp" />
+    <ClCompile Include="..\..\src\interfaces\generic\LanguageInvokerThread.cpp" />
+    <ClCompile Include="..\..\src\interfaces\generic\ScriptInvocationManager.cpp" />
+    <ClCompile Include="..\..\src\interfaces\info\InfoBool.cpp" />
+    <ClCompile Include="..\..\src\interfaces\info\InfoExpression.cpp" />
+    <ClCompile Include="..\..\src\interfaces\info\SkinVariable.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\AddonsOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\ApplicationOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\AudioLibrary.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FavouritesOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FileItemHandler.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FileOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\GUIOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\InputOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\JSONRPC.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\JSONServiceDescription.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PlayerOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PlaylistOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\ProfilesOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PVROperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\SettingsOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\SystemOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\VideoLibrary.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\XBMCOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\json-rpc\TextureOperations.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Addon.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonCallback.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonClass.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonUtils.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\CallbackFunction.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\CallbackHandler.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Control.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Dialog.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\File.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\InfoTagMusic.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\InfoTagVideo.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Keyboard.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\LanguageHook.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\ListItem.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmc.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcgui.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcplugin.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcvfs.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Monitor.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Player.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\PlayList.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\String.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\Window.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowDialog.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowDialogMixin.cpp" />
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowXML.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\AddonPythonInvoker.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\CallbackHandler.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmc.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcaddon.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcgui.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcplugin.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcvfs.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\LanguageHook.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\PyContext.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\PythonInvoker.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\swig.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\test\TestSwig.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\interfaces\python\XBPython.cpp" />
+    <ClCompile Include="..\..\src\LangInfo.cpp" />
+    <ClCompile Include="..\..\src\listproviders\IListProvider.cpp" />
+    <ClCompile Include="..\..\src\listproviders\DirectoryProvider.cpp" />
+    <ClCompile Include="..\..\src\listproviders\StaticProvider.cpp" />
+    <ClCompile Include="..\..\src\MediaSource.cpp" />
+    <ClCompile Include="..\..\src\media\MediaType.cpp" />
+    <ClCompile Include="..\..\src\music\Album.cpp" />
+    <ClCompile Include="..\..\src\music\Artist.cpp" />
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicInfo.cpp" />
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicOSD.cpp" />
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicOverlay.cpp" />
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogSongInfo.cpp" />
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogVisualisationPresetList.cpp" />
+    <ClCompile Include="..\..\src\music\GUIViewStateMusic.cpp" />
+    <ClCompile Include="..\..\src\music\infoscanner\MusicAlbumInfo.cpp" />
+    <ClCompile Include="..\..\src\music\infoscanner\MusicArtistInfo.cpp" />
+    <ClCompile Include="..\..\src\music\infoscanner\MusicInfoScanner.cpp" />
+    <ClCompile Include="..\..\src\music\infoscanner\MusicInfoScraper.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\GUIDialogKaraokeSongSelector.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\GUIWindowKaraokeLyrics.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyrics.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricscdg.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricsfactory.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricsmanager.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstext.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextkar.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextlrc.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextustar.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokewindowbackground.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\karaokevideobackground.cpp" />
+    <ClCompile Include="..\..\src\music\MusicDatabase.cpp" />
+    <ClCompile Include="..\..\src\music\MusicDbUrl.cpp" />
+    <ClCompile Include="..\..\src\music\MusicInfoLoader.cpp" />
+    <ClCompile Include="..\..\src\music\Song.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTag.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderASAP.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderCDDA.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderDatabase.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderFactory.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderMidi.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderNSF.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderShn.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderSPC.cpp" />
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderYM.cpp" />
+    <ClCompile Include="..\..\src\music\tags\TagLibVFSStream.cpp" />
+    <ClCompile Include="..\..\src\music\tags\TagLoaderTagLib.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicBase.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicNav.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicPlaylist.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicPlaylistEditor.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicSongs.cpp" />
+    <ClCompile Include="..\..\src\music\windows\GUIWindowVisualisation.cpp" />
+    <ClCompile Include="..\..\src\network\AirPlayServer.cpp" />
+    <ClCompile Include="..\..\src\network\AirTunesServer.cpp" />
+    <ClCompile Include="..\..\src\network\cddb.cpp" />
+    <ClCompile Include="..\..\src\network\DNSNameCache.cpp" />
+    <ClCompile Include="..\..\src\network\EventClient.cpp" />
+    <ClCompile Include="..\..\src\network\EventPacket.cpp" />
+    <ClCompile Include="..\..\src\network\EventServer.cpp" />
+    <ClCompile Include="..\..\src\network\GUIDialogAccessPoints.cpp" />
+    <ClCompile Include="..\..\src\network\GUIDialogNetworkSetup.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPImageHandler.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPJsonRpcHandler.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPVfsHandler.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceHandler.cpp" />
+    <ClCompile Include="..\..\src\network\httprequesthandler\IHTTPRequestHandler.cpp" />
+    <ClCompile Include="..\..\src\network\mdns\ZeroconfBrowserMDNS.cpp" />
+    <ClCompile Include="..\..\src\network\mdns\ZeroconfMDNS.cpp" />
+    <ClCompile Include="..\..\src\network\Network.cpp" />
+    <ClCompile Include="..\..\src\network\NetworkServices.cpp" />
+    <ClCompile Include="..\..\src\network\Socket.cpp" />
+    <ClCompile Include="..\..\src\network\TCPServer.cpp" />
+    <ClCompile Include="..\..\src\network\UdpClient.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnP.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnPInternal.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnPPlayer.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnPRenderer.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnPServer.cpp" />
+    <ClCompile Include="..\..\src\network\upnp\UPnPSettings.cpp" />
+    <ClCompile Include="..\..\src\network\WakeOnAccess.cpp" />
+    <ClCompile Include="..\..\src\network\WebServer.cpp" />
+    <ClCompile Include="..\..\src\network\websocket\WebSocket.cpp" />
+    <ClCompile Include="..\..\src\network\websocket\WebSocketManager.cpp" />
+    <ClCompile Include="..\..\src\network\websocket\WebSocketV13.cpp" />
+    <ClCompile Include="..\..\src\network\websocket\WebSocketV8.cpp" />
+    <ClCompile Include="..\..\src\network\windows\NetworkWin32.cpp" />
+    <ClCompile Include="..\..\src\network\Zeroconf.cpp" />
+    <ClCompile Include="..\..\src\network\ZeroconfBrowser.cpp" />
+    <ClCompile Include="..\..\src\NfoFile.cpp" />
+    <ClCompile Include="..\..\src\PartyModeManager.cpp" />
+    <ClCompile Include="..\..\src\PasswordManager.cpp" />
+    <ClCompile Include="..\..\src\peripherals\bus\PeripheralBus.cpp" />
+    <ClCompile Include="..\..\src\peripherals\bus\virtual\PeripheralBusCEC.cpp" />
+    <ClCompile Include="..\..\src\peripherals\bus\win32\PeripheralBusUSB.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\Peripheral.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralBluetooth.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralCecAdapter.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralDisk.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralHID.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralNIC.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralNyxboard.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralImon.cpp" />
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralTuner.cpp" />
+    <ClCompile Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralManager.cpp" />
+    <ClCompile Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralSettings.cpp" />
+    <ClCompile Include="..\..\src\peripherals\Peripherals.cpp" />
+    <ClCompile Include="..\..\src\pictures\GUIDialogPictureInfo.cpp" />
+    <ClCompile Include="..\..\src\pictures\GUIViewStatePictures.cpp" />
+    <ClCompile Include="..\..\src\pictures\GUIWindowPictures.cpp" />
+    <ClCompile Include="..\..\src\pictures\GUIWindowSlideShow.cpp" />
+    <ClCompile Include="..\..\src\pictures\Picture.cpp" />
+    <ClCompile Include="..\..\src\pictures\PictureInfoLoader.cpp" />
+    <ClCompile Include="..\..\src\pictures\PictureInfoTag.cpp" />
+    <ClCompile Include="..\..\src\pictures\PictureThumbLoader.cpp" />
+    <ClCompile Include="..\..\src\pictures\SlideShowPicture.cpp" />
+    <ClCompile Include="..\..\src\PlayListPlayer.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayList.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListB4S.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListFactory.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListM3U.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListPLS.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListURL.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListWPL.cpp" />
+    <ClCompile Include="..\..\src\playlists\PlayListXML.cpp" />
+    <ClCompile Include="..\..\src\playlists\SmartPlayList.cpp" />
+    <ClCompile Include="..\..\src\playlists\SmartPlaylistFileItemListModifier.cpp" />
+    <ClCompile Include="..\..\src\powermanagement\DPMSSupport.cpp" />
+    <ClCompile Include="..\..\src\powermanagement\PowerManager.cpp" />
+    <ClCompile Include="..\..\src\powermanagement\windows\Win32PowerSyscall.cpp" />
+    <ClCompile Include="..\..\src\profiles\dialogs\GUIDialogLockSettings.cpp" />
+    <ClCompile Include="..\..\src\profiles\dialogs\GUIDialogProfileSettings.cpp" />
+    <ClCompile Include="..\..\src\profiles\Profile.cpp" />
+    <ClCompile Include="..\..\src\profiles\ProfilesManager.cpp" />
+    <ClCompile Include="..\..\src\profiles\windows\GUIWindowSettingsProfile.cpp" />
+    <ClCompile Include="..\..\src\programs\GUIViewStatePrograms.cpp" />
+    <ClCompile Include="..\..\src\programs\GUIWindowPrograms.cpp" />
+    <ClCompile Include="..\..\src\pvr\addons\PVRClient.cpp" />
+    <ClCompile Include="..\..\src\pvr\addons\PVRClients.cpp" />
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannel.cpp" />
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroup.cpp" />
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroupInternal.cpp" />
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroups.cpp" />
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroupsContainer.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelManager.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelsOSD.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRCutterOSD.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRDirectorOSD.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGroupManager.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideInfo.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideOSD.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideSearch.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRRecordingInfo.cpp" />
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRTimerSettings.cpp" />
+    <ClCompile Include="..\..\src\pvr\PVRDatabase.cpp" />
+    <ClCompile Include="..\..\src\pvr\PVRGUIInfo.cpp" />
+    <ClCompile Include="..\..\src\pvr\PVRManager.cpp" />
+    <ClCompile Include="..\..\src\pvr\recordings\PVRRecording.cpp" />
+    <ClCompile Include="..\..\src\pvr\recordings\PVRRecordings.cpp" />
+    <ClCompile Include="..\..\src\pvr\timers\PVRTimerInfoTag.cpp" />
+    <ClCompile Include="..\..\src\pvr\timers\PVRTimers.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIViewStatePVR.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRBase.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRChannels.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRGuide.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRRecordings.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRSearch.cpp" />
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRTimers.cpp" />
+    <ClCompile Include="..\..\src\rendering\dx\GUIWindowTestPatternDX.cpp" />
+    <ClCompile Include="..\..\src\rendering\dx\RenderSystemDX.cpp" />
+    <ClCompile Include="..\..\src\rendering\RenderSystem.cpp" />
+    <ClCompile Include="..\..\src\SectionLoader.cpp" />
+    <ClCompile Include="..\..\src\settings\AdvancedSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogContentSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsBase.cpp" />
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsManagerBase.cpp" />
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsManualBase.cpp" />
+    <ClCompile Include="..\..\src\settings\DisplaySettings.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\ISetting.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\ISettingControl.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\Setting.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingCategoryAccess.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingConditions.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingDependency.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingRequirement.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingSection.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingsManager.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\SettingUpdate.cpp" />
+    <ClCompile Include="..\..\src\settings\MediaSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\MediaSourceSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingAddon.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingConditions.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingControl.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingCreator.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingPath.cpp" />
+    <ClCompile Include="..\..\src\settings\Settings.cpp" />
+    <ClCompile Include="..\..\src\settings\SettingUtils.cpp" />
+    <ClCompile Include="..\..\src\settings\SkinSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\VideoSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\windows\GUIControlSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettings.cpp" />
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettingsCategory.cpp" />
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettingsScreenCalibration.cpp" />
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowTestPattern.cpp" />
+    <ClCompile Include="..\..\src\storage\AutorunMediaJob.cpp" />
+    <ClCompile Include="..\..\src\storage\cdioSupport.cpp" />
+    <ClCompile Include="..\..\src\storage\IoSupport.cpp" />
+    <ClCompile Include="..\..\src\storage\MediaManager.cpp" />
+    <ClCompile Include="..\..\src\storage\windows\Win32StorageProvider.cpp" />
+    <ClCompile Include="..\..\src\SystemGlobals.cpp" />
+    <ClCompile Include="..\..\src\Temperature.cpp" />
+    <ClCompile Include="..\..\src\test\TestBasicEnvironment.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\TestFileItem.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\TestTextureUtils.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\TestUtils.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\test\xbmc-test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\TextureCache.cpp" />
+    <ClCompile Include="..\..\src\TextureCacheJob.cpp" />
+    <ClCompile Include="..\..\src\TextureDatabase.cpp" />
+    <ClCompile Include="..\..\src\DatabaseManager.cpp" />
+    <ClInclude Include="..\..\src\addons\AddonCallbacksCodec.h" />
+    <ClInclude Include="..\..\src\ApplicationPlayer.h" />
+    <ClInclude Include="..\..\src\AppParamParser.h" />
+    <ClInclude Include="..\..\src\CompileInfo.h" />
+    <ClInclude Include="..\..\src\cores\DataCacheCore.h" />
+    <CustomBuild Include="..\..\src\GitRevision.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CALL update_git_rev.bat</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\xbmc\win32\git_rev.h</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\.git\HEAD;..\..\xbmc\win32\git_rev.tmpl</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\win32\git_rev.h</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\.git\HEAD;..\..\src\win32\git_rev.tmpl</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Retrieving the git revision</Message>
     </CustomBuild>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEAudioFormat.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Encoders\AEEncoderFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAE.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AE.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEResample.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEEncoder.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AESink.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AESound.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\ThreadedAE.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEChannelInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AELimiter.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h" />
-    <ClInclude Include="..\..\xbmc\cores\FFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.h" />
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKeyboardGeneric.h" />
-    <ClInclude Include="..\..\xbmc\DbUrl.h" />
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.h" />
-    <ClInclude Include="..\..\xbmc\FileItemListModification.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\BlurayFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HTTPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ImageFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32Directory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32SMBDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32File.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32SMBFile.h" />
-    <ClInclude Include="..\..\xbmc\guilib\cximage.h" />
-    <ClInclude Include="..\..\xbmc\guilib\GUIKeyboard.h" />
-    <ClInclude Include="..\..\xbmc\guilib\GUIKeyboardFactory.h" />
-    <ClInclude Include="..\..\xbmc\guilib\iimage.h" />
-    <ClInclude Include="..\..\xbmc\guilib\imagefactory.h" />
-    <ClInclude Include="..\..\xbmc\guilib\ISliderCallback.h" />
-    <ClInclude Include="..\..\xbmc\IFileItemListModifier.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h" />
-    <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h" />
-    <ClInclude Include="..\..\xbmc\input\windows\WINJoystick.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ILanguageInvocationHandler.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ILanguageInvoker.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\generic\LanguageInvokerThread.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ScriptInvocationManager.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ProfilesOperations.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PVROperations.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\SettingsOperations.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Addon.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonCallback.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonClass.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonString.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonUtils.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Alternative.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\aojsonrpc.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\CallbackFunction.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\CallbackHandler.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Control.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Dialog.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Dictionary.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Exception.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\File.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\InfoTagMusic.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\InfoTagVideo.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Keyboard.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\LanguageHook.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\List.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ListItem.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmc.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcgui.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcplugin.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcvfs.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Monitor.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Player.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\PlayList.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\RenderCapture.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\swighelper.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Tuple.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Window.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowDialog.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowDialogMixin.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowException.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowInterceptor.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowXML.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\AddonPythonInvoker.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\CallbackHandler.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\LanguageHook.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\preamble.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\PythonInvoker.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h" />
-    <ClInclude Include="..\..\xbmc\media\MediaType.h" />
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
-    <ClInclude Include="..\..\xbmc\network\NetworkServices.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h" />
-    <ClInclude Include="..\..\xbmc\playlists\SmartPlaylistFileItemListModifier.h" />
-    <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h" />
-    <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h" />
-    <ClInclude Include="..\..\xbmc\profiles\Profile.h" />
-    <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h" />
-    <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h" />
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsBase.h" />
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManagerBase.h" />
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManualBase.h" />
-    <ClInclude Include="..\..\xbmc\settings\DiscSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISetting.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingCallback.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingControl.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingControlCreator.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingCreator.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingsHandler.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISubSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\Setting.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingCategoryAccess.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingConditions.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingDefinitions.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingDependency.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingRequirement.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingSection.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingsManager.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingUpdate.h" />
-    <ClInclude Include="..\..\xbmc\settings\MediaSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingAddon.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingConditions.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingControl.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingCreator.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingPath.h" />
-    <ClInclude Include="..\..\xbmc\settings\SettingUtils.h" />
-    <ClInclude Include="..\..\xbmc\settings\SkinSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIControlSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h" />
-    <ClInclude Include="..\..\xbmc\utils\ActorProtocol.h" />
-    <ClInclude Include="..\..\xbmc\utils\auto_buffer.h" />
-    <ClInclude Include="..\..\xbmc\utils\BooleanLogic.h" />
-    <ClInclude Include="..\..\xbmc\utils\CharsetDetection.h" />
-    <ClInclude Include="..\..\xbmc\utils\IRssObserver.h" />
-    <ClInclude Include="..\..\xbmc\utils\IXmlDeserializable.h" />
-    <ClInclude Include="..\..\xbmc\utils\LegacyPathTranslation.h" />
-    <ClInclude Include="..\..\xbmc\utils\MarkWatchedJob.h" />
-    <ClInclude Include="..\..\xbmc\utils\params_check_macros.h" />
-    <ClInclude Include="..\..\xbmc\utils\RssManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\StringValidation.h" />
-    <ClInclude Include="..\..\xbmc\utils\Utf8Utils.h" />
-    <ClInclude Include="..\..\xbmc\utils\uXstrings.h" />
-    <ClInclude Include="..\..\xbmc\utils\Vector.h" />
-    <ClInclude Include="..\..\xbmc\utils\win32\Win32InterfaceForCLog.h" />
-    <ClInclude Include="..\..\xbmc\utils\win32\Win32Log.h" />
-    <ClInclude Include="..\..\xbmc\utils\XSLTUtils.h" />
-    <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\swig.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h" />
-    <ClInclude Include="..\..\xbmc\music\MusicDbUrl.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\TagLibVFSStream.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\TagLoaderTagLib.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPImageHandler.h" />
-    <ClInclude Include="..\..\xbmc\network\AirTunesServer.h" />
-    <ClInclude Include="..\..\xbmc\network\DllLibShairplay.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnP.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPInternal.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPRenderer.h" />
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPServer.h" />
-    <ClInclude Include="..\..\xbmc\network\WakeOnAccess.h" />
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocket.h" />
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketManager.h" />
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketV13.h" />
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketV8.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\IJSONRPCAnnouncer.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONRPCUtils.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\GUIOperations.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPJsonRpcHandler.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPVfsHandler.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.h" />
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\CircularCache.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryCache.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FavouritesDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FileCache.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MemBufferCache.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\AddonsDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\AFPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\AFPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ASAPFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\BlurayDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\CacheStrategy.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\CDDADirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\CDDAFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\CurlFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DAAPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DAAPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DAVDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\Directory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryFactory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibAfp.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibCMyth.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibCurl.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibNfs.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\File.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FileDirectoryFactory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FileReaderFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FTPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\FTPParse.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HTSPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HTSPSession.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\HTTPDirectory.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\ISOFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\LibraryDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MultiPathDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MultiPathFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MusicFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MusicSearchDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MythDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MythFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MythSession.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\NFSFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\NSFFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\OGGFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PipeFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PlaylistDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PlaylistFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PluginDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RarDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RarFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RarManager.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RSSDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RTVDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\RTVFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SAPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SAPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SFTPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SFTPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ShoutcastFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SIDFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SlingboxDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SlingboxFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SourcesDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocol.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\StackDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\TuxBoxDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\TuxBoxFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\udf25.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\UDFDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\UDFFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\UPnPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\UPnPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VTPDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VTPFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\VTPSession.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ZipDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ZipFile.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ZipManager.h" />
-    <ClInclude Include="..\..\xbmc\network\mdns\ZeroconfBrowserMDNS.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralImon.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h" />
-    <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ActorProtocol.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\auto_buffer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\BooleanLogic.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\CharsetDetection.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\LegacyPathTranslation.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\MarkWatchedJob.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\StringValidation.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\test\TestUrlOptions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Utf8Utils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Vector.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\win32\Win32InterfaceForCLog.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\win32\Win32Log.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\XSLTUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\video\PlayerController.cpp" />
-    <ClCompile Include="..\..\xbmc\video\videosync\VideoSyncD3D.cpp" />
-    <ClCompile Include="..\..\xbmc\video\VideoThumbLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\music\MusicThumbLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
-    <ClCompile Include="..\..\xbmc\URL.cpp" />
-    <ClCompile Include="..\..\xbmc\Util.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Screenshot.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\Base64.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\DatabaseUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\EdenVideoArtUpdater.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\EndianSwap.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">
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEAudioFormat.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEFactory.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEResampleFactory.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\AESinkFactory.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Encoders\AEEncoderFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAE.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AE.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEResample.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEEncoder.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AESink.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AESound.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEStream.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\ThreadedAE.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkDirectSound.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkNULL.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkWASAPI.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEBitstreamPacker.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEBuffer.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEChannelInfo.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEDeviceInfo.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AELimiter.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEPackIEC61937.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEStreamInfo.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEUtil.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h" />
+    <ClInclude Include="..\..\src\cores\FFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererGUI.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogKeyboardGeneric.h" />
+    <ClInclude Include="..\..\src\DbUrl.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMediaFilter.h" />
+    <ClInclude Include="..\..\src\FileItemListModification.h" />
+    <ClInclude Include="..\..\src\filesystem\BlurayFile.h" />
+    <ClInclude Include="..\..\src\filesystem\HTTPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\DAVCommon.h" />
+    <ClInclude Include="..\..\src\filesystem\DAVFile.h" />
+    <ClInclude Include="..\..\src\filesystem\ImageFile.h" />
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h" />
+    <ClInclude Include="..\..\src\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h" />
+    <ClInclude Include="..\..\src\filesystem\win32\Win32Directory.h" />
+    <ClInclude Include="..\..\src\filesystem\win32\Win32SMBDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\win32\Win32File.h" />
+    <ClInclude Include="..\..\src\filesystem\win32\Win32SMBFile.h" />
+    <ClInclude Include="..\..\src\guilib\cximage.h" />
+    <ClInclude Include="..\..\src\guilib\GUIKeyboard.h" />
+    <ClInclude Include="..\..\src\guilib\GUIKeyboardFactory.h" />
+    <ClInclude Include="..\..\src\guilib\iimage.h" />
+    <ClInclude Include="..\..\src\guilib\imagefactory.h" />
+    <ClInclude Include="..\..\src\guilib\ISliderCallback.h" />
+    <ClInclude Include="..\..\src\IFileItemListModifier.h" />
+    <ClInclude Include="..\..\src\input\touch\generic\GenericTouchActionHandler.h" />
+    <ClInclude Include="..\..\src\input\touch\generic\GenericTouchSwipeDetector.h" />
+    <ClInclude Include="..\..\src\input\touch\generic\IGenericTouchGestureDetector.h" />
+    <ClInclude Include="..\..\src\input\touch\ITouchActionHandler.h" />
+    <ClInclude Include="..\..\src\input\touch\ITouchInputHandler.h" />
+    <ClInclude Include="..\..\src\input\touch\ITouchInputHandling.h" />
+    <ClInclude Include="..\..\src\input\touch\TouchTypes.h" />
+    <ClInclude Include="..\..\src\input\windows\WINJoystick.h" />
+    <ClInclude Include="..\..\src\interfaces\generic\ILanguageInvocationHandler.h" />
+    <ClInclude Include="..\..\src\interfaces\generic\ILanguageInvoker.h" />
+    <ClInclude Include="..\..\src\interfaces\generic\LanguageInvokerThread.h" />
+    <ClInclude Include="..\..\src\interfaces\generic\ScriptInvocationManager.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FavouritesOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ProfilesOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PVROperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\SettingsOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Addon.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonCallback.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonClass.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonString.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonUtils.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Alternative.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\aojsonrpc.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\CallbackFunction.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\CallbackHandler.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Control.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Dialog.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Dictionary.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Exception.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\File.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\InfoTagMusic.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\InfoTagVideo.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Keyboard.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\LanguageHook.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\List.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\ListItem.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmc.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcgui.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcplugin.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcvfs.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Monitor.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Player.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\PlayList.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\RenderCapture.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\swighelper.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Tuple.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\Window.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowDialog.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowDialogMixin.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowException.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowInterceptor.h" />
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowXML.h" />
+    <ClInclude Include="..\..\src\interfaces\python\AddonPythonInvoker.h" />
+    <ClInclude Include="..\..\src\interfaces\python\CallbackHandler.h" />
+    <ClInclude Include="..\..\src\interfaces\python\LanguageHook.h" />
+    <ClInclude Include="..\..\src\interfaces\python\preamble.h" />
+    <ClInclude Include="..\..\src\interfaces\python\PyContext.h" />
+    <ClInclude Include="..\..\src\interfaces\python\PythonInvoker.h" />
+    <ClInclude Include="..\..\src\interfaces\python\pythreadstate.h" />
+    <ClInclude Include="..\..\src\media\MediaType.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokevideobackground.h" />
+    <ClInclude Include="..\..\src\network\NetworkServices.h" />
+    <ClInclude Include="..\..\src\peripherals\bus\virtual\PeripheralBusCEC.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnPSettings.h" />
+    <ClInclude Include="..\..\src\playlists\SmartPlaylistFileItemListModifier.h" />
+    <ClInclude Include="..\..\src\profiles\dialogs\GUIDialogLockSettings.h" />
+    <ClInclude Include="..\..\src\profiles\dialogs\GUIDialogProfileSettings.h" />
+    <ClInclude Include="..\..\src\profiles\Profile.h" />
+    <ClInclude Include="..\..\src\profiles\ProfilesManager.h" />
+    <ClInclude Include="..\..\src\profiles\windows\GUIWindowSettingsProfile.h" />
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogContentSettings.h" />
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsBase.h" />
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsManagerBase.h" />
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsManualBase.h" />
+    <ClInclude Include="..\..\src\settings\DiscSettings.h" />
+    <ClInclude Include="..\..\src\settings\DisplaySettings.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISetting.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingCallback.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingControl.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingControlCreator.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingCreator.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingsHandler.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISubSettings.h" />
+    <ClInclude Include="..\..\src\settings\lib\Setting.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingCategoryAccess.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingConditions.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingDefinitions.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingDependency.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingRequirement.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingSection.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingsManager.h" />
+    <ClInclude Include="..\..\src\settings\lib\SettingUpdate.h" />
+    <ClInclude Include="..\..\src\settings\MediaSettings.h" />
+    <ClInclude Include="..\..\src\settings\MediaSourceSettings.h" />
+    <ClInclude Include="..\..\src\settings\SettingAddon.h" />
+    <ClInclude Include="..\..\src\settings\SettingConditions.h" />
+    <ClInclude Include="..\..\src\settings\SettingControl.h" />
+    <ClInclude Include="..\..\src\settings\SettingCreator.h" />
+    <ClInclude Include="..\..\src\settings\SettingPath.h" />
+    <ClInclude Include="..\..\src\settings\SettingUtils.h" />
+    <ClInclude Include="..\..\src\settings\SkinSettings.h" />
+    <ClInclude Include="..\..\src\settings\windows\GUIControlSettings.h" />
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettings.h" />
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettingsCategory.h" />
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettingsScreenCalibration.h" />
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowTestPattern.h" />
+    <ClInclude Include="..\..\src\utils\ActorProtocol.h" />
+    <ClInclude Include="..\..\src\utils\auto_buffer.h" />
+    <ClInclude Include="..\..\src\utils\BooleanLogic.h" />
+    <ClInclude Include="..\..\src\utils\CharsetDetection.h" />
+    <ClInclude Include="..\..\src\utils\IRssObserver.h" />
+    <ClInclude Include="..\..\src\utils\IXmlDeserializable.h" />
+    <ClInclude Include="..\..\src\utils\LegacyPathTranslation.h" />
+    <ClInclude Include="..\..\src\utils\MarkWatchedJob.h" />
+    <ClInclude Include="..\..\src\utils\params_check_macros.h" />
+    <ClInclude Include="..\..\src\utils\RssManager.h" />
+    <ClInclude Include="..\..\src\utils\StringValidation.h" />
+    <ClInclude Include="..\..\src\utils\Utf8Utils.h" />
+    <ClInclude Include="..\..\src\utils\uXstrings.h" />
+    <ClInclude Include="..\..\src\utils\Vector.h" />
+    <ClInclude Include="..\..\src\utils\win32\Win32InterfaceForCLog.h" />
+    <ClInclude Include="..\..\src\utils\win32\Win32Log.h" />
+    <ClInclude Include="..\..\src\utils\XSLTUtils.h" />
+    <ClInclude Include="..\..\src\video\FFmpegVideoDecoder.h" />
+    <ClInclude Include="..\..\src\interfaces\python\swig.h" />
+    <ClInclude Include="..\..\src\interfaces\python\XBPython.h" />
+    <ClInclude Include="..\..\src\music\MusicDbUrl.h" />
+    <ClInclude Include="..\..\src\music\tags\TagLibVFSStream.h" />
+    <ClInclude Include="..\..\src\music\tags\TagLoaderTagLib.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPImageHandler.h" />
+    <ClInclude Include="..\..\src\network\AirTunesServer.h" />
+    <ClInclude Include="..\..\src\network\DllLibShairplay.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnP.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnPInternal.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnPPlayer.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnPRenderer.h" />
+    <ClInclude Include="..\..\src\network\upnp\UPnPServer.h" />
+    <ClInclude Include="..\..\src\network\WakeOnAccess.h" />
+    <ClInclude Include="..\..\src\network\websocket\WebSocket.h" />
+    <ClInclude Include="..\..\src\network\websocket\WebSocketManager.h" />
+    <ClInclude Include="..\..\src\network\websocket\WebSocketV13.h" />
+    <ClInclude Include="..\..\src\network\websocket\WebSocketV8.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\IJSONRPCAnnouncer.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONRPCUtils.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\GUIOperations.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPJsonRpcHandler.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPVfsHandler.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceHandler.h" />
+    <ClInclude Include="..\..\src\network\httprequesthandler\IHTTPRequestHandler.h" />
+    <ClInclude Include="..\..\src\filesystem\CircularCache.h" />
+    <ClInclude Include="..\..\src\filesystem\DirectoryCache.h" />
+    <ClInclude Include="..\..\src\filesystem\FavouritesDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\FileCache.h" />
+    <ClInclude Include="..\..\src\filesystem\MemBufferCache.h" />
+    <ClInclude Include="..\..\src\filesystem\AddonsDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\AFPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\AFPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\ASAPFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\BlurayDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\CacheStrategy.h" />
+    <ClInclude Include="..\..\src\filesystem\CDDADirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\CDDAFile.h" />
+    <ClInclude Include="..\..\src\filesystem\CurlFile.h" />
+    <ClInclude Include="..\..\src\filesystem\DAAPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\DAAPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\DAVDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\Directory.h" />
+    <ClInclude Include="..\..\src\filesystem\DirectoryFactory.h" />
+    <ClInclude Include="..\..\src\filesystem\DirectoryHistory.h" />
+    <ClInclude Include="..\..\src\filesystem\DllLibAfp.h" />
+    <ClInclude Include="..\..\src\filesystem\DllLibCMyth.h" />
+    <ClInclude Include="..\..\src\filesystem\DllLibCurl.h" />
+    <ClInclude Include="..\..\src\filesystem\DllLibNfs.h" />
+    <ClInclude Include="..\..\src\filesystem\File.h" />
+    <ClInclude Include="..\..\src\filesystem\FileDirectoryFactory.h" />
+    <ClInclude Include="..\..\src\filesystem\FileFactory.h" />
+    <ClInclude Include="..\..\src\filesystem\FileReaderFile.h" />
+    <ClInclude Include="..\..\src\filesystem\FTPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\FTPParse.h" />
+    <ClInclude Include="..\..\src\filesystem\HDHomeRunDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\HDHomeRunFile.h" />
+    <ClInclude Include="..\..\src\filesystem\HTSPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\HTSPSession.h" />
+    <ClInclude Include="..\..\src\filesystem\HTTPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\IDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\IFile.h" />
+    <ClInclude Include="..\..\src\filesystem\IFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\ILiveTV.h" />
+    <ClInclude Include="..\..\src\filesystem\iso9660.h" />
+    <ClInclude Include="..\..\src\filesystem\ISO9660Directory.h" />
+    <ClInclude Include="..\..\src\filesystem\ISOFile.h" />
+    <ClInclude Include="..\..\src\filesystem\LibraryDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MultiPathDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MultiPathFile.h" />
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseFile.h" />
+    <ClInclude Include="..\..\src\filesystem\MusicFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MusicSearchDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MythDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\MythFile.h" />
+    <ClInclude Include="..\..\src\filesystem\MythSession.h" />
+    <ClInclude Include="..\..\src\filesystem\NFSDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\NFSFile.h" />
+    <ClInclude Include="..\..\src\filesystem\NSFFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\OGGFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\PipeFile.h" />
+    <ClInclude Include="..\..\src\filesystem\PipesManager.h" />
+    <ClInclude Include="..\..\src\filesystem\PlaylistDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\PlaylistFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\PluginDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\RarDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\RarFile.h" />
+    <ClInclude Include="..\..\src\filesystem\RarManager.h" />
+    <ClInclude Include="..\..\src\filesystem\RSSDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\RTVDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\RTVFile.h" />
+    <ClInclude Include="..\..\src\filesystem\SAPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SAPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\SFTPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SFTPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\ShoutcastFile.h" />
+    <ClInclude Include="..\..\src\filesystem\SIDFileDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SlingboxDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SlingboxFile.h" />
+    <ClInclude Include="..\..\src\filesystem\SmartPlaylistDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SourcesDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocol.h" />
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocolDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocolFile.h" />
+    <ClInclude Include="..\..\src\filesystem\StackDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\TuxBoxDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\TuxBoxFile.h" />
+    <ClInclude Include="..\..\src\filesystem\udf25.h" />
+    <ClInclude Include="..\..\src\filesystem\UDFDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\UDFFile.h" />
+    <ClInclude Include="..\..\src\filesystem\UPnPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\UPnPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\VideoDatabaseDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\VirtualDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\VTPDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\VTPFile.h" />
+    <ClInclude Include="..\..\src\filesystem\VTPSession.h" />
+    <ClInclude Include="..\..\src\filesystem\ZeroconfDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\ZipDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\ZipFile.h" />
+    <ClInclude Include="..\..\src\filesystem\ZipManager.h" />
+    <ClInclude Include="..\..\src\network\mdns\ZeroconfBrowserMDNS.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralImon.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\AddonsOperations.h" />
+    <ClCompile Include="..\..\src\ThumbLoader.cpp" />
+    <ClCompile Include="..\..\src\utils\ActorProtocol.cpp" />
+    <ClCompile Include="..\..\src\utils\auto_buffer.cpp" />
+    <ClCompile Include="..\..\src\utils\BooleanLogic.cpp" />
+    <ClCompile Include="..\..\src\utils\CharsetDetection.cpp" />
+    <ClCompile Include="..\..\src\utils\LegacyPathTranslation.cpp" />
+    <ClCompile Include="..\..\src\utils\MarkWatchedJob.cpp" />
+    <ClCompile Include="..\..\src\utils\RssManager.cpp" />
+    <ClCompile Include="..\..\src\utils\StringValidation.cpp" />
+    <ClCompile Include="..\..\src\utils\test\TestUrlOptions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\utils\Utf8Utils.cpp" />
+    <ClCompile Include="..\..\src\utils\Vector.cpp" />
+    <ClCompile Include="..\..\src\utils\win32\Win32InterfaceForCLog.cpp" />
+    <ClCompile Include="..\..\src\utils\win32\Win32Log.cpp" />
+    <ClCompile Include="..\..\src\utils\XSLTUtils.cpp" />
+    <ClCompile Include="..\..\src\video\PlayerController.cpp" />
+    <ClCompile Include="..\..\src\video\videosync\VideoSyncD3D.cpp" />
+    <ClCompile Include="..\..\src\video\VideoThumbLoader.cpp" />
+    <ClCompile Include="..\..\src\music\MusicThumbLoader.cpp" />
+    <ClCompile Include="..\..\src\ThumbnailCache.cpp" />
+    <ClCompile Include="..\..\src\URL.cpp" />
+    <ClCompile Include="..\..\src\Util.cpp" />
+    <ClCompile Include="..\..\src\utils\Screenshot.cpp" />
+    <ClCompile Include="..\..\src\utils\AlarmClock.cpp" />
+    <ClCompile Include="..\..\src\utils\AliasShortcutUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\Archive.cpp" />
+    <ClCompile Include="..\..\src\utils\AsyncFileCopy.cpp" />
+    <ClCompile Include="..\..\src\utils\AutoPtrHandle.cpp" />
+    <ClCompile Include="..\..\src\utils\Base64.cpp" />
+    <ClCompile Include="..\..\src\utils\BitstreamStats.cpp" />
+    <ClCompile Include="..\..\src\utils\CharsetConverter.cpp" />
+    <ClCompile Include="..\..\src\utils\CPUInfo.cpp" />
+    <ClCompile Include="..\..\src\utils\Crc32.cpp" />
+    <ClCompile Include="..\..\src\utils\DatabaseUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\EdenVideoArtUpdater.cpp" />
+    <ClCompile Include="..\..\src\utils\EndianSwap.cpp" />
+    <ClCompile Include="..\..\src\utils\Fanart.cpp" />
+    <ClCompile Include="..\..\src\utils\fft.cpp" />
+    <ClCompile Include="..\..\src\utils\FileOperationJob.cpp" />
+    <ClCompile Include="..\..\src\utils\FileUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\fstrcmp.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\GroupUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HTMLTable.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HTMLUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HttpHeader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HttpParser.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\HttpResponse.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\InfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\JobManager.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\JSONVariantParser.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\JSONVariantWriter.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\LabelFormatter.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\LangCodeExpander.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\log.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\md5.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Observer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Mime.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PerformanceSample.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\PerformanceStats.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\POUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RecentlyAddedJob.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RegExp.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RingBuffer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RssReader.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SaveFileStateJob.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ScraperParser.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\ScraperUrl.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SeekHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SortUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Splash.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Stopwatch.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\StreamDetails.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\StreamUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\StringUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\SystemInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\test\TestFileOperationJob.cpp">
+    <ClCompile Include="..\..\src\utils\GroupUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\HTMLTable.cpp" />
+    <ClCompile Include="..\..\src\utils\HTMLUtil.cpp" />
+    <ClCompile Include="..\..\src\utils\HttpHeader.cpp" />
+    <ClCompile Include="..\..\src\utils\HttpParser.cpp" />
+    <ClCompile Include="..\..\src\utils\HttpResponse.cpp" />
+    <ClCompile Include="..\..\src\utils\InfoLoader.cpp" />
+    <ClCompile Include="..\..\src\utils\JobManager.cpp" />
+    <ClCompile Include="..\..\src\utils\JSONVariantParser.cpp" />
+    <ClCompile Include="..\..\src\utils\JSONVariantWriter.cpp" />
+    <ClCompile Include="..\..\src\utils\LabelFormatter.cpp" />
+    <ClCompile Include="..\..\src\utils\LangCodeExpander.cpp" />
+    <ClCompile Include="..\..\src\utils\log.cpp" />
+    <ClCompile Include="..\..\src\utils\md5.cpp" />
+    <ClCompile Include="..\..\src\utils\Observer.cpp" />
+    <ClCompile Include="..\..\src\utils\Mime.cpp" />
+    <ClCompile Include="..\..\src\utils\PerformanceSample.cpp" />
+    <ClCompile Include="..\..\src\utils\PerformanceStats.cpp" />
+    <ClCompile Include="..\..\src\utils\POUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\RecentlyAddedJob.cpp" />
+    <ClCompile Include="..\..\src\utils\RegExp.cpp" />
+    <ClCompile Include="..\..\src\utils\RingBuffer.cpp" />
+    <ClCompile Include="..\..\src\utils\RssReader.cpp" />
+    <ClCompile Include="..\..\src\utils\SaveFileStateJob.cpp" />
+    <ClCompile Include="..\..\src\utils\ScraperParser.cpp" />
+    <ClCompile Include="..\..\src\utils\ScraperUrl.cpp" />
+    <ClCompile Include="..\..\src\utils\SeekHandler.cpp" />
+    <ClCompile Include="..\..\src\utils\SortUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\Splash.cpp" />
+    <ClCompile Include="..\..\src\utils\Stopwatch.cpp" />
+    <ClCompile Include="..\..\src\utils\StreamDetails.cpp" />
+    <ClCompile Include="..\..\src\utils\StreamUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\StringUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\SystemInfo.cpp" />
+    <ClCompile Include="..\..\src\utils\test\TestFileOperationJob.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestFileUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestFileUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfstrcmp.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfstrcmp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestGlobalsHandling.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestGlobalsHandling.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHTMLTable.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHTMLTable.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHTMLUtil.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHTMLUtil.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpHeader.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpHeader.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpParser.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpResponse.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpResponse.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJobManager.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJobManager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJSONVariantParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJSONVariantParser.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJSONVariantWriter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJSONVariantWriter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestLabelFormatter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestLabelFormatter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestLangCodeExpander.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestLangCodeExpander.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testlog.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testlog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestMathUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestMathUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testmd5.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testmd5.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestMime.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestMime.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestPerformanceSample.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestPerformanceSample.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestPOUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestPOUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestRegExp.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestRegExp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestRingBuffer.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestRingBuffer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestScraperParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestScraperParser.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestScraperUrl.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestScraperUrl.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestSortUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestSortUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStdString.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStdString.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStopwatch.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStopwatch.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStreamDetails.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStreamDetails.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStreamUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStreamUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStringUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStringUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestSystemInfo.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestSystemInfo.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestTimeSmoother.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestTimeSmoother.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestTimeUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestTimeUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestURIUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestURIUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestVariant.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestVariant.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestXBMCTinyXML.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestXBMCTinyXML.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestXMLUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestXMLUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TextSearch.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\test\TestAlarmClock.cpp">
+    <ClCompile Include="..\..\src\utils\TextSearch.cpp" />
+    <ClCompile Include="..\..\src\utils\test\TestAlarmClock.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestAliasShortcutUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestAliasShortcutUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestArchive.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestArchive.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestAsyncFileCopy.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestAsyncFileCopy.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestBase64.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestBase64.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestBitstreamStats.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestBitstreamStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCharsetConverter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCharsetConverter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCPUInfo.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCPUInfo.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCrc32.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCrc32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestDatabaseUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestDatabaseUtils.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestEndianSwap.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestEndianSwap.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfastmemcpy.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfastmemcpy.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfft.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfft.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TimeSmoother.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\TimeUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\TuxBoxUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\URIUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\UrlOptions.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Variant.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Weather.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\Environment.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\XBMCTinyXML.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\GUIDialogSubtitles.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\GUIDialogVideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp" />
-    <ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp" />
-    <ClCompile Include="..\..\xbmc\video\Teletext.cpp" />
-    <ClCompile Include="..\..\xbmc\video\VideoDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\video\VideoDbUrl.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\view\GUIViewControl.cpp" />
-    <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
-    <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\pch.cpp">
+    <ClCompile Include="..\..\src\utils\TimeSmoother.cpp" />
+    <ClCompile Include="..\..\src\utils\TimeUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\TuxBoxUtil.cpp" />
+    <ClCompile Include="..\..\src\utils\URIUtils.cpp" />
+    <ClCompile Include="..\..\src\utils\UrlOptions.cpp" />
+    <ClCompile Include="..\..\src\utils\Variant.cpp" />
+    <ClCompile Include="..\..\src\utils\Weather.cpp" />
+    <ClCompile Include="..\..\src\utils\Environment.cpp" />
+    <ClCompile Include="..\..\src\utils\XBMCTinyXML.cpp" />
+    <ClCompile Include="..\..\src\utils\XMLUtils.cpp" />
+    <ClCompile Include="..\..\src\video\Bookmark.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogFileStacking.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogFullScreenInfo.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogSubtitles.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogTeletext.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoBookmarks.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoInfo.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoOSD.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoOverlay.cpp" />
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoSettings.cpp" />
+    <ClCompile Include="..\..\src\video\FFmpegVideoDecoder.cpp" />
+    <ClCompile Include="..\..\src\video\GUIViewStateVideo.cpp" />
+    <ClCompile Include="..\..\src\video\Teletext.cpp" />
+    <ClCompile Include="..\..\src\video\VideoDatabase.cpp" />
+    <ClCompile Include="..\..\src\video\VideoDbUrl.cpp" />
+    <ClCompile Include="..\..\src\video\VideoInfoDownloader.cpp" />
+    <ClCompile Include="..\..\src\video\VideoInfoScanner.cpp" />
+    <ClCompile Include="..\..\src\video\VideoInfoTag.cpp" />
+    <ClCompile Include="..\..\src\video\VideoReferenceClock.cpp" />
+    <ClCompile Include="..\..\src\video\windows\GUIWindowFullScreen.cpp" />
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoBase.cpp" />
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoNav.cpp" />
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoPlaylist.cpp" />
+    <ClCompile Include="..\..\src\view\GUIViewControl.cpp" />
+    <ClCompile Include="..\..\src\view\GUIViewState.cpp" />
+    <ClCompile Include="..\..\src\view\ViewDatabase.cpp" />
+    <ClCompile Include="..\..\src\view\ViewStateSettings.cpp" />
+    <ClCompile Include="..\..\src\win32\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|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\WIN32Util.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\WindowHelper.cpp" />
-    <ClCompile Include="..\..\xbmc\win32\XBMC_PC.cpp">
+    <ClCompile Include="..\..\src\win32\stat_utf8.cpp" />
+    <ClCompile Include="..\..\src\win32\stdio_utf8.cpp" />
+    <ClCompile Include="..\..\src\win32\strverscmp.cpp" />
+    <ClCompile Include="..\..\src\win32\Win32DelayedDllLoad.cpp" />
+    <ClCompile Include="..\..\src\win32\WIN32Util.cpp" />
+    <ClCompile Include="..\..\src\win32\WindowHelper.cpp" />
+    <ClCompile Include="..\..\src\win32\XBMC_PC.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DummyVideoPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDAudio.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDClock.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessage.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\Edl.cpp" />
-    <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\Video\DVDVideoCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.c">
+    <ClCompile Include="..\..\src\cores\DummyVideoPlayer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDAudio.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDClock.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxSPU.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDFileInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDMessage.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDMessageQueue.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDOverlayContainer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDOverlayRenderer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerAudio.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerSubtitle.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerTeletext.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerVideo.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDStreamInfo.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDTSCorrection.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\Edl.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp" />
-    <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\DVDInputStreamNavigator.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp" />
-    <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\ASAPCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\AudioDecoder.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\CodecFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\ModplugCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\NSFCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\OggCallback.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\OGGcodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\PAPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\SIDCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\SPCCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\TimidityCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\VGMCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\paplayer\YMCodec.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\coff.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker_file.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker_library.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_util.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\DllLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\DllLoaderContainer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\LibraryLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\Win32DllLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_dummy.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_kernel32.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_msvcrt.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\util\EmuFileWrapper.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\BaseRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererDX.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererUtil.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderFlags.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderManager.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\WinRenderer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\DXVA.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\DXVAHD.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\ConvolutionKernels.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\YUV2RGBShader.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\QueryParams.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNode.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp" />
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\ASAPCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\AudioDecoder.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\CodecFactory.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\DVDPlayerCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\ModplugCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\NSFCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\OggCallback.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\OGGcodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\PAPlayer.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\SIDCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\SPCCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\TimidityCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\VGMCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\paplayer\YMCodec.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\coff.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\dll.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker_file.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker_library.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_util.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\DllLoader.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\DllLoaderContainer.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\LibraryLoader.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\Win32DllLoader.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_dummy.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_kernel32.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_msvcrt.cpp" />
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\util\EmuFileWrapper.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\BaseRenderer.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRenderer.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererDX.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererUtil.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderFlags.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderManager.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\WinRenderer.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\DXVA.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\DXVAHD.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\ConvolutionKernels.cpp" />
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\YUV2RGBShader.cpp" />
+    <ClCompile Include="..\..\src\cores\ExternalPlayer\ExternalPlayer.cpp" />
+    <ClCompile Include="..\..\src\cores\playercorefactory\PlayerCoreFactory.cpp" />
+    <ClCompile Include="..\..\src\cores\playercorefactory\PlayerSelectionRule.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\QueryParams.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNode.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.cpp" />
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\QueryParams.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.cpp" />
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\QueryParams.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Addon.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonManager.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AddonStatusHandler.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\AudioEncoder.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\Scraper.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\ScreenSaver.cpp" />
-    <ClCompile Include="..\..\xbmc\addons\Visualisation.cpp" />
-    <ClCompile Include="..\..\xbmc\cdrip\CDDARipJob.cpp" />
-    <ClCompile Include="..\..\xbmc\cdrip\CDDARipper.cpp" />
-    <ClCompile Include="..\..\xbmc\cdrip\Encoder.cpp" />
-    <ClCompile Include="..\..\xbmc\cdrip\EncoderFFmpeg.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\WinEvents.cpp" />
-    <ClCompile Include="..\..\xbmc\windowing\WinSystem.cpp" />
-    <ClCompile Include="..\..\xbmc\windows\GUIMediaWindow.cpp" />
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowDebugInfo.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\GUIWindowScreensaverDim.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">
+    <ClCompile Include="..\..\src\addons\Addon.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonManager.cpp" />
+    <ClCompile Include="..\..\src\addons\AddonStatusHandler.cpp" />
+    <ClCompile Include="..\..\src\addons\AudioEncoder.cpp" />
+    <ClCompile Include="..\..\src\addons\Scraper.cpp" />
+    <ClCompile Include="..\..\src\addons\ScreenSaver.cpp" />
+    <ClCompile Include="..\..\src\addons\Visualisation.cpp" />
+    <ClCompile Include="..\..\src\cdrip\CDDARipJob.cpp" />
+    <ClCompile Include="..\..\src\cdrip\CDDARipper.cpp" />
+    <ClCompile Include="..\..\src\cdrip\Encoder.cpp" />
+    <ClCompile Include="..\..\src\cdrip\EncoderFFmpeg.cpp" />
+    <ClCompile Include="..\..\src\windowing\windows\WinEventsWin32.cpp" />
+    <ClCompile Include="..\..\src\windowing\windows\WinSystemWin32.cpp" />
+    <ClCompile Include="..\..\src\windowing\windows\WinSystemWin32DX.cpp" />
+    <ClCompile Include="..\..\src\windowing\WinEvents.cpp" />
+    <ClCompile Include="..\..\src\windowing\WinSystem.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIMediaWindow.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowDebugInfo.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowFileManager.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowHome.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowLoginScreen.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowPointer.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowScreensaver.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowScreensaverDim.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowStartup.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowSystemInfo.cpp" />
+    <ClCompile Include="..\..\src\windows\GUIWindowWeather.cpp" />
+    <ClCompile Include="..\..\src\XBApplicationEx.cpp" />
+    <ClCompile Include="..\..\src\XBDateTime.cpp" />
+    <ClCompile Include="..\..\src\xbmc.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\XbmcContext.cpp" />
+    <ClCompile Include="..\..\src\XbmcContext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\lib\DllAvFilter.h" />
     <ClInclude Include="..\..\lib\ffmpeg\include-xbmc-win32\libavutil\avconfig.h" />
     <ClInclude Include="..\..\lib\SlingboxLib\SlingboxLib.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacks.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksAddon.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksGUI.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksPVR.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonDatabase.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonInstaller.h" />
-    <ClInclude Include="..\..\xbmc\addons\AddonVersion.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllLibCPluff.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllPVRClient.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\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\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\DatabaseQuery.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\GUIDialogExtendedProgressBar.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\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\epg\Epg.h" />
-    <ClInclude Include="..\..\xbmc\epg\EpgContainer.h" />
-    <ClInclude Include="..\..\xbmc\epg\EpgDatabase.h" />
-    <ClInclude Include="..\..\xbmc\epg\EpgInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\epg\EpgSearchFilter.h" />
-    <ClInclude Include="..\..\xbmc\epg\GUIEPGGridContainer.h" />
-    <ClInclude Include="..\..\xbmc\FileItem.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PVRDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PVRFile.h" />
-    <ClInclude Include="..\..\xbmc\GUIInfoManager.h" />
-    <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
-    <ClInclude Include="..\..\xbmc\guilib\AnimatedGif.h" />
-    <ClInclude Include="..\..\xbmc\guilib\D3DResource.h" />
-    <ClInclude Include="..\..\xbmc\guilib\DDSImage.h" />
-    <ClInclude Include="..\..\xbmc\guilib\DirectXGraphics.h" />
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegion.h" />
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegionSolvers.h" />
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegionTracker.h" />
-    <ClInclude Include="..\..\xbmc\guilib\Geometry.h" />
-    <ClInclude Include="..\..\xbmc\guilib\GraphicContext.h" />
-    <ClInclude Include="..\..\xbmc\guilib\gui3d.h" />
-    <ClInclude Include="..\..\xbmc\guilib\GUIAction.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\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\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\GUISpinControl.h" />
-    <ClInclude Include="..\..\xbmc\guilib\GUISpinControlEx.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\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\JpegIO.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\StereoscopicsManager.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\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\input\ButtonTranslator.h" />
-    <ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h" />
-    <ClInclude Include="..\..\xbmc\input\KeyboardLayout.h" />
-    <ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h" />
-    <ClInclude Include="..\..\xbmc\input\KeyboardStat.h" />
-    <ClInclude Include="..\..\xbmc\input\MouseStat.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_keytable.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\IAnnouncer.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\info\InfoBool.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\info\InfoExpression.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\info\SkinVariable.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.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\InputOperations.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\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\json-rpc\TextureOperations.h" />
-    <ClInclude Include="..\..\xbmc\IProgressCallback.h" />
-    <ClInclude Include="..\..\xbmc\LangInfo.h" />
-    <ClInclude Include="..\..\xbmc\listproviders\IListProvider.h" />
-    <ClInclude Include="..\..\xbmc\listproviders\DirectoryProvider.h" />
-    <ClInclude Include="..\..\xbmc\listproviders\StaticProvider.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\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\MusicDatabase.h" />
-    <ClInclude Include="..\..\xbmc\music\MusicInfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\music\Song.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\ImusicInfoTagLoader.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTag.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\MusicInfoTagLoaderMidi.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.h" />
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.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\AirPlayServer.h" />
-    <ClInclude Include="..\..\xbmc\network\cddb.h" />
-    <ClInclude Include="..\..\xbmc\network\DllLibPlist.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\mdns\ZeroconfMDNS.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\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\peripherals\bus\PeripheralBus.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\bus\win32\PeripheralBusUSB.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\Peripheral.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralBluetooth.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralCecAdapter.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralDisk.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralHID.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNIC.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralTuner.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\Peripherals.h" />
-    <ClInclude Include="..\..\xbmc\peripherals\PeripheralTypes.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\pvr\addons\PVRClient.h" />
-    <ClInclude Include="..\..\xbmc\pvr\addons\PVRClients.h" />
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannel.h" />
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroup.h" />
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroupInternal.h" />
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroups.h" />
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroupsContainer.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelManager.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelsOSD.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRCutterOSD.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRDirectorOSD.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGroupManager.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideInfo.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideOSD.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.h" />
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRDatabase.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRGUIInfo.h" />
-    <ClInclude Include="..\..\xbmc\pvr\PVRManager.h" />
-    <ClInclude Include="..\..\xbmc\pvr\recordings\PVRRecording.h" />
-    <ClInclude Include="..\..\xbmc\pvr\recordings\PVRRecordings.h" />
-    <ClInclude Include="..\..\xbmc\pvr\timers\PVRTimerInfoTag.h" />
-    <ClInclude Include="..\..\xbmc\pvr\timers\PVRTimers.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIViewStatePVR.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRBase.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRChannels.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRGuide.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRRecordings.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRSearch.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimers.h" />
-    <ClInclude Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.h" />
-    <ClInclude Include="..\..\xbmc\rendering\dx\RenderSystemDX.h" />
-    <ClInclude Include="..\..\xbmc\rendering\RenderSystem.h" />
-    <ClInclude Include="..\..\xbmc\SectionLoader.h" />
-    <ClInclude Include="..\..\xbmc\settings\AdvancedSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\Settings.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\test\TestBasicEnvironment.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacks.h" />
+    <ClInclude Include="..\..\src\addons\AddonCallbacksAddon.h" />
+    <ClInclude Include="..\..\src\addons\AddonCallbacksGUI.h" />
+    <ClInclude Include="..\..\src\addons\AddonCallbacksPVR.h" />
+    <ClInclude Include="..\..\src\addons\AddonDatabase.h" />
+    <ClInclude Include="..\..\src\addons\AddonInstaller.h" />
+    <ClInclude Include="..\..\src\addons\AddonVersion.h" />
+    <ClInclude Include="..\..\src\addons\DllLibCPluff.h" />
+    <ClInclude Include="..\..\src\addons\DllPVRClient.h" />
+    <ClInclude Include="..\..\src\addons\GUIDialogAddonInfo.h" />
+    <ClInclude Include="..\..\src\addons\GUIDialogAddonSettings.h" />
+    <ClInclude Include="..\..\src\addons\GUIViewStateAddonBrowser.h" />
+    <ClInclude Include="..\..\src\addons\GUIWindowAddonBrowser.h" />
+    <ClInclude Include="..\..\src\addons\PluginSource.h" />
+    <ClInclude Include="..\..\src\addons\Repository.h" />
+    <ClInclude Include="..\..\src\addons\Service.h" />
+    <ClInclude Include="..\..\src\addons\Skin.h" />
+    <ClInclude Include="..\..\src\Application.h" />
+    <ClInclude Include="..\..\src\ApplicationMessenger.h" />
+    <ClInclude Include="..\..\src\Autorun.h" />
+    <ClInclude Include="..\..\src\AutoSwitch.h" />
+    <ClInclude Include="..\..\src\BackgroundInfoLoader.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderCapture.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\WinVideoFilter.h" />
+    <ClInclude Include="..\..\src\CueDocument.h" />
+    <ClInclude Include="..\..\src\dbwrappers\Database.h" />
+    <ClInclude Include="..\..\src\dbwrappers\DatabaseQuery.h" />
+    <ClInclude Include="..\..\src\dbwrappers\dataset.h" />
+    <ClInclude Include="..\..\src\dbwrappers\mysqldataset.h" />
+    <ClInclude Include="..\..\src\dbwrappers\qry_dat.h" />
+    <ClInclude Include="..\..\src\dbwrappers\sqlitedataset.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogBoxBase.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogBusy.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogButtonMenu.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogCache.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogContextMenu.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogExtendedProgressBar.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogFavourites.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogFileBrowser.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogGamepad.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogKaiToast.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMediaSource.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMuteBug.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogNumeric.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogOK.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogPlayEject.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogPlayerControls.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogProgress.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSeekBar.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSelect.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSlider.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSmartPlaylistEditor.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSmartPlaylistRule.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSubMenu.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogTextViewer.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogVolumeBar.h" />
+    <ClInclude Include="..\..\src\dialogs\GUIDialogYesNo.h" />
+    <ClInclude Include="..\..\src\DynamicDll.h" />
+    <ClInclude Include="..\..\src\epg\Epg.h" />
+    <ClInclude Include="..\..\src\epg\EpgContainer.h" />
+    <ClInclude Include="..\..\src\epg\EpgDatabase.h" />
+    <ClInclude Include="..\..\src\epg\EpgInfoTag.h" />
+    <ClInclude Include="..\..\src\epg\EpgSearchFilter.h" />
+    <ClInclude Include="..\..\src\epg\GUIEPGGridContainer.h" />
+    <ClInclude Include="..\..\src\FileItem.h" />
+    <ClInclude Include="..\..\src\filesystem\PVRDirectory.h" />
+    <ClInclude Include="..\..\src\filesystem\PVRFile.h" />
+    <ClInclude Include="..\..\src\GUIInfoManager.h" />
+    <ClInclude Include="..\..\src\GUILargeTextureManager.h" />
+    <ClInclude Include="..\..\src\guilib\AnimatedGif.h" />
+    <ClInclude Include="..\..\src\guilib\D3DResource.h" />
+    <ClInclude Include="..\..\src\guilib\DDSImage.h" />
+    <ClInclude Include="..\..\src\guilib\DirectXGraphics.h" />
+    <ClInclude Include="..\..\src\guilib\DirtyRegion.h" />
+    <ClInclude Include="..\..\src\guilib\DirtyRegionSolvers.h" />
+    <ClInclude Include="..\..\src\guilib\DirtyRegionTracker.h" />
+    <ClInclude Include="..\..\src\guilib\Geometry.h" />
+    <ClInclude Include="..\..\src\guilib\GraphicContext.h" />
+    <ClInclude Include="..\..\src\guilib\gui3d.h" />
+    <ClInclude Include="..\..\src\guilib\GUIAction.h" />
+    <ClInclude Include="..\..\src\guilib\GUIAudioManager.h" />
+    <ClInclude Include="..\..\src\guilib\GUIBaseContainer.h" />
+    <ClInclude Include="..\..\src\guilib\GUIBorderedImage.h" />
+    <ClInclude Include="..\..\src\guilib\GUIButtonControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUICallback.h" />
+    <ClInclude Include="..\..\src\guilib\GUICheckMarkControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIColorManager.h" />
+    <ClInclude Include="..\..\src\guilib\GUIControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIControlFactory.h" />
+    <ClInclude Include="..\..\src\guilib\GUIControlGroup.h" />
+    <ClInclude Include="..\..\src\guilib\GUIControlGroupList.h" />
+    <ClInclude Include="..\..\src\guilib\GUIControlProfiler.h" />
+    <ClInclude Include="..\..\src\guilib\GUIDialog.h" />
+    <ClInclude Include="..\..\src\guilib\GUIEditControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFadeLabelControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFixedListContainer.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFont.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFontManager.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFontTTF.h" />
+    <ClInclude Include="..\..\src\guilib\GUIFontTTFDX.h" />
+    <ClInclude Include="..\..\src\guilib\GUIImage.h" />
+    <ClInclude Include="..\..\src\guilib\GUIIncludes.h" />
+    <ClInclude Include="..\..\src\guilib\GUIInfoTypes.h" />
+    <ClInclude Include="..\..\src\guilib\GUILabel.h" />
+    <ClInclude Include="..\..\src\guilib\GUILabelControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIListContainer.h" />
+    <ClInclude Include="..\..\src\guilib\GUIListGroup.h" />
+    <ClInclude Include="..\..\src\guilib\GUIListItem.h" />
+    <ClInclude Include="..\..\src\guilib\GUIListItemLayout.h" />
+    <ClInclude Include="..\..\src\guilib\GUIListLabel.h" />
+    <ClInclude Include="..\..\src\guilib\GUIMessage.h" />
+    <ClInclude Include="..\..\src\guilib\GUIMoverControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIMultiImage.h" />
+    <ClInclude Include="..\..\src\guilib\GUIMultiSelectText.h" />
+    <ClInclude Include="..\..\src\guilib\GUIPanelContainer.h" />
+    <ClInclude Include="..\..\src\guilib\GUIProgressControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIRadioButtonControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIRenderingControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIResizeControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIRSSControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIScrollBarControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUISelectButtonControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUISettingsSliderControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIShader.h" />
+    <ClInclude Include="..\..\src\guilib\GUISliderControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUISpinControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUISpinControlEx.h" />
+    <ClInclude Include="..\..\src\guilib\GUIStaticItem.h" />
+    <ClInclude Include="..\..\src\guilib\GUITextBox.h" />
+    <ClInclude Include="..\..\src\guilib\GUITextLayout.h" />
+    <ClInclude Include="..\..\src\guilib\GUITexture.h" />
+    <ClInclude Include="..\..\src\guilib\GUITextureD3D.h" />
+    <ClInclude Include="..\..\src\guilib\GUIToggleButtonControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIVideoControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIVisualisationControl.h" />
+    <ClInclude Include="..\..\src\guilib\GUIWindow.h" />
+    <ClInclude Include="..\..\src\guilib\GUIWindowManager.h" />
+    <ClInclude Include="..\..\src\guilib\GUIWrappingListContainer.h" />
+    <ClInclude Include="..\..\src\guilib\IAudioDeviceChangedCallback.h" />
+    <ClInclude Include="..\..\src\guilib\IMsgTargetCallback.h" />
+    <ClInclude Include="..\..\src\guilib\IWindowManagerCallback.h" />
+    <ClInclude Include="..\..\src\guilib\JpegIO.h" />
+    <ClInclude Include="..\..\src\guilib\Key.h" />
+    <ClInclude Include="..\..\src\guilib\LocalizeStrings.h" />
+    <ClInclude Include="..\..\src\guilib\MatrixGLES.h" />
+    <ClInclude Include="..\..\src\guilib\Resolution.h" />
+    <ClInclude Include="..\..\src\guilib\StereoscopicsManager.h" />
+    <ClInclude Include="..\..\src\guilib\Texture.h" />
+    <ClInclude Include="..\..\src\guilib\TextureBundle.h" />
+    <ClInclude Include="..\..\src\guilib\TextureBundleXBT.h" />
+    <ClInclude Include="..\..\src\guilib\TextureBundleXPR.h" />
+    <ClInclude Include="..\..\src\guilib\TextureDX.h" />
+    <ClInclude Include="..\..\src\guilib\TextureManager.h" />
+    <ClInclude Include="..\..\src\guilib\TransformMatrix.h" />
+    <ClInclude Include="..\..\src\guilib\Tween.h" />
+    <ClInclude Include="..\..\src\guilib\VisibleEffect.h" />
+    <ClInclude Include="..\..\src\guilib\XBTF.h" />
+    <ClInclude Include="..\..\src\guilib\XBTFReader.h" />
+    <ClInclude Include="..\..\src\GUIPassword.h" />
+    <ClInclude Include="..\..\src\GUIUserMessages.h" />
+    <ClInclude Include="..\..\src\input\ButtonTranslator.h" />
+    <ClInclude Include="..\..\src\input\InertialScrollingHandler.h" />
+    <ClInclude Include="..\..\src\input\KeyboardLayout.h" />
+    <ClInclude Include="..\..\src\input\KeyboardLayoutConfiguration.h" />
+    <ClInclude Include="..\..\src\input\KeyboardStat.h" />
+    <ClInclude Include="..\..\src\input\MouseStat.h" />
+    <ClInclude Include="..\..\src\input\windows\IRServerSuite.h" />
+    <ClInclude Include="..\..\src\input\windows\IrssMessage.h" />
+    <ClInclude Include="..\..\src\input\XBIRRemote.h" />
+    <ClInclude Include="..\..\src\input\XBMC_keyboard.h" />
+    <ClInclude Include="..\..\src\input\XBMC_keysym.h" />
+    <ClInclude Include="..\..\src\input\XBMC_keytable.h" />
+    <ClInclude Include="..\..\src\input\XBMC_mouse.h" />
+    <ClInclude Include="..\..\src\input\XBMC_vkeys.h" />
+    <ClInclude Include="..\..\src\interfaces\AnnouncementManager.h" />
+    <ClInclude Include="..\..\src\interfaces\Builtins.h" />
+    <ClInclude Include="..\..\src\interfaces\IAnnouncer.h" />
+    <ClInclude Include="..\..\src\interfaces\info\InfoBool.h" />
+    <ClInclude Include="..\..\src\interfaces\info\InfoExpression.h" />
+    <ClInclude Include="..\..\src\interfaces\info\SkinVariable.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ApplicationOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\AudioLibrary.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FileItemHandler.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FileOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\IClient.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\InputOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ITransportLayer.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONRPC.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONServiceDescription.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONUtils.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PlayerOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PlaylistOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ServiceDescription.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\SystemOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\VideoLibrary.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\XBMCOperations.h" />
+    <ClInclude Include="..\..\src\interfaces\json-rpc\TextureOperations.h" />
+    <ClInclude Include="..\..\src\IProgressCallback.h" />
+    <ClInclude Include="..\..\src\LangInfo.h" />
+    <ClInclude Include="..\..\src\listproviders\IListProvider.h" />
+    <ClInclude Include="..\..\src\listproviders\DirectoryProvider.h" />
+    <ClInclude Include="..\..\src\listproviders\StaticProvider.h" />
+    <ClInclude Include="..\..\src\MediaSource.h" />
+    <ClInclude Include="..\..\src\music\Album.h" />
+    <ClInclude Include="..\..\src\music\Artist.h" />
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicInfo.h" />
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicOSD.h" />
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicOverlay.h" />
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogSongInfo.h" />
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogVisualisationPresetList.h" />
+    <ClInclude Include="..\..\src\music\GUIViewStateMusic.h" />
+    <ClInclude Include="..\..\src\music\infoscanner\MusicAlbumInfo.h" />
+    <ClInclude Include="..\..\src\music\infoscanner\MusicArtistInfo.h" />
+    <ClInclude Include="..\..\src\music\infoscanner\MusicInfoScanner.h" />
+    <ClInclude Include="..\..\src\music\infoscanner\MusicInfoScraper.h" />
+    <ClInclude Include="..\..\src\music\karaoke\cdgdata.h" />
+    <ClInclude Include="..\..\src\music\karaoke\GUIDialogKaraokeSongSelector.h" />
+    <ClInclude Include="..\..\src\music\karaoke\GUIWindowKaraokeLyrics.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyrics.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricscdg.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricsfactory.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricsmanager.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstext.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextkar.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextlrc.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextustar.h" />
+    <ClInclude Include="..\..\src\music\karaoke\karaokewindowbackground.h" />
+    <ClInclude Include="..\..\src\music\MusicDatabase.h" />
+    <ClInclude Include="..\..\src\music\MusicInfoLoader.h" />
+    <ClInclude Include="..\..\src\music\Song.h" />
+    <ClInclude Include="..\..\src\music\tags\ImusicInfoTagLoader.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTag.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderASAP.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderCDDA.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderDatabase.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderFactory.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderMidi.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderNSF.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderShn.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderSPC.h" />
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderYM.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicBase.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicNav.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicPlaylist.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicPlaylistEditor.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicSongs.h" />
+    <ClInclude Include="..\..\src\music\windows\GUIWindowVisualisation.h" />
+    <ClInclude Include="..\..\src\network\AirPlayServer.h" />
+    <ClInclude Include="..\..\src\network\cddb.h" />
+    <ClInclude Include="..\..\src\network\DllLibPlist.h" />
+    <ClInclude Include="..\..\src\network\DNSNameCache.h" />
+    <ClInclude Include="..\..\src\network\EventClient.h" />
+    <ClInclude Include="..\..\src\network\EventPacket.h" />
+    <ClInclude Include="..\..\src\network\EventServer.h" />
+    <ClInclude Include="..\..\src\network\GUIDialogAccessPoints.h" />
+    <ClInclude Include="..\..\src\network\GUIDialogNetworkSetup.h" />
+    <ClInclude Include="..\..\src\network\mdns\ZeroconfMDNS.h" />
+    <ClInclude Include="..\..\src\network\Network.h" />
+    <ClInclude Include="..\..\src\network\Socket.h" />
+    <ClInclude Include="..\..\src\network\TCPServer.h" />
+    <ClInclude Include="..\..\src\network\UdpClient.h" />
+    <ClInclude Include="..\..\src\network\WebServer.h" />
+    <ClInclude Include="..\..\src\network\windows\NetworkWin32.h" />
+    <ClInclude Include="..\..\src\network\Zeroconf.h" />
+    <ClInclude Include="..\..\src\network\ZeroconfBrowser.h" />
+    <ClInclude Include="..\..\src\NfoFile.h" />
+    <ClInclude Include="..\..\src\PartyModeManager.h" />
+    <ClInclude Include="..\..\src\PasswordManager.h" />
+    <ClInclude Include="..\..\src\peripherals\bus\PeripheralBus.h" />
+    <ClInclude Include="..\..\src\peripherals\bus\win32\PeripheralBusUSB.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\Peripheral.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralBluetooth.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralCecAdapter.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralDisk.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralHID.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralNIC.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralNyxboard.h" />
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralTuner.h" />
+    <ClInclude Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralManager.h" />
+    <ClInclude Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralSettings.h" />
+    <ClInclude Include="..\..\src\peripherals\Peripherals.h" />
+    <ClInclude Include="..\..\src\peripherals\PeripheralTypes.h" />
+    <ClInclude Include="..\..\src\pictures\DllImageLib.h" />
+    <ClInclude Include="..\..\src\pictures\DllLibExif.h" />
+    <ClInclude Include="..\..\src\pictures\GUIDialogPictureInfo.h" />
+    <ClInclude Include="..\..\src\pictures\GUIViewStatePictures.h" />
+    <ClInclude Include="..\..\src\pictures\GUIWindowPictures.h" />
+    <ClInclude Include="..\..\src\pictures\GUIWindowSlideShow.h" />
+    <ClInclude Include="..\..\src\pictures\Picture.h" />
+    <ClInclude Include="..\..\src\pictures\PictureInfoLoader.h" />
+    <ClInclude Include="..\..\src\pictures\PictureInfoTag.h" />
+    <ClInclude Include="..\..\src\pictures\PictureThumbLoader.h" />
+    <ClInclude Include="..\..\src\pictures\SlideShowPicture.h" />
+    <ClInclude Include="..\..\src\PlayListPlayer.h" />
+    <ClInclude Include="..\..\src\playlists\PlayList.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListB4S.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListFactory.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListM3U.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListPLS.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListURL.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListWPL.h" />
+    <ClInclude Include="..\..\src\playlists\PlayListXML.h" />
+    <ClInclude Include="..\..\src\playlists\SmartPlayList.h" />
+    <ClInclude Include="..\..\src\powermanagement\DPMSSupport.h" />
+    <ClInclude Include="..\..\src\powermanagement\IPowerSyscall.h" />
+    <ClInclude Include="..\..\src\powermanagement\PowerManager.h" />
+    <ClInclude Include="..\..\src\powermanagement\windows\Win32PowerSyscall.h" />
+    <ClInclude Include="..\..\src\programs\GUIViewStatePrograms.h" />
+    <ClInclude Include="..\..\src\programs\GUIWindowPrograms.h" />
+    <ClInclude Include="..\..\src\pvr\addons\PVRClient.h" />
+    <ClInclude Include="..\..\src\pvr\addons\PVRClients.h" />
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannel.h" />
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroup.h" />
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroupInternal.h" />
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroups.h" />
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroupsContainer.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelManager.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelsOSD.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRCutterOSD.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRDirectorOSD.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGroupManager.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideInfo.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideOSD.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideSearch.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRRecordingInfo.h" />
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRTimerSettings.h" />
+    <ClInclude Include="..\..\src\pvr\PVRDatabase.h" />
+    <ClInclude Include="..\..\src\pvr\PVRGUIInfo.h" />
+    <ClInclude Include="..\..\src\pvr\PVRManager.h" />
+    <ClInclude Include="..\..\src\pvr\recordings\PVRRecording.h" />
+    <ClInclude Include="..\..\src\pvr\recordings\PVRRecordings.h" />
+    <ClInclude Include="..\..\src\pvr\timers\PVRTimerInfoTag.h" />
+    <ClInclude Include="..\..\src\pvr\timers\PVRTimers.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIViewStatePVR.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRBase.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRChannels.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRGuide.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRRecordings.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRSearch.h" />
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRTimers.h" />
+    <ClInclude Include="..\..\src\rendering\dx\GUIWindowTestPatternDX.h" />
+    <ClInclude Include="..\..\src\rendering\dx\RenderSystemDX.h" />
+    <ClInclude Include="..\..\src\rendering\RenderSystem.h" />
+    <ClInclude Include="..\..\src\SectionLoader.h" />
+    <ClInclude Include="..\..\src\settings\AdvancedSettings.h" />
+    <ClInclude Include="..\..\src\settings\Settings.h" />
+    <ClInclude Include="..\..\src\settings\VideoSettings.h" />
+    <ClInclude Include="..\..\src\SortFileItem.h" />
+    <ClInclude Include="..\..\src\storage\AutorunMediaJob.h" />
+    <ClInclude Include="..\..\src\storage\cdioSupport.h" />
+    <ClInclude Include="..\..\src\storage\IoSupport.h" />
+    <ClInclude Include="..\..\src\storage\IStorageProvider.h" />
+    <ClInclude Include="..\..\src\storage\MediaManager.h" />
+    <ClInclude Include="..\..\src\storage\windows\Win32StorageProvider.h" />
+    <ClInclude Include="..\..\src\system.h" />
+    <ClInclude Include="..\..\src\Temperature.h" />
+    <ClInclude Include="..\..\src\test\TestBasicEnvironment.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\test\TestUtils.h">
+    <ClInclude Include="..\..\src\test\TestUtils.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\TextureCache.h" />
-    <ClInclude Include="..\..\xbmc\TextureCacheJob.h" />
-    <ClInclude Include="..\..\xbmc\TextureDatabase.h" />
-    <ClInclude Include="..\..\xbmc\DatabaseManager.h" />
-    <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
-    <ClInclude Include="..\..\xbmc\video\PlayerController.h" />
-    <ClInclude Include="..\..\xbmc\video\videosync\VideoSync.h" />
-    <ClInclude Include="..\..\xbmc\video\videosync\VideoSyncD3D.h" />
-    <ClInclude Include="..\..\xbmc\video\VideoThumbLoader.h" />
-    <ClInclude Include="..\..\xbmc\music\MusicThumbLoader.h" />
-    <ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
-    <ClInclude Include="..\..\xbmc\URL.h" />
-    <ClInclude Include="..\..\xbmc\Util.h" />
-    <ClInclude Include="..\..\xbmc\utils\Screenshot.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\Base64.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\DatabaseUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\EdenVideoArtUpdater.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\GroupUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\HTMLTable.h" />
-    <ClInclude Include="..\..\xbmc\utils\HTMLUtil.h" />
-    <ClInclude Include="..\..\xbmc\utils\HttpHeader.h" />
-    <ClInclude Include="..\..\xbmc\utils\HttpParser.h" />
-    <ClInclude Include="..\..\xbmc\utils\HttpResponse.h" />
-    <ClInclude Include="..\..\xbmc\utils\InfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\utils\ISerializable.h" />
-    <ClInclude Include="..\..\xbmc\utils\ISortable.h" />
-    <ClInclude Include="..\..\xbmc\utils\Job.h" />
-    <ClInclude Include="..\..\xbmc\utils\JobManager.h" />
-    <ClInclude Include="..\..\xbmc\utils\JSONVariantParser.h" />
-    <ClInclude Include="..\..\xbmc\utils\JSONVariantWriter.h" />
-    <ClInclude Include="..\..\xbmc\utils\LabelFormatter.h" />
-    <ClInclude Include="..\..\xbmc\utils\LangCodeExpander.h" />
-    <ClInclude Include="..\..\xbmc\utils\log.h" />
-    <ClInclude Include="..\..\xbmc\utils\MathUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\md5.h" />
-    <ClInclude Include="..\..\xbmc\utils\Observer.h" />
-    <ClInclude Include="..\..\xbmc\utils\Mime.h" />
-    <ClInclude Include="..\..\xbmc\utils\PerformanceSample.h" />
-    <ClInclude Include="..\..\xbmc\utils\PerformanceStats.h" />
-    <ClInclude Include="..\..\xbmc\utils\POUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\RecentlyAddedJob.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\SeekHandler.h" />
-    <ClInclude Include="..\..\xbmc\utils\SortUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\Splash.h" />
-    <ClInclude Include="..\..\xbmc\utils\StdString.h" />
-    <ClInclude Include="..\..\xbmc\utils\Stopwatch.h" />
-    <ClInclude Include="..\..\xbmc\utils\StreamDetails.h" />
-    <ClInclude Include="..\..\xbmc\utils\StreamUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\StringUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\SystemInfo.h" />
-    <ClCompile Include="..\..\xbmc\utils\test\TestGlobalsHandlingPattern1.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\xbmc\utils\TextSearch.h" />
-    <ClInclude Include="..\..\xbmc\utils\TimeSmoother.h" />
-    <ClInclude Include="..\..\xbmc\utils\TimeUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\TuxBoxUtil.h" />
-    <ClInclude Include="..\..\xbmc\utils\URIUtils.h" />
-    <ClInclude Include="..\..\xbmc\utils\UrlOptions.h" />
-    <ClInclude Include="..\..\xbmc\utils\Variant.h" />
-    <ClInclude Include="..\..\xbmc\utils\Weather.h" />
-    <ClInclude Include="..\..\xbmc\utils\Environment.h" />
-    <ClInclude Include="..\..\xbmc\utils\XBMCTinyXML.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\GUIDialogSubtitles.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\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\VideoDbUrl.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\view\GUIViewControl.h" />
-    <ClInclude Include="..\..\xbmc\view\GUIViewState.h" />
-    <ClInclude Include="..\..\xbmc\view\ViewDatabase.h" />
-    <ClInclude Include="..\..\xbmc\view\ViewState.h" />
-    <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h" />
-    <ClInclude Include="..\..\xbmc\win32\IMMNotificationClient.h" />
-    <ClInclude Include="..\..\xbmc\win32\pch.h" />
-    <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
-    <ClInclude Include="..\..\xbmc\XBDateTime.h" />
-    <ClInclude Include="..\..\xbmc\XbmcContext.h" />
-    <ClInclude Include="..\..\xbmc\win32\PlatformInclude.h" />
-    <ClInclude Include="..\..\xbmc\win32\stat_utf8.h" />
-    <ClInclude Include="..\..\xbmc\win32\stdio_utf8.h" />
-    <ClInclude Include="..\..\xbmc\win32\WIN32Util.h" />
-    <ClInclude Include="..\..\xbmc\win32\WindowHelper.h" />
-    <ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\IPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessage.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Edl.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\IDVDPlayer.h" />
-    <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\DVDAudioCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DllDvdNav.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h" />
-    <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\DVDInputStreamNavigator.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h" />
+    <ClInclude Include="..\..\src\TextureCache.h" />
+    <ClInclude Include="..\..\src\TextureCacheJob.h" />
+    <ClInclude Include="..\..\src\TextureDatabase.h" />
+    <ClInclude Include="..\..\src\DatabaseManager.h" />
+    <ClInclude Include="..\..\src\ThumbLoader.h" />
+    <ClInclude Include="..\..\src\video\PlayerController.h" />
+    <ClInclude Include="..\..\src\video\videosync\VideoSync.h" />
+    <ClInclude Include="..\..\src\video\videosync\VideoSyncD3D.h" />
+    <ClInclude Include="..\..\src\video\VideoThumbLoader.h" />
+    <ClInclude Include="..\..\src\music\MusicThumbLoader.h" />
+    <ClInclude Include="..\..\src\ThumbnailCache.h" />
+    <ClInclude Include="..\..\src\URL.h" />
+    <ClInclude Include="..\..\src\Util.h" />
+    <ClInclude Include="..\..\src\utils\Screenshot.h" />
+    <ClInclude Include="..\..\src\utils\AlarmClock.h" />
+    <ClInclude Include="..\..\src\utils\AliasShortcutUtils.h" />
+    <ClInclude Include="..\..\src\utils\Archive.h" />
+    <ClInclude Include="..\..\src\utils\AsyncFileCopy.h" />
+    <ClInclude Include="..\..\src\utils\AutoPtrHandle.h" />
+    <ClInclude Include="..\..\src\utils\Base64.h" />
+    <ClInclude Include="..\..\src\utils\BitstreamStats.h" />
+    <ClInclude Include="..\..\src\utils\CharsetConverter.h" />
+    <ClInclude Include="..\..\src\utils\CPUInfo.h" />
+    <ClInclude Include="..\..\src\utils\Crc32.h" />
+    <ClInclude Include="..\..\src\utils\DatabaseUtils.h" />
+    <ClInclude Include="..\..\src\utils\EdenVideoArtUpdater.h" />
+    <ClInclude Include="..\..\src\utils\EndianSwap.h" />
+    <ClInclude Include="..\..\src\utils\Fanart.h" />
+    <ClInclude Include="..\..\src\utils\fft.h" />
+    <ClInclude Include="..\..\src\utils\FileOperationJob.h" />
+    <ClInclude Include="..\..\src\utils\FileUtils.h" />
+    <ClInclude Include="..\..\src\utils\fstrcmp.h" />
+    <ClInclude Include="..\..\src\utils\GlobalsHandling.h" />
+    <ClInclude Include="..\..\src\utils\GroupUtils.h" />
+    <ClInclude Include="..\..\src\utils\HTMLTable.h" />
+    <ClInclude Include="..\..\src\utils\HTMLUtil.h" />
+    <ClInclude Include="..\..\src\utils\HttpHeader.h" />
+    <ClInclude Include="..\..\src\utils\HttpParser.h" />
+    <ClInclude Include="..\..\src\utils\HttpResponse.h" />
+    <ClInclude Include="..\..\src\utils\InfoLoader.h" />
+    <ClInclude Include="..\..\src\utils\ISerializable.h" />
+    <ClInclude Include="..\..\src\utils\ISortable.h" />
+    <ClInclude Include="..\..\src\utils\Job.h" />
+    <ClInclude Include="..\..\src\utils\JobManager.h" />
+    <ClInclude Include="..\..\src\utils\JSONVariantParser.h" />
+    <ClInclude Include="..\..\src\utils\JSONVariantWriter.h" />
+    <ClInclude Include="..\..\src\utils\LabelFormatter.h" />
+    <ClInclude Include="..\..\src\utils\LangCodeExpander.h" />
+    <ClInclude Include="..\..\src\utils\log.h" />
+    <ClInclude Include="..\..\src\utils\MathUtils.h" />
+    <ClInclude Include="..\..\src\utils\md5.h" />
+    <ClInclude Include="..\..\src\utils\Observer.h" />
+    <ClInclude Include="..\..\src\utils\Mime.h" />
+    <ClInclude Include="..\..\src\utils\PerformanceSample.h" />
+    <ClInclude Include="..\..\src\utils\PerformanceStats.h" />
+    <ClInclude Include="..\..\src\utils\POUtils.h" />
+    <ClInclude Include="..\..\src\utils\RecentlyAddedJob.h" />
+    <ClInclude Include="..\..\src\utils\RegExp.h" />
+    <ClInclude Include="..\..\src\utils\RingBuffer.h" />
+    <ClInclude Include="..\..\src\utils\RssReader.h" />
+    <ClInclude Include="..\..\src\utils\SaveFileStateJob.h" />
+    <ClInclude Include="..\..\src\utils\ScraperParser.h" />
+    <ClInclude Include="..\..\src\utils\ScraperUrl.h" />
+    <ClInclude Include="..\..\src\utils\SeekHandler.h" />
+    <ClInclude Include="..\..\src\utils\SortUtils.h" />
+    <ClInclude Include="..\..\src\utils\Splash.h" />
+    <ClInclude Include="..\..\src\utils\StdString.h" />
+    <ClInclude Include="..\..\src\utils\Stopwatch.h" />
+    <ClInclude Include="..\..\src\utils\StreamDetails.h" />
+    <ClInclude Include="..\..\src\utils\StreamUtils.h" />
+    <ClInclude Include="..\..\src\utils\StringUtils.h" />
+    <ClInclude Include="..\..\src\utils\SystemInfo.h" />
+    <ClCompile Include="..\..\src\utils\test\TestGlobalsHandlingPattern1.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\utils\TextSearch.h" />
+    <ClInclude Include="..\..\src\utils\TimeSmoother.h" />
+    <ClInclude Include="..\..\src\utils\TimeUtils.h" />
+    <ClInclude Include="..\..\src\utils\TuxBoxUtil.h" />
+    <ClInclude Include="..\..\src\utils\URIUtils.h" />
+    <ClInclude Include="..\..\src\utils\UrlOptions.h" />
+    <ClInclude Include="..\..\src\utils\Variant.h" />
+    <ClInclude Include="..\..\src\utils\Weather.h" />
+    <ClInclude Include="..\..\src\utils\Environment.h" />
+    <ClInclude Include="..\..\src\utils\XBMCTinyXML.h" />
+    <ClInclude Include="..\..\src\utils\XMLUtils.h" />
+    <ClInclude Include="..\..\src\video\Bookmark.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogAudioSubtitleSettings.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogFileStacking.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogFullScreenInfo.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogSubtitles.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogTeletext.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoBookmarks.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoInfo.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoOSD.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoOverlay.h" />
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoSettings.h" />
+    <ClInclude Include="..\..\src\video\GUIViewStateVideo.h" />
+    <ClInclude Include="..\..\src\video\Teletext.h" />
+    <ClInclude Include="..\..\src\video\TeletextDefines.h" />
+    <ClInclude Include="..\..\src\video\VideoDatabase.h" />
+    <ClInclude Include="..\..\src\video\VideoDbUrl.h" />
+    <ClInclude Include="..\..\src\video\VideoInfoDownloader.h" />
+    <ClInclude Include="..\..\src\video\VideoInfoScanner.h" />
+    <ClInclude Include="..\..\src\video\VideoInfoTag.h" />
+    <ClInclude Include="..\..\src\video\VideoReferenceClock.h" />
+    <ClInclude Include="..\..\src\video\windows\GUIWindowFullScreen.h" />
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoBase.h" />
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoNav.h" />
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoPlaylist.h" />
+    <ClInclude Include="..\..\src\view\GUIViewControl.h" />
+    <ClInclude Include="..\..\src\view\GUIViewState.h" />
+    <ClInclude Include="..\..\src\view\ViewDatabase.h" />
+    <ClInclude Include="..\..\src\view\ViewState.h" />
+    <ClInclude Include="..\..\src\view\ViewStateSettings.h" />
+    <ClInclude Include="..\..\src\win32\IMMNotificationClient.h" />
+    <ClInclude Include="..\..\src\win32\pch.h" />
+    <ClInclude Include="..\..\src\win32\PlatformDefs.h" />
+    <ClInclude Include="..\..\src\XBDateTime.h" />
+    <ClInclude Include="..\..\src\XbmcContext.h" />
+    <ClInclude Include="..\..\src\win32\PlatformInclude.h" />
+    <ClInclude Include="..\..\src\win32\stat_utf8.h" />
+    <ClInclude Include="..\..\src\win32\stdio_utf8.h" />
+    <ClInclude Include="..\..\src\win32\WIN32Util.h" />
+    <ClInclude Include="..\..\src\win32\WindowHelper.h" />
+    <ClInclude Include="..\..\src\cores\DummyVideoPlayer.h" />
+    <ClInclude Include="..\..\src\cores\IPlayer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDAudio.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDClock.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxSPU.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDFileInfo.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDMessage.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDMessageQueue.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDOverlayContainer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDOverlayRenderer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerAudio.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerSubtitle.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerTeletext.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerVideo.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDStreamInfo.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDTSCorrection.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\Edl.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\IDVDPlayer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecs.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DXVA.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemux.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DllDvdNav.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStream.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h" />
     <ClInclude Include="..\..\lib\DllAvCodec.h" />
     <ClInclude Include="..\..\lib\DllAvFormat.h" />
     <ClInclude Include="..\..\lib\DllPostProc.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" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DllLibass.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h" />
-    <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\ASAPCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\AudioDecoder.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DllLibass.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h" />
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\ASAPCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\AudioDecoder.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\CodecFactory.h" />
     <ClInclude Include="..\..\lib\DllAdpcm.h" />
     <ClInclude Include="..\..\lib\DllASAP.h" />
     <ClInclude Include="..\..\lib\DllNosefart.h" />
     <ClInclude Include="..\..\lib\DllStSound.h" />
     <ClInclude Include="..\..\lib\DllTimidity.h" />
     <ClInclude Include="..\..\lib\DllVorbisfile.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\ModplugCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\NSFCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\OggCallback.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\OGGcodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\PAPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\SIDCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\SPCCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\TimidityCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\VGMCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\paplayer\YMCodec.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\coff.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\coffldr.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker_file.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker_library.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_util.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\DllLoader.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\DllLoaderContainer.h" />
-    <ClInclude Include="..\..\xbmc\DllPaths.h" />
-    <ClInclude Include="..\..\xbmc\DllPaths_win32.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\LibraryLoader.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\Win32DllLoader.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_dummy.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_kernel32.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_msvcrt.h" />
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\util\EmuFileWrapper.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\BaseRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererDX.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererUtil.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderFlags.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderManager.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinRenderer.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\DXVA.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\DXVAHD.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\ConvolutionKernels.h" />
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\YUV2RGBShader.h" />
-    <ClInclude Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.h" />
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreConfig.h" />
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.h" />
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\QueryParams.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNode.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.h" />
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\QueryParams.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\AudioEncoder.h" />
-    <ClInclude Include="..\..\xbmc\addons\DllAddon.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\cdrip\CDDARipJob.h" />
-    <ClInclude Include="..\..\xbmc\cdrip\CDDARipper.h" />
-    <ClInclude Include="..\..\xbmc\cdrip\Encoder.h" />
-    <ClInclude Include="..\..\xbmc\cdrip\EncoderFFmpeg.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\WinEvents.h" />
-    <ClInclude Include="..\..\xbmc\windowing\WinSystem.h" />
-    <ClInclude Include="..\..\xbmc\windowing\XBMC_events.h" />
-    <ClInclude Include="..\..\xbmc\windows\GUIMediaWindow.h" />
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowDebugInfo.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\GUIWindowScreensaverDim.h" />
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowStartup.h" />
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowSystemInfo.h" />
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowWeather.h" />
-    <ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\DVDPlayerCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\ICodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\ModplugCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\NSFCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\OggCallback.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\OGGcodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\PAPlayer.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\SIDCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\SPCCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\TimidityCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\VGMCodec.h" />
+    <ClInclude Include="..\..\src\cores\paplayer\YMCodec.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\coff.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\coffldr.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\dll.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker_file.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker_library.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_util.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\DllLoader.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\DllLoaderContainer.h" />
+    <ClInclude Include="..\..\src\DllPaths.h" />
+    <ClInclude Include="..\..\src\DllPaths_win32.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\LibraryLoader.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\Win32DllLoader.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_dummy.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_kernel32.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_msvcrt.h" />
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\util\EmuFileWrapper.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\BaseRenderer.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRenderer.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererDX.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererUtil.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderFlags.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderManager.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\WinRenderer.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\DXVA.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\DXVAHD.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\ConvolutionKernels.h" />
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\YUV2RGBShader.h" />
+    <ClInclude Include="..\..\src\cores\ExternalPlayer\ExternalPlayer.h" />
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerCoreConfig.h" />
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerCoreFactory.h" />
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerSelectionRule.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNode.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.h" />
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\QueryParams.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNode.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.h" />
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\QueryParams.h" />
+    <ClInclude Include="..\..\src\addons\Addon.h" />
+    <ClInclude Include="..\..\src\addons\AddonDll.h" />
+    <ClInclude Include="..\..\src\addons\AddonManager.h" />
+    <ClInclude Include="..\..\src\addons\AddonStatusHandler.h" />
+    <ClInclude Include="..\..\src\addons\AudioEncoder.h" />
+    <ClInclude Include="..\..\src\addons\DllAddon.h" />
+    <ClInclude Include="..\..\src\addons\IAddon.h" />
+    <ClInclude Include="..\..\src\addons\Scraper.h" />
+    <ClInclude Include="..\..\src\addons\ScreenSaver.h" />
+    <ClInclude Include="..\..\src\addons\Visualisation.h" />
+    <ClInclude Include="..\..\src\cdrip\CDDARipJob.h" />
+    <ClInclude Include="..\..\src\cdrip\CDDARipper.h" />
+    <ClInclude Include="..\..\src\cdrip\Encoder.h" />
+    <ClInclude Include="..\..\src\cdrip\EncoderFFmpeg.h" />
+    <ClInclude Include="..\..\src\windowing\WindowingFactory.h" />
+    <ClInclude Include="..\..\src\windowing\windows\WinEventsWin32.h" />
+    <ClInclude Include="..\..\src\windowing\windows\WinSystemWin32.h" />
+    <ClInclude Include="..\..\src\windowing\windows\WinSystemWin32DX.h" />
+    <ClInclude Include="..\..\src\windowing\WinEvents.h" />
+    <ClInclude Include="..\..\src\windowing\WinSystem.h" />
+    <ClInclude Include="..\..\src\windowing\XBMC_events.h" />
+    <ClInclude Include="..\..\src\windows\GUIMediaWindow.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowDebugInfo.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowFileManager.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowHome.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowLoginScreen.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowPointer.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowScreensaver.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowScreensaverDim.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowStartup.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowSystemInfo.h" />
+    <ClInclude Include="..\..\src\windows\GUIWindowWeather.h" />
+    <ClInclude Include="..\..\src\XBApplicationEx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
+    <ResourceCompile Include="..\..\src\win32\XBMC_PC.rc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
       <AdditionalIncludeDirectories>..\..\tools\windows\packaging\media;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmc.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmc.i">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating SWIG bindings</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating SWIG bindings</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\python\generated\%(Filename).cpp</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcaddon.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcaddon.i">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating SWIG bindings</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating SWIG bindings</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\python\generated\%(Filename).cpp</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcgui.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcgui.i">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating SWIG bindings</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating SWIG bindings</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\python\generated\%(Filename).cpp</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcplugin.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcplugin.i">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating SWIG bindings</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating SWIG bindings</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\python\generated\%(Filename).cpp</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcvfs.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcvfs.i">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename)</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating SWIG bindings</Message>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\license.txt">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\license.txt">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\JsonSchemaBuilder.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\methods.json">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\methods.json">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\JsonSchemaBuilder.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\notifications.json">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\notifications.json">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\JsonSchemaBuilder.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\types.json">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\types.json">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\JsonSchemaBuilder.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\version.txt">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\version.txt">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\JsonSchemaBuilder.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ServiceDescription.h for JSON-RPC API</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)..\ServiceDescription.h</Outputs>
     </CustomBuild>
-    <None Include="..\..\xbmc\interfaces\swig\ControlListAddItemMethods.i" />
+    <None Include="..\..\src\interfaces\swig\ControlListAddItemMethods.i" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\version.txt">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CALL ..\..\tools\windows\CompileInfo.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating CompileInfo.cpp</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\xbmc\CompileInfo.cpp;..\..\xbmc\win32\XBMC_PC.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\CompileInfo.cpp;..\..\src\win32\XBMC_PC.rc</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CALL ..\..\tools\windows\CompileInfo.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating CompileInfo.cpp</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\xbmc\CompileInfo.cpp</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\CompileInfo.cpp</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">CALL ..\..\tools\windows\CompileInfo.bat</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Generating CompileInfo.cpp</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">..\..\xbmc\CompileInfo.cpp</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">..\..\src\CompileInfo.cpp</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>
index 7603447..c67ca1f 100644 (file)
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\win32\pch.cpp">
+    <ClCompile Include="..\..\src\win32\pch.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\strverscmp.cpp">
+    <ClCompile Include="..\..\src\win32\strverscmp.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\WIN32Util.cpp">
+    <ClCompile Include="..\..\src\win32\WIN32Util.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\WindowHelper.cpp">
+    <ClCompile Include="..\..\src\win32\WindowHelper.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\XBMC_PC.cpp">
+    <ClCompile Include="..\..\src\win32\XBMC_PC.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DummyVideoPlayer.cpp">
+    <ClCompile Include="..\..\src\cores\DummyVideoPlayer.cpp">
       <Filter>cores</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDAudio.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDAudio.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDClock.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDClock.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxSPU.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDFileInfo.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessage.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDMessage.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDMessageQueue.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDOverlayContainer.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDOverlayRenderer.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayer.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerAudio.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerSubtitle.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerTeletext.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDPlayerVideo.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDStreamInfo.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDTSCorrection.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\Edl.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\Edl.cpp">
       <Filter>cores\dvdplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecUtils.cpp">
       <Filter>cores\dvdplayer\DVDCodecs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.cpp">
       <Filter>cores\dvdplayer\DVDCodecs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DXVA.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.c">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.c">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay\libspucc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemux.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStream.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\ASAPCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\ASAPCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\AudioDecoder.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\AudioDecoder.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\CodecFactory.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\CodecFactory.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\DVDPlayerCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\ModplugCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\ModplugCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\NSFCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\NSFCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\OggCallback.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\OggCallback.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\OGGcodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\OGGcodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\PAPlayer.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\PAPlayer.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\SIDCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\SIDCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\SPCCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\SPCCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\TimidityCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\TimidityCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\VGMCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\VGMCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\paplayer\YMCodec.cpp">
+    <ClCompile Include="..\..\src\cores\paplayer\YMCodec.cpp">
       <Filter>cores\paplayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\coff.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\coff.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\dll.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker_file.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker_file.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_tracker_library.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_tracker_library.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\dll_util.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\dll_util.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\DllLoader.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\DllLoader.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\DllLoaderContainer.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\DllLoaderContainer.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\LibraryLoader.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\LibraryLoader.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\Win32DllLoader.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\Win32DllLoader.cpp">
       <Filter>cores\DllLoader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_dummy.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_dummy.cpp">
       <Filter>cores\DllLoader\exports</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_kernel32.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_kernel32.cpp">
       <Filter>cores\DllLoader\exports</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\emu_msvcrt.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\emu_msvcrt.cpp">
       <Filter>cores\DllLoader\exports</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DllLoader\exports\util\EmuFileWrapper.cpp">
+    <ClCompile Include="..\..\src\cores\DllLoader\exports\util\EmuFileWrapper.cpp">
       <Filter>cores\DllLoader\exports\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\BaseRenderer.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\BaseRenderer.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRenderer.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRenderer.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererDX.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererDX.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererUtil.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererUtil.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderFlags.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderFlags.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderManager.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderManager.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\WinRenderer.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\WinRenderer.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\DXVA.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\DXVA.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\DXVAHD.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\DXVAHD.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\ConvolutionKernels.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\ConvolutionKernels.cpp">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\YUV2RGBShader.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\YUV2RGBShader.cpp">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.cpp">
+    <ClCompile Include="..\..\src\cores\ExternalPlayer\ExternalPlayer.cpp">
       <Filter>cores\ExternalPlayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.cpp">
+    <ClCompile Include="..\..\src\cores\playercorefactory\PlayerCoreFactory.cpp">
       <Filter>cores\PlayerCoreFactory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.cpp">
+    <ClCompile Include="..\..\src\cores\playercorefactory\PlayerSelectionRule.cpp">
       <Filter>cores\PlayerCoreFactory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\QueryParams.cpp">
+    <ClCompile Include="..\..\src\FileSystem\MusicDatabaseDirectory\QueryParams.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNode.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNode.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\QueryParams.cpp">
+    <ClCompile Include="..\..\src\FileSystem\VideoDatabaseDirectory\QueryParams.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Addon.cpp">
+    <ClCompile Include="..\..\src\addons\Addon.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonManager.cpp">
+    <ClCompile Include="..\..\src\addons\AddonManager.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonStatusHandler.cpp">
+    <ClCompile Include="..\..\src\addons\AddonStatusHandler.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AudioEncoder.cpp">
+    <ClCompile Include="..\..\src\addons\AudioEncoder.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Scraper.cpp">
+    <ClCompile Include="..\..\src\addons\Scraper.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\ScreenSaver.cpp">
+    <ClCompile Include="..\..\src\addons\ScreenSaver.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Visualisation.cpp">
+    <ClCompile Include="..\..\src\addons\Visualisation.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Repository.cpp">
+    <ClCompile Include="..\..\src\addons\Repository.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Skin.cpp">
+    <ClCompile Include="..\..\src\addons\Skin.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\PluginSource.cpp">
+    <ClCompile Include="..\..\src\addons\PluginSource.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\VideoShaders\WinVideoFilter.cpp">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.cpp">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\Service.cpp">
+    <ClCompile Include="..\..\src\addons\Service.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIDialog.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIDialog.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\music\karaoke\GUIDialogKaraokeSongSelector.cpp">
+    <ClCompile Include="..\..\src\MediaSource.cpp" />
+    <ClCompile Include="..\..\src\MediaSource.cpp" />
+    <ClCompile Include="..\..\src\MediaSource.cpp" />
+    <ClCompile Include="..\..\src\music\karaoke\GUIDialogKaraokeSongSelector.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\GUIWindowKaraokeLyrics.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\GUIWindowKaraokeLyrics.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyrics.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyrics.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricscdg.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricscdg.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricsfactory.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricsfactory.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricsmanager.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricsmanager.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstext.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstext.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextkar.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextkar.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextlrc.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextlrc.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokelyricstextustar.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokelyricstextustar.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokewindowbackground.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokewindowbackground.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\Album.cpp">
+    <ClCompile Include="..\..\src\music\Album.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\Artist.cpp">
+    <ClCompile Include="..\..\src\music\Artist.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\GUIViewStateMusic.cpp">
+    <ClCompile Include="..\..\src\music\GUIViewStateMusic.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\MusicInfoLoader.cpp">
+    <ClCompile Include="..\..\src\music\MusicInfoLoader.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\Song.cpp">
+    <ClCompile Include="..\..\src\music\Song.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cdrip\CDDARipper.cpp">
+    <ClCompile Include="..\..\src\cdrip\CDDARipper.cpp">
       <Filter>cdrip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cdrip\CDDARipJob.cpp">
+    <ClCompile Include="..\..\src\cdrip\CDDARipJob.cpp">
       <Filter>cdrip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cdrip\Encoder.cpp">
+    <ClCompile Include="..\..\src\cdrip\Encoder.cpp">
       <Filter>cdrip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cdrip\EncoderFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cdrip\EncoderFFmpeg.cpp">
       <Filter>cdrip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonInfo.cpp">
+    <ClCompile Include="..\..\src\addons\GUIDialogAddonInfo.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonSettings.cpp">
+    <ClCompile Include="..\..\src\addons\GUIDialogAddonSettings.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogBoxBase.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogBoxBase.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogBusy.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogBusy.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogButtonMenu.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogButtonMenu.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogContextMenu.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogContextMenu.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogFavourites.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogFavourites.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogFileBrowser.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogFileBrowser.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogGamepad.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogGamepad.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogKaiToast.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogKaiToast.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMediaSource.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMediaSource.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMuteBug.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMuteBug.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogNumeric.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogNumeric.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogOK.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogOK.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogPlayerControls.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogPlayerControls.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogProgress.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogProgress.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSeekBar.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSeekBar.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSelect.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSelect.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSlider.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSlider.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistEditor.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSmartPlaylistEditor.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistRule.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSmartPlaylistRule.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogSubMenu.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogSubMenu.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogTextViewer.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogTextViewer.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogVolumeBar.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogVolumeBar.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogYesNo.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogYesNo.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\Application.cpp" />
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp" />
-    <ClCompile Include="..\..\xbmc\SystemGlobals.cpp" />
-    <ClCompile Include="..\..\xbmc\xbmc.cpp" />
-    <ClCompile Include="..\..\xbmc\guilib\AnimatedGif.cpp">
+    <ClCompile Include="..\..\src\Application.cpp" />
+    <ClCompile Include="..\..\src\MediaSource.cpp" />
+    <ClCompile Include="..\..\src\SystemGlobals.cpp" />
+    <ClCompile Include="..\..\src\xbmc.cpp" />
+    <ClCompile Include="..\..\src\guilib\AnimatedGif.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\D3DResource.cpp">
+    <ClCompile Include="..\..\src\guilib\D3DResource.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\DDSImage.cpp">
+    <ClCompile Include="..\..\src\guilib\DDSImage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\DirectXGraphics.cpp">
+    <ClCompile Include="..\..\src\guilib\DirectXGraphics.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIAudioManager.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIAudioManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIBaseContainer.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIBaseContainer.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIBorderedImage.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIBorderedImage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIButtonControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIButtonControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUICheckMarkControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUICheckMarkControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIColorManager.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIColorManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIControlFactory.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIControlFactory.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIControlGroup.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIControlGroup.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIControlGroupList.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIControlGroupList.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIControlProfiler.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIControlProfiler.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIEditControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIEditControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFadeLabelControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFixedListContainer.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFont.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFontManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIImage.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIImage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIIncludes.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIIncludes.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIInfoTypes.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIInfoTypes.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUILabel.cpp">
+    <ClCompile Include="..\..\src\guilib\GUILabel.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUILabelControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUILabelControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIListContainer.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIListContainer.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIListGroup.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIListGroup.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIListItem.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIListItem.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIListItemLayout.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIListItemLayout.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIListLabel.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIListLabel.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIMessage.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIMessage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIMoverControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIMoverControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIMultiImage.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIMultiImage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIMultiSelectText.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIMultiSelectText.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIPanelContainer.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIPanelContainer.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIProgressControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIProgressControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIRadioButtonControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIRadioButtonControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIRenderingControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIRenderingControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIResizeControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIResizeControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIRSSControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIRSSControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIScrollBarControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIScrollBarControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUISelectButtonControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUISelectButtonControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUISettingsSliderControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUISettingsSliderControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIShader.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIShader.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUISliderControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUISliderControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUISpinControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUISpinControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUISpinControlEx.cpp">
+    <ClCompile Include="..\..\src\guilib\GUISpinControlEx.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIStaticItem.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIStaticItem.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUITextBox.cpp">
+    <ClCompile Include="..\..\src\guilib\GUITextBox.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUITextLayout.cpp">
+    <ClCompile Include="..\..\src\guilib\GUITextLayout.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIToggleButtonControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIToggleButtonControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIVideoControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIVideoControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIVisualisationControl.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIVisualisationControl.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIWindow.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIWindow.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIWindowManager.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIWindowManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIWrappingListContainer.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIWrappingListContainer.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\IWindowManagerCallback.cpp">
+    <ClCompile Include="..\..\src\guilib\IWindowManagerCallback.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\Key.cpp">
+    <ClCompile Include="..\..\src\guilib\Key.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\LocalizeStrings.cpp">
+    <ClCompile Include="..\..\src\guilib\LocalizeStrings.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\MatrixGLES.cpp">
+    <ClCompile Include="..\..\src\guilib\MatrixGLES.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\TextureBundle.cpp">
+    <ClCompile Include="..\..\src\guilib\TextureBundle.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\TextureBundleXBT.cpp">
+    <ClCompile Include="..\..\src\guilib\TextureBundleXBT.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\TextureBundleXPR.cpp">
+    <ClCompile Include="..\..\src\guilib\TextureBundleXPR.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\VisibleEffect.cpp">
+    <ClCompile Include="..\..\src\guilib\VisibleEffect.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\XBTF.cpp">
+    <ClCompile Include="..\..\src\guilib\XBTF.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\XBTFReader.cpp">
+    <ClCompile Include="..\..\src\guilib\XBTFReader.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp">
+    <ClCompile Include="..\..\src\input\ButtonTranslator.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\KeyboardLayout.cpp">
+    <ClCompile Include="..\..\src\input\KeyboardLayout.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp">
+    <ClCompile Include="..\..\src\input\KeyboardLayoutConfiguration.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp">
+    <ClCompile Include="..\..\src\input\KeyboardStat.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\MouseStat.cpp">
+    <ClCompile Include="..\..\src\input\MouseStat.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\windows\IRServerSuite.cpp">
+    <ClCompile Include="..\..\src\input\windows\IRServerSuite.cpp">
       <Filter>input\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\windows\IrssMessage.cpp">
+    <ClCompile Include="..\..\src\input\windows\IrssMessage.cpp">
       <Filter>input\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\AudioLibrary.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileItemHandler.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FileItemHandler.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FileOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FileOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONRPC.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\JSONRPC.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlayerOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PlayerOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PlaylistOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PlaylistOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\SystemOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\SystemOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\VideoLibrary.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\VideoLibrary.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\XBMCOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\XBMCOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\TextureOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\TextureOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp">
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicInfo.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp">
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicOSD.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp">
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogMusicOverlay.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp">
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogSongInfo.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.cpp">
+    <ClCompile Include="..\..\src\music\dialogs\GUIDialogVisualisationPresetList.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicAlbumInfo.cpp">
+    <ClCompile Include="..\..\src\music\infoscanner\MusicAlbumInfo.cpp">
       <Filter>music\infoscanner</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicArtistInfo.cpp">
+    <ClCompile Include="..\..\src\music\infoscanner\MusicArtistInfo.cpp">
       <Filter>music\infoscanner</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicInfoScanner.cpp">
+    <ClCompile Include="..\..\src\music\infoscanner\MusicInfoScanner.cpp">
       <Filter>music\infoscanner</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\infoscanner\MusicInfoScraper.cpp">
+    <ClCompile Include="..\..\src\music\infoscanner\MusicInfoScraper.cpp">
       <Filter>music\infoscanner</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicBase.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicBase.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicNav.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicNav.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylist.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicPlaylist.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylistEditor.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicPlaylistEditor.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowMusicSongs.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowMusicSongs.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\windows\GUIWindowVisualisation.cpp">
+    <ClCompile Include="..\..\src\music\windows\GUIWindowVisualisation.cpp">
       <Filter>music\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTag.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTag.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderASAP.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderASAP.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderCDDA.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderCDDA.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderDatabase.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderDatabase.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFactory.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderFactory.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMidi.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderMidi.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderNSF.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderShn.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderSPC.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.cpp">
+    <ClCompile Include="..\..\src\music\tags\MusicInfoTagLoaderYM.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\cddb.cpp">
+    <ClCompile Include="..\..\src\network\cddb.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\DNSNameCache.cpp">
+    <ClCompile Include="..\..\src\network\DNSNameCache.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\EventClient.cpp">
+    <ClCompile Include="..\..\src\network\EventClient.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\EventPacket.cpp">
+    <ClCompile Include="..\..\src\network\EventPacket.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\EventServer.cpp">
+    <ClCompile Include="..\..\src\network\EventServer.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\GUIDialogAccessPoints.cpp">
+    <ClCompile Include="..\..\src\network\GUIDialogAccessPoints.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\GUIDialogNetworkSetup.cpp">
+    <ClCompile Include="..\..\src\network\GUIDialogNetworkSetup.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\Network.cpp">
+    <ClCompile Include="..\..\src\network\Network.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\Socket.cpp">
+    <ClCompile Include="..\..\src\network\Socket.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\TCPServer.cpp">
+    <ClCompile Include="..\..\src\network\TCPServer.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\UdpClient.cpp">
+    <ClCompile Include="..\..\src\network\UdpClient.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\WakeOnAccess.cpp">
+    <ClCompile Include="..\..\src\network\WakeOnAccess.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\WebServer.cpp">
+    <ClCompile Include="..\..\src\network\WebServer.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\Zeroconf.cpp">
+    <ClCompile Include="..\..\src\network\Zeroconf.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\windows\NetworkWin32.cpp">
+    <ClCompile Include="..\..\src\network\windows\NetworkWin32.cpp">
       <Filter>network\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\GUIDialogPictureInfo.cpp">
+    <ClCompile Include="..\..\src\pictures\GUIDialogPictureInfo.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\GUIViewStatePictures.cpp">
+    <ClCompile Include="..\..\src\pictures\GUIViewStatePictures.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\GUIWindowPictures.cpp">
+    <ClCompile Include="..\..\src\pictures\GUIWindowPictures.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\GUIWindowSlideShow.cpp">
+    <ClCompile Include="..\..\src\pictures\GUIWindowSlideShow.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\Picture.cpp">
+    <ClCompile Include="..\..\src\pictures\Picture.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\PictureInfoLoader.cpp">
+    <ClCompile Include="..\..\src\pictures\PictureInfoLoader.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\PictureInfoTag.cpp">
+    <ClCompile Include="..\..\src\pictures\PictureInfoTag.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pictures\SlideShowPicture.cpp">
+    <ClCompile Include="..\..\src\pictures\SlideShowPicture.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayList.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayList.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListB4S.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListB4S.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListFactory.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListFactory.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListM3U.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListM3U.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListPLS.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListPLS.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListURL.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListURL.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListWPL.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListWPL.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\PlayListXML.cpp">
+    <ClCompile Include="..\..\src\playlists\PlayListXML.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\SmartPlayList.cpp">
+    <ClCompile Include="..\..\src\playlists\SmartPlayList.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\powermanagement\PowerManager.cpp">
+    <ClCompile Include="..\..\src\powermanagement\PowerManager.cpp">
       <Filter>powermanagement</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.cpp">
+    <ClCompile Include="..\..\src\powermanagement\windows\Win32PowerSyscall.cpp">
       <Filter>powermanagement\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp">
+    <ClCompile Include="..\..\src\programs\GUIViewStatePrograms.cpp">
       <Filter>programs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp">
+    <ClCompile Include="..\..\src\programs\GUIWindowPrograms.cpp">
       <Filter>programs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\rendering\RenderSystem.cpp">
+    <ClCompile Include="..\..\src\rendering\RenderSystem.cpp">
       <Filter>rendering</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.cpp">
+    <ClCompile Include="..\..\src\rendering\dx\GUIWindowTestPatternDX.cpp">
       <Filter>rendering\dx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\rendering\dx\RenderSystemDX.cpp">
+    <ClCompile Include="..\..\src\rendering\dx\RenderSystemDX.cpp">
       <Filter>rendering\dx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\AdvancedSettings.cpp">
+    <ClCompile Include="..\..\src\settings\AdvancedSettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\Settings.cpp">
+    <ClCompile Include="..\..\src\settings\Settings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp">
+    <ClCompile Include="..\..\src\settings\VideoSettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\storage\AutorunMediaJob.cpp">
+    <ClCompile Include="..\..\src\storage\AutorunMediaJob.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\storage\cdioSupport.cpp">
+    <ClCompile Include="..\..\src\storage\cdioSupport.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\storage\IoSupport.cpp">
+    <ClCompile Include="..\..\src\storage\IoSupport.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\storage\MediaManager.cpp">
+    <ClCompile Include="..\..\src\storage\MediaManager.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\storage\windows\Win32StorageProvider.cpp">
+    <ClCompile Include="..\..\src\storage\windows\Win32StorageProvider.cpp">
       <Filter>storage\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\AlarmClock.cpp">
+    <ClCompile Include="..\..\src\utils\AlarmClock.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\AliasShortcutUtils.cpp">
+    <ClCompile Include="..\..\src\utils\AliasShortcutUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Archive.cpp">
+    <ClCompile Include="..\..\src\utils\Archive.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\AsyncFileCopy.cpp">
+    <ClCompile Include="..\..\src\utils\AsyncFileCopy.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\AutoPtrHandle.cpp">
+    <ClCompile Include="..\..\src\utils\AutoPtrHandle.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\BitstreamStats.cpp">
+    <ClCompile Include="..\..\src\utils\BitstreamStats.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\CharsetConverter.cpp">
+    <ClCompile Include="..\..\src\utils\CharsetConverter.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\CPUInfo.cpp">
+    <ClCompile Include="..\..\src\utils\CPUInfo.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Crc32.cpp">
+    <ClCompile Include="..\..\src\utils\Crc32.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Fanart.cpp">
+    <ClCompile Include="..\..\src\utils\Fanart.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\fft.cpp">
+    <ClCompile Include="..\..\src\utils\fft.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\FileOperationJob.cpp">
+    <ClCompile Include="..\..\src\utils\FileOperationJob.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\FileUtils.cpp">
+    <ClCompile Include="..\..\src\utils\FileUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\fstrcmp.c">
+    <ClCompile Include="..\..\src\utils\fstrcmp.c">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\HTMLTable.cpp">
+    <ClCompile Include="..\..\src\utils\HTMLTable.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\HTMLUtil.cpp">
+    <ClCompile Include="..\..\src\utils\HTMLUtil.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\HttpHeader.cpp">
+    <ClCompile Include="..\..\src\utils\HttpHeader.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\InfoLoader.cpp">
+    <ClCompile Include="..\..\src\utils\InfoLoader.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\JobManager.cpp">
+    <ClCompile Include="..\..\src\utils\JobManager.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\LabelFormatter.cpp">
+    <ClCompile Include="..\..\src\utils\LabelFormatter.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\log.cpp">
+    <ClCompile Include="..\..\src\utils\log.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\md5.cpp">
+    <ClCompile Include="..\..\src\utils\md5.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\PerformanceSample.cpp">
+    <ClCompile Include="..\..\src\utils\PerformanceSample.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\PerformanceStats.cpp">
+    <ClCompile Include="..\..\src\utils\PerformanceStats.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\RegExp.cpp">
+    <ClCompile Include="..\..\src\utils\RegExp.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\RingBuffer.cpp">
+    <ClCompile Include="..\..\src\utils\RingBuffer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\RssReader.cpp">
+    <ClCompile Include="..\..\src\utils\RssReader.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\SaveFileStateJob.cpp">
+    <ClCompile Include="..\..\src\utils\SaveFileStateJob.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\ScraperParser.cpp">
+    <ClCompile Include="..\..\src\utils\ScraperParser.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\ScraperUrl.cpp">
+    <ClCompile Include="..\..\src\utils\ScraperUrl.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Splash.cpp">
+    <ClCompile Include="..\..\src\utils\Splash.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Stopwatch.cpp">
+    <ClCompile Include="..\..\src\utils\Stopwatch.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\StreamDetails.cpp">
+    <ClCompile Include="..\..\src\utils\StreamDetails.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\StreamUtils.cpp">
+    <ClCompile Include="..\..\src\utils\StreamUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\StringUtils.cpp">
+    <ClCompile Include="..\..\src\utils\StringUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\SystemInfo.cpp">
+    <ClCompile Include="..\..\src\utils\SystemInfo.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TimeSmoother.cpp">
+    <ClCompile Include="..\..\src\utils\TimeSmoother.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TimeUtils.cpp">
+    <ClCompile Include="..\..\src\utils\TimeUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TuxBoxUtil.cpp">
+    <ClCompile Include="..\..\src\utils\TuxBoxUtil.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\URIUtils.cpp">
+    <ClCompile Include="..\..\src\utils\URIUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Variant.cpp">
+    <ClCompile Include="..\..\src\utils\Variant.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Weather.cpp">
+    <ClCompile Include="..\..\src\utils\Weather.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp">
+    <ClCompile Include="..\..\src\utils\XMLUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\Bookmark.cpp">
+    <ClCompile Include="..\..\src\video\Bookmark.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp">
+    <ClCompile Include="..\..\src\video\GUIViewStateVideo.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\Teletext.cpp">
+    <ClCompile Include="..\..\src\video\Teletext.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoInfoDownloader.cpp">
+    <ClCompile Include="..\..\src\video\VideoInfoDownloader.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoInfoScanner.cpp">
+    <ClCompile Include="..\..\src\video\VideoInfoScanner.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoInfoTag.cpp">
+    <ClCompile Include="..\..\src\video\VideoInfoTag.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoReferenceClock.cpp">
+    <ClCompile Include="..\..\src\video\VideoReferenceClock.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogAudioSubtitleSettings.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogFileStacking.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogFullScreenInfo.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogSubtitles.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogTeletext.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoBookmarks.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoInfo.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoOSD.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoOverlay.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp">
+    <ClCompile Include="..\..\src\video\dialogs\GUIDialogVideoSettings.cpp">
       <Filter>video\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowFullScreen.cpp">
+    <ClCompile Include="..\..\src\video\windows\GUIWindowFullScreen.cpp">
       <Filter>video\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoBase.cpp">
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoBase.cpp">
       <Filter>video\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoNav.cpp">
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoNav.cpp">
       <Filter>video\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.cpp">
+    <ClCompile Include="..\..\src\video\windows\GUIWindowVideoPlaylist.cpp">
       <Filter>video\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windowing\WinSystem.cpp">
+    <ClCompile Include="..\..\src\windowing\WinSystem.cpp">
       <Filter>windowing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windowing\windows\WinEventsWin32.cpp">
+    <ClCompile Include="..\..\src\windowing\windows\WinEventsWin32.cpp">
       <Filter>windowing\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32.cpp">
+    <ClCompile Include="..\..\src\windowing\windows\WinSystemWin32.cpp">
       <Filter>windowing\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windowing\windows\WinSystemWin32DX.cpp">
+    <ClCompile Include="..\..\src\windowing\windows\WinSystemWin32DX.cpp">
       <Filter>windowing\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.cpp">
+    <ClCompile Include="..\..\src\addons\GUIViewStateAddonBrowser.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\GUIWindowAddonBrowser.cpp">
+    <ClCompile Include="..\..\src\addons\GUIWindowAddonBrowser.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogCache.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogCache.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\Builtins.cpp">
+    <ClCompile Include="..\..\src\interfaces\Builtins.cpp">
       <Filter>interfaces</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\AnnouncementManager.cpp">
+    <ClCompile Include="..\..\src\interfaces\AnnouncementManager.cpp">
       <Filter>interfaces</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\powermanagement\DPMSSupport.cpp">
+    <ClCompile Include="..\..\src\powermanagement\DPMSSupport.cpp">
       <Filter>powermanagement</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIMediaWindow.cpp">
+    <ClCompile Include="..\..\src\windows\GUIMediaWindow.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowDebugInfo.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowDebugInfo.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowFileManager.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowFileManager.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowHome.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowHome.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowLoginScreen.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowLoginScreen.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowPointer.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowPointer.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowScreensaver.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowScreensaver.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowScreensaverDim.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowScreensaverDim.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowStartup.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowStartup.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowSystemInfo.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowSystemInfo.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windows\GUIWindowWeather.cpp">
+    <ClCompile Include="..\..\src\windows\GUIWindowWeather.cpp">
       <Filter>windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\LangCodeExpander.cpp">
+    <ClCompile Include="..\..\src\utils\LangCodeExpander.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp">
+    <ClCompile Include="..\..\src\MediaSource.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp">
+    <ClCompile Include="..\..\src\addons\AddonInstaller.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\Epg.cpp">
+    <ClCompile Include="..\..\src\epg\Epg.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\EpgContainer.cpp">
+    <ClCompile Include="..\..\src\epg\EpgContainer.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\EpgDatabase.cpp">
+    <ClCompile Include="..\..\src\epg\EpgDatabase.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\EpgInfoTag.cpp">
+    <ClCompile Include="..\..\src\epg\EpgInfoTag.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\EpgSearchFilter.cpp">
+    <ClCompile Include="..\..\src\epg\EpgSearchFilter.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PVRDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\PVRDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PVRFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\PVRFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Observer.cpp">
+    <ClCompile Include="..\..\src\utils\Observer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.cpp">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\TextSearch.cpp">
+    <ClCompile Include="..\..\src\utils\TextSearch.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\stdio_utf8.cpp">
+    <ClCompile Include="..\..\src\win32\stdio_utf8.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\stat_utf8.cpp">
+    <ClCompile Include="..\..\src\win32\stat_utf8.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRBase.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRBase.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\timers\PVRTimerInfoTag.cpp">
+    <ClCompile Include="..\..\src\pvr\timers\PVRTimerInfoTag.cpp">
       <Filter>pvr\timers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\timers\PVRTimers.cpp">
+    <ClCompile Include="..\..\src\pvr\timers\PVRTimers.cpp">
       <Filter>pvr\timers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\recordings\PVRRecording.cpp">
+    <ClCompile Include="..\..\src\pvr\recordings\PVRRecording.cpp">
       <Filter>pvr\recordings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\recordings\PVRRecordings.cpp">
+    <ClCompile Include="..\..\src\pvr\recordings\PVRRecordings.cpp">
       <Filter>pvr\recordings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelManager.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelManager.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelsOSD.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelsOSD.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRCutterOSD.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRCutterOSD.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRDirectorOSD.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRDirectorOSD.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGroupManager.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGroupManager.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideInfo.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideInfo.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideOSD.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideOSD.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideSearch.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRRecordingInfo.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.cpp">
+    <ClCompile Include="..\..\src\pvr\dialogs\GUIDialogPVRTimerSettings.cpp">
       <Filter>pvr\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannel.cpp">
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannel.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroup.cpp">
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroup.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroupInternal.cpp">
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroupInternal.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroups.cpp">
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroups.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroupsContainer.cpp">
+    <ClCompile Include="..\..\src\pvr\channels\PVRChannelGroupsContainer.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClient.cpp">
+    <ClCompile Include="..\..\src\pvr\addons\PVRClient.cpp">
       <Filter>pvr\addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogExtendedProgressBar.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\PVRDatabase.cpp">
+    <ClCompile Include="..\..\src\pvr\PVRDatabase.cpp">
       <Filter>pvr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\PVRManager.cpp">
+    <ClCompile Include="..\..\src\pvr\PVRManager.cpp">
       <Filter>pvr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\RenderCapture.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIViewStatePVR.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIViewStatePVR.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRChannels.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRChannels.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRGuide.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRGuide.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRRecordings.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRRecordings.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRSearch.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRSearch.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimers.cpp">
+    <ClCompile Include="..\..\src\pvr\windows\GUIWindowPVRTimers.cpp">
       <Filter>pvr\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClients.cpp">
+    <ClCompile Include="..\..\src\pvr\addons\PVRClients.cpp">
       <Filter>pvr\addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacks.cpp">
+    <ClCompile Include="..\..\src\addons\AddonCallbacks.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAddon.cpp">
+    <ClCompile Include="..\..\src\addons\AddonCallbacksAddon.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksGUI.cpp">
+    <ClCompile Include="..\..\src\addons\AddonCallbacksGUI.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksPVR.cpp">
+    <ClCompile Include="..\..\src\addons\AddonCallbacksPVR.cpp">
       <Filter>addons</Filter>
     </ClCompile>
     <ClCompile Include="..\..\lib\SlingboxLib\SlingboxLib.cpp">
       <Filter>libs\SlingboxLib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogPlayEject.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogPlayEject.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\PVRGUIInfo.cpp">
+    <ClCompile Include="..\..\src\pvr\PVRGUIInfo.cpp">
       <Filter>pvr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\JSONServiceDescription.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\win32\Win32DelayedDllLoad.cpp">
+    <ClCompile Include="..\..\src\win32\Win32DelayedDllLoad.cpp">
       <Filter>win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\InputOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\InputOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\epg\GUIEPGGridContainer.cpp">
+    <ClCompile Include="..\..\src\epg\GUIEPGGridContainer.cpp">
       <Filter>epg</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\XBMC_keytable.cpp">
+    <ClCompile Include="..\..\src\input\XBMC_keytable.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\JSONVariantParser.cpp">
+    <ClCompile Include="..\..\src\utils\JSONVariantParser.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\JSONVariantWriter.cpp">
+    <ClCompile Include="..\..\src\utils\JSONVariantWriter.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonVersion.cpp">
+    <ClCompile Include="..\..\src\addons\AddonVersion.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\DirtyRegionSolvers.cpp">
+    <ClCompile Include="..\..\src\guilib\DirtyRegionSolvers.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\DirtyRegionTracker.cpp">
+    <ClCompile Include="..\..\src\guilib\DirtyRegionTracker.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp">
+    <ClCompile Include="..\..\src\input\InertialScrollingHandler.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\info\InfoBool.cpp">
+    <ClCompile Include="..\..\src\interfaces\info\InfoBool.cpp">
       <Filter>interfaces\info</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\info\InfoExpression.cpp">
+    <ClCompile Include="..\..\src\interfaces\info\InfoExpression.cpp">
       <Filter>interfaces\info</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIAction.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIAction.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\ApplicationOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp">
+    <ClCompile Include="..\..\src\guilib\JpegIO.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\info\SkinVariable.cpp">
+    <ClCompile Include="..\..\src\interfaces\info\SkinVariable.cpp">
       <Filter>interfaces\info</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\AirPlayServer.cpp">
+    <ClCompile Include="..\..\src\network\AirPlayServer.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\HttpParser.cpp">
+    <ClCompile Include="..\..\src\utils\HttpParser.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\mdns\ZeroconfMDNS.cpp">
+    <ClCompile Include="..\..\src\network\mdns\ZeroconfMDNS.cpp">
       <Filter>network\mdns</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\Peripherals.cpp">
+    <ClCompile Include="..\..\src\peripherals\Peripherals.cpp">
       <Filter>peripherals</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\bus\PeripheralBus.cpp">
+    <ClCompile Include="..\..\src\peripherals\bus\PeripheralBus.cpp">
       <Filter>peripherals\bus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\Peripheral.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\Peripheral.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralCecAdapter.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralCecAdapter.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralDisk.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralDisk.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralHID.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralHID.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralNIC.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralNIC.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralNyxboard.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\bus\win32\PeripheralBusUSB.cpp">
+    <ClCompile Include="..\..\src\peripherals\bus\win32\PeripheralBusUSB.cpp">
       <Filter>peripherals\bus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralBluetooth.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralBluetooth.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralTuner.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralTuner.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.cpp">
+    <ClCompile Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralManager.cpp">
       <Filter>peripherals\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.cpp">
+    <ClCompile Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralSettings.cpp">
       <Filter>peripherals\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\AddonsDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\AddonsDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\AFPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\AFPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPVfsHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPVfsHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\XBMCTinyXML.cpp">
+    <ClCompile Include="..\..\src\utils\XBMCTinyXML.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Base64.cpp">
+    <ClCompile Include="..\..\src\utils\Base64.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\HttpResponse.cpp">
+    <ClCompile Include="..\..\src\utils\HttpResponse.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocket.cpp">
+    <ClCompile Include="..\..\src\network\websocket\WebSocket.cpp">
       <Filter>network\websocket</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketV8.cpp">
+    <ClCompile Include="..\..\src\network\websocket\WebSocketV8.cpp">
       <Filter>network\websocket</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketManager.cpp">
+    <ClCompile Include="..\..\src\network\websocket\WebSocketManager.cpp">
       <Filter>network\websocket</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\websocket\WebSocketV13.cpp">
+    <ClCompile Include="..\..\src\network\websocket\WebSocketV13.cpp">
       <Filter>network\websocket</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\GUIOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\GUIOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Mime.cpp">
+    <ClCompile Include="..\..\src\utils\Mime.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPJsonRpcHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPJsonRpcHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\IHTTPRequestHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\AFPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\AFPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ASAPFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\ASAPFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\BlurayDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\BlurayDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\CacheStrategy.cpp">
+    <ClCompile Include="..\..\src\filesystem\CacheStrategy.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\CDDADirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\CDDADirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\CDDAFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\CDDAFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\CurlFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\CurlFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DAAPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\DAAPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DAAPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\DAAPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DAVDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\DAVDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\Directory.cpp">
+    <ClCompile Include="..\..\src\filesystem\Directory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryFactory.cpp">
+    <ClCompile Include="..\..\src\filesystem\DirectoryFactory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryHistory.cpp">
+    <ClCompile Include="..\..\src\filesystem\DirectoryHistory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DllLibCurl.cpp">
+    <ClCompile Include="..\..\src\filesystem\DllLibCurl.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\File.cpp">
+    <ClCompile Include="..\..\src\filesystem\File.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FileDirectoryFactory.cpp">
+    <ClCompile Include="..\..\src\filesystem\FileDirectoryFactory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FileFactory.cpp">
+    <ClCompile Include="..\..\src\filesystem\FileFactory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FileReaderFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\FileReaderFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FTPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\FTPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FTPParse.cpp">
+    <ClCompile Include="..\..\src\filesystem\FTPParse.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\HDHomeRunDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\HDHomeRunFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HTSPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\HTSPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HTSPSession.cpp">
+    <ClCompile Include="..\..\src\filesystem\HTSPSession.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HTTPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\HTTPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\IDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\IDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\IFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\IFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\iso9660.cpp">
+    <ClCompile Include="..\..\src\filesystem\iso9660.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ISO9660Directory.cpp">
+    <ClCompile Include="..\..\src\filesystem\ISO9660Directory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ISOFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\ISOFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\LibraryDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\LibraryDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MultiPathDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\MultiPathDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\MultiPathFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\MusicFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MusicSearchDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\MusicSearchDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MythDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\MythDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MythFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\MythFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MythSession.cpp">
+    <ClCompile Include="..\..\src\filesystem\MythSession.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\NFSDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\NFSFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\NFSFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\NptXbmcFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\NptXbmcFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\NSFFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\NSFFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\OGGFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\OGGFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PipeFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\PipeFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp">
+    <ClCompile Include="..\..\src\filesystem\PipesManager.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PlaylistDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\PlaylistDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PlaylistFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\PlaylistFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PluginDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\PluginDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RarDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\RarDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RarFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\RarFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RarManager.cpp">
+    <ClCompile Include="..\..\src\filesystem\RarManager.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RSSDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\RSSDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RTVDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\RTVDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\RTVFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\RTVFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SAPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SAPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SAPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\SAPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SFTPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SFTPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SFTPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\SFTPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ShoutcastFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\ShoutcastFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SIDFileDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SIDFileDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SlingboxDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SlingboxDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SlingboxFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\SlingboxFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SmartPlaylistDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SourcesDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SourcesDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocol.cpp">
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocol.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocolDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\SpecialProtocolFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\StackDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\StackDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\TuxBoxDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\TuxBoxDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\TuxBoxFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\TuxBoxFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\udf25.cpp">
+    <ClCompile Include="..\..\src\filesystem\udf25.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\UDFDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\UDFDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\UDFFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\UDFFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\UPnPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\UPnPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\UPnPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\UPnPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\VideoDatabaseDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VirtualDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\VirtualDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VTPDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\VTPDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VTPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\VTPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VTPSession.cpp">
+    <ClCompile Include="..\..\src\filesystem\VTPSession.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\ZeroconfDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ZipDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\ZipDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ZipFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\ZipFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ZipManager.cpp">
+    <ClCompile Include="..\..\src\filesystem\ZipManager.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\CircularCache.cpp">
+    <ClCompile Include="..\..\src\filesystem\CircularCache.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DirectoryCache.cpp">
+    <ClCompile Include="..\..\src\filesystem\DirectoryCache.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FavouritesDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\FavouritesDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\FileCache.cpp">
+    <ClCompile Include="..\..\src\filesystem\FileCache.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MemBufferCache.cpp">
+    <ClCompile Include="..\..\src\filesystem\MemBufferCache.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\MediaSource.cpp">
+    <ClCompile Include="..\..\src\MediaSource.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\XbmcContext.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\POUtils.cpp">
+    <ClCompile Include="..\..\src\XbmcContext.cpp" />
+    <ClCompile Include="..\..\src\utils\POUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\XbmcContext.cpp" />
-    <ClCompile Include="..\..\xbmc\network\ZeroconfBrowser.cpp">
+    <ClCompile Include="..\..\src\XbmcContext.cpp" />
+    <ClCompile Include="..\..\src\network\ZeroconfBrowser.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\mdns\ZeroconfBrowserMDNS.cpp">
+    <ClCompile Include="..\..\src\network\mdns\ZeroconfBrowserMDNS.cpp">
       <Filter>network\mdns</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Encoders\AEEncoderFFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Encoders\AEEncoderFFmpeg.cpp">
       <Filter>cores\AudioEngine\Encoders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEFactory.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\AEFactory.cpp">
       <Filter>cores\AudioEngine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\AEResampleFactory.cpp">
       <Filter>cores\AudioEngine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\AESinkFactory.cpp">
       <Filter>cores\AudioEngine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkDirectSound.cpp">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkNULL.cpp">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Sinks\AESinkWASAPI.cpp">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEBitstreamPacker.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEBuffer.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEChannelInfo.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEChannelInfo.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEPackIEC61937.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEStreamInfo.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEUtil.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AEDeviceInfo.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GraphicContext.cpp">
+    <ClCompile Include="..\..\src\guilib\GraphicContext.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFontTTF.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFontTTF.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUITexture.cpp">
+    <ClCompile Include="..\..\src\guilib\GUITexture.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\StereoscopicsManager.cpp">
+    <ClCompile Include="..\..\src\guilib\StereoscopicsManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\Texture.cpp">
+    <ClCompile Include="..\..\src\guilib\Texture.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\TextureManager.cpp">
+    <ClCompile Include="..\..\src\guilib\TextureManager.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFDX.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIFontTTFDX.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUITextureD3D.cpp">
+    <ClCompile Include="..\..\src\guilib\GUITextureD3D.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\TextureDX.cpp">
+    <ClCompile Include="..\..\src\guilib\TextureDX.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonDatabase.cpp">
+    <ClCompile Include="..\..\src\addons\AddonDatabase.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\MusicDatabase.cpp">
+    <ClCompile Include="..\..\src\music\MusicDatabase.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoDatabase.cpp">
+    <ClCompile Include="..\..\src\video\VideoDatabase.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Screenshot.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
-    <ClCompile Include="..\..\xbmc\Autorun.cpp" />
-    <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
-    <ClCompile Include="..\..\xbmc\DynamicDll.cpp" />
-    <ClCompile Include="..\..\xbmc\CueDocument.cpp" />
-    <ClCompile Include="..\..\xbmc\FileItem.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
-    <ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
-    <ClCompile Include="..\..\xbmc\LangInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\NfoFile.cpp" />
-    <ClCompile Include="..\..\xbmc\PartyModeManager.cpp" />
-    <ClCompile Include="..\..\xbmc\PasswordManager.cpp" />
-    <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\Temperature.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureCache.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureCacheJob.cpp" />
-    <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
-    <ClCompile Include="..\..\xbmc\DatabaseManager.cpp" />
-    <ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
-    <ClCompile Include="..\..\xbmc\URL.cpp" />
-    <ClCompile Include="..\..\xbmc\Util.cpp" />
-    <ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
-    <ClCompile Include="..\..\xbmc\XBDateTime.cpp" />
-    <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
-    <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
-    <ClCompile Include="..\..\xbmc\pictures\PictureThumbLoader.cpp">
+    <ClCompile Include="..\..\src\utils\Screenshot.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ApplicationMessenger.cpp" />
+    <ClCompile Include="..\..\src\Autorun.cpp" />
+    <ClCompile Include="..\..\src\AutoSwitch.cpp" />
+    <ClCompile Include="..\..\src\DynamicDll.cpp" />
+    <ClCompile Include="..\..\src\CueDocument.cpp" />
+    <ClCompile Include="..\..\src\FileItem.cpp" />
+    <ClCompile Include="..\..\src\GUIInfoManager.cpp" />
+    <ClCompile Include="..\..\src\GUIPassword.cpp" />
+    <ClCompile Include="..\..\src\LangInfo.cpp" />
+    <ClCompile Include="..\..\src\NfoFile.cpp" />
+    <ClCompile Include="..\..\src\PartyModeManager.cpp" />
+    <ClCompile Include="..\..\src\PasswordManager.cpp" />
+    <ClCompile Include="..\..\src\SectionLoader.cpp" />
+    <ClCompile Include="..\..\src\Temperature.cpp" />
+    <ClCompile Include="..\..\src\TextureCache.cpp" />
+    <ClCompile Include="..\..\src\TextureCacheJob.cpp" />
+    <ClCompile Include="..\..\src\TextureDatabase.cpp" />
+    <ClCompile Include="..\..\src\DatabaseManager.cpp" />
+    <ClCompile Include="..\..\src\ThumbnailCache.cpp" />
+    <ClCompile Include="..\..\src\URL.cpp" />
+    <ClCompile Include="..\..\src\Util.cpp" />
+    <ClCompile Include="..\..\src\XBApplicationEx.cpp" />
+    <ClCompile Include="..\..\src\XBDateTime.cpp" />
+    <ClCompile Include="..\..\src\GUILargeTextureManager.cpp" />
+    <ClCompile Include="..\..\src\ThumbLoader.cpp" />
+    <ClCompile Include="..\..\src\BackgroundInfoLoader.cpp" />
+    <ClCompile Include="..\..\src\pictures\PictureThumbLoader.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\MusicThumbLoader.cpp">
+    <ClCompile Include="..\..\src\music\MusicThumbLoader.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoThumbLoader.cpp">
+    <ClCompile Include="..\..\src\video\VideoThumbLoader.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\Database.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\Database.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\DatabaseQuery.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\DatabaseQuery.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\dataset.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\dataset.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\qry_dat.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\qry_dat.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\mysqldataset.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\mysqldataset.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dbwrappers\sqlitedataset.cpp">
+    <ClCompile Include="..\..\src\dbwrappers\sqlitedataset.cpp">
       <Filter>dbwrappers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\PlayListPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\RecentlyAddedJob.cpp">
+    <ClCompile Include="..\..\src\PlayListPlayer.cpp" />
+    <ClCompile Include="..\..\src\utils\RecentlyAddedJob.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\windows\WINJoystick.cpp">
+    <ClCompile Include="..\..\src\input\windows\WINJoystick.cpp">
       <Filter>input\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\ImageFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\ImageFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPImageHandler.cpp">
+    <ClCompile Include="..\..\src\network\httprequesthandler\HTTPImageHandler.cpp">
       <Filter>network\httprequesthandler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\AirTunesServer.cpp">
+    <ClCompile Include="..\..\src\network\AirTunesServer.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\SeekHandler.cpp">
+    <ClCompile Include="..\..\src\utils\SeekHandler.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\SortUtils.cpp">
+    <ClCompile Include="..\..\src\utils\SortUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\DatabaseUtils.cpp">
+    <ClCompile Include="..\..\src\utils\DatabaseUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\karaoke\karaokevideobackground.cpp">
+    <ClCompile Include="..\..\src\music\karaoke\karaokevideobackground.cpp">
       <Filter>music\karaoke</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\EdenVideoArtUpdater.cpp">
+    <ClCompile Include="..\..\src\utils\EdenVideoArtUpdater.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\EndianSwap.cpp">
+    <ClCompile Include="..\..\src\utils\EndianSwap.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\GUIKeyboardFactory.cpp">
+    <ClCompile Include="..\..\src\guilib\GUIKeyboardFactory.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogKeyboardGeneric.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogKeyboardGeneric.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralImon.cpp">
+    <ClCompile Include="..\..\src\peripherals\devices\PeripheralImon.cpp">
       <Filter>peripherals\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\VideoDbUrl.cpp">
+    <ClCompile Include="..\..\src\video\VideoDbUrl.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\DbUrl.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\UrlOptions.cpp">
+    <ClCompile Include="..\..\src\DbUrl.cpp" />
+    <ClCompile Include="..\..\src\utils\UrlOptions.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\MusicDbUrl.cpp">
+    <ClCompile Include="..\..\src\music\MusicDbUrl.cpp">
       <Filter>music</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestBasicEnvironment.cpp">
+    <ClCompile Include="..\..\src\test\TestBasicEnvironment.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestUtils.cpp">
+    <ClCompile Include="..\..\src\test\TestUtils.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\xbmc-test.cpp">
+    <ClCompile Include="..\..\src\test\xbmc-test.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestAlarmClock.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestAlarmClock.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestAliasShortcutUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestAliasShortcutUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestArchive.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestArchive.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestAsyncFileCopy.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestAsyncFileCopy.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestBase64.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestBase64.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestBitstreamStats.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestBitstreamStats.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCharsetConverter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCharsetConverter.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCPUInfo.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCPUInfo.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestCrc32.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestCrc32.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestDatabaseUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestDatabaseUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestEndianSwap.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestEndianSwap.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfastmemcpy.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfastmemcpy.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfft.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfft.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestFileOperationJob.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestFileOperationJob.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestFileUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestFileUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testfstrcmp.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testfstrcmp.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestGlobalsHandling.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestGlobalsHandling.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHTMLTable.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHTMLTable.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHTMLUtil.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHTMLUtil.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpHeader.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpHeader.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpParser.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestHttpResponse.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestHttpResponse.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJobManager.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJobManager.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJSONVariantParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJSONVariantParser.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestJSONVariantWriter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestJSONVariantWriter.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestLabelFormatter.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestLabelFormatter.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestLangCodeExpander.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestLangCodeExpander.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testlog.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testlog.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestMathUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestMathUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\Testmd5.cpp">
+    <ClCompile Include="..\..\src\utils\test\Testmd5.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestMime.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestMime.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestPerformanceSample.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestPerformanceSample.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestPOUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestPOUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestRegExp.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestRegExp.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestRingBuffer.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestRingBuffer.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestScraperParser.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestScraperParser.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestScraperUrl.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestScraperUrl.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestSortUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestSortUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStdString.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStdString.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStopwatch.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStopwatch.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStreamDetails.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStreamDetails.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStreamUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStreamUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestStringUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestStringUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestSystemInfo.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestSystemInfo.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestTimeSmoother.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestTimeSmoother.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestTimeUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestTimeUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestURIUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestURIUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestVariant.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestVariant.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestXMLUtils.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestXMLUtils.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestXBMCTinyXML.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestXBMCTinyXML.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestGlobalsHandlingPattern1.h">
+    <ClCompile Include="..\..\src\utils\test\TestGlobalsHandlingPattern1.h">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\test\TestDirectory.cpp">
       <Filter>filesystem\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\test\TestFile.cpp">
       <Filter>filesystem\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestFileFactory.cpp">
+    <ClCompile Include="..\..\src\filesystem\test\TestFileFactory.cpp">
       <Filter>filesystem\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestRarFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\test\TestRarFile.cpp">
       <Filter>filesystem\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\test\TestZipFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\test\TestZipFile.cpp">
       <Filter>filesystem\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnP.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnP.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPInternal.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnPInternal.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPPlayer.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnPPlayer.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPRenderer.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnPRenderer.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPServer.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnPServer.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Addon.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Addon.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonCallback.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonCallback.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonClass.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonClass.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\AddonUtils.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\AddonUtils.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\CallbackFunction.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\CallbackFunction.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\CallbackHandler.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\CallbackHandler.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Control.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Control.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Dialog.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Dialog.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\File.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\File.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\InfoTagMusic.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\InfoTagMusic.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\InfoTagVideo.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\InfoTagVideo.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Keyboard.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Keyboard.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\LanguageHook.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\LanguageHook.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ListItem.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\ListItem.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmc.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmc.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcgui.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcgui.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcplugin.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcplugin.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\ModuleXbmcvfs.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\ModuleXbmcvfs.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Monitor.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Monitor.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Player.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Player.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\PlayList.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\PlayList.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\String.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\String.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\Window.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\Window.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowDialog.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowDialog.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowDialogMixin.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowDialogMixin.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\legacy\WindowXML.cpp">
+    <ClCompile Include="..\..\src\interfaces\legacy\WindowXML.cpp">
       <Filter>interfaces\legacy</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\CallbackHandler.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\CallbackHandler.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\LanguageHook.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\LanguageHook.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\swig.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\swig.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\XBPython.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\XBPython.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmc.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmc.cpp">
       <Filter>interfaces\python\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcaddon.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcaddon.cpp">
       <Filter>interfaces\python\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcgui.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcgui.cpp">
       <Filter>interfaces\python\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcplugin.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcplugin.cpp">
       <Filter>interfaces\python\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\generated\AddonModuleXbmcvfs.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\generated\AddonModuleXbmcvfs.cpp">
       <Filter>interfaces\python\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\TagLibVFSStream.cpp">
+    <ClCompile Include="..\..\src\music\tags\TagLibVFSStream.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\tags\TagLoaderTagLib.cpp">
+    <ClCompile Include="..\..\src\music\tags\TagLoaderTagLib.cpp">
       <Filter>music\tags</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\test\TestSwig.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\test\TestSwig.cpp">
       <Filter>interfaces\python\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\AddonsOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.cpp">
+    <ClCompile Include="..\..\src\dialogs\GUIDialogMediaFilter.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestFileItem.cpp">
+    <ClCompile Include="..\..\src\test\TestFileItem.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\test\TestTextureUtils.cpp">
+    <ClCompile Include="..\..\src\test\TestTextureUtils.cpp">
       <Filter>test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\PVROperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\PVROperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\HTTPFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\HTTPFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\GroupUtils.cpp">
+    <ClCompile Include="..\..\src\utils\GroupUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Utils\AELimiter.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Utils\AELimiter.cpp">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\test\TestUrlOptions.cpp">
+    <ClCompile Include="..\..\src\utils\test\TestUrlOptions.cpp">
       <Filter>utils\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\PyContext.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\PyContext.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp">
+    <ClCompile Include="..\..\src\video\FFmpegVideoDecoder.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp">
+    <ClCompile Include="..\..\src\view\GUIViewControl.cpp">
       <Filter>view</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp">
+    <ClCompile Include="..\..\src\view\GUIViewState.cpp">
       <Filter>view</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp">
+    <ClCompile Include="..\..\src\view\ViewDatabase.cpp">
       <Filter>view</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\imagefactory.cpp">
+    <ClCompile Include="..\..\src\guilib\imagefactory.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\guilib\cximage.cpp">
+    <ClCompile Include="..\..\src\guilib\cximage.cpp">
       <Filter>guilib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DAVFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\DAVFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\DAVCommon.cpp">
+    <ClCompile Include="..\..\src\filesystem\DAVCommon.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp">
+    <ClCompile Include="..\..\src\peripherals\bus\virtual\PeripheralBusCEC.cpp">
       <Filter>peripherals\bus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp">
+    <ClCompile Include="..\..\src\network\upnp\UPnPSettings.cpp">
       <Filter>network\upnp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp">
+    <ClCompile Include="..\..\src\AppParamParser.cpp" />
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogContentSettings.cpp">
       <Filter>settings\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp">
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettings.cpp">
       <Filter>settings\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp">
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettingsCategory.cpp">
       <Filter>settings\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp">
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowSettingsScreenCalibration.cpp">
       <Filter>settings\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.cpp">
+    <ClCompile Include="..\..\src\settings\windows\GUIWindowTestPattern.cpp">
       <Filter>settings\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\RssManager.cpp">
+    <ClCompile Include="..\..\src\utils\RssManager.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp">
+    <ClCompile Include="..\..\src\settings\SkinSettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp">
+    <ClCompile Include="..\..\src\settings\MediaSourceSettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp">
+    <ClCompile Include="..\..\src\view\ViewStateSettings.cpp">
       <Filter>view</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp">
+    <ClCompile Include="..\..\src\settings\MediaSettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp">
+    <ClCompile Include="..\..\src\settings\DisplaySettings.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp">
+    <ClCompile Include="..\..\src\profiles\dialogs\GUIDialogLockSettings.cpp">
       <Filter>profiles\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp">
+    <ClCompile Include="..\..\src\profiles\dialogs\GUIDialogProfileSettings.cpp">
       <Filter>profiles\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp">
+    <ClCompile Include="..\..\src\profiles\windows\GUIWindowSettingsProfile.cpp">
       <Filter>profiles\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\profiles\Profile.cpp">
+    <ClCompile Include="..\..\src\profiles\Profile.cpp">
       <Filter>profiles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp">
+    <ClCompile Include="..\..\src\profiles\ProfilesManager.cpp">
       <Filter>profiles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp">
+    <ClCompile Include="..\..\src\input\touch\generic\GenericTouchActionHandler.cpp">
       <Filter>input\touch\generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp">
+    <ClCompile Include="..\..\src\input\touch\generic\GenericTouchSwipeDetector.cpp">
       <Filter>input\touch\generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp">
+    <ClCompile Include="..\..\src\input\touch\ITouchInputHandling.cpp">
       <Filter>input\touch</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Vector.cpp">
+    <ClCompile Include="..\..\src\utils\Vector.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\PlayerController.cpp">
+    <ClCompile Include="..\..\src\video\PlayerController.cpp">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp">
+    <ClCompile Include="..\..\src\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp">
+    <ClCompile Include="..\..\src\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\windows\GUIControlSettings.cpp">
+    <ClCompile Include="..\..\src\settings\windows\GUIControlSettings.cpp">
       <Filter>settings\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingControl.cpp">
+    <ClCompile Include="..\..\src\settings\SettingControl.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\network\NetworkServices.cpp">
+    <ClCompile Include="..\..\src\network\NetworkServices.cpp">
       <Filter>network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\BooleanLogic.cpp">
+    <ClCompile Include="..\..\src\utils\BooleanLogic.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingAddon.cpp">
+    <ClCompile Include="..\..\src\settings\SettingAddon.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingPath.cpp">
+    <ClCompile Include="..\..\src\settings\SettingPath.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\FavouritesOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.cpp">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Environment.cpp">
+    <ClCompile Include="..\..\src\utils\Environment.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\LegacyPathTranslation.cpp">
+    <ClCompile Include="..\..\src\utils\LegacyPathTranslation.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\generic\LanguageInvokerThread.cpp">
+    <ClCompile Include="..\..\src\interfaces\generic\LanguageInvokerThread.cpp">
       <Filter>interfaces\generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\generic\ScriptInvocationManager.cpp">
+    <ClCompile Include="..\..\src\interfaces\generic\ScriptInvocationManager.cpp">
       <Filter>interfaces\generic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\python\PythonInvoker.cpp">
+    <ClCompile Include="..\..\src\interfaces\python\PythonInvoker.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksCodec.cpp">
+    <ClCompile Include="..\..\src\addons\AddonCallbacksCodec.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\ProfilesOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\ProfilesOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAE.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAE.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp">
+    <ClCompile Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.cpp">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\ActorProtocol.cpp">
+    <ClCompile Include="..\..\src\utils\ActorProtocol.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\ApplicationPlayer.cpp" />
-    <ClCompile Include="..\..\xbmc\interfaces\python\AddonPythonInvoker.cpp">
+    <ClCompile Include="..\..\src\ApplicationPlayer.cpp" />
+    <ClCompile Include="..\..\src\interfaces\python\AddonPythonInvoker.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\StringValidation.cpp">
+    <ClCompile Include="..\..\src\utils\StringValidation.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\windowing\WinEvents.cpp">
+    <ClCompile Include="..\..\src\windowing\WinEvents.cpp">
       <Filter>windowing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\playlists\SmartPlaylistFileItemListModifier.cpp">
+    <ClCompile Include="..\..\src\playlists\SmartPlaylistFileItemListModifier.cpp">
       <Filter>playlists</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\FileItemListModification.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\lib\ISettingControl.cpp">
+    <ClCompile Include="..\..\src\FileItemListModification.cpp" />
+    <ClCompile Include="..\..\src\settings\lib\ISettingControl.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\ISetting.cpp">
+    <ClCompile Include="..\..\src\settings\lib\ISetting.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\Setting.cpp">
+    <ClCompile Include="..\..\src\settings\lib\Setting.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingCategoryAccess.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingCategoryAccess.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingConditions.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingConditions.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingDependency.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingDependency.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingRequirement.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingRequirement.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingSection.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingSection.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingsManager.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingsManager.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\lib\SettingUpdate.cpp">
+    <ClCompile Include="..\..\src\settings\lib\SettingUpdate.cpp">
       <Filter>settings\lib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\CharsetDetection.cpp">
+    <ClCompile Include="..\..\src\utils\CharsetDetection.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.cpp">
+    <ClCompile Include="..\..\src\cores\VideoRenderers\OverlayRendererGUI.cpp">
       <Filter>cores\VideoRenderers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\interfaces\json-rpc\SettingsOperations.cpp">
+    <ClCompile Include="..\..\src\interfaces\json-rpc\SettingsOperations.cpp">
       <Filter>interfaces\json-rpc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\listproviders\IListProvider.cpp">
+    <ClCompile Include="..\..\src\listproviders\IListProvider.cpp">
       <Filter>listproviders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\listproviders\DirectoryProvider.cpp">
+    <ClCompile Include="..\..\src\listproviders\DirectoryProvider.cpp">
       <Filter>listproviders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\listproviders\StaticProvider.cpp">
+    <ClCompile Include="..\..\src\listproviders\StaticProvider.cpp">
       <Filter>listproviders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\Utf8Utils.cpp">
+    <ClCompile Include="..\..\src\utils\Utf8Utils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\XSLTUtils.cpp">
+    <ClCompile Include="..\..\src\utils\XSLTUtils.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp">
+    <ClCompile Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\FFmpeg.cpp">
+    <ClCompile Include="..\..\src\cores\FFmpeg.cpp">
       <Filter>cores</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\media\MediaType.cpp">
+    <ClCompile Include="..\..\src\media\MediaType.cpp">
       <Filter>media</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsBase.cpp">
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsBase.cpp">
       <Filter>settings\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManagerBase.cpp">
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsManagerBase.cpp">
       <Filter>settings\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingCreator.cpp">
+    <ClCompile Include="..\..\src\settings\SettingCreator.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingConditions.cpp">
+    <ClCompile Include="..\..\src\settings\SettingConditions.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManualBase.cpp">
+    <ClCompile Include="..\..\src\settings\dialogs\GUIDialogSettingsManualBase.cpp">
       <Filter>settings\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\settings\SettingUtils.cpp">
+    <ClCompile Include="..\..\src\settings\SettingUtils.cpp">
       <Filter>settings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32Directory.cpp">
+    <ClCompile Include="..\..\src\filesystem\win32\Win32Directory.cpp">
       <Filter>filesystem\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\CompileInfo.cpp" />
-    <ClCompile Include="..\..\xbmc\utils\auto_buffer.cpp">
+    <ClCompile Include="..\..\src\CompileInfo.cpp" />
+    <ClCompile Include="..\..\src\utils\auto_buffer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32SMBDirectory.cpp">
+    <ClCompile Include="..\..\src\filesystem\win32\Win32SMBDirectory.cpp">
       <Filter>filesystem\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\win32\Win32InterfaceForCLog.cpp">
+    <ClCompile Include="..\..\src\utils\win32\Win32InterfaceForCLog.cpp">
       <Filter>utils\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\win32\Win32Log.cpp">
+    <ClCompile Include="..\..\src\utils\win32\Win32Log.cpp">
       <Filter>utils\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32File.cpp">
+    <ClCompile Include="..\..\src\filesystem\win32\Win32File.cpp">
       <Filter>filesystem\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\win32\Win32SMBFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\win32\Win32SMBFile.cpp">
       <Filter>filesystem\win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\utils\MarkWatchedJob.cpp">
+    <ClCompile Include="..\..\src\utils\MarkWatchedJob.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\BlurayFile.cpp">
+    <ClCompile Include="..\..\src\filesystem\BlurayFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\videosync\VideoSyncD3D.cpp">
+    <ClCompile Include="..\..\src\video\videosync\VideoSyncD3D.cpp">
       <Filter>video\videosync</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\DataCacheCore.cpp">
+    <ClCompile Include="..\..\src\cores\DataCacheCore.cpp">
       <Filter>cores</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\win32\pch.h">
+    <ClInclude Include="..\..\src\win32\pch.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h">
+    <ClInclude Include="..\..\src\win32\PlatformDefs.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\WIN32Util.h">
+    <ClInclude Include="..\..\src\win32\WIN32Util.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\WindowHelper.h">
+    <ClInclude Include="..\..\src\win32\WindowHelper.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h">
+    <ClInclude Include="..\..\src\cores\DummyVideoPlayer.h">
       <Filter>cores</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\IPlayer.h">
+    <ClInclude Include="..\..\src\cores\IPlayer.h">
       <Filter>cores</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDAudio.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDAudio.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDClock.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDClock.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxSPU.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxSPU.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxVobsub.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDFileInfo.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDFileInfo.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamTV.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessage.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDMessage.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDMessageQueue.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDMessageQueue.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayContainer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDOverlayContainer.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDOverlayRenderer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDOverlayRenderer.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayer.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerAudio.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerAudio.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerSubtitle.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerSubtitle.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerTeletext.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDPlayerVideo.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDStreamInfo.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDStreamInfo.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDTSCorrection.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDTSCorrection.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\Edl.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\Edl.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\IDVDPlayer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\IDVDPlayer.h">
       <Filter>cores\dvdplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecs.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecs.h">
       <Filter>cores\dvdplayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDCodecUtils.h">
       <Filter>cores\dvdplayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\DVDFactoryCodec.h">
       <Filter>cores\dvdplayer\DVDCodecs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodec.h">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecLibMpeg2.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DVDVideoPPFFmpeg.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DXVA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Video\DXVA.h">
       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlay.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodec.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecCC.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecFFmpeg.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecSSA.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecText.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayCodecTX3G.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayImage.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySpu.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlaySSA.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\DVDOverlayText.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Overlay\libspucc\cc_decoder.h">
       <Filter>cores\dvdplayer\DVDCodecs\Overlay\libspucc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemux.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemux.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxFFmpeg.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxHTSP.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxShoutcast.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxUtils.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDFactoryDemuxer.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DllDvdNav.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DllDvdNav.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDFactoryInputStream.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStream.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStream.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFFmpeg.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamFile.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHTSP.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamHttp.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamMemory.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamNavigator.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamRTMP.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDStateSerializer.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\DllAvCodec.h">
     <ClInclude Include="..\..\lib\ffmpeg\libavformat\avio.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvd_types.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_events.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\dvdnav_internal.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\ifo_types.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\nav_types.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\remap.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\vm.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\dvdnav\vmcmd.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DllLibass.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DllLibass.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDFactorySubtitle.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleLineCollection.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParser.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMicroDVD.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserMPL2.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSami.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSSA.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserSubrip.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleParserVplayer.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitlesLibass.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleStream.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\ASAPCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\ASAPCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\AudioDecoder.h">
+    <ClInclude Include="..\..\src\cores\paplayer\AudioDecoder.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\CodecFactory.h">
+    <ClInclude Include="..\..\src\cores\paplayer\CodecFactory.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\DllAdpcm.h">
     <ClInclude Include="..\..\lib\DllVorbisfile.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\DVDPlayerCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\DVDPlayerCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\ICodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\ICodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\ModplugCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\ModplugCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\NSFCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\NSFCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\OggCallback.h">
+    <ClInclude Include="..\..\src\cores\paplayer\OggCallback.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\OGGcodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\OGGcodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\PAPlayer.h">
+    <ClInclude Include="..\..\src\cores\paplayer\PAPlayer.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\SIDCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\SIDCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\SPCCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\SPCCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\TimidityCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\TimidityCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\VGMCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\VGMCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\paplayer\YMCodec.h">
+    <ClInclude Include="..\..\src\cores\paplayer\YMCodec.h">
       <Filter>cores\paplayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\coff.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\coff.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\coffldr.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\coffldr.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\dll.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker_file.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker_file.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_tracker_library.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_tracker_library.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\dll_util.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\dll_util.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\DllLoader.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\DllLoader.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\DllLoaderContainer.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\DllLoaderContainer.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\DllPaths.h">
+    <ClInclude Include="..\..\src\DllPaths.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\DllPaths_win32.h">
+    <ClInclude Include="..\..\src\DllPaths_win32.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\LibraryLoader.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\LibraryLoader.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\Win32DllLoader.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\Win32DllLoader.h">
       <Filter>cores\DllLoader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_dummy.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_dummy.h">
       <Filter>cores\DllLoader\exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_kernel32.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_kernel32.h">
       <Filter>cores\DllLoader\exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\emu_msvcrt.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\emu_msvcrt.h">
       <Filter>cores\DllLoader\exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DllLoader\exports\util\EmuFileWrapper.h">
+    <ClInclude Include="..\..\src\cores\DllLoader\exports\util\EmuFileWrapper.h">
       <Filter>cores\DllLoader\exports\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\BaseRenderer.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\BaseRenderer.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRenderer.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRenderer.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererDX.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererDX.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererUtil.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererUtil.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderFlags.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderFlags.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderManager.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderManager.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinRenderer.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\WinRenderer.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\DXVA.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\DXVA.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\DXVAHD.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\DXVAHD.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\ConvolutionKernels.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\ConvolutionKernels.h">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\YUV2RGBShader.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\YUV2RGBShader.h">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.h">
+    <ClInclude Include="..\..\src\cores\ExternalPlayer\ExternalPlayer.h">
       <Filter>cores\ExternalPlayer</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreConfig.h">
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerCoreConfig.h">
       <Filter>cores\PlayerCoreFactory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.h">
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerCoreFactory.h">
       <Filter>cores\PlayerCoreFactory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.h">
+    <ClInclude Include="..\..\src\cores\playercorefactory\PlayerSelectionRule.h">
       <Filter>cores\PlayerCoreFactory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNode.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilationsSongs.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAdded.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyAddedSong.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayed.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumRecentlyPlayedSong.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumTop100Song.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeArtist.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeOverview.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeRoot.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSingles.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSong.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeSongTop100.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeTop100.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearAlbum.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\DirectoryNodeYearSong.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\QueryParams.h">
+    <ClInclude Include="..\..\src\FileSystem\MusicDatabaseDirectory\QueryParams.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNode.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNode.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeEpisodes.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMoviesOverview.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeMusicVideosOverview.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeOverview.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedEpisodes.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMovies.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRecentlyAddedMusicVideos.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeRoot.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeSeasons.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMovies.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleMusicVideos.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTitleTvShows.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\DirectoryNodeTvShowsOverview.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\QueryParams.h">
+    <ClInclude Include="..\..\src\FileSystem\VideoDatabaseDirectory\QueryParams.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Addon.h">
+    <ClInclude Include="..\..\src\addons\Addon.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonDll.h">
+    <ClInclude Include="..\..\src\addons\AddonDll.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonManager.h">
+    <ClInclude Include="..\..\src\addons\AddonManager.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonStatusHandler.h">
+    <ClInclude Include="..\..\src\addons\AddonStatusHandler.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AudioEncoder.h">
+    <ClInclude Include="..\..\src\addons\AudioEncoder.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\DllAddon.h">
+    <ClInclude Include="..\..\src\addons\DllAddon.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\IAddon.h">
+    <ClInclude Include="..\..\src\addons\IAddon.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Scraper.h">
+    <ClInclude Include="..\..\src\addons\Scraper.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\ScreenSaver.h">
+    <ClInclude Include="..\..\src\addons\ScreenSaver.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Visualisation.h">
+    <ClInclude Include="..\..\src\addons\Visualisation.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Repository.h">
+    <ClInclude Include="..\..\src\addons\Repository.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Skin.h">
+    <ClInclude Include="..\..\src\addons\Skin.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\PluginSource.h">
+    <ClInclude Include="..\..\src\addons\PluginSource.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\VideoShaders\WinVideoFilter.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\VideoShaders\WinVideoFilter.h">
       <Filter>cores\VideoRenderers\Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagMicroDVD.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDSubtitles\DVDSubtitleTagSami.h">
       <Filter>cores\dvdplayer\DVDSubtitles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamBluray.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\Service.h">
+    <ClInclude Include="..\..\src\addons\Service.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIDialog.h">
+    <ClInclude Include="..\..\src\guilib\GUIDialog.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\cdgdata.h">
+    <ClInclude Include="..\..\src\music\karaoke\cdgdata.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\GUIDialogKaraokeSongSelector.h">
+    <ClInclude Include="..\..\src\music\karaoke\GUIDialogKaraokeSongSelector.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\GUIWindowKaraokeLyrics.h">
+    <ClInclude Include="..\..\src\music\karaoke\GUIWindowKaraokeLyrics.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyrics.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyrics.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricscdg.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricscdg.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricsfactory.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricsfactory.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricsmanager.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricsmanager.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstext.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstext.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextkar.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextkar.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextlrc.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextlrc.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokelyricstextustar.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokelyricstextustar.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokewindowbackground.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokewindowbackground.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\Album.h">
+    <ClInclude Include="..\..\src\music\Album.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\Artist.h">
+    <ClInclude Include="..\..\src\music\Artist.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\GUIViewStateMusic.h">
+    <ClInclude Include="..\..\src\music\GUIViewStateMusic.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\MusicInfoLoader.h">
+    <ClInclude Include="..\..\src\music\MusicInfoLoader.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\Song.h">
+    <ClInclude Include="..\..\src\music\Song.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cdrip\CDDARipJob.h">
+    <ClInclude Include="..\..\src\cdrip\CDDARipJob.h">
       <Filter>cdrip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cdrip\CDDARipper.h">
+    <ClInclude Include="..\..\src\cdrip\CDDARipper.h">
       <Filter>cdrip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cdrip\Encoder.h">
+    <ClInclude Include="..\..\src\cdrip\Encoder.h">
       <Filter>cdrip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cdrip\EncoderFFmpeg.h">
+    <ClInclude Include="..\..\src\cdrip\EncoderFFmpeg.h">
       <Filter>cdrip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\DllLibCPluff.h">
+    <ClInclude Include="..\..\src\addons\DllLibCPluff.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\GUIDialogAddonInfo.h">
+    <ClInclude Include="..\..\src\addons\GUIDialogAddonInfo.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\GUIDialogAddonSettings.h">
+    <ClInclude Include="..\..\src\addons\GUIDialogAddonSettings.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogBoxBase.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogBoxBase.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogBusy.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogBusy.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogButtonMenu.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogButtonMenu.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogContextMenu.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogContextMenu.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogFavourites.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogFavourites.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogFileBrowser.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogFileBrowser.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogGamepad.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogGamepad.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKaiToast.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogKaiToast.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaSource.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMediaSource.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMuteBug.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMuteBug.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogNumeric.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogNumeric.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogOK.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogOK.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogPlayerControls.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogPlayerControls.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogProgress.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogProgress.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSeekBar.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSeekBar.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSelect.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSelect.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSlider.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSlider.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistEditor.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSmartPlaylistEditor.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSmartPlaylistRule.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSmartPlaylistRule.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogSubMenu.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogSubMenu.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogTextViewer.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogTextViewer.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogVolumeBar.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogVolumeBar.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogYesNo.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogYesNo.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\Application.h" />
-    <ClInclude Include="..\..\xbmc\system.h" />
-    <ClInclude Include="..\..\xbmc\guilib\AnimatedGif.h">
+    <ClInclude Include="..\..\src\Application.h" />
+    <ClInclude Include="..\..\src\system.h" />
+    <ClInclude Include="..\..\src\guilib\AnimatedGif.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\D3DResource.h">
+    <ClInclude Include="..\..\src\guilib\D3DResource.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\DDSImage.h">
+    <ClInclude Include="..\..\src\guilib\DDSImage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\DirectXGraphics.h">
+    <ClInclude Include="..\..\src\guilib\DirectXGraphics.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\Geometry.h">
+    <ClInclude Include="..\..\src\guilib\Geometry.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\gui3d.h">
+    <ClInclude Include="..\..\src\guilib\gui3d.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIAudioManager.h">
+    <ClInclude Include="..\..\src\guilib\GUIAudioManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIBaseContainer.h">
+    <ClInclude Include="..\..\src\guilib\GUIBaseContainer.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIBorderedImage.h">
+    <ClInclude Include="..\..\src\guilib\GUIBorderedImage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIButtonControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIButtonControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUICallback.h">
+    <ClInclude Include="..\..\src\guilib\GUICallback.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUICheckMarkControl.h">
+    <ClInclude Include="..\..\src\guilib\GUICheckMarkControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIColorManager.h">
+    <ClInclude Include="..\..\src\guilib\GUIColorManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIControlFactory.h">
+    <ClInclude Include="..\..\src\guilib\GUIControlFactory.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIControlGroup.h">
+    <ClInclude Include="..\..\src\guilib\GUIControlGroup.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIControlGroupList.h">
+    <ClInclude Include="..\..\src\guilib\GUIControlGroupList.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIControlProfiler.h">
+    <ClInclude Include="..\..\src\guilib\GUIControlProfiler.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIEditControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIEditControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIFadeLabelControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h">
+    <ClInclude Include="..\..\src\guilib\GUIFixedListContainer.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFont.h">
+    <ClInclude Include="..\..\src\guilib\GUIFont.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h">
+    <ClInclude Include="..\..\src\guilib\GUIFontManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIImage.h">
+    <ClInclude Include="..\..\src\guilib\GUIImage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIIncludes.h">
+    <ClInclude Include="..\..\src\guilib\GUIIncludes.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIInfoTypes.h">
+    <ClInclude Include="..\..\src\guilib\GUIInfoTypes.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUILabel.h">
+    <ClInclude Include="..\..\src\guilib\GUILabel.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUILabelControl.h">
+    <ClInclude Include="..\..\src\guilib\GUILabelControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIListContainer.h">
+    <ClInclude Include="..\..\src\guilib\GUIListContainer.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIListGroup.h">
+    <ClInclude Include="..\..\src\guilib\GUIListGroup.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIListItem.h">
+    <ClInclude Include="..\..\src\guilib\GUIListItem.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIListItemLayout.h">
+    <ClInclude Include="..\..\src\guilib\GUIListItemLayout.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIListLabel.h">
+    <ClInclude Include="..\..\src\guilib\GUIListLabel.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIMessage.h">
+    <ClInclude Include="..\..\src\guilib\GUIMessage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIMoverControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIMoverControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIMultiImage.h">
+    <ClInclude Include="..\..\src\guilib\GUIMultiImage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIMultiSelectText.h">
+    <ClInclude Include="..\..\src\guilib\GUIMultiSelectText.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIPanelContainer.h">
+    <ClInclude Include="..\..\src\guilib\GUIPanelContainer.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIProgressControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIProgressControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIRadioButtonControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIRadioButtonControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIRenderingControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIRenderingControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIResizeControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIResizeControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIRSSControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIRSSControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIScrollBarControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIScrollBarControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUISelectButtonControl.h">
+    <ClInclude Include="..\..\src\guilib\GUISelectButtonControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUISettingsSliderControl.h">
+    <ClInclude Include="..\..\src\guilib\GUISettingsSliderControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIShader.h">
+    <ClInclude Include="..\..\src\guilib\GUIShader.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUISliderControl.h">
+    <ClInclude Include="..\..\src\guilib\GUISliderControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUISpinControl.h">
+    <ClInclude Include="..\..\src\guilib\GUISpinControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUISpinControlEx.h">
+    <ClInclude Include="..\..\src\guilib\GUISpinControlEx.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIStaticItem.h">
+    <ClInclude Include="..\..\src\guilib\GUIStaticItem.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUITextBox.h">
+    <ClInclude Include="..\..\src\guilib\GUITextBox.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUITextLayout.h">
+    <ClInclude Include="..\..\src\guilib\GUITextLayout.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIToggleButtonControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIToggleButtonControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIVideoControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIVideoControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIVisualisationControl.h">
+    <ClInclude Include="..\..\src\guilib\GUIVisualisationControl.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIWindow.h">
+    <ClInclude Include="..\..\src\guilib\GUIWindow.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIWindowManager.h">
+    <ClInclude Include="..\..\src\guilib\GUIWindowManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIWrappingListContainer.h">
+    <ClInclude Include="..\..\src\guilib\GUIWrappingListContainer.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\IAudioDeviceChangedCallback.h">
+    <ClInclude Include="..\..\src\guilib\IAudioDeviceChangedCallback.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\IMsgTargetCallback.h">
+    <ClInclude Include="..\..\src\guilib\IMsgTargetCallback.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\IWindowManagerCallback.h">
+    <ClInclude Include="..\..\src\guilib\IWindowManagerCallback.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\Key.h">
+    <ClInclude Include="..\..\src\guilib\Key.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\LocalizeStrings.h">
+    <ClInclude Include="..\..\src\guilib\LocalizeStrings.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\MatrixGLES.h">
+    <ClInclude Include="..\..\src\guilib\MatrixGLES.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\Resolution.h">
+    <ClInclude Include="..\..\src\guilib\Resolution.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TextureBundle.h">
+    <ClInclude Include="..\..\src\guilib\TextureBundle.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TextureBundleXBT.h">
+    <ClInclude Include="..\..\src\guilib\TextureBundleXBT.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TextureBundleXPR.h">
+    <ClInclude Include="..\..\src\guilib\TextureBundleXPR.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TransformMatrix.h">
+    <ClInclude Include="..\..\src\guilib\TransformMatrix.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\Tween.h">
+    <ClInclude Include="..\..\src\guilib\Tween.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\VisibleEffect.h">
+    <ClInclude Include="..\..\src\guilib\VisibleEffect.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\XBTF.h">
+    <ClInclude Include="..\..\src\guilib\XBTF.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\XBTFReader.h">
+    <ClInclude Include="..\..\src\guilib\XBTFReader.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\ButtonTranslator.h">
+    <ClInclude Include="..\..\src\input\ButtonTranslator.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\KeyboardLayout.h">
+    <ClInclude Include="..\..\src\input\KeyboardLayout.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h">
+    <ClInclude Include="..\..\src\input\KeyboardLayoutConfiguration.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\KeyboardStat.h">
+    <ClInclude Include="..\..\src\input\KeyboardStat.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\MouseStat.h">
+    <ClInclude Include="..\..\src\input\MouseStat.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBIRRemote.h">
+    <ClInclude Include="..\..\src\input\XBIRRemote.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBMC_keyboard.h">
+    <ClInclude Include="..\..\src\input\XBMC_keyboard.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBMC_keysym.h">
+    <ClInclude Include="..\..\src\input\XBMC_keysym.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBMC_mouse.h">
+    <ClInclude Include="..\..\src\input\XBMC_mouse.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBMC_vkeys.h">
+    <ClInclude Include="..\..\src\input\XBMC_vkeys.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\windows\IRServerSuite.h">
+    <ClInclude Include="..\..\src\input\windows\IRServerSuite.h">
       <Filter>input\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\windows\IrssMessage.h">
+    <ClInclude Include="..\..\src\input\windows\IrssMessage.h">
       <Filter>input\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AudioLibrary.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\AudioLibrary.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FileItemHandler.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FileItemHandler.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FileOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FileOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\IClient.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\IClient.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ITransportLayer.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ITransportLayer.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONRPC.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONRPC.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONUtils.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONUtils.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PlayerOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PlayerOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PlaylistOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PlaylistOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\SystemOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\SystemOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\VideoLibrary.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\VideoLibrary.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\XBMCOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\XBMCOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\TextureOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\TextureOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.h">
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicInfo.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.h">
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicOSD.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h">
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogMusicOverlay.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h">
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogSongInfo.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.h">
+    <ClInclude Include="..\..\src\music\dialogs\GUIDialogVisualisationPresetList.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicAlbumInfo.h">
+    <ClInclude Include="..\..\src\music\infoscanner\MusicAlbumInfo.h">
       <Filter>music\infoscanner</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicArtistInfo.h">
+    <ClInclude Include="..\..\src\music\infoscanner\MusicArtistInfo.h">
       <Filter>music\infoscanner</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicInfoScanner.h">
+    <ClInclude Include="..\..\src\music\infoscanner\MusicInfoScanner.h">
       <Filter>music\infoscanner</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\infoscanner\MusicInfoScraper.h">
+    <ClInclude Include="..\..\src\music\infoscanner\MusicInfoScraper.h">
       <Filter>music\infoscanner</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicBase.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicBase.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicNav.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicNav.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylist.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicPlaylist.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicPlaylistEditor.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicPlaylistEditor.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowMusicSongs.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowMusicSongs.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\windows\GUIWindowVisualisation.h">
+    <ClInclude Include="..\..\src\music\windows\GUIWindowVisualisation.h">
       <Filter>music\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\ImusicInfoTagLoader.h">
+    <ClInclude Include="..\..\src\music\tags\ImusicInfoTagLoader.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTag.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTag.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderASAP.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderASAP.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderCDDA.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderCDDA.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderDatabase.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderDatabase.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderFactory.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderFactory.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderMidi.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderMidi.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderNSF.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderShn.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderSPC.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.h">
+    <ClInclude Include="..\..\src\music\tags\MusicInfoTagLoaderYM.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\cddb.h">
+    <ClInclude Include="..\..\src\network\cddb.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\DNSNameCache.h">
+    <ClInclude Include="..\..\src\network\DNSNameCache.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\EventClient.h">
+    <ClInclude Include="..\..\src\network\EventClient.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\EventPacket.h">
+    <ClInclude Include="..\..\src\network\EventPacket.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\EventServer.h">
+    <ClInclude Include="..\..\src\network\EventServer.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\GUIDialogAccessPoints.h">
+    <ClInclude Include="..\..\src\network\GUIDialogAccessPoints.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\GUIDialogNetworkSetup.h">
+    <ClInclude Include="..\..\src\network\GUIDialogNetworkSetup.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\Network.h">
+    <ClInclude Include="..\..\src\network\Network.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\Socket.h">
+    <ClInclude Include="..\..\src\network\Socket.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\TCPServer.h">
+    <ClInclude Include="..\..\src\network\TCPServer.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\UdpClient.h">
+    <ClInclude Include="..\..\src\network\UdpClient.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\WakeOnAccess.h">
+    <ClInclude Include="..\..\src\network\WakeOnAccess.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\WebServer.h">
+    <ClInclude Include="..\..\src\network\WebServer.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\Zeroconf.h">
+    <ClInclude Include="..\..\src\network\Zeroconf.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\windows\NetworkWin32.h">
+    <ClInclude Include="..\..\src\network\windows\NetworkWin32.h">
       <Filter>network\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\DllImageLib.h">
+    <ClInclude Include="..\..\src\pictures\DllImageLib.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\DllLibExif.h">
+    <ClInclude Include="..\..\src\pictures\DllLibExif.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\GUIDialogPictureInfo.h">
+    <ClInclude Include="..\..\src\pictures\GUIDialogPictureInfo.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\GUIViewStatePictures.h">
+    <ClInclude Include="..\..\src\pictures\GUIViewStatePictures.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\GUIWindowPictures.h">
+    <ClInclude Include="..\..\src\pictures\GUIWindowPictures.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\GUIWindowSlideShow.h">
+    <ClInclude Include="..\..\src\pictures\GUIWindowSlideShow.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\Picture.h">
+    <ClInclude Include="..\..\src\pictures\Picture.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\PictureInfoLoader.h">
+    <ClInclude Include="..\..\src\pictures\PictureInfoLoader.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\PictureInfoTag.h">
+    <ClInclude Include="..\..\src\pictures\PictureInfoTag.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pictures\SlideShowPicture.h">
+    <ClInclude Include="..\..\src\pictures\SlideShowPicture.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayList.h">
+    <ClInclude Include="..\..\src\playlists\PlayList.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListB4S.h">
+    <ClInclude Include="..\..\src\playlists\PlayListB4S.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListFactory.h">
+    <ClInclude Include="..\..\src\playlists\PlayListFactory.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListM3U.h">
+    <ClInclude Include="..\..\src\playlists\PlayListM3U.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListPLS.h">
+    <ClInclude Include="..\..\src\playlists\PlayListPLS.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListURL.h">
+    <ClInclude Include="..\..\src\playlists\PlayListURL.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListWPL.h">
+    <ClInclude Include="..\..\src\playlists\PlayListWPL.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\PlayListXML.h">
+    <ClInclude Include="..\..\src\playlists\PlayListXML.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\playlists\SmartPlayList.h">
+    <ClInclude Include="..\..\src\playlists\SmartPlayList.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\powermanagement\IPowerSyscall.h">
+    <ClInclude Include="..\..\src\powermanagement\IPowerSyscall.h">
       <Filter>powermanagement</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\powermanagement\PowerManager.h">
+    <ClInclude Include="..\..\src\powermanagement\PowerManager.h">
       <Filter>powermanagement</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.h">
+    <ClInclude Include="..\..\src\powermanagement\windows\Win32PowerSyscall.h">
       <Filter>powermanagement\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\programs\GUIViewStatePrograms.h">
+    <ClInclude Include="..\..\src\programs\GUIViewStatePrograms.h">
       <Filter>programs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\programs\GUIWindowPrograms.h">
+    <ClInclude Include="..\..\src\programs\GUIWindowPrograms.h">
       <Filter>programs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\rendering\RenderSystem.h">
+    <ClInclude Include="..\..\src\rendering\RenderSystem.h">
       <Filter>rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.h">
+    <ClInclude Include="..\..\src\rendering\dx\GUIWindowTestPatternDX.h">
       <Filter>rendering\dx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\rendering\dx\RenderSystemDX.h">
+    <ClInclude Include="..\..\src\rendering\dx\RenderSystemDX.h">
       <Filter>rendering\dx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\AdvancedSettings.h">
+    <ClInclude Include="..\..\src\settings\AdvancedSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\Settings.h">
+    <ClInclude Include="..\..\src\settings\Settings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\VideoSettings.h">
+    <ClInclude Include="..\..\src\settings\VideoSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\AutorunMediaJob.h">
+    <ClInclude Include="..\..\src\storage\AutorunMediaJob.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\cdioSupport.h">
+    <ClInclude Include="..\..\src\storage\cdioSupport.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\IoSupport.h">
+    <ClInclude Include="..\..\src\storage\IoSupport.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\IStorageProvider.h">
+    <ClInclude Include="..\..\src\storage\IStorageProvider.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\MediaManager.h">
+    <ClInclude Include="..\..\src\storage\MediaManager.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\storage\windows\Win32StorageProvider.h">
+    <ClInclude Include="..\..\src\storage\windows\Win32StorageProvider.h">
       <Filter>storage\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\AlarmClock.h">
+    <ClInclude Include="..\..\src\utils\AlarmClock.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\AliasShortcutUtils.h">
+    <ClInclude Include="..\..\src\utils\AliasShortcutUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Archive.h">
+    <ClInclude Include="..\..\src\utils\Archive.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\AsyncFileCopy.h">
+    <ClInclude Include="..\..\src\utils\AsyncFileCopy.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\AutoPtrHandle.h">
+    <ClInclude Include="..\..\src\utils\AutoPtrHandle.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\BitstreamStats.h">
+    <ClInclude Include="..\..\src\utils\BitstreamStats.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\CharsetConverter.h">
+    <ClInclude Include="..\..\src\utils\CharsetConverter.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\CPUInfo.h">
+    <ClInclude Include="..\..\src\utils\CPUInfo.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Crc32.h">
+    <ClInclude Include="..\..\src\utils\Crc32.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\EdenVideoArtUpdater.h">
+    <ClInclude Include="..\..\src\utils\EdenVideoArtUpdater.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\EndianSwap.h">
+    <ClInclude Include="..\..\src\utils\EndianSwap.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Fanart.h">
+    <ClInclude Include="..\..\src\utils\Fanart.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\fft.h">
+    <ClInclude Include="..\..\src\utils\fft.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\FileOperationJob.h">
+    <ClInclude Include="..\..\src\utils\FileOperationJob.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\FileUtils.h">
+    <ClInclude Include="..\..\src\utils\FileUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\fstrcmp.h">
+    <ClInclude Include="..\..\src\utils\fstrcmp.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\HTMLTable.h">
+    <ClInclude Include="..\..\src\utils\HTMLTable.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\HTMLUtil.h">
+    <ClInclude Include="..\..\src\utils\HTMLUtil.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\HttpHeader.h">
+    <ClInclude Include="..\..\src\utils\HttpHeader.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\InfoLoader.h">
+    <ClInclude Include="..\..\src\utils\InfoLoader.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\ISerializable.h">
+    <ClInclude Include="..\..\src\utils\ISerializable.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Job.h">
+    <ClInclude Include="..\..\src\utils\Job.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\JobManager.h">
+    <ClInclude Include="..\..\src\utils\JobManager.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\LabelFormatter.h">
+    <ClInclude Include="..\..\src\utils\LabelFormatter.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\log.h">
+    <ClInclude Include="..\..\src\utils\log.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\MathUtils.h">
+    <ClInclude Include="..\..\src\utils\MathUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\md5.h">
+    <ClInclude Include="..\..\src\utils\md5.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\PerformanceSample.h">
+    <ClInclude Include="..\..\src\utils\PerformanceSample.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\PerformanceStats.h">
+    <ClInclude Include="..\..\src\utils\PerformanceStats.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\RegExp.h">
+    <ClInclude Include="..\..\src\utils\RegExp.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\RingBuffer.h">
+    <ClInclude Include="..\..\src\utils\RingBuffer.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\RssReader.h">
+    <ClInclude Include="..\..\src\utils\RssReader.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\SaveFileStateJob.h">
+    <ClInclude Include="..\..\src\utils\SaveFileStateJob.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\ScraperParser.h">
+    <ClInclude Include="..\..\src\utils\ScraperParser.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\ScraperUrl.h">
+    <ClInclude Include="..\..\src\utils\ScraperUrl.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Splash.h">
+    <ClInclude Include="..\..\src\utils\Splash.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\StdString.h">
+    <ClInclude Include="..\..\src\utils\StdString.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Stopwatch.h">
+    <ClInclude Include="..\..\src\utils\Stopwatch.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\StreamDetails.h">
+    <ClInclude Include="..\..\src\utils\StreamDetails.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\StreamUtils.h">
+    <ClInclude Include="..\..\src\utils\StreamUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\StringUtils.h">
+    <ClInclude Include="..\..\src\utils\StringUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\SystemInfo.h">
+    <ClInclude Include="..\..\src\utils\SystemInfo.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\TimeSmoother.h">
+    <ClInclude Include="..\..\src\utils\TimeSmoother.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\TimeUtils.h">
+    <ClInclude Include="..\..\src\utils\TimeUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\TuxBoxUtil.h">
+    <ClInclude Include="..\..\src\utils\TuxBoxUtil.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\URIUtils.h">
+    <ClInclude Include="..\..\src\utils\URIUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Variant.h">
+    <ClInclude Include="..\..\src\utils\Variant.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Weather.h">
+    <ClInclude Include="..\..\src\utils\Weather.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\XMLUtils.h">
+    <ClInclude Include="..\..\src\utils\XMLUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\Bookmark.h">
+    <ClInclude Include="..\..\src\video\Bookmark.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\GUIViewStateVideo.h">
+    <ClInclude Include="..\..\src\video\GUIViewStateVideo.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\Teletext.h">
+    <ClInclude Include="..\..\src\video\Teletext.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\TeletextDefines.h">
+    <ClInclude Include="..\..\src\video\TeletextDefines.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoInfoDownloader.h">
+    <ClInclude Include="..\..\src\video\VideoInfoDownloader.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoInfoScanner.h">
+    <ClInclude Include="..\..\src\video\VideoInfoScanner.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoInfoTag.h">
+    <ClInclude Include="..\..\src\video\VideoInfoTag.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoReferenceClock.h">
+    <ClInclude Include="..\..\src\video\VideoReferenceClock.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogAudioSubtitleSettings.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogFileStacking.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogFullScreenInfo.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogSubtitles.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogTeletext.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoBookmarks.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoInfo.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoOSD.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoOverlay.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h">
+    <ClInclude Include="..\..\src\video\dialogs\GUIDialogVideoSettings.h">
       <Filter>video\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowFullScreen.h">
+    <ClInclude Include="..\..\src\video\windows\GUIWindowFullScreen.h">
       <Filter>video\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoBase.h">
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoBase.h">
       <Filter>video\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoNav.h">
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoNav.h">
       <Filter>video\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.h">
+    <ClInclude Include="..\..\src\video\windows\GUIWindowVideoPlaylist.h">
       <Filter>video\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\WindowingFactory.h">
+    <ClInclude Include="..\..\src\windowing\WindowingFactory.h">
       <Filter>windowing</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\WinEvents.h">
+    <ClInclude Include="..\..\src\windowing\WinEvents.h">
       <Filter>windowing</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\WinSystem.h">
+    <ClInclude Include="..\..\src\windowing\WinSystem.h">
       <Filter>windowing</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\XBMC_events.h">
+    <ClInclude Include="..\..\src\windowing\XBMC_events.h">
       <Filter>windowing</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\windows\WinEventsWin32.h">
+    <ClInclude Include="..\..\src\windowing\windows\WinEventsWin32.h">
       <Filter>windowing\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32.h">
+    <ClInclude Include="..\..\src\windowing\windows\WinSystemWin32.h">
       <Filter>windowing\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windowing\windows\WinSystemWin32DX.h">
+    <ClInclude Include="..\..\src\windowing\windows\WinSystemWin32DX.h">
       <Filter>windowing\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\GUIViewStateAddonBrowser.h">
+    <ClInclude Include="..\..\src\addons\GUIViewStateAddonBrowser.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\GUIWindowAddonBrowser.h">
+    <ClInclude Include="..\..\src\addons\GUIWindowAddonBrowser.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogCache.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogCache.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\Builtins.h">
+    <ClInclude Include="..\..\src\interfaces\Builtins.h">
       <Filter>interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\IAnnouncer.h">
+    <ClInclude Include="..\..\src\interfaces\IAnnouncer.h">
       <Filter>interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\AnnouncementManager.h">
+    <ClInclude Include="..\..\src\interfaces\AnnouncementManager.h">
       <Filter>interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\powermanagement\DPMSSupport.h">
+    <ClInclude Include="..\..\src\powermanagement\DPMSSupport.h">
       <Filter>powermanagement</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIMediaWindow.h">
+    <ClInclude Include="..\..\src\windows\GUIMediaWindow.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowDebugInfo.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowDebugInfo.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowFileManager.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowFileManager.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowHome.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowHome.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowLoginScreen.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowLoginScreen.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowPointer.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowPointer.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowScreensaver.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowScreensaver.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowScreensaverDim.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowScreensaverDim.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowStartup.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowStartup.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowSystemInfo.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowSystemInfo.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\windows\GUIWindowWeather.h">
+    <ClInclude Include="..\..\src\windows\GUIWindowWeather.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\LangCodeExpander.h">
+    <ClInclude Include="..\..\src\utils\LangCodeExpander.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonInstaller.h">
+    <ClInclude Include="..\..\src\addons\AddonInstaller.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\EpgSearchFilter.h">
+    <ClInclude Include="..\..\src\epg\EpgSearchFilter.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\Epg.h">
+    <ClInclude Include="..\..\src\epg\Epg.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\EpgContainer.h">
+    <ClInclude Include="..\..\src\epg\EpgContainer.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\EpgDatabase.h">
+    <ClInclude Include="..\..\src\epg\EpgDatabase.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\EpgInfoTag.h">
+    <ClInclude Include="..\..\src\epg\EpgInfoTag.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PVRFile.h">
+    <ClInclude Include="..\..\src\filesystem\PVRFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PVRDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\PVRDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\DllPVRClient.h">
+    <ClInclude Include="..\..\src\addons\DllPVRClient.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Observer.h">
+    <ClInclude Include="..\..\src\utils\Observer.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDInputStreams\DVDInputStreamPVRManager.h">
       <Filter>cores\dvdplayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxPVRClient.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\TextSearch.h">
+    <ClInclude Include="..\..\src\utils\TextSearch.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\stdio_utf8.h">
+    <ClInclude Include="..\..\src\win32\stdio_utf8.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\stat_utf8.h">
+    <ClInclude Include="..\..\src\win32\stat_utf8.h">
       <Filter>win32</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\ffmpeg\include-xbmc-win32\libavutil\avconfig.h" />
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRBase.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRBase.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\timers\PVRTimers.h">
+    <ClInclude Include="..\..\src\pvr\timers\PVRTimers.h">
       <Filter>pvr\timers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\timers\PVRTimerInfoTag.h">
+    <ClInclude Include="..\..\src\pvr\timers\PVRTimerInfoTag.h">
       <Filter>pvr\timers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\recordings\PVRRecordings.h">
+    <ClInclude Include="..\..\src\pvr\recordings\PVRRecordings.h">
       <Filter>pvr\recordings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\recordings\PVRRecording.h">
+    <ClInclude Include="..\..\src\pvr\recordings\PVRRecording.h">
       <Filter>pvr\recordings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRTimerSettings.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelManager.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelManager.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRChannelsOSD.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRChannelsOSD.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRCutterOSD.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRCutterOSD.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRDirectorOSD.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRDirectorOSD.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGroupManager.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGroupManager.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideInfo.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideInfo.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideOSD.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideOSD.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRGuideSearch.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.h">
+    <ClInclude Include="..\..\src\pvr\dialogs\GUIDialogPVRRecordingInfo.h">
       <Filter>pvr\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroupsContainer.h">
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroupsContainer.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannel.h">
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannel.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroup.h">
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroup.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroupInternal.h">
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroupInternal.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroups.h">
+    <ClInclude Include="..\..\src\pvr\channels\PVRChannelGroups.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\addons\PVRClient.h">
+    <ClInclude Include="..\..\src\pvr\addons\PVRClient.h">
       <Filter>pvr\addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogExtendedProgressBar.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\PVRDatabase.h">
+    <ClInclude Include="..\..\src\pvr\PVRDatabase.h">
       <Filter>pvr</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\PVRManager.h">
+    <ClInclude Include="..\..\src\pvr\PVRManager.h">
       <Filter>pvr</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\RenderCapture.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\RenderCapture.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimers.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRTimers.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIViewStatePVR.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIViewStatePVR.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRChannels.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRChannels.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRGuide.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRGuide.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRRecordings.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRRecordings.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRSearch.h">
+    <ClInclude Include="..\..\src\pvr\windows\GUIWindowPVRSearch.h">
       <Filter>pvr\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\GlobalsHandling.h">
+    <ClInclude Include="..\..\src\utils\GlobalsHandling.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\addons\PVRClients.h">
+    <ClInclude Include="..\..\src\pvr\addons\PVRClients.h">
       <Filter>pvr\addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacks.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacks.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksAddon.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacksAddon.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksGUI.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacksGUI.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksPVR.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacksPVR.h">
       <Filter>addons</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\SlingboxLib\SlingboxLib.h">
       <Filter>libs\SlingboxLib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogPlayEject.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogPlayEject.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\PVRGUIInfo.h">
+    <ClInclude Include="..\..\src\pvr\PVRGUIInfo.h">
       <Filter>pvr</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONServiceDescription.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONServiceDescription.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ServiceDescription.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ServiceDescription.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\InputOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\InputOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\epg\GUIEPGGridContainer.h">
+    <ClInclude Include="..\..\src\epg\GUIEPGGridContainer.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\XBMC_keytable.h">
+    <ClInclude Include="..\..\src\input\XBMC_keytable.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\JSONVariantParser.h">
+    <ClInclude Include="..\..\src\utils\JSONVariantParser.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\JSONVariantWriter.h">
+    <ClInclude Include="..\..\src\utils\JSONVariantWriter.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonVersion.h">
+    <ClInclude Include="..\..\src\addons\AddonVersion.h">
       <Filter>addons</Filter>
     </ClInclude>
     <ClInclude Include="..\..\lib\DllAvFilter.h">
       <Filter>cores\dvdplayer\DVDHeaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegionTracker.h">
+    <ClInclude Include="..\..\src\guilib\DirtyRegionTracker.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegion.h">
+    <ClInclude Include="..\..\src\guilib\DirtyRegion.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\DirtyRegionSolvers.h">
+    <ClInclude Include="..\..\src\guilib\DirtyRegionSolvers.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h">
+    <ClInclude Include="..\..\src\input\InertialScrollingHandler.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\info\InfoBool.h">
+    <ClInclude Include="..\..\src\interfaces\info\InfoBool.h">
       <Filter>interfaces\info</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\info\InfoExpression.h">
+    <ClInclude Include="..\..\src\interfaces\info\InfoExpression.h">
       <Filter>interfaces\info</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIAction.h">
+    <ClInclude Include="..\..\src\guilib\GUIAction.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ApplicationOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\JpegIO.h">
+    <ClInclude Include="..\..\src\guilib\JpegIO.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\info\SkinVariable.h">
+    <ClInclude Include="..\..\src\interfaces\info\SkinVariable.h">
       <Filter>interfaces\info</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\AirPlayServer.h">
+    <ClInclude Include="..\..\src\network\AirPlayServer.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\HttpParser.h">
+    <ClInclude Include="..\..\src\utils\HttpParser.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\mdns\ZeroconfMDNS.h">
+    <ClInclude Include="..\..\src\network\mdns\ZeroconfMDNS.h">
       <Filter>network\mdns</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\DllLibPlist.h">
+    <ClInclude Include="..\..\src\network\DllLibPlist.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\Peripherals.h">
+    <ClInclude Include="..\..\src\peripherals\Peripherals.h">
       <Filter>peripherals</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\bus\PeripheralBus.h">
+    <ClInclude Include="..\..\src\peripherals\bus\PeripheralBus.h">
       <Filter>peripherals\bus</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\Peripheral.h">
+    <ClInclude Include="..\..\src\peripherals\devices\Peripheral.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralCecAdapter.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralCecAdapter.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralDisk.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralDisk.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralHID.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralHID.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNIC.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralNIC.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralNyxboard.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralNyxboard.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\bus\win32\PeripheralBusUSB.h">
+    <ClInclude Include="..\..\src\peripherals\bus\win32\PeripheralBusUSB.h">
       <Filter>peripherals\bus</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\PeripheralTypes.h">
+    <ClInclude Include="..\..\src\peripherals\PeripheralTypes.h">
       <Filter>peripherals</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralBluetooth.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralBluetooth.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralTuner.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralTuner.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralManager.h">
+    <ClInclude Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralManager.h">
       <Filter>peripherals\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\dialogs\GUIDialogPeripheralSettings.h">
+    <ClInclude Include="..\..\src\peripherals\dialogs\GUIDialogPeripheralSettings.h">
       <Filter>peripherals\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ZipManager.h">
+    <ClInclude Include="..\..\src\filesystem\ZipManager.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\AddonsDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\AddonsDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\AFPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\AFPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\AFPFile.h">
+    <ClInclude Include="..\..\src\filesystem\AFPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ASAPFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\ASAPFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\CacheStrategy.h">
+    <ClInclude Include="..\..\src\filesystem\CacheStrategy.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\CDDADirectory.h">
+    <ClInclude Include="..\..\src\filesystem\CDDADirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\CDDAFile.h">
+    <ClInclude Include="..\..\src\filesystem\CDDAFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\CurlFile.h">
+    <ClInclude Include="..\..\src\filesystem\CurlFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DAAPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\DAAPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DAAPFile.h">
+    <ClInclude Include="..\..\src\filesystem\DAAPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DAVDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\DAVDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\Directory.h">
+    <ClInclude Include="..\..\src\filesystem\Directory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryFactory.h">
+    <ClInclude Include="..\..\src\filesystem\DirectoryFactory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h">
+    <ClInclude Include="..\..\src\filesystem\DirectoryHistory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibAfp.h">
+    <ClInclude Include="..\..\src\filesystem\DllLibAfp.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibCMyth.h">
+    <ClInclude Include="..\..\src\filesystem\DllLibCMyth.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibCurl.h">
+    <ClInclude Include="..\..\src\filesystem\DllLibCurl.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DllLibNfs.h">
+    <ClInclude Include="..\..\src\filesystem\DllLibNfs.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\File.h">
+    <ClInclude Include="..\..\src\filesystem\File.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FileDirectoryFactory.h">
+    <ClInclude Include="..\..\src\filesystem\FileDirectoryFactory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h">
+    <ClInclude Include="..\..\src\filesystem\FileFactory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FileReaderFile.h">
+    <ClInclude Include="..\..\src\filesystem\FileReaderFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FTPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\FTPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FTPParse.h">
+    <ClInclude Include="..\..\src\filesystem\FTPParse.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\HDHomeRunDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunFile.h">
+    <ClInclude Include="..\..\src\filesystem\HDHomeRunFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HTSPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\HTSPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HTSPSession.h">
+    <ClInclude Include="..\..\src\filesystem\HTSPSession.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HTTPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\HTTPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\IDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\IFile.h">
+    <ClInclude Include="..\..\src\filesystem\IFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\IFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h">
+    <ClInclude Include="..\..\src\filesystem\ILiveTV.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\iso9660.h">
+    <ClInclude Include="..\..\src\filesystem\iso9660.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ISO9660Directory.h">
+    <ClInclude Include="..\..\src\filesystem\ISO9660Directory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ISOFile.h">
+    <ClInclude Include="..\..\src\filesystem\ISOFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\LibraryDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\LibraryDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MultiPathDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\MultiPathDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MultiPathFile.h">
+    <ClInclude Include="..\..\src\filesystem\MultiPathFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseFile.h">
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MusicFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\MusicFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MusicSearchDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\MusicSearchDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MythDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\MythDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MythFile.h">
+    <ClInclude Include="..\..\src\filesystem\MythFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MythSession.h">
+    <ClInclude Include="..\..\src\filesystem\MythSession.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\NFSDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\NFSFile.h">
+    <ClInclude Include="..\..\src\filesystem\NFSFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\NSFFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\NSFFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\OGGFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\OGGFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PipeFile.h">
+    <ClInclude Include="..\..\src\filesystem\PipeFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h">
+    <ClInclude Include="..\..\src\filesystem\PipesManager.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PlaylistDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\PlaylistDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PlaylistFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\PlaylistFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PluginDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\PluginDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RarDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\RarDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RarFile.h">
+    <ClInclude Include="..\..\src\filesystem\RarFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RarManager.h">
+    <ClInclude Include="..\..\src\filesystem\RarManager.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RSSDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\RSSDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RTVDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\RTVDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\RTVFile.h">
+    <ClInclude Include="..\..\src\filesystem\RTVFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SAPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SAPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SAPFile.h">
+    <ClInclude Include="..\..\src\filesystem\SAPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SFTPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SFTPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SFTPFile.h">
+    <ClInclude Include="..\..\src\filesystem\SFTPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ShoutcastFile.h">
+    <ClInclude Include="..\..\src\filesystem\ShoutcastFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SIDFileDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SIDFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SlingboxDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SlingboxDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SlingboxFile.h">
+    <ClInclude Include="..\..\src\filesystem\SlingboxFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SmartPlaylistDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SourcesDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SourcesDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocol.h">
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocol.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocolDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolFile.h">
+    <ClInclude Include="..\..\src\filesystem\SpecialProtocolFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\StackDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\StackDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\TuxBoxDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\TuxBoxDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\TuxBoxFile.h">
+    <ClInclude Include="..\..\src\filesystem\TuxBoxFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\udf25.h">
+    <ClInclude Include="..\..\src\filesystem\udf25.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\UDFDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\UDFDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\UDFFile.h">
+    <ClInclude Include="..\..\src\filesystem\UDFFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\UPnPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\UPnPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\UPnPFile.h">
+    <ClInclude Include="..\..\src\filesystem\UPnPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\VideoDatabaseDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\VirtualDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VTPDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\VTPDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VTPFile.h">
+    <ClInclude Include="..\..\src\filesystem\VTPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VTPSession.h">
+    <ClInclude Include="..\..\src\filesystem\VTPSession.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\ZeroconfDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ZipDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\ZipDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ZipFile.h">
+    <ClInclude Include="..\..\src\filesystem\ZipFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\XbmcContext.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\MemBufferCache.h">
+    <ClInclude Include="..\..\src\XbmcContext.h" />
+    <ClInclude Include="..\..\src\filesystem\MemBufferCache.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\CircularCache.h">
+    <ClInclude Include="..\..\src\filesystem\CircularCache.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DirectoryCache.h">
+    <ClInclude Include="..\..\src\filesystem\DirectoryCache.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FavouritesDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\FavouritesDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\FileCache.h">
+    <ClInclude Include="..\..\src\filesystem\FileCache.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\XBMCTinyXML.h">
+    <ClInclude Include="..\..\src\utils\XBMCTinyXML.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\BlurayDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\BlurayDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Base64.h">
+    <ClInclude Include="..\..\src\utils\Base64.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\HttpResponse.h">
+    <ClInclude Include="..\..\src\utils\HttpResponse.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocket.h">
+    <ClInclude Include="..\..\src\network\websocket\WebSocket.h">
       <Filter>network\websocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketV8.h">
+    <ClInclude Include="..\..\src\network\websocket\WebSocketV8.h">
       <Filter>network\websocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketManager.h">
+    <ClInclude Include="..\..\src\network\websocket\WebSocketManager.h">
       <Filter>network\websocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\websocket\WebSocketV13.h">
+    <ClInclude Include="..\..\src\network\websocket\WebSocketV13.h">
       <Filter>network\websocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\JSONRPCUtils.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\JSONRPCUtils.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\IJSONRPCAnnouncer.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\IJSONRPCAnnouncer.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\GUIOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\GUIOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Mime.h">
+    <ClInclude Include="..\..\src\utils\Mime.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\IHTTPRequestHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPVfsHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPVfsHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPJsonRpcHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPJsonRpcHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\POUtils.h">
+    <ClInclude Include="..\..\src\utils\POUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\ZeroconfBrowser.h">
+    <ClInclude Include="..\..\src\network\ZeroconfBrowser.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\mdns\ZeroconfBrowserMDNS.h">
+    <ClInclude Include="..\..\src\network\mdns\ZeroconfBrowserMDNS.h">
       <Filter>network\mdns</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Encoders\AEEncoderFFmpeg.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Encoders\AEEncoderFFmpeg.h">
       <Filter>cores\AudioEngine\Encoders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEAudioFormat.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEAudioFormat.h">
       <Filter>cores\AudioEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEFactory.h">
       <Filter>cores\AudioEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\AEResampleFactory.h">
       <Filter>cores\AudioEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\AESinkFactory.h">
       <Filter>cores\AudioEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AE.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AE.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEResample.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEResample.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEEncoder.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEEncoder.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AESink.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AESink.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AESound.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AESound.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\AEStream.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\AEStream.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Interfaces\ThreadedAE.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Interfaces\ThreadedAE.h">
       <Filter>cores\AudioEngine\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkDirectSound.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkDirectSound.h">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkNULL.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkNULL.h">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Sinks\AESinkWASAPI.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Sinks\AESinkWASAPI.h">
       <Filter>cores\AudioEngine\Sinks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBitstreamPacker.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEBitstreamPacker.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEBuffer.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEBuffer.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEChannelInfo.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEChannelInfo.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEPackIEC61937.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEPackIEC61937.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamInfo.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEStreamInfo.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEUtil.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEUtil.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEDeviceInfo.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AEDeviceInfo.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthrough.h">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TextureManager.h">
+    <ClInclude Include="..\..\src\guilib\TextureManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GraphicContext.h">
+    <ClInclude Include="..\..\src\guilib\GraphicContext.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFontTTF.h">
+    <ClInclude Include="..\..\src\guilib\GUIFontTTF.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUITexture.h">
+    <ClInclude Include="..\..\src\guilib\GUITexture.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\StereoscopicsManager.h">
+    <ClInclude Include="..\..\src\guilib\StereoscopicsManager.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\Texture.h">
+    <ClInclude Include="..\..\src\guilib\Texture.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\TextureDX.h">
+    <ClInclude Include="..\..\src\guilib\TextureDX.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFDX.h">
+    <ClInclude Include="..\..\src\guilib\GUIFontTTFDX.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUITextureD3D.h">
+    <ClInclude Include="..\..\src\guilib\GUITextureD3D.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonDatabase.h">
+    <ClInclude Include="..\..\src\addons\AddonDatabase.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\MusicDatabase.h">
+    <ClInclude Include="..\..\src\music\MusicDatabase.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoDatabase.h">
+    <ClInclude Include="..\..\src\video\VideoDatabase.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\ApplicationMessenger.h" />
-    <ClInclude Include="..\..\xbmc\Autorun.h" />
-    <ClInclude Include="..\..\xbmc\AutoSwitch.h" />
-    <ClInclude Include="..\..\xbmc\DynamicDll.h" />
-    <ClInclude Include="..\..\xbmc\CueDocument.h" />
-    <ClInclude Include="..\..\xbmc\FileItem.h" />
-    <ClInclude Include="..\..\xbmc\GUIInfoManager.h" />
-    <ClInclude Include="..\..\xbmc\GUIPassword.h" />
-    <ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
-    <ClInclude Include="..\..\xbmc\IProgressCallback.h" />
-    <ClInclude Include="..\..\xbmc\LangInfo.h" />
-    <ClInclude Include="..\..\xbmc\MediaSource.h" />
-    <ClInclude Include="..\..\xbmc\NfoFile.h" />
-    <ClInclude Include="..\..\xbmc\PartyModeManager.h" />
-    <ClInclude Include="..\..\xbmc\PasswordManager.h" />
-    <ClInclude Include="..\..\xbmc\SortFileItem.h" />
-    <ClInclude Include="..\..\xbmc\SectionLoader.h" />
-    <ClInclude Include="..\..\xbmc\Temperature.h" />
-    <ClInclude Include="..\..\xbmc\TextureCache.h" />
-    <ClInclude Include="..\..\xbmc\TextureCacheJob.h" />
-    <ClInclude Include="..\..\xbmc\TextureDatabase.h" />
-    <ClInclude Include="..\..\xbmc\DatabaseManager.h" />
-    <ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
-    <ClInclude Include="..\..\xbmc\URL.h" />
-    <ClInclude Include="..\..\xbmc\Util.h" />
-    <ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
-    <ClInclude Include="..\..\xbmc\XBDateTime.h" />
-    <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
-    <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
-    <ClInclude Include="..\..\xbmc\pictures\PictureThumbLoader.h">
+    <ClInclude Include="..\..\src\ApplicationMessenger.h" />
+    <ClInclude Include="..\..\src\Autorun.h" />
+    <ClInclude Include="..\..\src\AutoSwitch.h" />
+    <ClInclude Include="..\..\src\DynamicDll.h" />
+    <ClInclude Include="..\..\src\CueDocument.h" />
+    <ClInclude Include="..\..\src\FileItem.h" />
+    <ClInclude Include="..\..\src\GUIInfoManager.h" />
+    <ClInclude Include="..\..\src\GUIPassword.h" />
+    <ClInclude Include="..\..\src\GUIUserMessages.h" />
+    <ClInclude Include="..\..\src\IProgressCallback.h" />
+    <ClInclude Include="..\..\src\LangInfo.h" />
+    <ClInclude Include="..\..\src\MediaSource.h" />
+    <ClInclude Include="..\..\src\NfoFile.h" />
+    <ClInclude Include="..\..\src\PartyModeManager.h" />
+    <ClInclude Include="..\..\src\PasswordManager.h" />
+    <ClInclude Include="..\..\src\SortFileItem.h" />
+    <ClInclude Include="..\..\src\SectionLoader.h" />
+    <ClInclude Include="..\..\src\Temperature.h" />
+    <ClInclude Include="..\..\src\TextureCache.h" />
+    <ClInclude Include="..\..\src\TextureCacheJob.h" />
+    <ClInclude Include="..\..\src\TextureDatabase.h" />
+    <ClInclude Include="..\..\src\DatabaseManager.h" />
+    <ClInclude Include="..\..\src\ThumbnailCache.h" />
+    <ClInclude Include="..\..\src\URL.h" />
+    <ClInclude Include="..\..\src\Util.h" />
+    <ClInclude Include="..\..\src\XBApplicationEx.h" />
+    <ClInclude Include="..\..\src\XBDateTime.h" />
+    <ClInclude Include="..\..\src\GUILargeTextureManager.h" />
+    <ClInclude Include="..\..\src\ThumbLoader.h" />
+    <ClInclude Include="..\..\src\pictures\PictureThumbLoader.h">
       <Filter>pictures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\MusicThumbLoader.h">
+    <ClInclude Include="..\..\src\music\MusicThumbLoader.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoThumbLoader.h">
+    <ClInclude Include="..\..\src\video\VideoThumbLoader.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\Database.h">
+    <ClInclude Include="..\..\src\dbwrappers\Database.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\DatabaseQuery.h">
+    <ClInclude Include="..\..\src\dbwrappers\DatabaseQuery.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\dataset.h">
+    <ClInclude Include="..\..\src\dbwrappers\dataset.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\qry_dat.h">
+    <ClInclude Include="..\..\src\dbwrappers\qry_dat.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\mysqldataset.h">
+    <ClInclude Include="..\..\src\dbwrappers\mysqldataset.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dbwrappers\sqlitedataset.h">
+    <ClInclude Include="..\..\src\dbwrappers\sqlitedataset.h">
       <Filter>dbwrappers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\PlayListPlayer.h" />
-    <ClInclude Include="..\..\xbmc\BackgroundInfoLoader.h" />
-    <ClInclude Include="..\..\xbmc\utils\RecentlyAddedJob.h">
+    <ClInclude Include="..\..\src\PlayListPlayer.h" />
+    <ClInclude Include="..\..\src\BackgroundInfoLoader.h" />
+    <ClInclude Include="..\..\src\utils\RecentlyAddedJob.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\windows\WINJoystick.h">
+    <ClInclude Include="..\..\src\input\windows\WINJoystick.h">
       <Filter>input\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ImageFile.h">
+    <ClInclude Include="..\..\src\filesystem\ImageFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPImageHandler.h">
+    <ClInclude Include="..\..\src\network\httprequesthandler\HTTPImageHandler.h">
       <Filter>network\httprequesthandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\AirTunesServer.h">
+    <ClInclude Include="..\..\src\network\AirTunesServer.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\DllLibShairplay.h">
+    <ClInclude Include="..\..\src\network\DllLibShairplay.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\SeekHandler.h">
+    <ClInclude Include="..\..\src\utils\SeekHandler.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\SortUtils.h">
+    <ClInclude Include="..\..\src\utils\SortUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\DatabaseUtils.h">
+    <ClInclude Include="..\..\src\utils\DatabaseUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\ISortable.h">
+    <ClInclude Include="..\..\src\utils\ISortable.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIKeyboard.h">
+    <ClInclude Include="..\..\src\guilib\GUIKeyboard.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\GUIKeyboardFactory.h">
+    <ClInclude Include="..\..\src\guilib\GUIKeyboardFactory.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogKeyboardGeneric.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogKeyboardGeneric.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralImon.h">
+    <ClInclude Include="..\..\src\peripherals\devices\PeripheralImon.h">
       <Filter>peripherals\devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\VideoDbUrl.h">
+    <ClInclude Include="..\..\src\video\VideoDbUrl.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\DbUrl.h" />
-    <ClInclude Include="..\..\xbmc\utils\UrlOptions.h">
+    <ClInclude Include="..\..\src\DbUrl.h" />
+    <ClInclude Include="..\..\src\utils\UrlOptions.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\MusicDbUrl.h">
+    <ClInclude Include="..\..\src\music\MusicDbUrl.h">
       <Filter>music</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\test\TestBasicEnvironment.h">
+    <ClInclude Include="..\..\src\test\TestBasicEnvironment.h">
       <Filter>test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\test\TestUtils.h">
+    <ClInclude Include="..\..\src\test\TestUtils.h">
       <Filter>test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnP.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnP.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPInternal.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnPInternal.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnPPlayer.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPRenderer.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnPRenderer.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPServer.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnPServer.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Addon.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Addon.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonCallback.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonCallback.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonClass.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonClass.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonString.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonString.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\AddonUtils.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\AddonUtils.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Alternative.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Alternative.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\aojsonrpc.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\aojsonrpc.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\CallbackFunction.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\CallbackFunction.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\CallbackHandler.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\CallbackHandler.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Control.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Control.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Dialog.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Dialog.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Dictionary.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Dictionary.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Exception.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Exception.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\File.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\File.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\InfoTagMusic.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\InfoTagMusic.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\InfoTagVideo.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\InfoTagVideo.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Keyboard.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Keyboard.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\LanguageHook.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\LanguageHook.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\List.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\List.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ListItem.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\ListItem.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmc.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmc.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcgui.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcgui.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcplugin.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcplugin.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\ModuleXbmcvfs.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\ModuleXbmcvfs.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Monitor.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Monitor.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Player.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Player.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\PlayList.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\PlayList.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\RenderCapture.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\RenderCapture.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\swighelper.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\swighelper.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Tuple.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Tuple.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\Window.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\Window.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowDialog.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowDialog.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowDialogMixin.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowDialogMixin.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowException.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowException.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowInterceptor.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowInterceptor.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\legacy\WindowXML.h">
+    <ClInclude Include="..\..\src\interfaces\legacy\WindowXML.h">
       <Filter>interfaces\legacy</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\CallbackHandler.h">
+    <ClInclude Include="..\..\src\interfaces\python\CallbackHandler.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\LanguageHook.h">
+    <ClInclude Include="..\..\src\interfaces\python\LanguageHook.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\preamble.h">
+    <ClInclude Include="..\..\src\interfaces\python\preamble.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h">
+    <ClInclude Include="..\..\src\interfaces\python\pythreadstate.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\swig.h">
+    <ClInclude Include="..\..\src\interfaces\python\swig.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h">
+    <ClInclude Include="..\..\src\interfaces\python\XBPython.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\TagLibVFSStream.h">
+    <ClInclude Include="..\..\src\music\tags\TagLibVFSStream.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\tags\TagLoaderTagLib.h">
+    <ClInclude Include="..\..\src\music\tags\TagLoaderTagLib.h">
       <Filter>music\tags</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\AddonsOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxBXA.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Screenshot.h">
+    <ClInclude Include="..\..\src\utils\Screenshot.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.h">
+    <ClInclude Include="..\..\src\dialogs\GUIDialogMediaFilter.h">
       <Filter>dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PVROperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\PVROperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\HTTPFile.h">
+    <ClInclude Include="..\..\src\filesystem\HTTPFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\GroupUtils.h">
+    <ClInclude Include="..\..\src\utils\GroupUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AELimiter.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Utils\AELimiter.h">
       <Filter>cores\AudioEngine\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h">
+    <ClInclude Include="..\..\src\interfaces\python\PyContext.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\iimage.h">
+    <ClInclude Include="..\..\src\guilib\iimage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\imagefactory.h">
+    <ClInclude Include="..\..\src\guilib\imagefactory.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\cximage.h">
+    <ClInclude Include="..\..\src\guilib\cximage.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h">
+    <ClInclude Include="..\..\src\music\karaoke\karaokevideobackground.h">
       <Filter>music\karaoke</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
+    <ClInclude Include="..\..\src\video\FFmpegVideoDecoder.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
+    <ClInclude Include="..\..\src\view\GUIViewControl.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\view\GUIViewState.h">
+    <ClInclude Include="..\..\src\view\GUIViewState.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\view\ViewDatabase.h">
+    <ClInclude Include="..\..\src\view\ViewDatabase.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\view\ViewState.h">
+    <ClInclude Include="..\..\src\view\ViewState.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h">
+    <ClInclude Include="..\..\src\filesystem\DAVFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h">
+    <ClInclude Include="..\..\src\filesystem\DAVCommon.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h">
+    <ClInclude Include="..\..\src\peripherals\bus\virtual\PeripheralBusCEC.h">
       <Filter>peripherals\bus</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h">
+    <ClInclude Include="..\..\src\network\upnp\UPnPSettings.h">
       <Filter>network\upnp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\AppParamParser.h" />
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h">
+    <ClInclude Include="..\..\src\AppParamParser.h" />
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogContentSettings.h">
       <Filter>settings\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h">
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettings.h">
       <Filter>settings\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h">
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettingsCategory.h">
       <Filter>settings\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h">
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowSettingsScreenCalibration.h">
       <Filter>settings\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h">
+    <ClInclude Include="..\..\src\settings\windows\GUIWindowTestPattern.h">
       <Filter>settings\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\IRssObserver.h">
+    <ClInclude Include="..\..\src\utils\IRssObserver.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\RssManager.h">
+    <ClInclude Include="..\..\src\utils\RssManager.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SkinSettings.h">
+    <ClInclude Include="..\..\src\settings\SkinSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h">
+    <ClInclude Include="..\..\src\settings\MediaSourceSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h">
+    <ClInclude Include="..\..\src\view\ViewStateSettings.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\MediaSettings.h">
+    <ClInclude Include="..\..\src\settings\MediaSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h">
+    <ClInclude Include="..\..\src\settings\DisplaySettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h">
+    <ClInclude Include="..\..\src\profiles\dialogs\GUIDialogLockSettings.h">
       <Filter>profiles\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h">
+    <ClInclude Include="..\..\src\profiles\dialogs\GUIDialogProfileSettings.h">
       <Filter>profiles\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h">
+    <ClInclude Include="..\..\src\profiles\windows\GUIWindowSettingsProfile.h">
       <Filter>profiles\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\profiles\Profile.h">
+    <ClInclude Include="..\..\src\profiles\Profile.h">
       <Filter>profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h">
+    <ClInclude Include="..\..\src\profiles\ProfilesManager.h">
       <Filter>profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h">
+    <ClInclude Include="..\..\src\input\touch\ITouchActionHandler.h">
       <Filter>input\touch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h">
+    <ClInclude Include="..\..\src\input\touch\generic\GenericTouchActionHandler.h">
       <Filter>input\touch\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h">
+    <ClInclude Include="..\..\src\input\touch\TouchTypes.h">
       <Filter>input\touch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h">
+    <ClInclude Include="..\..\src\input\touch\generic\GenericTouchSwipeDetector.h">
       <Filter>input\touch\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h">
+    <ClInclude Include="..\..\src\input\touch\generic\IGenericTouchGestureDetector.h">
       <Filter>input\touch\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h">
+    <ClInclude Include="..\..\src\input\touch\ITouchInputHandler.h">
       <Filter>input\touch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h">
+    <ClInclude Include="..\..\src\input\touch\ITouchInputHandling.h">
       <Filter>input\touch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Vector.h">
+    <ClInclude Include="..\..\src\utils\Vector.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\PlayerController.h">
+    <ClInclude Include="..\..\src\video\PlayerController.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h">
+    <ClInclude Include="..\..\src\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h">
       <Filter>filesystem\VideoDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h">
+    <ClInclude Include="..\..\src\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h">
       <Filter>filesystem\MusicDatabaseDirectory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\windows\GUIControlSettings.h">
+    <ClInclude Include="..\..\src\settings\windows\GUIControlSettings.h">
       <Filter>settings\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingControl.h">
+    <ClInclude Include="..\..\src\settings\SettingControl.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\network\NetworkServices.h">
+    <ClInclude Include="..\..\src\network\NetworkServices.h">
       <Filter>network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\BooleanLogic.h">
+    <ClInclude Include="..\..\src\utils\BooleanLogic.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\IXmlDeserializable.h">
+    <ClInclude Include="..\..\src\utils\IXmlDeserializable.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingAddon.h">
+    <ClInclude Include="..\..\src\settings\SettingAddon.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingPath.h">
+    <ClInclude Include="..\..\src\settings\SettingPath.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\FavouritesOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\FavouritesOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h">
+    <ClInclude Include="..\..\src\cores\dvdplayer\DVDDemuxers\DVDDemuxCDDA.h">
       <Filter>cores\dvdplayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Environment.h">
+    <ClInclude Include="..\..\src\utils\Environment.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\LegacyPathTranslation.h">
+    <ClInclude Include="..\..\src\utils\LegacyPathTranslation.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ILanguageInvoker.h">
+    <ClInclude Include="..\..\src\interfaces\generic\ILanguageInvoker.h">
       <Filter>interfaces\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\generic\LanguageInvokerThread.h">
+    <ClInclude Include="..\..\src\interfaces\generic\LanguageInvokerThread.h">
       <Filter>interfaces\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ScriptInvocationManager.h">
+    <ClInclude Include="..\..\src\interfaces\generic\ScriptInvocationManager.h">
       <Filter>interfaces\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\python\PythonInvoker.h">
+    <ClInclude Include="..\..\src\interfaces\python\PythonInvoker.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\generic\ILanguageInvocationHandler.h">
+    <ClInclude Include="..\..\src\interfaces\generic\ILanguageInvocationHandler.h">
       <Filter>interfaces\generic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksCodec.h">
+    <ClInclude Include="..\..\src\addons\AddonCallbacksCodec.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ProfilesOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\ProfilesOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\PlatformInclude.h" />
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAE.h">
+    <ClInclude Include="..\..\src\win32\PlatformInclude.h" />
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAE.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEBuffer.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEResampleFFMPEG.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESink.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAESound.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.h">
+    <ClInclude Include="..\..\src\cores\AudioEngine\Engines\ActiveAE\ActiveAEStream.h">
       <Filter>cores\AudioEngine\Engines\ActiveAE</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\ActorProtocol.h">
+    <ClInclude Include="..\..\src\utils\ActorProtocol.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\ApplicationPlayer.h" />
-    <ClInclude Include="..\..\xbmc\interfaces\python\AddonPythonInvoker.h">
+    <ClInclude Include="..\..\src\ApplicationPlayer.h" />
+    <ClInclude Include="..\..\src\interfaces\python\AddonPythonInvoker.h">
       <Filter>interfaces\python</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\StringValidation.h">
+    <ClInclude Include="..\..\src\utils\StringValidation.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\uXstrings.h">
+    <ClInclude Include="..\..\src\utils\uXstrings.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\IFileItemListModifier.h" />
-    <ClInclude Include="..\..\xbmc\playlists\SmartPlaylistFileItemListModifier.h">
+    <ClInclude Include="..\..\src\IFileItemListModifier.h" />
+    <ClInclude Include="..\..\src\playlists\SmartPlaylistFileItemListModifier.h">
       <Filter>playlists</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\FileItemListModification.h" />
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingControl.h">
+    <ClInclude Include="..\..\src\FileItemListModification.h" />
+    <ClInclude Include="..\..\src\settings\lib\ISettingControl.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISetting.h">
+    <ClInclude Include="..\..\src\settings\lib\ISetting.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingCallback.h">
+    <ClInclude Include="..\..\src\settings\lib\ISettingCallback.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingCreator.h">
+    <ClInclude Include="..\..\src\settings\lib\ISettingCreator.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingsHandler.h">
+    <ClInclude Include="..\..\src\settings\lib\ISettingsHandler.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISubSettings.h">
+    <ClInclude Include="..\..\src\settings\lib\ISubSettings.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\Setting.h">
+    <ClInclude Include="..\..\src\settings\lib\Setting.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingCategoryAccess.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingCategoryAccess.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingConditions.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingConditions.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingDependency.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingDependency.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingRequirement.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingRequirement.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingSection.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingSection.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingsManager.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingsManager.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingUpdate.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingUpdate.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\SettingDefinitions.h">
+    <ClInclude Include="..\..\src\settings\lib\SettingDefinitions.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\lib\ISettingControlCreator.h">
+    <ClInclude Include="..\..\src\settings\lib\ISettingControlCreator.h">
       <Filter>settings\lib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\CharsetDetection.h">
+    <ClInclude Include="..\..\src\utils\CharsetDetection.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\VideoRenderers\OverlayRendererGUI.h">
+    <ClInclude Include="..\..\src\cores\VideoRenderers\OverlayRendererGUI.h">
       <Filter>cores\VideoRenderers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\interfaces\json-rpc\SettingsOperations.h">
+    <ClInclude Include="..\..\src\interfaces\json-rpc\SettingsOperations.h">
       <Filter>interfaces\json-rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\listproviders\IListProvider.h">
+    <ClInclude Include="..\..\src\listproviders\IListProvider.h">
       <Filter>listproviders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\listproviders\DirectoryProvider.h">
+    <ClInclude Include="..\..\src\listproviders\DirectoryProvider.h">
       <Filter>listproviders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\listproviders\StaticProvider.h">
+    <ClInclude Include="..\..\src\listproviders\StaticProvider.h">
       <Filter>listproviders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\Utf8Utils.h">
+    <ClInclude Include="..\..\src\utils\Utf8Utils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\XSLTUtils.h">
+    <ClInclude Include="..\..\src\utils\XSLTUtils.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\win32\IMMNotificationClient.h">
+    <ClInclude Include="..\..\src\win32\IMMNotificationClient.h">
       <Filter>win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\FFmpeg.h">
+    <ClInclude Include="..\..\src\cores\FFmpeg.h">
       <Filter>cores</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\media\MediaType.h">
+    <ClInclude Include="..\..\src\media\MediaType.h">
       <Filter>media</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\guilib\ISliderCallback.h">
+    <ClInclude Include="..\..\src\guilib\ISliderCallback.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsBase.h">
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsBase.h">
       <Filter>settings\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManagerBase.h">
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsManagerBase.h">
       <Filter>settings\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingCreator.h">
+    <ClInclude Include="..\..\src\settings\SettingCreator.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingConditions.h">
+    <ClInclude Include="..\..\src\settings\SettingConditions.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettingsManualBase.h">
+    <ClInclude Include="..\..\src\settings\dialogs\GUIDialogSettingsManualBase.h">
       <Filter>settings\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\SettingUtils.h">
+    <ClInclude Include="..\..\src\settings\SettingUtils.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32Directory.h">
+    <ClInclude Include="..\..\src\filesystem\win32\Win32Directory.h">
       <Filter>filesystem\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\CompileInfo.h" />
-    <ClInclude Include="..\..\xbmc\utils\auto_buffer.h">
+    <ClInclude Include="..\..\src\CompileInfo.h" />
+    <ClInclude Include="..\..\src\utils\auto_buffer.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32SMBDirectory.h">
+    <ClInclude Include="..\..\src\filesystem\win32\Win32SMBDirectory.h">
       <Filter>filesystem\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\params_check_macros.h">
+    <ClInclude Include="..\..\src\utils\params_check_macros.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\win32\Win32InterfaceForCLog.h">
+    <ClInclude Include="..\..\src\utils\win32\Win32InterfaceForCLog.h">
       <Filter>utils\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\win32\Win32Log.h">
+    <ClInclude Include="..\..\src\utils\win32\Win32Log.h">
       <Filter>utils\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32File.h">
+    <ClInclude Include="..\..\src\filesystem\win32\Win32File.h">
       <Filter>filesystem\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\win32\Win32SMBFile.h">
+    <ClInclude Include="..\..\src\filesystem\win32\Win32SMBFile.h">
       <Filter>filesystem\win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\utils\MarkWatchedJob.h">
+    <ClInclude Include="..\..\src\utils\MarkWatchedJob.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\settings\DiscSettings.h">
+    <ClInclude Include="..\..\src\settings\DiscSettings.h">
       <Filter>settings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\BlurayFile.h">
+    <ClInclude Include="..\..\src\filesystem\BlurayFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\videosync\VideoSyncD3D.h">
+    <ClInclude Include="..\..\src\video\videosync\VideoSyncD3D.h">
       <Filter>video\videosync</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\videosync\VideoSync.h">
+    <ClInclude Include="..\..\src\video\videosync\VideoSync.h">
       <Filter>video\videosync</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\DataCacheCore.h">
+    <ClInclude Include="..\..\src\cores\DataCacheCore.h">
       <Filter>cores</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
+    <ResourceCompile Include="..\..\src\win32\XBMC_PC.rc">
       <Filter>win32</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcplugin.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcplugin.i">
       <Filter>interfaces\swig</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcgui.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcgui.i">
       <Filter>interfaces\swig</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcaddon.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcaddon.i">
       <Filter>interfaces\swig</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmcvfs.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmcvfs.i">
       <Filter>interfaces\swig</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\swig\AddonModuleXbmc.i">
+    <CustomBuild Include="..\..\src\interfaces\swig\AddonModuleXbmc.i">
       <Filter>interfaces\swig</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\GitRevision.h" />
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\types.json">
+    <CustomBuild Include="..\..\src\GitRevision.h" />
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\types.json">
       <Filter>interfaces\json-rpc\schema</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\notifications.json">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\notifications.json">
       <Filter>interfaces\json-rpc\schema</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\methods.json">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\methods.json">
       <Filter>interfaces\json-rpc\schema</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\version.txt">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\version.txt">
       <Filter>interfaces\json-rpc\schema</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\xbmc\interfaces\json-rpc\schema\license.txt">
+    <CustomBuild Include="..\..\src\interfaces\json-rpc\schema\license.txt">
       <Filter>interfaces\json-rpc\schema</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\version.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\xbmc\interfaces\swig\ControlListAddItemMethods.i">
+    <None Include="..\..\src\interfaces\swig\ControlListAddItemMethods.i">
       <Filter>interfaces\swig</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index 18af62a..34f18fe 100644 (file)
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\commons\Exception.cpp" />
-    <ClCompile Include="..\..\xbmc\commons\ilog.cpp" />
+    <ClCompile Include="..\..\src\commons\Exception.cpp" />
+    <ClCompile Include="..\..\src\commons\ilog.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\commons\Buffer.h" />
-    <ClInclude Include="..\..\xbmc\commons\Exception.h" />
-    <ClInclude Include="..\..\xbmc\commons\ilog.h" />
+    <ClInclude Include="..\..\src\commons\Buffer.h" />
+    <ClInclude Include="..\..\src\commons\Exception.h" />
+    <ClInclude Include="..\..\src\commons\ilog.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{87DA0A1E-3F33-4927-A5E5-2D58F2C58E17}</ProjectGuid>
@@ -69,7 +69,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4018;4146;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>commons.hpp</PrecompiledHeaderFile>
       <DebugInformationFormat>
@@ -91,4 +91,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index e91146b..1d6ad12 100644 (file)
@@ -1,12 +1,12 @@
 ï»¿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\commons\ilog.cpp" />
-    <ClCompile Include="..\..\xbmc\commons\Exception.cpp" />
+    <ClCompile Include="..\..\src\commons\ilog.cpp" />
+    <ClCompile Include="..\..\src\commons\Exception.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\commons\ilog.h" />
-    <ClInclude Include="..\..\xbmc\commons\Exception.h" />
-    <ClInclude Include="..\..\xbmc\commons\Buffer.h" />
+    <ClInclude Include="..\..\src\commons\ilog.h" />
+    <ClInclude Include="..\..\src\commons\Exception.h" />
+    <ClInclude Include="..\..\src\commons\Buffer.h" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index 8ce0f50..e1b73be 100644 (file)
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\threads\Atomics.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\Event.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\LockFree.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\Timer.cpp" />
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadImpl.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadImpl.cpp" />
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadImpl.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\platform\win\Win32Exception.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
-    <ClInclude Include="..\..\xbmc\threads\Timer.h" />
+    <ClCompile Include="..\..\src\threads\Atomics.cpp" />
+    <ClCompile Include="..\..\src\threads\Event.cpp" />
+    <ClCompile Include="..\..\src\threads\LockFree.cpp" />
+    <ClCompile Include="..\..\src\threads\Timer.cpp" />
+    <ClInclude Include="..\..\src\threads\platform\ThreadImpl.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadImpl.cpp" />
+    <ClInclude Include="..\..\src\threads\platform\ThreadImpl.cpp" />
+    <ClCompile Include="..\..\src\threads\platform\Implementation.cpp" />
+    <ClCompile Include="..\..\src\threads\platform\win\Win32Exception.cpp" />
+    <ClCompile Include="..\..\src\threads\SystemClock.cpp" />
+    <ClCompile Include="..\..\src\threads\Thread.cpp" />
+    <ClInclude Include="..\..\src\threads\Timer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\threads\Atomics.h" />
-    <ClInclude Include="..\..\xbmc\threads\Condition.h" />
-    <ClInclude Include="..\..\xbmc\threads\CriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\Event.h" />
-    <ClInclude Include="..\..\xbmc\threads\Helpers.h" />
-    <ClInclude Include="..\..\xbmc\threads\Lockables.h" />
-    <ClInclude Include="..\..\xbmc\threads\LockFree.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\Condition.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\CriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadLocal.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\Condition.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\CriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadImpl.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadLocal.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\Win32Exception.h" />
-    <ClInclude Include="..\..\xbmc\threads\SharedSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\SingleLock.h" />
-    <ClInclude Include="..\..\xbmc\threads\SystemClock.h" />
-    <ClInclude Include="..\..\xbmc\threads\Thread.h" />
-    <ClInclude Include="..\..\xbmc\threads\ThreadImpl.h" />
-    <ClInclude Include="..\..\xbmc\threads\ThreadLocal.h" />
+    <ClInclude Include="..\..\src\threads\Atomics.h" />
+    <ClInclude Include="..\..\src\threads\Condition.h" />
+    <ClInclude Include="..\..\src\threads\CriticalSection.h" />
+    <ClInclude Include="..\..\src\threads\Event.h" />
+    <ClInclude Include="..\..\src\threads\Helpers.h" />
+    <ClInclude Include="..\..\src\threads\Lockables.h" />
+    <ClInclude Include="..\..\src\threads\LockFree.h" />
+    <ClInclude Include="..\..\src\threads\platform\Condition.h" />
+    <ClInclude Include="..\..\src\threads\platform\CriticalSection.h" />
+    <ClInclude Include="..\..\src\threads\platform\ThreadLocal.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\Condition.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\CriticalSection.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadImpl.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadLocal.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\Win32Exception.h" />
+    <ClInclude Include="..\..\src\threads\SharedSection.h" />
+    <ClInclude Include="..\..\src\threads\SingleLock.h" />
+    <ClInclude Include="..\..\src\threads\SystemClock.h" />
+    <ClInclude Include="..\..\src\threads\Thread.h" />
+    <ClInclude Include="..\..\src\threads\ThreadImpl.h" />
+    <ClInclude Include="..\..\src\threads\ThreadLocal.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="XbmcCommons.vcxproj">
@@ -98,7 +98,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_XBMC;_USE_32BIT_TIME_T;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4018;4146;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ExceptionHandling>Async</ExceptionHandling>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\xbmc;..\..\xbmc\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\src\win32</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>commons.hpp</PrecompiledHeaderFile>
       <DebugInformationFormat>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index ba61706..81780ba 100644 (file)
@@ -1,67 +1,67 @@
 ï»¿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\threads\Atomics.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\Event.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\LockFree.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp">
+    <ClCompile Include="..\..\src\threads\Atomics.cpp" />
+    <ClCompile Include="..\..\src\threads\Event.cpp" />
+    <ClCompile Include="..\..\src\threads\LockFree.cpp" />
+    <ClCompile Include="..\..\src\threads\Thread.cpp" />
+    <ClCompile Include="..\..\src\threads\SystemClock.cpp" />
+    <ClCompile Include="..\..\src\threads\platform\Implementation.cpp">
       <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\threads\platform\win\Win32Exception.cpp">
+    <ClCompile Include="..\..\src\threads\platform\win\Win32Exception.cpp">
       <Filter>platform\win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\threads\Timer.cpp" />
+    <ClCompile Include="..\..\src\threads\Timer.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\threads\Atomics.h" />
-    <ClInclude Include="..\..\xbmc\threads\Condition.h" />
-    <ClInclude Include="..\..\xbmc\threads\CriticalSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\Event.h" />
-    <ClInclude Include="..\..\xbmc\threads\Helpers.h" />
-    <ClInclude Include="..\..\xbmc\threads\Lockables.h" />
-    <ClInclude Include="..\..\xbmc\threads\LockFree.h" />
-    <ClInclude Include="..\..\xbmc\threads\SharedSection.h" />
-    <ClInclude Include="..\..\xbmc\threads\SingleLock.h" />
-    <ClInclude Include="..\..\xbmc\threads\Thread.h" />
-    <ClInclude Include="..\..\xbmc\threads\ThreadImpl.h" />
-    <ClInclude Include="..\..\xbmc\threads\ThreadLocal.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\Condition.h">
+    <ClInclude Include="..\..\src\threads\Atomics.h" />
+    <ClInclude Include="..\..\src\threads\Condition.h" />
+    <ClInclude Include="..\..\src\threads\CriticalSection.h" />
+    <ClInclude Include="..\..\src\threads\Event.h" />
+    <ClInclude Include="..\..\src\threads\Helpers.h" />
+    <ClInclude Include="..\..\src\threads\Lockables.h" />
+    <ClInclude Include="..\..\src\threads\LockFree.h" />
+    <ClInclude Include="..\..\src\threads\SharedSection.h" />
+    <ClInclude Include="..\..\src\threads\SingleLock.h" />
+    <ClInclude Include="..\..\src\threads\Thread.h" />
+    <ClInclude Include="..\..\src\threads\ThreadImpl.h" />
+    <ClInclude Include="..\..\src\threads\ThreadLocal.h" />
+    <ClInclude Include="..\..\src\threads\platform\Condition.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\CriticalSection.h">
+    <ClInclude Include="..\..\src\threads\platform\CriticalSection.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadLocal.h">
+    <ClInclude Include="..\..\src\threads\platform\ThreadLocal.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\win\Condition.h">
+    <ClInclude Include="..\..\src\threads\platform\win\Condition.h">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\win\CriticalSection.h">
+    <ClInclude Include="..\..\src\threads\platform\win\CriticalSection.h">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadLocal.h">
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadLocal.h">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\SystemClock.h" />
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadImpl.h">
+    <ClInclude Include="..\..\src\threads\SystemClock.h" />
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadImpl.h">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\win\ThreadImpl.cpp">
+    <ClInclude Include="..\..\src\threads\platform\win\ThreadImpl.cpp">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadImpl.h">
+    <ClInclude Include="..\..\src\threads\platform\ThreadImpl.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\ThreadImpl.cpp">
+    <ClInclude Include="..\..\src\threads\platform\ThreadImpl.cpp">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\platform\win\Win32Exception.h">
+    <ClInclude Include="..\..\src\threads\platform\win\Win32Exception.h">
       <Filter>platform\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\threads\Timer.h" />
+    <ClInclude Include="..\..\src\threads\Timer.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="platform">
@@ -71,4 +71,4 @@
       <UniqueIdentifier>{260ff9eb-2873-4bb8-8694-81aad4e2fedc}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index 34025ad..6650abd 100644 (file)
@@ -64,7 +64,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\xbmc\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\xbmc\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
       <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>UnitTest++.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)XBMC.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\libSDL-WIN32\lib;..\..\xbmc\cores\DSPlayer\Libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\lib\libSDL-WIN32\lib;..\..\src\cores\DSPlayer\Libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <DelayLoadDLLs>dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\threads\test\TestAtomics.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestEvent.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestMain.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestSharedSection.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestThreadLocal.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestAtomics.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestEvent.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestMain.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestSharedSection.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestThreadLocal.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\threads\test\TestHelpers.h" />
+    <ClInclude Include="..\..\src\threads\test\TestHelpers.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="XbmcCommons.vcxproj">
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>
index 1df9342..02e94d5 100644 (file)
@@ -1,13 +1,13 @@
 ï»¿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\xbmc\threads\test\TestAtomics.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestEvent.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestMain.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestSharedSection.cpp" />
-    <ClCompile Include="..\..\xbmc\threads\test\TestThreadLocal.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestAtomics.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestEvent.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestMain.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestSharedSection.cpp" />
+    <ClCompile Include="..\..\src\threads\test\TestThreadLocal.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\xbmc\threads\test\TestHelpers.h" />
+    <ClInclude Include="..\..\src\threads\test\TestHelpers.h" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index c0b5217..bd839ab 100644 (file)
@@ -54,7 +54,7 @@ configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xb
 
 ### copy all the addon binding header files to include/kodi
 # parse addon-bindings.mk to get the list of header files to copy
-file(STRINGS ${APP_ROOT}/xbmc/addons/addon-bindings.mk bindings)
+file(STRINGS ${APP_ROOT}/src/addons/addon-bindings.mk bindings)
 string(REPLACE "\n" ";" bindings "${bindings}")
 foreach(binding ${bindings})
   string(REPLACE " =" ";" binding "${binding}")
@@ -74,4 +74,4 @@ foreach(binding ${bindings})
   #warning DEPRECATION_WARNING
 #endif
 #include \"kodi/${headerfile}\"")
-endforeach()
\ No newline at end of file
+endforeach()
index 2f4d651..310152b 100644 (file)
@@ -70,7 +70,7 @@
 
 #include "utils/GlobalsHandling.h"
 #if defined(TARGET_ANDROID)
-  #include "xbmc/android/activity/XBMCApp.h"
+  #include "src/android/activity/XBMCApp.h"
 #endif
 
 using namespace PVR;
index 50d75bc..75e0ddb 100644 (file)
@@ -1,20 +1,20 @@
-BINDINGS =xbmc/addons/include/xbmc_addon_cpp_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_addon_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_addon_types.h
-BINDINGS+=xbmc/addons/include/xbmc_audioenc_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_audioenc_types.h
-BINDINGS+=xbmc/addons/include/xbmc_codec_types.h
-BINDINGS+=xbmc/addons/include/xbmc_epg_types.h
-BINDINGS+=xbmc/addons/include/xbmc_pvr_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_pvr_types.h
-BINDINGS+=xbmc/addons/include/xbmc_scr_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_scr_types.h
-BINDINGS+=xbmc/addons/include/xbmc_vis_dll.h
-BINDINGS+=xbmc/addons/include/xbmc_vis_types.h
-BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp
+BINDINGS =src/addons/include/xbmc_addon_cpp_dll.h
+BINDINGS+=src/addons/include/xbmc_addon_dll.h
+BINDINGS+=src/addons/include/xbmc_addon_types.h
+BINDINGS+=src/addons/include/xbmc_audioenc_dll.h
+BINDINGS+=src/addons/include/xbmc_audioenc_types.h
+BINDINGS+=src/addons/include/xbmc_codec_types.h
+BINDINGS+=src/addons/include/xbmc_epg_types.h
+BINDINGS+=src/addons/include/xbmc_pvr_dll.h
+BINDINGS+=src/addons/include/xbmc_pvr_types.h
+BINDINGS+=src/addons/include/xbmc_scr_dll.h
+BINDINGS+=src/addons/include/xbmc_scr_types.h
+BINDINGS+=src/addons/include/xbmc_vis_dll.h
+BINDINGS+=src/addons/include/xbmc_vis_types.h
+BINDINGS+=src/addons/include/xbmc_stream_utils.hpp
 BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h
 BINDINGS+=addons/library.xbmc.gui/libXBMC_gui.h
 BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h
 BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h
-BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h
+BINDINGS+=src/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h
 
index 8491050..b48b20f 100644 (file)
@@ -1,13 +1,13 @@
 ARCH=@ARCH@
 
 INCLUDES  = -I.
-INCLUDES += -I@abs_top_srcdir@/xbmc
-INCLUDES += -I@abs_top_srcdir@/xbmc/linux
-INCLUDES += -I@abs_top_srcdir@/xbmc/utils
-INCLUDES += -I@abs_top_srcdir@/xbmc/guilib
-INCLUDES += -I@abs_top_srcdir@/xbmc/cores
-INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer
-INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer/Codecs/ffmpeg
+INCLUDES += -I@abs_top_srcdir@/src
+INCLUDES += -I@abs_top_srcdir@/src/linux
+INCLUDES += -I@abs_top_srcdir@/src/utils
+INCLUDES += -I@abs_top_srcdir@/src/guilib
+INCLUDES += -I@abs_top_srcdir@/src/cores
+INCLUDES += -I@abs_top_srcdir@/src/cores/dvdplayer
+INCLUDES += -I@abs_top_srcdir@/src/cores/dvdplayer/Codecs/ffmpeg
 
 OSSLIBDIR=0
 -include /etc/oss.conf
index 81fe19b..0c4ccec 100644 (file)
@@ -48,7 +48,7 @@
 #include "threads/SingleLock.h"
 #include "RenderCapture.h"
 #include "RenderFormats.h"
-#include "xbmc/Application.h"
+#include "src/Application.h"
 #include "cores/IPlayer.h"
 
 extern "C" {
index d8bf35d..7b47c2b 100644 (file)
 
 #include "system_gl.h"
 
-#include "xbmc/guilib/FrameBufferObject.h"
-#include "xbmc/guilib/Shader.h"
+#include "src/guilib/FrameBufferObject.h"
+#include "src/guilib/Shader.h"
 #include "settings/VideoSettings.h"
 #include "RenderFlags.h"
 #include "RenderFormats.h"
 #include "guilib/GraphicContext.h"
 #include "BaseRenderer.h"
-#include "xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
+#include "src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
 
 class CRenderCapture;
 
index 03a05de..a5b2618 100644 (file)
@@ -31,7 +31,7 @@
 #include "utils/MathUtils.h"
 #include "windowing/WindowingFactory.h"
 #include "cores/dvdplayer/DVDCodecs/Video/MMALCodec.h"
-#include "xbmc/Application.h"
+#include "src/Application.h"
 
 #define CLASSNAME "CMMALRenderer"
 
index 56d269a..b8a65ad 100644 (file)
@@ -173,7 +173,7 @@ class CRenderCaptureBase
 };
 
 #if defined(TARGET_RASPBERRY_PI)
-#include "xbmc/linux/RBP.h"
+#include "src/linux/RBP.h"
 
 class CRenderCaptureDispmanX : public CRenderCaptureBase
 {
index 6446ee9..7c92c31 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 CXXFLAGS+=-DHAVE_MMX
 
index ed183d8..d2290d5 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 SRCS  = DVDCodecUtils.cpp
 SRCS += DVDFactoryCodec.cpp
index 9e9c56f..3ed7f8a 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 SRCS  = DVDOverlayCodec.cpp
 SRCS += DVDOverlayCodecCC.cpp
index b4aa571..e1119cd 100644 (file)
@@ -31,7 +31,7 @@
 #include "cores/dvdplayer/DVDStreamInfo.h"
 #include "DVDVideoCodec.h"
 #include "threads/Event.h"
-#include "xbmc/settings/VideoSettings.h"
+#include "src/settings/VideoSettings.h"
 
 #include <queue>
 #include <semaphore.h>
index 6f5d3e8..eecec72 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 SRCS  = DVDVideoCodec.cpp
 SRCS += DVDVideoCodecFFmpeg.cpp
index 0f2cab0..1969483 100644 (file)
@@ -38,7 +38,7 @@
 #include "settings/AdvancedSettings.h"
 #include "android/jni/Build.h"
 
-#include "xbmc/guilib/FrameBufferObject.h"
+#include "src/guilib/FrameBufferObject.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
index ebd19ce..83b0302 100644 (file)
@@ -21,7 +21,7 @@
 /***************************************************************************/
 
 #include "threads/Thread.h"
-#include "xbmc/guilib/FrameBufferObject.h"
+#include "src/guilib/FrameBufferObject.h"
 #include "cores/VideoRenderers/RenderFormats.h"
 
 #include <android/native_window.h>
index 658c451..511d746 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 SRCS  = DVDDemux.cpp
 SRCS += DVDDemuxBXA.cpp
index 72b6eaf..6bfbcae 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "DVDInputStreamFFmpeg.h"
-#include "xbmc/playlists/PlayListM3U.h"
+#include "src/playlists/PlayListM3U.h"
 #include "settings/Settings.h"
 #include "Util.h"
 #include "utils/log.h"
index a9bab4c..86b97a1 100644 (file)
@@ -57,7 +57,7 @@
 #include "cores/VideoRenderers/RenderManager.h"
 #endif
 #ifdef HAS_PERFORMANCE_SAMPLE
-#include "xbmc/utils/PerformanceSample.h"
+#include "src/utils/PerformanceSample.h"
 #else
 #define MEASURE_FUNCTION
 #endif
@@ -78,7 +78,7 @@
 #include "storage/MediaManager.h"
 #include "dialogs/GUIDialogBusy.h"
 #include "dialogs/GUIDialogKaiToast.h"
-#include "xbmc/playlists/PlayListM3U.h"
+#include "src/playlists/PlayListM3U.h"
 #include "utils/StringUtils.h"
 #include "Util.h"
 #include "LangInfo.h"
index 7fc91aa..3b5d777 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer
 
 SRCS  = DVDFactorySubtitle.cpp
 SRCS += DVDSubtitleLineCollection.cpp
index 2397db4..14b5c75 100644 (file)
@@ -34,7 +34,7 @@
 #include "DVDDemuxers/DVDDemux.h"
 #include "DVDMessageQueue.h"
 #include "utils/BitstreamStats.h"
-#include "xbmc/linux/DllBCM.h"
+#include "src/linux/DllBCM.h"
 
 class OMXPlayerAudio : public CThread, public IDVDStreamPlayerAudio
 {
index 99bb7eb..27157fe 100644 (file)
@@ -32,7 +32,7 @@
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
 #include "cores/VideoRenderers/RenderManager.h"
-#include "xbmc/guilib/GraphicContext.h"
+#include "src/guilib/GraphicContext.h"
 #include "settings/Settings.h"
 #include "utils/BitstreamConverter.h"
 
index c8fd5fb..f850f04 100644 (file)
@@ -30,9 +30,9 @@
 
 #include "guilib/Geometry.h"
 #include "DVDDemuxers/DVDDemux.h"
-#include "xbmc/settings/VideoSettings.h"
+#include "src/settings/VideoSettings.h"
 #include "threads/CriticalSection.h"
-#include "xbmc/rendering/RenderSystem.h"
+#include "src/rendering/RenderSystem.h"
 #include <string>
 
 #define VIDEO_BUFFERS 60
index b1a07b7..cd6c82e 100644 (file)
@@ -22,7 +22,7 @@
 
 #if defined(TARGET_ANDROID)
 #include "AndroidAppDirectory.h"
-#include "xbmc/android/activity/XBMCApp.h"
+#include "src/android/activity/XBMCApp.h"
 #include "FileItem.h"
 #include "File.h"
 #include "utils/URIUtils.h"
index 098d8e1..747dc96 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include "GUIInfoTypes.h"
-#include "xbmc/FileItem.h"
+#include "src/FileItem.h"
 #include "GUIAction.h"
 
 class TiXmlElement;
index e137ef0..55eb77a 100644 (file)
@@ -3,7 +3,7 @@ DOXYGEN=@DOXYGEN_EXE@
 endif
 
 TOPDIR = @abs_top_srcdir@
-INTERFACES_DIR = @abs_top_srcdir@/xbmc/interfaces
+INTERFACES_DIR = @abs_top_srcdir@/src/interfaces
 JAVA=@JAVA_EXE@
 SWIG=@SWIG_EXE@
 LIB=python_binding.a
index 4ae29ba..ed044f3 100644 (file)
@@ -32,7 +32,7 @@
 #include "utils/log.h"
 
 #include "OMXClock.h"
-#include "xbmc/linux/RBP.h"
+#include "src/linux/RBP.h"
 
 #ifdef TARGET_LINUX
 #include "XMemUtils.h"
index 20e3bf5..0c179af 100644 (file)
@@ -43,7 +43,7 @@
 #include "music/MusicDatabase.h"
 #include "video/VideoDatabase.h"
 #include "guilib/GUIWindowManager.h"
-#include "xbmc/GUIUserMessages.h"
+#include "src/GUIUserMessages.h"
 #include "utils/FileUtils.h"
 
 NPT_SET_LOCAL_LOGGER("xbmc.upnp.server")
index 50cdf80..b23d728 100644 (file)
@@ -45,9 +45,9 @@
 #import <OpenGLES/ES2/glext.h>
 #import "IOSEAGLView.h"
 #if defined(TARGET_DARWIN_IOS_ATV2)
-#import "xbmc/osx/atv2/KodiController.h"
+#import "src/osx/atv2/KodiController.h"
 #elif defined(TARGET_DARWIN_IOS)
-#import "xbmc/osx/ios/XBMCController.h"
+#import "src/osx/ios/XBMCController.h"
 #endif
 #import "IOSScreenManager.h"
 #import "AutoPool.h"
index f27d58c..328aad0 100644 (file)
@@ -38,9 +38,9 @@
 
 #import "IOSScreenManager.h"
 #if defined(TARGET_DARWIN_IOS_ATV2)
-#import "xbmc/osx/atv2/KodiController.h"
+#import "src/osx/atv2/KodiController.h"
 #elif defined(TARGET_DARWIN_IOS)
-#import "xbmc/osx/ios/XBMCController.h"
+#import "src/osx/ios/XBMCController.h"
 #endif
 #import "IOSExternalTouchController.h"
 #import "IOSEAGLView.h"
index 5a8e861..b4f5e79 100644 (file)
@@ -1,6 +1,6 @@
 INCLUDES  = -I@abs_top_srcdir@
-INCLUDES += -I@abs_top_srcdir@/xbmc
-INCLUDES += -I@abs_top_srcdir@/xbmc/linux
+INCLUDES += -I@abs_top_srcdir@/src
+INCLUDES += -I@abs_top_srcdir@/src/linux
 
 .SUFFIXES : .m .mm
 
index 63a16a1..f7650d8 100644 (file)
@@ -299,7 +299,7 @@ namespace PVR
      *
      * The stream input type
      * If it is empty, ffmpeg will try to scan the stream to find the right input format.
-     * See "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a
+     * See "src/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a
      * list of the input formats.
      *
      * @return The stream input type
index 98e398a..a8b83d7 100644 (file)
@@ -26,7 +26,7 @@
 #include "system.h"
 #include "system_gl.h"
 #include "rendering/RenderSystem.h"
-#include "xbmc/guilib/GUIShader.h"
+#include "src/guilib/GUIShader.h"
 
 enum ESHADERMETHOD
 {
index db73d4a..ee60a14 100644 (file)
@@ -30,7 +30,7 @@
 #include "pictures/Picture.h"
 
 #ifdef TARGET_RASPBERRY_PI
-#include "xbmc/linux/RBP.h"
+#include "src/linux/RBP.h"
 #endif
 
 #ifdef HAS_VIDEO_PLAYBACK
index e307d71..a172e67 100644 (file)
@@ -9,9 +9,9 @@ DISTCLEAN_FILES=../../../addons/visualization.goom
 
 $(SLIB): $(OBJS) goom2k4-0/src/.libs/libgoom2.a
 ifeq ($(findstring osx,$(ARCH)), osx)
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined suppress -read_only_relocs suppress -o $(SLIB) \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o goom2k4-0/src/.libs/libgoom2.a  $(OBJS)
+               @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o goom2k4-0/src/.libs/libgoom2.a  $(OBJS)
 else
        $(CXX) $(LDFLAGS) -fPIC goom2k4-0/src/*.o -shared $(CXXFLAGS) -o $(SLIB) $(OBJS) \
                `cat ../../cores/DllLoader/exports/wrapper.def` \
index b9f2903..5e47082 100644 (file)
@@ -9,8 +9,8 @@ OBJS = opengl_spectrum.o
 
 ifeq (@USE_OPENGLES@,1)
   DEFINES += -DHAS_GLES=2
-  INCLUDES+= -I@abs_top_srcdir@/xbmc/visualizations/EGLHelpers
-  OBJS += @abs_top_srcdir@/xbmc/visualizations/EGLHelpers/eglhelpers.a
+  INCLUDES+= -I@abs_top_srcdir@/src/visualizations/EGLHelpers
+  OBJS += @abs_top_srcdir@/src/visualizations/EGLHelpers/eglhelpers.a
   ifeq ($(findstring osx,$(ARCH)), osx)
     LDFLAGS += -framework OpenGLES
   else
index 98117cf..2f408dd 100644 (file)
@@ -9,9 +9,9 @@ endif
 
 ifeq (@USE_OPENGLES@,1)
   DEFINES += -DHAS_GLES=2
-  INCLUDES+= -I@abs_top_srcdir@/xbmc/visualizations/EGLHelpers
+  INCLUDES+= -I@abs_top_srcdir@/src/visualizations/EGLHelpers
   OBJS  = Main_gles.o
-  OBJS += @abs_top_srcdir@/xbmc/visualizations/EGLHelpers/eglhelpers.a
+  OBJS += @abs_top_srcdir@/src/visualizations/EGLHelpers/eglhelpers.a
   ifeq ($(findstring osx,$(ARCH)), osx)
     LDFLAGS += -framework OpenGLES
   else
index c6bec1d..8dee2ca 100644 (file)
@@ -50,8 +50,8 @@
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.vis</TargetExt>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Waveform_win32</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Waveform_win32</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\xbmc;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\xbmc;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\src;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\src;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
index 249338c..2fbbca0 100644 (file)
@@ -10,16 +10,16 @@ ifeq ($(findstring osx,$(ARCH)), osx)
 CXXFLAGS+=-fno-common 
 
 $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
-       $(CXX)  $(CFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+       $(CXX)  $(CFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $(SLIB) \
-                @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o ./libprojectM/CMakeFiles/projectM.dir/*.o $(OBJS)
+                @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o ./libprojectM/CMakeFiles/projectM.dir/*.o $(OBJS)
        $(MAKE) $(PRESETS)
 
 libprojectM/libprojectM.dylib:
        $(MAKE) -C libprojectM
 else
 $(SLIB): $(OBJS) libprojectM/libprojectM.so
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o
        $(MAKE) $(PRESETS)
 
 libprojectM/libprojectM.so: 
index d46870c..2885f5f 100644 (file)
@@ -24,7 +24,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "Application.h"
-#include "xbmc/windowing/WindowingFactory.h"
+#include "src/windowing/WindowingFactory.h"
 #include "WinEventsWayland.h"
 
 #include "wayland/EventListener.h"
index 0a3cdee..4dfa870 100644 (file)
@@ -28,7 +28,7 @@
 #include "PlatformInclude.h"
 #include "utils/XBMCTinyXML.h"
 #include "utils/StringUtils.h"
-#include "../xbmc/utils/log.h"
+#include "../src/utils/log.h"
 #include "threads/SystemClock.h"
 #include "CompileInfo.h"
 
index fb004ef..5e6aeb0 100644 (file)
@@ -68,7 +68,7 @@
 #include "dialogs/GUIDialogMediaFilter.h"
 #include "filesystem/SmartPlaylistDirectory.h"
 #if defined(TARGET_ANDROID)
-#include "xbmc/android/activity/XBMCApp.h"
+#include "src/android/activity/XBMCApp.h"
 #endif
 #include "FileItemListModification.h"
 
index 4f0b610..3f2e3bb 100644 (file)
@@ -8,7 +8,7 @@ SRCS           = \
   SDL_anigif.cpp \
   XBTFWriter.cpp \
   XBMCTex.cpp \
-  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
+  @abs_top_srcdir@/src/guilib/XBTF.cpp
 
 TARGET         = TexturePacker
 CLEAN_FILES    = $(TARGET)
@@ -16,8 +16,8 @@ CLEAN_FILES    = $(TARGET)
 CXXFLAGS_FOR_BUILD += \
   -I. \
   -I@abs_top_srcdir@/lib \
-  -I@abs_top_srcdir@/xbmc \
-  -I@abs_top_srcdir@/xbmc/linux
+  -I@abs_top_srcdir@/src \
+  -I@abs_top_srcdir@/src/linux
 
 LDFLAGS_FOR_BUILD += -lSDL_image -lSDL -llzo2
 LDFLAGS_FOR_BUILD += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
@@ -29,7 +29,7 @@ endif
 
 all: $(TARGET)
 
-$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
+$(TARGET): $(SRCS) @abs_top_srcdir@/src/guilib/XBTF.h
 # TexturePacker run native on build system, build it with native tools
        make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so
        $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET)
index 35f15ae..91584a2 100644 (file)
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\..\xbmc\win32;..\..\..\xbmc\guilib;..\..\..\xbmc;..\..\..\xbmc\lib\libsquish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\src\win32;..\..\..\src\guilib;..\..\..\src;..\..\..\src\lib\libsquish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NO_XBMC_FILESYSTEM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -58,7 +58,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDL_image.lib;..\..\..\xbmc\lib\libsquish\lib\squishd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL.lib;SDL_image.lib;..\..\..\lib\libsquish\lib\squishd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..;..\..\..\xbmc\win32;..\..\..\xbmc\guilib;..\..\..\xbmc;..\..\..\xbmc\lib\libsquish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\src\win32;..\..\..\src\guilib;..\..\..\src;..\..\..\lib\libsquish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_XBMC_FILESYSTEM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -78,7 +78,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>SDL.lib;SDL_image.lib;..\..\..\xbmc\lib\libsquish\lib\squish.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL.lib;SDL_image.lib;..\..\..\lib\libsquish\lib\squish.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\xbmc\guilib\DDSImage.cpp" />
+    <ClCompile Include="..\..\..\src\guilib\DDSImage.cpp" />
     <ClCompile Include="..\MakeDDS.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\xbmc\guilib\DDSImage.h" />
+    <ClInclude Include="..\..\..\src\guilib\DDSImage.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
@@ -99,4 +99,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 134d242..4a2ca07 100644 (file)
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\xbmc\guilib\DDSImage.cpp">
+    <ClCompile Include="..\..\..\src\guilib\DDSImage.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\MakeDDS.cpp">
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\xbmc\guilib\DDSImage.h">
+    <ClInclude Include="..\..\..\src\guilib\DDSImage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
index 900a833..ff39345 100644 (file)
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\..\..\xbmc;..\..\..\lib;..\..\..\xbmc\win32%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\..\..\src;..\..\..\lib;..\..\..\src\win32%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -73,7 +73,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>.;..\..\..\xbmc;..\..\..\lib;..\..\..\xbmc\win32%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\..\..\src;..\..\..\lib;..\..\..\src\win32%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_LZO_PACKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -97,7 +97,7 @@
     <ClCompile Include="..\SDL_anigif.cpp" />
     <ClCompile Include="dirent.c" />
     <ClCompile Include="..\XBMCTex.cpp" />
-    <ClCompile Include="..\..\..\xbmc\guilib\XBTF.cpp" />
+    <ClCompile Include="..\..\..\src\guilib\XBTF.cpp" />
     <ClCompile Include="..\XBTFWriter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dirent.h" />
     <ClInclude Include="..\md5.h" />
     <ClInclude Include="..\SDL_anigif.h" />
-    <ClInclude Include="..\..\..\xbmc\guilib\XBTF.h" />
+    <ClInclude Include="..\..\..\src\guilib\XBTF.h" />
     <ClInclude Include="..\XBTFWriter.h" />
   </ItemGroup>
   <ItemGroup>
index b212ae0..3b54486 100644 (file)
@@ -21,7 +21,7 @@
     <ClCompile Include="..\XBMCTex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\xbmc\guilib\XBTF.cpp">
+    <ClCompile Include="..\..\..\src\guilib\XBTF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\XBTFWriter.cpp">
@@ -47,7 +47,7 @@
     <ClInclude Include="..\SDL_anigif.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\xbmc\guilib\XBTF.h">
+    <ClInclude Include="..\..\..\src\guilib\XBTF.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\XBTFWriter.h">
index da45bdb..332df83 100644 (file)
@@ -8,7 +8,7 @@ SET generator_dir=%base_dir%\tools\codegenerator
 SET bin_dir=%cur_dir%\..\BuildDependencies\bin
 SET java_exe=java.exe
 
-rem go into xbmc/interfaces/python
+rem go into src/interfaces/python
 cd "%1\..\python"
 
 SET python_dir=%CD%
@@ -27,7 +27,7 @@ rem run doxygen
 "%bin_dir%\doxygen\doxygen.exe" > NUL 2>&1
 
 rem run swig to generate the XML used by groovy to generate the python bindings
-"%bin_dir%\swig\swig.exe" -w401 -c++ -outdir "%python_generated_dir%" -o "%python_generated_dir%\%2.xml" -xml -I"%base_Dir%\xbmc" -xmllang python "%swig_dir%\%2.i"
+"%bin_dir%\swig\swig.exe" -w401 -c++ -outdir "%python_generated_dir%" -o "%python_generated_dir%\%2.xml" -xml -I"%base_Dir%\src" -xmllang python "%swig_dir%\%2.i"
 rem run groovy to generate the python bindings
 "%java_exe%" -cp "%groovy_dir%\groovy-all-2.1.7.jar;%groovy_dir%\commons-lang-2.6.jar;%generator_dir%;%python_dir%" groovy.ui.GroovyMain "%generator_dir%\Generator.groovy" "%python_generated_dir%\%2.xml" "%python_dir%\PythonSwig.cpp.template" "%python_generated_dir%\%2.cpp" "%doxygen_dir%"
 
index 936815c..7675060 100644 (file)
@@ -20,9 +20,9 @@
 
 XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@
 
-HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6
+HEADER_SEARCH_PATHS = $(inherited) $SRCROOT src src/linux src/osx src/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6
 
-LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/libsquish $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
+LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/libsquish $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/src/interfaces/json-rpc "$(SRCROOT)/src/interfaces/python" "$(SRCROOT)/src/interfaces/legacy"
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/"
 
 XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.6 -lyajl -ljpeg -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt
index 3ebb6ab..bc347a6 100755 (executable)
@@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime"
 
 ${SYNC} "$SRCROOT/LICENSE.GPL"         "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
-${SYNC} "$SRCROOT/xbmc/osx/Credits.html"       "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
+${SYNC} "$SRCROOT/src/osx/Credits.html"        "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
 ${ADDONSYNC} "$SRCROOT/addons"         "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
 ${SYNC} "$SRCROOT/addons/visualization.glspectrum"     "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons"
 ${SYNC} "$SRCROOT/addons/visualization.waveform"       "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons"
index 81bccd6..e24379a 100755 (executable)
@@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime"
 
 ${SYNC} "$SRCROOT/LICENSE.GPL"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
-${SYNC} "$SRCROOT/xbmc/osx/Credits.html"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
+${SYNC} "$SRCROOT/src/osx/Credits.html"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
 ${ADDONSYNC} "$SRCROOT/addons"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
 ${SYNC} "$SRCROOT/addons/visualization.glspectrum"    "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons"
 ${SYNC} "$SRCROOT/addons/visualization.waveform"      "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons"
index 8c10364..d004d36 100755 (executable)
@@ -31,7 +31,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darw
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
 
 ${SYNC} "$SRCROOT/LICENSE.GPL"         "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
-${SYNC} "$SRCROOT/xbmc/osx/Credits.html"       "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
+${SYNC} "$SRCROOT/src/osx/Credits.html"        "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
 ${SYNC} "$SRCROOT/tools/darwin/runtime"        "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin"
 ${ADDONSYNC} "$SRCROOT/addons"         "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
 ${SYNC} "$SRCROOT/language"            "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
index 21cdd55..d0d35a0 100755 (executable)
@@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr"
 echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies"
 check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs"
 
-echo "Checking xbmc/DllPaths_generated.h for dylib dependencies"
-for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
+echo "Checking src/DllPaths_generated.h for dylib dependencies"
+for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
   check_dyloaded_depends $a
 done
 
index 328258b..1dcc09f 100755 (executable)
@@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr"
 echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies"
 check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs"
 
-echo "Checking xbmc/DllPaths_generated.h for dylib dependencies"
-for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
+echo "Checking src/DllPaths_generated.h for dylib dependencies"
+for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
   check_dyloaded_depends $a
 done
 
index df041c1..105c74f 100755 (executable)
@@ -70,7 +70,7 @@ cp -f "$TARGET_BUILD_DIR/$APP_NAME" "$TARGET_BINARY"
 echo "Creating icon"
 iconutil -c icns --output "$TARGET_CONTENTS/Resources/kodi.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset"
 
-cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/"
+cp -f "$SRCROOT/src/osx/Info.plist" "$TARGET_CONTENTS/"
 
 # Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework
 echo "Checking $TARGET_BINARY dylib dependencies"
@@ -102,8 +102,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr"
 echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies"
 check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs"
 
-echo "Checking xbmc/DllPaths_generated.h for dylib dependencies"
-for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
+echo "Checking src/DllPaths_generated.h for dylib dependencies"
+for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do
   check_dyloaded_depends $a
 done
 
index ec2d2b4..d670659 100755 (executable)
@@ -8,5 +8,5 @@ fi
 
 if [ "$ACTION" = build ] ; then
   make -f ${SRCROOT}/codegenerator.mk
-  make -f ${SRCROOT}/xbmc/gen-compileinfo.mk
+  make -f ${SRCROOT}/src/gen-compileinfo.mk
 fi
index ef8af0a..0ee40cd 100644 (file)
@@ -20,7 +20,7 @@ SET separator=,
 CALL SET file_version=%%addon_api:.=%separator%%%%separator%0
 
 REM create the files with the proper version information
-"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g "%base_dir%\xbmc\CompileInfo.cpp.in" > "%base_dir%\xbmc\CompileInfo.cpp"
+"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g "%base_dir%\src\CompileInfo.cpp.in" > "%base_dir%\src\CompileInfo.cpp"
 "%msys_bin_dir%\sed.exe" s/@APP_ADDON_API@/%addon_api%/g "%base_dir%\addons\xbmc.addon\addon.xml.in" > "%base_dir%\addons\xbmc.addon\addon.xml"
-"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g "%base_dir%\xbmc\win32\XBMC_PC.rc.in" > "%base_dir%\xbmc\win32\XBMC_PC.rc"
+"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g "%base_dir%\src\win32\XBMC_PC.rc.in" > "%base_dir%\src\win32\XBMC_PC.rc"
 
index 3e0b52e..04db6df 100644 (file)
@@ -6,7 +6,7 @@ SET base_dir=%cur_dir%\..\..
 SET builddeps_dir=%cur_dir%\..\BuildDependencies
 SET bin_dir=%builddeps_dir%\bin
 SET msys_bin_dir=%builddeps_dir%\msys\bin
-SET jsonrpc_path=%base_dir%\xbmc\interfaces\json-rpc
+SET jsonrpc_path=%base_dir%\src\interfaces\json-rpc
 SET jsonrpc_schema_path=%jsonrpc_path%\schema
 SET jsonrpc_output=ServiceDescription.h