From 1036fc635e72892e28e4398f55f6d8f221944b4c Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Sat, 29 Jul 2017 12:11:49 +0200
Subject: [PATCH] Restructure headers in coreblas directory

---
 coreblas/compute/core_dzasum.c                |  4 +-
 coreblas/compute/core_zaxpy.c                 |  2 +-
 coreblas/compute/core_zgeadd.c                |  2 +-
 coreblas/compute/core_zgelqt.c                |  4 +-
 coreblas/compute/core_zgemm.c                 |  2 +-
 coreblas/compute/core_zgeqrt.c                |  4 +-
 coreblas/compute/core_zgesplit.c              |  4 +-
 coreblas/compute/core_zgessm.c                |  6 +--
 coreblas/compute/core_zgessq.c                |  4 +-
 coreblas/compute/core_zgetf2_nopiv.c          |  4 +-
 coreblas/compute/core_zgetrf.c                |  4 +-
 coreblas/compute/core_zgetrf_incpiv.c         |  4 +-
 coreblas/compute/core_zgetrf_nopiv.c          |  2 +-
 coreblas/compute/core_zhe2ge.c                |  4 +-
 coreblas/compute/core_zhemm.c                 |  2 +-
 coreblas/compute/core_zher2k.c                |  2 +-
 coreblas/compute/core_zherfb.c                |  4 +-
 coreblas/compute/core_zherk.c                 |  2 +-
 coreblas/compute/core_zhessq.c                |  4 +-
 coreblas/compute/core_zlacpy.c                |  4 +-
 coreblas/compute/core_zlag2c.c                |  4 +-
 coreblas/compute/core_zlange.c                |  4 +-
 coreblas/compute/core_zlanhe.c                |  4 +-
 coreblas/compute/core_zlansy.c                |  4 +-
 coreblas/compute/core_zlantr.c                |  4 +-
 coreblas/compute/core_zlascal.c               |  4 +-
 coreblas/compute/core_zlaset.c                |  4 +-
 coreblas/compute/core_zlaset2.c               |  4 +-
 coreblas/compute/core_zlatro.c                |  4 +-
 coreblas/compute/core_zlauum.c                |  4 +-
 coreblas/compute/core_zpamm.c                 |  6 +--
 coreblas/compute/core_zparfb.c                |  6 +--
 coreblas/compute/core_zpemv.c                 |  6 +--
 coreblas/compute/core_zplghe.c                |  2 +-
 coreblas/compute/core_zplgsy.c                |  2 +-
 coreblas/compute/core_zplrnt.c                |  2 +-
 coreblas/compute/core_zpotrf.c                |  4 +-
 coreblas/compute/core_zssssm.c                |  4 +-
 coreblas/compute/core_zsymm.c                 |  2 +-
 coreblas/compute/core_zsyr2k.c                |  2 +-
 coreblas/compute/core_zsyrk.c                 |  2 +-
 coreblas/compute/core_zsyssq.c                |  4 +-
 coreblas/compute/core_zsytf2_nopiv.c          |  2 +-
 coreblas/compute/core_ztpmqrt.c               |  2 +-
 coreblas/compute/core_ztpqrt.c                |  4 +-
 coreblas/compute/core_ztradd.c                |  2 +-
 coreblas/compute/core_ztrasm.c                |  4 +-
 coreblas/compute/core_ztrmm.c                 |  2 +-
 coreblas/compute/core_ztrsm.c                 |  2 +-
 coreblas/compute/core_ztrssq.c                |  4 +-
 coreblas/compute/core_ztrtri.c                |  4 +-
 coreblas/compute/core_ztslqt.c                |  4 +-
 coreblas/compute/core_ztsmlq.c                |  2 +-
 coreblas/compute/core_ztsmlq_hetra1.c         |  4 +-
 coreblas/compute/core_ztsmqr.c                |  2 +-
 coreblas/compute/core_ztsmqr_hetra1.c         |  4 +-
 coreblas/compute/core_ztsqrt.c                |  4 +-
 coreblas/compute/core_ztstrf.c                |  4 +-
 coreblas/compute/core_zttlqt.c                |  4 +-
 coreblas/compute/core_zttmlq.c                |  2 +-
 coreblas/compute/core_zttmqr.c                |  2 +-
 coreblas/compute/core_zttqrt.c                |  4 +-
 coreblas/compute/core_zunmlq.c                |  4 +-
 coreblas/compute/core_zunmqr.c                |  4 +-
 coreblas/include/CMakeLists.txt               | 39 +++++++++++--------
 coreblas/include/coreblas.h                   | 33 ++++++++--------
 coreblas/include/{ => coreblas}/cblas.h       |  0
 coreblas/include/{ => coreblas}/coreblas_z.h  | 11 ------
 coreblas/include/{ => coreblas}/coreblas_zc.h | 10 -----
 coreblas/include/{ => coreblas}/lapacke.h     |  4 +-
 .../include/{ => coreblas}/lapacke_config.h   |  0
 .../include/{ => coreblas}/lapacke_mangling.h |  0
 72 files changed, 151 insertions(+), 166 deletions(-)
 rename coreblas/include/{ => coreblas}/cblas.h (100%)
 rename coreblas/include/{ => coreblas}/coreblas_z.h (99%)
 rename coreblas/include/{ => coreblas}/coreblas_zc.h (95%)
 rename coreblas/include/{ => coreblas}/lapacke.h (99%)
 rename coreblas/include/{ => coreblas}/lapacke_config.h (100%)
 rename coreblas/include/{ => coreblas}/lapacke_mangling.h (100%)

diff --git a/coreblas/compute/core_dzasum.c b/coreblas/compute/core_dzasum.c
index f0af36164..e06402dbf 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 373ff859a..249267697 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 9714410f6..259f4b61d 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 e0c5b8ff6..37bb3e998 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 a7737378d..b4d4ad797 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 0c984732d..fa6d9392a 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 4c62e55c5..f2610acf1 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 2694092b2..fdf9e6198 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 72eff4242..dfdf90e25 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 d2bd6031c..60fcbe48b 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 049153fcf..c40a0b0bb 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 a59b84a1d..220d8794e 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 a7fd6c499..a6fa9f7f0 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 53b0b24dd..916c12e0c 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 bc9c29b6f..c6237bf73 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 a58e3f521..59b73e216 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 933e302c1..c20e20f87 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 d71a47552..ba1e717fe 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 4eaf0762c..330a75abf 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 bc82632b7..dbdb0af41 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 1e5e377ff..af426a1a6 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 afe5b5259..19b9e9648 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 506d49cf8..dbe465ef3 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 910449213..e9ff19afa 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 d100feb12..2c8225dc1 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 3fc2101d8..73083eed2 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 de82e8500..40d95208c 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 3b72bf204..60d4ba6c4 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 b8547cb0c..85c630ed1 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 cf27cb969..4ab3749b3 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 65c0ce5cf..1c7750da0 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 f46466558..99feee51a 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 32d63ae48..5cd8a128b 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 097d63ad4..e17d7a580 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 8a0dbe15d..449d19c9f 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 f3aba6370..c3a5ffb31 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 21f8b6853..39d9076ae 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 2094c6d25..3e7adb10a 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 d8320214b..56ea9c76e 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 3a20a4c55..b2328e7c5 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 a6eed7233..f1a9b44ec 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 99853e69a..2bb5f0759 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 4539bcb97..8f5b622dd 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 8744ed8a1..e83dbfc9e 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 c12051a16..1b1137b23 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 6d87ccbb9..f14213b16 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 940458aec..4d373fc52 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 c73d1f140..dafae3ff9 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 9f3554631..1d57c0ca4 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 154091c38..69a303e24 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 2725ce0fa..fde44f4eb 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 dd188ad6f..f5a870062 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 d12b66707..5ac1224ea 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 579ff9fdb..f80ed80d7 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 d3473600b..c64ccd4d1 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 76e7f65c0..2934b9d69 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 9323e5b91..032e2691e 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 c235d3388..09f1b9ec5 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 6a3551aa0..0cdfb8802 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 0edbcc62f..3acea2594 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 95760f3cd..7663bf9a6 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 5aa323be9..72e7e6974 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 5f222e5fc..1da8c0d2c 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 6e864baf4..57d996f2a 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 8e6f10526..771709713 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 d6269de79..7db66b9bf 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 345836f81..9847d7e96 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 0fcb1b6df..66178bfea 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 2dfa4ff60..fedfb50ff 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
-- 
GitLab