diff --git a/coreblas/compute/core_dzasum.c b/coreblas/compute/core_dzasum.c
index f0af36164ecc9ca098f87ad006250860851b8fb1..e06402dbfa179cba57352c2023627d9449e29d1e 100644
--- a/coreblas/compute/core_dzasum.c
+++ b/coreblas/compute/core_dzasum.c
@@ -24,9 +24,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 #include <math.h>
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /**
  *
diff --git a/coreblas/compute/core_zaxpy.c b/coreblas/compute/core_zaxpy.c
index 373ff859a0aaf2e3dc6d420f0b4bad14f02d0462..249267697aa16815746506cf4dfadd0a11a6ed72 100644
--- a/coreblas/compute/core_zaxpy.c
+++ b/coreblas/compute/core_zaxpy.c
@@ -17,7 +17,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgeadd.c b/coreblas/compute/core_zgeadd.c
index 9714410f6e76186deeb8cfc4fc3817c40e80a097..259f4b61df3ec94dc9fdb43bf09c4dedbe45bf1c 100644
--- a/coreblas/compute/core_zgeadd.c
+++ b/coreblas/compute/core_zgeadd.c
@@ -25,7 +25,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /**
  ******************************************************************************
diff --git a/coreblas/compute/core_zgelqt.c b/coreblas/compute/core_zgelqt.c
index e0c5b8ff68f821d59694a8134a2c6985e1ed3042..37bb3e99819e4d9df5f2795c44f3280590e99f2d 100644
--- a/coreblas/compute/core_zgelqt.c
+++ b/coreblas/compute/core_zgelqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgemm.c b/coreblas/compute/core_zgemm.c
index a7737378daef67e284a6c100ad7b4ab74981c5b1..b4d4ad797c9157ee9b9d64ab3f1f83b8153b14d9 100644
--- a/coreblas/compute/core_zgemm.c
+++ b/coreblas/compute/core_zgemm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgeqrt.c b/coreblas/compute/core_zgeqrt.c
index 0c984732d78d183a64026c5910d7597d75b53fb2..fa6d9392afcb46b892a10cefa8f65cd62c00fe57 100644
--- a/coreblas/compute/core_zgeqrt.c
+++ b/coreblas/compute/core_zgeqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgesplit.c b/coreblas/compute/core_zgesplit.c
index 4c62e55c5e2574356e955e86f993612d0ca674c0..f2610acf1c65c2eff0c111299cbb832e0f1c634a 100644
--- a/coreblas/compute/core_zgesplit.c
+++ b/coreblas/compute/core_zgesplit.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /**
  ***************************************************************************
diff --git a/coreblas/compute/core_zgessm.c b/coreblas/compute/core_zgessm.c
index 2694092b26bbf45e9ee60ac2411fa0bce4fb2dc7..fdf9e619850fc979454dee17c3f38c8786a71c60 100644
--- a/coreblas/compute/core_zgessm.c
+++ b/coreblas/compute/core_zgessm.c
@@ -28,9 +28,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/cblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgessq.c b/coreblas/compute/core_zgessq.c
index 72eff4242258138b9e0529d1652b248c6680b4fa..dfdf90e25caec46773a2da81830bf14895bc81f9 100644
--- a/coreblas/compute/core_zgessq.c
+++ b/coreblas/compute/core_zgessq.c
@@ -25,8 +25,8 @@
  *
  **/
 #include <math.h>
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 #define COMPLEX
 
diff --git a/coreblas/compute/core_zgetf2_nopiv.c b/coreblas/compute/core_zgetf2_nopiv.c
index d2bd6031c7e32f96540a9f7d0a78bd28926ab91f..60fcbe48b796f9a0a9ee2aa8959260bdd7b1d5b1 100644
--- a/coreblas/compute/core_zgetf2_nopiv.c
+++ b/coreblas/compute/core_zgetf2_nopiv.c
@@ -25,9 +25,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 #include <math.h>
-#include "coreblas/include/lapacke.h"
+#include "coreblas/lapacke.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgetrf.c b/coreblas/compute/core_zgetrf.c
index 049153fcf46e2bfe6d59159a6739171b5fd170aa..c40a0b0bbf2ee221d7be6ee1ed99be40b11c1342 100644
--- a/coreblas/compute/core_zgetrf.c
+++ b/coreblas/compute/core_zgetrf.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 
 int CORE_zgetrf(int m, int n,
diff --git a/coreblas/compute/core_zgetrf_incpiv.c b/coreblas/compute/core_zgetrf_incpiv.c
index a59b84a1dddbd85416e4b09e79ec1df652cbd57f..220d8794e04617a0632f892ac51ec1e8ed6a6724 100644
--- a/coreblas/compute/core_zgetrf_incpiv.c
+++ b/coreblas/compute/core_zgetrf_incpiv.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zgetrf_nopiv.c b/coreblas/compute/core_zgetrf_nopiv.c
index a7fd6c4994ca6016f1fd229f5d71ff81564781ca..a6fa9f7f05dd383c6f4b304e88846f192f4b0a83 100644
--- a/coreblas/compute/core_zgetrf_nopiv.c
+++ b/coreblas/compute/core_zgetrf_nopiv.c
@@ -25,7 +25,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zhe2ge.c b/coreblas/compute/core_zhe2ge.c
index 53b0b24ddf15637459866b578abfae6ee64c6d08..916c12e0ce7b99fa2ede8ec6b3688b4790c7ad0d 100644
--- a/coreblas/compute/core_zhe2ge.c
+++ b/coreblas/compute/core_zhe2ge.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zhemm.c b/coreblas/compute/core_zhemm.c
index bc9c29b6f92ab686a1b164416e412de5f0606c0e..c6237bf73792bc37ab56734ff2e8d1a41bce7e11 100644
--- a/coreblas/compute/core_zhemm.c
+++ b/coreblas/compute/core_zhemm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #undef REAL
 #define COMPLEX
diff --git a/coreblas/compute/core_zher2k.c b/coreblas/compute/core_zher2k.c
index a58e3f521e9ceb116c7b8553d827bb6992067f10..59b73e216b91939daf6a8c8b4246dca9147ef867 100644
--- a/coreblas/compute/core_zher2k.c
+++ b/coreblas/compute/core_zher2k.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #undef REAL
 #define COMPLEX
diff --git a/coreblas/compute/core_zherfb.c b/coreblas/compute/core_zherfb.c
index 933e302c109a28d1859413423557866efec0c804..c20e20f87a46faf39a8797b8d5deb906bbeeb7b5 100644
--- a/coreblas/compute/core_zherfb.c
+++ b/coreblas/compute/core_zherfb.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
-#include "coreblas/include/lapacke.h"
+#include "coreblas.h"
+#include "coreblas/lapacke.h"
 
 /**
  *******************************************************************************
diff --git a/coreblas/compute/core_zherk.c b/coreblas/compute/core_zherk.c
index d71a47552873d29072295c535507bf7a2d3c5775..ba1e717feaacb17db56a8b4d99a63889dca90552 100644
--- a/coreblas/compute/core_zherk.c
+++ b/coreblas/compute/core_zherk.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #undef REAL
 #define COMPLEX
diff --git a/coreblas/compute/core_zhessq.c b/coreblas/compute/core_zhessq.c
index 4eaf0762c21bc4776219ced86a3a1d511f09e7f9..330a75abfd917bfb3de6256fd1221a984e95dfc5 100644
--- a/coreblas/compute/core_zhessq.c
+++ b/coreblas/compute/core_zhessq.c
@@ -25,8 +25,8 @@
  *
  **/
 #include <math.h>
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 #define COMPLEX
 
diff --git a/coreblas/compute/core_zlacpy.c b/coreblas/compute/core_zlacpy.c
index bc82632b724fbc9effc0b1ab799daf943cad5f6a..dbdb0af416ddfbd662dd0e89e2ec0beced4746ba 100644
--- a/coreblas/compute/core_zlacpy.c
+++ b/coreblas/compute/core_zlacpy.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlag2c.c b/coreblas/compute/core_zlag2c.c
index 1e5e377ff13e67580f770f3365bac62704ef54f8..af426a1a631bc8999dc9091428dd4c1b191e4da9 100644
--- a/coreblas/compute/core_zlag2c.c
+++ b/coreblas/compute/core_zlag2c.c
@@ -26,8 +26,8 @@
  * @precisions mixed zc -> ds
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlange.c b/coreblas/compute/core_zlange.c
index afe5b5259eb6647536b5179293ec62850ba2e308..19b9e9648b5c57f2fa142bf1c5a1d13150d5521c 100644
--- a/coreblas/compute/core_zlange.c
+++ b/coreblas/compute/core_zlange.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlanhe.c b/coreblas/compute/core_zlanhe.c
index 506d49cf840dac25325905f1e9b9998d2c4e25ee..dbe465ef333289e62ef43d16e87796b67f917f71 100644
--- a/coreblas/compute/core_zlanhe.c
+++ b/coreblas/compute/core_zlanhe.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlansy.c b/coreblas/compute/core_zlansy.c
index 9104492136d05c9cd0efeb4179fe2f6f9114c516..e9ff19afa363867a0f60082b92282611b6b5b335 100644
--- a/coreblas/compute/core_zlansy.c
+++ b/coreblas/compute/core_zlansy.c
@@ -26,8 +26,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlantr.c b/coreblas/compute/core_zlantr.c
index d100feb12bef5b12a14a149be99847f83339cade..2c8225dc18e785c50cda1ff95693f36aa1f04804 100644
--- a/coreblas/compute/core_zlantr.c
+++ b/coreblas/compute/core_zlantr.c
@@ -24,9 +24,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
+#include "coreblas/lapacke.h"
 #include <math.h>
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlascal.c b/coreblas/compute/core_zlascal.c
index 3fc2101d8213ca3789ecdb4fe4510dafa7930131..73083eed231c6853b3120fd24d34ad9cd62c3e5f 100644
--- a/coreblas/compute/core_zlascal.c
+++ b/coreblas/compute/core_zlascal.c
@@ -11,8 +11,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
-#include "coreblas/include/cblas.h"
+#include "coreblas.h"
+#include "coreblas/cblas.h"
 #include <math.h>
 
 /**
diff --git a/coreblas/compute/core_zlaset.c b/coreblas/compute/core_zlaset.c
index de82e85003868b3cb233bf796eba373c28905a49..40d95208c3a952cd39be4328b2f191f1b3809277 100644
--- a/coreblas/compute/core_zlaset.c
+++ b/coreblas/compute/core_zlaset.c
@@ -27,8 +27,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 
 /**
diff --git a/coreblas/compute/core_zlaset2.c b/coreblas/compute/core_zlaset2.c
index 3b72bf20436e0b7b35e8361f495c69dc7b0d573a..60d4ba6c47d43d1d4d0457094b5201da836c247a 100644
--- a/coreblas/compute/core_zlaset2.c
+++ b/coreblas/compute/core_zlaset2.c
@@ -27,8 +27,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 
 /**
diff --git a/coreblas/compute/core_zlatro.c b/coreblas/compute/core_zlatro.c
index b8547cb0c185f7ad580675e816c6261f062524b8..85c630ed1e236715e87c411793acbf3782925e84 100644
--- a/coreblas/compute/core_zlatro.c
+++ b/coreblas/compute/core_zlatro.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
-#include "coreblas/include/lapacke.h"
+#include "coreblas.h"
+#include "coreblas/lapacke.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zlauum.c b/coreblas/compute/core_zlauum.c
index cf27cb96987c6f7cf95c0246ef10b0ff015c9fe6..4ab3749b319978c85f234f5e57b84eee22af3c9c 100644
--- a/coreblas/compute/core_zlauum.c
+++ b/coreblas/compute/core_zlauum.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zpamm.c b/coreblas/compute/core_zpamm.c
index 65c0ce5cf64f5d5c54d54c5205e1f5ba58339620..1c7750da04c10c444b95e5b21140178ecba3d9f9 100644
--- a/coreblas/compute/core_zpamm.c
+++ b/coreblas/compute/core_zpamm.c
@@ -27,9 +27,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/cblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 static inline int CORE_zpamm_a2(MORSE_enum side, MORSE_enum trans, MORSE_enum uplo,
                                 int M, int N, int K, int L,
diff --git a/coreblas/compute/core_zparfb.c b/coreblas/compute/core_zparfb.c
index f46466558ccbe6e8400a5cf384c6523baeb0e23b..99feee51aaae319520bc2ba1d5f599a0d28c975d 100644
--- a/coreblas/compute/core_zparfb.c
+++ b/coreblas/compute/core_zparfb.c
@@ -27,9 +27,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/cblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zpemv.c b/coreblas/compute/core_zpemv.c
index 32d63ae48b56c26d0b4c6a20b63b83200af05b05..5cd8a128b53ec37351738b9c70704044e0632b88 100644
--- a/coreblas/compute/core_zpemv.c
+++ b/coreblas/compute/core_zpemv.c
@@ -27,9 +27,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/cblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zplghe.c b/coreblas/compute/core_zplghe.c
index 097d63ad4e5efccff2dce7e4408ec280013b984e..e17d7a580655650d6466b4dc070ec6e0dd8bc4d5 100644
--- a/coreblas/compute/core_zplghe.c
+++ b/coreblas/compute/core_zplghe.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #define COMPLEX
 #undef REAL
diff --git a/coreblas/compute/core_zplgsy.c b/coreblas/compute/core_zplgsy.c
index 8a0dbe15d67e5e21794cb09b2e243763da597d21..449d19c9f49000555e2821a8a5568e69eac8a074 100644
--- a/coreblas/compute/core_zplgsy.c
+++ b/coreblas/compute/core_zplgsy.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #define COMPLEX
 #undef REAL
diff --git a/coreblas/compute/core_zplrnt.c b/coreblas/compute/core_zplrnt.c
index f3aba63706ca40dd7b6da1e54cf565811eeea6e0..c3a5ffb3166e731e6317a6e0a51d0c92329c4bc8 100644
--- a/coreblas/compute/core_zplrnt.c
+++ b/coreblas/compute/core_zplrnt.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 #define COMPLEX
 #undef REAL
diff --git a/coreblas/compute/core_zpotrf.c b/coreblas/compute/core_zpotrf.c
index 21f8b6853f58facd588bc00a339b12dc031d7bc5..39d9076ae2b922e4e006e7591a197be69f2e0b28 100644
--- a/coreblas/compute/core_zpotrf.c
+++ b/coreblas/compute/core_zpotrf.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zssssm.c b/coreblas/compute/core_zssssm.c
index 2094c6d25333396fc5c5c67386ec29ea9cc83099..3e7adb10a02c7754fccfda3e515401826628f551 100644
--- a/coreblas/compute/core_zssssm.c
+++ b/coreblas/compute/core_zssssm.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/cblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zsymm.c b/coreblas/compute/core_zsymm.c
index d8320214b8e3cf7f10b59e3499d03138ffad9f53..56ea9c76e4c2b6d547bccaabebdac5059bd5d48f 100644
--- a/coreblas/compute/core_zsymm.c
+++ b/coreblas/compute/core_zsymm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zsyr2k.c b/coreblas/compute/core_zsyr2k.c
index 3a20a4c55989a89b11f9690468808c2e66066f7e..b2328e7c51779125114fd6668ee668348d7c974c 100644
--- a/coreblas/compute/core_zsyr2k.c
+++ b/coreblas/compute/core_zsyr2k.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zsyrk.c b/coreblas/compute/core_zsyrk.c
index a6eed7233d7e469f4bff782ef686ddf42408f856..f1a9b44ec3f8e4bc9efc610d43d0bd9ab84bd312 100644
--- a/coreblas/compute/core_zsyrk.c
+++ b/coreblas/compute/core_zsyrk.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zsyssq.c b/coreblas/compute/core_zsyssq.c
index 99853e69a1411ac12d0daf2973e7b4a460f2c8f5..2bb5f07590c3b43439369bb3526796bee7a4fba9 100644
--- a/coreblas/compute/core_zsyssq.c
+++ b/coreblas/compute/core_zsyssq.c
@@ -25,8 +25,8 @@
  *
  **/
 #include <math.h>
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 #define COMPLEX
 
diff --git a/coreblas/compute/core_zsytf2_nopiv.c b/coreblas/compute/core_zsytf2_nopiv.c
index 4539bcb97aada322f66506759a947e488420d5de..8f5b622dd28398190956b58b3a82dec69690e1f4 100644
--- a/coreblas/compute/core_zsytf2_nopiv.c
+++ b/coreblas/compute/core_zsytf2_nopiv.c
@@ -30,7 +30,7 @@
  * @precisions normal z -> c
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztpmqrt.c b/coreblas/compute/core_ztpmqrt.c
index 8744ed8a1577ff65b361dc50f312cef47f53dc8d..e83dbfc9e70cf3fc4d29e5cfdab56a927530c4ec 100644
--- a/coreblas/compute/core_ztpmqrt.c
+++ b/coreblas/compute/core_ztpmqrt.c
@@ -22,7 +22,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /**
  *******************************************************************************
diff --git a/coreblas/compute/core_ztpqrt.c b/coreblas/compute/core_ztpqrt.c
index c12051a16acad1415cb83791b11553f7e64253a3..1b1137b23c74e0b33934f37dc0abf8c5e0b7c8bf 100644
--- a/coreblas/compute/core_ztpqrt.c
+++ b/coreblas/compute/core_ztpqrt.c
@@ -22,8 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /**
  ******************************************************************************
diff --git a/coreblas/compute/core_ztradd.c b/coreblas/compute/core_ztradd.c
index 6d87ccbb9e88f1498d1a1a76f128b0265236cf48..f14213b160c96d5b81fb48dd146a8e8ad382401c 100644
--- a/coreblas/compute/core_ztradd.c
+++ b/coreblas/compute/core_ztradd.c
@@ -24,7 +24,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /**
  ******************************************************************************
diff --git a/coreblas/compute/core_ztrasm.c b/coreblas/compute/core_ztrasm.c
index 940458aece604159c295bdb7c19d2db91e49af79..4d373fc52dae0e2a5135ccedf36f116cb0a3334f 100644
--- a/coreblas/compute/core_ztrasm.c
+++ b/coreblas/compute/core_ztrasm.c
@@ -24,9 +24,9 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 #include <math.h>
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztrmm.c b/coreblas/compute/core_ztrmm.c
index c73d1f140123be697f16befa6cbaae6736e7d047..dafae3ff984856295dcb84bde4bfec1034455258 100644
--- a/coreblas/compute/core_ztrmm.c
+++ b/coreblas/compute/core_ztrmm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztrsm.c b/coreblas/compute/core_ztrsm.c
index 9f355463137440c83e982c2e94eb51ddf891e5e7..1d57c0ca48dd34b66eed3c0ca96d9da4c116ab7a 100644
--- a/coreblas/compute/core_ztrsm.c
+++ b/coreblas/compute/core_ztrsm.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztrssq.c b/coreblas/compute/core_ztrssq.c
index 154091c38b1e0285b47686d27865a602775edfcf..69a303e244d368fdc7e52ec699101a9a12906f74 100644
--- a/coreblas/compute/core_ztrssq.c
+++ b/coreblas/compute/core_ztrssq.c
@@ -25,8 +25,8 @@
  *
  **/
 #include <math.h>
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 #define COMPLEX
 
diff --git a/coreblas/compute/core_ztrtri.c b/coreblas/compute/core_ztrtri.c
index 2725ce0fa193793eec272b305f736a86795d97b7..fde44f4ebee767cbbb0436a506c67781cc87ae0e 100644
--- a/coreblas/compute/core_ztrtri.c
+++ b/coreblas/compute/core_ztrtri.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztslqt.c b/coreblas/compute/core_ztslqt.c
index dd188ad6f90a22c883b795df87a3ce68329bf03e..f5a87006236bf97f6e29627bd48937455d5fbf9b 100644
--- a/coreblas/compute/core_ztslqt.c
+++ b/coreblas/compute/core_ztslqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/coreblas/compute/core_ztsmlq.c b/coreblas/compute/core_ztsmlq.c
index d12b66707e4e1eab5ba7f158750613b7534cb570..5ac1224ea4b5e60deef070d367fe6be0848b325d 100644
--- a/coreblas/compute/core_ztsmlq.c
+++ b/coreblas/compute/core_ztsmlq.c
@@ -30,7 +30,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztsmlq_hetra1.c b/coreblas/compute/core_ztsmlq_hetra1.c
index 579ff9fdb4973372f1f9861fcae94fe081205154..f80ed80d718d7fd67e600e10b2c00c657fafff34 100644
--- a/coreblas/compute/core_ztsmlq_hetra1.c
+++ b/coreblas/compute/core_ztsmlq_hetra1.c
@@ -24,8 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include <coreblas/include/lapacke.h>
-#include "coreblas/include/coreblas.h"
+#include <coreblas/lapacke.h>
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztsmqr.c b/coreblas/compute/core_ztsmqr.c
index d3473600b4f59945806782f638219c3083ac1495..c64ccd4d177774bca3b3c56a6d3e3fcaf42fd1a4 100644
--- a/coreblas/compute/core_ztsmqr.c
+++ b/coreblas/compute/core_ztsmqr.c
@@ -30,7 +30,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztsmqr_hetra1.c b/coreblas/compute/core_ztsmqr_hetra1.c
index 76e7f65c08eedfa35057cb97c0350ba01b703bbc..2934b9d69599ee04ff07ff16bed6453b451e49f7 100644
--- a/coreblas/compute/core_ztsmqr_hetra1.c
+++ b/coreblas/compute/core_ztsmqr_hetra1.c
@@ -25,8 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include <coreblas/include/lapacke.h>
-#include "coreblas/include/coreblas.h"
+#include <coreblas/lapacke.h>
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_ztsqrt.c b/coreblas/compute/core_ztsqrt.c
index 9323e5b9178e8496045baaff59c08edabcd932ae..032e2691e812e7a45be0160fec2b3fe5ca906b58 100644
--- a/coreblas/compute/core_ztsqrt.c
+++ b/coreblas/compute/core_ztsqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/coreblas/compute/core_ztstrf.c b/coreblas/compute/core_ztstrf.c
index c235d33880deee1bf4fcc260cbd94bb646d46328..09f1b9ec5582d11bc593dce389eb3ed581b12235 100644
--- a/coreblas/compute/core_ztstrf.c
+++ b/coreblas/compute/core_ztstrf.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
-#include "coreblas/include/cblas.h"
+#include "coreblas.h"
+#include "coreblas/cblas.h"
 #include <math.h>
 
 /***************************************************************************//**
diff --git a/coreblas/compute/core_zttlqt.c b/coreblas/compute/core_zttlqt.c
index 6a3551aa0aeaf9ba75295406514f2c709a84b62a..0cdfb8802b7e0f4f1cfba0666a48ebadb075cf7c 100644
--- a/coreblas/compute/core_zttlqt.c
+++ b/coreblas/compute/core_zttlqt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/coreblas/compute/core_zttmlq.c b/coreblas/compute/core_zttmlq.c
index 0edbcc62fb836fc711e0f25bd8d2521b4768801c..3acea2594030ad41dd1a866acefa423923797760 100644
--- a/coreblas/compute/core_zttmlq.c
+++ b/coreblas/compute/core_zttmlq.c
@@ -28,7 +28,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zttmqr.c b/coreblas/compute/core_zttmqr.c
index 95760f3cd10868775a03ca2ac732f8888cf0cbef..7663bf9a6353a0c97b776b372ed844de83d58ba2 100644
--- a/coreblas/compute/core_zttmqr.c
+++ b/coreblas/compute/core_zttmqr.c
@@ -27,7 +27,7 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/coreblas.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zttqrt.c b/coreblas/compute/core_zttqrt.c
index 5aa323be9aa71dc5c7002675d90c62dedab06a4b..72e7e6974d6ccf14b18c00537a7e0743ad719334 100644
--- a/coreblas/compute/core_zttqrt.c
+++ b/coreblas/compute/core_zttqrt.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/coreblas/compute/core_zunmlq.c b/coreblas/compute/core_zunmlq.c
index 5f222e5fc9ab1eb9c8fcc7d6f13b27edd6625e68..1da8c0d2c8de6a905f123096bebe34059dc2c50f 100644
--- a/coreblas/compute/core_zunmlq.c
+++ b/coreblas/compute/core_zunmlq.c
@@ -29,8 +29,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/compute/core_zunmqr.c b/coreblas/compute/core_zunmqr.c
index 6e864baf4bc3235b521639770a00d41e73871568..57d996f2a362eea182d08126673f6ccd40e9ad23 100644
--- a/coreblas/compute/core_zunmqr.c
+++ b/coreblas/compute/core_zunmqr.c
@@ -28,8 +28,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "coreblas/include/lapacke.h"
-#include "coreblas/include/coreblas.h"
+#include "coreblas/lapacke.h"
+#include "coreblas.h"
 
 /***************************************************************************//**
  *
diff --git a/coreblas/include/CMakeLists.txt b/coreblas/include/CMakeLists.txt
index 8e6f10526bdf81e7e68f0f693e1fe2575136074a..7717097135debd395a24b6f7308944e327296f7e 100644
--- a/coreblas/include/CMakeLists.txt
+++ b/coreblas/include/CMakeLists.txt
@@ -30,36 +30,41 @@
 # ---------------------
 set(COREBLAS_HDRS_GENERATED "")
 set(ZHDR
-    coreblas_z.h
-    coreblas_zc.h
+  coreblas/coreblas_z.h
+  coreblas/coreblas_zc.h
 )
-precisions_rules_py(COREBLAS_HDRS_GENERATED "${ZHDR}"
-                    PRECISIONS "s;d;c;z;zc;ds" )
+precisions_rules_py(
+  COREBLAS_HDRS_GENERATED "${ZHDR}"
+  TARGETDIR  coreblas
+  PRECISIONS "s;d;c;z;zc;ds" )
 
 # Define the list of headers
 # --------------------------
 set(COREBLAS_HDRS
-    cblas.h
     coreblas.h
-    lapacke.h
-    lapacke_config.h
-    lapacke_mangling.h
-    ${COREBLAS_HDRS_GENERATED}
+    coreblas/cblas.h
+    coreblas/lapacke.h
+    coreblas/lapacke_config.h
+    coreblas/lapacke_mangling.h
     )
 
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${COREBLAS_HDRS_GENERATED} )
+  list(APPEND COREBLAS_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
+
 # Force generation of headers
 # ---------------------------
 add_custom_target(coreblas_include ALL SOURCES ${COREBLAS_HDRS})
 
-set(HDR_INSTALL "cblas.h;coreblas.h;lapacke.h;lapacke_config.h;lapacke_mangling.h")
-foreach( hdr_file ${COREBLAS_HDRS_GENERATED} )
-    list(APPEND HDR_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
-endforeach()
-
-# installation
+# Installation
 # ------------
-install(FILES ${HDR_INSTALL}
-        DESTINATION include/chameleon/coreblas/include)
+install( FILES coreblas.h
+         DESTINATION include )
+
+install( FILES ${COREBLAS_HDRS}
+         DESTINATION include/coreblas )
 
 ###
 ### END CMakeLists.txt
diff --git a/coreblas/include/coreblas.h b/coreblas/include/coreblas.h
index d6269de796d3c5f5906e5dc0da48b4fc491c20a3..7db66b9bf9c3fcd3be6d40f5809795a2e48cb084 100644
--- a/coreblas/include/coreblas.h
+++ b/coreblas/include/coreblas.h
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
+#include <assert.h>
 
 /** ****************************************************************************
  *  CBLAS requires for scalar arguments to be passed
@@ -37,11 +38,12 @@
 #ifndef CBLAS_SADDR
 #define CBLAS_SADDR( _val_ ) &(_val_)
 #endif
-#include "coreblas/include/cblas.h"
+#include "coreblas/cblas.h"
 
 /** ****************************************************************************
  * MORSE types and constants
  **/
+#include "chameleon/chameleon_config.h"
 #include "chameleon/morse_types.h"
 #include "chameleon/morse_struct.h"
 #include "chameleon/morse_constants.h"
@@ -49,17 +51,16 @@
 /** ****************************************************************************
  * CORE BLAS headers
  **/
-#include "coreblas/include/coreblas_z.h"
-#include "coreblas/include/coreblas_d.h"
-#include "coreblas/include/coreblas_c.h"
-#include "coreblas/include/coreblas_s.h"
-#include "coreblas/include/coreblas_zc.h"
-#include "coreblas/include/coreblas_ds.h"
-#include <assert.h>
+BEGIN_C_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "coreblas/coreblas_z.h"
+#include "coreblas/coreblas_d.h"
+#include "coreblas/coreblas_c.h"
+#include "coreblas/coreblas_s.h"
+#include "coreblas/coreblas_zc.h"
+#include "coreblas/coreblas_ds.h"
+
+END_C_DECLS
 
 /** ****************************************************************************
  * Coreblas Error
@@ -80,14 +81,14 @@ extern "C" {
 /** ****************************************************************************
  *  LAPACK Constants
  **/
+BEGIN_C_DECLS
+
 extern char *morse_lapack_constants[];
 #define morse_lapack_const(morse_const) morse_lapack_constants[morse_const][0]
 
-void set_coreblas_gemm3m_enabled(int v) ;
-int get_coreblas_gemm3m_enabled(void) ;
+void set_coreblas_gemm3m_enabled( int v );
+int  get_coreblas_gemm3m_enabled( void );
 
-#ifdef __cplusplus
-}
-#endif
+END_C_DECLS
 
 #endif
diff --git a/coreblas/include/cblas.h b/coreblas/include/coreblas/cblas.h
similarity index 100%
rename from coreblas/include/cblas.h
rename to coreblas/include/coreblas/cblas.h
diff --git a/coreblas/include/coreblas_z.h b/coreblas/include/coreblas/coreblas_z.h
similarity index 99%
rename from coreblas/include/coreblas_z.h
rename to coreblas/include/coreblas/coreblas_z.h
index 345836f81bf57f97b41081a4dd956b340ccf3f9c..9847d7e96a9e8c76f35de6c33f9eb4a613142a57 100644
--- a/coreblas/include/coreblas_z.h
+++ b/coreblas/include/coreblas/coreblas_z.h
@@ -34,10 +34,6 @@
 
 #define COMPLEX
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** ****************************************************************************
  *  Declarations of serial kernels - alphabetical order
  **/
@@ -403,13 +399,6 @@ int  CORE_zunmqr(MORSE_enum side, MORSE_enum trans,
                  MORSE_Complex64_t *C, int LDC,
                  MORSE_Complex64_t *WORK, int LDWORK);
 
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
 #undef COMPLEX
 
 #endif
diff --git a/coreblas/include/coreblas_zc.h b/coreblas/include/coreblas/coreblas_zc.h
similarity index 95%
rename from coreblas/include/coreblas_zc.h
rename to coreblas/include/coreblas/coreblas_zc.h
index 0fcb1b6df34cc1e5d079b4db7d97e1492fcf8b83..66178bfeaba29c2d893dff89c47eb2842b6bd319 100644
--- a/coreblas/include/coreblas_zc.h
+++ b/coreblas/include/coreblas/coreblas_zc.h
@@ -31,10 +31,6 @@
 #ifndef _MORSE_CORE_ZCBLAS_H_
 #define _MORSE_CORE_ZCBLAS_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** ****************************************************************************
  *  Declarations of serial kernels - alphabetical order
  **/
@@ -45,10 +41,4 @@ void CORE_zlag2c(int m, int n,
                  const MORSE_Complex64_t *A, int lda,
                  MORSE_Complex32_t *B, int ldb, int *info);
 
-
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/coreblas/include/lapacke.h b/coreblas/include/coreblas/lapacke.h
similarity index 99%
rename from coreblas/include/lapacke.h
rename to coreblas/include/coreblas/lapacke.h
index 2dfa4ff602f29b501bd42f62667fff0e846917bb..fedfb50ff76adf6154472a270447a4eacfb9f702 100644
--- a/coreblas/include/lapacke.h
+++ b/coreblas/include/coreblas/lapacke.h
@@ -48,7 +48,7 @@
 *  Turn on HAVE_LAPACK_CONFIG_H to redefine C-LAPACK datatypes
 */
 #ifdef HAVE_LAPACK_CONFIG_H
-#include "lapacke_config.h"
+#include "coreblas/lapacke_config.h"
 #endif
 
 #include <stdlib.h>
@@ -150,7 +150,7 @@ typedef lapack_logical (*LAPACK_Z_SELECT1) ( const lapack_complex_double* );
 typedef lapack_logical (*LAPACK_Z_SELECT2)
     ( const lapack_complex_double*, const lapack_complex_double* );
 
-#include "lapacke_mangling.h"
+#include "coreblas/lapacke_mangling.h"
 
 #define LAPACK_lsame LAPACK_GLOBAL(lsame,LSAME)
 lapack_logical LAPACK_lsame( char* ca,  char* cb,
diff --git a/coreblas/include/lapacke_config.h b/coreblas/include/coreblas/lapacke_config.h
similarity index 100%
rename from coreblas/include/lapacke_config.h
rename to coreblas/include/coreblas/lapacke_config.h
diff --git a/coreblas/include/lapacke_mangling.h b/coreblas/include/coreblas/lapacke_mangling.h
similarity index 100%
rename from coreblas/include/lapacke_mangling.h
rename to coreblas/include/coreblas/lapacke_mangling.h