Merge tag 'v2021.08' into adobe-sdk-git

75 files changed, 75 insertions, 225 deletions

diff --git a/public/include/TXMPFiles.hpp b/public/include/TXMPFiles.hpp
index 8a3cbb9..5933155 100644
--- a/public/include/TXMPFiles.hpp
+++ b/public/include/TXMPFiles.hpp
@@ -11,9 +11,7 @@
 // All Rights Reserved
 //
 // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/TXMPIterator.hpp b/public/include/TXMPIterator.hpp
index ccc8e69..6e052c3 100644
--- a/public/include/TXMPIterator.hpp
+++ b/public/include/TXMPIterator.hpp
@@ -11,9 +11,7 @@
 // All Rights Reserved
 //
 // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/TXMPMeta.hpp b/public/include/TXMPMeta.hpp
index 12a9214..e66b3a3 100644
--- a/public/include/TXMPMeta.hpp
+++ b/public/include/TXMPMeta.hpp
@@ -16,9 +16,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/TXMPUtils.hpp b/public/include/TXMPUtils.hpp
index aed1196..17c5ffb 100644
--- a/public/include/TXMPUtils.hpp
+++ b/public/include/TXMPUtils.hpp
@@ -11,9 +11,7 @@
 // All Rights Reserved
 //
 // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/XMP.hpp b/public/include/XMP.hpp
index cf543a2..8dd5ad8 100644
--- a/public/include/XMP.hpp
+++ b/public/include/XMP.hpp
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 //  ================================================================================================
diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h
index 9ee42d8..eec960d 100644
--- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h
+++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h
@@ -11,9 +11,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonFwdDeclarations.h"
diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h
index 1a9e64b..c8caa2f 100644
--- a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h
+++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonFwdDeclarations.h"
diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h
index 54b56b1..295096f 100644
--- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h
+++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h
@@ -9,9 +9,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 //
 
diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h
index c7bd606..e35dd85 100644
--- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h
+++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonFwdDeclarations.h"
diff --git a/public/include/XMPCommon/Interfaces/IConfigurationManager.h b/public/include/XMPCommon/Interfaces/IConfigurationManager.h
index 5a38baf..9bb126a 100644
--- a/public/include/XMPCommon/Interfaces/IConfigurationManager.h
+++ b/public/include/XMPCommon/Interfaces/IConfigurationManager.h
@@ -10,9 +10,7 @@
 // All Rights Reserved
 // 
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 //
 
diff --git a/public/include/XMPCommon/Interfaces/IError.h b/public/include/XMPCommon/Interfaces/IError.h
index 8df342a..e63583e 100644
--- a/public/include/XMPCommon/Interfaces/IError.h
+++ b/public/include/XMPCommon/Interfaces/IError.h
@@ -7,9 +7,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // ================================================================================================
 
 #include "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h"
diff --git a/public/include/XMPCommon/Interfaces/IErrorNotifier.h b/public/include/XMPCommon/Interfaces/IErrorNotifier.h
index 0e3520f..6faaa04 100644
--- a/public/include/XMPCommon/Interfaces/IErrorNotifier.h
+++ b/public/include/XMPCommon/Interfaces/IErrorNotifier.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonFwdDeclarations.h"
diff --git a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h
index 893604c..4b764d4 100644
--- a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h
+++ b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/Interfaces/BaseInterfaces/IVersionable.h"
diff --git a/public/include/XMPCommon/Interfaces/IObjectFactory.h b/public/include/XMPCommon/Interfaces/IObjectFactory.h
index ced1802..bc8ed39 100644
--- a/public/include/XMPCommon/Interfaces/IObjectFactory.h
+++ b/public/include/XMPCommon/Interfaces/IObjectFactory.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonFwdDeclarations.h"
diff --git a/public/include/XMPCommon/Interfaces/IUTF8String.h b/public/include/XMPCommon/Interfaces/IUTF8String.h
index 4530641..0322545 100644
--- a/public/include/XMPCommon/Interfaces/IUTF8String.h
+++ b/public/include/XMPCommon/Interfaces/IUTF8String.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h"
diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions.h b/public/include/XMPCommon/Utilities/TWrapperFunctions.h
index 43f8612..8c5e4c8 100644
--- a/public/include/XMPCommon/Utilities/TWrapperFunctions.h
+++ b/public/include/XMPCommon/Utilities/TWrapperFunctions.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/Interfaces/IError.h"
diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h
index 06ec99c..a6ae200 100644
--- a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h
+++ b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 //! \cond XMP_INTERNAL_DOCUMENTATION
diff --git a/public/include/XMPCommon/XMPCommonDefines.h b/public/include/XMPCommon/XMPCommonDefines.h
index 823f1b4..7012a67 100644
--- a/public/include/XMPCommon/XMPCommonDefines.h
+++ b/public/include/XMPCommon/XMPCommonDefines.h
@@ -5,9 +5,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/XMPCommon/XMPCommonErrorCodes.h b/public/include/XMPCommon/XMPCommonErrorCodes.h
index e1d41b9..8a8f886 100644
--- a/public/include/XMPCommon/XMPCommonErrorCodes.h
+++ b/public/include/XMPCommon/XMPCommonErrorCodes.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonDefines.h"
diff --git a/public/include/XMPCommon/XMPCommonFwdDeclarations.h b/public/include/XMPCommon/XMPCommonFwdDeclarations.h
index a39f0c3..9bd8cac 100644
--- a/public/include/XMPCommon/XMPCommonFwdDeclarations.h
+++ b/public/include/XMPCommon/XMPCommonFwdDeclarations.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/XMPCommonDefines.h"
diff --git a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h
index 6264144..76e7040 100644
--- a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h
+++ b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 //!
diff --git a/public/include/XMPCommon/source/IConfigurable.cpp b/public/include/XMPCommon/source/IConfigurable.cpp
index 6d932b5..47867e3 100644
--- a/public/include/XMPCommon/source/IConfigurable.cpp
+++ b/public/include/XMPCommon/source/IConfigurable.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h"
diff --git a/public/include/XMPCommon/source/IConfigurationManager.cpp b/public/include/XMPCommon/source/IConfigurationManager.cpp
index edafeb3..d529d58 100644
--- a/public/include/XMPCommon/source/IConfigurationManager.cpp
+++ b/public/include/XMPCommon/source/IConfigurationManager.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #define FRIEND_CLASS_DECLARATION() friend class IConfigurationManagerProxy;
diff --git a/public/include/XMPCommon/source/IError.cpp b/public/include/XMPCommon/source/IError.cpp
index 68e425d..e9158ff 100644
--- a/public/include/XMPCommon/source/IError.cpp
+++ b/public/include/XMPCommon/source/IError.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #define FRIEND_CLASS_DECLARATION() friend class IErrorProxy;
diff --git a/public/include/XMPCommon/source/IErrorNotifier.cpp b/public/include/XMPCommon/source/IErrorNotifier.cpp
index abd8867..7a3d251 100644
--- a/public/include/XMPCommon/source/IErrorNotifier.cpp
+++ b/public/include/XMPCommon/source/IErrorNotifier.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCommon/Interfaces/IErrorNotifier.h"
diff --git a/public/include/XMPCommon/source/IUTF8String.cpp b/public/include/XMPCommon/source/IUTF8String.cpp
index 0aace28..c5d4ee9 100644
--- a/public/include/XMPCommon/source/IUTF8String.cpp
+++ b/public/include/XMPCommon/source/IUTF8String.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #define FRIEND_CLASS_DECLARATION() friend class IUTF8StringProxy;
diff --git a/public/include/XMPCore/Interfaces/IArrayNode.h b/public/include/XMPCore/Interfaces/IArrayNode.h
index f340e68..987ee78 100644
--- a/public/include/XMPCore/Interfaces/IArrayNode.h
+++ b/public/include/XMPCore/Interfaces/IArrayNode.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 
diff --git a/public/include/XMPCore/Interfaces/IClientDOMParser.h b/public/include/XMPCore/Interfaces/IClientDOMParser.h
index dc67641..13b9b13 100644
--- a/public/include/XMPCore/Interfaces/IClientDOMParser.h
+++ b/public/include/XMPCore/Interfaces/IClientDOMParser.h
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h
index 49219c0..23fe72c 100644
--- a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h
+++ b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/ICompositeNode.h b/public/include/XMPCore/Interfaces/ICompositeNode.h
index 67c0205..2423617 100644
--- a/public/include/XMPCore/Interfaces/ICompositeNode.h
+++ b/public/include/XMPCore/Interfaces/ICompositeNode.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/INode.h"
diff --git a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h
index b75d9bc..bd75226 100644
--- a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h
+++ b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h
index cdd0602..9783d84 100644
--- a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h
+++ b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h
index be084f7..c2df16c 100644
--- a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h
+++ b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IDOMParser.h b/public/include/XMPCore/Interfaces/IDOMParser.h
index a852791..6094a5b 100644
--- a/public/include/XMPCore/Interfaces/IDOMParser.h
+++ b/public/include/XMPCore/Interfaces/IDOMParser.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IDOMSerializer.h b/public/include/XMPCore/Interfaces/IDOMSerializer.h
index bea92cd..34b5fbd 100644
--- a/public/include/XMPCore/Interfaces/IDOMSerializer.h
+++ b/public/include/XMPCore/Interfaces/IDOMSerializer.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IMetadata.h b/public/include/XMPCore/Interfaces/IMetadata.h
index 6ce098f..5b12bfe 100644
--- a/public/include/XMPCore/Interfaces/IMetadata.h
+++ b/public/include/XMPCore/Interfaces/IMetadata.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/IStructureNode.h"
diff --git a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h
index acfc559..5ca132b 100644
--- a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h
+++ b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 #include <string>
 #define TXMP_STRING_TYPE std::string
diff --git a/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h b/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h
index fe4651e..24b5da1 100644
--- a/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h
+++ b/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/INode.h b/public/include/XMPCore/Interfaces/INode.h
index 516a944..d11a7c6 100644
--- a/public/include/XMPCore/Interfaces/INode.h
+++ b/public/include/XMPCore/Interfaces/INode.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/INodeIterator.h b/public/include/XMPCore/Interfaces/INodeIterator.h
index 10c60d8..01b7d72 100644
--- a/public/include/XMPCore/Interfaces/INodeIterator.h
+++ b/public/include/XMPCore/Interfaces/INodeIterator.h
@@ -8,9 +8,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IPath.h b/public/include/XMPCore/Interfaces/IPath.h
index 774bc46..d522cde 100644
--- a/public/include/XMPCore/Interfaces/IPath.h
+++ b/public/include/XMPCore/Interfaces/IPath.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/IPathSegment.h b/public/include/XMPCore/Interfaces/IPathSegment.h
index 5cd0591..14f8f03 100644
--- a/public/include/XMPCore/Interfaces/IPathSegment.h
+++ b/public/include/XMPCore/Interfaces/IPathSegment.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreFwdDeclarations.h"
diff --git a/public/include/XMPCore/Interfaces/ISimpleNode.h b/public/include/XMPCore/Interfaces/ISimpleNode.h
index 6bc731e..25fad4a 100644
--- a/public/include/XMPCore/Interfaces/ISimpleNode.h
+++ b/public/include/XMPCore/Interfaces/ISimpleNode.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/INode.h"
diff --git a/public/include/XMPCore/Interfaces/IStructureNode.h b/public/include/XMPCore/Interfaces/IStructureNode.h
index 47ebd4d..72f4a9e 100644
--- a/public/include/XMPCore/Interfaces/IStructureNode.h
+++ b/public/include/XMPCore/Interfaces/IStructureNode.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/ICompositeNode.h"
diff --git a/public/include/XMPCore/XMPCoreDefines.h b/public/include/XMPCore/XMPCoreDefines.h
index 00c22a4..5af5be9 100644
--- a/public/include/XMPCore/XMPCoreDefines.h
+++ b/public/include/XMPCore/XMPCoreDefines.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/XMPCore/XMPCoreErrorCodes.h b/public/include/XMPCore/XMPCoreErrorCodes.h
index 2ea8f22..80d4632 100644
--- a/public/include/XMPCore/XMPCoreErrorCodes.h
+++ b/public/include/XMPCore/XMPCoreErrorCodes.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/XMPCoreDefines.h"
diff --git a/public/include/XMPCore/XMPCoreFwdDeclarations.h b/public/include/XMPCore/XMPCoreFwdDeclarations.h
index 90a326f..78284ff 100644
--- a/public/include/XMPCore/XMPCoreFwdDeclarations.h
+++ b/public/include/XMPCore/XMPCoreFwdDeclarations.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 
diff --git a/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h
index d00d602..ece560e 100644
--- a/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h
+++ b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 //!
diff --git a/public/include/XMPCore/source/IArrayNode.cpp b/public/include/XMPCore/source/IArrayNode.cpp
index 46a719a..dda3cc3 100644
--- a/public/include/XMPCore/source/IArrayNode.cpp
+++ b/public/include/XMPCore/source/IArrayNode.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IClientDOMParser.cpp b/public/include/XMPCore/source/IClientDOMParser.cpp
index deac0d1..c8afab7 100644
--- a/public/include/XMPCore/source/IClientDOMParser.cpp
+++ b/public/include/XMPCore/source/IClientDOMParser.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/IClientDOMParser.h"
diff --git a/public/include/XMPCore/source/IClientDOMSerializer.cpp b/public/include/XMPCore/source/IClientDOMSerializer.cpp
index 769e90a..0069ad1 100644
--- a/public/include/XMPCore/source/IClientDOMSerializer.cpp
+++ b/public/include/XMPCore/source/IClientDOMSerializer.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/IClientDOMSerializer.h"
diff --git a/public/include/XMPCore/source/ICompositeNode.cpp b/public/include/XMPCore/source/ICompositeNode.cpp
index d11c2a8..7f95491 100644
--- a/public/include/XMPCore/source/ICompositeNode.cpp
+++ b/public/include/XMPCore/source/ICompositeNode.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/ICoreConfigurationManager.cpp b/public/include/XMPCore/source/ICoreConfigurationManager.cpp
index a61d8de..b6254ac 100644
--- a/public/include/XMPCore/source/ICoreConfigurationManager.cpp
+++ b/public/include/XMPCore/source/ICoreConfigurationManager.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/ICoreObjectFactory.cpp b/public/include/XMPCore/source/ICoreObjectFactory.cpp
index 95b372f..2b98ff5 100644
--- a/public/include/XMPCore/source/ICoreObjectFactory.cpp
+++ b/public/include/XMPCore/source/ICoreObjectFactory.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMPCore/Interfaces/ICoreObjectFactory.h"
diff --git a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp
index 9fc436c..e52ae0f 100644
--- a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp
+++ b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IDOMParser.cpp b/public/include/XMPCore/source/IDOMParser.cpp
index 78f4c36..8351250 100644
--- a/public/include/XMPCore/source/IDOMParser.cpp
+++ b/public/include/XMPCore/source/IDOMParser.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IDOMSerializer.cpp b/public/include/XMPCore/source/IDOMSerializer.cpp
index f76161a..b960f06 100644
--- a/public/include/XMPCore/source/IDOMSerializer.cpp
+++ b/public/include/XMPCore/source/IDOMSerializer.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IMetadata.cpp b/public/include/XMPCore/source/IMetadata.cpp
index 83e9cd7..8f9f8b3 100644
--- a/public/include/XMPCore/source/IMetadata.cpp
+++ b/public/include/XMPCore/source/IMetadata.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IMetadataConverterUtils.cpp b/public/include/XMPCore/source/IMetadataConverterUtils.cpp
index 5c98715..433cc43 100644
--- a/public/include/XMPCore/source/IMetadataConverterUtils.cpp
+++ b/public/include/XMPCore/source/IMetadataConverterUtils.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/INameSpacePrefixMap.cpp b/public/include/XMPCore/source/INameSpacePrefixMap.cpp
index 59db914..6489073 100644
--- a/public/include/XMPCore/source/INameSpacePrefixMap.cpp
+++ b/public/include/XMPCore/source/INameSpacePrefixMap.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/INode.cpp b/public/include/XMPCore/source/INode.cpp
index 114d2ee..cc71ad6 100644
--- a/public/include/XMPCore/source/INode.cpp
+++ b/public/include/XMPCore/source/INode.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/INodeIterator.cpp b/public/include/XMPCore/source/INodeIterator.cpp
index 6cae09e..0bb6b97 100644
--- a/public/include/XMPCore/source/INodeIterator.cpp
+++ b/public/include/XMPCore/source/INodeIterator.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IPath.cpp b/public/include/XMPCore/source/IPath.cpp
index ed42b82..b11d7f0 100644
--- a/public/include/XMPCore/source/IPath.cpp
+++ b/public/include/XMPCore/source/IPath.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IPathSegment.cpp b/public/include/XMPCore/source/IPathSegment.cpp
index c6b89f9..abff209 100644
--- a/public/include/XMPCore/source/IPathSegment.cpp
+++ b/public/include/XMPCore/source/IPathSegment.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/ISimpleNode.cpp b/public/include/XMPCore/source/ISimpleNode.cpp
index 81bf3b7..de013d2 100644
--- a/public/include/XMPCore/source/ISimpleNode.cpp
+++ b/public/include/XMPCore/source/ISimpleNode.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMPCore/source/IStructureNode.cpp b/public/include/XMPCore/source/IStructureNode.cpp
index 0869001..50b4fdc 100644
--- a/public/include/XMPCore/source/IStructureNode.cpp
+++ b/public/include/XMPCore/source/IStructureNode.cpp
@@ -4,9 +4,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 namespace AdobeXMPCore {
diff --git a/public/include/XMP_Const.h b/public/include/XMP_Const.h
index 2e60bb9..21230a0 100644
--- a/public/include/XMP_Const.h
+++ b/public/include/XMP_Const.h
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMP_Environment.h"
diff --git a/public/include/XMP_Environment.h b/public/include/XMP_Environment.h
index a635cc6..3be35bc 100644
--- a/public/include/XMP_Environment.h
+++ b/public/include/XMP_Environment.h
@@ -15,9 +15,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // =================================================================================================
diff --git a/public/include/XMP_IO.hpp b/public/include/XMP_IO.hpp
index 5dcfd76..d0a7c17 100644
--- a/public/include/XMP_IO.hpp
+++ b/public/include/XMP_IO.hpp
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "XMP_Environment.h"	// ! XMP_Environment.h must be the first included header.
diff --git a/public/include/XMP_Version.h b/public/include/XMP_Version.h
index 622658a..501ed20 100644
--- a/public/include/XMP_Version.h
+++ b/public/include/XMP_Version.h
@@ -11,9 +11,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 */
 
diff --git a/public/include/client-glue/WXMPFiles.hpp b/public/include/client-glue/WXMPFiles.hpp
index 4575e48..c23ca62 100644
--- a/public/include/client-glue/WXMPFiles.hpp
+++ b/public/include/client-glue/WXMPFiles.hpp
@@ -7,9 +7,7 @@
 // All Rights Reserved
 //
 // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "client-glue/WXMP_Common.hpp"
diff --git a/public/include/client-glue/WXMPIterator.hpp b/public/include/client-glue/WXMPIterator.hpp
index b0e7624..ea8e619 100644
--- a/public/include/client-glue/WXMPIterator.hpp
+++ b/public/include/client-glue/WXMPIterator.hpp
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "client-glue/WXMP_Common.hpp"
diff --git a/public/include/client-glue/WXMPMeta.hpp b/public/include/client-glue/WXMPMeta.hpp
index f507bd7..fa474aa 100644
--- a/public/include/client-glue/WXMPMeta.hpp
+++ b/public/include/client-glue/WXMPMeta.hpp
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "client-glue/WXMP_Common.hpp"
diff --git a/public/include/client-glue/WXMPUtils.hpp b/public/include/client-glue/WXMPUtils.hpp
index 34db833..a3c3463 100644
--- a/public/include/client-glue/WXMPUtils.hpp
+++ b/public/include/client-glue/WXMPUtils.hpp
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "client-glue/WXMP_Common.hpp"
diff --git a/public/include/client-glue/WXMP_Common.hpp b/public/include/client-glue/WXMP_Common.hpp
index da48ad5..79bf322 100644
--- a/public/include/client-glue/WXMP_Common.hpp
+++ b/public/include/client-glue/WXMP_Common.hpp
@@ -6,9 +6,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #ifndef XMP_Inline