diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3df2260..42c5629 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -16,7 +16,7 @@ CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CXXCPP = @CXXCPP@
-INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} -I${top_srcdir}/src -I${top_srcdir}/src/base -I${top_srcdir}/src/float -I${top_srcdir}/src/float/lfloat -I${top_srcdir}/src/integer -I${top_srcdir}/src/base/random -I${top_srcdir}/src/base/digitseq -I${top_srcdir}/src/base/digit -I../src/base -I${top_srcdir}/src/base
+INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} -I${top_srcdir}/src -I$(top_builddir)/src
 override CPPFLAGS += ${INCLUDES}
 LIBTOOL = @LIBTOOL@
 LIBTOOL_LINK = ${LIBTOOL} --mode=link
diff --git a/tests/test_MI.cc b/tests/test_MI.cc
index 691565d..89d0a40 100644
--- a/tests/test_MI.cc
+++ b/tests/test_MI.cc
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "cl_macros.h"
+#include "base/cl_macros.h"
 
 extern int test_MI_canonhom (int iterations);
 extern int test_MI_plus (int iterations);
diff --git a/tests/timeLFRAmul.cc b/tests/timeLFRAmul.cc
index af6a41f..3db524b 100644
--- a/tests/timeLFRAmul.cc
+++ b/tests/timeLFRAmul.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/rational.h>
 #include <cln/float_io.h>
 #include <cln/random.h>
diff --git a/tests/timeLFatan-compare.cc b/tests/timeLFatan-compare.cc
index 1f27540..6910c60 100644
--- a/tests/timeLFatan-compare.cc
+++ b/tests/timeLFatan-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFatan.cc b/tests/timeLFatan.cc
index ee2ac78..481d164 100644
--- a/tests/timeLFatan.cc
+++ b/tests/timeLFatan.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFatanh-compare.cc b/tests/timeLFatanh-compare.cc
index fc6415d..36343d7 100644
--- a/tests/timeLFatanh-compare.cc
+++ b/tests/timeLFatanh-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/complex.h>
 #include <cln/real.h>
 #include <cln/random.h>
diff --git a/tests/timeLFatanh.cc b/tests/timeLFatanh.cc
index 1d46238..ea1551a 100644
--- a/tests/timeLFatanh.cc
+++ b/tests/timeLFatanh.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/complex.h>
 #include <cln/complex_io.h>
 #include <cln/real.h>
diff --git a/tests/timeLFcos-compare.cc b/tests/timeLFcos-compare.cc
index aefbd56..63159ce 100644
--- a/tests/timeLFcos-compare.cc
+++ b/tests/timeLFcos-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFcos.cc b/tests/timeLFcos.cc
index 1681351..7d5ac8f 100644
--- a/tests/timeLFcos.cc
+++ b/tests/timeLFcos.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFcosh.cc b/tests/timeLFcosh.cc
index 9f346ca..3d6e178 100644
--- a/tests/timeLFcosh.cc
+++ b/tests/timeLFcosh.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFexp-compare.cc b/tests/timeLFexp-compare.cc
index 16fd06a..e963ce9 100644
--- a/tests/timeLFexp-compare.cc
+++ b/tests/timeLFexp-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFexp.cc b/tests/timeLFexp.cc
index 18c6fab..f060ac6 100644
--- a/tests/timeLFexp.cc
+++ b/tests/timeLFexp.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFln-compare.cc b/tests/timeLFln-compare.cc
index ba82b6d..9fa5eb9 100644
--- a/tests/timeLFln-compare.cc
+++ b/tests/timeLFln-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFln.cc b/tests/timeLFln.cc
index 224258c..f59eadc 100644
--- a/tests/timeLFln.cc
+++ b/tests/timeLFln.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFsin-compare.cc b/tests/timeLFsin-compare.cc
index eda9b7d..d6e26fc 100644
--- a/tests/timeLFsin-compare.cc
+++ b/tests/timeLFsin-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFsin.cc b/tests/timeLFsin.cc
index 2df7ab1..01cc741 100644
--- a/tests/timeLFsin.cc
+++ b/tests/timeLFsin.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFsinh.cc b/tests/timeLFsinh.cc
index c8f7170..a95406b 100644
--- a/tests/timeLFsinh.cc
+++ b/tests/timeLFsinh.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeLFsqrt.cc b/tests/timeLFsqrt.cc
index 5ace735..02722cd 100644
--- a/tests/timeLFsqrt.cc
+++ b/tests/timeLFsqrt.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>
diff --git a/tests/timeRALFdiv.cc b/tests/timeRALFdiv.cc
index 74e79f8..ec990bc 100644
--- a/tests/timeRALFdiv.cc
+++ b/tests/timeRALFdiv.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/rational.h>
 #include <cln/float_io.h>
 #include <cln/random.h>
diff --git a/tests/timecatalan.cc b/tests/timecatalan.cc
index a0cb822..fbb24ad 100644
--- a/tests/timecatalan.cc
+++ b/tests/timecatalan.cc
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])
diff --git a/tests/timediv2adic-compare.cc b/tests/timediv2adic-compare.cc
index e8dabb0..b682aa4 100644
--- a/tests/timediv2adic-compare.cc
+++ b/tests/timediv2adic-compare.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
diff --git a/tests/timediv2adic.cc b/tests/timediv2adic.cc
index 9ccc777..7918c97 100644
--- a/tests/timediv2adic.cc
+++ b/tests/timediv2adic.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
diff --git a/tests/timeeuler.cc b/tests/timeeuler.cc
index 5d2633b..40f44ea 100644
--- a/tests/timeeuler.cc
+++ b/tests/timeeuler.cc
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])
diff --git a/tests/timefact.cc b/tests/timefact.cc
index 894f028..572640c 100644
--- a/tests/timefact.cc
+++ b/tests/timefact.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/random.h>
-#include "cl_I.h"
+#include "integer/cl_I.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
diff --git a/tests/timerecip2adic-compare.cc b/tests/timerecip2adic-compare.cc
index 4e8857f..bf9bc3e 100644
--- a/tests/timerecip2adic-compare.cc
+++ b/tests/timerecip2adic-compare.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
diff --git a/tests/timerecip2adic.cc b/tests/timerecip2adic.cc
index 366f79b..fa2c38e 100644
--- a/tests/timerecip2adic.cc
+++ b/tests/timerecip2adic.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
diff --git a/tests/timezeta3.cc b/tests/timezeta3.cc
index b0f8608..eae434f 100644
--- a/tests/timezeta3.cc
+++ b/tests/timezeta3.cc
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])