Moved them out to a separate file in the library which can be cleanly included from both places for transparent happiness. A fresh rebuild & test of UtfNormal data via 'make test' now works fine.