Updated Shim.System headers