WIP: xlink:href needs xlink:type

Change-Id: Ide0fc9331a62c1ddb1f7fe9aaee8a27ed35af8e7