Merge "Move XMP* classes to includes/libs"