#1121 Fixes to msvc/*.vcproj to support VS2017 RC!

9 years ago · c7cc1138b4
parent 1a0095ff4a
commit c7cc1138b4
49 changed files with 3111 additions and 3111 deletions
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/conntest/conntest.vcproj
+++ b/msvc/conntest/conntest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/convert-test/convert-test.vcproj
+++ b/msvc/convert-test/convert-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/easyaccess-test/easyaccess-test.vcproj
+++ b/msvc/easyaccess-test/easyaccess-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exifcomment/exifcomment.vcproj
+++ b/msvc/exifcomment/exifcomment.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exifdata-test/exifdata-test.vcproj
+++ b/msvc/exifdata-test/exifdata-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exifdata/exifdata.vcproj
+++ b/msvc/exifdata/exifdata.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/exifprint/exifprint.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exifvalue/exifvalue.vcproj
+++ b/msvc/exifvalue/exifvalue.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/exiv2json/exiv2json.vcproj
+++ b/msvc/exiv2json/exiv2json.vcproj
@ -173,13 +173,13 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
      <File RelativePath="..\..\samples\Jzon.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/geotag/geotag.vcproj
+++ b/msvc/geotag/geotag.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/httptest/httptest.vcproj
+++ b/msvc/httptest/httptest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/iotest/iotest.vcproj
+++ b/msvc/iotest/iotest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/iptceasy/iptceasy.vcproj
+++ b/msvc/iptceasy/iptceasy.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/iptcprint/iptcprint.vcproj
+++ b/msvc/iptcprint/iptcprint.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/iptctest/iptctest.vcproj
+++ b/msvc/iptctest/iptctest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/key-test/key-test.vcproj
+++ b/msvc/key-test/key-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/largeiptc-test/largeiptc-test.vcproj
+++ b/msvc/largeiptc-test/largeiptc-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/metacopy/metacopy.vcproj
+++ b/msvc/metacopy/metacopy.vcproj
@ -172,11 +172,11 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
--- a/msvc/mmap-test/mmap-test.vcproj
+++ b/msvc/mmap-test/mmap-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/path-test/path-test.vcproj
+++ b/msvc/path-test/path-test.vcproj
@ -172,11 +172,11 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
--- a/msvc/prevtest/prevtest.vcproj
+++ b/msvc/prevtest/prevtest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/remotetest/remotetest.vcproj
+++ b/msvc/remotetest/remotetest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/stringto-test/stringto-test.vcproj
+++ b/msvc/stringto-test/stringto-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/taglist/taglist.vcproj
+++ b/msvc/taglist/taglist.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/tiff-test/tiff-test.vcproj
+++ b/msvc/tiff-test/tiff-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utils.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/utiltest/utiltest.vcproj
+++ b/msvc/utiltest/utiltest.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\src\utiltest.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/werror-test/werror-test.vcproj
+++ b/msvc/werror-test/werror-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\werror-test.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/write-test/write-test.vcproj
+++ b/msvc/write-test/write-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\write-test.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/write2-test/write2-test.vcproj
+++ b/msvc/write2-test/write2-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\write2-test.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/xmpparse/xmpparse.vcproj
+++ b/msvc/xmpparse/xmpparse.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\xmpparse.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/xmpparser-test/xmpparser-test.vcproj
+++ b/msvc/xmpparser-test/xmpparser-test.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\xmpparser-test.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>
--- a/msvc/xmpsample/xmpsample.vcproj
+++ b/msvc/xmpsample/xmpsample.vcproj
@ -172,12 +172,12 @@
      <File RelativePath="..\..\samples\xmpsample.cpp"/>
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\include\exiv2\actions.hpp"/>
-      <File RelativePath="..\..\include\exiv2\getopt_win32.h"/>
-      <File RelativePath="..\..\include\exiv2\private.h"/>
-      <File RelativePath="..\..\include\exiv2\timegm.h"/>
-      <File RelativePath="..\..\include\exiv2\tzfile.h"/>
-      <File RelativePath="..\..\include\exiv2\utils.hpp"/>
+      <File RelativePath="..\..\src\actions.hpp"/>
+      <File RelativePath="..\..\src\getopt_win32.h"/>
+      <File RelativePath="..\..\src\private.h"/>
+      <File RelativePath="..\..\src\timegm.h"/>
+      <File RelativePath="..\..\src\tzfile.h"/>
+      <File RelativePath="..\..\src\utils.hpp"/>
    </Filter>
    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/>
  </Files>