diff --git a/resolve/LinSolverDirectCuSolverGLU.hpp b/resolve/LinSolverDirectCuSolverGLU.hpp
index 899f52e3..c6f5416c 100644
--- a/resolve/LinSolverDirectCuSolverGLU.hpp
+++ b/resolve/LinSolverDirectCuSolverGLU.hpp
@@ -3,7 +3,6 @@
 #include "LinSolver.hpp"
 #include "cusolver_defs.hpp"
 #include <resolve/MemoryUtils.hpp>
-
 namespace ReSolve 
 {
   // Forward declaration of vector::Vector class
@@ -19,7 +18,7 @@ namespace ReSolve
   }
 
   // Forward declaration of ReSolve handlers workspace
-  class LinAlgWorkspace;
+  class LinAlgWorkspaceCUDA;
 
   class LinSolverDirectCuSolverGLU : public LinSolverDirect 
   {
diff --git a/resolve/LinSolverDirectRocSolverRf.hpp b/resolve/LinSolverDirectRocSolverRf.hpp
index 97c95526..94d512b1 100644
--- a/resolve/LinSolverDirectRocSolverRf.hpp
+++ b/resolve/LinSolverDirectRocSolverRf.hpp
@@ -8,7 +8,6 @@
 #include <rocblas/rocblas.h>
 #include <rocsolver/rocsolver.h>
 #include <hip/hip_runtime.h>
-
 namespace ReSolve 
 {
   // Forward declaration of vector::Vector class
@@ -17,10 +16,11 @@ namespace ReSolve
     class Vector;
   }
 
-  // Forward declaration of matrix::Sparse class
+  // Forward declaration of matrix::Sparse and matrix::Csr classes
   namespace matrix
   {
     class Sparse;
+    class Csr;
   }
   
   class LinSolverDirectRocSolverRf : public LinSolverDirect