diff --git a/compute/zgesvd.c b/compute/zgesvd.c
index be26ed8a16beefdb2119920830d31dd793faa5db..b2d7e48d430c43bfef24fbde3dbd6a404bc10620 100644
--- a/compute/zgesvd.c
+++ b/compute/zgesvd.c
@@ -24,6 +24,7 @@
  *
  **/
 #include "control/common.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #if !defined(CHAMELEON_SIMULATION)
diff --git a/compute/zheevd.c b/compute/zheevd.c
index ccd4db8bba1f64b8d4b87f9c86515be548b11b0a..e4a85b98b380b7217225252031dd29b7cb4a21c5 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -24,6 +24,7 @@
  *
  **/
 #include "control/common.h"
+#include <stdlib.h>
 #include <string.h>
 #if !defined(CHAMELEON_SIMULATION)
 #include <coreblas/lapacke.h>
diff --git a/runtime/parsec/CMakeLists.txt b/runtime/parsec/CMakeLists.txt
index 45a1559e971eaad0e287d081612871319c372d22..714235ae976c1b3c1fd94635ae7e80a51cf5bfd7 100644
--- a/runtime/parsec/CMakeLists.txt
+++ b/runtime/parsec/CMakeLists.txt
@@ -124,7 +124,6 @@ endif(NOT CHAMELEON_SIMULATION)
 
 add_dependencies(chameleon_parsec
   chameleon_include
-  coreblas_include
   control_include
   runtime_parsec_include
 )
diff --git a/runtime/quark/CMakeLists.txt b/runtime/quark/CMakeLists.txt
index c535a55a1929c6a4ed525cb56f033574ba5d0386..eeee4ac10fd6cf8cb6c9375f50d1f5c09c61c317 100644
--- a/runtime/quark/CMakeLists.txt
+++ b/runtime/quark/CMakeLists.txt
@@ -119,7 +119,6 @@ endif(CHAMELEON_USE_CUDA)
 
 add_dependencies(chameleon_quark
   chameleon_include
-  coreblas_include
   control_include
   runtime_quark_include
 )
diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index b875800dbf35781e5554ed6fe3b505fec8b2537f..dfd436b546e93420afc76ec360f0e4fb4dd4a89a 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -141,7 +141,6 @@ endif(NOT CHAMELEON_SIMULATION)
 
 add_dependencies(chameleon_starpu
   chameleon_include
-  coreblas_include
   control_include
   runtime_starpu_include
   )
diff --git a/timing/timing.c b/timing/timing.c
index 989d97aaae67ee4e9f6b1a32e1362d9f090e502b..d054b1ef7a81419cdf75d77e2673b80ffac0f374 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -47,10 +47,11 @@
 #include <sys/resource.h>
 #endif
 
-#include "coreblas/cblas.h"
-#include "coreblas/lapacke.h"
 #include <morse.h>
-#include "coreblas.h"
+#if !defined(CHAMELEON_SIMULATION)
+#include <coreblas/lapacke.h>
+#include <coreblas.h>
+#endif
 #include "flops.h"
 #include "timing.h"
 #include "control/auxiliary.h"