fix various includes for elliptic functions