include flint/foo.h instead of foo.h

acb/rising2_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
 #include "acb.h"
 
 void _gamma_rf_bsplit(fmpz * A, ulong a, ulong b);

acb/rising_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
 #include "acb.h"
 
 void rising_difference_polynomial(fmpz * s, fmpz * c, ulong m);

acb/test/t-rising2_ui.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "acb_poly.h"
 
 int main()

acb/test/t-rising2_ui_bs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "acb_poly.h"
 
 int main()

acb/test/t-rising2_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "acb_poly.h"
 
 int main()

acb_hypgeom/airy.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "acb_hypgeom.h"
-#include "double_extras.h"
 
 #define LOG2 0.69314718055994530942
 #define EXP1 2.7182818284590452354

acb_mat.h

@@ -33,10 +33,10 @@
 #endif
 
 #include <stdio.h>
+#include "flint/fmpz_mat.h"
+#include "flint/fmpq_mat.h"
 #include "arb.h"
 #include "acb.h"
-#include "fmpz_mat.h"
-#include "fmpq_mat.h"
 #include "arb_mat.h"
 #include "acb_poly.h"
 

acb_mat/exp.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "acb_mat.h"
 #include "bool_mat.h"
 

acb_modular.h

@@ -27,7 +27,7 @@
 #define ACB_MODULAR_H
 
 #include <stdio.h>
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
 #include "acb.h"
 
 #ifdef __cplusplus

acb_modular/test/t-delta.c

@@ -25,8 +25,6 @@
 
 #include "acb_modular.h"
 
-#include "profiler.h"
-
 int main()
 {
     slong iter;

acb_modular/test/t-epsilon_arg.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "acb_modular.h"
-#include "arith.h"
+#include "flint/arith.h"
 
 static void
 acb_modular_epsilon_arg_naive(fmpq_t arg, const psl2z_t g)

acb_modular/test/t-hilbert_class_poly.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
 #include "acb_modular.h"
 
 /* reference values h_(-d)(2015) mod 31337 computed using sage */

arb/bell_fmpz.c

@@ -23,9 +23,9 @@
 
 ******************************************************************************/
 
+#include "flint/arith.h"
+#include "flint/double_extras.h"
 #include "arb.h"
-#include "arith.h"
-#include "double_extras.h"
 
 /* \sum_{k=0}^{a-1} \frac{k^n}{k!} */
 /* b = a * \frac{(a-1)^n}{(a-1)!} */

arb/digamma.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/arith.h"
 #include "arb.h"
-#include "arith.h"
 
 void arb_gamma_stirling_choose_param(int * reflect, slong * r, slong * n,
     const arb_t x, int use_reflect, int digamma, slong prec);

arb/rising2_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
 #include "arb.h"
 
 void

arb/rising_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb.h"
 
 void

arb/sin_cos.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/mpn_extras.h"
 #include "arb.h"
-#include "mpn_extras.h"
 
 #define TMP_ALLOC_LIMBS(__n) TMP_ALLOC((__n) * sizeof(mp_limb_t))
 #define MAGLIM(prec) FLINT_MAX(65536, (4*prec))

arb/sin_cos_pi_fmpq_algebraic.c

@@ -26,11 +26,9 @@
 #include "arb.h"
 #include "arb_poly.h"
 
-
-
 /* include minpoly code here until it appears in a flint release */
-#include "fmpz_poly.h"
+#include "flint/fmpz_poly.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 /* Use a lookup table for small n. We skip 53, 59 and 61, as the
    coefficients do not fit in 16 bits. */

arb/test/t-add_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-add_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/test/t-addmul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-addmul_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/test/t-atan_taylor_rs.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/mpn_extras.h"
 #include "arb.h"
-#include "mpn_extras.h"
 
 int main()
 {

arb/test/t-div_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-div_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/test/t-euler_number_fmpz.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb.h"
 
 int main()

arb/test/t-exp_taylor_rs.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/mpn_extras.h"
 #include "arb.h"
-#include "mpn_extras.h"
 
 int main()
 {

arb/test/t-mul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-mul_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/test/t-rising2_ui.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb_poly.h"
 
 int main()

arb/test/t-rising2_ui_bs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb_poly.h"
 
 int main()

arb/test/t-rising2_ui_rs.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb_poly.h"
 
 int main()

arb/test/t-sin_cos_taylor_rs.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/mpn_extras.h"
 #include "arb.h"
-#include "mpn_extras.h"
 
 int main()
 {

arb/test/t-sub_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-sub_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/test/t-submul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

arb/test/t-submul_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arb.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int main()
 {

arb/zeta_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include <math.h>
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb.h"
 
 /* The constant factor is nearly optimal up to at least 300000 bits. */

arb_mat.h

@@ -33,10 +33,10 @@
 #endif
 
 #include <stdio.h>
+#include "flint/fmpz_mat.h"
+#include "flint/fmpq_mat.h"
+#include "flint/perm.h"
 #include "arb.h"
-#include "fmpz_mat.h"
-#include "fmpq_mat.h"
-#include "perm.h"
 #include "arb_poly.h"
 
 #ifdef __cplusplus

arb_mat/exp.c

@@ -23,8 +23,7 @@
 
 ******************************************************************************/
 
-#include "fmpz_mat.h"
+#include "flint/double_extras.h"
-#include "double_extras.h"
 #include "arb_mat.h"
 #include "bool_mat.h"
 

arb_poly.h

@@ -33,10 +33,10 @@
 #endif
 
 #include <stdio.h>
+#include "flint/fmpz_poly.h"
+#include "flint/fmpq_poly.h"
 #include "arb.h"
 #include "acb.h"
-#include "fmpz_poly.h"
-#include "fmpq_poly.h"
 
 #ifdef __cplusplus
 extern "C" {

arf.h

@@ -37,7 +37,7 @@
 
 #include <stdio.h>
 #include <math.h>
-#include "flint.h"
+#include "flint/flint.h"
 #include "fmpr.h"
 #include "mag.h"
 

arf/div.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/mpn_extras.h"
 #include "arf.h"
-#include "mpn_extras.h"
 
 #if !defined(__MPIR_VERSION)
 #define USE_GMP_DIV_Q 1

arf/get_d.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "arf.h"
-#include "double_extras.h"
 
 /* most double: (2^53-1) * 2^971 */
 /* least normal: 2^-1022 */

arf/set_d.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "arf.h"
-#include "double_extras.h"
 
 void
 arf_set_d(arf_t x, double v)

arf/test/t-add_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int
 arf_add_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)

arf/test/t-add_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int
 arf_add_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)

arf/test/t-addmul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int
 arf_addmul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)

arf/test/t-mul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int
 arf_mul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)

arf/test/t-mul_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int
 arf_mul_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)

arf/test/t-sub_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int
 arf_sub_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)

arf/test/t-sub_ui.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
 
 int
 arf_sub_ui_naive(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)

arf/test/t-submul_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "arf.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int
 arf_submul_si_naive(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)

bernoulli.h

@@ -27,11 +27,11 @@
 #define BERNOULLI_H
 
 #include <math.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz.h"
+#include "flint/fmpz.h"
-#include "fmpz_vec.h"
+#include "flint/fmpz_vec.h"
-#include "fmpq.h"
+#include "flint/fmpq.h"
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb.h"
 
 #ifdef __cplusplus

bernoulli/test/t-fmpq_ui.c

@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "fmpz_vec.h"
+#include "flint/fmpz_vec.h"
-#include "arith.h"
+#include "flint/arith.h"
 #include "bernoulli.h"
 
 int main()

bernoulli/test/t-rev.c

@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "bernoulli.h"
-#include "ulong_extras.h"
+#include "flint/ulong_extras.h"
-#include "nmod_poly.h"
+#include "flint/nmod_poly.h"
-#include "nmod_vec.h"
+#include "flint/nmod_vec.h"
 
 int main()
 {

bool_mat.h

@@ -33,8 +33,8 @@
 #endif
 
 #include <stdio.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz_mat.h"
+#include "flint/fmpz_mat.h"
 
 #ifdef __cplusplus
 extern "C" {

bool_mat/nilpotency_degree.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/fmpz_mat.h"
 #include "bool_mat.h"
-#include "fmpz_mat.h"
 
 /*
  * Postorder traversal of a DAG follows

bool_mat/randtest.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/perm.h"
 #include "bool_mat.h"
-#include "perm.h"
 
 void
 bool_mat_randtest(bool_mat_t mat, flint_rand_t state)

bool_mat/test/t-all_pairs_longest_walk.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "bool_mat.h"
-#include "perm.h"
+#include "flint/perm.h"
 
 
 int

bool_mat/test/t-transitive_closure.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "bool_mat.h"
-#include "perm.h"
+#include "flint/perm.h"
 
 /* permute rows and columns of a square matrix */
 void

configure

@@ -263,9 +263,16 @@ else
 fi
 
 if [ -d "${FLINT_INC_DIR}/flint" ]; then
-   FLINT_INC_DIR="${FLINT_INC_DIR}/flint"
+   FLINT_INC_DIR="${FLINT_INC_DIR}"
+elif [ -f "${FLINT_INC_DIR}/flint.h" ]; then
+   mkdir -p build/include
+   ln -sf ${FLINT_INC_DIR} build/include/flint
+   FLINT_INC_DIR="${PWD}/build/include"
 fi
 
+echo "FLINT_LIB_DIR set to ${FLINT_LIB_DIR}"
+echo "FLINT_INC_DIR set to ${FLINT_INC_DIR}"
+
 LIB_DIRS="${LIB_DIRS} ${FLINT_LIB_DIR}"
 INC_DIRS="${INC_DIRS} ${FLINT_INC_DIR}"
 LIBS="${LIBS} flint"

examples/complex_plot.c

@@ -4,7 +4,7 @@
 #include "acb.h"
 #include "acb_hypgeom.h"
 #include "acb_modular.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 /* HLS algorithm from python's colorsys module */
 static double

examples/hilbert_matrix.c

@@ -1,7 +1,7 @@
 /* This file is public domain. Author: Fredrik Johansson. */
 
 #include "arb_mat.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 int main(int argc, char *argv[])
 {

examples/integrals.c

@@ -1,7 +1,7 @@
 /* This file is public domain. Author: Fredrik Johansson. */
 
 #include "acb_calc.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 int
 sinx(acb_ptr out, const acb_t inp, void * params, slong order, slong prec)

examples/keiper_li.c

@@ -4,7 +4,7 @@
 #include "arb.h"
 #include "acb.h"
 #include "arb_poly.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 void
 keiper_li_series(arb_ptr z, slong len, slong prec)

examples/pi.c

@@ -1,7 +1,7 @@
 /* This file is public domain. Author: Fredrik Johansson. */
 
 #include "arb.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 int main(int argc, char *argv[])
 {

examples/poly_roots.c

@@ -3,8 +3,8 @@
 #include <string.h>
 #include "acb.h"
 #include "acb_poly.h"
-#include "arith.h"
+#include "flint/arith.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 int check_accuracy(acb_ptr vec, slong len, slong prec)
 {

examples/real_roots.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include "arb_calc.h"
 #include "acb_hypgeom.h"
-#include "profiler.h"
+#include "flint/profiler.h"
 
 slong eval_count = 0;
 

fmpr.h

@@ -33,12 +33,12 @@
 #include <limits.h>
 #include <gmp.h>
 #include <mpfr.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz.h"
+#include "flint/fmpz.h"
-#include "fmpq.h"
+#include "flint/fmpq.h"
+#include "flint/config.h"
 #include "fmpz_extras.h"
 
-#include "config.h"
 #ifdef HAVE_TLS
 #if HAVE_TLS
 #define TLS_PREFIX __thread

fmpr/test/t-mul_si.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/long_extras.h"
 #include "fmpr.h"
-#include "long_extras.h"
 
 static slong
 fmpr_mul_si_naive(fmpr_t z, const fmpr_t x, slong y, slong prec, fmpr_rnd_t rnd)

fmpr/test/t-mul_ui.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/ulong_extras.h"
 #include "fmpr.h"
-#include "ulong_extras.h"
 
 static slong
 fmpr_mul_ui_naive(fmpr_t z, const fmpr_t x, ulong y, slong prec, fmpr_rnd_t rnd)

fmpz_extras.h

@@ -27,8 +27,8 @@
 #define FMPZ_EXTRAS_H
 
 #include <limits.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz.h"
+#include "flint/fmpz.h"
 
 #ifdef __cplusplus
 extern "C" {

fmpz_mat_extras.h

@@ -26,8 +26,8 @@
 #ifndef FMPZ_MAT_EXTRAS_H
 #define FMPZ_MAT_EXTRAS_H
 
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz_mat.h"
+#include "flint/fmpz_mat.h"
 
 #ifdef __cplusplus
 extern "C" {

fmpz_mat_extras/test/t-transitive_closure.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "fmpz_mat_extras.h"
-#include "perm.h"
+#include "flint/perm.h"
 
 /* transitive closure can only turn zeros into ones */
 int

hypgeom.h

@@ -26,9 +26,9 @@
 #ifndef HYPGEOM_H
 #define HYPGEOM_H
 
+#include "flint/fmpz_poly.h"
 #include "arb.h"
 #include "mag.h"
-#include "fmpz_poly.h"
 
 #ifdef __cplusplus
 extern "C" {

hypgeom/bound.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include <math.h>
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "hypgeom.h"
 
 slong

hypgeom/estimate_terms_d.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include <math.h>
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "hypgeom.h"
 
 #define LOG2 0.69314718055994530942

mag.h

@@ -34,8 +34,8 @@
 
 #include <stdio.h>
 #include <math.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "fmpz.h"
+#include "flint/fmpz.h"
 #include "fmpz_extras.h"
 
 #ifdef __cplusplus

mag/d_log.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "mag.h"
-#include "double_extras.h"
 
 /*
 This is a bad implementation the logarithm function,

mag/exp.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "mag.h"
-#include "double_extras.h"
 
 static const double inverse_factorials[] = {
     1.0,

mag/get_d.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "mag.h"
 
 double

mag/log1p.c

@@ -23,8 +23,8 @@
 
 ******************************************************************************/
 
+#include "flint/double_extras.h"
 #include "mag.h"
-#include "double_extras.h"
 
 void
 mag_log1p(mag_t z, const mag_t x)

mag/test/t-cmp_2exp_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "mag.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

mag/test/t-d_log_lower_bound.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "mag.h"
 
 /* XXX: d_randtest is not good enough */

mag/test/t-d_log_upper_bound.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "mag.h"
 
 /* XXX: d_randtest is not good enough */

mag/test/t-mul_2exp_si.c

@@ -24,7 +24,7 @@
 ******************************************************************************/
 
 #include "mag.h"
-#include "long_extras.h"
+#include "flint/long_extras.h"
 
 int main()
 {

mag/test/t-set_d.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "mag.h"
 
 /* XXX: d_randtest is not good enough */

mag/test/t-set_d_2exp_fmpz.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "double_extras.h"
+#include "flint/double_extras.h"
 #include "mag.h"
 
 /* XXX: d_randtest is not good enough */

partitions.h

@@ -27,8 +27,8 @@
 #define PARTITIONS_H
 
 #include <math.h>
-#include "flint.h"
+#include "flint/flint.h"
-#include "arith.h"
+#include "flint/arith.h"
 #include "arb.h"
 
 #ifdef __cplusplus

partitions/hrr_sum_arb.c

@@ -24,8 +24,6 @@
 ******************************************************************************/
 
 #include "partitions.h"
-
-#include "arith.h"
 #include "arb.h"
 #include "math.h"
 

partitions/test/t-partitions_fmpz_ui.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "partitions.h"
 
 /* Values mod 10^9 generated with Sage */

partitions/test/t-partitions_fmpz_ui_threaded.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "partitions.h"
 
 /* Values mod 10^9 */

partitions/test/t-partitions_fmpz_ui_using_doubles.c

@@ -23,7 +23,7 @@
 
 ******************************************************************************/
 
-#include "arith.h"
+#include "flint/arith.h"
 #include "partitions.h"
 
 /* Values mod 10^9 generated with Sage */