cherry-pick a fix for sockin
cherry-pick IOC macros in rumpdefs