diff -up src/sage/libs/arb/acb_hypgeom.pxd.orig src/sage/libs/arb/acb_hypgeom.pxd

--- src/sage/libs/arb/acb_hypgeom.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/acb_hypgeom.pxd	2019-01-16 09:46:54.148469344 -0700

@@ -2,7 +2,7 @@

 from sage.libs.arb.types cimport *

-cdef extern from "acb_hypgeom.h":

+cdef extern from "arb/acb_hypgeom.h":

     void acb_hypgeom_pfq_bound_factor(mag_t C, acb_srcptr a, long p, acb_srcptr b, long q, const acb_t z, unsigned long n)

     long acb_hypgeom_pfq_choose_n(acb_srcptr a, long p, acb_srcptr b, long q, const acb_t z, long prec)

     void acb_hypgeom_pfq_sum_forward(acb_t s, acb_t t, acb_srcptr a, long p, acb_srcptr b, long q, const acb_t z, long n, long prec)

diff -up src/sage/libs/arb/acb_mat.pxd.orig src/sage/libs/arb/acb_mat.pxd

--- src/sage/libs/arb/acb_mat.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/acb_mat.pxd	2019-01-16 09:46:54.148469344 -0700

@@ -1,6 +1,6 @@

 from sage.libs.arb.types cimport acb_t, acb_mat_t, acb_poly_t

-cdef extern from "acb_mat.h":

+cdef extern from "arb/acb_mat.h":

     unsigned int acb_mat_nrows(acb_mat_t mat)

     unsigned int acb_mat_ncols(acb_mat_t mat)

     acb_t acb_mat_entry(acb_mat_t mat, unsigned long i, unsigned long j)

diff -up src/sage/libs/arb/acb_modular.pxd.orig src/sage/libs/arb/acb_modular.pxd

--- src/sage/libs/arb/acb_modular.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/acb_modular.pxd	2019-01-16 09:46:54.149469326 -0700

@@ -3,7 +3,7 @@

 from sage.libs.arb.types cimport *

 from sage.libs.flint.types cimport fmpz_poly_t

-cdef extern from "acb_modular.h":

+cdef extern from "arb/acb_modular.h":

     void acb_modular_theta(acb_t theta1, acb_t theta2, acb_t theta3, acb_t theta4, const acb_t z, const acb_t tau, long prec)

     void acb_modular_j(acb_t z, const acb_t tau, long prec)

     void acb_modular_eta(acb_t z, const acb_t tau, long prec)

diff -up src/sage/libs/arb/acb_poly.pxd.orig src/sage/libs/arb/acb_poly.pxd

--- src/sage/libs/arb/acb_poly.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/acb_poly.pxd	2019-01-16 09:46:54.149469326 -0700

@@ -3,7 +3,7 @@

 from sage.libs.arb.types cimport *

 from sage.libs.flint.types cimport fmpz_poly_t, fmpq_poly_t

-cdef extern from "acb_poly.h":

+cdef extern from "arb/acb_poly.h":

     void acb_poly_init(acb_poly_t poly)

     void acb_poly_clear(acb_poly_t poly)

     void acb_poly_fit_length(acb_poly_t poly, long len)

diff -up src/sage/libs/arb/acb.pxd.orig src/sage/libs/arb/acb.pxd

--- src/sage/libs/arb/acb.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/acb.pxd	2019-01-16 09:46:54.149469326 -0700

@@ -3,7 +3,7 @@

 from sage.libs.arb.types cimport *

 from sage.libs.flint.types cimport fmpz_t, fmpq_t

-cdef extern from "acb.h":

+cdef extern from "arb/acb.h":

     arb_t acb_realref(acb_t x)

     arb_t acb_imagref(acb_t x)

diff -up src/sage/libs/arb/arf.pxd.orig src/sage/libs/arb/arf.pxd

--- src/sage/libs/arb/arf.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/arf.pxd	2019-01-16 09:46:54.149469326 -0700

@@ -5,7 +5,7 @@ from sage.libs.gmp.types cimport mpz_t

 from sage.libs.flint.types cimport fmpz_t

 from sage.libs.mpfr.types cimport mpfr_t, mpfr_rnd_t

-cdef extern from "arf.h":

+cdef extern from "arb/arf.h":

     void arf_init(arf_t x)

     void arf_clear(arf_t x)

     void arf_zero(arf_t x)

diff -up src/sage/libs/arb/bernoulli.pxd.orig src/sage/libs/arb/bernoulli.pxd

--- src/sage/libs/arb/bernoulli.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/bernoulli.pxd	2019-01-16 09:46:54.149469326 -0700

@@ -2,5 +2,5 @@

 from ..flint.types cimport fmpq_t, ulong

-cdef extern from "bernoulli.h":

+cdef extern from "arb/bernoulli.h":

     void bernoulli_fmpq_ui(fmpq_t b, ulong n)

diff -up src/sage/libs/arb/mag.pxd.orig src/sage/libs/arb/mag.pxd

--- src/sage/libs/arb/mag.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/mag.pxd	2019-01-16 09:46:54.150469309 -0700

@@ -3,7 +3,7 @@

 from sage.libs.arb.types cimport *

 from sage.libs.flint.types cimport fmpz_t, fmpq_t

-cdef extern from "mag.h":

+cdef extern from "arb/mag.h":

     void mag_init(mag_t x)

     void mag_clear(mag_t x)

     void mag_init_set(mag_t x, const mag_t y)

diff -up src/sage/libs/arb/types.pxd.orig src/sage/libs/arb/types.pxd

--- src/sage/libs/arb/types.pxd.orig	2018-12-22 16:37:08.000000000 -0700

+++ src/sage/libs/arb/types.pxd	2019-01-16 09:46:54.150469309 -0700

@@ -1,4 +1,4 @@

-cdef extern from "mag.h":

+cdef extern from "arb/mag.h":

     ctypedef struct mag_struct:

         pass

     ctypedef mag_struct mag_t[1]

@@ -6,7 +6,7 @@ cdef extern from "mag.h":

     ctypedef const mag_struct * mag_srcptr

     long MAG_BITS

-cdef extern from "arf.h":

+cdef extern from "arb/arf.h":

     ctypedef struct arf_struct:

         pass

     ctypedef arf_struct arf_t[1]

@@ -20,25 +20,25 @@ cdef extern from "arf.h":

         ARF_RND_NEAR

     long ARF_PREC_EXACT

-cdef extern from "arb.h":

+cdef extern from "arb/arb.h":

     ctypedef struct arb_struct:

         pass

     ctypedef arb_struct arb_t[1]

     ctypedef arb_struct * arb_ptr

-cdef extern from "acb.h":

+cdef extern from "arb/acb.h":

     ctypedef struct acb_struct:

         pass

     ctypedef acb_struct[1] acb_t

     ctypedef acb_struct * acb_ptr

     ctypedef const acb_struct * acb_srcptr

-cdef extern from "acb_mat.h":

+cdef extern from "arb/acb_mat.h":

     ctypedef struct acb_mat_struct:

         pass

     ctypedef acb_mat_struct[1] acb_mat_t

-cdef extern from "acb_poly.h":

+cdef extern from "arb/acb_poly.h":

     ctypedef struct acb_poly_struct:

         pass

     ctypedef acb_poly_struct[1] acb_poly_t