Moved all headers into the source tree, changed headers to .hpp extension

41 files changed, 80 insertions, 80 deletions

diff --git a/test/routines/level1/xamax.h b/test/routines/level1/xamax.hpp
index 12b031bc..4423845e 100644
--- a/test/routines/level1/xamax.h
+++ b/test/routines/level1/xamax.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xasum.h b/test/routines/level1/xasum.hpp
index eb83817b..b1f02dcd 100644
--- a/test/routines/level1/xasum.h
+++ b/test/routines/level1/xasum.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xaxpy.h b/test/routines/level1/xaxpy.hpp
index c241da91..c276a42e 100644
--- a/test/routines/level1/xaxpy.h
+++ b/test/routines/level1/xaxpy.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xcopy.h b/test/routines/level1/xcopy.hpp
index a1ff06ce..a96bb9ae 100644
--- a/test/routines/level1/xcopy.h
+++ b/test/routines/level1/xcopy.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xdot.h b/test/routines/level1/xdot.hpp
index 0bbc93d5..f6cf2809 100644
--- a/test/routines/level1/xdot.h
+++ b/test/routines/level1/xdot.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xdotc.h b/test/routines/level1/xdotc.hpp
index e1cc1854..2b00d04b 100644
--- a/test/routines/level1/xdotc.h
+++ b/test/routines/level1/xdotc.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xdotu.h b/test/routines/level1/xdotu.hpp
index 558257cc..31a867e0 100644
--- a/test/routines/level1/xdotu.h
+++ b/test/routines/level1/xdotu.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xnrm2.h b/test/routines/level1/xnrm2.hpp
index 19074ca2..62d649e3 100644
--- a/test/routines/level1/xnrm2.h
+++ b/test/routines/level1/xnrm2.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xscal.h b/test/routines/level1/xscal.hpp
index 84d14ac7..79926890 100644
--- a/test/routines/level1/xscal.h
+++ b/test/routines/level1/xscal.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level1/xswap.h b/test/routines/level1/xswap.hpp
index e870b602..8f7e4cfe 100644
--- a/test/routines/level1/xswap.h
+++ b/test/routines/level1/xswap.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xgbmv.h b/test/routines/level2/xgbmv.hpp
index c777ff73..5a907077 100644
--- a/test/routines/level2/xgbmv.h
+++ b/test/routines/level2/xgbmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xgemv.h b/test/routines/level2/xgemv.hpp
index f8a7e1d0..1499b2d2 100644
--- a/test/routines/level2/xgemv.h
+++ b/test/routines/level2/xgemv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xger.h b/test/routines/level2/xger.hpp
index e0d1fe49..5cbed505 100644
--- a/test/routines/level2/xger.h
+++ b/test/routines/level2/xger.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xgerc.h b/test/routines/level2/xgerc.hpp
index 7449146b..d50092cb 100644
--- a/test/routines/level2/xgerc.h
+++ b/test/routines/level2/xgerc.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xgeru.h b/test/routines/level2/xgeru.hpp
index 07837657..9c823b73 100644
--- a/test/routines/level2/xgeru.h
+++ b/test/routines/level2/xgeru.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xhbmv.h b/test/routines/level2/xhbmv.hpp
index 73194975..01cb3f51 100644
--- a/test/routines/level2/xhbmv.h
+++ b/test/routines/level2/xhbmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xhemv.h b/test/routines/level2/xhemv.hpp
index aabbf14a..dadd3975 100644
--- a/test/routines/level2/xhemv.h
+++ b/test/routines/level2/xhemv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xher.h b/test/routines/level2/xher.hpp
index 1294832c..b21c0a9b 100644
--- a/test/routines/level2/xher.h
+++ b/test/routines/level2/xher.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xher2.h b/test/routines/level2/xher2.hpp
index 5e90174d..070f823c 100644
--- a/test/routines/level2/xher2.h
+++ b/test/routines/level2/xher2.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xhpmv.h b/test/routines/level2/xhpmv.hpp
index 8face6b6..d7f9634e 100644
--- a/test/routines/level2/xhpmv.h
+++ b/test/routines/level2/xhpmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xhpr.h b/test/routines/level2/xhpr.hpp
index 63cab31f..8f44a68d 100644
--- a/test/routines/level2/xhpr.h
+++ b/test/routines/level2/xhpr.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xhpr2.h b/test/routines/level2/xhpr2.hpp
index 64d205a0..666a8dfc 100644
--- a/test/routines/level2/xhpr2.h
+++ b/test/routines/level2/xhpr2.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xsbmv.h b/test/routines/level2/xsbmv.hpp
index 3f1446c8..fd5dd68e 100644
--- a/test/routines/level2/xsbmv.h
+++ b/test/routines/level2/xsbmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xspmv.h b/test/routines/level2/xspmv.hpp
index 2add3cdd..63286248 100644
--- a/test/routines/level2/xspmv.h
+++ b/test/routines/level2/xspmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xspr.h b/test/routines/level2/xspr.hpp
index ad21bdf6..f9dead53 100644
--- a/test/routines/level2/xspr.h
+++ b/test/routines/level2/xspr.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xspr2.h b/test/routines/level2/xspr2.hpp
index c55e8181..a2f22098 100644
--- a/test/routines/level2/xspr2.h
+++ b/test/routines/level2/xspr2.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xsymv.h b/test/routines/level2/xsymv.hpp
index b6583a24..0d3ca632 100644
--- a/test/routines/level2/xsymv.h
+++ b/test/routines/level2/xsymv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xsyr.h b/test/routines/level2/xsyr.hpp
index f3929588..15ad9595 100644
--- a/test/routines/level2/xsyr.h
+++ b/test/routines/level2/xsyr.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xsyr2.h b/test/routines/level2/xsyr2.hpp
index 8cdb6a14..a9a61a1f 100644
--- a/test/routines/level2/xsyr2.h
+++ b/test/routines/level2/xsyr2.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xtbmv.h b/test/routines/level2/xtbmv.hpp
index 9c4131ec..54e7fe18 100644
--- a/test/routines/level2/xtbmv.h
+++ b/test/routines/level2/xtbmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xtpmv.h b/test/routines/level2/xtpmv.hpp
index 58249227..9776c4de 100644
--- a/test/routines/level2/xtpmv.h
+++ b/test/routines/level2/xtpmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level2/xtrmv.h b/test/routines/level2/xtrmv.hpp
index 635a1319..18300e50 100644
--- a/test/routines/level2/xtrmv.h
+++ b/test/routines/level2/xtrmv.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xgemm.h b/test/routines/level3/xgemm.hpp
index 842dae93..5f9bea81 100644
--- a/test/routines/level3/xgemm.h
+++ b/test/routines/level3/xgemm.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xhemm.h b/test/routines/level3/xhemm.hpp
index 106b99ff..8c44be25 100644
--- a/test/routines/level3/xhemm.h
+++ b/test/routines/level3/xhemm.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xher2k.h b/test/routines/level3/xher2k.hpp
index e2f4448f..fd20bbb5 100644
--- a/test/routines/level3/xher2k.h
+++ b/test/routines/level3/xher2k.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xherk.h b/test/routines/level3/xherk.hpp
index 43d7cfcd..12990d39 100644
--- a/test/routines/level3/xherk.h
+++ b/test/routines/level3/xherk.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xsymm.h b/test/routines/level3/xsymm.hpp
index c32b4cf7..f8e90927 100644
--- a/test/routines/level3/xsymm.h
+++ b/test/routines/level3/xsymm.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xsyr2k.h b/test/routines/level3/xsyr2k.hpp
index 57c3c203..4e4ba0b7 100644
--- a/test/routines/level3/xsyr2k.h
+++ b/test/routines/level3/xsyr2k.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xsyrk.h b/test/routines/level3/xsyrk.hpp
index 6c3a3786..f5509c88 100644
--- a/test/routines/level3/xsyrk.h
+++ b/test/routines/level3/xsyrk.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/level3/xtrmm.h b/test/routines/level3/xtrmm.hpp
index 3eb63030..45e17e45 100644
--- a/test/routines/level3/xtrmm.h
+++ b/test/routines/level3/xtrmm.hpp
@@ -20,10 +20,10 @@
 #include <string>
 
 #ifdef CLBLAST_REF_CLBLAS
-  #include "wrapper_clblas.h"
+  #include "test/wrapper_clblas.hpp"
 #endif
 #ifdef CLBLAST_REF_CBLAS
-  #include "wrapper_cblas.h"
+  #include "test/wrapper_cblas.hpp"
 #endif
 
 namespace clblast {
diff --git a/test/routines/levelx/xomatcopy.h b/test/routines/levelx/xomatcopy.hpp
index c499ba75..c499ba75 100644
--- a/test/routines/levelx/xomatcopy.h
+++ b/test/routines/levelx/xomatcopy.hpp