diff --git a/runtime/quark/codelets/codelet_zgetrf_incpiv.c b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
index be4374bb232491554917939af2c56af98f6a71dd..3cfe46a71c0f8305f0b46693337c06f00abc0af8 100644
--- a/runtime/quark/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/quark/codelets/codelet_zgetrf_incpiv.c
@@ -69,4 +69,8 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
         sizeof(int),                        &iinfo,         VALUE,
         0);
 
+    (void)L;
+    (void)Lm;
+    (void)Ln;
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zgetrf_nopiv.c b/runtime/quark/codelets/codelet_zgetrf_nopiv.c
index 0c1d77fee0e7a838f6c320c1a371ec7592db2a9a..b59d417e9c516f9d9fb8176e840758e3f82767df 100644
--- a/runtime/quark/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/quark/codelets/codelet_zgetrf_nopiv.c
@@ -60,4 +60,6 @@ void INSERT_TASK_zgetrf_nopiv(const RUNTIME_option_t *options,
         sizeof(RUNTIME_request_t*),            &(options->request),       VALUE,
         sizeof(int),                        &iinfo,         VALUE,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zhe2ge.c b/runtime/quark/codelets/codelet_zhe2ge.c
index 7c0379a46a4c662ccc9dbec708080a9a4784a811..73d5f6f6704fd28c29a5200754f0bd4b20052891 100644
--- a/runtime/quark/codelets/codelet_zhe2ge.c
+++ b/runtime/quark/codelets/codelet_zhe2ge.c
@@ -36,7 +36,7 @@ static inline void CORE_zhe2ge_quark(Quark *quark)
 
 void INSERT_TASK_zhe2ge( const RUNTIME_option_t *options,
                          cham_uplo_t uplo,
-                         int m, int n, int mb,
+                         int m, int n, int nb,
                          const CHAM_desc_t *A, int Am, int An,
                          const CHAM_desc_t *B, int Bm, int Bn )
 {
@@ -49,4 +49,6 @@ void INSERT_TASK_zhe2ge( const RUNTIME_option_t *options,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(void*), RTBLKADDR(B, CHAMELEON_Complex64_t, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlacpy.c b/runtime/quark/codelets/codelet_zlacpy.c
index b8cf0bc3fc19d5b6b713f7a1c447d6e7153d2717..79085b4f0eaafd632ce36b41cd016673ab7c70c5 100644
--- a/runtime/quark/codelets/codelet_zlacpy.c
+++ b/runtime/quark/codelets/codelet_zlacpy.c
@@ -64,6 +64,7 @@ void INSERT_TASK_zlacpyx( const RUNTIME_option_t *options,
         sizeof(int),                     &displB, VALUE,
         sizeof(void*), RTBLKADDR(B, CHAMELEON_Complex64_t, Bm, Bn),             OUTPUT,
         0);
+    (void)nb;
 }
 
 void INSERT_TASK_zlacpy( const RUNTIME_option_t *options,
diff --git a/runtime/quark/codelets/codelet_zlange.c b/runtime/quark/codelets/codelet_zlange.c
index d0443c3ddd660cf9043be74df9411b98d42f874f..920e83e65f788b0e0f88cfe1045410fedd9ff702 100644
--- a/runtime/quark/codelets/codelet_zlange.c
+++ b/runtime/quark/codelets/codelet_zlange.c
@@ -38,22 +38,24 @@ void CORE_zlange_quark(Quark *quark)
 }
 
 void INSERT_TASK_zlange(const RUNTIME_option_t *options,
-                       cham_normtype_t norm, int M, int N, int NB,
+                       cham_normtype_t norm, int m, int n, int nb,
                        const CHAM_desc_t *A, int Am, int An,
                        const CHAM_desc_t *B, int Bm, int Bn)
 {
     quark_option_t *opt = (quark_option_t*)(options->schedopt);
     DAG_CORE_LANGE;
-    int szeW = chameleon_max( M, N );
+    int szeW = chameleon_max( m, n );
     QUARK_Insert_Task(
         opt->quark, CORE_zlange_quark, (Quark_Task_Flags*)opt,
         sizeof(int),              &norm,  VALUE,
-        sizeof(int),                     &M,     VALUE,
-        sizeof(int),                     &N,     VALUE,
+        sizeof(int),                     &m,     VALUE,
+        sizeof(int),                     &n,     VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(double)*szeW,             NULL,   SCRATCH,
         sizeof(void*), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
 
 void CORE_zlange_max_quark(Quark *quark)
diff --git a/runtime/quark/codelets/codelet_zlanhe.c b/runtime/quark/codelets/codelet_zlanhe.c
index 058990df3ff7f7757125c1796bf85750e06c77f2..d8b1804080531c87d5cd469c105e93f2197d1717 100644
--- a/runtime/quark/codelets/codelet_zlanhe.c
+++ b/runtime/quark/codelets/codelet_zlanhe.c
@@ -37,21 +37,23 @@ void CORE_zlanhe_quark(Quark *quark)
     TCORE_zlanhe( norm, uplo, N, tileA, work, tileNorm->mat );
 }
 
-void INSERT_TASK_zlanhe(const RUNTIME_option_t *options,
-                       cham_normtype_t norm, cham_uplo_t uplo, int N, int NB,
-                       const CHAM_desc_t *A, int Am, int An,
-                       const CHAM_desc_t *B, int Bm, int Bn)
+void INSERT_TASK_zlanhe( const RUNTIME_option_t *options,
+                         cham_normtype_t norm, cham_uplo_t uplo, int n, int nb,
+                         const CHAM_desc_t *A, int Am, int An,
+                         const CHAM_desc_t *B, int Bm, int Bn )
 {
     quark_option_t *opt = (quark_option_t*)(options->schedopt);
     DAG_CORE_LANHE;
-    int szeW = chameleon_max( 1, N );
+    int szeW = chameleon_max( 1, n );
     QUARK_Insert_Task(
         opt->quark, CORE_zlanhe_quark, (Quark_Task_Flags*)opt,
         sizeof(int),              &norm,  VALUE,
         sizeof(int),              &uplo,  VALUE,
-        sizeof(int),                     &N,     VALUE,
+        sizeof(int),                     &n,     VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(double)*szeW,             NULL,   SCRATCH,
         sizeof(void*), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlansy.c b/runtime/quark/codelets/codelet_zlansy.c
index adda052ac96423740bf5098642836874a799ab1e..9c75b979259f95b02271c06f6252ba843412801c 100644
--- a/runtime/quark/codelets/codelet_zlansy.c
+++ b/runtime/quark/codelets/codelet_zlansy.c
@@ -37,21 +37,23 @@ void CORE_zlansy_quark(Quark *quark)
     TCORE_zlansy( norm, uplo, N, tileA, work, tileNorm->mat );
 }
 
-void INSERT_TASK_zlansy(const RUNTIME_option_t *options,
-                       cham_normtype_t norm, cham_uplo_t uplo, int N, int NB,
-                       const CHAM_desc_t *A, int Am, int An,
-                       const CHAM_desc_t *B, int Bm, int Bn)
+void INSERT_TASK_zlansy( const RUNTIME_option_t *options,
+                         cham_normtype_t norm, cham_uplo_t uplo, int n, int nb,
+                         const CHAM_desc_t *A, int Am, int An,
+                         const CHAM_desc_t *B, int Bm, int Bn)
 {
     quark_option_t *opt = (quark_option_t*)(options->schedopt);
     DAG_CORE_LANSY;
-    int szeW = chameleon_max( 1, N );
+    int szeW = chameleon_max( 1, n );
     QUARK_Insert_Task(
         opt->quark, CORE_zlansy_quark, (Quark_Task_Flags*)opt,
         sizeof(int),              &norm,  VALUE,
         sizeof(int),              &uplo,  VALUE,
-        sizeof(int),                     &N,     VALUE,
+        sizeof(int),                     &n,     VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(double)*szeW,             NULL,   SCRATCH,
         sizeof(void*), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlantr.c b/runtime/quark/codelets/codelet_zlantr.c
index dfc3855e416f6303e085c0f388c1fddffa3b0a39..38a3a5f897e331c8e3104c5a2832bf09fd57bf54 100644
--- a/runtime/quark/codelets/codelet_zlantr.c
+++ b/runtime/quark/codelets/codelet_zlantr.c
@@ -25,7 +25,9 @@
 void CORE_zlantr_quark(Quark *quark)
 {
     CHAM_tile_t *tileNorm;
-    cham_normtype_t norm, uplo, diag;
+    cham_normtype_t norm;
+    cham_uplo_t     uplo;
+    cham_diag_t     diag;
     int M;
     int N;
     CHAM_tile_t *tileA;
@@ -35,24 +37,26 @@ void CORE_zlantr_quark(Quark *quark)
     TCORE_zlantr( norm, uplo, diag, M, N, tileA, work, tileNorm->mat );
 }
 
-void INSERT_TASK_zlantr(const RUNTIME_option_t *options,
-                       cham_normtype_t norm, cham_uplo_t uplo, cham_diag_t diag,
-                       int M, int N, int NB,
-                       const CHAM_desc_t *A, int Am, int An,
-                       const CHAM_desc_t *B, int Bm, int Bn)
+void INSERT_TASK_zlantr( const RUNTIME_option_t *options,
+                         cham_normtype_t norm, cham_uplo_t uplo, cham_diag_t diag,
+                         int m, int n, int nb,
+                         const CHAM_desc_t *A, int Am, int An,
+                         const CHAM_desc_t *B, int Bm, int Bn )
 {
     quark_option_t *opt = (quark_option_t*)(options->schedopt);
     DAG_CORE_LANTR;
-    int szeW = chameleon_max( 1, N );
+    int szeW = chameleon_max( 1, n );
     QUARK_Insert_Task(
         opt->quark, CORE_zlantr_quark, (Quark_Task_Flags*)opt,
         sizeof(int),              &norm,  VALUE,
         sizeof(int),              &uplo,  VALUE,
         sizeof(int),              &diag,  VALUE,
-        sizeof(int),                     &M,     VALUE,
-        sizeof(int),                     &N,     VALUE,
+        sizeof(int),                     &m,     VALUE,
+        sizeof(int),                     &n,     VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(double)*szeW,             NULL,   SCRATCH,
         sizeof(void*), RTBLKADDR(B, double, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlascal.c b/runtime/quark/codelets/codelet_zlascal.c
index a031b57b406575f025f9134afe4171f4586383be..93565a1732497b2fafd5022ba0d197ac06469288 100644
--- a/runtime/quark/codelets/codelet_zlascal.c
+++ b/runtime/quark/codelets/codelet_zlascal.c
@@ -60,4 +60,6 @@ void INSERT_TASK_zlascal(const RUNTIME_option_t *options,
         sizeof(CHAMELEON_Complex64_t),       &alpha, VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INOUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlatro.c b/runtime/quark/codelets/codelet_zlatro.c
index f5b375baf757ee5194ebdf8dbb250a66be7b2f8c..5a3e30887c3009e1b8d87daf5f7469deb9d5edb8 100644
--- a/runtime/quark/codelets/codelet_zlatro.c
+++ b/runtime/quark/codelets/codelet_zlatro.c
@@ -37,7 +37,7 @@ void CORE_zlatro_quark(Quark *quark)
 
 void INSERT_TASK_zlatro(const RUNTIME_option_t *options,
                        cham_uplo_t uplo, cham_trans_t trans,
-                       int m, int n, int mb,
+                       int m, int n, int nb,
                        const CHAM_desc_t *A, int Am, int An,
                        const CHAM_desc_t *B, int Bm, int Bn)
 {
@@ -51,4 +51,6 @@ void INSERT_TASK_zlatro(const RUNTIME_option_t *options,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An), INPUT,
         sizeof(void*), RTBLKADDR(B, CHAMELEON_Complex64_t, Bm, Bn), OUTPUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zlauum.c b/runtime/quark/codelets/codelet_zlauum.c
index 2367de04caf98472983596cd16a96fe09276ce52..01ee1558f8e1ebf417db5de6f81a049f5f08ceb9 100644
--- a/runtime/quark/codelets/codelet_zlauum.c
+++ b/runtime/quark/codelets/codelet_zlauum.c
@@ -36,15 +36,17 @@ void CORE_zlauum_quark(Quark *quark)
     TCORE_zlauum(uplo, N, tileA);
 }
 
-void INSERT_TASK_zlauum(const RUNTIME_option_t *options,
-                       cham_uplo_t uplo, int n, int nb,
-                       const CHAM_desc_t *A, int Am, int An)
+void INSERT_TASK_zlauum( const RUNTIME_option_t *options,
+                         cham_uplo_t uplo, int n, int nb,
+                         const CHAM_desc_t *A, int Am, int An )
 {
     quark_option_t *opt = (quark_option_t*)(options->schedopt);
     DAG_CORE_LAUUM;
     QUARK_Insert_Task(opt->quark, CORE_zlauum_quark, (Quark_Task_Flags*)opt,
         sizeof(int),                &uplo,  VALUE,
-        sizeof(int),                        &n,     VALUE,
+        sizeof(int),                &n,     VALUE,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),             INOUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zplssq.c b/runtime/quark/codelets/codelet_zplssq.c
index 7403980c367fff705558d5369067e4c83e8b7d96..c6c10eb704a5b10899a8b5c78b8330954c9ccac4 100644
--- a/runtime/quark/codelets/codelet_zplssq.c
+++ b/runtime/quark/codelets/codelet_zplssq.c
@@ -18,7 +18,6 @@
  * @precisions normal z -> c d s
  *
  */
-#include <math.h>
 #include "chameleon_quark.h"
 #include "chameleon/tasks_z.h"
 #include "coreblas/coreblas_ztile.h"
diff --git a/runtime/quark/codelets/codelet_zpotrf.c b/runtime/quark/codelets/codelet_zpotrf.c
index d8a3691c7b8c8847be317bd190697164793b2cba..a27ddd5abfb666d644e96a9aa37552a117988957 100644
--- a/runtime/quark/codelets/codelet_zpotrf.c
+++ b/runtime/quark/codelets/codelet_zpotrf.c
@@ -59,4 +59,6 @@ void INSERT_TASK_zpotrf(const RUNTIME_option_t *options,
                       sizeof(RUNTIME_request_t*),            &(options->request),   VALUE,
                       sizeof(int),                        &iinfo,     VALUE,
                       0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_zsytrf_nopiv.c b/runtime/quark/codelets/codelet_zsytrf_nopiv.c
index 4a5b2c1ca897bb58436c68a4988d90f0e858e766..1eb683e43ce5286ca5eeda4f580f337c3fae8ecc 100644
--- a/runtime/quark/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/quark/codelets/codelet_zsytrf_nopiv.c
@@ -59,4 +59,6 @@ void INSERT_TASK_zsytrf_nopiv(const RUNTIME_option_t *options,
         sizeof(RUNTIME_request_t*),        &(options->request),  VALUE,
         sizeof(int),                     &iinfo,               VALUE,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_ztrmm.c b/runtime/quark/codelets/codelet_ztrmm.c
index 53b30d5876e593c0a4bf1b679008151a0e1d715c..c424a27d8e011c54fedc3a2502e1a278794b03c5 100644
--- a/runtime/quark/codelets/codelet_ztrmm.c
+++ b/runtime/quark/codelets/codelet_ztrmm.c
@@ -70,4 +70,6 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),                 INPUT,
         sizeof(void*), RTBLKADDR(B, CHAMELEON_Complex64_t, Bm, Bn),                 INOUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_ztrsm.c b/runtime/quark/codelets/codelet_ztrsm.c
index d630db7442eeec54ada5e7fb985b38e4fbd91149..57712e5428a8301b4acf5cfc9b040712f565ecd3 100644
--- a/runtime/quark/codelets/codelet_ztrsm.c
+++ b/runtime/quark/codelets/codelet_ztrsm.c
@@ -65,4 +65,6 @@ void INSERT_TASK_ztrsm(const RUNTIME_option_t *options,
         sizeof(void*), RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),                 INPUT,
         sizeof(void*), RTBLKADDR(B, CHAMELEON_Complex64_t, Bm, Bn),                 INOUT,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/codelets/codelet_ztrtri.c b/runtime/quark/codelets/codelet_ztrtri.c
index d1ed474207073489562f1cc3cef8caf53fc603fe..fb54394e451f40b71c1a9b338f62e24d18e63282 100644
--- a/runtime/quark/codelets/codelet_ztrtri.c
+++ b/runtime/quark/codelets/codelet_ztrtri.c
@@ -62,4 +62,6 @@ void INSERT_TASK_ztrtri(const RUNTIME_option_t *options,
         sizeof(RUNTIME_request_t*),            &(options->request),   VALUE,
         sizeof(int),                        &iinfo,     VALUE,
         0);
+
+    (void)nb;
 }
diff --git a/runtime/quark/control/runtime_async.c b/runtime/quark/control/runtime_async.c
index b21ebfa87e62fa62968cebaf45638ad07f33c1fd..5324c1c08a9d39c71c6e2354a499933edb7de249 100644
--- a/runtime/quark/control/runtime_async.c
+++ b/runtime/quark/control/runtime_async.c
@@ -20,7 +20,6 @@
  * @date 2020-04-22
  *
  */
-#include <stdlib.h>
 #include "chameleon_quark.h"
 
 /**
@@ -111,4 +110,4 @@ int RUNTIME_request_set( CHAM_context_t  *chamctxt,
     (void)param;
     (void)value;
     return CHAMELEON_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/runtime/quark/control/runtime_context.c b/runtime/quark/control/runtime_context.c
index 713672d6aafca7c8cd84d58b6c12e6ec3652bd81..b95ccde564707c6449c7a85223e3380f57ec77e6 100644
--- a/runtime/quark/control/runtime_context.c
+++ b/runtime/quark/control/runtime_context.c
@@ -19,7 +19,6 @@
  * @date 2020-03-03
  *
  */
-#include <stdlib.h>
 #include "chameleon_quark.h"
 
 /**
diff --git a/runtime/quark/control/runtime_control.c b/runtime/quark/control/runtime_control.c
index 21ba5cc4e2ca3c738813396b07850890e2d70d46..36d634ab310d98c52dec2fa87666ab8a9d877334 100644
--- a/runtime/quark/control/runtime_control.c
+++ b/runtime/quark/control/runtime_control.c
@@ -20,8 +20,6 @@
  * @date 2020-04-22
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
 #include "chameleon_quark.h"
 
 /**
diff --git a/runtime/quark/control/runtime_descriptor.c b/runtime/quark/control/runtime_descriptor.c
index b843f272ddf0342c1847e84e4f53db5737383518..78859a86fd593b41a8a303cba7f3068d3a26fcc0 100644
--- a/runtime/quark/control/runtime_descriptor.c
+++ b/runtime/quark/control/runtime_descriptor.c
@@ -20,7 +20,6 @@
  * @date 2020-03-03
  *
  */
-#include <stdlib.h>
 #include "chameleon_quark.h"
 
 void RUNTIME_comm_set_tag_sizes( int user_tag_width,
diff --git a/runtime/quark/control/runtime_options.c b/runtime/quark/control/runtime_options.c
index b32061bac017edbfb9e64c1f0a88f4f9670f2390..bab33ac075fdad9c78894b0044400485cb4a8f50 100644
--- a/runtime/quark/control/runtime_options.c
+++ b/runtime/quark/control/runtime_options.c
@@ -19,8 +19,6 @@
  * @date 2020-03-03
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
 #include "chameleon_quark.h"
 
 void RUNTIME_options_init( RUNTIME_option_t *options, CHAM_context_t *chamctxt,