diff --git a/src/Benchmarks/SpMV/spmv-legacy.h b/src/Benchmarks/SpMV/spmv-legacy.h
index 191b31362804342c9ae690cf5fae6b27aa99f57e..690bbed7e810b31f14d2d79441f066f05d412225 100644
--- a/src/Benchmarks/SpMV/spmv-legacy.h
+++ b/src/Benchmarks/SpMV/spmv-legacy.h
@@ -173,8 +173,8 @@ benchmarkSpMVLegacy( Benchmark& benchmark,
                      const String& inputFileName,
                      bool verboseMR )
 {
-   using HostMatrix = Matrix< Real, Devices::Host, int >;
-   using CudaMatrix = Matrix< Real, Devices::Cuda, int >;
+   using HostMatrix = Matrix< Real, TNL::Devices::Host, int >;
+   using CudaMatrix = Matrix< Real, TNL::Devices::Cuda, int >;
    using HostVector = Containers::Vector< Real, Devices::Host, int >;
    using CudaVector = Containers::Vector< Real, Devices::Cuda, int >;
 
@@ -322,8 +322,8 @@ benchmarkSpmvSynthetic( Benchmark& benchmark,
 
    /////
    // Benchmarking TNL formats
-   /*benchmarkSpMV< Real, SparseMatrix_CSR_Scalar                   >( benchmark, hostOutVector, inputFileName, verboseMR );
-   benchmarkSpMV< Real, SparseMatrix_CSR_Vector                   >( benchmark, hostOutVector, inputFileName, verboseMR );
+   benchmarkSpMVLegacy< Real, SparseMatrix_CSR_Scalar                   >( benchmark, hostOutVector, inputFileName, verboseMR );
+   /*benchmarkSpMV< Real, SparseMatrix_CSR_Vector                   >( benchmark, hostOutVector, inputFileName, verboseMR );
    benchmarkSpMV< Real, SparseMatrix_CSR_Hybrid                   >( benchmark, hostOutVector, inputFileName, verboseMR );
    benchmarkSpMV< Real, SparseMatrix_CSR_Adaptive                 >( benchmark, hostOutVector, inputFileName, verboseMR );
    benchmarkSpMV< Real, SparseMatrix_Ellpack                      >( benchmark, hostOutVector, inputFileName, verboseMR );
diff --git a/src/Benchmarks/SpMV/tnl-benchmark-spmv.h b/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
index 82d0e083c61458b04af809d1c24bac19aca6b465..d4ec93934d38dfa5f406258975742382c8768d6e 100644
--- a/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
+++ b/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
@@ -18,8 +18,6 @@
 #include <TNL/Devices/Cuda.h>
 #include <TNL/Config/parseCommandLine.h>
 
-#include <Benchmarks/BLAS/array-operations.h>
-#include <Benchmarks/BLAS/vector-operations.h>
 #include "spmv-legacy.h"
 
 #include <TNL/Matrices/MatrixReader.h>