diff --git a/test/triqs/arrays/array_algebra.cpp b/test/triqs/arrays/array_algebra.cpp
index 21e0c4a2..a0488a25 100644
--- a/test/triqs/arrays/array_algebra.cpp
+++ b/test/triqs/arrays/array_algebra.cpp
@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 #include <type_traits>
 
diff --git a/test/triqs/arrays/array_cache2.cpp b/test/triqs/arrays/array_cache2.cpp
index 81b3ed17..14b38e5a 100644
--- a/test/triqs/arrays/array_cache2.cpp
+++ b/test/triqs/arrays/array_cache2.cpp
@@ -21,9 +21,9 @@
 
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #define TRIQS_ARRAYS_CACHE_COPY_VERBOSE
-#include "./src/cache.hpp"
+#include <triqs/arrays/cache.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/array_mpi.cpp b/test/triqs/arrays/array_mpi.cpp
index 34276568..54af8d9b 100644
--- a/test/triqs/arrays/array_mpi.cpp
+++ b/test/triqs/arrays/array_mpi.cpp
@@ -20,7 +20,7 @@
  ******************************************************************************/
 #include "./common.hpp"
 // order of include in horrible : on mac + clang, array (in fact boost::tuple) must come before boost::mpi
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <boost/mpi.hpp>
 #include <iostream>
 #include <sstream>
diff --git a/test/triqs/arrays/assign_vect_array.cpp b/test/triqs/arrays/assign_vect_array.cpp
index b6f857f1..991c6c1e 100644
--- a/test/triqs/arrays/assign_vect_array.cpp
+++ b/test/triqs/arrays/assign_vect_array.cpp
@@ -21,8 +21,8 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/assignment.cpp b/test/triqs/arrays/assignment.cpp
index 9e264526..4a3c234b 100644
--- a/test/triqs/arrays/assignment.cpp
+++ b/test/triqs/arrays/assignment.cpp
@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/blas_lapack.cpp b/test/triqs/arrays/blas_lapack.cpp
index cd9eace2..d9b15d55 100644
--- a/test/triqs/arrays/blas_lapack.cpp
+++ b/test/triqs/arrays/blas_lapack.cpp
@@ -20,15 +20,15 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 
-#include "./src/blas_lapack/gemm.hpp"
-#include "./src/blas_lapack/gemv.hpp"
-#include "./src/blas_lapack/ger.hpp"
-#include "./src/blas_lapack/axpy.hpp"
+#include <triqs/arrays/blas_lapack/gemm.hpp>
+#include <triqs/arrays/blas_lapack/gemv.hpp>
+#include <triqs/arrays/blas_lapack/ger.hpp>
+#include <triqs/arrays/blas_lapack/axpy.hpp>
 
 #include <iostream>
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/bound_check.cpp b/test/triqs/arrays/bound_check.cpp
index 035cf4c6..4c478226 100644
--- a/test/triqs/arrays/bound_check.cpp
+++ b/test/triqs/arrays/bound_check.cpp
@@ -21,8 +21,8 @@
 #define TRIQS_ARRAYS_ENFORCE_BOUNDCHECK
 
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/common.hpp b/test/triqs/arrays/common.hpp
index 97603111..ac1297a1 100644
--- a/test/triqs/arrays/common.hpp
+++ b/test/triqs/arrays/common.hpp
@@ -21,10 +21,10 @@
  ******************************************************************************/
 #ifndef COMMON_TEST_ARRAY_H
 #define COMMON_TEST_ARRAY_H
-#include <iostream>
 #include <triqs/arrays.hpp>
 #include <triqs/arrays/asserts.hpp>
 #include<sstream>
+#include <iostream>
 
 #define TEST(X) std::cout << BOOST_PP_STRINGIZE((X)) << " ---> "<< (X) <<std::endl;
 
diff --git a/test/triqs/arrays/compound_ops.cpp b/test/triqs/arrays/compound_ops.cpp
index 1792f3d2..03d70060 100644
--- a/test/triqs/arrays/compound_ops.cpp
+++ b/test/triqs/arrays/compound_ops.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/const_view.cpp b/test/triqs/arrays/const_view.cpp
index c18a56bd..ea42a489 100644
--- a/test/triqs/arrays/const_view.cpp
+++ b/test/triqs/arrays/const_view.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/create.cpp b/test/triqs/arrays/create.cpp
index 59f1c2db..d9d57d05 100644
--- a/test/triqs/arrays/create.cpp
+++ b/test/triqs/arrays/create.cpp
@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 
diff --git a/test/triqs/arrays/cross_construct.cpp b/test/triqs/arrays/cross_construct.cpp
index 631729ec..a4fb1805 100644
--- a/test/triqs/arrays/cross_construct.cpp
+++ b/test/triqs/arrays/cross_construct.cpp
@@ -19,9 +19,9 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/dot.cpp b/test/triqs/arrays/dot.cpp
index 19d5f95e..b61704b3 100644
--- a/test/triqs/arrays/dot.cpp
+++ b/test/triqs/arrays/dot.cpp
@@ -21,11 +21,11 @@
 #include "./common.hpp"
 #include <iostream>
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/blas_lapack/dot.hpp"
-#include "./src/asserts.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/blas_lapack/dot.hpp>
+#include <triqs/arrays/asserts.hpp>
 
 using namespace triqs::arrays;
 
diff --git a/test/triqs/arrays/eigenelements.cpp b/test/triqs/arrays/eigenelements.cpp
index 7f854f2a..f20ab538 100644
--- a/test/triqs/arrays/eigenelements.cpp
+++ b/test/triqs/arrays/eigenelements.cpp
@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/linalg/eigenelements.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/linalg/eigenelements.hpp>
 
 #include <iostream>
 
diff --git a/test/triqs/arrays/ellipsis.cpp b/test/triqs/arrays/ellipsis.cpp
index 0f212a72..60251518 100644
--- a/test/triqs/arrays/ellipsis.cpp
+++ b/test/triqs/arrays/ellipsis.cpp
@@ -20,10 +20,10 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/expr_matrix.cpp b/test/triqs/arrays/expr_matrix.cpp
index 591249ba..5afbaa56 100644
--- a/test/triqs/arrays/expr_matrix.cpp
+++ b/test/triqs/arrays/expr_matrix.cpp
@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <iostream>
 #include <triqs/arrays/asserts.hpp>
diff --git a/test/triqs/arrays/fill_with_lazy.cpp b/test/triqs/arrays/fill_with_lazy.cpp
index 983bbb82..ec475826 100644
--- a/test/triqs/arrays/fill_with_lazy.cpp
+++ b/test/triqs/arrays/fill_with_lazy.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 namespace tqa=triqs::arrays; namespace tql=triqs::clef;
 
diff --git a/test/triqs/arrays/fold_expression.cpp b/test/triqs/arrays/fold_expression.cpp
index 5d5b1be1..50262826 100644
--- a/test/triqs/arrays/fold_expression.cpp
+++ b/test/triqs/arrays/fold_expression.cpp
@@ -20,10 +20,10 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/matrix.hpp"
-#include "./src/functional/fold.hpp"
-#include "./src/functional/map.hpp"
-#include "./src/algorithms.hpp"
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/functional/fold.hpp>
+#include <triqs/arrays/functional/map.hpp>
+#include <triqs/arrays/algorithms.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/h5_stack.cpp b/test/triqs/arrays/h5_stack.cpp
index 14edb661..8feb77c3 100644
--- a/test/triqs/arrays/h5_stack.cpp
+++ b/test/triqs/arrays/h5_stack.cpp
@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/h5/array_stack.hpp"
-#include "./src/h5/simple_read_write.hpp"
+#include <triqs/arrays/h5/array_stack.hpp>
+#include <triqs/arrays/h5/simple_read_write.hpp>
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 using std::cout; using std::endl;
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/h5_string_arrays.cpp b/test/triqs/arrays/h5_string_arrays.cpp
index 83c78c6d..1a32a4a4 100644
--- a/test/triqs/arrays/h5_string_arrays.cpp
+++ b/test/triqs/arrays/h5_string_arrays.cpp
@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
-#include "./src/h5/simple_read_write.hpp"
-#include "./src/asserts.hpp"
+#include <triqs/arrays/h5/simple_read_write.hpp>
+#include <triqs/arrays/asserts.hpp>
 #include <triqs/h5.hpp>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/h5_vector_array.cpp b/test/triqs/arrays/h5_vector_array.cpp
index 07aa9342..2ad20de2 100644
--- a/test/triqs/arrays/h5_vector_array.cpp
+++ b/test/triqs/arrays/h5_vector_array.cpp
@@ -20,7 +20,7 @@
  ******************************************************************************/
 #include "./common.hpp"
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 #include <triqs/h5.hpp>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/hdf5.cpp b/test/triqs/arrays/hdf5.cpp
index c1e1829a..ceda54d1 100644
--- a/test/triqs/arrays/hdf5.cpp
+++ b/test/triqs/arrays/hdf5.cpp
@@ -19,9 +19,9 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
-#include "./src/h5/simple_read_write.hpp"
+#include <triqs/arrays/h5/simple_read_write.hpp>
 
 using std::cout; using std::endl;
 namespace tqa = triqs::arrays;
diff --git a/test/triqs/arrays/init_list.cpp b/test/triqs/arrays/init_list.cpp
index 24539e75..6d50b934 100644
--- a/test/triqs/arrays/init_list.cpp
+++ b/test/triqs/arrays/init_list.cpp
@@ -21,16 +21,14 @@
 #include "./common.hpp"
 #include <iostream>
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
 
 using namespace triqs::arrays;
 
 int main(int argc, char **argv) {
 
-// only for icc 13.x
-#ifndef TRIQS_WORKAROUND_INTEL_COMPILER_BUGS 
  array<double,1> A = {1,2,3,4};
  std::cout  << A<< A.shape()<<std::endl ;
 
@@ -43,9 +41,6 @@ int main(int argc, char **argv) {
  matrix<double> M = {{1,2},{3,4}, {5,6}};
  std::cout  << M<< M.shape()<<std::endl ;
 
-
-#endif
-
 }
 
 
diff --git a/test/triqs/arrays/inverse2.cpp b/test/triqs/arrays/inverse2.cpp
index eaba9d45..06c3013f 100644
--- a/test/triqs/arrays/inverse2.cpp
+++ b/test/triqs/arrays/inverse2.cpp
@@ -20,10 +20,10 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/iterators.cpp b/test/triqs/arrays/iterators.cpp
index 6a2d0b55..a61a3b7b 100644
--- a/test/triqs/arrays/iterators.cpp
+++ b/test/triqs/arrays/iterators.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/lexico_vector.cpp b/test/triqs/arrays/lexico_vector.cpp
index c3b47076..b01ef6a0 100644
--- a/test/triqs/arrays/lexico_vector.cpp
+++ b/test/triqs/arrays/lexico_vector.cpp
@@ -22,10 +22,10 @@
 #include <iostream>
 #include <algorithm>
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/asserts.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/asserts.hpp>
 
 using namespace triqs::arrays;
 
diff --git a/test/triqs/arrays/map_expression.cpp b/test/triqs/arrays/map_expression.cpp
index c65a2e10..5a64ffb9 100644
--- a/test/triqs/arrays/map_expression.cpp
+++ b/test/triqs/arrays/map_expression.cpp
@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/functional/map.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/functional/map.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 #include <algorithm>
 
diff --git a/test/triqs/arrays/mapped_functions.cpp b/test/triqs/arrays/mapped_functions.cpp
index 77d95f58..691f2563 100644
--- a/test/triqs/arrays/mapped_functions.cpp
+++ b/test/triqs/arrays/mapped_functions.cpp
@@ -20,9 +20,9 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/mapped_functions.hpp"
-#include "./src/matrix.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/mapped_functions.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/mat_vec_mul.cpp b/test/triqs/arrays/mat_vec_mul.cpp
index db02659b..5beba3e7 100644
--- a/test/triqs/arrays/mat_vec_mul.cpp
+++ b/test/triqs/arrays/mat_vec_mul.cpp
@@ -20,11 +20,11 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/mat_vec_mul2.cpp b/test/triqs/arrays/mat_vec_mul2.cpp
index f2cbd3ed..a3d7853c 100644
--- a/test/triqs/arrays/mat_vec_mul2.cpp
+++ b/test/triqs/arrays/mat_vec_mul2.cpp
@@ -20,12 +20,12 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
-#include "./src/asserts.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/asserts.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/move.cpp b/test/triqs/arrays/move.cpp
index 9688733e..0f3ef552 100644
--- a/test/triqs/arrays/move.cpp
+++ b/test/triqs/arrays/move.cpp
@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/negate.cpp b/test/triqs/arrays/negate.cpp
index b515a37c..117aebe7 100644
--- a/test/triqs/arrays/negate.cpp
+++ b/test/triqs/arrays/negate.cpp
@@ -19,12 +19,12 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
-#include "./src/vector.hpp"
-#include "./src/asserts.hpp"
-#include "./src/algorithms.hpp"
-#include "./src/mapped_functions.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/asserts.hpp>
+#include <triqs/arrays/algorithms.hpp>
+#include <triqs/arrays/mapped_functions.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/non_numeric.cpp b/test/triqs/arrays/non_numeric.cpp
index 5ce8dc4e..452b1e8b 100644
--- a/test/triqs/arrays/non_numeric.cpp
+++ b/test/triqs/arrays/non_numeric.cpp
@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/printing.cpp b/test/triqs/arrays/printing.cpp
index d7e76c7d..c9e17c98 100644
--- a/test/triqs/arrays/printing.cpp
+++ b/test/triqs/arrays/printing.cpp
@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 //using std::cout; using std::endl;
diff --git a/test/triqs/arrays/scalar_assign.cpp b/test/triqs/arrays/scalar_assign.cpp
index a1d02fbf..7f0e9a7b 100644
--- a/test/triqs/arrays/scalar_assign.cpp
+++ b/test/triqs/arrays/scalar_assign.cpp
@@ -21,9 +21,9 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
-#include "./src/matrix.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/serialization.cpp b/test/triqs/arrays/serialization.cpp
index 5737b269..6bd89f99 100644
--- a/test/triqs/arrays/serialization.cpp
+++ b/test/triqs/arrays/serialization.cpp
@@ -22,7 +22,7 @@
 #define TRIQS_ARRAYS_ENFORCE_BOUNDCHECK
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 #include <fstream>
 
diff --git a/test/triqs/arrays/src b/test/triqs/arrays/src
deleted file mode 120000
index a8efa258..00000000
--- a/test/triqs/arrays/src
+++ /dev/null
@@ -1 +0,0 @@
-../../../triqs/arrays
\ No newline at end of file
diff --git a/test/triqs/arrays/swap.cpp b/test/triqs/arrays/swap.cpp
index c0eb3ddb..7c23cbbd 100644
--- a/test/triqs/arrays/swap.cpp
+++ b/test/triqs/arrays/swap.cpp
@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/array.hpp>
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 namespace tqa=triqs::arrays;
diff --git a/test/triqs/arrays/temp_slice.cpp b/test/triqs/arrays/temp_slice.cpp
index 69722606..794a14b9 100644
--- a/test/triqs/arrays/temp_slice.cpp
+++ b/test/triqs/arrays/temp_slice.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/tridiag.cpp b/test/triqs/arrays/tridiag.cpp
index 5129975b..7f51b2aa 100644
--- a/test/triqs/arrays/tridiag.cpp
+++ b/test/triqs/arrays/tridiag.cpp
@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/linalg/eigenelements.hpp"
-#include "./src/blas_lapack/stev.hpp"
+#include <triqs/arrays/linalg/eigenelements.hpp>
+#include <triqs/arrays/blas_lapack/stev.hpp>
 using namespace triqs::arrays;
 using namespace triqs;
 
diff --git a/test/triqs/arrays/vector_brack.cpp b/test/triqs/arrays/vector_brack.cpp
index fc66662d..3d8e162d 100644
--- a/test/triqs/arrays/vector_brack.cpp
+++ b/test/triqs/arrays/vector_brack.cpp
@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 using std::cout; using std::endl;
 using namespace triqs::arrays;
diff --git a/test/triqs/arrays/vector_cmul.cpp b/test/triqs/arrays/vector_cmul.cpp
index 09d000b0..2a6cc40a 100644
--- a/test/triqs/arrays/vector_cmul.cpp
+++ b/test/triqs/arrays/vector_cmul.cpp
@@ -22,7 +22,7 @@
 
 #include "./common.hpp"
 
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/vector_copy.cpp b/test/triqs/arrays/vector_copy.cpp
index b0a01f4a..c62c3c35 100644
--- a/test/triqs/arrays/vector_copy.cpp
+++ b/test/triqs/arrays/vector_copy.cpp
@@ -22,7 +22,7 @@
 
 #include "./common.hpp"
 
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/views.cpp b/test/triqs/arrays/views.cpp
index bc45a3be..69a862db 100644
--- a/test/triqs/arrays/views.cpp
+++ b/test/triqs/arrays/views.cpp
@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/views3.cpp b/test/triqs/arrays/views3.cpp
index d6fe9935..e50fa07e 100644
--- a/test/triqs/arrays/views3.cpp
+++ b/test/triqs/arrays/views3.cpp
@@ -21,7 +21,7 @@
 #include "./common.hpp"
 #define ARRAY_DEBUG_SLICE
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/test/triqs/arrays/withSTL.cpp b/test/triqs/arrays/withSTL.cpp
index 4c393de6..8a277bbb 100644
--- a/test/triqs/arrays/withSTL.cpp
+++ b/test/triqs/arrays/withSTL.cpp
@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;
diff --git a/triqs/utility/complex_ops.hpp b/triqs/utility/complex_ops.hpp
index 0b6bba80..3503ffb6 100644
--- a/triqs/utility/complex_ops.hpp
+++ b/triqs/utility/complex_ops.hpp
@@ -2,10 +2,8 @@
 #define TRIQS_UTILITY_COMPLEX_OPS_H
 #include <complex> 
 
-#ifndef TRIQS_WORKAROUND_INTEL_COMPILER_14_BUGS   
 inline  std::complex<double> operator"" _j ( long double x ) { return std::complex<double>(0,x); }
 inline  std::complex<double> operator"" _j ( unsigned long long x ) { return std::complex<double>(0,x); }
-#endif
 
 namespace std { // has to be in the right namespace for ADL !