diff --git a/VBA.vcproj b/VBA.vcproj
index 2eb83b89..809737ef 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -530,6 +530,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -550,6 +551,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -591,214 +593,6 @@
 					RelativePath=".\src\simpleFilter.cpp"
 					>
 				</File>
-				<Filter
-					Name="HQ"
-					>
-					<File
-						RelativePath=".\src\hq2x.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\hq3x32.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								AssemblerOutput="1"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\hq3x_16.asm"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\hq3x_32.asm"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\hq4x_16.asm"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\hq4x_32.asm"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\src\hq_shared32.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\src\macros.mac"
-						>
-					</File>
-					<File
-						RelativePath=".\src\portable.cpp"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="Functionality"
@@ -1493,30 +1287,6 @@
 					RelativePath=".\src\win32\rpi.h"
 					>
 				</File>
-				<Filter
-					Name="HQ"
-					>
-					<File
-						RelativePath=".\src\hq2x.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\hq3x32.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\hq_shared32.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\interp.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\lq2x.h"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="GBA"
@@ -1933,6 +1703,463 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="HQ"
+			>
+			<Filter
+				Name="H/LQ2x"
+				>
+				<File
+					RelativePath=".\src\hq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\hq2x.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\interp.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\lq2x.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="HQ34x_ASM"
+				>
+				<File
+					RelativePath=".\src\hq3x32.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AssemblerOutput="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq3x32.h"
+					>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq3x_16.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq3x_32.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq4x_16.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq4x_32.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin32 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\macros.mac"
+					>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="HQ34x_C"
+				>
+				<File
+					RelativePath=".\src\hq3x16c.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq3x32c.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq3x_pattern.h"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq4x16c.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq4x32c.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq4x_pattern.h"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq_shared32.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hq_shared32.h"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\src\hqxx.h"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index ffe75e1a..cb6fb28f 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -86,10 +86,17 @@ extern void Simple3x32(u8*,u32,u8*,u8*,u32,int,int);
 extern void Simple4x16(u8*,u32,u8*,u8*,u32,int,int);
 extern void Simple4x32(u8*,u32,u8*,u8*,u32,int,int);
 
-extern void hq3x32(u8*,u32,u8*,u8*,u32,int,int);
 extern void hq3x16(u8*,u32,u8*,u8*,u32,int,int);
-extern void hq4x32(u8*,u32,u8*,u8*,u32,int,int);
 extern void hq4x16(u8*,u32,u8*,u8*,u32,int,int);
+#ifdef MMX
+extern void hq3x32(u8*,u32,u8*,u8*,u32,int,int);
+extern void hq4x32(u8*,u32,u8*,u8*,u32,int,int);
+#else
+extern void hq3x32_32(u8*,u32,u8*,u8*,u32,int,int);
+extern void hq4x32_32(u8*,u32,u8*,u8*,u32,int,int);
+#define hq3x32 hq3x32_32
+#define hq4x32 hq4x32_32
+#endif
 
 extern void SmartIB(u8*,u32,int,int);
 extern void SmartIB32(u8*,u32,int,int);