diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index f2109a8ce4956edc2a27b3b0b5d9e8912e6a7855..bf86ebc1afc69e8e827bd5acf833e442047c9b4d 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 c1e6c2fb90fdc1957eb6e7223fdc35296029d76c..2e43d5ec1f324151b3429b5c3726bf8bf529b186 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 5d9431088e755464dd1c6b751044e01e4a68e11c..77211ecea6b902884c4c714911eb244f6affb7ec 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 cc6e9868d6050402d2fc30ed65fba41291737e17..e2060eb119a6d59c9e51cf6dde2339eb29b06f82 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 89d89a5473c547c438c1de3039f378b8debbe6be..e6086c0f73f3c9660a81fe196e88081038f84ff3 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 aa4d4dda3244fc7d5f507088a6c155bf97a7a0ce..905bc8a9a86da0bfe5282135eeadf2b1a9bf605a 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 66ffc50888538893515e17a7864346ba197362f9..513259fd8d44c0f6335b547ea8e9b4df826196a4 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 e6e681f7be09fbbd039c19b3a467fddad5eedd3c..cb8717bddc0223a99728a478f167b344b6d966f3 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 ab666dd70e9d46b3b9e771a165a4aca828f76b46..376b7c4e48e76e9a8e1e33f0b5a57561cd86cb56 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 06602939feb2546a93c960c1846f5e45084e16f8..24bdd536371e06fa7b82b3baca0a452221015eb9 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 5d8c1d3ebe43eeb7909f9929f5316585d2fc0c36..69037dfb95c3a651b6cee07538a3ac6a94d9b4e1 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 62ef1bd974b982c1f8222a47a7486c188a9c7638..69ff940d763cc268a4468006c586393565a6dbd5 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 8c40ed79e79f81edea425e27883613cce014cba3..b07c35b920ddb5654876911f7e3ca29773cf9d40 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 00351134bbfd0887660f01862869a34ef548fde6..7515cf3889b644552c5e24d818da8a0163b544e7 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 7386a396762a8b81877bac88663ae69f45c11251..6994c8e18e2f423003bc01bd9ce76207ec4de86f 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 26fe36caef02981623355da01bdaa104e571e27d..d4898be959cb1baece1240bf9229316e71096d7b 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 5f369fbadff6c5a80d1de1e7948274523aa964cf..7eb1cab6f0dc9105df9820237e7fd7c8eab7966a 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 cd0641030d801369a733e4e22a6d89caf0948c96..9cd19851c1f23b8b47b64dd7046c68e39ae9dca2 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 3a1dbfd68b5fb21cca7f44438ca288501ddcb368..693c6b4fd0ffedcf7427dbe72ba6f043a41bf149 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 d06ea0e221b7271d08ca5d383170c623fb322d2d..1dcd00f9aad0834db5ea0ff31b439182ff633fa6 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 42b75ab04fa2ebb1e3f1bae52cdd5107cd8ff0fa..64c5a6212993c2fa6f3c984664f8d59e47f66098 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 13f5169b08b2c52981617403c27d8ee33a2ae09a..03d56c1e2e47ee39a4ef4bb48576aba283af1064 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 e099bda20550d8dd71d7bc073520ee10f395e85f..1d714321e79d345d810d3aafa2d77b22a7bc78a1 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 9a19ff26af7e7556c382ae19b2dd3f9d1a805a1f..1ebf6b5efc1cf77f8970c3fbc6acbc1fd354e42a 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 9b57a8a2877acd9b2196c30038a34e7f00a041fa..fb119405da53eb4eb041eb07e21573bd7348f179 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 734521c0279068c2daeffe8b3b33fba34cfdab69..5729b6aa49f3b6e75ca0ecb4d6efe831dfffef38 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 171bf8fa9c082bc9f4c804d6ab2e191ba3860551..673b154801e13a0e5dbeb27ecacc2b687c740e95 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 e18cdd955b9e8485da4a4e071fba3fc981cbc490..9a4bc3fea17030365a9b661c4dff906bb311268b 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 0e59f1bee51a82051407f6187e0ac16751ae7cde..b6c7f294cd4d874ca6c8964a6ee5a63ac4507e59 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 9f9c68d5dd31ae85005b830b97cc15f3482bc231..0ca1daaa29b59ac31ecc81f5f8744112dc2709c1 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 7d21a094fbf1df9aa79b85ec009bc5471f050227..72a9716622ad6ab7550f9e08f497fe4a88101e3c 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 f370f6c6faf58faea3a42d4521b776cd8e5d8233..1da8cff747ed4e0e879f650b6ebcaf38dcc1777e 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 289d4c4b81e6bb14ede8ab708d75cf1bda113c48..0ac2c5466fca5d94ae58d6ae1a8fea5dca2002f2 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 f925eb038a97be31004e203ee96615fbbd371dec..1bc231208a1c352bfbca7f862d1a973708632c76 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 9bea322d98270e2ca0a560a499a28f8eb4589d02..13cd22da00c041b8910271c767ffd912cf5a5f41 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 896cb8f71141196a7b03764f5dad370bb193c9e3..d41d45b6eb9278bf82456319c719ddcda77d4085 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 d9d056affe46fa4c343c1ca696d639c8c4e57388..d3c17b217490bb17c62182e257a5e90427548c64 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 b2221899bd8ab8fdccdb27e06b18828168515d8e..32807897959c8c78ef54ded84681c6cda0acf75f 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 fcf2b3bf28a2d2e2d883a5b41dae485a8e5bed9c..f292afdcb703ad738d12a7909014c72fa892ad2e 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 9462a4672b54a30c2685a738078840095d2f7b58..11f179f7afc640fe393d0bb6374de60c47c965dc 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 44e465d32e8a622f218473593ffa33174d00a52c..b3a3c82365d04cd8769266ac1e1eb67b6e0bd40f 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 5c8e35900db169c85e0916de3a6dda51b6cef49f..87fe85c7b555b45255b6d97840d779c77b7615da 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 5c3c2851a290dde5e3cc538c239237c5cae1337b..935fde7dbec4c9323ff7cf2f909b9c97429070c3 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 77ba67c74a2737ac9c37693d69dc051017a27d5d..c3c3cca00841125d99690472734997f63d337b6e 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 db5db63fcd3f0ef76b715c0ee7c813bb3034f8a8..f26c785e42716a80cee5fe1ba81b7ccf335fe32d 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 7a0d09d1d3e47283e989f1790014482da7c5e426..d997971b3a355518429a0c29e95688d8a425419f 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 232d0f47eea349c4ce6588fb77313f1eea9b5856..d8f2557bae9c02e5700892936c061d63bf9b7843 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 074c27e5522dba58b3ee133bc1a51b5067d0ce6f..2560d75b1da28d6fa3486f1acaf87f10f59209a7 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 4a953fdd9334bf2dfb6dc022700acaacec57e29c..23bb3545e5c65c61a7a11531e93949c2acd721da 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 bb4bdbc3d55d3c0c9a87a0cd66086321704ef20f..8c4f3064122735e2c6d39d2d4768d80e4437977e 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 17b0d24a05e4b4fef9eeadcab44a7b824f4e3259..483eaeb2e39f7f13b76fca407fe88ad009ddb1cb 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 c7fc81b505dddb5754b723e7c9bde7d9bb58702a..0cd6649f7a1bc9c14e0a3df1b46ad04b15441161 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 06b1ae17a136bcb1083bc30043df2ba3a04a39ca..a39f1921bfa6bd283427760d119d150270f99b01 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 774b5e9eb54b5b196f3238e82c48dedc843556dd..d27f7cb1e0d4a3c9d6bfac1a3f098671e501f004 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 f4fe0c8557265c75a368f9824f0d01b06f40d83a..1c75f0e7983702242d72694f08df7b41871c2cdc 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 00ecc66af87b46d8d0b1c9f93a278088fe395560..b16fa24ede2d64f40bea864610fca8f27bd86c6a 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 29f97cc0e787a6f9b3d9b0ddaa5ebc7bef45c49a..c43e85e2b6aa24f50b79b3fe42513c19abfb8d31 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 a86bf0b92c8f31f01c04ed80819ef8e08b5e78c7..05e177292148d8829d60b9df3d7c995ce72411cc 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 21823a51a86237565ae8534649f2d4faa678eec3..444eb0fe559cec89ad2c308eb8a369f5374de583 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 58e218b1f0f5a99dcc09e09092aef6611ed51bca..f7d89787c52f570c3a67f5bc436b54bab878b8dd 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 c49e54e24d25d67f760194510bd7d023eb2123c5..eb95c983843bc64e338c2c8afb8d060ef0bdbdb8 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 5a3a2051fcd3fa5132a5f0c9762fa012ffcd72d4..4cca405a05f0307a6be952736c84d360fede65a8 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 c745a8c496922d733973bbb85f693140cc9e1dac..37377aab411d91b180a8bdc6eb4d224749981aef 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 088d8198c24ef83ca4c1336a325b27ee22738d1c..d4bfab7f93e77b8a9a30d30dc77ccb6baa3a74a3 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 054b4f3eede30d846f7bfd80373b68de53aa518b..5b38ab7aa8497daa3e9107cec215f5da1273ab20 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 09a120e69e63aabfd6f4a65103239cacac5e4856..4d9b646acad528cca09a0bbb578f6e433f99dceb 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 806eeb3523e533921f806f3d1a4a471d0cd6b8df..a96a071e2c35c8f462dfac901316a3713764a754 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 c1c83499b21f20ade3c2150166e9a66bb7cab462..bbf792875153712d4ca6cbae90a53635d09a2aea 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 46383eae701eee8e5d2d5a0ddef754e0f0da1bf8..b14888842d1e0b81cd54df2371268c37a1f383ce 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 902d49417cb23881f94fd5b23b59112f44436f10..55caf9a7ae505c0e0f2cd4cc4a24c59aab944fc6 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 33bbb4021690aa53ef39db1409aa85b0a6d93f27..4b9c700d50c9c2430d1094f1ec4b81fedabd10a4 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 d67f95a82bac96d8dae1ab615a6e853fd145bc07..c79f0db1fce281273a1700b067ee191441fa83b9 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 f7bdf1fff8741172ee5fe2dca77efa6c640a2f53..19317707ffeaba6910050149e5e297e8322d16ef 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 c2fc5f5e61987e2d968b9c588cb14f858979b2fd..4167bcf2f0f3ef01cc0a0c97caf65e39aa40d2a5 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 14d589b1fc36698dcca331bf568b49b3280fcd33..e171edd10fe2ab0773666ac401a429146e7b5f22 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 16de7ea017d057fa15d4f0760c95b9af4045200a..da6dce4f74fea7bd8eb292d3c2c10373a15a64de 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 b0da0542647aa405f98fe1f674077924584505f0..4fa08b2808bbf96fe44755cb0676a2365bb8819c 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.