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

269 files changed, 484 insertions, 477 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0ea8777..5ca56bd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ endif()
 # ==================================================================================================
 
 # Includes directories: CLBlast and OpenCL
-include_directories(${clblast_SOURCE_DIR}/include ${OPENCL_INCLUDE_DIRS})
+include_directories(${clblast_SOURCE_DIR}/include ${clblast_SOURCE_DIR}/src ${OPENCL_INCLUDE_DIRS})
 
 # ==================================================================================================
 
@@ -140,8 +140,15 @@ set(PRECISIONS 32 64 3232 6464)
 # ==================================================================================================
 
 # Gathers all source-files
-set(SOURCES src/clblast.cc src/database.cc src/routine.cc src/cache.cc
-            src/utilities.cc src/clblast_c.cc src/routines/common.cc)
+set(SOURCES
+  src/database/database.cc
+  src/routines/common.cc
+  src/cache.cc
+  src/clblast.cc
+  src/clblast_c.cc
+  src/routine.cc
+  src/utilities.cc
+)
 foreach(ROUTINE ${LEVEL1_ROUTINES})
   set(SOURCES ${SOURCES} src/routines/level1/${ROUTINE}.cc)
 endforeach()
@@ -211,7 +218,7 @@ if(TUNERS)
 
   # Adds tuning executables
   foreach(KERNEL ${KERNELS})
-    add_executable(clblast_tuner_${KERNEL} src/tuning/${KERNEL}.cc)
+    add_executable(clblast_tuner_${KERNEL} src/tuning/kernels/${KERNEL}.cc)
     target_link_libraries(clblast_tuner_${KERNEL} clblast ${CLTUNE_LIBRARIES} ${OPENCL_LIBRARIES})
     install(TARGETS clblast_tuner_${KERNEL} DESTINATION bin)
   endforeach()
@@ -257,7 +264,7 @@ if(CLIENTS OR TESTS)
   endif()
 
   # Sets the include directories
-  include_directories(${clblast_SOURCE_DIR}/test ${REF_INCLUDES})
+  include_directories(${clblast_SOURCE_DIR} ${REF_INCLUDES})
 
 endif()
 
diff --git a/scripts/database/database.py b/scripts/database/database.py
index 7f7f07e4..4ca184c5 100644
--- a/scripts/database/database.py
+++ b/scripts/database/database.py
@@ -310,7 +310,7 @@ defaults = CalculateDefaults(bests)
 bests = ConcatenateData(bests, defaults)
 
 # Outputs the data as a C++ database
-path_cpp_database = os.path.join(path_clblast, "include", "internal", "database")
+path_cpp_database = os.path.join(path_clblast, "src", "database", "kernels")
 print("## Producing a C++ database in '"+path_cpp_database+"'...")
 PrintData(bests, path_cpp_database)
 
diff --git a/scripts/generator/generator.py b/scripts/generator/generator.py
index c597c556..1df4c8e6 100644
--- a/scripts/generator/generator.py
+++ b/scripts/generator/generator.py
@@ -382,8 +382,8 @@ files = [
   path_clblast+"/src/clblast.cc",
   path_clblast+"/include/clblast_c.h",
   path_clblast+"/src/clblast_c.cc",
-  path_clblast+"/test/wrapper_clblas.h",
-  path_clblast+"/test/wrapper_cblas.h",
+  path_clblast+"/test/wrapper_clblas.hpp",
+  path_clblast+"/test/wrapper_cblas.hpp",
 ]
 header_lines = [84, 74, 93, 22, 29, 41]
 footer_lines = [17, 75, 19, 14, 6, 6]
@@ -436,8 +436,8 @@ for level in [1,2,3,4]:
 			filename = path_clblast+"/test/correctness/routines/level"+levelnames[level-1]+"/x"+routine.name+".cc"
 			with open(filename, "w") as f:
 				body = ""
-				body += "#include \"correctness/testblas.h\"\n"
-				body += "#include \"routines/level"+levelnames[level-1]+"/x"+routine.name+".h\"\n\n"
+				body += "#include \"test/correctness/testblas.hpp\"\n"
+				body += "#include \"test/routines/level"+levelnames[level-1]+"/x"+routine.name+".hpp\"\n\n"
 				body += "// Shortcuts to the clblast namespace\n"
 				body += "using float2 = clblast::float2;\n"
 				body += "using double2 = clblast::double2;\n\n"
@@ -462,8 +462,8 @@ for level in [1,2,3,4]:
 			filename = path_clblast+"/test/performance/routines/level"+levelnames[level-1]+"/x"+routine.name+".cc"
 			with open(filename, "w") as f:
 				body = ""
-				body += "#include \"performance/client.h\"\n"
-				body += "#include \"routines/level"+levelnames[level-1]+"/x"+routine.name+".h\"\n\n"
+				body += "#include \"test/performance/client.hpp\"\n"
+				body += "#include \"test/routines/level"+levelnames[level-1]+"/x"+routine.name+".hpp\"\n\n"
 				body += "// Shortcuts to the clblast namespace\n"
 				body += "using float2 = clblast::float2;\n"
 				body += "using double2 = clblast::double2;\n\n"
diff --git a/include/internal/buffer_test.h b/src/buffer_test.hpp
index 80f5243f..80f5243f 100644
--- a/include/internal/buffer_test.h
+++ b/src/buffer_test.hpp
diff --git a/src/cache.cc b/src/cache.cc
index a34d351f..cd9055d0 100644
--- a/src/cache.cc
+++ b/src/cache.cc
@@ -15,7 +15,7 @@
 #include <vector>
 #include <mutex>
 
-#include "internal/cache.h"
+#include "cache.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/cache.h b/src/cache.hpp
index bc7e87d9..0d74d7bc 100644
--- a/include/internal/cache.h
+++ b/src/cache.hpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <mutex>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/clblast.cc b/src/clblast.cc
index d0f0c937..88d60772 100644
--- a/src/clblast.cc
+++ b/src/clblast.cc
@@ -16,60 +16,60 @@
 #include <string>
 
 #include "clblast.h"
-#include "internal/public_api.h"
-#include "internal/cache.h"
+#include "public_api.hpp"
+#include "cache.hpp"
 
 // BLAS level-1 includes
-#include "internal/routines/level1/xswap.h"
-#include "internal/routines/level1/xscal.h"
-#include "internal/routines/level1/xcopy.h"
-#include "internal/routines/level1/xaxpy.h"
-#include "internal/routines/level1/xdot.h"
-#include "internal/routines/level1/xdotu.h"
-#include "internal/routines/level1/xdotc.h"
-#include "internal/routines/level1/xnrm2.h"
-#include "internal/routines/level1/xasum.h"
-#include "internal/routines/level1/xsum.h" // non-BLAS routine
-#include "internal/routines/level1/xamax.h"
-#include "internal/routines/level1/xmax.h" // non-BLAS routine
-#include "internal/routines/level1/xmin.h" // non-BLAS routine
+#include "routines/level1/xswap.hpp"
+#include "routines/level1/xscal.hpp"
+#include "routines/level1/xcopy.hpp"
+#include "routines/level1/xaxpy.hpp"
+#include "routines/level1/xdot.hpp"
+#include "routines/level1/xdotu.hpp"
+#include "routines/level1/xdotc.hpp"
+#include "routines/level1/xnrm2.hpp"
+#include "routines/level1/xasum.hpp"
+#include "routines/level1/xsum.hpp" // non-BLAS routine
+#include "routines/level1/xamax.hpp"
+#include "routines/level1/xmax.hpp" // non-BLAS routine
+#include "routines/level1/xmin.hpp" // non-BLAS routine
 
 // BLAS level-2 includes
-#include "internal/routines/level2/xgemv.h"
-#include "internal/routines/level2/xgbmv.h"
-#include "internal/routines/level2/xhemv.h"
-#include "internal/routines/level2/xhbmv.h"
-#include "internal/routines/level2/xhpmv.h"
-#include "internal/routines/level2/xsymv.h"
-#include "internal/routines/level2/xsbmv.h"
-#include "internal/routines/level2/xspmv.h"
-#include "internal/routines/level2/xtrmv.h"
-#include "internal/routines/level2/xtbmv.h"
-#include "internal/routines/level2/xtpmv.h"
-#include "internal/routines/level2/xger.h"
-#include "internal/routines/level2/xgeru.h"
-#include "internal/routines/level2/xgerc.h"
-#include "internal/routines/level2/xher.h"
-#include "internal/routines/level2/xhpr.h"
-#include "internal/routines/level2/xher2.h"
-#include "internal/routines/level2/xhpr2.h"
-#include "internal/routines/level2/xsyr.h"
-#include "internal/routines/level2/xspr.h"
-#include "internal/routines/level2/xsyr2.h"
-#include "internal/routines/level2/xspr2.h"
+#include "routines/level2/xgemv.hpp"
+#include "routines/level2/xgbmv.hpp"
+#include "routines/level2/xhemv.hpp"
+#include "routines/level2/xhbmv.hpp"
+#include "routines/level2/xhpmv.hpp"
+#include "routines/level2/xsymv.hpp"
+#include "routines/level2/xsbmv.hpp"
+#include "routines/level2/xspmv.hpp"
+#include "routines/level2/xtrmv.hpp"
+#include "routines/level2/xtbmv.hpp"
+#include "routines/level2/xtpmv.hpp"
+#include "routines/level2/xger.hpp"
+#include "routines/level2/xgeru.hpp"
+#include "routines/level2/xgerc.hpp"
+#include "routines/level2/xher.hpp"
+#include "routines/level2/xhpr.hpp"
+#include "routines/level2/xher2.hpp"
+#include "routines/level2/xhpr2.hpp"
+#include "routines/level2/xsyr.hpp"
+#include "routines/level2/xspr.hpp"
+#include "routines/level2/xsyr2.hpp"
+#include "routines/level2/xspr2.hpp"
 
 // BLAS level-3 includes
-#include "internal/routines/level3/xgemm.h"
-#include "internal/routines/level3/xsymm.h"
-#include "internal/routines/level3/xhemm.h"
-#include "internal/routines/level3/xsyrk.h"
-#include "internal/routines/level3/xherk.h"
-#include "internal/routines/level3/xsyr2k.h"
-#include "internal/routines/level3/xher2k.h"
-#include "internal/routines/level3/xtrmm.h"
+#include "routines/level3/xgemm.hpp"
+#include "routines/level3/xsymm.hpp"
+#include "routines/level3/xhemm.hpp"
+#include "routines/level3/xsyrk.hpp"
+#include "routines/level3/xherk.hpp"
+#include "routines/level3/xsyr2k.hpp"
+#include "routines/level3/xher2k.hpp"
+#include "routines/level3/xtrmm.hpp"
 
 // Level-x includes (non-BLAS)
-#include "internal/routines/levelx/xomatcopy.h"
+#include "routines/levelx/xomatcopy.hpp"
 
 namespace clblast {
 
diff --git a/src/clblast_c.cc b/src/clblast_c.cc
index 22cb2192..9ea2c884 100644
--- a/src/clblast_c.cc
+++ b/src/clblast_c.cc
@@ -15,7 +15,7 @@
 
 #include "clblast_c.h"
 #include "clblast.h"
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/include/internal/clpp11.h b/src/clpp11.hpp
index b834d8b4..b834d8b4 100644
--- a/include/internal/clpp11.h
+++ b/src/clpp11.hpp
diff --git a/src/database.cc b/src/database/database.cc
index e20ae340..6ec93731 100644
--- a/src/database.cc
+++ b/src/database/database.cc
@@ -11,18 +11,18 @@
 //
 // =================================================================================================
 
-#include "internal/database.h"
-#include "internal/database/xaxpy.h"
-#include "internal/database/xdot.h"
-#include "internal/database/xgemv.h"
-#include "internal/database/xger.h"
-#include "internal/database/xgemm.h"
-#include "internal/database/copy.h"
-#include "internal/database/pad.h"
-#include "internal/database/transpose.h"
-#include "internal/database/padtranspose.h"
-
-#include "internal/utilities.h"
+#include "utilities.hpp"
+
+#include "database/database.hpp"
+#include "database/kernels/xaxpy.hpp"
+#include "database/kernels/xdot.hpp"
+#include "database/kernels/xgemv.hpp"
+#include "database/kernels/xger.hpp"
+#include "database/kernels/xgemm.hpp"
+#include "database/kernels/copy.hpp"
+#include "database/kernels/pad.hpp"
+#include "database/kernels/transpose.hpp"
+#include "database/kernels/padtranspose.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/database.h b/src/database/database.hpp
index f93eaa22..0987cbed 100644
--- a/include/internal/database.h
+++ b/src/database/database.hpp
@@ -21,7 +21,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/database/copy.h b/src/database/kernels/copy.hpp
index 201e8b8a..201e8b8a 100644
--- a/include/internal/database/copy.h
+++ b/src/database/kernels/copy.hpp
diff --git a/include/internal/database/pad.h b/src/database/kernels/pad.hpp
index cc703dd6..cc703dd6 100644
--- a/include/internal/database/pad.h
+++ b/src/database/kernels/pad.hpp
diff --git a/include/internal/database/padtranspose.h b/src/database/kernels/padtranspose.hpp
index f3b1f262..f3b1f262 100644
--- a/include/internal/database/padtranspose.h
+++ b/src/database/kernels/padtranspose.hpp
diff --git a/include/internal/database/transpose.h b/src/database/kernels/transpose.hpp
index 0c893dae..0c893dae 100644
--- a/include/internal/database/transpose.h
+++ b/src/database/kernels/transpose.hpp
diff --git a/include/internal/database/xaxpy.h b/src/database/kernels/xaxpy.hpp
index 6e6719e8..6e6719e8 100644
--- a/include/internal/database/xaxpy.h
+++ b/src/database/kernels/xaxpy.hpp
diff --git a/include/internal/database/xdot.h b/src/database/kernels/xdot.hpp
index d09d8c62..d09d8c62 100644
--- a/include/internal/database/xdot.h
+++ b/src/database/kernels/xdot.hpp
diff --git a/include/internal/database/xgemm.h b/src/database/kernels/xgemm.hpp
index f35d2c88..f35d2c88 100644
--- a/include/internal/database/xgemm.h
+++ b/src/database/kernels/xgemm.hpp
diff --git a/include/internal/database/xgemv.h b/src/database/kernels/xgemv.hpp
index 6b76c8ac..6b76c8ac 100644
--- a/include/internal/database/xgemv.h
+++ b/src/database/kernels/xgemv.hpp
diff --git a/include/internal/database/xger.h b/src/database/kernels/xger.hpp
index f2e0a36f..f2e0a36f 100644
--- a/include/internal/database/xger.h
+++ b/src/database/kernels/xger.hpp
diff --git a/include/internal/public_api.h b/src/public_api.hpp
index d0732297..d0732297 100644
--- a/include/internal/public_api.h
+++ b/src/public_api.hpp
diff --git a/src/routine.cc b/src/routine.cc
index 11633ede..d3590896 100644
--- a/src/routine.cc
+++ b/src/routine.cc
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/routine.h b/src/routine.hpp
index a6a59d77..54b5779f 100644
--- a/include/internal/routine.h
+++ b/src/routine.hpp
@@ -19,11 +19,11 @@
 #include <string>
 #include <vector>
 
-#include "internal/cache.h"
-#include "internal/utilities.h"
-#include "internal/database.h"
-#include "internal/buffer_test.h"
-#include "internal/routines/common.h"
+#include "utilities.hpp"
+#include "cache.hpp"
+#include "buffer_test.hpp"
+#include "database/database.hpp"
+#include "routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/common.cc b/src/routines/common.cc
index 561a1bd8..c378df28 100644
--- a/src/routines/common.cc
+++ b/src/routines/common.cc
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "internal/routines/common.h"
+#include "routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/routines/common.h b/src/routines/common.hpp
index 308785bd..c99cd39d 100644
--- a/include/internal/routines/common.h
+++ b/src/routines/common.hpp
@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "clblast.h"
-#include "internal/clpp11.h"
-#include "internal/database.h"
+#include "clpp11.hpp"
+#include "database/database.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xamax.cc b/src/routines/level1/xamax.cc
index b4add2a3..6b6e7f9e 100644
--- a/src/routines/level1/xamax.cc
+++ b/src/routines/level1/xamax.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xamax.h"
+#include "routines/level1/xamax.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xamax.h b/src/routines/level1/xamax.hpp
index 42f8f67c..aa45a8e4 100644
--- a/include/internal/routines/level1/xamax.h
+++ b/src/routines/level1/xamax.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XAMAX_H_
 #define CLBLAST_ROUTINES_XAMAX_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xasum.cc b/src/routines/level1/xasum.cc
index 80f04829..0c1ce903 100644
--- a/src/routines/level1/xasum.cc
+++ b/src/routines/level1/xasum.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xasum.h"
+#include "routines/level1/xasum.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xasum.h b/src/routines/level1/xasum.hpp
index 9d93a6f4..5a253f4d 100644
--- a/include/internal/routines/level1/xasum.h
+++ b/src/routines/level1/xasum.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XASUM_H_
 #define CLBLAST_ROUTINES_XASUM_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xaxpy.cc b/src/routines/level1/xaxpy.cc
index 4a548757..5b6c9e77 100644
--- a/src/routines/level1/xaxpy.cc
+++ b/src/routines/level1/xaxpy.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xaxpy.h"
+#include "routines/level1/xaxpy.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xaxpy.h b/src/routines/level1/xaxpy.hpp
index 4c8d2c1f..caac871e 100644
--- a/include/internal/routines/level1/xaxpy.h
+++ b/src/routines/level1/xaxpy.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XAXPY_H_
 #define CLBLAST_ROUTINES_XAXPY_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xcopy.cc b/src/routines/level1/xcopy.cc
index 92d31786..673ef349 100644
--- a/src/routines/level1/xcopy.cc
+++ b/src/routines/level1/xcopy.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xcopy.h"
+#include "routines/level1/xcopy.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xcopy.h b/src/routines/level1/xcopy.hpp
index c7d03dd0..0c424ba3 100644
--- a/include/internal/routines/level1/xcopy.h
+++ b/src/routines/level1/xcopy.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XCOPY_H_
 #define CLBLAST_ROUTINES_XCOPY_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xdot.cc b/src/routines/level1/xdot.cc
index 8709c541..bafea157 100644
--- a/src/routines/level1/xdot.cc
+++ b/src/routines/level1/xdot.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xdot.h b/src/routines/level1/xdot.hpp
index e1968740..02c1efaa 100644
--- a/include/internal/routines/level1/xdot.h
+++ b/src/routines/level1/xdot.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOT_H_
 #define CLBLAST_ROUTINES_XDOT_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xdotc.cc b/src/routines/level1/xdotc.cc
index b3a01079..27cf2bab 100644
--- a/src/routines/level1/xdotc.cc
+++ b/src/routines/level1/xdotc.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdotc.h"
+#include "routines/level1/xdotc.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xdotc.h b/src/routines/level1/xdotc.hpp
index 0dc2cfe9..b8cbdaf5 100644
--- a/include/internal/routines/level1/xdotc.h
+++ b/src/routines/level1/xdotc.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOTC_H_
 #define CLBLAST_ROUTINES_XDOTC_H_
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xdotu.cc b/src/routines/level1/xdotu.cc
index 8dded6e0..0bce70b7 100644
--- a/src/routines/level1/xdotu.cc
+++ b/src/routines/level1/xdotu.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdotu.h"
+#include "routines/level1/xdotu.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level1/xdotu.h b/src/routines/level1/xdotu.hpp
index 98988744..b3f73086 100644
--- a/include/internal/routines/level1/xdotu.h
+++ b/src/routines/level1/xdotu.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOTU_H_
 #define CLBLAST_ROUTINES_XDOTU_H_
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/routines/level1/xmax.h b/src/routines/level1/xmax.hpp
index a872cede..5a0236f2 100644
--- a/include/internal/routines/level1/xmax.h
+++ b/src/routines/level1/xmax.hpp
@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XMAX_H_
 #define CLBLAST_ROUTINES_XMAX_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xamax.h"
+#include "routine.hpp"
+#include "routines/level1/xamax.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/routines/level1/xmin.h b/src/routines/level1/xmin.hpp
index 700c81cc..6befec64 100644
--- a/include/internal/routines/level1/xmin.h
+++ b/src/routines/level1/xmin.hpp
@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XMIN_H_
 #define CLBLAST_ROUTINES_XMIN_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xamax.h"
+#include "routine.hpp"
+#include "routines/level1/xamax.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xnrm2.cc b/src/routines/level1/xnrm2.cc
index 105f991c..97615d8b 100644
--- a/src/routines/level1/xnrm2.cc
+++ b/src/routines/level1/xnrm2.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xnrm2.h"
+#include "routines/level1/xnrm2.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xnrm2.h b/src/routines/level1/xnrm2.hpp
index ca9268c0..7baf07f5 100644
--- a/include/internal/routines/level1/xnrm2.h
+++ b/src/routines/level1/xnrm2.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XNRM2_H_
 #define CLBLAST_ROUTINES_XNRM2_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xscal.cc b/src/routines/level1/xscal.cc
index 3c1b5257..bcc43c3b 100644
--- a/src/routines/level1/xscal.cc
+++ b/src/routines/level1/xscal.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xscal.h"
+#include "routines/level1/xscal.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xscal.h b/src/routines/level1/xscal.hpp
index b9430f3b..6c585cb2 100644
--- a/include/internal/routines/level1/xscal.h
+++ b/src/routines/level1/xscal.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSCAL_H_
 #define CLBLAST_ROUTINES_XSCAL_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/routines/level1/xsum.h b/src/routines/level1/xsum.hpp
index 2f633b52..84e20bea 100644
--- a/include/internal/routines/level1/xsum.h
+++ b/src/routines/level1/xsum.hpp
@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XSUM_H_
 #define CLBLAST_ROUTINES_XSUM_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xasum.h"
+#include "routine.hpp"
+#include "routines/level1/xasum.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level1/xswap.cc b/src/routines/level1/xswap.cc
index 27eb9b13..03907cbd 100644
--- a/src/routines/level1/xswap.cc
+++ b/src/routines/level1/xswap.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xswap.h"
+#include "routines/level1/xswap.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level1/xswap.h b/src/routines/level1/xswap.hpp
index bd063afc..4f9ea36d 100644
--- a/include/internal/routines/level1/xswap.h
+++ b/src/routines/level1/xswap.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSWAP_H_
 #define CLBLAST_ROUTINES_XSWAP_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xgbmv.cc b/src/routines/level2/xgbmv.cc
index 7a30c34a..ea4f001c 100644
--- a/src/routines/level2/xgbmv.cc
+++ b/src/routines/level2/xgbmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgbmv.h"
+#include "routines/level2/xgbmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xgbmv.h b/src/routines/level2/xgbmv.hpp
index bc94c77d..686ab642 100644
--- a/include/internal/routines/level2/xgbmv.h
+++ b/src/routines/level2/xgbmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XGBMV_H_
 #define CLBLAST_ROUTINES_XGBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xgemv.cc b/src/routines/level2/xgemv.cc
index ccadd131..21fb397c 100644
--- a/src/routines/level2/xgemv.cc
+++ b/src/routines/level2/xgemv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xgemv.h b/src/routines/level2/xgemv.hpp
index e9804c62..e9afec8d 100644
--- a/include/internal/routines/level2/xgemv.h
+++ b/src/routines/level2/xgemv.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGEMV_H_
 #define CLBLAST_ROUTINES_XGEMV_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xger.cc b/src/routines/level2/xger.cc
index 6ceaa00e..353047d2 100644
--- a/src/routines/level2/xger.cc
+++ b/src/routines/level2/xger.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xger.h b/src/routines/level2/xger.hpp
index 184f8477..3c6abe44 100644
--- a/include/internal/routines/level2/xger.h
+++ b/src/routines/level2/xger.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGER_H_
 #define CLBLAST_ROUTINES_XGER_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xgerc.cc b/src/routines/level2/xgerc.cc
index 73284b52..d9feda97 100644
--- a/src/routines/level2/xgerc.cc
+++ b/src/routines/level2/xgerc.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgerc.h"
+#include "routines/level2/xgerc.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xgerc.h b/src/routines/level2/xgerc.hpp
index 6d06ef94..f1d04dfd 100644
--- a/include/internal/routines/level2/xgerc.h
+++ b/src/routines/level2/xgerc.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGERC_H_
 #define CLBLAST_ROUTINES_XGERC_H_
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xgeru.cc b/src/routines/level2/xgeru.cc
index 7730d6a5..da9e91c2 100644
--- a/src/routines/level2/xgeru.cc
+++ b/src/routines/level2/xgeru.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgeru.h"
+#include "routines/level2/xgeru.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xgeru.h b/src/routines/level2/xgeru.hpp
index 45ce1cba..fb50e917 100644
--- a/include/internal/routines/level2/xgeru.h
+++ b/src/routines/level2/xgeru.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGERU_H_
 #define CLBLAST_ROUTINES_XGERU_H_
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xhbmv.cc b/src/routines/level2/xhbmv.cc
index 58591b50..f6c0e3c4 100644
--- a/src/routines/level2/xhbmv.cc
+++ b/src/routines/level2/xhbmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhbmv.h"
+#include "routines/level2/xhbmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xhbmv.h b/src/routines/level2/xhbmv.hpp
index f0a6212c..d668eb88 100644
--- a/include/internal/routines/level2/xhbmv.h
+++ b/src/routines/level2/xhbmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHBMV_H_
 #define CLBLAST_ROUTINES_XHBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xhemv.cc b/src/routines/level2/xhemv.cc
index b4ef0fa4..2cbcf7b4 100644
--- a/src/routines/level2/xhemv.cc
+++ b/src/routines/level2/xhemv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhemv.h"
+#include "routines/level2/xhemv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xhemv.h b/src/routines/level2/xhemv.hpp
index 3daf2457..8e062fd3 100644
--- a/include/internal/routines/level2/xhemv.h
+++ b/src/routines/level2/xhemv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHEMV_H_
 #define CLBLAST_ROUTINES_XHEMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xher.cc b/src/routines/level2/xher.cc
index 939e17bb..ed8ba9e9 100644
--- a/src/routines/level2/xher.cc
+++ b/src/routines/level2/xher.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xher.h b/src/routines/level2/xher.hpp
index fca8bb97..9ff6bf3f 100644
--- a/include/internal/routines/level2/xher.h
+++ b/src/routines/level2/xher.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHER_H_
 #define CLBLAST_ROUTINES_XHER_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xher2.cc b/src/routines/level2/xher2.cc
index 95dbd87a..50572cea 100644
--- a/src/routines/level2/xher2.cc
+++ b/src/routines/level2/xher2.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xher2.h b/src/routines/level2/xher2.hpp
index 9a7610f1..8c53c047 100644
--- a/include/internal/routines/level2/xher2.h
+++ b/src/routines/level2/xher2.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHER2_H_
 #define CLBLAST_ROUTINES_XHER2_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xhpmv.cc b/src/routines/level2/xhpmv.cc
index 92686dbe..e6f82b34 100644
--- a/src/routines/level2/xhpmv.cc
+++ b/src/routines/level2/xhpmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpmv.h"
+#include "routines/level2/xhpmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xhpmv.h b/src/routines/level2/xhpmv.hpp
index a1d5595a..b11192f9 100644
--- a/include/internal/routines/level2/xhpmv.h
+++ b/src/routines/level2/xhpmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHPMV_H_
 #define CLBLAST_ROUTINES_XHPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xhpr.cc b/src/routines/level2/xhpr.cc
index 4b31ad09..225ebfe5 100644
--- a/src/routines/level2/xhpr.cc
+++ b/src/routines/level2/xhpr.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpr.h"
+#include "routines/level2/xhpr.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xhpr.h b/src/routines/level2/xhpr.hpp
index 6554d74c..37801c68 100644
--- a/include/internal/routines/level2/xhpr.h
+++ b/src/routines/level2/xhpr.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHPR_H_
 #define CLBLAST_ROUTINES_XHPR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xhpr2.cc b/src/routines/level2/xhpr2.cc
index 9be24f43..85f9d3f9 100644
--- a/src/routines/level2/xhpr2.cc
+++ b/src/routines/level2/xhpr2.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpr2.h"
+#include "routines/level2/xhpr2.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xhpr2.h b/src/routines/level2/xhpr2.hpp
index d95e7b61..d66dce55 100644
--- a/include/internal/routines/level2/xhpr2.h
+++ b/src/routines/level2/xhpr2.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHPR2_H_
 #define CLBLAST_ROUTINES_XHPR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xsbmv.cc b/src/routines/level2/xsbmv.cc
index 66ba74e8..28730899 100644
--- a/src/routines/level2/xsbmv.cc
+++ b/src/routines/level2/xsbmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsbmv.h"
+#include "routines/level2/xsbmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xsbmv.h b/src/routines/level2/xsbmv.hpp
index 4328e377..16c5e9a8 100644
--- a/include/internal/routines/level2/xsbmv.h
+++ b/src/routines/level2/xsbmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSBMV_H_
 #define CLBLAST_ROUTINES_XSBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xspmv.cc b/src/routines/level2/xspmv.cc
index 589a97d4..f6651012 100644
--- a/src/routines/level2/xspmv.cc
+++ b/src/routines/level2/xspmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspmv.h"
+#include "routines/level2/xspmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xspmv.h b/src/routines/level2/xspmv.hpp
index ca3e28b6..a0c69b85 100644
--- a/include/internal/routines/level2/xspmv.h
+++ b/src/routines/level2/xspmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSPMV_H_
 #define CLBLAST_ROUTINES_XSPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xspr.cc b/src/routines/level2/xspr.cc
index c556b920..a75fe9c3 100644
--- a/src/routines/level2/xspr.cc
+++ b/src/routines/level2/xspr.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspr.h"
+#include "routines/level2/xspr.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xspr.h b/src/routines/level2/xspr.hpp
index 7e91abc5..6468c736 100644
--- a/include/internal/routines/level2/xspr.h
+++ b/src/routines/level2/xspr.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSPR_H_
 #define CLBLAST_ROUTINES_XSPR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xspr2.cc b/src/routines/level2/xspr2.cc
index c4ad5dc4..c39a2eb4 100644
--- a/src/routines/level2/xspr2.cc
+++ b/src/routines/level2/xspr2.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspr2.h"
+#include "routines/level2/xspr2.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xspr2.h b/src/routines/level2/xspr2.hpp
index a34be8e8..693c56a1 100644
--- a/include/internal/routines/level2/xspr2.h
+++ b/src/routines/level2/xspr2.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSPR2_H_
 #define CLBLAST_ROUTINES_XSPR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xsymv.cc b/src/routines/level2/xsymv.cc
index 2a404a8a..648d2a3e 100644
--- a/src/routines/level2/xsymv.cc
+++ b/src/routines/level2/xsymv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsymv.h"
+#include "routines/level2/xsymv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xsymv.h b/src/routines/level2/xsymv.hpp
index 98a0ce88..67815f2f 100644
--- a/include/internal/routines/level2/xsymv.h
+++ b/src/routines/level2/xsymv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSYMV_H_
 #define CLBLAST_ROUTINES_XSYMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xsyr.cc b/src/routines/level2/xsyr.cc
index 892517d7..758d8f8f 100644
--- a/src/routines/level2/xsyr.cc
+++ b/src/routines/level2/xsyr.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsyr.h"
+#include "routines/level2/xsyr.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xsyr.h b/src/routines/level2/xsyr.hpp
index f88498ae..20393454 100644
--- a/include/internal/routines/level2/xsyr.h
+++ b/src/routines/level2/xsyr.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSYR_H_
 #define CLBLAST_ROUTINES_XSYR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xsyr2.cc b/src/routines/level2/xsyr2.cc
index e6dfd158..6f43b219 100644
--- a/src/routines/level2/xsyr2.cc
+++ b/src/routines/level2/xsyr2.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsyr2.h"
+#include "routines/level2/xsyr2.hpp"
 
 #include <string>
 
diff --git a/include/internal/routines/level2/xsyr2.h b/src/routines/level2/xsyr2.hpp
index d2d3143a..1a8dcbe8 100644
--- a/include/internal/routines/level2/xsyr2.h
+++ b/src/routines/level2/xsyr2.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSYR2_H_
 #define CLBLAST_ROUTINES_XSYR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xtbmv.cc b/src/routines/level2/xtbmv.cc
index 86e28dfb..e315c544 100644
--- a/src/routines/level2/xtbmv.cc
+++ b/src/routines/level2/xtbmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtbmv.h"
+#include "routines/level2/xtbmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xtbmv.h b/src/routines/level2/xtbmv.hpp
index 493a9853..389e9705 100644
--- a/include/internal/routines/level2/xtbmv.h
+++ b/src/routines/level2/xtbmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTBMV_H_
 #define CLBLAST_ROUTINES_XTBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xtpmv.cc b/src/routines/level2/xtpmv.cc
index 72445547..46811089 100644
--- a/src/routines/level2/xtpmv.cc
+++ b/src/routines/level2/xtpmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtpmv.h"
+#include "routines/level2/xtpmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xtpmv.h b/src/routines/level2/xtpmv.hpp
index ce5cae6f..0e8cf1d2 100644
--- a/include/internal/routines/level2/xtpmv.h
+++ b/src/routines/level2/xtpmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTPMV_H_
 #define CLBLAST_ROUTINES_XTPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level2/xtrmv.cc b/src/routines/level2/xtrmv.cc
index df6f85a3..d2f24252 100644
--- a/src/routines/level2/xtrmv.cc
+++ b/src/routines/level2/xtrmv.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtrmv.h"
+#include "routines/level2/xtrmv.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level2/xtrmv.h b/src/routines/level2/xtrmv.hpp
index 4407bad7..07dd7841 100644
--- a/include/internal/routines/level2/xtrmv.h
+++ b/src/routines/level2/xtrmv.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTRMV_H_
 #define CLBLAST_ROUTINES_XTRMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xgemm.cc b/src/routines/level3/xgemm.cc
index 8386ad09..9ea5559c 100644
--- a/src/routines/level3/xgemm.cc
+++ b/src/routines/level3/xgemm.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xgemm.h b/src/routines/level3/xgemm.hpp
index c0541eef..71723d78 100644
--- a/include/internal/routines/level3/xgemm.h
+++ b/src/routines/level3/xgemm.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGEMM_H_
 #define CLBLAST_ROUTINES_XGEMM_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xhemm.cc b/src/routines/level3/xhemm.cc
index 8120c09c..9813503e 100644
--- a/src/routines/level3/xhemm.cc
+++ b/src/routines/level3/xhemm.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xhemm.h"
+#include "routines/level3/xhemm.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xhemm.h b/src/routines/level3/xhemm.hpp
index e0f35669..d79b42a1 100644
--- a/include/internal/routines/level3/xhemm.h
+++ b/src/routines/level3/xhemm.hpp
@@ -15,7 +15,7 @@
 #ifndef CLBLAST_ROUTINES_XHEMM_H_
 #define CLBLAST_ROUTINES_XHEMM_H_
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xher2k.cc b/src/routines/level3/xher2k.cc
index bd0f83dd..bd7a053e 100644
--- a/src/routines/level3/xher2k.cc
+++ b/src/routines/level3/xher2k.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xher2k.h"
+#include "routines/level3/xher2k.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xher2k.h b/src/routines/level3/xher2k.hpp
index b7764e18..23996219 100644
--- a/include/internal/routines/level3/xher2k.h
+++ b/src/routines/level3/xher2k.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHER2K_H_
 #define CLBLAST_ROUTINES_XHER2K_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xherk.cc b/src/routines/level3/xherk.cc
index 6155734a..6ef7f21f 100644
--- a/src/routines/level3/xherk.cc
+++ b/src/routines/level3/xherk.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xherk.h"
+#include "routines/level3/xherk.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xherk.h b/src/routines/level3/xherk.hpp
index abcf4c1a..3f156a1b 100644
--- a/include/internal/routines/level3/xherk.h
+++ b/src/routines/level3/xherk.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHERK_H_
 #define CLBLAST_ROUTINES_XHERK_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xsymm.cc b/src/routines/level3/xsymm.cc
index c5e56617..04e4b718 100644
--- a/src/routines/level3/xsymm.cc
+++ b/src/routines/level3/xsymm.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xsymm.h"
+#include "routines/level3/xsymm.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xsymm.h b/src/routines/level3/xsymm.hpp
index 889abfb7..754dd7a0 100644
--- a/include/internal/routines/level3/xsymm.h
+++ b/src/routines/level3/xsymm.hpp
@@ -17,7 +17,7 @@
 #ifndef CLBLAST_ROUTINES_XSYMM_H_
 #define CLBLAST_ROUTINES_XSYMM_H_
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xsyr2k.cc b/src/routines/level3/xsyr2k.cc
index f9655889..424d4d2d 100644
--- a/src/routines/level3/xsyr2k.cc
+++ b/src/routines/level3/xsyr2k.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xsyr2k.h"
+#include "routines/level3/xsyr2k.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xsyr2k.h b/src/routines/level3/xsyr2k.hpp
index f75c91e5..56185653 100644
--- a/include/internal/routines/level3/xsyr2k.h
+++ b/src/routines/level3/xsyr2k.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSYR2K_H_
 #define CLBLAST_ROUTINES_XSYR2K_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xsyrk.cc b/src/routines/level3/xsyrk.cc
index bceb6afd..f56c232b 100644
--- a/src/routines/level3/xsyrk.cc
+++ b/src/routines/level3/xsyrk.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xsyrk.h"
+#include "routines/level3/xsyrk.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xsyrk.h b/src/routines/level3/xsyrk.hpp
index 0710fa74..7c075c26 100644
--- a/include/internal/routines/level3/xsyrk.h
+++ b/src/routines/level3/xsyrk.hpp
@@ -18,7 +18,7 @@
 #ifndef CLBLAST_ROUTINES_XSYRK_H_
 #define CLBLAST_ROUTINES_XSYRK_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/level3/xtrmm.cc b/src/routines/level3/xtrmm.cc
index 92dda9fb..74a82822 100644
--- a/src/routines/level3/xtrmm.cc
+++ b/src/routines/level3/xtrmm.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xtrmm.h"
+#include "routines/level3/xtrmm.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/level3/xtrmm.h b/src/routines/level3/xtrmm.hpp
index e18ad17a..bb435592 100644
--- a/include/internal/routines/level3/xtrmm.h
+++ b/src/routines/level3/xtrmm.hpp
@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTRMM_H_
 #define CLBLAST_ROUTINES_XTRMM_H_
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routines/levelx/xomatcopy.cc b/src/routines/levelx/xomatcopy.cc
index 6e4bddb2..e8593301 100644
--- a/src/routines/levelx/xomatcopy.cc
+++ b/src/routines/levelx/xomatcopy.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/levelx/xomatcopy.h"
+#include "routines/levelx/xomatcopy.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/routines/levelx/xomatcopy.h b/src/routines/levelx/xomatcopy.hpp
index d2acb50d..0e580230 100644
--- a/include/internal/routines/levelx/xomatcopy.h
+++ b/src/routines/levelx/xomatcopy.hpp
@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XOMATCOPY_H_
 #define CLBLAST_ROUTINES_XOMATCOPY_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/copy_fast.cc b/src/tuning/kernels/copy_fast.cc
index 09fdbaba..34269bc7 100644
--- a/src/tuning/copy_fast.cc
+++ b/src/tuning/kernels/copy_fast.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/copy_pad.cc b/src/tuning/kernels/copy_pad.cc
index 7088b3bf..1e0dccd3 100644
--- a/src/tuning/copy_pad.cc
+++ b/src/tuning/kernels/copy_pad.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/transpose_fast.cc b/src/tuning/kernels/transpose_fast.cc
index 3b0bdeb5..7ac19cb6 100644
--- a/src/tuning/transpose_fast.cc
+++ b/src/tuning/kernels/transpose_fast.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/transpose_pad.cc b/src/tuning/kernels/transpose_pad.cc
index b9ab3ffa..63274415 100644
--- a/src/tuning/transpose_pad.cc
+++ b/src/tuning/kernels/transpose_pad.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/xaxpy.cc b/src/tuning/kernels/xaxpy.cc
index d27cb73d..88d12c1f 100644
--- a/src/tuning/xaxpy.cc
+++ b/src/tuning/kernels/xaxpy.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/xdot.cc b/src/tuning/kernels/xdot.cc
index 5f30296c..1581e13f 100644
--- a/src/tuning/xdot.cc
+++ b/src/tuning/kernels/xdot.cc
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/xgemm.cc b/src/tuning/kernels/xgemm.cc
index d309b830..4b1efdef 100644
--- a/src/tuning/xgemm.cc
+++ b/src/tuning/kernels/xgemm.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/xgemv.cc b/src/tuning/kernels/xgemv.cc
index 6587dcf4..d42155ae 100644
--- a/src/tuning/xgemv.cc
+++ b/src/tuning/kernels/xgemv.cc
@@ -17,8 +17,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/tuning/xger.cc b/src/tuning/kernels/xger.cc
index 4be80c86..d2590c53 100644
--- a/src/tuning/xger.cc
+++ b/src/tuning/kernels/xger.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "internal/utilities.h"
-#include "internal/tuning.h"
+#include "utilities.hpp"
+#include "tuning/tuning.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/include/internal/tuning.h b/src/tuning/tuning.hpp
index a44f79d6..19df5f9a 100644
--- a/include/internal/tuning.h
+++ b/src/tuning/tuning.hpp
@@ -20,7 +20,7 @@
 
 #include <cltune.h>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/utilities.cc b/src/utilities.cc
index 30b09a5f..e3a1fb75 100644
--- a/src/utilities.cc
+++ b/src/utilities.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/internal/utilities.h b/src/utilities.hpp
index 7092bcdd..9a2b9ffc 100644
--- a/include/internal/utilities.h
+++ b/src/utilities.hpp
@@ -23,7 +23,7 @@
 
 #include "clblast.h"
 #include "clblast_half.h"
-#include "internal/clpp11.h"
+#include "clpp11.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/correctness/routines/level1/xamax.cc b/test/correctness/routines/level1/xamax.cc
index 21400a40..607637e8 100644
--- a/test/correctness/routines/level1/xamax.cc
+++ b/test/correctness/routines/level1/xamax.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xamax.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xamax.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xasum.cc b/test/correctness/routines/level1/xasum.cc
index f48d1d4b..e22e42a6 100644
--- a/test/correctness/routines/level1/xasum.cc
+++ b/test/correctness/routines/level1/xasum.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xasum.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xasum.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xaxpy.cc b/test/correctness/routines/level1/xaxpy.cc
index 85649a04..064172fa 100644
--- a/test/correctness/routines/level1/xaxpy.cc
+++ b/test/correctness/routines/level1/xaxpy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xaxpy.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xaxpy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xcopy.cc b/test/correctness/routines/level1/xcopy.cc
index b89baabf..e6f2581b 100644
--- a/test/correctness/routines/level1/xcopy.cc
+++ b/test/correctness/routines/level1/xcopy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xcopy.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xcopy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xdot.cc b/test/correctness/routines/level1/xdot.cc
index 3a353e2e..080250cb 100644
--- a/test/correctness/routines/level1/xdot.cc
+++ b/test/correctness/routines/level1/xdot.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xdot.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xdot.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xdotc.cc b/test/correctness/routines/level1/xdotc.cc
index 195b0847..2a7bbeca 100644
--- a/test/correctness/routines/level1/xdotc.cc
+++ b/test/correctness/routines/level1/xdotc.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xdotc.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xdotc.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xdotu.cc b/test/correctness/routines/level1/xdotu.cc
index 7a501052..1047d021 100644
--- a/test/correctness/routines/level1/xdotu.cc
+++ b/test/correctness/routines/level1/xdotu.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xdotu.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xdotu.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xnrm2.cc b/test/correctness/routines/level1/xnrm2.cc
index 02ea57cb..142fa7ba 100644
--- a/test/correctness/routines/level1/xnrm2.cc
+++ b/test/correctness/routines/level1/xnrm2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xnrm2.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xnrm2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xrot.cc b/test/correctness/routines/level1/xrot.cc
index 8ffcd6af..5af358eb 100644
--- a/test/correctness/routines/level1/xrot.cc
+++ b/test/correctness/routines/level1/xrot.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xrot.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xrot.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xrotg.cc b/test/correctness/routines/level1/xrotg.cc
index c8480673..ad23a554 100644
--- a/test/correctness/routines/level1/xrotg.cc
+++ b/test/correctness/routines/level1/xrotg.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xrotg.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xrotg.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xrotm.cc b/test/correctness/routines/level1/xrotm.cc
index 196e0de9..4f7e8f15 100644
--- a/test/correctness/routines/level1/xrotm.cc
+++ b/test/correctness/routines/level1/xrotm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xrotm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xrotm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xrotmg.cc b/test/correctness/routines/level1/xrotmg.cc
index e4dd712b..ca89bc12 100644
--- a/test/correctness/routines/level1/xrotmg.cc
+++ b/test/correctness/routines/level1/xrotmg.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xrotmg.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xrotmg.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xscal.cc b/test/correctness/routines/level1/xscal.cc
index a3de54b0..939524be 100644
--- a/test/correctness/routines/level1/xscal.cc
+++ b/test/correctness/routines/level1/xscal.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xscal.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xscal.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level1/xswap.cc b/test/correctness/routines/level1/xswap.cc
index dab60669..446f3d65 100644
--- a/test/correctness/routines/level1/xswap.cc
+++ b/test/correctness/routines/level1/xswap.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level1/xswap.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level1/xswap.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xgbmv.cc b/test/correctness/routines/level2/xgbmv.cc
index f2e69225..8c49bc65 100644
--- a/test/correctness/routines/level2/xgbmv.cc
+++ b/test/correctness/routines/level2/xgbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xgbmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xgbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xgemv.cc b/test/correctness/routines/level2/xgemv.cc
index 5b67f0ad..902ae777 100644
--- a/test/correctness/routines/level2/xgemv.cc
+++ b/test/correctness/routines/level2/xgemv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xgemv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xgemv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xger.cc b/test/correctness/routines/level2/xger.cc
index 05c782db..ce61bbcb 100644
--- a/test/correctness/routines/level2/xger.cc
+++ b/test/correctness/routines/level2/xger.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xger.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xger.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xgerc.cc b/test/correctness/routines/level2/xgerc.cc
index 6fd80f9f..b747f20d 100644
--- a/test/correctness/routines/level2/xgerc.cc
+++ b/test/correctness/routines/level2/xgerc.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xgerc.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xgerc.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xgeru.cc b/test/correctness/routines/level2/xgeru.cc
index 84b88c42..f80c1e2b 100644
--- a/test/correctness/routines/level2/xgeru.cc
+++ b/test/correctness/routines/level2/xgeru.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xgeru.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xgeru.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xhbmv.cc b/test/correctness/routines/level2/xhbmv.cc
index 020c5dc3..a4885c01 100644
--- a/test/correctness/routines/level2/xhbmv.cc
+++ b/test/correctness/routines/level2/xhbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xhbmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xhbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xhemv.cc b/test/correctness/routines/level2/xhemv.cc
index fcd4e68f..4318ffee 100644
--- a/test/correctness/routines/level2/xhemv.cc
+++ b/test/correctness/routines/level2/xhemv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xhemv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xhemv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xher.cc b/test/correctness/routines/level2/xher.cc
index 0420a9e8..fe37bd76 100644
--- a/test/correctness/routines/level2/xher.cc
+++ b/test/correctness/routines/level2/xher.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xher.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xher.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xher2.cc b/test/correctness/routines/level2/xher2.cc
index 36d7db94..0b4af4d0 100644
--- a/test/correctness/routines/level2/xher2.cc
+++ b/test/correctness/routines/level2/xher2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xher2.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xher2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xhpmv.cc b/test/correctness/routines/level2/xhpmv.cc
index df7121eb..dd77df71 100644
--- a/test/correctness/routines/level2/xhpmv.cc
+++ b/test/correctness/routines/level2/xhpmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xhpmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xhpmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xhpr.cc b/test/correctness/routines/level2/xhpr.cc
index c13802ea..5a3f615f 100644
--- a/test/correctness/routines/level2/xhpr.cc
+++ b/test/correctness/routines/level2/xhpr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xhpr.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xhpr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xhpr2.cc b/test/correctness/routines/level2/xhpr2.cc
index 7c62c255..8218b444 100644
--- a/test/correctness/routines/level2/xhpr2.cc
+++ b/test/correctness/routines/level2/xhpr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xhpr2.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xhpr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xsbmv.cc b/test/correctness/routines/level2/xsbmv.cc
index a0af3c25..7918cb21 100644
--- a/test/correctness/routines/level2/xsbmv.cc
+++ b/test/correctness/routines/level2/xsbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xsbmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xsbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xspmv.cc b/test/correctness/routines/level2/xspmv.cc
index 39ded21b..78210660 100644
--- a/test/correctness/routines/level2/xspmv.cc
+++ b/test/correctness/routines/level2/xspmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xspmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xspmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xspr.cc b/test/correctness/routines/level2/xspr.cc
index 2e807a1e..d05adf34 100644
--- a/test/correctness/routines/level2/xspr.cc
+++ b/test/correctness/routines/level2/xspr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xspr.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xspr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xspr2.cc b/test/correctness/routines/level2/xspr2.cc
index a009bc70..caa46a09 100644
--- a/test/correctness/routines/level2/xspr2.cc
+++ b/test/correctness/routines/level2/xspr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xspr2.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xspr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xsymv.cc b/test/correctness/routines/level2/xsymv.cc
index 0a0cb002..978a5f8a 100644
--- a/test/correctness/routines/level2/xsymv.cc
+++ b/test/correctness/routines/level2/xsymv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xsymv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xsymv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xsyr.cc b/test/correctness/routines/level2/xsyr.cc
index 4015a696..244dbfb4 100644
--- a/test/correctness/routines/level2/xsyr.cc
+++ b/test/correctness/routines/level2/xsyr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xsyr.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xsyr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xsyr2.cc b/test/correctness/routines/level2/xsyr2.cc
index 4bf57a87..422e67ad 100644
--- a/test/correctness/routines/level2/xsyr2.cc
+++ b/test/correctness/routines/level2/xsyr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xsyr2.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xsyr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtbmv.cc b/test/correctness/routines/level2/xtbmv.cc
index 78b05518..491708ec 100644
--- a/test/correctness/routines/level2/xtbmv.cc
+++ b/test/correctness/routines/level2/xtbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtbmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtbsv.cc b/test/correctness/routines/level2/xtbsv.cc
index 0026502a..12b5dca5 100644
--- a/test/correctness/routines/level2/xtbsv.cc
+++ b/test/correctness/routines/level2/xtbsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtbsv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtbsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtpmv.cc b/test/correctness/routines/level2/xtpmv.cc
index 00078c6c..b89f0adc 100644
--- a/test/correctness/routines/level2/xtpmv.cc
+++ b/test/correctness/routines/level2/xtpmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtpmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtpmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtpsv.cc b/test/correctness/routines/level2/xtpsv.cc
index f0ff939e..6e6e7c85 100644
--- a/test/correctness/routines/level2/xtpsv.cc
+++ b/test/correctness/routines/level2/xtpsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtpsv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtpsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtrmv.cc b/test/correctness/routines/level2/xtrmv.cc
index 22138806..819f5cad 100644
--- a/test/correctness/routines/level2/xtrmv.cc
+++ b/test/correctness/routines/level2/xtrmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtrmv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtrmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level2/xtrsv.cc b/test/correctness/routines/level2/xtrsv.cc
index 0bd71fac..78e33807 100644
--- a/test/correctness/routines/level2/xtrsv.cc
+++ b/test/correctness/routines/level2/xtrsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level2/xtrsv.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level2/xtrsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xgemm.cc b/test/correctness/routines/level3/xgemm.cc
index 869463ee..54d41719 100644
--- a/test/correctness/routines/level3/xgemm.cc
+++ b/test/correctness/routines/level3/xgemm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xgemm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xgemm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xhemm.cc b/test/correctness/routines/level3/xhemm.cc
index 8261fd31..76c970a7 100644
--- a/test/correctness/routines/level3/xhemm.cc
+++ b/test/correctness/routines/level3/xhemm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xhemm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xhemm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xher2k.cc b/test/correctness/routines/level3/xher2k.cc
index 381071c8..c653265e 100644
--- a/test/correctness/routines/level3/xher2k.cc
+++ b/test/correctness/routines/level3/xher2k.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xher2k.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xher2k.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xherk.cc b/test/correctness/routines/level3/xherk.cc
index a5efb263..09ea9e4d 100644
--- a/test/correctness/routines/level3/xherk.cc
+++ b/test/correctness/routines/level3/xherk.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xherk.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xherk.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xsymm.cc b/test/correctness/routines/level3/xsymm.cc
index 9005f6e6..3cb3515a 100644
--- a/test/correctness/routines/level3/xsymm.cc
+++ b/test/correctness/routines/level3/xsymm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xsymm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xsymm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xsyr2k.cc b/test/correctness/routines/level3/xsyr2k.cc
index 2d131f21..617af04d 100644
--- a/test/correctness/routines/level3/xsyr2k.cc
+++ b/test/correctness/routines/level3/xsyr2k.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xsyr2k.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xsyr2k.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xsyrk.cc b/test/correctness/routines/level3/xsyrk.cc
index 32e19ed6..2014b8d0 100644
--- a/test/correctness/routines/level3/xsyrk.cc
+++ b/test/correctness/routines/level3/xsyrk.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xsyrk.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xsyrk.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xtrmm.cc b/test/correctness/routines/level3/xtrmm.cc
index 3eb89829..32640d52 100644
--- a/test/correctness/routines/level3/xtrmm.cc
+++ b/test/correctness/routines/level3/xtrmm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xtrmm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xtrmm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/level3/xtrsm.cc b/test/correctness/routines/level3/xtrsm.cc
index f3637e2e..6119bd17 100644
--- a/test/correctness/routines/level3/xtrsm.cc
+++ b/test/correctness/routines/level3/xtrsm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/level3/xtrsm.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/level3/xtrsm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/routines/levelx/xomatcopy.cc b/test/correctness/routines/levelx/xomatcopy.cc
index 43021bc9..e034bc18 100644
--- a/test/correctness/routines/levelx/xomatcopy.cc
+++ b/test/correctness/routines/levelx/xomatcopy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "correctness/testblas.h"
-#include "routines/levelx/xomatcopy.h"
+#include "test/correctness/testblas.hpp"
+#include "test/routines/levelx/xomatcopy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/correctness/testblas.cc b/test/correctness/testblas.cc
index 9f842d91..cec8bafa 100644
--- a/test/correctness/testblas.cc
+++ b/test/correctness/testblas.cc
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <iostream>
 
-#include "correctness/testblas.h"
+#include "test/correctness/testblas.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/correctness/testblas.h b/test/correctness/testblas.hpp
index e849466a..d01cd06c 100644
--- a/test/correctness/testblas.h
+++ b/test/correctness/testblas.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <algorithm>
 
-#include "correctness/tester.h"
+#include "test/correctness/tester.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/correctness/tester.cc b/test/correctness/tester.cc
index 68c02da6..92e2c1b8 100644
--- a/test/correctness/tester.cc
+++ b/test/correctness/tester.cc
@@ -11,13 +11,13 @@
 //
 // =================================================================================================
 
-#include "correctness/tester.h"
-
 #include <string>
 #include <vector>
 #include <iostream>
 #include <cmath>
 
+#include "test/correctness/tester.hpp"
+
 namespace clblast {
 // =================================================================================================
 
diff --git a/test/correctness/tester.h b/test/correctness/tester.hpp
index 0defacec..5e5db6a1 100644
--- a/test/correctness/tester.h
+++ b/test/correctness/tester.hpp
@@ -28,7 +28,7 @@
 #endif
 #include "clblast.h"
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/performance/client.cc b/test/performance/client.cc
index 4c0c79a6..d0068f8b 100644
--- a/test/performance/client.cc
+++ b/test/performance/client.cc
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
+#include "test/performance/client.hpp"
 
 #include <string>
 #include <vector>
diff --git a/test/performance/client.h b/test/performance/client.hpp
index 493a7aed..5ff2aec7 100644
--- a/test/performance/client.h
+++ b/test/performance/client.hpp
@@ -31,7 +31,7 @@
 #endif
 #include "clblast.h"
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/performance/routines/level1/xamax.cc b/test/performance/routines/level1/xamax.cc
index 4af1f1c0..450678e0 100644
--- a/test/performance/routines/level1/xamax.cc
+++ b/test/performance/routines/level1/xamax.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xamax.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xamax.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xasum.cc b/test/performance/routines/level1/xasum.cc
index 8e098890..c21102f5 100644
--- a/test/performance/routines/level1/xasum.cc
+++ b/test/performance/routines/level1/xasum.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xasum.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xasum.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xaxpy.cc b/test/performance/routines/level1/xaxpy.cc
index b48c290d..e1c4935e 100644
--- a/test/performance/routines/level1/xaxpy.cc
+++ b/test/performance/routines/level1/xaxpy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xaxpy.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xaxpy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xcopy.cc b/test/performance/routines/level1/xcopy.cc
index b7c60f0f..ea3531a0 100644
--- a/test/performance/routines/level1/xcopy.cc
+++ b/test/performance/routines/level1/xcopy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xcopy.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xcopy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xdot.cc b/test/performance/routines/level1/xdot.cc
index 3edf2590..09fe9258 100644
--- a/test/performance/routines/level1/xdot.cc
+++ b/test/performance/routines/level1/xdot.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xdot.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xdot.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xdotc.cc b/test/performance/routines/level1/xdotc.cc
index 5f36b80e..6e716ebb 100644
--- a/test/performance/routines/level1/xdotc.cc
+++ b/test/performance/routines/level1/xdotc.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xdotc.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xdotc.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xdotu.cc b/test/performance/routines/level1/xdotu.cc
index f19f751b..d011d558 100644
--- a/test/performance/routines/level1/xdotu.cc
+++ b/test/performance/routines/level1/xdotu.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xdotu.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xdotu.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xnrm2.cc b/test/performance/routines/level1/xnrm2.cc
index f167df95..1d6e177d 100644
--- a/test/performance/routines/level1/xnrm2.cc
+++ b/test/performance/routines/level1/xnrm2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xnrm2.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xnrm2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xrot.cc b/test/performance/routines/level1/xrot.cc
index 3ff59ace..4b543f1b 100644
--- a/test/performance/routines/level1/xrot.cc
+++ b/test/performance/routines/level1/xrot.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xrot.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xrot.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xrotg.cc b/test/performance/routines/level1/xrotg.cc
index 0320c314..e52704b0 100644
--- a/test/performance/routines/level1/xrotg.cc
+++ b/test/performance/routines/level1/xrotg.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xrotg.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xrotg.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xrotm.cc b/test/performance/routines/level1/xrotm.cc
index 7af94d0f..83ee1d9d 100644
--- a/test/performance/routines/level1/xrotm.cc
+++ b/test/performance/routines/level1/xrotm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xrotm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xrotm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xrotmg.cc b/test/performance/routines/level1/xrotmg.cc
index a326347b..ee1539d9 100644
--- a/test/performance/routines/level1/xrotmg.cc
+++ b/test/performance/routines/level1/xrotmg.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xrotmg.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xrotmg.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xscal.cc b/test/performance/routines/level1/xscal.cc
index 35e21ba8..adb83a90 100644
--- a/test/performance/routines/level1/xscal.cc
+++ b/test/performance/routines/level1/xscal.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xscal.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xscal.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level1/xswap.cc b/test/performance/routines/level1/xswap.cc
index 4791d4c3..7f591d19 100644
--- a/test/performance/routines/level1/xswap.cc
+++ b/test/performance/routines/level1/xswap.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level1/xswap.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level1/xswap.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xgbmv.cc b/test/performance/routines/level2/xgbmv.cc
index be4056de..6aa72ded 100644
--- a/test/performance/routines/level2/xgbmv.cc
+++ b/test/performance/routines/level2/xgbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xgbmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xgbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xgemv.cc b/test/performance/routines/level2/xgemv.cc
index 50e6225a..fdcef95d 100644
--- a/test/performance/routines/level2/xgemv.cc
+++ b/test/performance/routines/level2/xgemv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xgemv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xgemv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xger.cc b/test/performance/routines/level2/xger.cc
index b1b5a268..c4f3699d 100644
--- a/test/performance/routines/level2/xger.cc
+++ b/test/performance/routines/level2/xger.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xger.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xger.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xgerc.cc b/test/performance/routines/level2/xgerc.cc
index acd0fab7..f855dc11 100644
--- a/test/performance/routines/level2/xgerc.cc
+++ b/test/performance/routines/level2/xgerc.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xgerc.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xgerc.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xgeru.cc b/test/performance/routines/level2/xgeru.cc
index a5973777..2bf885e3 100644
--- a/test/performance/routines/level2/xgeru.cc
+++ b/test/performance/routines/level2/xgeru.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xgeru.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xgeru.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xhbmv.cc b/test/performance/routines/level2/xhbmv.cc
index 28b71045..b7f3b9ad 100644
--- a/test/performance/routines/level2/xhbmv.cc
+++ b/test/performance/routines/level2/xhbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xhbmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xhbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xhemv.cc b/test/performance/routines/level2/xhemv.cc
index 622854a7..e1168083 100644
--- a/test/performance/routines/level2/xhemv.cc
+++ b/test/performance/routines/level2/xhemv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xhemv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xhemv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xher.cc b/test/performance/routines/level2/xher.cc
index 613d7766..0d1bc1dd 100644
--- a/test/performance/routines/level2/xher.cc
+++ b/test/performance/routines/level2/xher.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xher.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xher.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xher2.cc b/test/performance/routines/level2/xher2.cc
index c335d3be..3d98c838 100644
--- a/test/performance/routines/level2/xher2.cc
+++ b/test/performance/routines/level2/xher2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xher2.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xher2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xhpmv.cc b/test/performance/routines/level2/xhpmv.cc
index 1e726569..c3bc3d9c 100644
--- a/test/performance/routines/level2/xhpmv.cc
+++ b/test/performance/routines/level2/xhpmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xhpmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xhpmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xhpr.cc b/test/performance/routines/level2/xhpr.cc
index 000b69af..afc65b25 100644
--- a/test/performance/routines/level2/xhpr.cc
+++ b/test/performance/routines/level2/xhpr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xhpr.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xhpr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xhpr2.cc b/test/performance/routines/level2/xhpr2.cc
index 19bafc46..c543dc90 100644
--- a/test/performance/routines/level2/xhpr2.cc
+++ b/test/performance/routines/level2/xhpr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xhpr2.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xhpr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xsbmv.cc b/test/performance/routines/level2/xsbmv.cc
index 5fb6e8c0..32899a74 100644
--- a/test/performance/routines/level2/xsbmv.cc
+++ b/test/performance/routines/level2/xsbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xsbmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xsbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xspmv.cc b/test/performance/routines/level2/xspmv.cc
index e0ee2075..0b0d2409 100644
--- a/test/performance/routines/level2/xspmv.cc
+++ b/test/performance/routines/level2/xspmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xspmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xspmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xspr.cc b/test/performance/routines/level2/xspr.cc
index 19651679..9c1c80a0 100644
--- a/test/performance/routines/level2/xspr.cc
+++ b/test/performance/routines/level2/xspr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xspr.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xspr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xspr2.cc b/test/performance/routines/level2/xspr2.cc
index 8745c004..117e9c2f 100644
--- a/test/performance/routines/level2/xspr2.cc
+++ b/test/performance/routines/level2/xspr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xspr2.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xspr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xsymv.cc b/test/performance/routines/level2/xsymv.cc
index 42de1ed5..60db1ae9 100644
--- a/test/performance/routines/level2/xsymv.cc
+++ b/test/performance/routines/level2/xsymv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xsymv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xsymv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xsyr.cc b/test/performance/routines/level2/xsyr.cc
index 310bfb5e..d9ecd38a 100644
--- a/test/performance/routines/level2/xsyr.cc
+++ b/test/performance/routines/level2/xsyr.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xsyr.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xsyr.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xsyr2.cc b/test/performance/routines/level2/xsyr2.cc
index bbeed3db..24e0a517 100644
--- a/test/performance/routines/level2/xsyr2.cc
+++ b/test/performance/routines/level2/xsyr2.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xsyr2.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xsyr2.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtbmv.cc b/test/performance/routines/level2/xtbmv.cc
index 24eec61f..ed9d26a8 100644
--- a/test/performance/routines/level2/xtbmv.cc
+++ b/test/performance/routines/level2/xtbmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtbmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtbmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtbsv.cc b/test/performance/routines/level2/xtbsv.cc
index 4dcd9a06..f0b80330 100644
--- a/test/performance/routines/level2/xtbsv.cc
+++ b/test/performance/routines/level2/xtbsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtbsv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtbsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtpmv.cc b/test/performance/routines/level2/xtpmv.cc
index 2f2487f8..c5801205 100644
--- a/test/performance/routines/level2/xtpmv.cc
+++ b/test/performance/routines/level2/xtpmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtpmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtpmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtpsv.cc b/test/performance/routines/level2/xtpsv.cc
index a3e3f7f1..db956c9d 100644
--- a/test/performance/routines/level2/xtpsv.cc
+++ b/test/performance/routines/level2/xtpsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtpsv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtpsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtrmv.cc b/test/performance/routines/level2/xtrmv.cc
index 3f23afd1..629c773c 100644
--- a/test/performance/routines/level2/xtrmv.cc
+++ b/test/performance/routines/level2/xtrmv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtrmv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtrmv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level2/xtrsv.cc b/test/performance/routines/level2/xtrsv.cc
index e8c65b0f..d6c2968c 100644
--- a/test/performance/routines/level2/xtrsv.cc
+++ b/test/performance/routines/level2/xtrsv.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level2/xtrsv.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level2/xtrsv.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xgemm.cc b/test/performance/routines/level3/xgemm.cc
index 8e48dc3a..3f68096e 100644
--- a/test/performance/routines/level3/xgemm.cc
+++ b/test/performance/routines/level3/xgemm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xgemm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xgemm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xhemm.cc b/test/performance/routines/level3/xhemm.cc
index 87650b9e..ff6d0f71 100644
--- a/test/performance/routines/level3/xhemm.cc
+++ b/test/performance/routines/level3/xhemm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xhemm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xhemm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xher2k.cc b/test/performance/routines/level3/xher2k.cc
index 06894816..9636959e 100644
--- a/test/performance/routines/level3/xher2k.cc
+++ b/test/performance/routines/level3/xher2k.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xher2k.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xher2k.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xherk.cc b/test/performance/routines/level3/xherk.cc
index d6f38fb2..d51400f0 100644
--- a/test/performance/routines/level3/xherk.cc
+++ b/test/performance/routines/level3/xherk.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xherk.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xherk.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xsymm.cc b/test/performance/routines/level3/xsymm.cc
index 7eac5537..38c3dc9b 100644
--- a/test/performance/routines/level3/xsymm.cc
+++ b/test/performance/routines/level3/xsymm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xsymm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xsymm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xsyr2k.cc b/test/performance/routines/level3/xsyr2k.cc
index 49d00f34..5360e297 100644
--- a/test/performance/routines/level3/xsyr2k.cc
+++ b/test/performance/routines/level3/xsyr2k.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xsyr2k.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xsyr2k.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xsyrk.cc b/test/performance/routines/level3/xsyrk.cc
index ad0a06b4..30612f99 100644
--- a/test/performance/routines/level3/xsyrk.cc
+++ b/test/performance/routines/level3/xsyrk.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xsyrk.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xsyrk.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xtrmm.cc b/test/performance/routines/level3/xtrmm.cc
index 92526844..264a34e7 100644
--- a/test/performance/routines/level3/xtrmm.cc
+++ b/test/performance/routines/level3/xtrmm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xtrmm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xtrmm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/level3/xtrsm.cc b/test/performance/routines/level3/xtrsm.cc
index 08e4b4a9..80c46d91 100644
--- a/test/performance/routines/level3/xtrsm.cc
+++ b/test/performance/routines/level3/xtrsm.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/level3/xtrsm.h"
+#include "test/performance/client.hpp"
+#include "test/routines/level3/xtrsm.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/test/performance/routines/levelx/xomatcopy.cc b/test/performance/routines/levelx/xomatcopy.cc
index 851f6ee1..0bd5773e 100644
--- a/test/performance/routines/levelx/xomatcopy.cc
+++ b/test/performance/routines/levelx/xomatcopy.cc
@@ -9,8 +9,8 @@
 //
 // =================================================================================================
 
-#include "performance/client.h"
-#include "routines/levelx/xomatcopy.h"
+#include "test/performance/client.hpp"
+#include "test/routines/levelx/xomatcopy.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
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
diff --git a/test/wrapper_cblas.h b/test/wrapper_cblas.hpp
index bf59aa94..7bc674ab 100644
--- a/test/wrapper_cblas.h
+++ b/test/wrapper_cblas.hpp
@@ -20,7 +20,7 @@ extern "C"
   #include <cblas.h>
 }
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 
diff --git a/test/wrapper_clblas.h b/test/wrapper_clblas.hpp
index 5115b3d9..3f33890a 100644
--- a/test/wrapper_clblas.h
+++ b/test/wrapper_clblas.hpp
@@ -17,7 +17,7 @@
 
 #include <clBLAS.h>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {