diff --git a/libs/broadvoice/src/Makefile.am b/libs/broadvoice/src/Makefile.am
index 3aa4026608..e3d0a53d6c 100644
--- a/libs/broadvoice/src/Makefile.am
+++ b/libs/broadvoice/src/Makefile.am
@@ -114,7 +114,7 @@ noinst_PROGRAMS =
 DSP = broadvoice.dsp
 VCPROJ = broadvoice.vcproj
 
-WIN32SOURCES = $(broadvoice_la_SOURCES) msvc/gettimeofday.c
+WIN32SOURCES = $(libbroadvoice_la_SOURCES) msvc/gettimeofday.c
 WIN32HEADERS = $(nobase_include_HEADERS) broadvoice.h
 
 DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
diff --git a/libs/broadvoice/src/broadvoice.vcproj b/libs/broadvoice/src/broadvoice.vcproj
index 929bebf07b..2db7989e9c 100644
--- a/libs/broadvoice/src/broadvoice.vcproj
+++ b/libs/broadvoice/src/broadvoice.vcproj
@@ -1,189 +1,246 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C"
-	Version="9.00"
-	Name="libg722_1"
-	ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
-	RootNamespace="libg722_1"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="src; src\g722_1; src\msvc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				ModuleDefinitionFile="src/msvc/g722_1.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src; src\g722_1; src\msvc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				ModuleDefinitionFile="src/msvc/g722_1.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-<File RelativePath="msvc/gettimeofday.c"></File>
-</Filter><Filter  Name="Header Files">
-<File RelativePath="broadvoice/broadvoice.h"></File>
-<File RelativePath="broadvoice/version.h"></File>
-<File RelativePath="broadvoice/private/broadvoice.h"></File>
-<File RelativePath="broadvoice.h"></File>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libbroadvoice"
+	ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
+	RootNamespace="libbroadvoice"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice;  .\msvc"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice;  .\msvc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="bitpack16.c"></File>
+			<File RelativePath="bitpack32.c"></File>
+			<File RelativePath="bitstream.c"></File>
+			<File RelativePath="floating\bv16\bv16coarse_pitch.c"></File>
+			<File RelativePath="floating\bv16\bv16decoder.c"></File>
+			<File RelativePath="floating\bv16\bv16encoder.c"></File>
+			<File RelativePath="floating\bv16\bv16excdec.c"></File>
+			<File RelativePath="floating\bv16\bv16excquan.c"></File>
+			<File RelativePath="floating\bv16\bv16fine_pitch.c"></File>
+			<File RelativePath="floating\bv16\bv16gaindec.c"></File>
+			<File RelativePath="floating\bv16\bv16gainquan.c"></File>
+			<File RelativePath="floating\bv16\bv16levelest.c"></File>
+			<File RelativePath="floating\bv16\bv16lspdec.c"></File>
+			<File RelativePath="floating\bv16\bv16lspquan.c"></File>
+			<File RelativePath="floating\bv16\bv16plc.c"></File>
+			<File RelativePath="floating\bv16\bv16postfilter.c"></File>
+			<File RelativePath="floating\bv16\bv16ptdec.c"></File>
+			<File RelativePath="floating\bv16\bv16ptquan.c"></File>
+			<File RelativePath="floating\bv16\bv16tables.c"></File>
+			<File RelativePath="floating\bv32\bv32coarse_pitch.c"></File>
+			<File RelativePath="floating\bv32\bv32decoder.c"></File>
+			<File RelativePath="floating\bv32\bv32encoder.c"></File>
+			<File RelativePath="floating\bv32\bv32excdec.c"></File>
+			<File RelativePath="floating\bv32\bv32excquan.c"></File>
+			<File RelativePath="floating\bv32\bv32fine_pitch.c"></File>
+			<File RelativePath="floating\bv32\bv32gaindec.c"></File>
+			<File RelativePath="floating\bv32\bv32gainquan.c"></File>
+			<File RelativePath="floating\bv32\bv32levelest.c"></File>
+			<File RelativePath="floating\bv32\bv32lspdec.c"></File>
+			<File RelativePath="floating\bv32\bv32lspquan.c"></File>
+			<File RelativePath="floating\bv32\bv32plc.c"></File>
+			<File RelativePath="floating\bv32\bv32ptdec.c"></File>
+			<File RelativePath="floating\bv32\bv32ptquan.c"></File>
+			<File RelativePath="floating\bv32\bv32tables.c"></File>
+			<File RelativePath="floating\common\a2lsp.c"></File>
+			<File RelativePath="floating\common\allpole.c"></File>
+			<File RelativePath="floating\common\allzero.c"></File>
+			<File RelativePath="floating\common\autocor.c"></File>
+			<File RelativePath="floating\common\cmtables.c"></File>
+			<File RelativePath="floating\common\levdur.c"></File>
+			<File RelativePath="floating\common\lsp2a.c"></File>
+			<File RelativePath="floating\common\stblchck.c"></File>
+			<File RelativePath="floating\common\stblzlsp.c"></File>
+			<File RelativePath="floating\common\utility.c"></File>
+			<File RelativePath="msvc\gettimeofday.c"></File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="broadvoice.h"
+				>
+			</File>
+			<File
+				RelativePath="broadvoice/broadvoice.h"
+				>
+			</File>
+			<File
+				RelativePath="broadvoice/private/broadvoice.h"
+				>
+			</File>
+			<File
+				RelativePath="broadvoice/version.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/libs/broadvoice/src/msvc/vc8proj.head b/libs/broadvoice/src/msvc/vc8proj.head
index 1d1cc526ab..a6ce980a9d 100644
--- a/libs/broadvoice/src/msvc/vc8proj.head
+++ b/libs/broadvoice/src/msvc/vc8proj.head
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C"
+	ProjectType="Visual C++"
 	Version="9.00"
-	Name="libg722_1"
+	Name="libbroadvoice"
 	ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
-	RootNamespace="libg722_1"
+	RootNamespace="libbroadvoice"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src; src\g722_1; src\msvc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
+				AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice;  .\msvc"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -64,7 +64,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-				ModuleDefinitionFile="src/msvc/g722_1.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -118,8 +117,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src; src\g722_1; src\msvc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
+				AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice;  .\msvc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -138,7 +137,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				ModuleDefinitionFile="src/msvc/g722_1.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"