diff --git a/inst/include/model_methods.cpp b/inst/include/model_methods.cpp
index 70eeabf5..e4931462 100644
--- a/inst/include/model_methods.cpp
+++ b/inst/include/model_methods.cpp
@@ -3,13 +3,13 @@
 #include <stan/model/model_base.hpp>
 #include <stan/model/log_prob_grad.hpp>
 #include <stan/model/log_prob_propto.hpp>
-#include <boost/random/additive_combine.hpp>
 #ifdef CMDSTAN_JSON
 #include <cmdstan/io/json/json_data.hpp>
 #else
 #include <stan/io/json/json_data.hpp>
 #include <stan/io/empty_var_context.hpp>
 #endif
+#include <stan_rng.hpp>
 
 std::shared_ptr<stan::io::var_context> var_context(std::string file_path) {
   if (file_path == "") {
@@ -36,7 +36,7 @@ Rcpp::List model_ptr(std::string data_path, boost::uint32_t seed) {
   Rcpp::XPtr<stan::model::model_base> ptr(
     &new_model(*var_context(data_path), seed, &Rcpp::Rcout)
   );
-  Rcpp::XPtr<boost::ecuyer1988> base_rng(new boost::ecuyer1988(seed));
+  Rcpp::XPtr<stan::rng_t> base_rng(new stan::rng_t(seed));
   return Rcpp::List::create(
     Rcpp::Named("model_ptr") = ptr,
     Rcpp::Named("base_rng") = base_rng
@@ -144,7 +144,7 @@ std::vector<double> constrain_variables(SEXP ext_model_ptr, SEXP base_rng,
                                     bool return_trans_pars,
                                     bool return_gen_quants) {
   Rcpp::XPtr<stan::model::model_base> ptr(ext_model_ptr);
-  Rcpp::XPtr<boost::ecuyer1988> rng(base_rng);
+  Rcpp::XPtr<stan::rng_t> rng(base_rng);
   std::vector<int> params_i;
   std::vector<double> vars;
 
diff --git a/inst/include/rcpp_tuple_interop.hpp b/inst/include/rcpp_tuple_interop.hpp
index 52a614ab..2d59f949 100644
--- a/inst/include/rcpp_tuple_interop.hpp
+++ b/inst/include/rcpp_tuple_interop.hpp
@@ -1,3 +1,6 @@
+#ifndef CMDSTANR_RCPP_TUPLE_INTEROP_HPP
+#define CMDSTANR_RCPP_TUPLE_INTEROP_HPP
+
 #include <stan/math/prim/functor/apply.hpp>
 #include <Rcpp.h>
 
@@ -38,3 +41,5 @@ namespace Rcpp {
     }, x);
   }
 }
+
+#endif
diff --git a/inst/include/stan_rng.hpp b/inst/include/stan_rng.hpp
new file mode 100644
index 00000000..834464f7
--- /dev/null
+++ b/inst/include/stan_rng.hpp
@@ -0,0 +1,17 @@
+#ifndef CMDSTANR_STAN_RNG_HPP
+#define CMDSTANR_STAN_RNG_HPP
+
+#include <boost/random/additive_combine.hpp>
+#include <stan/version.hpp>
+
+// A consistent rng_t is defined from 2.35 onwards
+// so add a fallback for older versions
+#if STAN_MAJOR == 2 && STAN_MINOR >= 35
+#include <stan/services/util/create_rng.hpp>
+#else
+namespace stan {
+  using rng_t = boost::ecuyer1988;
+}
+#endif
+
+#endif