From e9ec1a9deffad684386468d5e4d34eb7db5692df Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 31 Jul 2017 18:08:42 +0200
Subject: [PATCH] Cleanup headers in starpu directory

---
 runtime/starpu/CMakeLists.txt                 | 107 ++++++++++--------
 runtime/starpu/codelets/codelet_dataflush.c   |   3 +-
 runtime/starpu/codelets/codelet_zasum.c       |   4 +-
 runtime/starpu/codelets/codelet_zaxpy.c       |   4 +-
 runtime/starpu/codelets/codelet_zbuild.c      |   4 +-
 runtime/starpu/codelets/codelet_zcallback.c   |   4 +-
 runtime/starpu/codelets/codelet_zgeadd.c      |   4 +-
 runtime/starpu/codelets/codelet_zgelqt.c      |   4 +-
 runtime/starpu/codelets/codelet_zgemm.c       |   4 +-
 runtime/starpu/codelets/codelet_zgeqrt.c      |   4 +-
 runtime/starpu/codelets/codelet_zgessm.c      |   4 +-
 runtime/starpu/codelets/codelet_zgessq.c      |   4 +-
 runtime/starpu/codelets/codelet_zgetrf.c      |   4 +-
 .../starpu/codelets/codelet_zgetrf_incpiv.c   |   4 +-
 .../starpu/codelets/codelet_zgetrf_nopiv.c    |   4 +-
 runtime/starpu/codelets/codelet_zhe2ge.c      |   4 +-
 runtime/starpu/codelets/codelet_zhemm.c       |   4 +-
 runtime/starpu/codelets/codelet_zher2k.c      |   4 +-
 runtime/starpu/codelets/codelet_zherfb.c      |   4 +-
 runtime/starpu/codelets/codelet_zherk.c       |   4 +-
 runtime/starpu/codelets/codelet_zhessq.c      |   4 +-
 runtime/starpu/codelets/codelet_zlacpy.c      |   4 +-
 runtime/starpu/codelets/codelet_zlag2c.c      |   4 +-
 runtime/starpu/codelets/codelet_zlange.c      |   4 +-
 runtime/starpu/codelets/codelet_zlanhe.c      |   4 +-
 runtime/starpu/codelets/codelet_zlansy.c      |   4 +-
 runtime/starpu/codelets/codelet_zlantr.c      |   4 +-
 runtime/starpu/codelets/codelet_zlascal.c     |   4 +-
 runtime/starpu/codelets/codelet_zlaset.c      |   4 +-
 runtime/starpu/codelets/codelet_zlaset2.c     |   4 +-
 runtime/starpu/codelets/codelet_zlatro.c      |   4 +-
 runtime/starpu/codelets/codelet_zlauum.c      |   4 +-
 runtime/starpu/codelets/codelet_zplghe.c      |   4 +-
 runtime/starpu/codelets/codelet_zplgsy.c      |   4 +-
 runtime/starpu/codelets/codelet_zplrnt.c      |   4 +-
 runtime/starpu/codelets/codelet_zplssq.c      |   4 +-
 runtime/starpu/codelets/codelet_zpotrf.c      |   4 +-
 runtime/starpu/codelets/codelet_zssssm.c      |   4 +-
 runtime/starpu/codelets/codelet_zsymm.c       |   4 +-
 runtime/starpu/codelets/codelet_zsyr2k.c      |   4 +-
 runtime/starpu/codelets/codelet_zsyrk.c       |   4 +-
 runtime/starpu/codelets/codelet_zsyssq.c      |   4 +-
 .../starpu/codelets/codelet_zsytrf_nopiv.c    |   4 +-
 runtime/starpu/codelets/codelet_ztile_zero.c  |   4 +-
 runtime/starpu/codelets/codelet_ztpmqrt.c     |   4 +-
 runtime/starpu/codelets/codelet_ztpqrt.c      |   4 +-
 runtime/starpu/codelets/codelet_ztradd.c      |   4 +-
 runtime/starpu/codelets/codelet_ztrasm.c      |   4 +-
 runtime/starpu/codelets/codelet_ztrmm.c       |   4 +-
 runtime/starpu/codelets/codelet_ztrsm.c       |   4 +-
 runtime/starpu/codelets/codelet_ztrssq.c      |   4 +-
 runtime/starpu/codelets/codelet_ztrtri.c      |   4 +-
 runtime/starpu/codelets/codelet_ztslqt.c      |   4 +-
 runtime/starpu/codelets/codelet_ztsmlq.c      |   4 +-
 .../starpu/codelets/codelet_ztsmlq_hetra1.c   |   4 +-
 runtime/starpu/codelets/codelet_ztsmqr.c      |   4 +-
 .../starpu/codelets/codelet_ztsmqr_hetra1.c   |   4 +-
 runtime/starpu/codelets/codelet_ztsqrt.c      |   4 +-
 runtime/starpu/codelets/codelet_ztstrf.c      |   4 +-
 runtime/starpu/codelets/codelet_zttlqt.c      |   4 +-
 runtime/starpu/codelets/codelet_zttmlq.c      |   4 +-
 runtime/starpu/codelets/codelet_zttmqr.c      |   4 +-
 runtime/starpu/codelets/codelet_zttqrt.c      |   4 +-
 runtime/starpu/codelets/codelet_zunmlq.c      |   4 +-
 runtime/starpu/codelets/codelet_zunmqr.c      |   4 +-
 runtime/starpu/control/runtime_async.c        |   2 +-
 runtime/starpu/control/runtime_context.c      |   2 +-
 runtime/starpu/control/runtime_control.c      |   2 +-
 runtime/starpu/control/runtime_descriptor.c   |   2 +-
 runtime/starpu/control/runtime_options.c      |   2 +-
 runtime/starpu/control/runtime_profiling.c    |   2 +-
 runtime/starpu/control/runtime_workspace.c    |   2 +-
 runtime/starpu/control/runtime_zlocality.c    |   4 +-
 runtime/starpu/control/runtime_zprofiling.c   |   4 +-
 .../{morse_starpu.h => chameleon_starpu.h}    |   8 +-
 runtime/starpu/include/runtime_codelet_z.h    |   2 +-
 runtime/starpu/include/runtime_codelets.h     |   2 +-
 77 files changed, 204 insertions(+), 192 deletions(-)
 rename runtime/starpu/include/{morse_starpu.h => chameleon_starpu.h} (95%)

diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index f2109a8ce..bf86ebc1a 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -1,10 +1,10 @@
 ###
 #
-# @copyright (c) 2009-2014 The University of Tennessee and The University
+# @copyright (c) 2009-2015 The University of Tennessee and The University
 #                          of Tennessee Research Foundation.
 #                          All rights reserved.
-# @copyright (c) 2012-2016 Inria. All rights reserved.
-# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
+# @copyright (c) 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+#                          Univ. Bordeaux. All rights reserved.
 #
 ###
 #
@@ -26,81 +26,92 @@
 #  @date 13-07-2012
 #
 ###
-
 cmake_minimum_required(VERSION 2.8)
 
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include )
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include )
+
 # Generate headers for all possible precisions
 # --------------------------------------------
 set(RUNTIME_HDRS_GENERATED "")
 set(ZHDR
   include/runtime_codelet_z.h
-)
+  )
 
 precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
-                    PRECISIONS "s;d;c;z;ds;zc"
-                    TARGETDIR  "include")
+  PRECISIONS "s;d;c;z;ds;zc"
+  TARGETDIR  "include")
 
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/morse_starpu.h
-    include/runtime_codelet_profile.h
-    include/runtime_codelets.h
-    include/runtime_profiling.h
-    include/runtime_workspace.h
-    ${RUNTIME_HDRS_GENERATED}
-    )
+  include/chameleon_starpu.h
+  include/runtime_codelet_profile.h
+  include/runtime_codelets.h
+  include/runtime_profiling.h
+  include/runtime_workspace.h
+  )
+
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${RUNTIME_HDRS_GENERATED} )
+  list(APPEND RUNTIME_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
 
 # Force generation of headers
 # ---------------------------
-add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
+add_custom_target(
+  runtime_starpu_include
+  ALL SOURCES ${RUNTIME_HDRS})
 
-# installation
+# Installation
 # ------------
-#install(FILES ${RUNTIME_HDRS}
-#        DESTINATION include)
+install(
+  FILES ${RUNTIME_HDRS}
+  DESTINATION include/runtime/starpu )
 
-# Generate the morse common for all possible precisions
+# Generate the Chameleon common for all possible precisions
 # -----------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/runtime_zprofiling.c
-    control/runtime_zlocality.c
-    )
+  control/runtime_zprofiling.c
+  control/runtime_zlocality.c
+  )
 
-precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "control")
+precisions_rules_py(
+  RUNTIME_COMMON_GENERATED "${ZSRC}"
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/runtime_async.c
-    control/runtime_context.c
-    control/runtime_control.c
-    control/runtime_descriptor.c
-    control/runtime_options.c
-    control/runtime_profiling.c
-    control/runtime_workspace.c
-    codelets/codelet_dataflush.c
-    ${RUNTIME_COMMON_GENERATED}
-    )
+  control/runtime_async.c
+  control/runtime_context.c
+  control/runtime_control.c
+  control/runtime_descriptor.c
+  control/runtime_options.c
+  control/runtime_profiling.c
+  control/runtime_workspace.c
+  codelets/codelet_dataflush.c
+  ${RUNTIME_COMMON_GENERATED}
+  )
 
 set(flags_to_add "")
 foreach(_prec ${CHAMELEON_PRECISION})
-    set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
+  set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
 endforeach()
 set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
 
-# Generate the morse sources for all possible precisions
+# Generate the Chameleon sources for all possible precisions
 # ------------------------------------------------------
 set(RUNTIME_SRCS_GENERATED "")
 set(ZSRC
-    codelets/codelet_zcallback.c
-    ${CODELETS_ZSRC}
-    )
+  codelets/codelet_zcallback.c
+  ${CODELETS_ZSRC}
+  )
 
 precisions_rules_py(RUNTIME_SRCS_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "codelets")
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "codelets")
 
 set(RUNTIME_SRCS
   ${RUNTIME_COMMON}
@@ -115,10 +126,10 @@ set_property(TARGET chameleon_starpu PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_
 
 target_link_libraries(chameleon_starpu ${STARPU_LIBRARIES_DEP})
 if (NOT CHAMELEON_SIMULATION)
-    target_link_libraries(chameleon_starpu coreblas)
+  target_link_libraries(chameleon_starpu coreblas)
 endif()
 if(CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION)
-    target_link_libraries(chameleon_starpu cudablas)
+  target_link_libraries(chameleon_starpu cudablas)
 endif(CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION)
 
 add_dependencies(chameleon_starpu
@@ -126,19 +137,19 @@ add_dependencies(chameleon_starpu
   coreblas_include
   control_include
   runtime_starpu_include
-)
+  )
 if (NOT CHAMELEON_SIMULATION)
-    add_dependencies(chameleon_starpu coreblas_include)
+  add_dependencies(chameleon_starpu coreblas_include)
 endif()
 
 if (CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION)
-    add_dependencies(chameleon_starpu cudablas_include)
+  add_dependencies(chameleon_starpu cudablas_include)
 endif()
 
 # installation
 # ------------
 install(TARGETS chameleon_starpu
-        DESTINATION lib)
+  DESTINATION lib)
 
 ###
 ### END CMakeLists.txt
diff --git a/runtime/starpu/codelets/codelet_dataflush.c b/runtime/starpu/codelets/codelet_dataflush.c
index c1e6c2fb9..2e43d5ec1 100644
--- a/runtime/starpu/codelets/codelet_dataflush.c
+++ b/runtime/starpu/codelets/codelet_dataflush.c
@@ -24,7 +24,8 @@
  * @date 2014-02-05
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
+#include "chameleon/morse_tasks.h"
 
 #ifdef HAVE_STARPU_DATA_WONT_USE
 #elif defined HAVE_STARPU_IDLE_PREFETCH
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index 5d9431088..77211ecea 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_dzasum(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index cc6e9868d..e2060eb11 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zaxpy(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index 89d89a547..e6086c0f7 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -29,8 +29,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zbuild( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zcallback.c b/runtime/starpu/codelets/codelet_zcallback.c
index aa4d4dda3..905bc8a9a 100644
--- a/runtime/starpu/codelets/codelet_zcallback.c
+++ b/runtime/starpu/codelets/codelet_zcallback.c
@@ -25,8 +25,8 @@
  *  @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 
 CHAMELEON_CL_CB(zasum,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_ny(task->handles[0]), 0,                                      M*N)
 CHAMELEON_CL_CB(zaxpy,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_nx(task->handles[1]), 0,                                      M)
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 66ffc5088..513259fd8 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 e6e681f7b..cb8717bdd 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 ab666dd70..376b7c4e4 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 06602939f..24bdd5363 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 5d8c1d3eb..69037dfb9 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -29,8 +29,8 @@
  *
  **/
 #include "coreblas/cblas.h"
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 62ef1bd97..69ff940d7 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgessq( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 8c40ed79e..b07c35b92 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zgetrf(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 00351134b..7515cf388 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 7386a3967..6994c8e18 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -25,8 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 26fe36cae..d4898be95 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/runtime/starpu/codelets/codelet_zhe2ge.c
@@ -20,8 +20,8 @@
  *
  **/
 
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 5f369fbad..7eb1cab6f 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 cd0641030..9cd19851c 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 3a1dbfd68..693c6b4fd 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/runtime/starpu/codelets/codelet_zherfb.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 d06ea0e22..1dcd00f9a 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 42b75ab04..64c5a6212 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zhessq( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 13f5169b0..03d56c1e2 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 e099bda20..1d714321e 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -26,8 +26,8 @@
  * @precisions mixed zc -> ds
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 9a19ff26a..1ebf6b5ef 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlange(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 9b57a8a28..fb119405d 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlanhe(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index 734521c02..5729b6aa4 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlansy(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index 171bf8fa9..673b15480 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zlantr(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index e18cdd955..9a4bc3fea 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 0e59f1bee..b6c7f294c 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -27,8 +27,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 9f9c68d5d..0ca1daaa2 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -27,8 +27,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 7d21a094f..72a971662 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 f370f6c6f..1da8cff74 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 289d4c4b8..0ac2c5466 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 f925eb038..1bc231208 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 9bea322d9..13cd22da0 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 896cb8f71..d41d45b6e 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -25,8 +25,8 @@
  *
  **/
 #include <math.h>
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 d9d056aff..d3c17b217 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 b2221899b..328078979 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -29,8 +29,8 @@
  *
  **/
 #include "coreblas/cblas.h"
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 fcf2b3bf2..f292afdcb 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 9462a4672..11f179f7a 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 44e465d32..b3a3c8236 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 5c8e35900..87fe85c7b 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsyssq( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 5c3c2851a..935fde7db 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index 77ba67c74..c3c3cca00 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 db5db63fc..f26c785e4 100644
--- a/runtime/starpu/codelets/codelet_ztpmqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpmqrt.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpmqrt( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztpqrt.c b/runtime/starpu/codelets/codelet_ztpqrt.c
index 7a0d09d1d..d997971b3 100644
--- a/runtime/starpu/codelets/codelet_ztpqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpqrt.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztpqrt( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index 232d0f47e..d8f2557ba 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 074c27e55..2560d75b1 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrasm(const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 4a953fdd9..23bb3545e 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 bb4bdbc3d..8c4f30641 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 17b0d24a0..483eaeb2e 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 void MORSE_TASK_ztrssq( const MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index c7fc81b50..0cd6649f7 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 06b1ae17a..a39f1921b 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 774b5e9eb..d27f7cb1e 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -30,8 +30,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 f4fe0c855..1c75f0e79 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 00ecc66af..b16fa24ed 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -30,8 +30,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 29f97cc0e..c43e85e2b 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 a86bf0b92..05e177292 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 21823a51a..444eb0fe5 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.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 58e218b1f..f7d89787c 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 c49e54e24..eb95c9838 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 5a3a2051f..4cca405a0 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 c745a8c49..37377aab4 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 088d8198c..d4bfab7f9 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -29,8 +29,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#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 054b4f3ee..5b38ab7aa 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 #include "chameleon/morse_tasks_z.h"
 
 /**
diff --git a/runtime/starpu/control/runtime_async.c b/runtime/starpu/control/runtime_async.c
index 09a120e69..4d9b646ac 100644
--- a/runtime/starpu/control/runtime_async.c
+++ b/runtime/starpu/control/runtime_async.c
@@ -23,7 +23,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 /*******************************************************************************
  *  Create a sequence
diff --git a/runtime/starpu/control/runtime_context.c b/runtime/starpu/control/runtime_context.c
index 806eeb352..a96a071e2 100644
--- a/runtime/starpu/control/runtime_context.c
+++ b/runtime/starpu/control/runtime_context.c
@@ -24,7 +24,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 #if (STARPU_MAJOR_VERSION > 1) || ((STARPU_MAJOR_VERSION == 1) && (STARPU_MINOR_VERSION >= 3))
 /* Defined by StarPU as external function */
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index c1c83499b..bbf792875 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -25,7 +25,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 #if defined(CHAMELEON_SIMULATION)
 # ifndef STARPU_SIMGRID
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 46383eae7..b14888842 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -23,7 +23,7 @@
  **/
 #include <stdlib.h>
 #include <unistd.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 #if defined(CHAMELEON_USE_MPI)
 
diff --git a/runtime/starpu/control/runtime_options.c b/runtime/starpu/control/runtime_options.c
index 902d49417..55caf9a7a 100644
--- a/runtime/starpu/control/runtime_options.c
+++ b/runtime/starpu/control/runtime_options.c
@@ -25,7 +25,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 void RUNTIME_options_init( MORSE_option_t *option, MORSE_context_t *morse,
                            MORSE_sequence_t *sequence, MORSE_request_t *request )
diff --git a/runtime/starpu/control/runtime_profiling.c b/runtime/starpu/control/runtime_profiling.c
index 33bbb4021..4b9c700d5 100644
--- a/runtime/starpu/control/runtime_profiling.c
+++ b/runtime/starpu/control/runtime_profiling.c
@@ -24,7 +24,7 @@
  *
  **/
 #include <math.h>
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 #if defined(HAVE_STARPU_FXT_PROFILING)
 #include <starpu_fxt.h>
 #endif
diff --git a/runtime/starpu/control/runtime_workspace.c b/runtime/starpu/control/runtime_workspace.c
index d67f95a82..c79f0db1f 100644
--- a/runtime/starpu/control/runtime_workspace.c
+++ b/runtime/starpu/control/runtime_workspace.c
@@ -23,7 +23,7 @@
  * @date 2011-06-01
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
+#include "chameleon_starpu.h"
 
 static void RUNTIME_allocate_workspace_on_workers(void *arg)
 {
diff --git a/runtime/starpu/control/runtime_zlocality.c b/runtime/starpu/control/runtime_zlocality.c
index f7bdf1fff..19317707f 100644
--- a/runtime/starpu/control/runtime_zlocality.c
+++ b/runtime/starpu/control/runtime_zlocality.c
@@ -25,8 +25,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 
 #ifdef CHAMELEON_USE_CUDA
 /* Only codelets with multiple choices are present here */
diff --git a/runtime/starpu/control/runtime_zprofiling.c b/runtime/starpu/control/runtime_zprofiling.c
index c2fc5f5e6..4167bcf2f 100644
--- a/runtime/starpu/control/runtime_zprofiling.c
+++ b/runtime/starpu/control/runtime_zprofiling.c
@@ -25,8 +25,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/runtime_codelet_z.h"
+#include "chameleon_starpu.h"
+#include "runtime_codelet_z.h"
 
 void RUNTIME_zdisplay_allprofile()
 {
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/chameleon_starpu.h
similarity index 95%
rename from runtime/starpu/include/morse_starpu.h
rename to runtime/starpu/include/chameleon_starpu.h
index 14d589b1f..e171edd10 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/chameleon_starpu.h
@@ -49,10 +49,10 @@
 #endif
 
 #include "control/common.h"
-#include "runtime/starpu/include/runtime_codelets.h"
-#include "runtime/starpu/include/runtime_profiling.h"
-#include "runtime/starpu/include/runtime_codelet_profile.h"
-#include "runtime/starpu/include/runtime_workspace.h"
+#include "runtime_codelets.h"
+#include "runtime_profiling.h"
+#include "runtime_codelet_profile.h"
+#include "runtime_workspace.h"
 
 typedef struct starpu_conf starpu_conf_t;
 
diff --git a/runtime/starpu/include/runtime_codelet_z.h b/runtime/starpu/include/runtime_codelet_z.h
index 16de7ea01..da6dce4f7 100644
--- a/runtime/starpu/include/runtime_codelet_z.h
+++ b/runtime/starpu/include/runtime_codelet_z.h
@@ -30,7 +30,7 @@
 #define _CODELETS_Z_H_
 
 #include <stdio.h>
-#include "runtime/starpu/include/runtime_codelets.h"
+#include "runtime_codelets.h"
 
 /*
  * Management functions
diff --git a/runtime/starpu/include/runtime_codelets.h b/runtime/starpu/include/runtime_codelets.h
index b0da05426..4fa08b280 100644
--- a/runtime/starpu/include/runtime_codelets.h
+++ b/runtime/starpu/include/runtime_codelets.h
@@ -1,4 +1,4 @@
-/**
+ /**
  *
  * @copyright (c) 2009-2014 The University of Tennessee and The University
  *                          of Tennessee Research Foundation.
-- 
GitLab