diff --git a/Makefile b/Makefile
index bd84f22e..a6f7e58f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@
 ########################################################################
 
 SHELL = /bin/sh
-ENABLE_XMP = 1
+ENABLE_XMP = 
 
 .PHONY: all doc config samples xmpsdk                \
         mostlyclean clean distclean maintainer-clean \
diff --git a/msvc/addmoddel/addmoddel.vcproj b/msvc/addmoddel/addmoddel.vcproj
index 40a920f2..a1f22d1a 100644
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\addmoddel.cpp">
+				RelativePath="..\..\samples\addmoddel.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/crwparse/crwparse.vcproj b/msvc/crwparse/crwparse.vcproj
index 5dc828bc..07646e7c 100644
--- a/msvc/crwparse/crwparse.vcproj
+++ b/msvc/crwparse/crwparse.vcproj
@@ -114,7 +114,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\crwparse.cpp">
+				RelativePath="..\..\samples\crwparse.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/exifcomment/exifcomment.vcproj b/msvc/exifcomment/exifcomment.vcproj
index 9f74bd2d..5a6750c1 100644
--- a/msvc/exifcomment/exifcomment.vcproj
+++ b/msvc/exifcomment/exifcomment.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\exifcomment.cpp">
+				RelativePath="..\..\samples\exifcomment.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/exifdata-test/exifdata-test.vcproj b/msvc/exifdata-test/exifdata-test.vcproj
index 9fb234af..2be5a73a 100644
--- a/msvc/exifdata-test/exifdata-test.vcproj
+++ b/msvc/exifdata-test/exifdata-test.vcproj
@@ -114,7 +114,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\exifdata-test.cpp">
+				RelativePath="..\..\samples\exifdata-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/exifprint/exifprint.vcproj
index 268c6e1d..78b573ac 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/exifprint/exifprint.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\exifprint.cpp">
+				RelativePath="..\..\samples\exifprint.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 8bde9827..849f170d 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -313,6 +313,9 @@
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\pentaxmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\rafimage.cpp">
 			</File>
@@ -546,6 +549,9 @@
 			<File
 				RelativePath="..\..\src\panasonicmn.hpp">
 			</File>
+			<File
+				RelativePath="..\..\src\pentaxmn.hpp">
+			</File>
 			<File
 				RelativePath="..\..\src\properties.hpp">
 			</File>
diff --git a/msvc/ifd-test/ifd-test.vcproj b/msvc/ifd-test/ifd-test.vcproj
index 529c413e..bdea77d0 100644
--- a/msvc/ifd-test/ifd-test.vcproj
+++ b/msvc/ifd-test/ifd-test.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\ifd-test.cpp">
+				RelativePath="..\..\samples\ifd-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/iotest/iotest.vcproj b/msvc/iotest/iotest.vcproj
index 568a0f54..61cb4f05 100644
--- a/msvc/iotest/iotest.vcproj
+++ b/msvc/iotest/iotest.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\iotest.cpp">
+				RelativePath="..\..\samples\iotest.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/iptceasy/iptceasy.vcproj b/msvc/iptceasy/iptceasy.vcproj
index 9a93220d..b5e3da00 100644
--- a/msvc/iptceasy/iptceasy.vcproj
+++ b/msvc/iptceasy/iptceasy.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\iptceasy.cpp">
+				RelativePath="..\..\samples\iptceasy.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/iptcprint/iptcprint.vcproj b/msvc/iptcprint/iptcprint.vcproj
index 61fe7ed6..66d5ead9 100644
--- a/msvc/iptcprint/iptcprint.vcproj
+++ b/msvc/iptcprint/iptcprint.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\iptcprint.cpp">
+				RelativePath="..\..\samples\iptcprint.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/iptctest/iptctest.vcproj b/msvc/iptctest/iptctest.vcproj
index 106f9fd6..d08b333a 100644
--- a/msvc/iptctest/iptctest.vcproj
+++ b/msvc/iptctest/iptctest.vcproj
@@ -123,7 +123,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\iptctest.cpp">
+				RelativePath="..\..\samples\iptctest.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/largeiptc-test/largeiptc-test.vcproj b/msvc/largeiptc-test/largeiptc-test.vcproj
index c355a311..0828ce0d 100644
--- a/msvc/largeiptc-test/largeiptc-test.vcproj
+++ b/msvc/largeiptc-test/largeiptc-test.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\largeiptc-test.cpp">
+				RelativePath="..\..\samples\largeiptc-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/makernote-test/makernote-test.vcproj b/msvc/makernote-test/makernote-test.vcproj
index 78543b98..6ac80f1e 100644
--- a/msvc/makernote-test/makernote-test.vcproj
+++ b/msvc/makernote-test/makernote-test.vcproj
@@ -122,7 +122,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\makernote-test.cpp">
+				RelativePath="..\..\samples\makernote-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/write-test/write-test.vcproj b/msvc/write-test/write-test.vcproj
index 81827f4b..68bf3440 100644
--- a/msvc/write-test/write-test.vcproj
+++ b/msvc/write-test/write-test.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\write-test.cpp">
+				RelativePath="..\..\samples\write-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/write2-test/write2-test.vcproj b/msvc/write2-test/write2-test.vcproj
index 03bc97fb..2109a2fc 100644
--- a/msvc/write2-test/write2-test.vcproj
+++ b/msvc/write2-test/write2-test.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\write2-test.cpp">
+				RelativePath="..\..\samples\write2-test.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/src/taglist.cpp b/src/taglist.cpp
index 0032244d..23ec87aa 100644
--- a/src/taglist.cpp
+++ b/src/taglist.cpp
@@ -47,7 +47,7 @@ try {
         try {
             XmpProperties::printProperties(std::cout, item);
         }
-        catch(const AnyError& e) {
+        catch(const AnyError&) {
             rc = 2;
         }
 
diff --git a/src/xmp.cpp b/src/xmp.cpp
index b04ddbc5..b922a988 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -381,17 +381,20 @@ namespace Exiv2 {
 
     bool XmpParser::registerNs(const std::string& ns, 
                                const std::string& prefix)
-    { try {
-        initialize();
+    {
 #ifdef EXV_HAVE_XMP_TOOLKIT
-        return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
+        try {
+            initialize();
+            return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
+        }
+        catch (const XMP_Error& e) {
+            throw Error(40, e.GetID(), e.GetErrMsg());
+        }
 #else
+        initialize();
         return true;
 #endif
-    }
-    catch (const XMP_Error& e) {
-        throw Error(40, e.GetID(), e.GetErrMsg());
-    }} // XmpParser::registerNs
+	} // XmpParser::registerNs
 
 #ifdef EXV_HAVE_XMP_TOOLKIT
     int XmpParser::decode(      XmpData&     xmpData,