diff --git a/coreblas/include/coreblas.h b/coreblas/include/coreblas.h
index 50a31094db4cf663eb6d6e4364f9d0b0dbc0631a..ec609fdf3bf840a3998bada0e5afe50e4e4a3bd8 100644
--- a/coreblas/include/coreblas.h
+++ b/coreblas/include/coreblas.h
@@ -29,14 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
-/**
- *  CBLAS requires for scalar arguments to be passed
- *        by address rather than by value
- */
-#ifndef CBLAS_SADDR
-#define CBLAS_SADDR( _val_ ) &(_val_)
-#endif
-#include "coreblas/cblas.h"
+#include "coreblas/cblas_wrapper.h"
 
 /**
  * CHAMELEON types and constants
@@ -68,14 +61,6 @@ END_C_DECLS
         assert(0);                                                      \
     } while(0)
 
-/**
- * CBlas enum
- */
-#define CBLAS_TRANSPOSE enum CBLAS_TRANSPOSE
-#define CBLAS_UPLO      enum CBLAS_UPLO
-#define CBLAS_DIAG      enum CBLAS_DIAG
-#define CBLAS_SIDE      enum CBLAS_SIDE
-
 /**
  *  LAPACK Constants
  */
diff --git a/coreblas/include/coreblas/cblas_wrapper.h b/coreblas/include/coreblas/cblas_wrapper.h
new file mode 100644
index 0000000000000000000000000000000000000000..f35a7d60dfd526083e7047edb770936584192172
--- /dev/null
+++ b/coreblas/include/coreblas/cblas_wrapper.h
@@ -0,0 +1,42 @@
+/**
+ *
+ * @file cblas_wrapper.h
+ *
+ * @copyright 2009-2014 The University of Tennessee and The University of
+ *                      Tennessee Research Foundation. All rights reserved.
+ * @copyright 2012-2022 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ *                      Univ. Bordeaux. All rights reserved.
+ *
+ ***
+ *
+ * @brief Chameleon cblas header wrapper
+ *
+ * @version 1.2.0
+ * @author Cedric Castagnede
+ * @author Florent Pruvost
+ * @author Mathieu Faverge
+ * @date 2022-02-22
+ *
+ */
+#ifndef _cblas_wrapper_h_
+#define _cblas_wrapper_h_
+
+/**
+ *  CBLAS requires for scalar arguments to be passed
+ *        by address rather than by value
+ */
+#ifndef CBLAS_SADDR
+#define CBLAS_SADDR( _val_ ) &(_val_)
+#endif
+#include "coreblas/cblas.h"
+
+/**
+ * CBlas enum
+ */
+#define CBLAS_ORDER     enum CBLAS_ORDER
+#define CBLAS_TRANSPOSE enum CBLAS_TRANSPOSE
+#define CBLAS_UPLO      enum CBLAS_UPLO
+#define CBLAS_DIAG      enum CBLAS_DIAG
+#define CBLAS_SIDE      enum CBLAS_SIDE
+
+#endif /* _cblas_wrapper_h_ */