-renamed "strbase.lib" to "BaseClasses.lib"

-removed "#pragma comment(lib, libname)"
-sorted linker libs alphabetically

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2148 10f7b99b-c216-0410-bff0-8a66a9350fd8

41 files changed, 152 insertions, 161 deletions

diff --git a/src/apps/mplayerc/LcdSupport.cpp b/src/apps/mplayerc/LcdSupport.cpp
index 6f35d6339..6455fd085 100644
--- a/src/apps/mplayerc/LcdSupport.cpp
+++ b/src/apps/mplayerc/LcdSupport.cpp
@@ -30,9 +30,6 @@
 

 #include "LcdSupport.h"

 

-// make sure we use the library

-#pragma comment(lib, "lgLcd.lib")

-

 #define LCD_APP_NAME "Media Player Classic"

 #define LCD_UPD_TIMER 40

 

diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index b127ad440..baea9465f 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -73,10 +73,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib dxguid.lib Dsound.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib d2vsource.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib Mpeg2DecFilter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib subtitlesource.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib MPCVideoDec.lib SyncClock.lib"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib qtmlClient.lib SetupAPI.lib wmstub.lib AsyncReader.lib AudioSwitcher.lib AVI2AC3Filter.lib AviSplitter.lib BaseClasses.lib BaseMuxer.lib BaseSource.lib BaseSplitter.lib BufferFilter.lib CDDAReader.lib CDXAReader.lib CmdUI.lib D2VSource.lib DeCSS.lib DeCSSFilter.lib DiracSplitter.lib DSMMuxer.lib DSMSplitter.lib DSUtil.lib DTSAC3Source.lib Filters.lib FlacSource.lib FLICSource.lib FLVSplitter.lib LCDUI.lib lgLcd.lib libpng.lib libssf.lib libvorbisidec.lib MatroskaSplitter.lib MatroskaMuxer.lib MP4Splitter.lib MpaDecFilter.lib MpaSplitter.lib MpcAudioRendererFilter.lib Mpeg2DecFilter.lib MpegSplitter.lib NutSplitter.lib OggSplitter.lib RealMediaSplitter.lib ResizableLib.lib RoQSplitter.lib sizecbar.lib ShoutcastSource.lib SSFSplitter.lib StreamDriveThru.lib SubPic.lib Subtitles.lib SubtitleSource.lib SyncClock.lib TreePropSheet.lib UDPReader.lib VTSReader.lib WavDest.lib zlib.lib MPCVideoDec.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib;$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"

-				IgnoreDefaultLibraryNames="MSVCRT"

+				IgnoreDefaultLibraryNames=""

 				DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"

 				SubSystem="2"

 				LargeAddressAware="2"

@@ -162,7 +162,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib dxguid.lib Dsound.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib subtitlesource.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib Uuid.Lib strmiids.lib MPCVideoDec.lib Mpeg2DecFilter.lib detours.lib"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib SetupAPI.lib strmiids.lib Uuid.Lib AsyncReader.lib AudioSwitcher.lib AVI2AC3Filter.lib AviSplitter.lib BaseClasses.lib BaseMuxer.lib BaseSource.lib BaseSplitter.lib BufferFilter.lib CDDAReader.lib CDXAReader.lib CmdUI.lib D2VSource.lib DeCSS.lib DeCSSFilter.lib DiracSplitter.lib DSMMuxer.lib DSMSplitter.lib DSUtil.lib DTSAC3Source.lib Filters.lib FlacSource.lib FLICSource.lib FLVSplitter.lib LCDUI.lib lgLcd.lib libpng.lib libssf.lib libvorbisidec.lib MatroskaSplitter.lib MatroskaMuxer.lib MP4Splitter.lib MpaDecFilter.lib MpaSplitter.lib MpcAudioRendererFilter.lib Mpeg2DecFilter.lib MpegSplitter.lib NutSplitter.lib OggSplitter.lib RealMediaSplitter.lib ResizableLib.lib RoQSplitter.lib sizecbar.lib ShoutcastSource.lib SSFSplitter.lib StreamDriveThru.lib SubPic.lib Subtitles.lib SubtitleSource.lib SyncClock.lib TreePropSheet.lib UDPReader.lib VTSReader.lib WavDest.lib zlib.lib MPCVideoDec.lib"

 				OutputFile="$(OutDir)\$(ProjectName)64.exe"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64;$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"

 				IgnoreDefaultLibraryNames=""

@@ -247,11 +247,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib detours.lib qtmlClient.lib wmstub.lib Dsound.lib dxguid.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib d2vsource.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib subtitlesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib Mpeg2DecFilter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib MPCVideoDec.lib SyncClock.lib ResizableLib.lib CmdUI.lib sizecbar.lib decss.lib MpcAudioRendererFilter.lib TreePropSheet.lib VTSReader.lib FlacSource.lib"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib qtmlClient.lib SetupAPI.lib wmstub.lib AsyncReader.lib AudioSwitcher.lib AVI2AC3Filter.lib AviSplitter.lib BaseClasses.lib BaseMuxer.lib BaseSource.lib BaseSplitter.lib BufferFilter.lib CDDAReader.lib CDXAReader.lib CmdUI.lib D2VSource.lib DeCSS.lib DeCSSFilter.lib DiracSplitter.lib DSMMuxer.lib DSMSplitter.lib DSUtil.lib DTSAC3Source.lib Filters.lib FlacSource.lib FLICSource.lib FLVSplitter.lib LCDUI.lib lgLcd.lib libpng.lib libssf.lib libvorbisidec.lib MatroskaSplitter.lib MatroskaMuxer.lib MP4Splitter.lib MpaDecFilter.lib MpaSplitter.lib MpcAudioRendererFilter.lib MPCVideoDec.lib Mpeg2DecFilter.lib MpegSplitter.lib NutSplitter.lib OggSplitter.lib RealMediaSplitter.lib ResizableLib.lib RoQSplitter.lib ShoutcastSource.lib sizecbar.lib SSFSplitter.lib StreamDriveThru.lib SubPic.lib Subtitles.lib SubtitleSource.lib SyncClock.lib TreePropSheet.lib UDPReader.lib VTSReader.lib WavDest.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="2"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib\wm7;$(SolutionDir)lib\qt6;$(SolutionDir)lib\detours;$(SolutionDir)lib\lglcd;$(SolutionDir)lib\dx;$(DXSDK_DIR)Lib\x86"

-				IgnoreDefaultLibraryNames="MSVCRTD;LIBCMT"

+				AdditionalManifestDependencies=""

+				IgnoreDefaultLibraryNames="msvcrtd;libcmt"

 				DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -332,11 +333,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib Dsound.lib dxguid.lib strmbase.lib dsutil.lib subpic.lib subtitles.lib libssf.lib asyncreader.lib audioswitcher.lib avi2ac3filter.lib bufferfilter.lib cddareader.lib cdxareader.lib decssfilter.lib flicsource.lib dtsac3source.lib basesource.lib subtitlesource.lib wavdest.lib shoutcastsource.lib streamdrivethru.lib vtsreader.lib basesplitter.lib MatroskaSplitter.lib MatroskaMuxer.lib RealMediaSplitter.lib AviSplitter.lib MpaDecFilter.lib RoQSplitter.lib OggSplitter.lib NutSplitter.lib MpegSplitter.lib DiracSplitter.lib MpaSplitter.lib DSMSplitter.lib BaseMuxer.lib DSMMuxer.lib UDPReader.lib FLVSplitter.lib zlib.lib filters.lib libvorbisidec.lib SSFSplitter.lib MP4Splitter.lib libpng.lib Setupapi.lib lgLcd.lib LCDUI.lib strmiids.lib MPCVideoDec.lib Mpeg2DecFilter.lib detours.lib"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib detours.lib dsound.lib dxguid.lib gdiplus.lib Psapi.lib SetupAPI.lib strmiids.lib AsyncReader.lib AudioSwitcher.lib AVI2AC3Filter.lib AviSplitter.lib BaseClasses.lib BaseMuxer.lib BaseSource.lib BaseSplitter.lib BufferFilter.lib CDDAReader.lib CDXAReader.lib CmdUI.lib D2VSource.lib DeCSS.lib DeCSSFilter.lib DiracSplitter.lib DSMMuxer.lib DSMSplitter.lib DSUtil.lib DTSAC3Source.lib Filters.lib FlacSource.lib FLICSource.lib FLVSplitter.lib LCDUI.lib lgLcd.lib libpng.lib libssf.lib libvorbisidec.lib MatroskaSplitter.lib MatroskaMuxer.lib MP4Splitter.lib MpaDecFilter.lib MpaSplitter.lib MpcAudioRendererFilter.lib MPCVideoDec.lib Mpeg2DecFilter.lib MpegSplitter.lib NutSplitter.lib OggSplitter.lib RealMediaSplitter.lib ResizableLib.lib RoQSplitter.lib ShoutcastSource.lib sizecbar.lib SSFSplitter.lib StreamDriveThru.lib SubPic.lib Subtitles.lib SubtitleSource.lib SyncClock.lib TreePropSheet.lib UDPReader.lib VTSReader.lib WavDest.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName)64.exe"

 				LinkIncremental="2"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\$(ConfigurationName)_$(PlatformName);$(SolutionDir)lib64\lglcd;$(SolutionDir)lib64\detours;$(SolutionDir)lib64\dx;$(DXSDK_DIR)Lib\x64"

-				IgnoreDefaultLibraryNames="MSVCRTD;LIBCMT"

+				IgnoreDefaultLibraryNames="msvcrtd;libcmt"

 				DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h
index 288c0e45d..1a62ab256 100644
--- a/src/apps/mplayerc/stdafx.h
+++ b/src/apps/mplayerc/stdafx.h
@@ -64,7 +64,6 @@
 #include "../../DSUtil/DSUtil.h"

 

 #include <gdiplus.h>

-#pragma comment(lib, "gdiplus.lib")

 

 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")

 

diff --git a/src/filters/BaseClasses/BaseClasses.vcproj b/src/filters/BaseClasses/BaseClasses.vcproj
index 7ec766cec..096e303b5 100644
--- a/src/filters/BaseClasses/BaseClasses.vcproj
+++ b/src/filters/BaseClasses/BaseClasses.vcproj
@@ -63,7 +63,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="strmiids.lib"

-				OutputFile="$(OutDir)\strmbase.lib"

 				AdditionalLibraryDirectories=""

 			/>

 			<Tool

@@ -127,7 +126,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="strmiids.lib"

-				OutputFile="$(OutDir)\strmbase.lib"

 				AdditionalLibraryDirectories=""

 			/>

 			<Tool

@@ -189,7 +187,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="strmiids.lib"

-				OutputFile="$(OutDir)\strmbase.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -252,7 +249,6 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="strmiids.lib"

-				OutputFile="$(OutDir)\strmbase.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
index 43a23b6ee..b7dac5873 100644
--- a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
+++ b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DSMMuxer.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DSMMuxer.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DSMMuxer.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DSMMuxer.def"

diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj
index 41ffb4301..96ece7925 100644
--- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj
+++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaMuxer.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaMuxer.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaMuxer.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaMuxer.def"

diff --git a/src/filters/muxer/WavDest/WavDest.vcproj b/src/filters/muxer/WavDest/WavDest.vcproj
index 3a6ef7ede..3bd62eb4a 100644
--- a/src/filters/muxer/WavDest/WavDest.vcproj
+++ b/src/filters/muxer/WavDest/WavDest.vcproj
@@ -291,7 +291,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="wavdest.def"

@@ -364,7 +364,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="wavdest.def"

@@ -435,7 +435,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="wavdest.def"

@@ -510,7 +510,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="wavdest.def"

diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcproj b/src/filters/parser/AviSplitter/AviSplitter.vcproj
index abca01c61..93d9eab86 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.vcproj
+++ b/src/filters/parser/AviSplitter/AviSplitter.vcproj
@@ -292,7 +292,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AviSplitter.def"

@@ -366,7 +366,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AviSplitter.def"

@@ -439,7 +439,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AviSplitter.def"

@@ -515,7 +515,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AviSplitter.def"

diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
index 6cd4206d3..3484135ea 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -363,7 +363,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -436,7 +436,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DSMSplitter.def"

@@ -511,7 +511,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DSMSplitter.def"

diff --git a/src/filters/parser/DiracSplitter/DiracSplitter.vcproj b/src/filters/parser/DiracSplitter/DiracSplitter.vcproj
index 1f5168066..1a7da3055 100644
--- a/src/filters/parser/DiracSplitter/DiracSplitter.vcproj
+++ b/src/filters/parser/DiracSplitter/DiracSplitter.vcproj
@@ -296,7 +296,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libdirac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DiracSplitter.def"

@@ -370,7 +370,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libdirac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DiracSplitter.def"

@@ -442,7 +442,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libdirac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DiracSplitter.def"

@@ -517,7 +517,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libdirac.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libdirac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DiracSplitter.def"

diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.vcproj b/src/filters/parser/FLVSplitter/FLVSplitter.vcproj
index cd2c45f05..4caeba464 100644
--- a/src/filters/parser/FLVSplitter/FLVSplitter.vcproj
+++ b/src/filters/parser/FLVSplitter/FLVSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames=""

@@ -363,7 +363,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames=""

@@ -436,7 +436,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="FLVSplitter.def"

@@ -511,7 +511,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies=" strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="FLVSplitter.def"

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
index 2235da549..9b8bc06c5 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcproj
@@ -294,7 +294,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -370,7 +370,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -444,7 +444,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MP4Splitter.def"

@@ -520,7 +520,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MP4Splitter.def"

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj
index 49c41f60f..28c8b1a13 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="zlib.lib strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MatroskaSplitter.def"

diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.vcproj b/src/filters/parser/MpaSplitter/MpaSplitter.vcproj
index 622808e1b..7a26f60e9 100644
--- a/src/filters/parser/MpaSplitter/MpaSplitter.vcproj
+++ b/src/filters/parser/MpaSplitter/MpaSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpaSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpaSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpaSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpaSplitter.def"

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.vcproj b/src/filters/parser/MpegSplitter/MpegSplitter.vcproj
index 1092f83ad..d32f4a075 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.vcproj
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpegSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpegSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpegSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpegSplitter.def"

diff --git a/src/filters/parser/NutSplitter/NutSplitter.vcproj b/src/filters/parser/NutSplitter/NutSplitter.vcproj
index 63881e6b4..fb8f09bcd 100644
--- a/src/filters/parser/NutSplitter/NutSplitter.vcproj
+++ b/src/filters/parser/NutSplitter/NutSplitter.vcproj
@@ -289,7 +289,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="NutSplitter.def"

@@ -363,7 +363,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="NutSplitter.def"

@@ -435,7 +435,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="NutSplitter.def"

@@ -510,7 +510,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="NutSplitter.def"

diff --git a/src/filters/parser/OggSplitter/OggSplitter.vcproj b/src/filters/parser/OggSplitter/OggSplitter.vcproj
index b2d6f47ad..2eb1e2d3f 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.vcproj
+++ b/src/filters/parser/OggSplitter/OggSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="OggSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="OggSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="OggSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="OggSplitter.def"

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj
index 7d2c29e42..4b9735a98 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcproj
@@ -298,7 +298,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -373,7 +373,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreDefaultLibraryNames="libc.lib"

@@ -446,7 +446,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="RealMediaSplitter.def"

@@ -521,7 +521,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib basevideofilter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib BaseVideoFilter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="RealMediaSplitter.def"

diff --git a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
index 26a232d51..cb7e99a7f 100644
--- a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
+++ b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="RoQSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="RoQSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="RoQSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="RoQSplitter.def"

diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
index f76d7b8a4..69b3eba53 100644
--- a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
+++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
@@ -288,7 +288,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="SSFSplitter.def"

@@ -362,7 +362,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="SSFSplitter.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="SSFSplitter.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib basesplitter.lib libssf.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libssf.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="SSFSplitter.def"

diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcproj b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcproj
index 10856483f..4e1a15d9e 100644
--- a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcproj
+++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcproj
@@ -290,7 +290,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="StreamDriveThru.def"

@@ -364,7 +364,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="StreamDriveThru.def"

@@ -436,7 +436,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="StreamDriveThru.def"

@@ -511,7 +511,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="StreamDriveThru.def"

diff --git a/src/filters/reader/CDDAReader/CDDAReader.vcproj b/src/filters/reader/CDDAReader/CDDAReader.vcproj
index 23be86e73..50badea13 100644
--- a/src/filters/reader/CDDAReader/CDDAReader.vcproj
+++ b/src/filters/reader/CDDAReader/CDDAReader.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="CDDAReader.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="CDDAReader.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="CDDAReader.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="CDDAReader.def"

diff --git a/src/filters/reader/CDXAReader/CDXAReader.vcproj b/src/filters/reader/CDXAReader/CDXAReader.vcproj
index ec71a453a..f2bdd8528 100644
--- a/src/filters/reader/CDXAReader/CDXAReader.vcproj
+++ b/src/filters/reader/CDXAReader/CDXAReader.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="CDXAReader.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="CDXAReader.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="CDXAReader.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="CDXAReader.def"

diff --git a/src/filters/reader/UDPReader/UDPReader.vcproj b/src/filters/reader/UDPReader/UDPReader.vcproj
index 831951804..421c55944 100644
--- a/src/filters/reader/UDPReader/UDPReader.vcproj
+++ b/src/filters/reader/UDPReader/UDPReader.vcproj
@@ -293,7 +293,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="UDPReader.def"

@@ -366,7 +366,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="UDPReader.def"

@@ -438,7 +438,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="UDPReader.def"

@@ -514,7 +514,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="UDPReader.def"

diff --git a/src/filters/reader/VTSReader/VTSReader.vcproj b/src/filters/reader/VTSReader/VTSReader.vcproj
index f8d3e23f8..ab9501f86 100644
--- a/src/filters/reader/VTSReader/VTSReader.vcproj
+++ b/src/filters/reader/VTSReader/VTSReader.vcproj
@@ -290,7 +290,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="VTSReader.def"

@@ -363,7 +363,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="VTSReader.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="VTSReader.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib asyncreader.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="AsyncReader.lib BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="VTSReader.def"

diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
index 471479950..1a7394234 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib dsound.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				IgnoreAllDefaultLibraries="false"

@@ -133,7 +133,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib dsound.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

@@ -204,7 +204,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib dsound.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

@@ -279,7 +279,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsound.lib dsutil.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib dsound.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpcAudioRenderer.def"

diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp
index 5668e6b96..3a8dd22a9 100644
--- a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp
+++ b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp
@@ -25,8 +25,6 @@
 #include "RenderersSettings.h"

 #include <d3dx9.h>

 

-#pragma comment(lib, "winmm.lib")

-

 /////////////////////////////////////////////////////////////////////////////

 // CRenderersData construction

 

diff --git a/src/filters/source/D2VSource/D2VSource.vcproj b/src/filters/source/D2VSource/D2VSource.vcproj
index 97352006c..2925219ad 100644
--- a/src/filters/source/D2VSource/D2VSource.vcproj
+++ b/src/filters/source/D2VSource/D2VSource.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="D2VSource.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="D2VSource.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="D2VSource.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="D2VSource.def"

diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.vcproj b/src/filters/source/DTSAC3Source/DTSAC3Source.vcproj
index 8da516b9e..685ca7c14 100644
--- a/src/filters/source/DTSAC3Source/DTSAC3Source.vcproj
+++ b/src/filters/source/DTSAC3Source/DTSAC3Source.vcproj
@@ -290,7 +290,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DTSAC3Source.def"

@@ -363,7 +363,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DTSAC3Source.def"

@@ -434,7 +434,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DTSAC3Source.def"

@@ -509,7 +509,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSource.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DTSAC3Source.def"

diff --git a/src/filters/source/FLICSource/FLICSource.vcproj b/src/filters/source/FLICSource/FLICSource.vcproj
index 4b1adc46c..f3c424de2 100644
--- a/src/filters/source/FLICSource/FLICSource.vcproj
+++ b/src/filters/source/FLICSource/FLICSource.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="FLICSource.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="FLICSource.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="FLICSource.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="FLICSource.def"

diff --git a/src/filters/source/FlacSource/FlacSource.vcproj b/src/filters/source/FlacSource/FlacSource.vcproj
index 28675315f..57e0a0fbd 100644
--- a/src/filters/source/FlacSource/FlacSource.vcproj
+++ b/src/filters/source/FlacSource/FlacSource.vcproj
@@ -296,7 +296,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib  libflac.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libflac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="FlacSource.def"

@@ -369,7 +369,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib  libflac.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libflac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="FlacSource.def"

@@ -440,7 +440,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib  libflac.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libflac.lib Winmm.lib"

 				ShowProgress="0"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

@@ -516,7 +516,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib strmbase.lib basesource.lib Winmm.lib  libflac.lib"

+				AdditionalDependencies="BaseClasses.lib BaseSplitter.lib DSUtil.lib libflac.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="FlacSource.def"

diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.vcproj b/src/filters/source/ShoutcastSource/ShoutcastSource.vcproj
index d52837d9e..ae4e49bfb 100644
--- a/src/filters/source/ShoutcastSource/ShoutcastSource.vcproj
+++ b/src/filters/source/ShoutcastSource/ShoutcastSource.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="ShoutcastSource.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="ShoutcastSource.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="ShoutcastSource.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="ShoutcastSource.def"

diff --git a/src/filters/source/SubtitleSource/SubtitleSource.vcproj b/src/filters/source/SubtitleSource/SubtitleSource.vcproj
index f901ff032..452cdc38a 100644
--- a/src/filters/source/SubtitleSource/SubtitleSource.vcproj
+++ b/src/filters/source/SubtitleSource/SubtitleSource.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"

+				AdditionalDependencies="BaseClasses.lib comsuppw.lib Subtitles.lib SubPic.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="SubtitleSource.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"

+				AdditionalDependencies="BaseClasses.lib comsuppw.lib Subtitles.lib SubPic.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="SubtitleSource.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"

+				AdditionalDependencies="BaseClasses.lib comsuppw.lib Subtitles.lib SubPic.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="SubtitleSource.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib subtitles.lib subpic.lib dsutil.lib Winmm.lib comsuppw.lib"

+				AdditionalDependencies="BaseClasses.lib comsuppw.lib Subtitles.lib SubPic.lib DSUtil.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="SubtitleSource.def"

diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcproj b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcproj
index 289a07c42..34ce8e3b3 100644
--- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcproj
+++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AudioSwitcher.def"

@@ -133,7 +133,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AudioSwitcher.def"

@@ -205,7 +205,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AudioSwitcher.def"

@@ -281,7 +281,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AudioSwitcher.def"

diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcproj b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcproj
index ef6cceb79..03c41331d 100644
--- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcproj
+++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AVI2AC3Filter.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="AVI2AC3Filter.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AVI2AC3Filter.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="AVI2AC3Filter.def"

diff --git a/src/filters/transform/BufferFilter/BufferFilter.vcproj b/src/filters/transform/BufferFilter/BufferFilter.vcproj
index 1b3925470..a21424595 100644
--- a/src/filters/transform/BufferFilter/BufferFilter.vcproj
+++ b/src/filters/transform/BufferFilter/BufferFilter.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="BufferFilter.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="BufferFilter.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="BufferFilter.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="BufferFilter.def"

diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcproj b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcproj
index 1722f7e39..45bf585d4 100644
--- a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcproj
+++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcproj
@@ -60,7 +60,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DeCSSFilter.def"

@@ -134,7 +134,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="DeCSSFilter.def"

@@ -205,7 +205,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DeCSSFilter.def"

@@ -280,7 +280,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="decss.lib strmbase.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="DeCSSFilter.def"

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
index 74fcb2ea9..ec38f3ef8 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec.lib d3d9.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MPCVideoDec.def"

@@ -130,7 +130,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec.lib d3d9.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="MPCVideoDec.def"

@@ -200,7 +200,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec_gcc.lib libgcc.a libmingwex.a d3d9.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec_gcc.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)lib;$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MPCVideoDec.def"

@@ -275,7 +275,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dsutil.lib filters.lib strmbase.lib Winmm.lib zlib.lib basevideofilter.lib libavcodec_gcc.lib libgcc.a libmingwex.a d3d9.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib d3d9.lib DSUtil.lib Filters.lib libavcodec_gcc.lib libgcc.a libmingwex.a Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)lib64;$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				IgnoreDefaultLibraryNames=""

diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj
index a5dbb948f..a6d15cd6d 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj
+++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec.lib zlib.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib DSUtil.lib Filters.lib liba52.lib libavcodec.lib libdca.lib libfaad.lib libflac.lib libmad.lib libvorbisidec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib\detours"

 				ModuleDefinitionFile="MpaDecFilter.def"

@@ -132,7 +132,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec.lib zlib.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib DSUtil.lib Filters.lib liba52.lib libavcodec.lib libdca.lib libfaad.lib libflac.lib libmad.lib libvorbisidec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib64\detours"

 				ModuleDefinitionFile="MpaDecFilter.def"

@@ -203,7 +203,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlib.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib DSUtil.lib Filters.lib liba52.lib libavcodec_gcc.lib libdca.lib libfaad.lib libflac.lib libgcc.a libmad.lib libmingwex.a libvorbisidec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)lib;$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpaDecFilter.def"

@@ -278,7 +278,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="filters.lib libvorbisidec.lib libfaad.lib libmad.lib liba52.lib libdca.lib libflac.lib decss.lib dsutil.lib strmbase.lib Winmm.lib libavcodec_gcc.lib libgcc.a libmingwex.a zlib.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib DSUtil.lib Filters.lib liba52.lib libavcodec_gcc.lib libdca.lib libfaad.lib libflac.lib libgcc.a libmad.lib libmingwex.a libvorbisidec.lib Winmm.lib zlib.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)lib64;$(SolutionDir)bin\lib\Release_$(PlatformName)"

 				ModuleDefinitionFile="MpaDecFilter.def"

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
index 827426221..1fddbe370 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcproj
@@ -59,7 +59,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="idct_mmx.obj motion_comp_mmx.obj decss.lib dsutil.lib strmbase.lib basevideofilter.lib Winmm.lib detours.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib DeCSS.lib detours.lib DSUtil.lib idct_mmx.obj motion_comp_mmx.obj Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName);$(SolutionDir)lib\detours"

 				IgnoreDefaultLibraryNames="LIBCMT"

@@ -197,7 +197,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="idct_mmx.obj motion_comp_mmx.obj decss.lib dsutil.lib strmbase.lib basevideofilter.lib Winmm.lib detours.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib DeCSS.lib detours.lib DSUtil.lib idct_mmx.obj motion_comp_mmx.obj Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).ax"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName);$(SolutionDir)lib\detours"

 				ModuleDefinitionFile="Mpeg2DecFilter.def"

diff --git a/src/filters/transform/VSFilter/VSFilter.vcproj b/src/filters/transform/VSFilter/VSFilter.vcproj
index 9d166b0ae..8ed745a31 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcproj
+++ b/src/filters/transform/VSFilter/VSFilter.vcproj
@@ -62,7 +62,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib comsuppwd.lib DSUtil.lib Subtitles.lib SubPic.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="VSFilter.def"

@@ -135,7 +135,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib comsuppwd.lib DSUtil.lib Subtitles.lib SubPic.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Debug_$(PlatformName)"

 				ModuleDefinitionFile="VSFilter.def"

@@ -208,10 +208,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="delayimp.lib strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib comsuppwd.lib delayimp.lib DSUtil.lib Subtitles.lib SubPic.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

-				IgnoreDefaultLibraryNames="MSVCRT"

+				IgnoreDefaultLibraryNames="msvcrt"

 				ModuleDefinitionFile="VSFilter.def"

 				DelayLoadDLLs="oleacc.dll"

 				GenerateDebugInformation="true"

@@ -289,10 +289,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="delayimp.lib strmbase.lib dsutil.lib subtitles.lib subpic.lib basevideofilter.lib Winmm.lib comsuppwd.lib"

+				AdditionalDependencies="BaseClasses.lib BaseVideoFilter.lib comsuppwd.lib delayimp.lib DSUtil.lib Subtitles.lib SubPic.lib Winmm.lib"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

 				AdditionalLibraryDirectories="$(SolutionDir)bin\lib\Release_$(PlatformName)"

-				IgnoreDefaultLibraryNames="MSVCRT"

+				IgnoreDefaultLibraryNames="msvcrt"

 				ModuleDefinitionFile="VSFilter.def"

 				DelayLoadDLLs="oleacc.dll"

 				GenerateDebugInformation="true"