diff --git a/msvc/addmoddel/addmoddel.vcproj b/msvc/addmoddel/addmoddel.vcproj
index 13c253ee..40d6eb22 100644
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/conntest/conntest.vcproj b/msvc/conntest/conntest.vcproj
index 377b3a82..0a32acd8 100644
--- a/msvc/conntest/conntest.vcproj
+++ b/msvc/conntest/conntest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/convert-test/convert-test.vcproj b/msvc/convert-test/convert-test.vcproj
index 898fd6a2..bd49d82c 100644
--- a/msvc/convert-test/convert-test.vcproj
+++ b/msvc/convert-test/convert-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/easyaccess-test/easyaccess-test.vcproj b/msvc/easyaccess-test/easyaccess-test.vcproj
index 27b50e68..d9c76741 100644
--- a/msvc/easyaccess-test/easyaccess-test.vcproj
+++ b/msvc/easyaccess-test/easyaccess-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exifcomment/exifcomment.vcproj b/msvc/exifcomment/exifcomment.vcproj
index 7ebb6f38..c1d031e7 100644
--- a/msvc/exifcomment/exifcomment.vcproj
+++ b/msvc/exifcomment/exifcomment.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exifdata-test/exifdata-test.vcproj b/msvc/exifdata-test/exifdata-test.vcproj
index 9531a3f5..7660ef5c 100644
--- a/msvc/exifdata-test/exifdata-test.vcproj
+++ b/msvc/exifdata-test/exifdata-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exifdata/exifdata.vcproj b/msvc/exifdata/exifdata.vcproj
index 0c6d6330..dcabc20d 100755
--- a/msvc/exifdata/exifdata.vcproj
+++ b/msvc/exifdata/exifdata.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/exifprint/exifprint.vcproj
index 0a300249..49914754 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/exifprint/exifprint.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exifvalue/exifvalue.vcproj b/msvc/exifvalue/exifvalue.vcproj
index 6a9fc2d2..316dc8ed 100755
--- a/msvc/exifvalue/exifvalue.vcproj
+++ b/msvc/exifvalue/exifvalue.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exiv2/exiv2.vcproj b/msvc/exiv2/exiv2.vcproj
index 3e85f65b..05d30a9c 100644
--- a/msvc/exiv2/exiv2.vcproj
+++ b/msvc/exiv2/exiv2.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/exiv2json/exiv2json.vcproj b/msvc/exiv2json/exiv2json.vcproj
index 1b1f17f2..be06b9e7 100644
--- a/msvc/exiv2json/exiv2json.vcproj
+++ b/msvc/exiv2json/exiv2json.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/geotag/geotag.vcproj b/msvc/geotag/geotag.vcproj
index a0d9e631..2642da7c 100644
--- a/msvc/geotag/geotag.vcproj
+++ b/msvc/geotag/geotag.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/httptest/httptest.vcproj b/msvc/httptest/httptest.vcproj
index 869c7a5f..1123e6d5 100644
--- a/msvc/httptest/httptest.vcproj
+++ b/msvc/httptest/httptest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/ini-test/ini-test.vcproj b/msvc/ini-test/ini-test.vcproj
index 2ca5c524..e9ab2fa9 100755
--- a/msvc/ini-test/ini-test.vcproj
+++ b/msvc/ini-test/ini-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/iotest/iotest.vcproj b/msvc/iotest/iotest.vcproj
index b4ea2825..f027b73f 100644
--- a/msvc/iotest/iotest.vcproj
+++ b/msvc/iotest/iotest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/iptceasy/iptceasy.vcproj b/msvc/iptceasy/iptceasy.vcproj
index 229a8ba0..82efd7e1 100644
--- a/msvc/iptceasy/iptceasy.vcproj
+++ b/msvc/iptceasy/iptceasy.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/iptcprint/iptcprint.vcproj b/msvc/iptcprint/iptcprint.vcproj
index 45d4c44d..2ecd45ae 100644
--- a/msvc/iptcprint/iptcprint.vcproj
+++ b/msvc/iptcprint/iptcprint.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/iptctest/iptctest.vcproj b/msvc/iptctest/iptctest.vcproj
index 33b66166..47000bae 100644
--- a/msvc/iptctest/iptctest.vcproj
+++ b/msvc/iptctest/iptctest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/key-test/key-test.vcproj b/msvc/key-test/key-test.vcproj
index 0234abb1..d1e9194b 100644
--- a/msvc/key-test/key-test.vcproj
+++ b/msvc/key-test/key-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/largeiptc-test/largeiptc-test.vcproj b/msvc/largeiptc-test/largeiptc-test.vcproj
index 9e2ac96b..6e6aeb47 100644
--- a/msvc/largeiptc-test/largeiptc-test.vcproj
+++ b/msvc/largeiptc-test/largeiptc-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/libexiv2/libexiv2.vcproj b/msvc/libexiv2/libexiv2.vcproj
index ddd4c3c2..03a0817c 100644
--- a/msvc/libexiv2/libexiv2.vcproj
+++ b/msvc/libexiv2/libexiv2.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool" CommandLine=""/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -21,7 +21,7 @@
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool" CommandLine=""/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -38,7 +38,7 @@
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -55,7 +55,7 @@
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -72,7 +72,7 @@
       <Tool Name="VCFxCopTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -92,7 +92,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -112,7 +112,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -132,7 +132,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/metacopy/metacopy.vcproj b/msvc/metacopy/metacopy.vcproj
index 74da1112..781a8665 100644
--- a/msvc/metacopy/metacopy.vcproj
+++ b/msvc/metacopy/metacopy.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/mmap-test/mmap-test.vcproj b/msvc/mmap-test/mmap-test.vcproj
index ee2bfca3..8280e871 100644
--- a/msvc/mmap-test/mmap-test.vcproj
+++ b/msvc/mmap-test/mmap-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/path-test/path-test.vcproj b/msvc/path-test/path-test.vcproj
index 2d94f0d2..f4acc6f8 100644
--- a/msvc/path-test/path-test.vcproj
+++ b/msvc/path-test/path-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/prevtest/prevtest.vcproj b/msvc/prevtest/prevtest.vcproj
index 67ecbc71..b1cf0e54 100644
--- a/msvc/prevtest/prevtest.vcproj
+++ b/msvc/prevtest/prevtest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/remotetest/remotetest.vcproj b/msvc/remotetest/remotetest.vcproj
index 268b1b22..bc8a345d 100644
--- a/msvc/remotetest/remotetest.vcproj
+++ b/msvc/remotetest/remotetest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/stringto-test/stringto-test.vcproj b/msvc/stringto-test/stringto-test.vcproj
index 0d9124bd..6fade7f2 100644
--- a/msvc/stringto-test/stringto-test.vcproj
+++ b/msvc/stringto-test/stringto-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/taglist/taglist.vcproj b/msvc/taglist/taglist.vcproj
index a1ab2d34..aef7c8c4 100644
--- a/msvc/taglist/taglist.vcproj
+++ b/msvc/taglist/taglist.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/tiff-test/tiff-test.vcproj b/msvc/tiff-test/tiff-test.vcproj
index 5110b3af..95efbb95 100644
--- a/msvc/tiff-test/tiff-test.vcproj
+++ b/msvc/tiff-test/tiff-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/utiltest/utiltest.vcproj b/msvc/utiltest/utiltest.vcproj
index 6d4c6c37..2933a41b 100644
--- a/msvc/utiltest/utiltest.vcproj
+++ b/msvc/utiltest/utiltest.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/werror-test/werror-test.vcproj b/msvc/werror-test/werror-test.vcproj
index 506f5908..428bb5ca 100644
--- a/msvc/werror-test/werror-test.vcproj
+++ b/msvc/werror-test/werror-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/write-test/write-test.vcproj b/msvc/write-test/write-test.vcproj
index fdb20308..619f2bc5 100644
--- a/msvc/write-test/write-test.vcproj
+++ b/msvc/write-test/write-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/write2-test/write2-test.vcproj b/msvc/write2-test/write2-test.vcproj
index d700dfc4..be537b7d 100644
--- a/msvc/write2-test/write2-test.vcproj
+++ b/msvc/write2-test/write2-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/xmpparse/xmpparse.vcproj b/msvc/xmpparse/xmpparse.vcproj
index 2f3f7a85..79171623 100644
--- a/msvc/xmpparse/xmpparse.vcproj
+++ b/msvc/xmpparse/xmpparse.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/xmpparser-test/xmpparser-test.vcproj b/msvc/xmpparser-test/xmpparser-test.vcproj
index b8a5346c..828a2d33 100644
--- a/msvc/xmpparser-test/xmpparser-test.vcproj
+++ b/msvc/xmpparser-test/xmpparser-test.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
diff --git a/msvc/xmpsample/xmpsample.vcproj b/msvc/xmpsample/xmpsample.vcproj
index 90aaa6af..4cd107cd 100644
--- a/msvc/xmpsample/xmpsample.vcproj
+++ b/msvc/xmpsample/xmpsample.vcproj
@@ -4,7 +4,7 @@
     <Platform Name="x64"/>
   </Platforms>
   <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -24,7 +24,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -44,7 +44,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -64,7 +64,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -84,7 +84,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -104,7 +104,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -124,7 +124,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>
@@ -144,7 +144,7 @@
       <Tool Name="VCWebDeploymentTool"/>
       <Tool Name="VCPostBuildEventTool"/>
     </Configuration>
-    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2">
+    <Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
       <Tool Name="VCPreBuildEventTool"/>
       <Tool Name="VCCustomBuildTool"/>
       <Tool Name="VCXMLDataGeneratorTool"/>