r18963: * Move parts of registry headers that were still in