start moving headers to version-mangled namespaces