diff --git a/acb.h b/acb.h
index 3b276994..5effd861 100644
--- a/acb.h
+++ b/acb.h
@@ -69,9 +69,9 @@ acb_clear(acb_t x)
 }
 
 ACB_INLINE acb_ptr
-_acb_vec_init(long n)
+_acb_vec_init(slong n)
 {
-    long i;
+    slong i;
     acb_ptr v = (acb_ptr) flint_malloc(sizeof(acb_struct) * n);
 
     for (i = 0; i < n; i++)
@@ -81,9 +81,9 @@ _acb_vec_init(long n)
 }
 
 ACB_INLINE void
-_acb_vec_clear(acb_ptr v, long n)
+_acb_vec_clear(acb_ptr v, slong n)
 {
-    long i;
+    slong i;
     for (i = 0; i < n; i++)
         acb_clear(v + i);
     flint_free(v);
@@ -157,14 +157,14 @@ acb_set(acb_t z, const acb_t x)
 }
 
 ACB_INLINE void
-acb_set_round(acb_t z, const acb_t x, long prec)
+acb_set_round(acb_t z, const acb_t x, slong prec)
 {
     arb_set_round(acb_realref(z), acb_realref(x), prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_neg_round(acb_t z, const acb_t x, long prec)
+acb_neg_round(acb_t z, const acb_t x, slong prec)
 {
     arb_neg_round(acb_realref(z), acb_realref(x), prec);
     arb_neg_round(acb_imagref(z), acb_imagref(x), prec);
@@ -248,14 +248,14 @@ acb_set_d(acb_t z, double c)
 }
 
 ACB_INLINE void
-acb_set_si(acb_t z, long c)
+acb_set_si(acb_t z, slong c)
 {
     arb_set_si(acb_realref(z), c);
     arb_zero(acb_imagref(z));
 }
 
 ACB_INLINE void
-acb_set_si_si(acb_t z, long x, long y)
+acb_set_si_si(acb_t z, slong x, slong y)
 {
     arb_set_si(acb_realref(z), x);
     arb_set_si(acb_imagref(z), y);
@@ -283,7 +283,7 @@ acb_set_fmpz_fmpz(acb_t z, const fmpz_t x, const fmpz_t y)
 }
 
 ACB_INLINE void
-acb_set_round_fmpz(acb_t z, const fmpz_t y, long prec)
+acb_set_round_fmpz(acb_t z, const fmpz_t y, slong prec)
 {
     arb_set_round_fmpz(acb_realref(z), y, prec);
     arb_zero(acb_imagref(z));
@@ -294,7 +294,7 @@ int acb_contains_int(const acb_t x);
 int acb_get_unique_fmpz(fmpz_t z, const acb_t x);
 
 ACB_INLINE void
-acb_set_fmpq(acb_t z, const fmpq_t c, long prec)
+acb_set_fmpq(acb_t z, const fmpq_t c, slong prec)
 {
     arb_set_fmpq(acb_realref(z), c, prec);
     arb_zero(acb_imagref(z));
@@ -315,7 +315,7 @@ acb_set_arb_arb(acb_t z, const arb_t x, const arb_t y)
 }
 
 ACB_INLINE void
-acb_set_round_arb(acb_t z, const arb_t x, long prec)
+acb_set_round_arb(acb_t z, const arb_t x, slong prec)
 {
     arb_set_round(acb_realref(z), x, prec);
     arb_zero(acb_imagref(z));
@@ -347,7 +347,7 @@ void acb_get_mag(mag_t z, const acb_t x);
 void acb_get_mag_lower(mag_t z, const acb_t x);
 
 ACB_INLINE void
-acb_get_abs_ubound_arf(arf_t u, const acb_t z, long prec)
+acb_get_abs_ubound_arf(arf_t u, const acb_t z, slong prec)
 {
     if (arb_is_zero(acb_imagref(z)))
     {
@@ -375,7 +375,7 @@ acb_get_abs_ubound_arf(arf_t u, const acb_t z, long prec)
 }
 
 ACB_INLINE void
-acb_get_abs_lbound_arf(arf_t u, const acb_t z, long prec)
+acb_get_abs_lbound_arf(arf_t u, const acb_t z, slong prec)
 {
     if (arb_is_zero(acb_imagref(z)))
     {
@@ -403,7 +403,7 @@ acb_get_abs_lbound_arf(arf_t u, const acb_t z, long prec)
 }
 
 ACB_INLINE void
-acb_get_rad_ubound_arf(arf_t u, const acb_t z, long prec)
+acb_get_rad_ubound_arf(arf_t u, const acb_t z, slong prec)
 {
     /* fixme: this bound is very sloppy */
 
@@ -415,73 +415,73 @@ acb_get_rad_ubound_arf(arf_t u, const acb_t z, long prec)
     arf_mul_2exp_si(u, u, 1);
 }
 
-void acb_arg(arb_t r, const acb_t z, long prec);
+void acb_arg(arb_t r, const acb_t z, slong prec);
 
 ACB_INLINE void
-acb_add(acb_t z, const acb_t x, const acb_t y, long prec)
+acb_add(acb_t z, const acb_t x, const acb_t y, slong prec)
 {
     arb_add(acb_realref(z), acb_realref(x), acb_realref(y), prec);
     arb_add(acb_imagref(z), acb_imagref(x), acb_imagref(y), prec);
 }
 
 ACB_INLINE void
-acb_sub(acb_t z, const acb_t x, const acb_t y, long prec)
+acb_sub(acb_t z, const acb_t x, const acb_t y, slong prec)
 {
     arb_sub(acb_realref(z), acb_realref(x), acb_realref(y), prec);
     arb_sub(acb_imagref(z), acb_imagref(x), acb_imagref(y), prec);
 }
 
 ACB_INLINE void
-acb_add_si(acb_t z, const acb_t x, ulong c, long prec)
+acb_add_si(acb_t z, const acb_t x, ulong c, slong prec)
 {
     arb_add_si(acb_realref(z), acb_realref(x), c, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_add_ui(acb_t z, const acb_t x, ulong c, long prec)
+acb_add_ui(acb_t z, const acb_t x, ulong c, slong prec)
 {
     arb_add_ui(acb_realref(z), acb_realref(x), c, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_sub_si(acb_t z, const acb_t x, ulong c, long prec)
+acb_sub_si(acb_t z, const acb_t x, ulong c, slong prec)
 {
     arb_sub_si(acb_realref(z), acb_realref(x), c, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_sub_ui(acb_t z, const acb_t x, ulong c, long prec)
+acb_sub_ui(acb_t z, const acb_t x, ulong c, slong prec)
 {
     arb_sub_ui(acb_realref(z), acb_realref(x), c, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_add_fmpz(acb_t z, const acb_t x, const fmpz_t y, long prec)
+acb_add_fmpz(acb_t z, const acb_t x, const fmpz_t y, slong prec)
 {
     arb_add_fmpz(acb_realref(z), acb_realref(x), y, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_add_arb(acb_t z, const acb_t x, const arb_t y, long prec)
+acb_add_arb(acb_t z, const acb_t x, const arb_t y, slong prec)
 {
     arb_add(acb_realref(z), acb_realref(x), y, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_sub_fmpz(acb_t z, const acb_t x, const fmpz_t y, long prec)
+acb_sub_fmpz(acb_t z, const acb_t x, const fmpz_t y, slong prec)
 {
     arb_sub_fmpz(acb_realref(z), acb_realref(x), y, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
 }
 
 ACB_INLINE void
-acb_sub_arb(acb_t z, const acb_t x, const arb_t y, long prec)
+acb_sub_arb(acb_t z, const acb_t x, const arb_t y, slong prec)
 {
     arb_sub(acb_realref(z), acb_realref(x), y, prec);
     arb_set_round(acb_imagref(z), acb_imagref(x), prec);
@@ -502,34 +502,34 @@ acb_conj(acb_t z, const acb_t x)
 }
 
 ACB_INLINE void
-acb_abs(arb_t u, const acb_t z, long prec)
+acb_abs(arb_t u, const acb_t z, slong prec)
 {
     arb_hypot(u, acb_realref(z), acb_imagref(z), prec);
 }
 
 ACB_INLINE void
-acb_mul_ui(acb_t z, const acb_t x, ulong y, long prec)
+acb_mul_ui(acb_t z, const acb_t x, ulong y, slong prec)
 {
     arb_mul_ui(acb_realref(z), acb_realref(x), y, prec);
     arb_mul_ui(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_mul_si(acb_t z, const acb_t x, long y, long prec)
+acb_mul_si(acb_t z, const acb_t x, slong y, slong prec)
 {
     arb_mul_si(acb_realref(z), acb_realref(x), y, prec);
     arb_mul_si(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_mul_fmpz(acb_t z, const acb_t x, const fmpz_t y, long prec)
+acb_mul_fmpz(acb_t z, const acb_t x, const fmpz_t y, slong prec)
 {
     arb_mul_fmpz(acb_realref(z), acb_realref(x), y, prec);
     arb_mul_fmpz(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_mul_arb(acb_t z, const acb_t x, const arb_t y, long prec)
+acb_mul_arb(acb_t z, const acb_t x, const arb_t y, slong prec)
 {
     arb_mul(acb_realref(z), acb_realref(x), y, prec);
     arb_mul(acb_imagref(z), acb_imagref(x), y, prec);
@@ -565,12 +565,12 @@ acb_div_onei(acb_t z, const acb_t x)
     }
 }
 
-void acb_mul(acb_t z, const acb_t x, const acb_t y, long prec);
+void acb_mul(acb_t z, const acb_t x, const acb_t y, slong prec);
 
-void acb_mul_naive(acb_t z, const acb_t x, const acb_t y, long prec);
+void acb_mul_naive(acb_t z, const acb_t x, const acb_t y, slong prec);
 
 ACB_INLINE void
-acb_mul_2exp_si(acb_t z, const acb_t x, long e)
+acb_mul_2exp_si(acb_t z, const acb_t x, slong e)
 {
     arb_mul_2exp_si(acb_realref(z), acb_realref(x), e);
     arb_mul_2exp_si(acb_imagref(z), acb_imagref(x), e);
@@ -583,132 +583,132 @@ acb_mul_2exp_fmpz(acb_t z, const acb_t x, const fmpz_t c)
     arb_mul_2exp_fmpz(acb_imagref(z), acb_imagref(x), c);
 }
 
-void acb_addmul(acb_t z, const acb_t x, const acb_t y, long prec);
+void acb_addmul(acb_t z, const acb_t x, const acb_t y, slong prec);
 
-void acb_submul(acb_t z, const acb_t x, const acb_t y, long prec);
+void acb_submul(acb_t z, const acb_t x, const acb_t y, slong prec);
 
 ACB_INLINE void
-acb_addmul_ui(acb_t z, const acb_t x, ulong y, long prec)
+acb_addmul_ui(acb_t z, const acb_t x, ulong y, slong prec)
 {
     arb_addmul_ui(acb_realref(z), acb_realref(x), y, prec);
     arb_addmul_ui(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_addmul_si(acb_t z, const acb_t x, long y, long prec)
+acb_addmul_si(acb_t z, const acb_t x, slong y, slong prec)
 {
     arb_addmul_si(acb_realref(z), acb_realref(x), y, prec);
     arb_addmul_si(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_submul_ui(acb_t z, const acb_t x, ulong y, long prec)
+acb_submul_ui(acb_t z, const acb_t x, ulong y, slong prec)
 {
     arb_submul_ui(acb_realref(z), acb_realref(x), y, prec);
     arb_submul_ui(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_submul_si(acb_t z, const acb_t x, long y, long prec)
+acb_submul_si(acb_t z, const acb_t x, slong y, slong prec)
 {
     arb_submul_si(acb_realref(z), acb_realref(x), y, prec);
     arb_submul_si(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_addmul_fmpz(acb_t z, const acb_t x, const fmpz_t y, long prec)
+acb_addmul_fmpz(acb_t z, const acb_t x, const fmpz_t y, slong prec)
 {
     arb_addmul_fmpz(acb_realref(z), acb_realref(x), y, prec);
     arb_addmul_fmpz(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_submul_fmpz(acb_t z, const acb_t x, const fmpz_t y, long prec)
+acb_submul_fmpz(acb_t z, const acb_t x, const fmpz_t y, slong prec)
 {
     arb_submul_fmpz(acb_realref(z), acb_realref(x), y, prec);
     arb_submul_fmpz(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_addmul_arb(acb_t z, const acb_t x, const arb_t y, long prec)
+acb_addmul_arb(acb_t z, const acb_t x, const arb_t y, slong prec)
 {
     arb_addmul(acb_realref(z), acb_realref(x), y, prec);
     arb_addmul(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
 ACB_INLINE void
-acb_submul_arb(acb_t z, const acb_t x, const arb_t y, long prec)
+acb_submul_arb(acb_t z, const acb_t x, const arb_t y, slong prec)
 {
     arb_submul(acb_realref(z), acb_realref(x), y, prec);
     arb_submul(acb_imagref(z), acb_imagref(x), y, prec);
 }
 
-void acb_inv(acb_t z, const acb_t x, long prec);
+void acb_inv(acb_t z, const acb_t x, slong prec);
 
-void acb_div(acb_t z, const acb_t x, const acb_t y, long prec);
+void acb_div(acb_t z, const acb_t x, const acb_t y, slong prec);
 
 ACB_INLINE void
-acb_div_ui(acb_t z, const acb_t x, ulong c, long prec)
+acb_div_ui(acb_t z, const acb_t x, ulong c, slong prec)
 {
     arb_div_ui(acb_realref(z), acb_realref(x), c, prec);
     arb_div_ui(acb_imagref(z), acb_imagref(x), c, prec);
 }
 
 ACB_INLINE void
-acb_div_si(acb_t z, const acb_t x, long c, long prec)
+acb_div_si(acb_t z, const acb_t x, slong c, slong prec)
 {
     arb_div_si(acb_realref(z), acb_realref(x), c, prec);
     arb_div_si(acb_imagref(z), acb_imagref(x), c, prec);
 }
 
 ACB_INLINE void
-acb_div_arb(acb_t z, const acb_t x, const arb_t c, long prec)
+acb_div_arb(acb_t z, const acb_t x, const arb_t c, slong prec)
 {
     arb_div(acb_realref(z), acb_realref(x), c, prec);
     arb_div(acb_imagref(z), acb_imagref(x), c, prec);
 }
 
 ACB_INLINE void
-acb_div_fmpz(acb_t z, const acb_t x, const fmpz_t c, long prec)
+acb_div_fmpz(acb_t z, const acb_t x, const fmpz_t c, slong prec)
 {
     arb_div_fmpz(acb_realref(z), acb_realref(x), c, prec);
     arb_div_fmpz(acb_imagref(z), acb_imagref(x), c, prec);
 }
 
-void acb_cube(acb_t y, const acb_t x, long prec);
-void acb_pow_fmpz(acb_t y, const acb_t b, const fmpz_t e, long prec);
-void acb_pow_ui(acb_t y, const acb_t b, ulong e, long prec);
-void acb_pow_si(acb_t y, const acb_t b, long e, long prec);
+void acb_cube(acb_t y, const acb_t x, slong prec);
+void acb_pow_fmpz(acb_t y, const acb_t b, const fmpz_t e, slong prec);
+void acb_pow_ui(acb_t y, const acb_t b, ulong e, slong prec);
+void acb_pow_si(acb_t y, const acb_t b, slong e, slong prec);
 
 ACB_INLINE void
-acb_const_pi(acb_t x, long prec)
+acb_const_pi(acb_t x, slong prec)
 {
     arb_const_pi(acb_realref(x), prec);
     arb_zero(acb_imagref(x));
 }
 
-void acb_log(acb_t r, const acb_t z, long prec);
-void acb_log1p(acb_t r, const acb_t z, long prec);
+void acb_log(acb_t r, const acb_t z, slong prec);
+void acb_log1p(acb_t r, const acb_t z, slong prec);
 
-void acb_exp(acb_t r, const acb_t z, long prec);
-void acb_exp_pi_i(acb_t r, const acb_t z, long prec);
-void acb_exp_invexp(acb_t r, acb_t s, const acb_t z, long prec);
+void acb_exp(acb_t r, const acb_t z, slong prec);
+void acb_exp_pi_i(acb_t r, const acb_t z, slong prec);
+void acb_exp_invexp(acb_t r, acb_t s, const acb_t z, slong prec);
 
-void acb_sin(acb_t r, const acb_t z, long prec);
-void acb_cos(acb_t r, const acb_t z, long prec);
-void acb_sin_cos(acb_t s, acb_t c, const acb_t z, long prec);
-void acb_tan(acb_t r, const acb_t z, long prec);
-void acb_cot(acb_t r, const acb_t z, long prec);
+void acb_sin(acb_t r, const acb_t z, slong prec);
+void acb_cos(acb_t r, const acb_t z, slong prec);
+void acb_sin_cos(acb_t s, acb_t c, const acb_t z, slong prec);
+void acb_tan(acb_t r, const acb_t z, slong prec);
+void acb_cot(acb_t r, const acb_t z, slong prec);
 
-void acb_asin(acb_t r, const acb_t z, long prec);
-void acb_acos(acb_t r, const acb_t z, long prec);
-void acb_atan(acb_t r, const acb_t z, long prec);
-void acb_asinh(acb_t r, const acb_t z, long prec);
-void acb_acosh(acb_t r, const acb_t z, long prec);
-void acb_atanh(acb_t r, const acb_t z, long prec);
+void acb_asin(acb_t r, const acb_t z, slong prec);
+void acb_acos(acb_t r, const acb_t z, slong prec);
+void acb_atan(acb_t r, const acb_t z, slong prec);
+void acb_asinh(acb_t r, const acb_t z, slong prec);
+void acb_acosh(acb_t r, const acb_t z, slong prec);
+void acb_atanh(acb_t r, const acb_t z, slong prec);
 
 ACB_INLINE void
-acb_sinh(acb_t y, const acb_t x, long prec)
+acb_sinh(acb_t y, const acb_t x, slong prec)
 {
     acb_mul_onei(y, x);
     acb_sin(y, y, prec);
@@ -716,14 +716,14 @@ acb_sinh(acb_t y, const acb_t x, long prec)
 }
 
 ACB_INLINE void
-acb_cosh(acb_t y, const acb_t x, long prec)
+acb_cosh(acb_t y, const acb_t x, slong prec)
 {
     acb_mul_onei(y, x);
     acb_cos(y, y, prec);
 }
 
 ACB_INLINE void
-acb_sinh_cosh(acb_t y, acb_t z, const acb_t x, long prec)
+acb_sinh_cosh(acb_t y, acb_t z, const acb_t x, slong prec)
 {
     acb_mul_onei(y, x);
     acb_sin_cos(y, z, y, prec);
@@ -731,7 +731,7 @@ acb_sinh_cosh(acb_t y, acb_t z, const acb_t x, long prec)
 }
 
 ACB_INLINE void
-acb_tanh(acb_t y, const acb_t x, long prec)
+acb_tanh(acb_t y, const acb_t x, slong prec)
 {
     acb_mul_onei(y, x);
     acb_tan(y, y, prec);
@@ -739,67 +739,67 @@ acb_tanh(acb_t y, const acb_t x, long prec)
 }
 
 ACB_INLINE void
-acb_coth(acb_t y, const acb_t x, long prec)
+acb_coth(acb_t y, const acb_t x, slong prec)
 {
     acb_mul_onei(y, x);
     acb_cot(y, y, prec);
     acb_mul_onei(y, y);
 }
 
-void acb_sin_pi(acb_t r, const acb_t z, long prec);
-void acb_cos_pi(acb_t r, const acb_t z, long prec);
-void acb_sin_cos_pi(acb_t s, acb_t c, const acb_t z, long prec);
-void acb_tan_pi(acb_t r, const acb_t z, long prec);
-void acb_cot_pi(acb_t r, const acb_t z, long prec);
+void acb_sin_pi(acb_t r, const acb_t z, slong prec);
+void acb_cos_pi(acb_t r, const acb_t z, slong prec);
+void acb_sin_cos_pi(acb_t s, acb_t c, const acb_t z, slong prec);
+void acb_tan_pi(acb_t r, const acb_t z, slong prec);
+void acb_cot_pi(acb_t r, const acb_t z, slong prec);
 
-void acb_pow_arb(acb_t z, const acb_t x, const arb_t y, long prec);
-void acb_pow(acb_t r, const acb_t x, const acb_t y, long prec);
+void acb_pow_arb(acb_t z, const acb_t x, const arb_t y, slong prec);
+void acb_pow(acb_t r, const acb_t x, const acb_t y, slong prec);
 
-void acb_sqrt(acb_t y, const acb_t x, long prec);
-void acb_rsqrt(acb_t y, const acb_t x, long prec);
+void acb_sqrt(acb_t y, const acb_t x, slong prec);
+void acb_rsqrt(acb_t y, const acb_t x, slong prec);
 
-void acb_chebyshev_t_ui(acb_t a, ulong n, const acb_t x, long prec);
-void acb_chebyshev_t2_ui(acb_t a, acb_t b, ulong n, const acb_t x, long prec);
-void acb_chebyshev_u_ui(acb_t a, ulong n, const acb_t x, long prec);
-void acb_chebyshev_u2_ui(acb_t a, acb_t b, ulong n, const acb_t x, long prec);
+void acb_chebyshev_t_ui(acb_t a, ulong n, const acb_t x, slong prec);
+void acb_chebyshev_t2_ui(acb_t a, acb_t b, ulong n, const acb_t x, slong prec);
+void acb_chebyshev_u_ui(acb_t a, ulong n, const acb_t x, slong prec);
+void acb_chebyshev_u2_ui(acb_t a, acb_t b, ulong n, const acb_t x, slong prec);
 
-void acb_rising_ui_bs(acb_t y, const acb_t x, ulong n, long prec);
-void acb_rising_ui_rs(acb_t y, const acb_t x, ulong n, ulong m, long prec);
-void acb_rising_ui_rec(acb_t y, const acb_t x, ulong n, long prec);
-void acb_rising_ui(acb_t z, const acb_t x, ulong n, long prec);
-void acb_rising(acb_t z, const acb_t x, const acb_t n, long prec);
+void acb_rising_ui_bs(acb_t y, const acb_t x, ulong n, slong prec);
+void acb_rising_ui_rs(acb_t y, const acb_t x, ulong n, ulong m, slong prec);
+void acb_rising_ui_rec(acb_t y, const acb_t x, ulong n, slong prec);
+void acb_rising_ui(acb_t z, const acb_t x, ulong n, slong prec);
+void acb_rising(acb_t z, const acb_t x, const acb_t n, slong prec);
 
-void acb_rising2_ui_bs(acb_t u, acb_t v, const acb_t x, ulong n, long prec);
-void acb_rising2_ui_rs(acb_t u, acb_t v, const acb_t x, ulong n, ulong m, long prec);
-void acb_rising2_ui(acb_t u, acb_t v, const acb_t x, ulong n, long prec);
+void acb_rising2_ui_bs(acb_t u, acb_t v, const acb_t x, ulong n, slong prec);
+void acb_rising2_ui_rs(acb_t u, acb_t v, const acb_t x, ulong n, ulong m, slong prec);
+void acb_rising2_ui(acb_t u, acb_t v, const acb_t x, ulong n, slong prec);
 
 void acb_rising_ui_get_mag(mag_t bound, const acb_t s, ulong n);
 
-void acb_gamma(acb_t y, const acb_t x, long prec);
-void acb_rgamma(acb_t y, const acb_t x, long prec);
-void acb_lgamma(acb_t y, const acb_t x, long prec);
-void acb_log_sin_pi(acb_t res, const acb_t z, long prec);
-void acb_digamma(acb_t y, const acb_t x, long prec);
-void acb_zeta(acb_t z, const acb_t s, long prec);
-void acb_hurwitz_zeta(acb_t z, const acb_t s, const acb_t a, long prec);
-void acb_polygamma(acb_t res, const acb_t s, const acb_t z, long prec);
+void acb_gamma(acb_t y, const acb_t x, slong prec);
+void acb_rgamma(acb_t y, const acb_t x, slong prec);
+void acb_lgamma(acb_t y, const acb_t x, slong prec);
+void acb_log_sin_pi(acb_t res, const acb_t z, slong prec);
+void acb_digamma(acb_t y, const acb_t x, slong prec);
+void acb_zeta(acb_t z, const acb_t s, slong prec);
+void acb_hurwitz_zeta(acb_t z, const acb_t s, const acb_t a, slong prec);
+void acb_polygamma(acb_t res, const acb_t s, const acb_t z, slong prec);
 
-void acb_log_barnes_g(acb_t res, const acb_t z, long prec);
-void acb_barnes_g(acb_t res, const acb_t z, long prec);
+void acb_log_barnes_g(acb_t res, const acb_t z, slong prec);
+void acb_barnes_g(acb_t res, const acb_t z, slong prec);
 
-void acb_polylog(acb_t w, const acb_t s, const acb_t z, long prec);
-void acb_polylog_si(acb_t w, long s, const acb_t z, long prec);
+void acb_polylog(acb_t w, const acb_t s, const acb_t z, slong prec);
+void acb_polylog_si(acb_t w, slong s, const acb_t z, slong prec);
 
-void acb_agm1(acb_t m, const acb_t z, long prec);
-void acb_agm1_cpx(acb_ptr m, const acb_t z, long len, long prec);
+void acb_agm1(acb_t m, const acb_t z, slong prec);
+void acb_agm1_cpx(acb_ptr m, const acb_t z, slong len, slong prec);
 
 /*
 TBD
 
-void acb_invroot_newton(acb_t r, const acb_t a, ulong m, const acb_t r0, long startprec, long prec);
-void acb_root_exp(acb_t r, const acb_t a, long m, long index, long prec);
-void acb_root_newton(acb_t r, const acb_t a, long m, long index, long prec);
-void acb_root(acb_t r, const acb_t a, long m, long index, long prec);
+void acb_invroot_newton(acb_t r, const acb_t a, ulong m, const acb_t r0, slong startprec, slong prec);
+void acb_root_exp(acb_t r, const acb_t a, slong m, slong index, slong prec);
+void acb_root_newton(acb_t r, const acb_t a, slong m, slong index, slong prec);
+void acb_root(acb_t r, const acb_t a, slong m, slong index, slong prec);
 */
 
 ACB_INLINE int
@@ -816,23 +816,23 @@ acb_indeterminate(acb_t x)
 }
 
 ACB_INLINE acb_ptr
-_acb_vec_entry_ptr(acb_ptr vec, long i)
+_acb_vec_entry_ptr(acb_ptr vec, slong i)
 {
     return vec + i;
 }
 
 ACB_INLINE void
-_acb_vec_zero(acb_ptr A, long n)
+_acb_vec_zero(acb_ptr A, slong n)
 {
-    long i;
+    slong i;
     for (i = 0; i < n; i++)
         acb_zero(A + i);
 }
 
 ACB_INLINE int
-_acb_vec_is_zero(acb_srcptr vec, long len)
+_acb_vec_is_zero(acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         if (!acb_is_zero(vec + i))
             return 0;
@@ -840,121 +840,121 @@ _acb_vec_is_zero(acb_srcptr vec, long len)
 }
 
 ACB_INLINE void
-_acb_vec_set(acb_ptr res, acb_srcptr vec, long len)
+_acb_vec_set(acb_ptr res, acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_set(res + i, vec + i);
 }
 
 ACB_INLINE void
-_acb_vec_set_round(acb_ptr res, acb_srcptr vec, long len, long prec)
+_acb_vec_set_round(acb_ptr res, acb_srcptr vec, slong len, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_set_round(res + i, vec + i, prec);
 }
 
 ACB_INLINE void
-_acb_vec_neg(acb_ptr res, acb_srcptr vec, long len)
+_acb_vec_neg(acb_ptr res, acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_neg(res + i, vec + i);
 }
 
 ACB_INLINE void
-_acb_vec_add(acb_ptr res, acb_srcptr vec1, acb_srcptr vec2, long len, long prec)
+_acb_vec_add(acb_ptr res, acb_srcptr vec1, acb_srcptr vec2, slong len, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_add(res + i, vec1 + i, vec2 + i, prec);
 }
 
 ACB_INLINE void
-_acb_vec_sub(acb_ptr res, acb_srcptr vec1, acb_srcptr vec2, long len, long prec)
+_acb_vec_sub(acb_ptr res, acb_srcptr vec1, acb_srcptr vec2, slong len, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_sub(res + i, vec1 + i, vec2 + i, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_submul(acb_ptr res, acb_srcptr vec, long len, const acb_t c, long prec)
+_acb_vec_scalar_submul(acb_ptr res, acb_srcptr vec, slong len, const acb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_submul(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_addmul(acb_ptr res, acb_srcptr vec, long len, const acb_t c, long prec)
+_acb_vec_scalar_addmul(acb_ptr res, acb_srcptr vec, slong len, const acb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_addmul(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul(acb_ptr res, acb_srcptr vec, long len, const acb_t c, long prec)
+_acb_vec_scalar_mul(acb_ptr res, acb_srcptr vec, slong len, const acb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul_ui(acb_ptr res, acb_srcptr vec, long len, ulong c, long prec)
+_acb_vec_scalar_mul_ui(acb_ptr res, acb_srcptr vec, slong len, ulong c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul_ui(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul_2exp_si(acb_ptr res, acb_srcptr vec, long len, long c)
+_acb_vec_scalar_mul_2exp_si(acb_ptr res, acb_srcptr vec, slong len, slong c)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul_2exp_si(res + i, vec + i, c);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul_onei(acb_ptr res, acb_srcptr vec, long len)
+_acb_vec_scalar_mul_onei(acb_ptr res, acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul_onei(res + i, vec + i);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_div_ui(acb_ptr res, acb_srcptr vec, long len, ulong c, long prec)
+_acb_vec_scalar_div_ui(acb_ptr res, acb_srcptr vec, slong len, ulong c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_div_ui(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_div(acb_ptr res, acb_srcptr vec, long len, const acb_t c, long prec)
+_acb_vec_scalar_div(acb_ptr res, acb_srcptr vec, slong len, const acb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_div(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul_arb(acb_ptr res, acb_srcptr vec, long len, const arb_t c, long prec)
+_acb_vec_scalar_mul_arb(acb_ptr res, acb_srcptr vec, slong len, const arb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul_arb(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_div_arb(acb_ptr res, acb_srcptr vec, long len, const arb_t c, long prec)
+_acb_vec_scalar_div_arb(acb_ptr res, acb_srcptr vec, slong len, const arb_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
     {
         arb_div(acb_realref(res + i), acb_realref(vec + i), c, prec);
@@ -963,17 +963,17 @@ _acb_vec_scalar_div_arb(acb_ptr res, acb_srcptr vec, long len, const arb_t c, lo
 }
 
 ACB_INLINE void
-_acb_vec_scalar_mul_fmpz(acb_ptr res, acb_srcptr vec, long len, const fmpz_t c, long prec)
+_acb_vec_scalar_mul_fmpz(acb_ptr res, acb_srcptr vec, slong len, const fmpz_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_mul_fmpz(res + i, vec + i, c, prec);
 }
 
 ACB_INLINE void
-_acb_vec_scalar_div_fmpz(acb_ptr res, acb_srcptr vec, long len, const fmpz_t c, long prec)
+_acb_vec_scalar_div_fmpz(acb_ptr res, acb_srcptr vec, slong len, const fmpz_t c, slong prec)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_div_fmpz(res + i, vec + i, c, prec);
 }
@@ -988,15 +988,15 @@ acb_print(const acb_t x)
     printf(")");
 }
 
-void acb_printd(const acb_t z, long digits);
+void acb_printd(const acb_t z, slong digits);
 
-void acb_randtest(acb_t z, flint_rand_t state, long prec, long mag_bits);
+void acb_randtest(acb_t z, flint_rand_t state, slong prec, slong mag_bits);
 
-void acb_randtest_special(acb_t z, flint_rand_t state, long prec, long mag_bits);
+void acb_randtest_special(acb_t z, flint_rand_t state, slong prec, slong mag_bits);
 
-void acb_randtest_precise(acb_t z, flint_rand_t state, long prec, long mag_bits);
+void acb_randtest_precise(acb_t z, flint_rand_t state, slong prec, slong mag_bits);
 
-void acb_randtest_param(acb_t z, flint_rand_t state, long prec, long mag_bits);
+void acb_randtest_param(acb_t z, flint_rand_t state, slong prec, slong mag_bits);
 
 long acb_rel_error_bits(const acb_t x);
 
@@ -1010,7 +1010,7 @@ acb_rel_accuracy_bits(const acb_t x)
 ACB_INLINE long
 acb_bits(const acb_t x)
 {
-    long b1, b2;
+    slong b1, b2;
     b1 = arb_bits(acb_realref(x));
     b2 = arb_bits(acb_imagref(x));
     return FLINT_MAX(b1, b2);
@@ -1023,9 +1023,9 @@ acb_is_real(const acb_t x)
 }
 
 ACB_INLINE int
-_acb_vec_is_real(acb_srcptr v, long len)
+_acb_vec_is_real(acb_srcptr v, slong len)
 {
-    long i;
+    slong i;
 
     for (i = 0; i < len; i++)
     {
@@ -1037,15 +1037,15 @@ _acb_vec_is_real(acb_srcptr v, long len)
 }
 
 ACB_INLINE long
-_acb_vec_bits(acb_srcptr vec, long len)
+_acb_vec_bits(acb_srcptr vec, slong len)
 {
     return _arb_vec_bits((arb_srcptr) vec, 2 * len);
 }
 
 ACB_INLINE void
-_acb_vec_set_powers(acb_ptr xs, const acb_t x, long len, long prec)
+_acb_vec_set_powers(acb_ptr xs, const acb_t x, slong len, slong prec)
 {
-    long i;
+    slong i;
 
     for (i = 0; i < len; i++)
     {
@@ -1061,17 +1061,17 @@ _acb_vec_set_powers(acb_ptr xs, const acb_t x, long len, long prec)
 }
 
 ACB_INLINE void
-_acb_vec_add_error_arf_vec(acb_ptr res, arf_srcptr err, long len)
+_acb_vec_add_error_arf_vec(acb_ptr res, arf_srcptr err, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_add_error_arf(res + i, err + i);
 }
 
 ACB_INLINE void
-_acb_vec_add_error_mag_vec(acb_ptr res, mag_srcptr err, long len)
+_acb_vec_add_error_mag_vec(acb_ptr res, mag_srcptr err, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
     {
         mag_add(arb_radref(acb_realref(res + i)),
@@ -1082,23 +1082,23 @@ _acb_vec_add_error_mag_vec(acb_ptr res, mag_srcptr err, long len)
 }
 
 ACB_INLINE void
-_acb_vec_indeterminate(acb_ptr vec, long len)
+_acb_vec_indeterminate(acb_ptr vec, slong len)
 {
     _arb_vec_indeterminate((arb_ptr) vec, 2 * len);
 }
 
 ACB_INLINE void
-_acb_vec_trim(acb_ptr res, acb_srcptr vec, long len)
+_acb_vec_trim(acb_ptr res, acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         acb_trim(res + i, vec + i);
 }
 
 ACB_INLINE int
-_acb_vec_get_unique_fmpz_vec(fmpz * res,  acb_srcptr vec, long len)
+_acb_vec_get_unique_fmpz_vec(fmpz * res,  acb_srcptr vec, slong len)
 {
-    long i;
+    slong i;
     for (i = 0; i < len; i++)
         if (!acb_get_unique_fmpz(res + i, vec + i))
             return 0;
@@ -1106,7 +1106,7 @@ _acb_vec_get_unique_fmpz_vec(fmpz * res,  acb_srcptr vec, long len)
 }
 
 /* sort complex numbers in a nice-to-display order */
-void _acb_vec_sort_pretty(acb_ptr vec, long len);
+void _acb_vec_sort_pretty(acb_ptr vec, slong len);
 
 #ifdef __cplusplus
 }