De-merge portions of stdinc which remain in coreux/include.