Attached is a patch to remove 'register' from the mainline Emacs source code. This is broken out of Bug#11604 and I will also follow up there.