diff --git a/CMakeLists.txt b/CMakeLists.txt
index b40d365f8dd1d16b128571a9a06afcea01ca8402..f106b6f4934e9a8b22e16516cdac23be57b6b715 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1012,6 +1012,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 # Coreblas library (kernels for CPUs) #
 #######################################
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/coreblas/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/coreblas/include)
 add_subdirectory(coreblas)
 #------------------------------------------------------------------------------
 
@@ -1021,6 +1023,8 @@ add_subdirectory(coreblas)
 ########################################
 
 if(CHAMELEON_USE_CUDA)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/cudablas/include)
+    include_directories(${CMAKE_CURRENT_BINARY_DIR}/cudablas/include)
     add_subdirectory(cudablas)
 endif()
 #------------------------------------------------------------------------------
diff --git a/compute/zgesvd.c b/compute/zgesvd.c
index 4aea26f51876378bf7435b626237f9c3f31afe1f..044a9e811baa2aeff6bbff6a695d0edf3e58eb4f 100644
--- a/compute/zgesvd.c
+++ b/compute/zgesvd.c
@@ -23,7 +23,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**
diff --git a/compute/zheevd.c b/compute/zheevd.c
index 671ffc5c16a668ce5c046075bde6b9841eee5dda..ea0aad7e1e7ae0197478946585f68da283f1c1ef 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -23,7 +23,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**
diff --git a/compute/zhetrd.c b/compute/zhetrd.c
index e3a6179cc2d1f430bdca9ff15308364c7ea27297..5227c5707615bc14cf6f01f1497612a62eebce2e 100644
--- a/compute/zhetrd.c
+++ b/compute/zhetrd.c
@@ -25,7 +25,7 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "control/common.h"
 
 /***************************************************************************//**
diff --git a/control/common.h b/control/common.h
index a6890efa05c744634e2c4993988757cdeb725d9d..64d8fa07be12976b0dd06d5703d748ab11f3609c 100644
--- a/control/common.h
+++ b/control/common.h
@@ -77,9 +77,9 @@
  **/
 #include "morse.h"
 
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 #if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
-#include "cudablas/include/cudablas.h"
+#include "cudablas.h"
 #endif
 
 #include "control/global.h"
diff --git a/control/morse_f77.h b/control/morse_f77.h
index ed898be11aa9ba076492395540438b476703423d..49f2d6ede949a119178f193425c96dfa0716aa2f 100644
--- a/control/morse_f77.h
+++ b/control/morse_f77.h
@@ -24,7 +24,7 @@
 #ifndef _MORSE_F77_H_
 #define _MORSE_F77_H_
 
-#include "include/morse_mangling.h"
+#include "chameleon/morse_mangling.h"
 
 /** ****************************************************************************
  *  Determine FORTRAN names
diff --git a/example/basic_zposv/basic_posv.h b/example/basic_zposv/basic_posv.h
index 9373f661ca8b0b8b7a20663f51f9cdd406b43cb3..2b3e015c201fbad7bc09ce654444f1eeb177892a 100644
--- a/example/basic_zposv/basic_posv.h
+++ b/example/basic_zposv/basic_posv.h
@@ -47,10 +47,10 @@
 #include <sys/resource.h>
 #endif
 
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas.h>
 
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
diff --git a/example/lapack_to_morse/step0.c b/example/lapack_to_morse/step0.c
index f6e84e907aea21e8a6758f40baf17f76d3553565..ef52684f1f91efede31bf3e0dc4fdccb8ad9f33e 100644
--- a/example/lapack_to_morse/step0.c
+++ b/example/lapack_to_morse/step0.c
@@ -23,7 +23,7 @@
  **/
 
 #include "step0.h"
-#include <coreblas/include/coreblas.h>
+#include <coreblas.h>
 
 /*
  * @brief step0 is a simple Cholesky example using the C interface of
diff --git a/example/lapack_to_morse/step0.h b/example/lapack_to_morse/step0.h
index f5b776c3318ea2fe2593d8d5a4094dbf54677909..9f1a4b610d819536cb1cf84813ac65985ff04ff1 100644
--- a/example/lapack_to_morse/step0.h
+++ b/example/lapack_to_morse/step0.h
@@ -32,8 +32,8 @@
 #ifndef CBLAS_SADDR
 #define CBLAS_SADDR( _val_ ) &(_val_)
 #endif
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
 
 /* Integer parameters for step0 */
 enum iparam_step0 {
diff --git a/example/lapack_to_morse/step1.h b/example/lapack_to_morse/step1.h
index 4ee136cc019f455b9590420e83c825ba647a0f6a..99637d2f297df3dd946413e48f7ee90a23ddfe0f 100644
--- a/example/lapack_to_morse/step1.h
+++ b/example/lapack_to_morse/step1.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 1 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step1 */
diff --git a/example/lapack_to_morse/step2.h b/example/lapack_to_morse/step2.h
index 455b57befd08b202ca1a618add93f58df8703baf..199394bea60084855fd881d4531947f0a98b2c3f 100644
--- a/example/lapack_to_morse/step2.h
+++ b/example/lapack_to_morse/step2.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 2 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include "morse.h"
 
 /* Integer parameters for step2 */
diff --git a/example/lapack_to_morse/step3.h b/example/lapack_to_morse/step3.h
index f27132feede6050d5e8b2e3082534e01bd0532d0..c40c190390a4f276527468abfbcf204fba1765e8 100644
--- a/example/lapack_to_morse/step3.h
+++ b/example/lapack_to_morse/step3.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 3 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step3 */
diff --git a/example/lapack_to_morse/step4.h b/example/lapack_to_morse/step4.h
index f77a56dd9cce3e28401aca65895f064090f1f345..da805639ce8a2a56c455e1b8528b60bfbac6ad61 100644
--- a/example/lapack_to_morse/step4.h
+++ b/example/lapack_to_morse/step4.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 4 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step4 */
diff --git a/example/lapack_to_morse/step5.h b/example/lapack_to_morse/step5.h
index e6d880763cf5c5c76b4aff3a36549364df946a5a..ff5cb91f8195310ead7d569a8c9491af407c6289 100644
--- a/example/lapack_to_morse/step5.h
+++ b/example/lapack_to_morse/step5.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 5 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step5 */
diff --git a/example/lapack_to_morse/step6.h b/example/lapack_to_morse/step6.h
index 0cb6d8a1cb31caa1fcdbacdd2a0e2403220b003a..cbcfb6dbc2d24a5367ffb3f9cdcf5986078d1379 100644
--- a/example/lapack_to_morse/step6.h
+++ b/example/lapack_to_morse/step6.h
@@ -29,7 +29,7 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 6 */
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
diff --git a/example/lapack_to_morse/step7.h b/example/lapack_to_morse/step7.h
index 3e452380944cc2ecf84dfdb484fe91f7549d889f..b916e319f65ecdebc356b6f8f51b2952c973f4c8 100644
--- a/example/lapack_to_morse/step7.h
+++ b/example/lapack_to_morse/step7.h
@@ -30,8 +30,8 @@
 #include "lapack_to_morse.h"
 
 /* Specific includes for step 7 */
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include <morse.h>
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
diff --git a/example/link_chameleon/link_chameleon.c b/example/link_chameleon/link_chameleon.c
index b63b45e327f14fa0cc3ffdc8adc5dee8e135e954..0aeb255eb24a1f138e229b7eefe9e1d0a29e4354 100644
--- a/example/link_chameleon/link_chameleon.c
+++ b/example/link_chameleon/link_chameleon.c
@@ -100,7 +100,7 @@ double cWtime(void)
     gettimeofday( &tp, NULL );
     return tp.tv_sec + 1e-6 * tp.tv_usec;
 }
-#include <coreblas/include/lapacke.h>
+#include <coreblas/lapacke.h>
 #include <morse.h>
 
 /* Integer parameters for step1 */
diff --git a/example/out_of_core/out_of_core.h b/example/out_of_core/out_of_core.h
index 95a25dcbcf149999e1ad5046a7f03ea783c97406..dce72d9bcafde47051fe07fe939ccd4200b9fc26 100644
--- a/example/out_of_core/out_of_core.h
+++ b/example/out_of_core/out_of_core.h
@@ -48,7 +48,7 @@
 #endif
 
 #include <starpu.h>
-#include "coreblas/include/lapacke.h"
+#include "coreblas/lapacke.h"
 #include "morse.h"
 #include "control/common.h"
 
diff --git a/lib/pkgconfig/chameleon.pc.in b/lib/pkgconfig/chameleon.pc.in
index 028e3d907b9dd26401d65f584826615262400a5d..80f9dabe1fb8fa8d513aff49c1cc54377b966f0d 100644
--- a/lib/pkgconfig/chameleon.pc.in
+++ b/lib/pkgconfig/chameleon.pc.in
@@ -1,12 +1,12 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include/chameleon
+includedir=${exec_prefix}/include
 
 Name: chameleon
 Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
 Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_MICRO@
-Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir} -I${includedir}/coreblas/include
+Cflags: @CHAMELEON_PKGCONFIG_DEFINITIONS@ -I${includedir}
 Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
 Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
 Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
diff --git a/lib/pkgconfig/coreblas.pc.in b/lib/pkgconfig/coreblas.pc.in
index 26b1dbb179450f0f04e77d7e15bf441584bab3d6..64fd9b165ea6af305ab3ec604fd997339de3d764 100644
--- a/lib/pkgconfig/coreblas.pc.in
+++ b/lib/pkgconfig/coreblas.pc.in
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include/chameleon/coreblas/include
+includedir=${exec_prefix}/include
 
 Name: coreblas
 Description: Interface to CBLAS/LAPACKE routines + some other auxiliary routines
diff --git a/lib/pkgconfig/cudablas.pc.in b/lib/pkgconfig/cudablas.pc.in
index db3f0f14c51c65d3ab245d2cc5371f412646311d..b0b94291c427be267e102b37703b661721caf912 100644
--- a/lib/pkgconfig/cudablas.pc.in
+++ b/lib/pkgconfig/cudablas.pc.in
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include/chameleon/cudablas/include
+includedir=${exec_prefix}/include
 
 Name: cudablas
 Description: Interface to cuBLAS/MAGMA routines + some other auxiliary routines
diff --git a/runtime/quark/codelets/codelet_zgessm.c b/runtime/quark/codelets/codelet_zgessm.c
index 3278c19818bab1de70e8114d088df0fcb1a02a89..e4e767a7b079a5aa99158e1621128c23c86300c2 100644
--- a/runtime/quark/codelets/codelet_zgessm.c
+++ b/runtime/quark/codelets/codelet_zgessm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 
 #include "runtime/quark/include/morse_quark.h"
 
diff --git a/runtime/quark/codelets/codelet_zpamm.c b/runtime/quark/codelets/codelet_zpamm.c
index 6334c1479dbbeeaa53fc77b7abc2371f7bdac988..dcf944d4f5136e898d5b29c3cca2d453aeb1a602 100644
--- a/runtime/quark/codelets/codelet_zpamm.c
+++ b/runtime/quark/codelets/codelet_zpamm.c
@@ -27,7 +27,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 
 #include "runtime/quark/include/morse_quark.h"
 
diff --git a/runtime/quark/codelets/codelet_zssssm.c b/runtime/quark/codelets/codelet_zssssm.c
index 0134cedb84895007214949486460a0695337acba..25466a851e2cbf8920123f661256022feacb9ef9 100644
--- a/runtime/quark/codelets/codelet_zssssm.c
+++ b/runtime/quark/codelets/codelet_zssssm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 #include "runtime/quark/include/morse_quark.h"
 
 /***************************************************************************//**
diff --git a/runtime/quark/codelets/codelet_ztstrf.c b/runtime/quark/codelets/codelet_ztstrf.c
index 31e9c34ca7a013949af9145d5fb21531b6ad3008..6243a2aa9a0a98c711707049964c544fb905adba 100644
--- a/runtime/quark/codelets/codelet_ztstrf.c
+++ b/runtime/quark/codelets/codelet_ztstrf.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/quark/include/morse_quark.h"
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 #include <math.h>
 
 /***************************************************************************//**
diff --git a/runtime/quark/include/morse_quark.h b/runtime/quark/include/morse_quark.h
index 2c4dc590b80725a669b731606761b240a0de9579..668531873eff69714342b7fd5aaf24952c09ac4b 100644
--- a/runtime/quark/include/morse_quark.h
+++ b/runtime/quark/include/morse_quark.h
@@ -27,7 +27,7 @@
 #define _MORSE_QUARK_H_
 
 #include <quark.h>
-#include "coreblas/include/coreblas.h"
+#include "coreblas/coreblas.h"
 #include "runtime/quark/include/quark_blas.h"
 #include "runtime/quark/include/core_blas_dag.h"
 
diff --git a/runtime/quark/include/quark_blas.h b/runtime/quark/include/quark_blas.h
index 56c97922bbd6dc2736c3cdc2cf226e933ccb9a14..fc175fdfe2551ce29ea6446fd03ed60a0408f065 100644
--- a/runtime/quark/include/quark_blas.h
+++ b/runtime/quark/include/quark_blas.h
@@ -25,7 +25,7 @@
 #ifndef _QUARK_BLAS_H_
 #define _QUARK_BLAS_H_
 
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 
 #include "runtime/quark/include/quark_zblas.h"
 #include "runtime/quark/include/quark_dblas.h"
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index 2323b95e6d2a4e72ee6a0b13842c7d31e678132a..5d9431088e755464dd1c6b751044e01e4a68e11c 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -26,7 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-#include "runtime_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_dzasum(const MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, int M, int N,
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index 56b03bfe80a83d0cf9856e72d261112cb510fff5..cc6e9868d6050402d2fc30ed65fba41291737e17 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -24,6 +24,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zaxpy(const MORSE_option_t *options,
                       int M, MORSE_Complex64_t alpha,
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index 6271384564537e164713f4c5d1fc45a03117509b..89d89a5473c547c438c1de3039f378b8debbe6be 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -31,8 +31,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-
-
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zbuild( const MORSE_option_t *options,
                         const MORSE_desc_t *A, int Am, int An, int lda,
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index a65b6daf5345bf539002703dea82ff61d9244905..66ffc50888538893515e17a7864346ba197362f9 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -28,6 +28,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  ******************************************************************************
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index e215ce20f9898969a609b186b433522efcf77126..e6e681f7be09fbbd039c19b3a467fddad5eedd3c 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 90fe880a741d756713ef0083fd4a73a83f1e225f..ab666dd70e9d46b3b9e771a165a4aca828f76b46 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index 595bafa1b86321d57ec47e76f2dfdd96922801d9..06602939feb2546a93c960c1846f5e45084e16f8 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index 1b5a72908c1b76b9a1b34b46d62e3a65cbf02153..5d8c1d3ebe43eeb7909f9929f5316585d2fc0c36 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -28,10 +28,10 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-
+#include "coreblas/cblas.h"
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index 094c7ba09e7da55c4774cd6d6ce6f68805e6cd16..62ef1bd974b982c1f8222a47a7486c188a9c7638 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgessq( const MORSE_option_t *options,
                         int m, int n,
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index e9b5327bfc6ef02a5dbec929ed096cac06ae2dc7..8c40ed79e79f81edea425e27883613cce014cba3 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -26,9 +26,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgetrf(const MORSE_option_t *options,
                        int m, int n, int nb,
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index bc91e972a6d224bd783a0dc1ba02cfae6fdbf734..00351134bbfd0887660f01862869a34ef548fde6 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index 8ca85664bf98c89e205b848e96642a6a0d859175..7386a396762a8b81877bac88663ae69f45c11251 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -27,6 +27,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index 6551a8fbb0fe55b06a341c55f0e8aa17345bb59a..26fe36caef02981623355da01bdaa104e571e27d 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/runtime/starpu/codelets/codelet_zhe2ge.c
@@ -22,6 +22,7 @@
 
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 97f0adcc5b3fbf1c275e5feded3fa258b77ed12f..5f369fbadff6c5a80d1de1e7948274523aa964cf 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 7c5509240eb3893fab6e471a2d7beed51159f41c..cd0641030d801369a733e4e22a6d89caf0948c96 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index 8b6c5d8d37e80d64da4d526554faaf2d0e67d4be..3a1dbfd68b5fb21cca7f44438ca288501ddcb368 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/runtime/starpu/codelets/codelet_zherfb.c
@@ -24,6 +24,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 0576cef52ac2abcca50dbfc36ed5422746f4c5a1..d06ea0e221b7271d08ca5d383170c623fb322d2d 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index 8f9ddf984bfb5533e6c93e6c9eabd636cd7cddd5..42b75ab04fa2ebb1e3f1bae52cdd5107cd8ff0fa 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zhessq( const MORSE_option_t *options,
                         MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 99274e18383f14a36c6e117528eeabbf483aaf49..13f5169b08b2c52981617403c27d8ee33a2ae09a 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index f09c80846b3ba17e2decea7b2aed145c1c858c66..e099bda20550d8dd71d7bc073520ee10f395e85f 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -26,9 +26,9 @@
  * @precisions mixed zc -> ds
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 9571eec74fdafabafd27866d5de9a040857fdad8..9a19ff26af7e7556c382ae19b2dd3f9d1a805a1f 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -26,9 +26,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlange(const MORSE_option_t *options,
                        MORSE_enum norm, int M, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 37725f178d09623af6933cc63217a0ddb8d8ea14..9b57a8a2877acd9b2196c30038a34e7f00a041fa 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -28,6 +28,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlanhe(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index dd01215c23e4da1334215d5e54124b1f51bda397..734521c0279068c2daeffe8b3b33fba34cfdab69 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -26,9 +26,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlansy(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index e950fd7e2606f3a19462cf89bffcd83066d38170..171bf8fa9c082bc9f4c804d6ab2e191ba3860551 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlantr(const MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 614962ed4e5420d504e64a2f0ba4b10df3fa0e24..e18cdd955b9e8485da4a4e071fba3fc981cbc490 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index fcba9efaa1de298206aefb5afa87afb065ab8eab..0e59f1bee51a82051407f6187e0ac16751ae7cde 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -27,9 +27,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 
 /**
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 0d5efc1de99e772b81572793b1ec21a0aa6d2e9d..9f9c68d5dd31ae85005b830b97cc15f3482bc231 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -27,9 +27,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 
 /**
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index 9faa75eb64cafc605c736e0f79e17f3a15aabf1f..7d21a094fbf1df9aa79b85ec009bc5471f050227 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 7f23c56821d3f39b14fda2e2828da23cb118f17f..f370f6c6faf58faea3a42d4521b776cd8e5d8233 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 79ff9238fa36e4fe5ddfaf0c8f2ea8ac9d6a38b8..289d4c4b81e6bb14ede8ab708d75cf1bda113c48 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
 
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index cbe5f9ee2970b7f924aa46303b167640e3db69bb..f925eb038a97be31004e203ee96615fbbd371dec 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -30,7 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-
+#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
 
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index b8c96b26348d48af715214639e7657d03e22f25b..9bea322d98270e2ca0a560a499a28f8eb4589d02 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -30,7 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-
+#include "chameleon/morse_tasks_z.h"
 
 /*   MORSE_TASK_zplrnt - Generate a tile for random matrix. */
 
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 75538476ebfe37346cb37be9276222076acbb106..896cb8f71141196a7b03764f5dad370bb193c9e3 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -27,6 +27,7 @@
 #include <math.h>
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index 686814274424ef112cf8bb90ca6c44333e8af9f3..d9d056affe46fa4c343c1ca696d639c8c4e57388 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index 6d1c3ee08cefee4ab99bd72354fb4c1cb6684ef9..b2221899bd8ab8fdccdb27e06b18828168515d8e 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -28,9 +28,10 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index bb01bfc7bac752da147983e5ac3a7640836d1925..fcf2b3bf28a2d2e2d883a5b41dae485a8e5bed9c 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index aec9d75f5a5f43dc087dfdcbb684cc5b68216b12..9462a4672b54a30c2685a738078840095d2f7b58 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 265a8922d43779fc8897c4a26e48f6ac3d034ea9..44e465d32e8a622f218473593ffa33174d00a52c 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 882650f2865138f4d3e804631de879e1add16b04..5c8e35900db169c85e0916de3a6dda51b6cef49f 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsyssq( const MORSE_option_t *options,
                         MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 002591071b3b5a7509b9e4941732a264bfc1aaed..5c3c2851a290dde5e3cc538c239237c5cae1337b 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -30,7 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
                              MORSE_enum uplo, int n, int nb,
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index b07702888352d4402837a23c8f63a15fc74eeeaf..77ba67c74a2737ac9c37693d69dc051017a27d5d 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *
diff --git a/runtime/starpu/codelets/codelet_ztpmqrt.c b/runtime/starpu/codelets/codelet_ztpmqrt.c
index c1344760444deb6f292017ed0252eb0c7d9188df..db5db63fcd3f0ef76b715c0ee7c813bb3034f8a8 100644
--- a/runtime/starpu/codelets/codelet_ztpmqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpmqrt.c
@@ -24,6 +24,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpmqrt( const MORSE_option_t *options,
                          MORSE_enum side, MORSE_enum trans,
diff --git a/runtime/starpu/codelets/codelet_ztpqrt.c b/runtime/starpu/codelets/codelet_ztpqrt.c
index 893a3ec9735607828e41d8c9186a1c5134b916c9..7a0d09d1d3e47283e989f1790014482da7c5e426 100644
--- a/runtime/starpu/codelets/codelet_ztpqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpqrt.c
@@ -24,6 +24,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpqrt( const MORSE_option_t *options,
                         int M, int N, int L, int ib, int nb,
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index ffce0ea3f581a58470f5b01a16f682d898bb7ee7..232d0f47eea349c4ce6588fb77313f1eea9b5856 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  ******************************************************************************
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index 03e30ff6c330c3b07ee93f1981af345b610d46f0..074c27e5522dba58b3ee133bc1a51b5067d0ce6f 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrasm(const MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, MORSE_enum diag, int M, int N,
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index b002c81709b0811d838670c96d38fbdb94086897..4a953fdd9334bf2dfb6dc022700acaacec57e29c 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 288427e82cb5c65809ed9fdfd6bbe48de7adba01..bb4bdbc3d55d3c0c9a87a0cd66086321704ef20f 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 578b318cee6174de50647efb18a59963e14dc40b..17b0d24a05e4b4fef9eeadcab44a7b824f4e3259 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrssq( const MORSE_option_t *options,
                         MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 73d1a439e4c6baca68e701d2d96645fceca82b80..c7fc81b505dddb5754b723e7c9bde7d9bb58702a 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index 56c278094de88b9bc90214642700e670b3312cd9..06b1ae17a136bcb1083bc30043df2ba3a04a39ca 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index 1ec507ca2f66d682624e9b69a83dfcbb105d0f84..774b5e9eb54b5b196f3238e82c48dedc843556dd 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -32,6 +32,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index 6a2a43768ba0209eaf265b685f7a329b0a81b76b..f4fe0c8557265c75a368f9824f0d01b06f40d83a 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index bb3e72c67f80dfac07198ed5422ee37431ca83dd..00ecc66af87b46d8d0b1c9f93a278088fe395560 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -32,6 +32,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index 792d9e0592832bb075a1916408fa983d9b82bef8..29f97cc0e787a6f9b3d9b0ddaa5ebc7bef45c49a 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -26,6 +26,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 969da0611698b3c9c72b23eaa04d869b3411f105..a86bf0b92c8f31f01c04ed80819ef8e08b5e78c7 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 59f7428077125914ce178b330265057444137afb..21823a51a86237565ae8534649f2d4faa678eec3 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -30,7 +30,8 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
+#include "chameleon/morse_tasks_z.h"
 #include <math.h>
 
 /**
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index f89913e6922496aa20d3ce275461b3805dc97c78..58e218b1f0f5a99dcc09e09092aef6611ed51bca 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index 2a75969c1e45651602f21fa00aaf707510f393f0..c49e54e24d25d67f760194510bd7d023eb2123c5 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index 9ffaa524c8dcc120b04c1d4866ded48d9c2b09d6..5a3a2051fcd3fa5132a5f0c9762fa012ffcd72d4 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -30,6 +30,7 @@
  **/
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index 02bc8245873c567e641f76b5e7b0bac82e613628..c745a8c496922d733973bbb85f693140cc9e1dac 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index b990da74beadad4b29ab49c6acfc1f4dd0cd413d..088d8198c24ef83ca4c1336a325b27ee22738d1c 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -29,9 +29,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index d4c6d6d813ae9d948d232908da530c1c963acd3e..054b4f3eede30d846f7bfd80373b68de53aa518b 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-
 #include "runtime/starpu/include/morse_starpu.h"
 #include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/morse_starpu.h
index 095b6886bb62c956501fcc40c8d4fb22ba67b26b..14d589b1fc36698dcca331bf568b49b3280fcd33 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/morse_starpu.h
@@ -26,7 +26,7 @@
 #ifndef _MORSE_STARPU_H_
 #define _MORSE_STARPU_H_
 
-#include "include/chameleon_config.h"
+#include "chameleon/chameleon_config.h"
 
 #if defined(CHAMELEON_USE_MPI)
 #include <starpu_mpi.h>
diff --git a/runtime/starpu/include/runtime_codelets.h b/runtime/starpu/include/runtime_codelets.h
index ad18261bcae347de1574cc45e491e46bf47f910a..b0da0542647aa405f98fe1f674077924584505f0 100644
--- a/runtime/starpu/include/runtime_codelets.h
+++ b/runtime/starpu/include/runtime_codelets.h
@@ -28,7 +28,7 @@
 #ifndef _CODELETS_H_
 #define _CODELETS_H_
 
-#include "include/chameleon_config.h"
+#include "chameleon/chameleon_config.h"
 #include "runtime_codelet_profile.h"
 
 //#undef STARPU_CUDA_ASYNC
diff --git a/testing/testing_zgeadd.c b/testing/testing_zgeadd.c
index 84225fe325e4b9f3ed4baf66cb3d7cb9103ae4dc..cf65e1843e1ae2f9b52d263ee77ca34630cbb1e2 100644
--- a/testing/testing_zgeadd.c
+++ b/testing/testing_zgeadd.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
diff --git a/testing/testing_zgels.c b/testing/testing_zgels.c
index d745f30bf06b17b970f257d796692ce4515ecc0e..1d2f248325593d6d08ced5e920f07db771bdaa3f 100644
--- a/testing/testing_zgels.c
+++ b/testing/testing_zgels.c
@@ -34,9 +34,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_zgels_hqr.c b/testing/testing_zgels_hqr.c
index b155ffb9ba5bb51a870d1fc744934598dac082e6..4f216e0d60514b68803d0cd0533e12550f537a3d 100644
--- a/testing/testing_zgels_hqr.c
+++ b/testing/testing_zgels_hqr.c
@@ -29,9 +29,9 @@
 #include <assert.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_zgels_systolic.c b/testing/testing_zgels_systolic.c
index a3d78696d71884f572906859820abb29d840ea14..85c89caebaf143aebfef80bd086157567bb551e1 100644
--- a/testing/testing_zgels_systolic.c
+++ b/testing/testing_zgels_systolic.c
@@ -29,9 +29,9 @@
 #include <assert.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_zgemm.c b/testing/testing_zgemm.c
index 8d682de70c28d7e9e442e04cee56a843d370f39e..562134b796265f72c41fc3ac17f400af9d169a7f 100644
--- a/testing/testing_zgemm.c
+++ b/testing/testing_zgemm.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 #if defined(CHAMELEON_USE_MPI)
 #include <mpi.h>
diff --git a/testing/testing_zgeqrf_qdwh.c b/testing/testing_zgeqrf_qdwh.c
index 194b005accff4364081206c54559eca28d336f40..cd03ec4337a5fa184e0e2f8308d53d3f587d0379 100644
--- a/testing/testing_zgeqrf_qdwh.c
+++ b/testing/testing_zgeqrf_qdwh.c
@@ -34,10 +34,10 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
-#include <coreblas/include/coreblas_z.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
+#include <coreblas/coreblas_z.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_zgesv_incpiv.c b/testing/testing_zgesv_incpiv.c
index 83254d745a83fe534ff1f1e29124603f1b53838b..c89a97e2d09e5791e4ef5ce35394703f7dfe8ded 100644
--- a/testing/testing_zgesv_incpiv.c
+++ b/testing/testing_zgesv_incpiv.c
@@ -33,9 +33,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 enum blas_order_type {
diff --git a/testing/testing_zgesvd.c b/testing/testing_zgesvd.c
index e26a746fd702c23ba31b40eb731157410fc0205c..e83248e941f949aa8022ee78ce7783c0d6d392b0 100644
--- a/testing/testing_zgesvd.c
+++ b/testing/testing_zgesvd.c
@@ -29,9 +29,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_orthogonality(int, int, int, MORSE_Complex64_t*, int, double);
diff --git a/testing/testing_zheevd.c b/testing/testing_zheevd.c
index 0837a58c799f38798e21a6b3889e95c030f5c2f8..cdc66adf453e4f015040edca3b43578e5f558e2e 100644
--- a/testing/testing_zheevd.c
+++ b/testing/testing_zheevd.c
@@ -29,9 +29,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_orthogonality(int, int, MORSE_Complex64_t*, int, double);
diff --git a/testing/testing_zhemm.c b/testing/testing_zhemm.c
index c0659d888ba42b2e2c2c4041c62eb3e7e5a168b6..53910f9e25ed84a15dda15b1d7f509fff4dc16b5 100644
--- a/testing/testing_zhemm.c
+++ b/testing/testing_zhemm.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum transA, MORSE_enum transB, int M, int N,
diff --git a/testing/testing_zher2k.c b/testing/testing_zher2k.c
index 750622248e69c1cb4091503235b2157346baebe2..7276353b11f552be567d0d0332d490a1e0f3cfbe 100644
--- a/testing/testing_zher2k.c
+++ b/testing/testing_zher2k.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K,
diff --git a/testing/testing_zherk.c b/testing/testing_zherk.c
index 5805e00eaec6efa35994454c23552997972f23ae..a218be22f157ccf81a2146d57a813a828e268df4 100644
--- a/testing/testing_zherk.c
+++ b/testing/testing_zherk.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K,
diff --git a/testing/testing_zlange.c b/testing/testing_zlange.c
index 93031b164e7a58bbc4706bcfc65cf213e5e7a98d..f818f658a485e7edc18bceabb94de58ff5687ee5 100644
--- a/testing/testing_zlange.c
+++ b/testing/testing_zlange.c
@@ -31,9 +31,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_zpemv.c b/testing/testing_zpemv.c
index 4a33972633be86505981cb5214fe2d1dbaf38072..401eea1ee15d178baa3d2a7cd9d5e544c7892915 100644
--- a/testing/testing_zpemv.c
+++ b/testing/testing_zpemv.c
@@ -31,9 +31,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #define COMPLEX
diff --git a/testing/testing_zposv.c b/testing/testing_zposv.c
index a865102d52be789e3b82fa20c53fd1e2af00f013..0b4906c4d15f748e54fde7cd381dafd946f51de0 100644
--- a/testing/testing_zposv.c
+++ b/testing/testing_zposv.c
@@ -33,9 +33,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 enum blas_order_type {
diff --git a/testing/testing_zpotri.c b/testing/testing_zpotri.c
index 22c42b565bc62342da1ea4e7060e98f3bf4a6a5c..2dff3ea05836051ee4bd4f5166ab7ccc9e551114 100644
--- a/testing/testing_zpotri.c
+++ b/testing/testing_zpotri.c
@@ -33,9 +33,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 enum blas_order_type {
diff --git a/testing/testing_zsymm.c b/testing/testing_zsymm.c
index ca66d4a43a77cbe79455127dbaf01df52925f339..0e037c761b86b7f5b92d49ceb400a725ecaaedac 100644
--- a/testing/testing_zsymm.c
+++ b/testing/testing_zsymm.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum transA, MORSE_enum transB, int M, int N,
diff --git a/testing/testing_zsyr2k.c b/testing/testing_zsyr2k.c
index 366e9b1ad0822c76ffacf10724c0eb90dc00cff5..cbd5a75d4ec8de376763c7728ad82dac96c0a8ee 100644
--- a/testing/testing_zsyr2k.c
+++ b/testing/testing_zsyr2k.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K,
diff --git a/testing/testing_zsyrk.c b/testing/testing_zsyrk.c
index 1f63117cff30d6fc5aa13097442e54eeab00b2cc..ba58ac727974fe1573113771848116137195b407 100644
--- a/testing/testing_zsyrk.c
+++ b/testing/testing_zsyrk.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K,
diff --git a/testing/testing_ztrmm.c b/testing/testing_ztrmm.c
index eb25babe4f38e7c56b5e783912a035c3f7c6e33f..83214ef269c94da86fdd2a7543713cfe8655bfc5 100644
--- a/testing/testing_ztrmm.c
+++ b/testing/testing_ztrmm.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/testing/testing_ztrsm.c b/testing/testing_ztrsm.c
index db0cc1ad1e725f9bd629f1050e0699ad5f969db6..3514b78d9691d6f6eb9a53ca00aff6b9bde18767 100644
--- a/testing/testing_ztrsm.c
+++ b/testing/testing_ztrsm.c
@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "testing_zauxiliary.h"
 
 #undef REAL
diff --git a/timing/timing.c b/timing/timing.c
index b8b009824649531b40aff254b19320310ba214d3..989d97aaae67ee4e9f6b1a32e1362d9f090e502b 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -47,10 +47,10 @@
 #include <sys/resource.h>
 #endif
 
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/lapacke.h"
+#include "coreblas/cblas.h"
+#include "coreblas/lapacke.h"
 #include <morse.h>
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 #include "flops.h"
 #include "timing.h"
 #include "control/auxiliary.h"
diff --git a/timing/timing_zauxiliary.c b/timing/timing_zauxiliary.c
index 2d9dba18dcddb9371939207a22ff7c9be2aad7d4..55998be13f199b66f17f090c6715cba92a58797f 100644
--- a/timing/timing_zauxiliary.c
+++ b/timing/timing_zauxiliary.c
@@ -18,9 +18,9 @@
 #include <string.h>
 #include <math.h>
 #include <morse.h>
-#include <coreblas/include/cblas.h>
-#include <coreblas/include/lapacke.h>
-#include <coreblas/include/coreblas.h>
+#include <coreblas/cblas.h>
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
 #include "timing_zauxiliary.h"
 
 /*-------------------------------------------------------------------