diff --git a/runtime/quark/codelets/codelet_zasum.c b/runtime/quark/codelets/codelet_zasum.c
index 4dde79a0f28560477a5e7946108c466eb6ec7203..b1b5ecdd7c940bf4ff64a497f34ad0077102fd36 100644
--- a/runtime/quark/codelets/codelet_zasum.c
+++ b/runtime/quark/codelets/codelet_zasum.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_dzasum_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zaxpy.c b/runtime/quark/codelets/codelet_zaxpy.c
index 36e76787f8f93257d53ce4018b8d16e3f2a6c80b..93f8ea8a00503226764dd943ab4e3c69e2fe675c 100644
--- a/runtime/quark/codelets/codelet_zaxpy.c
+++ b/runtime/quark/codelets/codelet_zaxpy.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zaxpy_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zbuild.c b/runtime/quark/codelets/codelet_zbuild.c
index 7e88fd1a172570585644e4605db82c1c412518c0..f7b53f264acd7a59538a32cca032490441e3d90b 100644
--- a/runtime/quark/codelets/codelet_zbuild.c
+++ b/runtime/quark/codelets/codelet_zbuild.c
@@ -31,6 +31,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zbuild_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgeadd.c b/runtime/quark/codelets/codelet_zgeadd.c
index f97921b5b91b8912ff50ffbb8e14cce6b80cc5da..63c5c4c253145d73c9779b496d8737dc49af3e45 100644
--- a/runtime/quark/codelets/codelet_zgeadd.c
+++ b/runtime/quark/codelets/codelet_zgeadd.c
@@ -28,6 +28,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgeadd_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgelqt.c b/runtime/quark/codelets/codelet_zgelqt.c
index e41d566f6cc1f92bba0cbdc3cc6a456110852d21..16919df2dd8b5e408dc3b93a5c9039a1d29c68b6 100644
--- a/runtime/quark/codelets/codelet_zgelqt.c
+++ b/runtime/quark/codelets/codelet_zgelqt.c
@@ -31,6 +31,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgelqt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgemm.c b/runtime/quark/codelets/codelet_zgemm.c
index 0e06cef9c6097f18a49cb3e6ef59eefea15efabc..1b105d4fb9d723afdf47da684016f43d543db50d 100644
--- a/runtime/quark/codelets/codelet_zgemm.c
+++ b/runtime/quark/codelets/codelet_zgemm.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgemm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgeqrt.c b/runtime/quark/codelets/codelet_zgeqrt.c
index 1b8680211f9ef82136bea8316b11b1c90098ac0c..c2575a706be1898eb0c1a0c6ff6c1cb2d18821e8 100644
--- a/runtime/quark/codelets/codelet_zgeqrt.c
+++ b/runtime/quark/codelets/codelet_zgeqrt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgeqrt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgessm.c b/runtime/quark/codelets/codelet_zgessm.c
index 9ce245661aa49bd3967f76bbf5044abcba9f4690..4cf62352a7352ce563e3dd73cef3fe208fc1233d 100644
--- a/runtime/quark/codelets/codelet_zgessm.c
+++ b/runtime/quark/codelets/codelet_zgessm.c
@@ -31,6 +31,7 @@
 #include "coreblas/cblas.h"
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgessm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgessq.c b/runtime/quark/codelets/codelet_zgessq.c
index 632c18b1cbcef1893adfe189abaa19fafe7dd1ee..6e3722dd9a7b70b509b9c9a840a7f3844b2d1ef8 100644
--- a/runtime/quark/codelets/codelet_zgessq.c
+++ b/runtime/quark/codelets/codelet_zgessq.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgessq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgetrf.c b/runtime/quark/codelets/codelet_zgetrf.c
index 5888529c6a8a5b784d2fc48299ed0de91a774256..8ba5bc278d073b9287a9b8278eeb695815a00c63 100644
--- a/runtime/quark/codelets/codelet_zgetrf.c
+++ b/runtime/quark/codelets/codelet_zgetrf.c
@@ -29,6 +29,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgetrf_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgetrf_incpiv.c b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
index 2c1b8388a4f4627f8d0712900fe75cb2cb72c37c..a87437b622518929dc509b317444e4acfc2118a7 100644
--- a/runtime/quark/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgetrf_incpiv_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zgetrf_nopiv.c b/runtime/quark/codelets/codelet_zgetrf_nopiv.c
index 10f0310522a247c3b7bba9e839aa2f78418511f7..2a34cb64cb44b82a12a47f3a88ccbdb10f1be367 100644
--- a/runtime/quark/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/quark/codelets/codelet_zgetrf_nopiv.c
@@ -27,6 +27,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zgetrf_nopiv_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zhe2ge.c b/runtime/quark/codelets/codelet_zhe2ge.c
index 702a86eb5ee67a62da44b862259412bba5db8ccd..18761e7b43696f1c7a61ea4f46017385fd128b55 100644
--- a/runtime/quark/codelets/codelet_zhe2ge.c
+++ b/runtime/quark/codelets/codelet_zhe2ge.c
@@ -22,6 +22,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 /**
  *
diff --git a/runtime/quark/codelets/codelet_zhemm.c b/runtime/quark/codelets/codelet_zhemm.c
index 77461f1d051b8715699017d9b8de2edfd37cb3c8..f68481accea2da25c605491da958c53b4d158545 100644
--- a/runtime/quark/codelets/codelet_zhemm.c
+++ b/runtime/quark/codelets/codelet_zhemm.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zhemm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zher2k.c b/runtime/quark/codelets/codelet_zher2k.c
index b78a8c1e19cd447af3fc08fe5876392cd548ffaa..3f47dbac4dccd3c258c690e43bfce3b80f82995f 100644
--- a/runtime/quark/codelets/codelet_zher2k.c
+++ b/runtime/quark/codelets/codelet_zher2k.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zher2k_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zherfb.c b/runtime/quark/codelets/codelet_zherfb.c
index 7d4224f905fc21b199d4d38cf3776048f9da7da9..79d9181df7230353582e6bf1eab15ebd706e49ae 100644
--- a/runtime/quark/codelets/codelet_zherfb.c
+++ b/runtime/quark/codelets/codelet_zherfb.c
@@ -24,6 +24,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zherfb_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zherk.c b/runtime/quark/codelets/codelet_zherk.c
index 4911c7132aa12234ea59e6f7398412bed88f1af3..1c81f3a0494494f5f38a52f5d1c974d5ce679e0e 100644
--- a/runtime/quark/codelets/codelet_zherk.c
+++ b/runtime/quark/codelets/codelet_zherk.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zherk_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zhessq.c b/runtime/quark/codelets/codelet_zhessq.c
index f7fc02d9aaaaf6663acf5b549c5cc5c680701357..329635c899fd993d3813f82fe16d0606823ad442 100644
--- a/runtime/quark/codelets/codelet_zhessq.c
+++ b/runtime/quark/codelets/codelet_zhessq.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zhessq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlacpy.c b/runtime/quark/codelets/codelet_zlacpy.c
index 11d6dc67fb58ef8e28484ec3c6e42949624e4777..a38850320db7b538337250a1cacdcc7a8a5392ca 100644
--- a/runtime/quark/codelets/codelet_zlacpy.c
+++ b/runtime/quark/codelets/codelet_zlacpy.c
@@ -31,6 +31,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 static inline void CORE_zlacpy_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlag2c.c b/runtime/quark/codelets/codelet_zlag2c.c
index 6e04898194e498fb2ca791f12a52b70968930516..a3c23c36a82039245b8cd095dd013f815c4f76ba 100644
--- a/runtime/quark/codelets/codelet_zlag2c.c
+++ b/runtime/quark/codelets/codelet_zlag2c.c
@@ -29,6 +29,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlag2c_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlange.c b/runtime/quark/codelets/codelet_zlange.c
index f492d7eaaaa181d8bd6c4516b03a988d87b9e1ab..edc7452263856db2c04acc9379d1b26166f24370 100644
--- a/runtime/quark/codelets/codelet_zlange.c
+++ b/runtime/quark/codelets/codelet_zlange.c
@@ -29,6 +29,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlange_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlanhe.c b/runtime/quark/codelets/codelet_zlanhe.c
index 82e6bbdd2d16de8808bbfbe3e243903d04230df2..27cd9ebbba1ba865599c409cfad075a29e74e78d 100644
--- a/runtime/quark/codelets/codelet_zlanhe.c
+++ b/runtime/quark/codelets/codelet_zlanhe.c
@@ -29,6 +29,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlanhe_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlansy.c b/runtime/quark/codelets/codelet_zlansy.c
index c1d7f5020efc193b83918013c85bbe7baa7a0109..c4e5fa3072790913123a397bf8b101f524f62b29 100644
--- a/runtime/quark/codelets/codelet_zlansy.c
+++ b/runtime/quark/codelets/codelet_zlansy.c
@@ -29,6 +29,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlansy_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlantr.c b/runtime/quark/codelets/codelet_zlantr.c
index 839692464155e3d3728ed13d1539bea4f46101cf..20078833c774af3d897beb3954d1a22d3e338650 100644
--- a/runtime/quark/codelets/codelet_zlantr.c
+++ b/runtime/quark/codelets/codelet_zlantr.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlantr_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlascal.c b/runtime/quark/codelets/codelet_zlascal.c
index 0ec86aebb36ebaeedc43aad44ffcc965b82e1aa0..72c5e1ab8b11e63db935afcb32962c54bd3b9bbe 100644
--- a/runtime/quark/codelets/codelet_zlascal.c
+++ b/runtime/quark/codelets/codelet_zlascal.c
@@ -31,6 +31,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 static inline void CORE_zlascal_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlaset.c b/runtime/quark/codelets/codelet_zlaset.c
index ee4da1eba5cc5c4f086cabd308c91ead8d28d8ed..1c6c44c01ee2acefe54fc273d910ee629ddfa515 100644
--- a/runtime/quark/codelets/codelet_zlaset.c
+++ b/runtime/quark/codelets/codelet_zlaset.c
@@ -30,6 +30,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlaset_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlaset2.c b/runtime/quark/codelets/codelet_zlaset2.c
index c816bcadcedf01e3d11b945e1a9b16f643ccd4be..29270843e7f896fc6b391f707d167302e9d3c66b 100644
--- a/runtime/quark/codelets/codelet_zlaset2.c
+++ b/runtime/quark/codelets/codelet_zlaset2.c
@@ -30,6 +30,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlaset2_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlatro.c b/runtime/quark/codelets/codelet_zlatro.c
index c6e4406fca1e3c9a8396243d7b0f8c06e3e4c71b..a1f0f4fe9268bb9b2778921f93b838dad9bb70bb 100644
--- a/runtime/quark/codelets/codelet_zlatro.c
+++ b/runtime/quark/codelets/codelet_zlatro.c
@@ -23,6 +23,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlatro_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zlauum.c b/runtime/quark/codelets/codelet_zlauum.c
index 1437ad52aa341a29ba0b345c90839cf52c9372aa..944871dfe7b38158bcfd432e1b740f95f8db2d19 100644
--- a/runtime/quark/codelets/codelet_zlauum.c
+++ b/runtime/quark/codelets/codelet_zlauum.c
@@ -31,6 +31,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zlauum_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zpamm.c b/runtime/quark/codelets/codelet_zpamm.c
index 830f78d8da4bdbc470aca13723edb0e16acd25a6..ae351f9706f44fd9873e74a18e3435d3ed28ac56 100644
--- a/runtime/quark/codelets/codelet_zpamm.c
+++ b/runtime/quark/codelets/codelet_zpamm.c
@@ -30,6 +30,7 @@
 #include "coreblas/cblas.h"
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void
 CORE_zpamm_quark(Quark *quark)
diff --git a/runtime/quark/codelets/codelet_zplghe.c b/runtime/quark/codelets/codelet_zplghe.c
index 7b861fcac4ceb345b4ab52c4e2aaa5357cd1c6d6..f9b3764832afa2bc444b2c287434aa554ff39cd8 100644
--- a/runtime/quark/codelets/codelet_zplghe.c
+++ b/runtime/quark/codelets/codelet_zplghe.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zplghe_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zplgsy.c b/runtime/quark/codelets/codelet_zplgsy.c
index 46dd487ceebd921770ea2291c962c60a70bcf618..92095ba9879084b91245099cebea0d5caf848a86 100644
--- a/runtime/quark/codelets/codelet_zplgsy.c
+++ b/runtime/quark/codelets/codelet_zplgsy.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zplgsy_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zplrnt.c b/runtime/quark/codelets/codelet_zplrnt.c
index 5f5288493206a7cfa86d104f53cfe76fb9f1067f..6bdadfe01aa3bcf5a4eebe460ebdc537de89793b 100644
--- a/runtime/quark/codelets/codelet_zplrnt.c
+++ b/runtime/quark/codelets/codelet_zplrnt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zplrnt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zplssq.c b/runtime/quark/codelets/codelet_zplssq.c
index e08ea2b0e4fb209a841664204777e23c70ddbdae..bcff3ea19417a7208a04e0941e7cbe54f8a95172 100644
--- a/runtime/quark/codelets/codelet_zplssq.c
+++ b/runtime/quark/codelets/codelet_zplssq.c
@@ -27,6 +27,7 @@
 #include <math.h>
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zplssq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zpotrf.c b/runtime/quark/codelets/codelet_zpotrf.c
index 6b09e1575821ae34a314b1b5dee93943ee1fde2f..d49982a09836d1d446d8d932dea87e1dcffe80c9 100644
--- a/runtime/quark/codelets/codelet_zpotrf.c
+++ b/runtime/quark/codelets/codelet_zpotrf.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zpotrf_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zssssm.c b/runtime/quark/codelets/codelet_zssssm.c
index 33289267d8bc66053adfa28ef0022a5c84898de2..6017ed56e748d603b9402dd988c017d52a9a680b 100644
--- a/runtime/quark/codelets/codelet_zssssm.c
+++ b/runtime/quark/codelets/codelet_zssssm.c
@@ -31,6 +31,7 @@
 #include "coreblas/cblas.h"
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zssssm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zsymm.c b/runtime/quark/codelets/codelet_zsymm.c
index eb05b3ccb8ebbc84e93769608ee9a426e2a2da69..949af0193b71c5d30e8afcd1f6c2056f583c84fd 100644
--- a/runtime/quark/codelets/codelet_zsymm.c
+++ b/runtime/quark/codelets/codelet_zsymm.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zsymm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zsyr2k.c b/runtime/quark/codelets/codelet_zsyr2k.c
index 1286c95fd6ef5c074b39856e1252b27c56ab7a79..72bf3e596d48ff9b5ddcd4b07c5dc56640edba9a 100644
--- a/runtime/quark/codelets/codelet_zsyr2k.c
+++ b/runtime/quark/codelets/codelet_zsyr2k.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zsyr2k_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zsyrk.c b/runtime/quark/codelets/codelet_zsyrk.c
index 6483481ff8065934344b82c2e823f665a50e5357..1dd33d770729fcb950202bd23df8643ea9357488 100644
--- a/runtime/quark/codelets/codelet_zsyrk.c
+++ b/runtime/quark/codelets/codelet_zsyrk.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zsyrk_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zsyssq.c b/runtime/quark/codelets/codelet_zsyssq.c
index d919213a57c7be80a12a9b43a50c140984e12a8d..ab72718080fe44d72ac8e53046452f5b1fb51539 100644
--- a/runtime/quark/codelets/codelet_zsyssq.c
+++ b/runtime/quark/codelets/codelet_zsyssq.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zsyssq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zsytrf_nopiv.c b/runtime/quark/codelets/codelet_zsytrf_nopiv.c
index f2821e798d2159a7dfe1794dde7dc18d914a38da..162948ff9e16746b617d074be55ed3e332f8ebae 100644
--- a/runtime/quark/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/quark/codelets/codelet_zsytrf_nopiv.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zsytrf_nopiv_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztile_zero.c b/runtime/quark/codelets/codelet_ztile_zero.c
index f1f77319ef64607ec13c52ba020bef70e20af5a5..4999db5b3a6e47075a7b9e974fb7570290b75c85 100644
--- a/runtime/quark/codelets/codelet_ztile_zero.c
+++ b/runtime/quark/codelets/codelet_ztile_zero.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztile_zero_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztpmqrt.c b/runtime/quark/codelets/codelet_ztpmqrt.c
index 20bddecdc12da81e068c1e0e76744a2f84983752..d0efd49bd0a5bf70cf4d661f11575b79bed2feaa 100644
--- a/runtime/quark/codelets/codelet_ztpmqrt.c
+++ b/runtime/quark/codelets/codelet_ztpmqrt.c
@@ -24,6 +24,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 static void
 CORE_ztpmqrt_quark( Quark *quark )
diff --git a/runtime/quark/codelets/codelet_ztpqrt.c b/runtime/quark/codelets/codelet_ztpqrt.c
index 4a3a8d957dd1a95011aeb8051f38601886dba0ea..72c763a66d344490b3889c48c3e9b6ffc2f2ce56 100644
--- a/runtime/quark/codelets/codelet_ztpqrt.c
+++ b/runtime/quark/codelets/codelet_ztpqrt.c
@@ -24,6 +24,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 static void
 CORE_ztpqrt_quark( Quark *quark )
diff --git a/runtime/quark/codelets/codelet_ztradd.c b/runtime/quark/codelets/codelet_ztradd.c
index b75ea4010d6faac0d6e8b36df61f85893903e37d..020bffeeeafdada8d64867052e2df2f1d20cf8bd 100644
--- a/runtime/quark/codelets/codelet_ztradd.c
+++ b/runtime/quark/codelets/codelet_ztradd.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztradd_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztrasm.c b/runtime/quark/codelets/codelet_ztrasm.c
index d2a7823411f8a942d99c09fc98c828200a86cc02..e1eb3faeec9e978e6323e301732a9b7e816a490a 100644
--- a/runtime/quark/codelets/codelet_ztrasm.c
+++ b/runtime/quark/codelets/codelet_ztrasm.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztrasm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztrmm.c b/runtime/quark/codelets/codelet_ztrmm.c
index b85c0740c1dd05fc352c2b8728c7a447d8d1e131..d75aeb2a9c5349099bda1194050f788114cf4eed 100644
--- a/runtime/quark/codelets/codelet_ztrmm.c
+++ b/runtime/quark/codelets/codelet_ztrmm.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztrmm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztrsm.c b/runtime/quark/codelets/codelet_ztrsm.c
index 5b57184eb6354dd438ae5382caa5206e9f3322c6..d6ccc5e49a777774fa38a6bb76c56808324dfbf7 100644
--- a/runtime/quark/codelets/codelet_ztrsm.c
+++ b/runtime/quark/codelets/codelet_ztrsm.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztrsm_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztrssq.c b/runtime/quark/codelets/codelet_ztrssq.c
index df70c22016a250b823b96c7d4b5aa66f65136445..8ebfcf856b13a0a50b368b7b1384681999784f67 100644
--- a/runtime/quark/codelets/codelet_ztrssq.c
+++ b/runtime/quark/codelets/codelet_ztrssq.c
@@ -26,6 +26,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztrssq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztrtri.c b/runtime/quark/codelets/codelet_ztrtri.c
index 1a9d8a6c632bd5bd5fd8f761e9bf44cbdc3b22d9..d87c03fd55c38647021ea3e058b349a568e51caf 100644
--- a/runtime/quark/codelets/codelet_ztrtri.c
+++ b/runtime/quark/codelets/codelet_ztrtri.c
@@ -31,6 +31,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztrtri_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztslqt.c b/runtime/quark/codelets/codelet_ztslqt.c
index af82add0edb420a993b77b1d3fec7a55dbf99d6b..766d3ff87a94212002ae0c6655dcd019a6062cb6 100644
--- a/runtime/quark/codelets/codelet_ztslqt.c
+++ b/runtime/quark/codelets/codelet_ztslqt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztslqt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztsmlq.c b/runtime/quark/codelets/codelet_ztsmlq.c
index fad50baaf05d270c7c2b86067f4b4617a1407829..a59d5b4e0b67eb4847cb14b328fc0678a635fb57 100644
--- a/runtime/quark/codelets/codelet_ztsmlq.c
+++ b/runtime/quark/codelets/codelet_ztsmlq.c
@@ -32,6 +32,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztsmlq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztsmlq_hetra1.c b/runtime/quark/codelets/codelet_ztsmlq_hetra1.c
index 3b358ea005676daebd69787aec1e87f702421288..f9f436593e1c384408c1d976a8b7867acfac70a7 100644
--- a/runtime/quark/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/quark/codelets/codelet_ztsmlq_hetra1.c
@@ -27,6 +27,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztsmlq_hetra1_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztsmqr.c b/runtime/quark/codelets/codelet_ztsmqr.c
index b29f61561fa1be124f1a499caf3aab659cda2ba8..de57a8aa83c6fdeb8cc3a42f4073465d6ae0b7ca 100644
--- a/runtime/quark/codelets/codelet_ztsmqr.c
+++ b/runtime/quark/codelets/codelet_ztsmqr.c
@@ -32,6 +32,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztsmqr_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztsmqr_hetra1.c b/runtime/quark/codelets/codelet_ztsmqr_hetra1.c
index df680204cb9a407fb9e545814f8619369355ec18..4c06a3a4629546f8a2f08572b3ad224e438f931c 100644
--- a/runtime/quark/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/quark/codelets/codelet_ztsmqr_hetra1.c
@@ -27,6 +27,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztsmqr_hetra1_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztsqrt.c b/runtime/quark/codelets/codelet_ztsqrt.c
index 73858e63400b5e3bb64818508bb7003d7d4c27ab..f3f09a3eada341478c802c9e8c482e1a09278df2 100644
--- a/runtime/quark/codelets/codelet_ztsqrt.c
+++ b/runtime/quark/codelets/codelet_ztsqrt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_ztsqrt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_ztstrf.c b/runtime/quark/codelets/codelet_ztstrf.c
index c035d2cac36aa037fd7ad74d8591639b46b9cba4..d5a47f5fa895738d9d25fe76c5d5b88d5ab3fd61 100644
--- a/runtime/quark/codelets/codelet_ztstrf.c
+++ b/runtime/quark/codelets/codelet_ztstrf.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 #include "coreblas/cblas.h"
 #include <math.h>
 
diff --git a/runtime/quark/codelets/codelet_zttlqt.c b/runtime/quark/codelets/codelet_zttlqt.c
index 2113531dea161a2e15fda48dfc53400d57eb2212..9ec2513320afcd10faf9f92300fc9df1062bfef6 100644
--- a/runtime/quark/codelets/codelet_zttlqt.c
+++ b/runtime/quark/codelets/codelet_zttlqt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zttlqt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zttmlq.c b/runtime/quark/codelets/codelet_zttmlq.c
index 3900a4fb984e9b1062e6af0a87bafe50db8df0e4..e2de201093fd517845994ba289ea1bbacc8b0ce7 100644
--- a/runtime/quark/codelets/codelet_zttmlq.c
+++ b/runtime/quark/codelets/codelet_zttmlq.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zttmlq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zttmqr.c b/runtime/quark/codelets/codelet_zttmqr.c
index ed3a77323aa1f6de9657905e6dd5fd1ddc07e263..ed4311d9955a7a2af10d478a403aa739a4ba2c53 100644
--- a/runtime/quark/codelets/codelet_zttmqr.c
+++ b/runtime/quark/codelets/codelet_zttmqr.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zttmqr_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zttqrt.c b/runtime/quark/codelets/codelet_zttqrt.c
index 8c3f9c4f54d9c1ed54d6473ba4fb789072a4b924..c7397d924b1f7848d6b83c7115e97a34e83eca2f 100644
--- a/runtime/quark/codelets/codelet_zttqrt.c
+++ b/runtime/quark/codelets/codelet_zttqrt.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zttqrt_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zunmlq.c b/runtime/quark/codelets/codelet_zunmlq.c
index 774acb280fabcaebbf03d2997fef5c261ead8d15..53b52088223056871895698f74cd42e310888220 100644
--- a/runtime/quark/codelets/codelet_zunmlq.c
+++ b/runtime/quark/codelets/codelet_zunmlq.c
@@ -32,6 +32,7 @@
 
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zunmlq_quark(Quark *quark)
 {
diff --git a/runtime/quark/codelets/codelet_zunmqr.c b/runtime/quark/codelets/codelet_zunmqr.c
index ce8e8ea12b8293034f3c26ff49efed66d1247551..8204632548475e7c97d645187d550eaabc9e06dd 100644
--- a/runtime/quark/codelets/codelet_zunmqr.c
+++ b/runtime/quark/codelets/codelet_zunmqr.c
@@ -30,6 +30,7 @@
  **/
 #include "chameleon_quark.h"
 #include "chameleon/morse_tasks_z.h"
+#include "coreblas/coreblas_z.h"
 
 void CORE_zunmqr_quark(Quark *quark)
 {