Update includes
Add sort_func type