diff --git a/include/micm/cuda/solver/cuda_linear_solver.hpp b/include/micm/cuda/solver/cuda_linear_solver.hpp
index dea37a549..a84083f1e 100644
--- a/include/micm/cuda/solver/cuda_linear_solver.hpp
+++ b/include/micm/cuda/solver/cuda_linear_solver.hpp
@@ -8,9 +8,6 @@
 #include <micm/solver/linear_solver.hpp>
 #include <micm/solver/lu_decomposition.hpp>
 
-#include <chrono>
-#include <functional>
-
 namespace micm
 {
   template<class SparseMatrixPolicy, class LuDecompositionPolicy = CudaLuDecomposition>
diff --git a/include/micm/cuda/solver/cuda_lu_decomposition.hpp b/include/micm/cuda/solver/cuda_lu_decomposition.hpp
index 512dafef1..c8058a14e 100644
--- a/include/micm/cuda/solver/cuda_lu_decomposition.hpp
+++ b/include/micm/cuda/solver/cuda_lu_decomposition.hpp
@@ -7,9 +7,6 @@
 #include <micm/cuda/util/cuda_sparse_matrix.hpp>
 #include <micm/solver/lu_decomposition.hpp>
 
-#include <chrono>
-#include <stdexcept>
-
 namespace micm
 {
   /// This CudaLuDecomposition class inherits everything from the base class "LuDecomposition"
diff --git a/include/micm/cuda/solver/cuda_rosenbrock.hpp b/include/micm/cuda/solver/cuda_rosenbrock.hpp
index 28fdef6bd..2044f97c9 100644
--- a/include/micm/cuda/solver/cuda_rosenbrock.hpp
+++ b/include/micm/cuda/solver/cuda_rosenbrock.hpp
@@ -7,26 +7,12 @@
 #include <micm/cuda/util/cuda_dense_matrix.hpp>
 #include <micm/cuda/util/cuda_param.hpp>
 #include <micm/cuda/util/cuda_sparse_matrix.hpp>
-#include <micm/process/process.hpp>
-#include <micm/solver/linear_solver.hpp>
 #include <micm/solver/rosenbrock.hpp>
 #include <micm/solver/rosenbrock_solver_parameters.hpp>
-#include <micm/solver/state.hpp>
-#include <micm/system/system.hpp>
-#include <micm/util/jacobian.hpp>
-#include <micm/util/matrix.hpp>
-#include <micm/util/sparse_matrix.hpp>
-
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <functional>
-#include <string>
-#include <vector>
 
 namespace micm
 {
+  struct CudaRosenbrockSolverParameters;
 
   template<class RatesPolicy, class LinearSolverPolicy>
   class CudaRosenbrockSolver : public AbstractRosenbrockSolver<
@@ -41,7 +27,7 @@ namespace micm
     CudaRosenbrockSolverParam devstruct_;
 
     /// @brief Solver parameters typename
-    using ParametersType = RosenbrockSolverParameters;
+    using ParametersType = CudaRosenbrockSolverParameters;
 
     CudaRosenbrockSolver(const CudaRosenbrockSolver&) = delete;
     CudaRosenbrockSolver& operator=(const CudaRosenbrockSolver&) = delete;
diff --git a/test/unit/cuda/solver/test_cuda_rosenbrock.cpp b/test/unit/cuda/solver/test_cuda_rosenbrock.cpp
index f40d11ed5..b4e0fa819 100644
--- a/test/unit/cuda/solver/test_cuda_rosenbrock.cpp
+++ b/test/unit/cuda/solver/test_cuda_rosenbrock.cpp
@@ -2,8 +2,8 @@
 
 #include <micm/cuda/solver/cuda_rosenbrock.cuh>
 #include <micm/cuda/solver/cuda_rosenbrock.hpp>
-#include <micm/cuda/solver/cuda_solver_builder.hpp>
 #include <micm/cuda/solver/cuda_solver_parameters.hpp>
+#include <micm/cuda/solver/cuda_solver_builder.hpp>
 #include <micm/cuda/util/cuda_dense_matrix.hpp>
 #include <micm/cuda/util/cuda_sparse_matrix.hpp>
 #include <micm/process/arrhenius_rate_constant.hpp>