diff --git a/compute/zgesvd.c b/compute/zgesvd.c
index bfcb72de3a157c660621f37a52f89da8dba22a58..be26ed8a16beefdb2119920830d31dd793faa5db 100644
--- a/compute/zgesvd.c
+++ b/compute/zgesvd.c
@@ -23,12 +23,12 @@
  * @precisions normal z -> s d c
  *
  **/
+#include "control/common.h"
 #include <stdio.h>
 #include <string.h>
 #if !defined(CHAMELEON_SIMULATION)
 #include <coreblas/lapacke.h>
 #endif
-#include "control/common.h"
 
 /***************************************************************************//**
  *
diff --git a/compute/zheevd.c b/compute/zheevd.c
index f1d059fc4584370744fb60db12ecc7688758aafa..ccd4db8bba1f64b8d4b87f9c86515be548b11b0a 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -23,11 +23,11 @@
  * @precisions normal z -> s d c
  *
  **/
+#include "control/common.h"
 #include <string.h>
 #if !defined(CHAMELEON_SIMULATION)
 #include <coreblas/lapacke.h>
 #endif
-#include "control/common.h"
 
 /***************************************************************************//**
  *
diff --git a/compute/zhetrd.c b/compute/zhetrd.c
index 30ad0ff7a56e5d9944775b9bfe9f9268f8f428d5..e3390e8fb0f56e45a2c21e35288bbefc2ed79d94 100644
--- a/compute/zhetrd.c
+++ b/compute/zhetrd.c
@@ -25,8 +25,10 @@
  * @precisions normal z -> s d c
  *
  **/
-#include <coreblas/lapacke.h>
 #include "control/common.h"
+#if !defined(CHAMELEON_SIMULATION)
+#include <coreblas/lapacke.h>
+#endif
 
 /***************************************************************************//**
  *