diff --git a/platform_build/win32_vs_net/lwjgl-fmod.vcproj b/platform_build/win32_vs_net/lwjgl-fmod.vcproj
new file mode 100644
index 00000000..c2532949
--- /dev/null
+++ b/platform_build/win32_vs_net/lwjgl-fmod.vcproj
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="lwjgl-fmod"
+	ProjectGUID="{E70435A1-9D52-4ECD-8839-C4FF5C23270E}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\fmodapi372win\api\inc&quot;;C:\Java\j2sdk1.5.0\include;C:\Java\j2sdk1.5.0\include\win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/lwjgl-fmod.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/lwjgl-fmod.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\fmodapi372win\api\inc&quot;;C:\Java\j2sdk1.5.0\include;C:\Java\j2sdk1.5.0\include\win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="0"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				OutputFile="..\..\libs\win32\lwjgl-fmod.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="FALSE"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=""
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\native\common\common_tools.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\extfmod.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMOD.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMusic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FSound.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/platform_build/win32_vs_net/lwjgl.sln b/platform_build/win32_vs_net/lwjgl.sln
index e4285ec7..4cf4abc3 100644
--- a/platform_build/win32_vs_net/lwjgl.sln
+++ b/platform_build/win32_vs_net/lwjgl.sln
@@ -3,6 +3,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwjgl", "lwjgl.vcproj", "{F
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwjgl-fmod", "lwjgl-fmod.vcproj", "{E70435A1-9D52-4ECD-8839-C4FF5C23270E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -13,6 +17,10 @@ Global
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Debug.Build.0 = Debug|Win32
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Release.ActiveCfg = Release|Win32
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Release.Build.0 = Release|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Debug.ActiveCfg = Debug|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Debug.Build.0 = Debug|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Release.ActiveCfg = Release|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/platform_build/win32_vs_net/lwjgl.suo b/platform_build/win32_vs_net/lwjgl.suo
index 0637e62b..6b71d411 100644
Binary files a/platform_build/win32_vs_net/lwjgl.suo and b/platform_build/win32_vs_net/lwjgl.suo differ
diff --git a/platform_build/win32_vs_net/lwjgl.vcproj b/platform_build/win32_vs_net/lwjgl.vcproj
index e20b2530..94972f64 100644
--- a/platform_build/win32_vs_net/lwjgl.vcproj
+++ b/platform_build/win32_vs_net/lwjgl.vcproj
@@ -99,7 +99,8 @@
 				AdditionalDependencies="dinput.lib dxguid.lib OpenAL32.lib alut.lib eaxguid.lib OpenGL32.Lib Version.lib"
 				OutputFile="..\..\libs\win32\lwjgl.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Creative Labs\OpenAL 1.0 SDK\libs&quot;;&quot;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\Include\prerelease&quot;;&quot;C:\Program Files\Creative Labs\EAX 2.0 Extensions SDK\Libs&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Creative Labs\OpenAL 1.0 SDK\libs&quot;;&quot;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\Include\prerelease&quot;;&quot;C:\Program Files\Creative Labs\EAX 2.0 Extensions SDK\Libs&quot;;&quot;C:\Program Files\fmodapi372win\api\lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="FALSE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -207,6 +208,9 @@
 			<File
 				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_Pbuffer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_SWTCanvas.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_Window.cpp">
 			</File>
@@ -220,6 +224,9 @@
 			<Filter
 				Name="arb"
 				Filter="">
+				<File
+					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBBufferObject.cpp">
+				</File>
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBImaging.cpp">
 				</File>
@@ -253,9 +260,6 @@
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexBlend.cpp">
 				</File>
-				<File
-					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexBufferObject.cpp">
-				</File>
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexProgram.cpp">
 				</File>
@@ -309,6 +313,9 @@
 				<File
 					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTCompiledVertexArray.cpp">
 				</File>
+				<File
+					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTDepthBoundsTest.cpp">
+				</File>
 				<File
 					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTDrawRangeElements.cpp">
 				</File>