diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32134886d4c856ad374ee6528a7c5f8350e4cfaf..02be11f748b1ceabdb46ee9b7fd5a54cef5f819f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,14 +384,14 @@ if(NOT CHAMELEON_SIMULATION)
         find_package(CUDA REQUIRED)
 
         if (CUDA_FOUND)
+            if(CUDA_VERSION VERSION_LESS "4.0")
+                message(WARNING "Cuda version must be at least 4.0")
+            endif(CUDA_VERSION VERSION_LESS "4.0")
             message("-- ${Blue}Add definition CHAMELEON_USE_CUDA"
             " - Activate CUDA in Chameleon${ColourReset}")
             # create imported target because not provided with old cmake
             add_library(CUDA::CUDA INTERFACE IMPORTED)
             add_library(CUDA::CUBLAS INTERFACE IMPORTED)
-            if(CUDA_VERSION VERSION_LESS "3.0")
-                set(CUDA_HOST_COMPILATION_CPP OFF)
-            endif(CUDA_VERSION VERSION_LESS "3.0")
             set(CUDA_BUILD_EMULATION OFF)
             if (CUDA_INCLUDE_DIRS)
                 set_target_properties(CUDA::CUDA PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CUDA_INCLUDE_DIRS}")
diff --git a/control/common.h b/control/common.h
index c86bf94ad82144c2cad722efee87dc948161ded8..ef06cffb0568edde5cbc6d601ca6d4ad2a0a32c0 100644
--- a/control/common.h
+++ b/control/common.h
@@ -48,7 +48,6 @@
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <cuda_runtime_api.h>
-#include <cublas.h>
 #include <cublas_v2.h>
 #endif
 
diff --git a/gpucublas/include/gpucublas.h b/gpucublas/include/gpucublas.h
index 90f05f44b1feef38ad0b2088257e1738f7e6b727..8a9deb977ccae2c998f3b1390c5085febaee9104 100644
--- a/gpucublas/include/gpucublas.h
+++ b/gpucublas/include/gpucublas.h
@@ -36,7 +36,6 @@
 #include <cuda.h>
 #include <cuComplex.h>
 
-#include <cublas.h>
 #include <cublas_v2.h>
 
 #define CUBLAS_SADDR(_a_) (&(_a_))
diff --git a/runtime/starpu/control/runtime_tags.c b/runtime/starpu/control/runtime_tags.c
index 08d0366da0417ce70251034c630edb103548e394..b1b0a2ec0207e65f06d834d47ff13b7ddb28baf9 100644
--- a/runtime/starpu/control/runtime_tags.c
+++ b/runtime/starpu/control/runtime_tags.c
@@ -210,7 +210,7 @@ chameleon_starpu_tag_release( int64_t min )
  ******************************************************************************/
 void
 chameleon_starpu_tag_init( ) {
-    return CHAMELEON_SUCCESS;
+    return;
 }
 
 /**
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 22c3ca53498ab24640f6620cc76a4052a96852bd..122bef359eade63b5d9a51db3441c35ad730e79e 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -67,8 +67,6 @@
 #include <starpu_scheduler.h>
 #include <starpu_cuda.h>
 
-#include <cublas.h>
-#include <starpu_cublas.h>
 #include <cublas_v2.h>
 #include <starpu_cublas_v2.h>
 #endif