Fix the "local" header includes to <global> in public(?) headers