diff --git a/src/convert.cpp b/src/convert.cpp
index b24078b9..f33edab6 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
 # define TXMP_STRING_TYPE std::string
-# include <XMP.hpp>
+# include <XMPSDK.hpp>
 # include <MD5.h>
 #endif // EXV_HAVE_XMP_TOOLKIT
 
diff --git a/src/xmp.cpp b/src/xmp.cpp
index c77d2e4a..8d55c2c6 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
 # define TXMP_STRING_TYPE std::string
-# include <XMP.hpp>
+# include <XMPSDK.hpp>
 # include <XMP.incl_cpp>
 #endif // EXV_HAVE_XMP_TOOLKIT
 
diff --git a/xmpsdk/include/TXMPIterator.hpp b/xmpsdk/include/TXMPIterator.hpp
index 26bb141f..2fbd9501 100644
--- a/xmpsdk/include/TXMPIterator.hpp
+++ b/xmpsdk/include/TXMPIterator.hpp
@@ -2,7 +2,7 @@
 #define __TXMPIterator_hpp__ 1
 
 #if ( ! __XMP_hpp__ )
-    #error "Do not directly include, use XMP.hpp"
+    #error "Do not directly include, use XMPSDK.hpp"
 #endif
 
 // =================================================================================================
@@ -37,7 +37,7 @@
 /// are automatically copied and access is fully thread safe.  String objects are only necessary
 /// for output strings. Input string are literals and passed as typical C <tt>const char *</tt>.
 ///
-/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
+/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
 ///
 /// \note Only XMP object iteration is implemented at this time. There are no table iterators yet.
 ///
diff --git a/xmpsdk/include/TXMPMeta.hpp b/xmpsdk/include/TXMPMeta.hpp
index ef1a5fcc..e0b1c817 100644
--- a/xmpsdk/include/TXMPMeta.hpp
+++ b/xmpsdk/include/TXMPMeta.hpp
@@ -2,7 +2,7 @@
 #define __TXMPMeta_hpp__    1
 
 #if ( ! __XMP_hpp__ )
-    #error "Do not directly include, use XMP.hpp"
+    #error "Do not directly include, use XMPSDK.hpp"
 #endif
 
 // =================================================================================================
@@ -33,11 +33,11 @@
 ///
 /// This template wraps a string object class around the raw XMP API. This provides two significant
 /// benefits, output strings are automatically copied and access is fully thread safe. The
-/// umbrella header, \c XMP.hpp, provides an \c SXMPMeta typedef for the instantiated template. String
+/// umbrella header, \c XMPSDK.hpp, provides an \c SXMPMeta typedef for the instantiated template. String
 /// objects are only necessary for output strings. Input string are literals and passed as typical
 /// C <tt>const char *</tt>.
 ///
-/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
+/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
 ///
 /// <b>Be aware that the \c TXMPMeta class is a normal C++ template, it is instantiated and local to
 /// each client executable. As are the other TXMP* classes. Different clients might not even use the
diff --git a/xmpsdk/include/TXMPUtils.hpp b/xmpsdk/include/TXMPUtils.hpp
index 95cdc9cc..c3143b83 100644
--- a/xmpsdk/include/TXMPUtils.hpp
+++ b/xmpsdk/include/TXMPUtils.hpp
@@ -2,7 +2,7 @@
 #define __TXMPUtils_hpp__ 1
 
 #if ( ! __XMP_hpp__ )
-    #error "Do not directly include, use XMP.hpp"
+    #error "Do not directly include, use XMPSDK.hpp"
 #endif
 
 // =================================================================================================
@@ -37,7 +37,7 @@
 /// copied and access is fully thread safe.  String objects are only necessary for output strings.
 /// Input strings are literals and passed as typical C <tt>const char *</tt>.
 ///
-/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
+/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
 //  ================================================================================================
 
 template <class tStringObj>
diff --git a/xmpsdk/include/XMP.incl_cpp b/xmpsdk/include/XMP.incl_cpp
index 037a361c..417eac7a 100644
--- a/xmpsdk/include/XMP.incl_cpp
+++ b/xmpsdk/include/XMP.incl_cpp
@@ -28,7 +28,7 @@
 /// \endcode
 
 
-#include "XMP.hpp" // ! This must be the first include!
+#include "XMPSDK.hpp" // ! This must be the first include!
 
 #define XMP_ClientBuild 1
 
diff --git a/xmpsdk/include/XMP.hpp b/xmpsdk/include/XMPSDK.hpp
similarity index 99%
rename from xmpsdk/include/XMP.hpp
rename to xmpsdk/include/XMPSDK.hpp
index 25d65a90..36ccd3b0 100644
--- a/xmpsdk/include/XMP.hpp
+++ b/xmpsdk/include/XMPSDK.hpp
@@ -10,7 +10,7 @@
 // =================================================================================================
 
 //  ================================================================================================
-/// \file XMP.hpp
+/// \file XMPSDK.hpp
 /// \brief Overall header file for the XMP toolkit.
 ///
 /// This is an overall header file, the only one that C++ clients should #include. The full client
diff --git a/xmpsdk/include/client-glue/TXMPIterator.incl_cpp b/xmpsdk/include/client-glue/TXMPIterator.incl_cpp
index 318fa66b..672203e2 100644
--- a/xmpsdk/include/client-glue/TXMPIterator.incl_cpp
+++ b/xmpsdk/include/client-glue/TXMPIterator.incl_cpp
@@ -11,7 +11,7 @@
 /// \file TXMPIterator.incl_cpp
 /// \brief The implementation of the TXMPIterator template class.
 
-#include "XMP.hpp"
+#include "XMPSDK.hpp"
 #include "client-glue/WXMP_Common.hpp"
 #include "client-glue/WXMPIterator.hpp"
 
diff --git a/xmpsdk/include/client-glue/TXMPMeta.incl_cpp b/xmpsdk/include/client-glue/TXMPMeta.incl_cpp
index 60bd8e79..00692d3f 100644
--- a/xmpsdk/include/client-glue/TXMPMeta.incl_cpp
+++ b/xmpsdk/include/client-glue/TXMPMeta.incl_cpp
@@ -11,7 +11,7 @@
 /// \file TXMPMeta.incl_cpp
 /// \brief The implementation of the TXMPMeta template class.
 
-#include "XMP.hpp"
+#include "XMPSDK.hpp"
 #include "client-glue/WXMP_Common.hpp"
 #include "client-glue/WXMPMeta.hpp"
 
diff --git a/xmpsdk/include/client-glue/TXMPUtils.incl_cpp b/xmpsdk/include/client-glue/TXMPUtils.incl_cpp
index 761ac4ef..0bcbdc32 100644
--- a/xmpsdk/include/client-glue/TXMPUtils.incl_cpp
+++ b/xmpsdk/include/client-glue/TXMPUtils.incl_cpp
@@ -11,7 +11,7 @@
 /// \file TXMPUtils.incl_cpp
 /// \brief The implementation of the TXMPUtils template class.
 
-#include "XMP.hpp"
+#include "XMPSDK.hpp"
 #include "client-glue/WXMP_Common.hpp"
 #include "client-glue/WXMPUtils.hpp"