Remove dependence on C11