diff --git a/MSVC/.gitignore b/MSVC/.gitignore
new file mode 100644
index 00000000..a462d955
--- /dev/null
+++ b/MSVC/.gitignore
@@ -0,0 +1,9 @@
+# Visual Studio files
+x64
+cd-info
+_UpgradeReport_Files
+Backup
+*.user
+UpgradeLog.*
+*.sdf
+*.suo
\ No newline at end of file
diff --git a/MSVC/cd-info.vcxproj b/MSVC/cd-info.vcxproj
new file mode 100644
index 00000000..f86789f0
--- /dev/null
+++ b/MSVC/cd-info.vcxproj
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8E55CFDB-5E38-4A07-84F8-36939C825735}</ProjectGuid>
+    <RootNamespace>cd-info</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>Debug\</OutDir>
+    <IntDir>Debug\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>Release\</OutDir>
+    <IntDir>Release\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include\cdio;..\src;..\lib\driver;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <ObjectFileName>$(ProjectName)/$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(ProjectName)/$(IntDir)vc70.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libcdiod.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(ProjectName)/$(OutDir)cd-info.exe</OutputFile>
+      <AdditionalLibraryDirectories>Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(ProjectName)/$(OutDir)cd-info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include\cdio;..\src;..\lib\driver;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>$(ProjectName)/$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(ProjectName)/$(IntDir)vc70.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libcdiod.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(ProjectName)/$(OutDir)cd-info.exe</OutputFile>
+      <AdditionalLibraryDirectories>Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(ProjectName)/$(OutDir)cd-info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\include\cdio;..\src;..\lib\driver;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <ObjectFileName>$(ProjectName)/$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(ProjectName)/$(IntDir)vc70.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libcdio.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(ProjectName)/$(OutDir)cd-info.exe</OutputFile>
+      <AdditionalLibraryDirectories>Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(ProjectName)/$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\include\cdio;..\src;..\lib\driver;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>$(ProjectName)/$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(ProjectName)/$(IntDir)vc70.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>libcdio.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(ProjectName)/$(OutDir)cd-info.exe</OutputFile>
+      <AdditionalLibraryDirectories>Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(ProjectName)/$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\cd-info.c" />
+    <ClCompile Include="..\src\util.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\util.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC/cd-info.vcxproj.filters b/MSVC/cd-info.vcxproj.filters
new file mode 100644
index 00000000..0ce770cb
--- /dev/null
+++ b/MSVC/cd-info.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\cd-info.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC/libcdio.sln b/MSVC/libcdio.sln
index fe8a64af..a4072bc8 100644
--- a/MSVC/libcdio.sln
+++ b/MSVC/libcdio.sln
@@ -1,39 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcdio", "libcdio.vcproj", "{E465056A-C6F3-45EE-B791-CAF8E0CE629D}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcdio", "libcdio.vcxproj", "{E465056A-C6F3-45EE-B791-CAF8E0CE629D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cd-info", "cd-info.vcproj", "{8E55CFDB-5E38-4A07-84F8-36939C825735}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cd-info", "cd-info.vcxproj", "{8E55CFDB-5E38-4A07-84F8-36939C825735}"
 	ProjectSection(ProjectDependencies) = postProject
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D} = {E465056A-C6F3-45EE-B791-CAF8E0CE629D}
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-		XBOX_Debug = XBOX_Debug
-		XBOX_Release = XBOX_Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug.ActiveCfg = Debug|Win32
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug.Build.0 = Debug|Win32
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release.ActiveCfg = Release|Win32
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release.Build.0 = Release|Win32
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.XBOX_Debug.ActiveCfg = XBOX_Debug|Xbox
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.XBOX_Debug.Build.0 = XBOX_Debug|Xbox
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.XBOX_Release.ActiveCfg = XBOX_Release|Xbox
-		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.XBOX_Release.Build.0 = XBOX_Release|Xbox
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug.ActiveCfg = Debug|Win32
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug.Build.0 = Debug|Win32
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release.ActiveCfg = Release|Win32
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release.Build.0 = Release|Win32
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.XBOX_Debug.ActiveCfg = XBOX_Debug|Xbox
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.XBOX_Debug.Build.0 = XBOX_Debug|Xbox
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.XBOX_Release.ActiveCfg = XBOX_Release|Xbox
-		{8E55CFDB-5E38-4A07-84F8-36939C825735}.XBOX_Release.Build.0 = XBOX_Release|Xbox
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug|Win32.Build.0 = Debug|Win32
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug|x64.ActiveCfg = Debug|x64
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Debug|x64.Build.0 = Debug|x64
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release|Win32.ActiveCfg = Release|Win32
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release|Win32.Build.0 = Release|Win32
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release|x64.ActiveCfg = Release|x64
+		{E465056A-C6F3-45EE-B791-CAF8E0CE629D}.Release|x64.Build.0 = Release|x64
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug|Win32.Build.0 = Debug|Win32
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug|x64.ActiveCfg = Debug|x64
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Debug|x64.Build.0 = Debug|x64
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release|Win32.ActiveCfg = Release|Win32
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release|Win32.Build.0 = Release|Win32
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release|x64.ActiveCfg = Release|x64
+		{8E55CFDB-5E38-4A07-84F8-36939C825735}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/MSVC/libcdio.vcxproj b/MSVC/libcdio.vcxproj
new file mode 100644
index 00000000..98338bad
--- /dev/null
+++ b/MSVC/libcdio.vcxproj
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E465056A-C6F3-45EE-B791-CAF8E0CE629D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>Debug\</OutDir>
+    <IntDir>Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>Release\</OutDir>
+    <IntDir>Release\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\MSVC;..\include;..\lib\driver;..\lib\driver\MSWindows;..\lib\driver\mmc;..\lib\driver\image;..\lib\driver\FreeBSD;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(ProjectName)d.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\MSVC;..\include;..\lib\driver;..\lib\driver\MSWindows;..\lib\driver\mmc;..\lib\driver\image;..\lib\driver\FreeBSD;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(ProjectName)d.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\MSVC;..\include;..\lib\driver;..\lib\driver\MSWindows;..\lib\driver\mmc;..\lib\driver\image;..\lib\driver\FreeBSD;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\MSVC;..\include;..\lib\driver;..\lib\driver\MSWindows;..\lib\driver\mmc;..\lib\driver\image;..\lib\driver\FreeBSD;..\lib\iso9660;..\lib\udf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\lib\driver\MSWindows\aspi32.c" />
+    <ClCompile Include="..\lib\driver\_cdio_generic.c" />
+    <ClCompile Include="..\lib\driver\_cdio_stdio.c" />
+    <ClCompile Include="..\lib\driver\_cdio_stream.c" />
+    <ClCompile Include="..\lib\driver\abs_path.c" />
+    <ClCompile Include="..\lib\driver\aix.c" />
+    <ClCompile Include="..\lib\driver\audio.c" />
+    <ClCompile Include="..\lib\driver\bsdi.c" />
+    <ClCompile Include="..\lib\driver\cd_types.c" />
+    <ClCompile Include="..\lib\driver\cdio.c" />
+    <ClCompile Include="..\lib\driver\cdtext.c" />
+    <ClCompile Include="..\lib\driver\device.c" />
+    <ClCompile Include="..\lib\driver\disc.c" />
+    <ClCompile Include="..\lib\driver\ds.c" />
+    <ClCompile Include="..\lib\driver\gnu_linux.c" />
+    <ClCompile Include="..\lib\driver\image_common.c" />
+    <ClCompile Include="..\lib\driver\logging.c" />
+    <ClCompile Include="..\lib\driver\netbsd.c" />
+    <ClCompile Include="..\lib\driver\os2.c" />
+    <ClCompile Include="..\lib\driver\osx.c" />
+    <ClCompile Include="..\lib\driver\read.c" />
+    <ClCompile Include="..\lib\driver\realpath.c" />
+    <ClCompile Include="..\lib\driver\sector.c" />
+    <ClCompile Include="..\lib\driver\solaris.c" />
+    <ClCompile Include="..\lib\driver\track.c" />
+    <ClCompile Include="..\lib\driver\utf8.c" />
+    <ClCompile Include="..\lib\driver\util.c" />
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd.c" />
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd_cam.c" />
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd_ioctl.c" />
+    <ClCompile Include="..\lib\driver\image\bincue.c" />
+    <ClCompile Include="..\lib\driver\image\cdrdao.c" />
+    <ClCompile Include="..\lib\driver\image\nrg.c" />
+    <ClCompile Include="..\lib\driver\mmc\mmc.c" />
+    <ClCompile Include="..\lib\driver\mmc\mmc_hl_cmds.c" />
+    <ClCompile Include="..\lib\driver\mmc\mmc_ll_cmds.c" />
+    <ClCompile Include="..\lib\driver\mmc\mmc_util.c" />
+    <ClCompile Include="..\lib\driver\MSWindows\win32.c" />
+    <ClCompile Include="..\lib\driver\MSWindows\win32_ioctl.c" />
+    <ClCompile Include="..\lib\iso9660\iso9660.c" />
+    <ClCompile Include="..\lib\iso9660\iso9660_fs.c" />
+    <ClCompile Include="..\lib\iso9660\rock.c" />
+    <ClCompile Include="..\lib\iso9660\xa.c" />
+    <ClInclude Include="..\lib\driver\filemode.h" />
+    <ClInclude Include="..\lib\udf\filemode.c" />
+    <ClInclude Include="..\lib\udf\udf.c" />
+    <ClInclude Include="..\lib\udf\udf_file.c" />
+    <ClInclude Include="..\lib\udf\udf_fs.c" />
+    <ClInclude Include="..\lib\udf\udf_time.c" />
+    <ClInclude Include="config.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\lib\driver\_cdio_stdio.h" />
+    <ClInclude Include="..\lib\driver\_cdio_stream.h" />
+    <ClInclude Include="..\lib\driver\cdio_assert.h" />
+    <ClInclude Include="..\lib\driver\cdio_private.h" />
+    <ClInclude Include="..\lib\driver\cdtext_private.h" />
+    <ClInclude Include="..\lib\driver\generic.h" />
+    <ClInclude Include="..\lib\driver\image.h" />
+    <ClInclude Include="..\lib\driver\image_common.h" />
+    <ClInclude Include="..\lib\driver\portable.h" />
+    <ClInclude Include="..\lib\driver\FreeBSD\freebsd.h" />
+    <ClInclude Include="..\lib\driver\image\nrg.h" />
+    <ClInclude Include="..\lib\driver\mmc\mmc_cmd_helper.h" />
+    <ClInclude Include="..\lib\driver\mmc\mmc_private.h" />
+    <ClInclude Include="..\lib\driver\MSWindows\aspi32.h" />
+    <ClInclude Include="..\lib\driver\MSWindows\win32.h" />
+    <ClInclude Include="..\lib\iso9660\iso9660_private.h" />
+    <ClInclude Include="..\lib\udf\udf_fs.h" />
+    <ClInclude Include="..\lib\udf\udf_private.h" />
+    <ClInclude Include="..\include\cdio\audio.h" />
+    <ClInclude Include="..\include\cdio\bytesex.h" />
+    <ClInclude Include="..\include\cdio\bytesex_asm.h" />
+    <ClInclude Include="..\include\cdio\cd_types.h" />
+    <ClInclude Include="..\include\cdio\cdio.h" />
+    <ClInclude Include="..\include\cdio\cdtext.h" />
+    <ClInclude Include="..\include\cdio\device.h" />
+    <ClInclude Include="..\include\cdio\disc.h" />
+    <ClInclude Include="..\include\cdio\ds.h" />
+    <ClInclude Include="..\include\cdio\dvd.h" />
+    <ClInclude Include="..\include\cdio\ecma_167.h" />
+    <ClInclude Include="..\include\cdio\iso9660.h" />
+    <ClInclude Include="..\include\cdio\logging.h" />
+    <ClInclude Include="..\include\cdio\mmc.h" />
+    <ClInclude Include="..\include\cdio\mmc_cmds.h" />
+    <ClInclude Include="..\include\cdio\mmc_hl_cmds.h" />
+    <ClInclude Include="..\include\cdio\mmc_ll_cmds.h" />
+    <ClInclude Include="..\include\cdio\mmc_util.h" />
+    <ClInclude Include="..\include\cdio\posix.h" />
+    <ClInclude Include="..\include\cdio\read.h" />
+    <ClInclude Include="..\include\cdio\rock.h" />
+    <ClInclude Include="..\include\cdio\scsi_mmc.h" />
+    <ClInclude Include="..\include\cdio\sector.h" />
+    <ClInclude Include="..\include\cdio\track.h" />
+    <ClInclude Include="..\include\cdio\types.h" />
+    <ClInclude Include="..\include\cdio\udf.h" />
+    <ClInclude Include="..\include\cdio\udf_file.h" />
+    <ClInclude Include="..\include\cdio\udf_time.h" />
+    <ClInclude Include="..\include\cdio\utf8.h" />
+    <ClInclude Include="..\include\cdio\util.h" />
+    <ClInclude Include="..\include\cdio\msvc\version.h" />
+    <ClInclude Include="..\include\cdio\xa.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC/libcdio.vcxproj.filters b/MSVC/libcdio.vcxproj.filters
new file mode 100644
index 00000000..b5987b80
--- /dev/null
+++ b/MSVC/libcdio.vcxproj.filters
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Include Files">
+      <UniqueIdentifier>{1ccad4fe-bf79-427a-8dbc-c16c700cc2d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\driver">
+      <UniqueIdentifier>{3b4f92ed-660d-4415-a252-685e2f9fa4e3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\iso9660">
+      <UniqueIdentifier>{f83086f3-c8ae-4e7a-aab6-037b2caa229a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\udf">
+      <UniqueIdentifier>{8f2d6b54-9af9-4834-a1e9-1b0596b9fb31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\driver\MSWindows">
+      <UniqueIdentifier>{831d9ff6-69d6-4af7-9b69-05529d86fa8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\driver\image">
+      <UniqueIdentifier>{4a15ee1f-56e9-4f8e-992d-b8171b4b2fbe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\driver\FreeBSD">
+      <UniqueIdentifier>{c48c999a-bfa8-407a-9ad1-2ae0575411d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\driver\mmc">
+      <UniqueIdentifier>{f9566a07-3cd6-410c-abb8-5d292d91d496}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\cdio">
+      <UniqueIdentifier>{7050c012-edf5-40cb-9487-a59d85b18b0f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\cdio\msvc">
+      <UniqueIdentifier>{6274b3bd-7c49-4399-837a-16dfac9e036f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib">
+      <UniqueIdentifier>{551721c2-51db-4fd7-bcfb-df978c6bb839}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\driver">
+      <UniqueIdentifier>{6f904c48-01ae-4c60-89fb-ef689c526549}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\driver\mmc">
+      <UniqueIdentifier>{dae44b13-c6e5-4d59-8269-23577de9e587}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\driver\FreeBSD">
+      <UniqueIdentifier>{7e8c5436-1648-4bf0-aa55-8cfa3275b8e6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\driver\image">
+      <UniqueIdentifier>{3c610521-a705-49b6-8d38-1731b4968640}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\driver\MSWindows">
+      <UniqueIdentifier>{d17f543b-3f32-4445-bb72-f0cf360890d5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\iso9660">
+      <UniqueIdentifier>{1fc82f46-df3f-4e53-b1b7-799071823563}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Include Files\lib\udf">
+      <UniqueIdentifier>{9294b999-1d55-467d-8520-f3e7faa8c888}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd.c">
+      <Filter>Source Files\driver\FreeBSD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd_cam.c">
+      <Filter>Source Files\driver\FreeBSD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\FreeBSD\freebsd_ioctl.c">
+      <Filter>Source Files\driver\FreeBSD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\_cdio_generic.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\_cdio_stdio.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\_cdio_stream.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\abs_path.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\aix.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\audio.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\image\bincue.c">
+      <Filter>Source Files\driver\image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\image\cdrdao.c">
+      <Filter>Source Files\driver\image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\bsdi.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\cd_types.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\cdio.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\cdtext.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\device.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\disc.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\ds.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\gnu_linux.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\image_common.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\iso9660\iso9660.c">
+      <Filter>Source Files\iso9660</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\iso9660\iso9660_fs.c">
+      <Filter>Source Files\iso9660</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\mmc\mmc.c">
+      <Filter>Source Files\driver\mmc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\mmc\mmc_hl_cmds.c">
+      <Filter>Source Files\driver\mmc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\mmc\mmc_ll_cmds.c">
+      <Filter>Source Files\driver\mmc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\mmc\mmc_util.c">
+      <Filter>Source Files\driver\mmc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\logging.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\netbsd.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\image\nrg.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\os2.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\osx.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\read.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\realpath.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\iso9660\rock.c">
+      <Filter>Source Files\iso9660</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\sector.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\solaris.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\track.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\iso9660\xa.c">
+      <Filter>Source Files\iso9660</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\MSWindows\win32.c">
+      <Filter>Source Files\driver\MSWindows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\MSWindows\win32_ioctl.c">
+      <Filter>Source Files\driver\MSWindows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\utf8.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\util.c">
+      <Filter>Source Files\driver</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib\driver\MSWindows\aspi32.c">
+      <Filter>Source Files\driver\MSWindows</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\lib\udf\filemode.c">
+      <Filter>Source Files\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf.c">
+      <Filter>Source Files\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf_file.c">
+      <Filter>Source Files\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf_fs.c">
+      <Filter>Source Files\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf_time.c">
+      <Filter>Source Files\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\audio.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\bytesex.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\bytesex_asm.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\cd_types.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\cdio.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\cdtext.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\device.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\disc.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\ds.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\dvd.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\ecma_167.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\iso9660.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\logging.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\mmc.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\mmc_cmds.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\mmc_hl_cmds.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\mmc_ll_cmds.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\mmc_util.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\posix.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\read.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\rock.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\scsi_mmc.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\sector.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\track.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\types.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\udf.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\udf_file.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\udf_time.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\utf8.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\util.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\xa.h">
+      <Filter>Include Files\cdio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cdio\msvc\version.h">
+      <Filter>Include Files\cdio\msvc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\iso9660\iso9660_private.h">
+      <Filter>Include Files\lib\iso9660</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\FreeBSD\freebsd.h">
+      <Filter>Include Files\lib\driver\FreeBSD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\image\nrg.h">
+      <Filter>Include Files\lib\driver\image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\mmc\mmc_cmd_helper.h">
+      <Filter>Include Files\lib\driver\mmc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\mmc\mmc_private.h">
+      <Filter>Include Files\lib\driver\mmc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\MSWindows\aspi32.h">
+      <Filter>Include Files\lib\driver\MSWindows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\MSWindows\win32.h">
+      <Filter>Include Files\lib\driver\MSWindows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\_cdio_stdio.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\_cdio_stream.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\cdio_assert.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\cdio_private.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\cdtext_private.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\generic.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\image.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\image_common.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\portable.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\driver\filemode.h">
+      <Filter>Include Files\lib\driver</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf_fs.h">
+      <Filter>Include Files\lib\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\udf\udf_private.h">
+      <Filter>Include Files\lib\udf</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h">
+      <Filter>Include Files\cdio\msvc</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h
index 044f3469..76712ae5 100644
--- a/include/cdio/cdio.h
+++ b/include/cdio/cdio.h
@@ -31,7 +31,11 @@
  */
 #define CDIO_API_VERSION 6
 
-#include <cdio/version.h>
+#if defined (_MSC_VER) || defined (_XBOX)
+	#include <cdio/msvc/version.h>
+#else
+	#include <cdio/version.h>
+#endif
 #include <cdio/types.h>
 #include <cdio/sector.h>
 
diff --git a/include/cdio/msvc/version.h b/include/cdio/msvc/version.h
new file mode 100644
index 00000000..bc21f1e4
--- /dev/null
+++ b/include/cdio/msvc/version.h
@@ -0,0 +1,20 @@
+/* $Id: version.h.in,v 1.6 2005/01/29 20:54:20 rocky Exp $ */
+/** \file version.h 
+ *
+ *  \brief A file containing the libcdio package version
+ *  number (@LIBCDIO_VERSION_NUM@) and OS build name. 
+ */
+
+/*! CDIO_VERSION is a C-Preprocessor macro of a string that shows what
+    version is used.  cdio_version_string has the same value, but it is a
+    constant variable that can be accessed at run time. */
+#define CDIO_VERSION "@VERSION@ @build@"
+extern const char *cdio_version_string; /**< = CDIO_VERSION */
+
+/*! LIBCDIO_VERSION_NUM is a C-Preprocessor macro that can be used for
+    testing in the C preprocessor. libcdio_version_num has the same
+    value, but it is a constant variable that can be accessed at run
+    time.  */
+#define LIBCDIO_VERSION_NUM @LIBCDIO_VERSION_NUM@
+
+extern const unsigned int libcdio_version_num; /**< = LIBCDIO_VERSION_NUM */