diff --git a/stan/math/fwd/constraint/unit_vector_constrain.hpp b/stan/math/fwd/constraint/unit_vector_constrain.hpp
index 1b1b258e5a8..bf03b22b222 100644
--- a/stan/math/fwd/constraint/unit_vector_constrain.hpp
+++ b/stan/math/fwd/constraint/unit_vector_constrain.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
 #define STAN_MATH_FWD_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/tcrossprod.hpp>
 #include <stan/math/fwd/fun/sqrt.hpp>
 #include <stan/math/prim/fun/divide.hpp>
diff --git a/stan/math/fwd/core/fvar.hpp b/stan/math/fwd/core/fvar.hpp
index 187d6a5700b..0ffedeb8e63 100644
--- a/stan/math/fwd/core/fvar.hpp
+++ b/stan/math/fwd/core/fvar.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_CORE_FVAR_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <ostream>
 #include <type_traits>
 
diff --git a/stan/math/fwd/core/std_iterator_traits.hpp b/stan/math/fwd/core/std_iterator_traits.hpp
index 0caffd3e034..8fe61a620a4 100644
--- a/stan/math/fwd/core/std_iterator_traits.hpp
+++ b/stan/math/fwd/core/std_iterator_traits.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_CORE_STD_ITERATOR_TRAITS_HPP
 
 #include <stan/math/fwd/core/fvar.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <iterator>
 
 namespace std {
diff --git a/stan/math/fwd/fun/Phi.hpp b/stan/math/fwd/fun/Phi.hpp
index 70c1c38249e..7ebb6a01cdc 100644
--- a/stan/math/fwd/fun/Phi.hpp
+++ b/stan/math/fwd/fun/Phi.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/pow.hpp>
 #include <stan/math/fwd/fun/exp.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/Phi.hpp>
diff --git a/stan/math/fwd/fun/abs.hpp b/stan/math/fwd/fun/abs.hpp
index 27305d4e053..fff26fe0d51 100644
--- a/stan/math/fwd/fun/abs.hpp
+++ b/stan/math/fwd/fun/abs.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/value_of.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/abs.hpp>
 #include <complex>
diff --git a/stan/math/fwd/fun/accumulator.hpp b/stan/math/fwd/fun/accumulator.hpp
index a5ceb9f6dbc..2cbbea328e3 100644
--- a/stan/math/fwd/fun/accumulator.hpp
+++ b/stan/math/fwd/fun/accumulator.hpp
@@ -1,14 +1,10 @@
 #ifndef STAN_MATH_FWD_FUN_ACCUMULATOR_HPP
 #define STAN_MATH_FWD_FUN_ACCUMULATOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/prim/fun/accumulator.hpp>
 
 #include <vector>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/atan.hpp b/stan/math/fwd/fun/atan.hpp
index 1aac58c0f02..392230520a6 100644
--- a/stan/math/fwd/fun/atan.hpp
+++ b/stan/math/fwd/fun/atan.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/fun/atanh.hpp>
 #include <stan/math/fwd/fun/square.hpp>
 #include <stan/math/prim/fun/atan.hpp>
 #include <cmath>
diff --git a/stan/math/fwd/fun/atanh.hpp b/stan/math/fwd/fun/atanh.hpp
index 04b95144eac..58253db2dab 100644
--- a/stan/math/fwd/fun/atanh.hpp
+++ b/stan/math/fwd/fun/atanh.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/log.hpp>
 #include <stan/math/fwd/fun/square.hpp>
-#include <stan/math/fwd/fun/value_of_rec.hpp>
 #include <stan/math/prim/fun/atanh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/cos.hpp b/stan/math/fwd/fun/cos.hpp
index 19be59e91de..32a9c43ff6d 100644
--- a/stan/math/fwd/fun/cos.hpp
+++ b/stan/math/fwd/fun/cos.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/sin.hpp>
-#include <stan/math/fwd/fun/cosh.hpp>
 #include <stan/math/prim/fun/cos.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/determinant.hpp b/stan/math/fwd/fun/determinant.hpp
index ac6cfa12e57..1f9735e4b44 100644
--- a/stan/math/fwd/fun/determinant.hpp
+++ b/stan/math/fwd/fun/determinant.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_DETERMINANT_HPP
 #define STAN_MATH_FWD_FUN_DETERMINANT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/fwd/fun/erfcx.hpp b/stan/math/fwd/fun/erfcx.hpp
index 06e8ae5ea56..fe68263702d 100644
--- a/stan/math/fwd/fun/erfcx.hpp
+++ b/stan/math/fwd/fun/erfcx.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfcx.hpp>
 #include <cmath>
 
diff --git a/stan/math/fwd/fun/exp.hpp b/stan/math/fwd/fun/exp.hpp
index d24e35e06eb..8831825b0aa 100644
--- a/stan/math/fwd/fun/exp.hpp
+++ b/stan/math/fwd/fun/exp.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/cos.hpp>
-#include <stan/math/fwd/fun/sin.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/fft.hpp b/stan/math/fwd/fun/fft.hpp
index 0d9c8f6f595..c6d3241cb7c 100644
--- a/stan/math/fwd/fun/fft.hpp
+++ b/stan/math/fwd/fun/fft.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_FFT_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/value_of.hpp>
 #include <stan/math/prim/meta.hpp>
diff --git a/stan/math/fwd/fun/hypergeometric_1F0.hpp b/stan/math/fwd/fun/hypergeometric_1F0.hpp
index df2b8a1ac63..d2d6d220645 100644
--- a/stan/math/fwd/fun/hypergeometric_1F0.hpp
+++ b/stan/math/fwd/fun/hypergeometric_1F0.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_HYPERGEOMETRIC_1F0_HPP
 #define STAN_MATH_FWD_FUN_HYPERGEOMETRIC_1F0_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/log1m.hpp>
 #include <stan/math/fwd/fun/inv.hpp>
diff --git a/stan/math/fwd/fun/hypergeometric_2F1.hpp b/stan/math/fwd/fun/hypergeometric_2F1.hpp
index 1b316e58988..0f7d720abe7 100644
--- a/stan/math/fwd/fun/hypergeometric_2F1.hpp
+++ b/stan/math/fwd/fun/hypergeometric_2F1.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_HYPERGEOMETRIC_2F1_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/value_of.hpp>
 #include <stan/math/prim/fun/grad_2F1.hpp>
 #include <stan/math/prim/fun/hypergeometric_2F1.hpp>
diff --git a/stan/math/fwd/fun/hypergeometric_pFq.hpp b/stan/math/fwd/fun/hypergeometric_pFq.hpp
index 32a0755968e..81e45f0cffc 100644
--- a/stan/math/fwd/fun/hypergeometric_pFq.hpp
+++ b/stan/math/fwd/fun/hypergeometric_pFq.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_HYPERGEOMETRIC_PFQ_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/value_of.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/grad_pFq.hpp>
diff --git a/stan/math/fwd/fun/inc_beta.hpp b/stan/math/fwd/fun/inc_beta.hpp
index d0b89e35e06..552ef6f73c2 100644
--- a/stan/math/fwd/fun/inc_beta.hpp
+++ b/stan/math/fwd/fun/inc_beta.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/beta.hpp>
 #include <stan/math/fwd/fun/digamma.hpp>
-#include <stan/math/fwd/fun/exp.hpp>
-#include <stan/math/fwd/fun/lbeta.hpp>
 #include <stan/math/fwd/fun/pow.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
diff --git a/stan/math/fwd/fun/inv_inc_beta.hpp b/stan/math/fwd/fun/inv_inc_beta.hpp
index 6dd75154fdf..56b7709fb48 100644
--- a/stan/math/fwd/fun/inv_inc_beta.hpp
+++ b/stan/math/fwd/fun/inv_inc_beta.hpp
@@ -11,8 +11,6 @@
 #include <stan/math/fwd/fun/lgamma.hpp>
 #include <stan/math/fwd/fun/log.hpp>
 #include <stan/math/fwd/fun/log1m.hpp>
-#include <stan/math/fwd/fun/log_diff_exp.hpp>
-#include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
 #include <stan/math/prim/fun/inv_inc_beta.hpp>
 
diff --git a/stan/math/fwd/fun/inv_logit.hpp b/stan/math/fwd/fun/inv_logit.hpp
index 325a74a133a..02dbace313c 100644
--- a/stan/math/fwd/fun/inv_logit.hpp
+++ b/stan/math/fwd/fun/inv_logit.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_INV_LOGIT_HPP
 
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <cmath>
 
diff --git a/stan/math/fwd/fun/inverse.hpp b/stan/math/fwd/fun/inverse.hpp
index 82e817b2dc9..76d59cc08ab 100644
--- a/stan/math/fwd/fun/inverse.hpp
+++ b/stan/math/fwd/fun/inverse.hpp
@@ -2,10 +2,8 @@
 #define STAN_MATH_FWD_FUN_INVERSE_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
-#include <stan/math/fwd/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/inverse.hpp>
 
diff --git a/stan/math/fwd/fun/is_nan.hpp b/stan/math/fwd/fun/is_nan.hpp
index 79d60f15793..d6e439a9df1 100644
--- a/stan/math/fwd/fun/is_nan.hpp
+++ b/stan/math/fwd/fun/is_nan.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_IS_NAN_HPP
 
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 
diff --git a/stan/math/fwd/fun/log.hpp b/stan/math/fwd/fun/log.hpp
index d3270d2b833..a9abcf3fe23 100644
--- a/stan/math/fwd/fun/log.hpp
+++ b/stan/math/fwd/fun/log.hpp
@@ -3,9 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/sqrt.hpp>
-#include <stan/math/fwd/fun/norm.hpp>
-#include <stan/math/fwd/fun/arg.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <cmath>
diff --git a/stan/math/fwd/fun/log10.hpp b/stan/math/fwd/fun/log10.hpp
index a28bef26a61..8c06a3c0af2 100644
--- a/stan/math/fwd/fun/log10.hpp
+++ b/stan/math/fwd/fun/log10.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log10.hpp>
 #include <cmath>
diff --git a/stan/math/fwd/fun/log_determinant.hpp b/stan/math/fwd/fun/log_determinant.hpp
index 78405cdc88f..ee25190dbe2 100644
--- a/stan/math/fwd/fun/log_determinant.hpp
+++ b/stan/math/fwd/fun/log_determinant.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_LOG_DETERMINANT_HPP
 #define STAN_MATH_FWD_FUN_LOG_DETERMINANT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/determinant.hpp>
 #include <stan/math/fwd/fun/fabs.hpp>
 #include <stan/math/fwd/fun/log.hpp>
diff --git a/stan/math/fwd/fun/log_softmax.hpp b/stan/math/fwd/fun/log_softmax.hpp
index a9685d7ca00..db8261e7337 100644
--- a/stan/math/fwd/fun/log_softmax.hpp
+++ b/stan/math/fwd/fun/log_softmax.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/softmax.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/log_softmax.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/fwd/fun/log_sum_exp.hpp b/stan/math/fwd/fun/log_sum_exp.hpp
index 926838d143c..7aae1ca5cb3 100644
--- a/stan/math/fwd/fun/log_sum_exp.hpp
+++ b/stan/math/fwd/fun/log_sum_exp.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <cmath>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/mdivide_left.hpp b/stan/math/fwd/fun/mdivide_left.hpp
index 654b017afc6..44cff451661 100644
--- a/stan/math/fwd/fun/mdivide_left.hpp
+++ b/stan/math/fwd/fun/mdivide_left.hpp
@@ -2,12 +2,10 @@
 #define STAN_MATH_FWD_FUN_MDIVIDE_LEFT_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/mdivide_left.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/mdivide_left_tri_low.hpp b/stan/math/fwd/fun/mdivide_left_tri_low.hpp
index 8dfd8f4cb2d..8744891eab8 100644
--- a/stan/math/fwd/fun/mdivide_left_tri_low.hpp
+++ b/stan/math/fwd/fun/mdivide_left_tri_low.hpp
@@ -2,10 +2,7 @@
 #define STAN_MATH_FWD_FUN_MDIVIDE_LEFT_TRI_LOW_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/mdivide_left.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
-#include <stan/math/fwd/fun/typedefs.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/mdivide_left_tri_low.hpp>
diff --git a/stan/math/fwd/fun/mdivide_right.hpp b/stan/math/fwd/fun/mdivide_right.hpp
index 6fe8b491116..c9c316e6a61 100644
--- a/stan/math/fwd/fun/mdivide_right.hpp
+++ b/stan/math/fwd/fun/mdivide_right.hpp
@@ -2,12 +2,10 @@
 #define STAN_MATH_FWD_FUN_MDIVIDE_RIGHT_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/mdivide_right.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/mdivide_right_tri_low.hpp b/stan/math/fwd/fun/mdivide_right_tri_low.hpp
index 039dc7dd57c..47a3a706c69 100644
--- a/stan/math/fwd/fun/mdivide_right_tri_low.hpp
+++ b/stan/math/fwd/fun/mdivide_right_tri_low.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_MDIVIDE_RIGHT_TRI_LOW_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/mdivide_right.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
diff --git a/stan/math/fwd/fun/multiply.hpp b/stan/math/fwd/fun/multiply.hpp
index bf98e1e5f3f..e4b75a123ca 100644
--- a/stan/math/fwd/fun/multiply.hpp
+++ b/stan/math/fwd/fun/multiply.hpp
@@ -1,13 +1,10 @@
 #ifndef STAN_MATH_FWD_FUN_MULTIPLY_HPP
 #define STAN_MATH_FWD_FUN_MULTIPLY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/typedefs.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/fwd/fun/to_fvar.hpp>
-#include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
 
 namespace stan {
diff --git a/stan/math/fwd/fun/multiply_lower_tri_self_transpose.hpp b/stan/math/fwd/fun/multiply_lower_tri_self_transpose.hpp
index c9ca25018b5..4635e902543 100644
--- a/stan/math/fwd/fun/multiply_lower_tri_self_transpose.hpp
+++ b/stan/math/fwd/fun/multiply_lower_tri_self_transpose.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/multiply_lower_tri_self_transpose.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/norm1.hpp b/stan/math/fwd/fun/norm1.hpp
index 07abcec1895..cff3e7f8115 100644
--- a/stan/math/fwd/fun/norm1.hpp
+++ b/stan/math/fwd/fun/norm1.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_FWD_FUN_NORM1_HPP
 #define STAN_MATH_FWD_FUN_NORM1_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/sign.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/norm1.hpp>
diff --git a/stan/math/fwd/fun/norm2.hpp b/stan/math/fwd/fun/norm2.hpp
index 94e19689a06..7624b3ab8b3 100644
--- a/stan/math/fwd/fun/norm2.hpp
+++ b/stan/math/fwd/fun/norm2.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_NORM2_HPP
 #define STAN_MATH_FWD_FUN_NORM2_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/meta.hpp>
diff --git a/stan/math/fwd/fun/polar.hpp b/stan/math/fwd/fun/polar.hpp
index 118479d0730..9924b4e3ea0 100644
--- a/stan/math/fwd/fun/polar.hpp
+++ b/stan/math/fwd/fun/polar.hpp
@@ -3,12 +3,8 @@
 
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/fun/cos.hpp>
-#include <stan/math/fwd/fun/is_inf.hpp>
-#include <stan/math/fwd/fun/sin.hpp>
 #include <stan/math/prim/fun/polar.hpp>
 #include <complex>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/pow.hpp b/stan/math/fwd/fun/pow.hpp
index 21a0bf36380..46c580ae1d7 100644
--- a/stan/math/fwd/fun/pow.hpp
+++ b/stan/math/fwd/fun/pow.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_FWD_FUN_POW_HPP
 
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/inv.hpp>
 #include <stan/math/fwd/fun/inv_sqrt.hpp>
 #include <stan/math/fwd/fun/inv_square.hpp>
@@ -11,8 +10,6 @@
 #include <stan/math/fwd/fun/square.hpp>
 #include <stan/math/prim/fun/pow.hpp>
 #include <cmath>
-#include <complex>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/quad_form.hpp b/stan/math/fwd/fun/quad_form.hpp
index 57463397977..b7314719173 100644
--- a/stan/math/fwd/fun/quad_form.hpp
+++ b/stan/math/fwd/fun/quad_form.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_QUAD_FORM_HPP
 #define STAN_MATH_FWD_FUN_QUAD_FORM_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
diff --git a/stan/math/fwd/fun/quad_form_sym.hpp b/stan/math/fwd/fun/quad_form_sym.hpp
index 040ce15d677..e487473d1b7 100644
--- a/stan/math/fwd/fun/quad_form_sym.hpp
+++ b/stan/math/fwd/fun/quad_form_sym.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_QUAD_FORM_SYM_HPP
 #define STAN_MATH_FWD_FUN_QUAD_FORM_SYM_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
diff --git a/stan/math/fwd/fun/sin.hpp b/stan/math/fwd/fun/sin.hpp
index a208ff190be..bdeb1f1872e 100644
--- a/stan/math/fwd/fun/sin.hpp
+++ b/stan/math/fwd/fun/sin.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
-#include <stan/math/fwd/fun/sinh.hpp>
 #include <stan/math/fwd/fun/cos.hpp>
 #include <stan/math/prim/fun/sin.hpp>
 #include <cmath>
diff --git a/stan/math/fwd/fun/sinh.hpp b/stan/math/fwd/fun/sinh.hpp
index 15c114ec7ab..4c9a558b094 100644
--- a/stan/math/fwd/fun/sinh.hpp
+++ b/stan/math/fwd/fun/sinh.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/cosh.hpp>
-#include <stan/math/fwd/fun/exp.hpp>
 #include <stan/math/prim/fun/sinh.hpp>
 #include <complex>
 
diff --git a/stan/math/fwd/fun/softmax.hpp b/stan/math/fwd/fun/softmax.hpp
index 97d019b6c23..2ad483363a4 100644
--- a/stan/math/fwd/fun/softmax.hpp
+++ b/stan/math/fwd/fun/softmax.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/value_of.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/softmax.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/fwd/fun/sqrt.hpp b/stan/math/fwd/fun/sqrt.hpp
index 81d0f187423..b7723e0b8de 100644
--- a/stan/math/fwd/fun/sqrt.hpp
+++ b/stan/math/fwd/fun/sqrt.hpp
@@ -3,10 +3,7 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/cos.hpp>
 #include <stan/math/fwd/fun/inv_sqrt.hpp>
-#include <stan/math/fwd/fun/sin.hpp>
-#include <stan/math/fwd/fun/hypot.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/tan.hpp b/stan/math/fwd/fun/tan.hpp
index b19cd576969..3c8ca965cc7 100644
--- a/stan/math/fwd/fun/tan.hpp
+++ b/stan/math/fwd/fun/tan.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/cos.hpp>
-#include <stan/math/fwd/fun/tanh.hpp>
 #include <stan/math/prim/fun/tan.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/tanh.hpp b/stan/math/fwd/fun/tanh.hpp
index 9699163b226..d2e366b6f31 100644
--- a/stan/math/fwd/fun/tanh.hpp
+++ b/stan/math/fwd/fun/tanh.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/exp.hpp>
 #include <stan/math/prim/fun/tanh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/fwd/fun/tcrossprod.hpp b/stan/math/fwd/fun/tcrossprod.hpp
index c5fdb3e66b0..b77764c7712 100644
--- a/stan/math/fwd/fun/tcrossprod.hpp
+++ b/stan/math/fwd/fun/tcrossprod.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/fun/to_fvar.hpp b/stan/math/fwd/fun/to_fvar.hpp
index 3c4c9226e09..6d329ac8faf 100644
--- a/stan/math/fwd/fun/to_fvar.hpp
+++ b/stan/math/fwd/fun/to_fvar.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_TO_FVAR_HPP
 #define STAN_MATH_FWD_FUN_TO_FVAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/fwd/fun/trace_dot.hpp b/stan/math/fwd/fun/trace_dot.hpp
index e15926ef51b..52236830391 100644
--- a/stan/math/fwd/fun/trace_dot.hpp
+++ b/stan/math/fwd/fun/trace_dot.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUN_TRACE_DOT_HPP
 #define STAN_MATH_FWD_FUN_TRACE_DOT_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/trace.hpp>
diff --git a/stan/math/fwd/fun/trace_quad_form.hpp b/stan/math/fwd/fun/trace_quad_form.hpp
index f10a0dbc1c4..5b45725d344 100644
--- a/stan/math/fwd/fun/trace_quad_form.hpp
+++ b/stan/math/fwd/fun/trace_quad_form.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_FWD_FUN_TRACE_QUAD_FORM_HPP
 #define STAN_MATH_FWD_FUN_TRACE_QUAD_FORM_HPP
 
-#include <stan/math/fwd/core.hpp>
 #include <stan/math/fwd/fun/multiply.hpp>
 #include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
-#include <stan/math/prim/fun/trace.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/fwd/fun/trigamma.hpp b/stan/math/fwd/fun/trigamma.hpp
index b1a4f6dea2d..3f60c14a9f5 100644
--- a/stan/math/fwd/fun/trigamma.hpp
+++ b/stan/math/fwd/fun/trigamma.hpp
@@ -3,10 +3,6 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/inv.hpp>
-#include <stan/math/fwd/fun/square.hpp>
-#include <stan/math/fwd/fun/sin.hpp>
-#include <stan/math/fwd/fun/inv_square.hpp>
 #include <stan/math/prim/fun/trigamma.hpp>
 
 namespace stan {
diff --git a/stan/math/fwd/fun/typedefs.hpp b/stan/math/fwd/fun/typedefs.hpp
index bd8ab2d84e4..9849e049883 100644
--- a/stan/math/fwd/fun/typedefs.hpp
+++ b/stan/math/fwd/fun/typedefs.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/Eigen_NumTraits.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/functor/broadcast_array.hpp b/stan/math/fwd/functor/broadcast_array.hpp
index 435408f8c42..a75e890a2d7 100644
--- a/stan/math/fwd/functor/broadcast_array.hpp
+++ b/stan/math/fwd/functor/broadcast_array.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_FWD_FUNCTOR_BROADCAST_ARRAY_HPP
 #define STAN_MATH_FWD_FUNCTOR_BROADCAST_ARRAY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/prim/functor/broadcast_array.hpp>
 #include <stan/math/prim/meta.hpp>
diff --git a/stan/math/fwd/functor/integrate_1d.hpp b/stan/math/fwd/functor/integrate_1d.hpp
index 501993bcdbf..c5b484115b7 100644
--- a/stan/math/fwd/functor/integrate_1d.hpp
+++ b/stan/math/fwd/functor/integrate_1d.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/prim/functor/integrate_1d.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/meta/forward_as.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/fwd/functor/finite_diff.hpp>
 
diff --git a/stan/math/fwd/functor/integrate_1d_double_exponential.hpp b/stan/math/fwd/functor/integrate_1d_double_exponential.hpp
index 2f6cc2ae279..1a9db05bd41 100644
--- a/stan/math/fwd/functor/integrate_1d_double_exponential.hpp
+++ b/stan/math/fwd/functor/integrate_1d_double_exponential.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/prim/functor/integrate_1d_double_exponential.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/meta/forward_as.hpp>
-#include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/fwd/functor/finite_diff.hpp>
 
 namespace stan {
diff --git a/stan/math/fwd/functor/integrate_1d_gauss_kronrod.hpp b/stan/math/fwd/functor/integrate_1d_gauss_kronrod.hpp
index c8c6705868a..28481e64f01 100644
--- a/stan/math/fwd/functor/integrate_1d_gauss_kronrod.hpp
+++ b/stan/math/fwd/functor/integrate_1d_gauss_kronrod.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/meta/forward_as.hpp>
-#include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/fwd/functor/finite_diff.hpp>
 
 namespace stan {
diff --git a/stan/math/fwd/functor/operands_and_partials.hpp b/stan/math/fwd/functor/operands_and_partials.hpp
index 9c76d07e185..ec5b63d25d9 100644
--- a/stan/math/fwd/functor/operands_and_partials.hpp
+++ b/stan/math/fwd/functor/operands_and_partials.hpp
@@ -6,12 +6,9 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/fwd/functor/broadcast_array.hpp>
 #include <stan/math/fwd/core/fvar.hpp>
-#include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
-#include <stan/math/prim/functor/apply.hpp>
-#include <stan/math/prim/functor/for_each.hpp>
 #include <stan/math/prim/functor/operands_and_partials.hpp>
 #include <vector>
 
diff --git a/stan/math/fwd/functor/partials_propagator.hpp b/stan/math/fwd/functor/partials_propagator.hpp
index a93081e5718..73e27d54142 100644
--- a/stan/math/fwd/functor/partials_propagator.hpp
+++ b/stan/math/fwd/functor/partials_propagator.hpp
@@ -1,17 +1,13 @@
 #ifndef STAN_MATH_FWD_META_PARTIALS_PROPOGATOR_HPP
 #define STAN_MATH_FWD_META_PARTIALS_PROPOGATOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/fwd/core/fvar.hpp>
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/functor/operands_and_partials.hpp>
 #include <stan/math/prim/functor/operands_and_partials.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <stan/math/prim/functor/apply.hpp>
-#include <stan/math/prim/functor/for_each.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/functor/reduce_sum.hpp b/stan/math/fwd/functor/reduce_sum.hpp
index 0a0bbeadc7b..a15514aa762 100644
--- a/stan/math/fwd/functor/reduce_sum.hpp
+++ b/stan/math/fwd/functor/reduce_sum.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/err.hpp>
 
 #include <algorithm>
-#include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/fwd/prob/std_normal_log_qf.hpp b/stan/math/fwd/prob/std_normal_log_qf.hpp
index 52f53dc107f..17df2c6c83b 100644
--- a/stan/math/fwd/prob/std_normal_log_qf.hpp
+++ b/stan/math/fwd/prob/std_normal_log_qf.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/fwd/meta.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/prob/std_normal_log_qf.hpp>
-#include <stan/math/prim/fun/square.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/mix/fun/typedefs.hpp b/stan/math/mix/fun/typedefs.hpp
index a03fd87f3eb..06d0bfe6d4b 100644
--- a/stan/math/mix/fun/typedefs.hpp
+++ b/stan/math/mix/fun/typedefs.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stan/math/fwd/fun/Eigen_NumTraits.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/barzilai_borwein_step_size.hpp b/stan/math/mix/functor/barzilai_borwein_step_size.hpp
index c66e6817c86..fae5fa2e451 100644
--- a/stan/math/mix/functor/barzilai_borwein_step_size.hpp
+++ b/stan/math/mix/functor/barzilai_borwein_step_size.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_FUNCTOR_BARZILAI_BORWEIN_STEP_SIZE_HPP
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <algorithm>
-#include <numeric>
 #include <cmath>
 
 namespace stan::math::internal {
diff --git a/stan/math/mix/functor/derivative.hpp b/stan/math/mix/functor/derivative.hpp
index 7acc00934da..de472d9176b 100644
--- a/stan/math/mix/functor/derivative.hpp
+++ b/stan/math/mix/functor/derivative.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_MIX_FUNCTOR_DERIVATIVE_HPP
 #define STAN_MATH_MIX_FUNCTOR_DERIVATIVE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/finite_diff_grad_hessian.hpp b/stan/math/mix/functor/finite_diff_grad_hessian.hpp
index 42ac3f5652b..158ba4df585 100644
--- a/stan/math/mix/functor/finite_diff_grad_hessian.hpp
+++ b/stan/math/mix/functor/finite_diff_grad_hessian.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_FUNCTOR_FINITE_DIFF_GRAD_HESSIAN_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/mix/functor/hessian.hpp>
 #include <vector>
 
diff --git a/stan/math/mix/functor/finite_diff_grad_hessian_auto.hpp b/stan/math/mix/functor/finite_diff_grad_hessian_auto.hpp
index b41a54e0320..01c1823722a 100644
--- a/stan/math/mix/functor/finite_diff_grad_hessian_auto.hpp
+++ b/stan/math/mix/functor/finite_diff_grad_hessian_auto.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_FUNCTOR_FINITE_DIFF_GRAD_HESSIAN_AUTO_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/mix/functor/hessian.hpp>
 #include <stan/math/prim/functor/finite_diff_gradient_auto.hpp>
 #include <vector>
diff --git a/stan/math/mix/functor/grad_hessian.hpp b/stan/math/mix/functor/grad_hessian.hpp
index c3478bcc113..bf73d0efaa1 100644
--- a/stan/math/mix/functor/grad_hessian.hpp
+++ b/stan/math/mix/functor/grad_hessian.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stdexcept>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/mix/functor/grad_tr_mat_times_hessian.hpp b/stan/math/mix/functor/grad_tr_mat_times_hessian.hpp
index 7b7bec13b32..864d308277e 100644
--- a/stan/math/mix/functor/grad_tr_mat_times_hessian.hpp
+++ b/stan/math/mix/functor/grad_tr_mat_times_hessian.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/mix/functor/gradient_dot_vector.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/gradient_dot_vector.hpp b/stan/math/mix/functor/gradient_dot_vector.hpp
index 5b5326ddb0a..bd0b32793b9 100644
--- a/stan/math/mix/functor/gradient_dot_vector.hpp
+++ b/stan/math/mix/functor/gradient_dot_vector.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/hessian.hpp b/stan/math/mix/functor/hessian.hpp
index ae0e93132d4..5b441fb8522 100644
--- a/stan/math/mix/functor/hessian.hpp
+++ b/stan/math/mix/functor/hessian.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/hessian_times_vector.hpp b/stan/math/mix/functor/hessian_times_vector.hpp
index 405ee2a9856..fa0dee1a417 100644
--- a/stan/math/mix/functor/hessian_times_vector.hpp
+++ b/stan/math/mix/functor/hessian_times_vector.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/laplace_base_rng.hpp b/stan/math/mix/functor/laplace_base_rng.hpp
index 0a59b778d78..036ee328842 100644
--- a/stan/math/mix/functor/laplace_base_rng.hpp
+++ b/stan/math/mix/functor/laplace_base_rng.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/mix/functor/laplace_marginal_density.hpp>
-#include <stan/math/prim/prob/multi_normal_cholesky_rng.hpp>
 #include <stan/math/prim/prob/multi_normal_rng.hpp>
 #include <stan/math/prim/fun/cholesky_decompose.hpp>
 
diff --git a/stan/math/mix/functor/laplace_likelihood.hpp b/stan/math/mix/functor/laplace_likelihood.hpp
index ec5be6b36d1..4645dbb16c6 100644
--- a/stan/math/mix/functor/laplace_likelihood.hpp
+++ b/stan/math/mix/functor/laplace_likelihood.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/mix/meta.hpp>
-#include <stan/math/rev/fun/grad.hpp>
 #include <stan/math/prim/functor/conditional_copy_and_promote.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/mix/functor/hessian_block_diag.hpp>
diff --git a/stan/math/mix/functor/laplace_marginal_density.hpp b/stan/math/mix/functor/laplace_marginal_density.hpp
index cf505417cc4..34b9a5b1dfc 100644
--- a/stan/math/mix/functor/laplace_marginal_density.hpp
+++ b/stan/math/mix/functor/laplace_marginal_density.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/functor/iter_tuple_nested.hpp>
 #include <stan/math/rev/functor/reverse_pass_collect_adjoints.hpp>
-#include <unsupported/Eigen/MatrixFunctions>
 #include <cmath>
 
 /**
diff --git a/stan/math/mix/functor/laplace_marginal_density_estimator.hpp b/stan/math/mix/functor/laplace_marginal_density_estimator.hpp
index 7d7a4b3a893..597b63f5388 100644
--- a/stan/math/mix/functor/laplace_marginal_density_estimator.hpp
+++ b/stan/math/mix/functor/laplace_marginal_density_estimator.hpp
@@ -6,10 +6,7 @@
 #include <stan/math/mix/functor/wolfe_line_search.hpp>
 #include <stan/math/mix/functor/barzilai_borwein_step_size.hpp>
 #include <stan/math/mix/meta.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/quad_form_diag.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/functor/iter_tuple_nested.hpp>
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/mix/functor/partial_derivative.hpp b/stan/math/mix/functor/partial_derivative.hpp
index 34245741c7e..bdb7f979c86 100644
--- a/stan/math/mix/functor/partial_derivative.hpp
+++ b/stan/math/mix/functor/partial_derivative.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/fwd/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/functor/wolfe_line_search.hpp b/stan/math/mix/functor/wolfe_line_search.hpp
index 8b2318d087d..f71c4d990b7 100644
--- a/stan/math/mix/functor/wolfe_line_search.hpp
+++ b/stan/math/mix/functor/wolfe_line_search.hpp
@@ -3,16 +3,9 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/mix/functor/laplace_likelihood.hpp>
-#include <stan/math/mix/meta.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/quad_form_diag.hpp>
-#include <stan/math/prim/functor/iter_tuple_nested.hpp>
 #include <algorithm>
 #include <cmath>
 #include <limits>
-#include <tuple>
-#include <type_traits>
 
 namespace stan::math {
 
diff --git a/stan/math/mix/prob/laplace_latent_bernoulli_logit_rng.hpp b/stan/math/mix/prob/laplace_latent_bernoulli_logit_rng.hpp
index 16b791f30ef..f28d7fbf758 100644
--- a/stan/math/mix/prob/laplace_latent_bernoulli_logit_rng.hpp
+++ b/stan/math/mix/prob/laplace_latent_bernoulli_logit_rng.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_PROB_LAPLACE_LATENT_BERNOULLI_LOGIT_RNG_HPP
 
 #include <stan/math/mix/functor/laplace_base_rng.hpp>
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp>
 
 namespace stan {
diff --git a/stan/math/mix/prob/laplace_latent_neg_binomial_2_log_rng.hpp b/stan/math/mix/prob/laplace_latent_neg_binomial_2_log_rng.hpp
index 0f764b3ae64..7a5d7ff3ae9 100644
--- a/stan/math/mix/prob/laplace_latent_neg_binomial_2_log_rng.hpp
+++ b/stan/math/mix/prob/laplace_latent_neg_binomial_2_log_rng.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_PROB_LAPLACE_LATENT_NEG_BINOMIAL_2_LOG_RNG_HPP
 
 #include <stan/math/mix/functor/laplace_base_rng.hpp>
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp>
 
 namespace stan {
diff --git a/stan/math/mix/prob/laplace_latent_poisson_log_rng.hpp b/stan/math/mix/prob/laplace_latent_poisson_log_rng.hpp
index b330d0fee5e..434580b9a0a 100644
--- a/stan/math/mix/prob/laplace_latent_poisson_log_rng.hpp
+++ b/stan/math/mix/prob/laplace_latent_poisson_log_rng.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_MIX_PROB_LAPLACE_LATENT_POISSON_LOG_RNG_HPP
 
 #include <stan/math/mix/functor/laplace_base_rng.hpp>
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp>
 
 namespace stan {
diff --git a/stan/math/mix/prob/laplace_latent_rng.hpp b/stan/math/mix/prob/laplace_latent_rng.hpp
index 9b09d850024..bf783ae5c8b 100644
--- a/stan/math/mix/prob/laplace_latent_rng.hpp
+++ b/stan/math/mix/prob/laplace_latent_rng.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_MIX_PROB_LAPLACE_LATENT_RNG_HPP
 
 #include <stan/math/mix/functor/laplace_base_rng.hpp>
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/mix/prob/laplace_marginal.hpp b/stan/math/mix/prob/laplace_marginal.hpp
index 169eb256043..59abd9095be 100644
--- a/stan/math/mix/prob/laplace_marginal.hpp
+++ b/stan/math/mix/prob/laplace_marginal.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_HPP
 #define STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_HPP
 
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/functor/laplace_marginal_density.hpp>
 
 namespace stan {
diff --git a/stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp b/stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp
index 79e1598486d..dbe4edcf18f 100644
--- a/stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp
+++ b/stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp
@@ -2,23 +2,13 @@
 #define STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_BERNOULLI_LOGIT_LPMF_HPP
 
 #include <stan/math/mix/meta.hpp>
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/functor/laplace_marginal_density.hpp>
 #include <stan/math/rev/fun/elt_multiply.hpp>
-#include <stan/math/rev/fun/exp.hpp>
-#include <stan/math/fwd/fun/exp.hpp>
 #include <stan/math/rev/fun/log.hpp>
-#include <stan/math/fwd/fun/log.hpp>
 #include <stan/math/rev/fun/log1p_exp.hpp>
 #include <stan/math/fwd/fun/log1p_exp.hpp>
-#include <stan/math/rev/fun/multiply.hpp>
-#include <stan/math/fwd/fun/multiply.hpp>
-#include <stan/math/rev/fun/lgamma.hpp>
-#include <stan/math/fwd/fun/lgamma.hpp>
 #include <stan/math/rev/fun/sum.hpp>
 #include <stan/math/fwd/fun/sum.hpp>
-#include <stan/math/prim/fun/binomial_coefficient_log.hpp>
-#include <stan/math/rev/fun/to_vector.hpp>
 #include <stan/math/prim/fun/to_vector.hpp>
 
 namespace stan {
diff --git a/stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp b/stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp
index 699a54b914a..1bb15876118 100644
--- a/stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp
+++ b/stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp
@@ -1,21 +1,15 @@
 #ifndef STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_NEG_BINOMIAL_2_LOG_LPMF_HPP
 #define STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_NEG_BINOMIAL_2_LOG_LPMF_HPP
 
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/functor/laplace_marginal_density.hpp>
 
 #include <stan/math/rev/core/operator_addition.hpp>
-#include <stan/math/rev/core/operator_multiplication.hpp>
 #include <stan/math/rev/core/operator_subtraction.hpp>
-#include <stan/math/rev/fun/dot_product.hpp>
 #include <stan/math/rev/fun/elt_multiply.hpp>
-#include <stan/math/rev/fun/lgamma.hpp>
 #include <stan/math/rev/fun/log.hpp>
 #include <stan/math/rev/fun/log_sum_exp.hpp>
-#include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/rev/fun/multiply.hpp>
 #include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/fwd/fun/exp.hpp>
 #include <stan/math/fwd/fun/lgamma.hpp>
 #include <stan/math/fwd/fun/log.hpp>
 #include <stan/math/fwd/fun/log_sum_exp.hpp>
diff --git a/stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp b/stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp
index c9cb99fa629..c370a895ef9 100644
--- a/stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp
+++ b/stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp
@@ -1,14 +1,11 @@
 #ifndef STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_POISSON_LOG_LPMF_HPP
 #define STAN_MATH_MIX_PROB_LAPLACE_MARGINAL_POISSON_LOG_LPMF_HPP
 
-#include <stan/math/mix/functor/laplace_likelihood.hpp>
 #include <stan/math/mix/functor/laplace_marginal_density.hpp>
 #include <stan/math/mix/meta.hpp>
 #include <stan/math/rev/fun/dot_product.hpp>
 #include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/fwd/fun/exp.hpp>
-#include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/fwd/fun/sum.hpp>
 #include <stan/math/fwd/fun/lgamma.hpp>
 #include <stan/math/rev/fun/lgamma.hpp>
 #include <stan/math/prim/fun/add.hpp>
diff --git a/stan/math/opencl/buffer_types.hpp b/stan/math/opencl/buffer_types.hpp
index 08fd9f00ad3..042fbf388ae 100644
--- a/stan/math/opencl/buffer_types.hpp
+++ b/stan/math/opencl/buffer_types.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_BUFFER_TYPES_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <CL/opencl.hpp>
 
diff --git a/stan/math/opencl/cholesky_decompose.hpp b/stan/math/opencl/cholesky_decompose.hpp
index 41a5ab77b65..7e88173ed40 100644
--- a/stan/math/opencl/cholesky_decompose.hpp
+++ b/stan/math/opencl/cholesky_decompose.hpp
@@ -12,7 +12,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <CL/opencl.hpp>
-#include <algorithm>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/copy.hpp b/stan/math/opencl/copy.hpp
index 9a06ea7cc26..a1a4aff753e 100644
--- a/stan/math/opencl/copy.hpp
+++ b/stan/math/opencl/copy.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/opencl_context.hpp>
@@ -18,8 +17,6 @@
 #include <stan/math/prim/fun/vec_concat.hpp>
 
 #include <CL/opencl.hpp>
-#include <algorithm>
-#include <iostream>
 #include <type_traits>
 #include <vector>
 
diff --git a/stan/math/opencl/double_d.hpp b/stan/math/opencl/double_d.hpp
index 54cf3114500..57d125fa8a1 100644
--- a/stan/math/opencl/double_d.hpp
+++ b/stan/math/opencl/double_d.hpp
@@ -3,10 +3,8 @@
 
 #include <stan/math/opencl/stringify.hpp>
 
-#include <string>
 #include <cmath>
 #include <cfloat>
-#include <limits>
 
 /**
  * Alternative stringify, that also exposes the code for use in C++ host code.
diff --git a/stan/math/opencl/err/check_mat_size_one.hpp b/stan/math/opencl/err/check_mat_size_one.hpp
index 9b965c51025..f52f9494cb6 100644
--- a/stan/math/opencl/err/check_mat_size_one.hpp
+++ b/stan/math/opencl/err/check_mat_size_one.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/err/check_opencl.hpp b/stan/math/opencl/err/check_opencl.hpp
index d5aa0c88aae..46e23c8b781 100644
--- a/stan/math/opencl/err/check_opencl.hpp
+++ b/stan/math/opencl/err/check_opencl.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/system_error.hpp>
 #include <CL/opencl.hpp>
-#include <iostream>
-#include <stdexcept>
 #include <string>
 
 namespace stan {
diff --git a/stan/math/opencl/err/check_symmetric.hpp b/stan/math/opencl/err/check_symmetric.hpp
index 43973eb6174..fdf1208ad3e 100644
--- a/stan/math/opencl/err/check_symmetric.hpp
+++ b/stan/math/opencl/err/check_symmetric.hpp
@@ -4,12 +4,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/err.hpp>
 #include <stan/math/opencl/kernels/check_symmetric.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/err/check_triangular.hpp b/stan/math/opencl/err/check_triangular.hpp
index ab4be6ad99d..d61ff31b5fb 100644
--- a/stan/math/opencl/err/check_triangular.hpp
+++ b/stan/math/opencl/err/check_triangular.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/err/invalid_argument.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/opencl/indexing_rev.hpp b/stan/math/opencl/indexing_rev.hpp
index c3cff5ecb76..f5e3b609d65 100644
--- a/stan/math/opencl/indexing_rev.hpp
+++ b/stan/math/opencl/indexing_rev.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/kernels/indexing_rev.hpp>
-#include <stan/math/opencl/kernels/add.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernel_cl.hpp b/stan/math/opencl/kernel_cl.hpp
index 8f0b6a66e7d..bbc0182cbc5 100644
--- a/stan/math/opencl/kernel_cl.hpp
+++ b/stan/math/opencl/kernel_cl.hpp
@@ -3,16 +3,12 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/opencl_context.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/stringify.hpp>
 #include <stan/math/opencl/err/check_opencl.hpp>
 #include <stan/math/opencl/kernels/helpers.hpp>
 #include <stan/math/prim/fun/vec_concat.hpp>
 #include <CL/opencl.hpp>
 #include <algorithm>
-#include <map>
 #include <string>
 #include <vector>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/append.hpp b/stan/math/opencl/kernel_generator/append.hpp
index c29cbe40284..cae120f49a8 100644
--- a/stan/math/opencl/kernel_generator/append.hpp
+++ b/stan/math/opencl/kernel_generator/append.hpp
@@ -2,20 +2,15 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_APPEND_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/err/check_opencl.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
-#include <stan/math/opencl/kernel_generator/scalar.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
 #include <algorithm>
 #include <string>
-#include <tuple>
 #include <type_traits>
-#include <map>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/as_column_vector_or_scalar.hpp b/stan/math/opencl/kernel_generator/as_column_vector_or_scalar.hpp
index b2c91b1b0ac..a221ddacaae 100644
--- a/stan/math/opencl/kernel_generator/as_column_vector_or_scalar.hpp
+++ b/stan/math/opencl/kernel_generator/as_column_vector_or_scalar.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_AS_COLUMN_VECTOR_OR_SCALAR_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl_lhs.hpp>
@@ -11,9 +10,7 @@
 #include <stan/math/prim/err/check_vector.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <algorithm>
-#include <map>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/as_operation_cl.hpp b/stan/math/opencl/kernel_generator/as_operation_cl.hpp
index b87e4fb0a9d..36ed39ace08 100644
--- a/stan/math/opencl/kernel_generator/as_operation_cl.hpp
+++ b/stan/math/opencl/kernel_generator/as_operation_cl.hpp
@@ -3,10 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator/assignment_ops.hpp>
-#include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/load.hpp>
 #include <stan/math/opencl/kernel_generator/scalar.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <type_traits>
 
diff --git a/stan/math/opencl/kernel_generator/binary_operation.hpp b/stan/math/opencl/kernel_generator/binary_operation.hpp
index b2198e4cea4..27440627fcb 100644
--- a/stan/math/opencl/kernel_generator/binary_operation.hpp
+++ b/stan/math/opencl/kernel_generator/binary_operation.hpp
@@ -2,13 +2,9 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_BINARY_OPERATOR_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/err/check_opencl.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
-#include <stan/math/opencl/kernel_generator/scalar.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
 #include <algorithm>
diff --git a/stan/math/opencl/kernel_generator/block_zero_based.hpp b/stan/math/opencl/kernel_generator/block_zero_based.hpp
index 4c0eeaeb2ac..d61082a956b 100644
--- a/stan/math/opencl/kernel_generator/block_zero_based.hpp
+++ b/stan/math/opencl/kernel_generator/block_zero_based.hpp
@@ -3,13 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/throw_domain_error.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl_lhs.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
-#include <map>
 #include <string>
 #include <tuple>
 #include <type_traits>
diff --git a/stan/math/opencl/kernel_generator/broadcast.hpp b/stan/math/opencl/kernel_generator/broadcast.hpp
index 66b823ce67b..cc95eb5cdbe 100644
--- a/stan/math/opencl/kernel_generator/broadcast.hpp
+++ b/stan/math/opencl/kernel_generator/broadcast.hpp
@@ -2,16 +2,12 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_BROADCAST_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <limits>
 #include <string>
 #include <type_traits>
-#include <set>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/calc_if.hpp b/stan/math/opencl/kernel_generator/calc_if.hpp
index 90ac0da1018..6ccd620294c 100644
--- a/stan/math/opencl/kernel_generator/calc_if.hpp
+++ b/stan/math/opencl/kernel_generator/calc_if.hpp
@@ -2,15 +2,12 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_CALC_IF_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <string>
 #include <type_traits>
-#include <map>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/cast.hpp b/stan/math/opencl/kernel_generator/cast.hpp
index 9e846fc3760..8e5c9555094 100644
--- a/stan/math/opencl/kernel_generator/cast.hpp
+++ b/stan/math/opencl/kernel_generator/cast.hpp
@@ -3,16 +3,11 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
-#include <array>
 #include <string>
 #include <type_traits>
-#include <set>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/check_cl.hpp b/stan/math/opencl/kernel_generator/check_cl.hpp
index c19ab578f54..7f91b3c59fa 100644
--- a/stan/math/opencl/kernel_generator/check_cl.hpp
+++ b/stan/math/opencl/kernel_generator/check_cl.hpp
@@ -4,12 +4,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <stan/math/opencl/value_type.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl_lhs.hpp>
 #include <stan/math/opencl/kernel_generator/constant.hpp>
 #include <stan/math/opencl/kernel_generator/scalar.hpp>
-#include <map>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernel_generator/colwise_reduction.hpp b/stan/math/opencl/kernel_generator/colwise_reduction.hpp
index e4520b154c6..5d0e160ccfd 100644
--- a/stan/math/opencl/kernel_generator/colwise_reduction.hpp
+++ b/stan/math/opencl/kernel_generator/colwise_reduction.hpp
@@ -4,14 +4,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/opencl_context.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/rowwise_reduction.hpp>
 #include <stan/math/opencl/kernel_generator/calc_if.hpp>
-#include <map>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/constant.hpp b/stan/math/opencl/kernel_generator/constant.hpp
index 4b6be51393f..1cf00e01ae9 100644
--- a/stan/math/opencl/kernel_generator/constant.hpp
+++ b/stan/math/opencl/kernel_generator/constant.hpp
@@ -3,14 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <limits>
-#include <map>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/diagonal.hpp b/stan/math/opencl/kernel_generator/diagonal.hpp
index 62c87bc1e81..49f65f549e1 100644
--- a/stan/math/opencl/kernel_generator/diagonal.hpp
+++ b/stan/math/opencl/kernel_generator/diagonal.hpp
@@ -3,15 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl_lhs.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <algorithm>
-#include <map>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/elt_function_cl.hpp b/stan/math/opencl/kernel_generator/elt_function_cl.hpp
index df349a7b483..5533550755d 100644
--- a/stan/math/opencl/kernel_generator/elt_function_cl.hpp
+++ b/stan/math/opencl/kernel_generator/elt_function_cl.hpp
@@ -27,10 +27,7 @@
 #include <stan/math/opencl/kernels/device_functions/Phi_approx.hpp>
 #include <stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp>
 #include <stan/math/opencl/kernels/device_functions/trigamma.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <array>
diff --git a/stan/math/opencl/kernel_generator/evaluate_into.hpp b/stan/math/opencl/kernel_generator/evaluate_into.hpp
index aaed90b8afb..5c00923dd1a 100644
--- a/stan/math/opencl/kernel_generator/evaluate_into.hpp
+++ b/stan/math/opencl/kernel_generator/evaluate_into.hpp
@@ -4,11 +4,7 @@
 
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
-#include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/multi_result_kernel.hpp>
-#include <CL/opencl.hpp>
-#include <string>
-#include <set>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernel_generator/get_kernel_source_for_evaluating_into.hpp b/stan/math/opencl/kernel_generator/get_kernel_source_for_evaluating_into.hpp
index 854b29d4a33..64fac3aad77 100644
--- a/stan/math/opencl/kernel_generator/get_kernel_source_for_evaluating_into.hpp
+++ b/stan/math/opencl/kernel_generator/get_kernel_source_for_evaluating_into.hpp
@@ -3,11 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
-#include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/multi_result_kernel.hpp>
-#include <CL/opencl.hpp>
 #include <string>
-#include <set>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernel_generator/holder_cl.hpp b/stan/math/opencl/kernel_generator/holder_cl.hpp
index ae836f371c9..869d2273c88 100644
--- a/stan/math/opencl/kernel_generator/holder_cl.hpp
+++ b/stan/math/opencl/kernel_generator/holder_cl.hpp
@@ -3,15 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <memory>
-#include <string>
 #include <type_traits>
-#include <set>
 #include <tuple>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/indexing.hpp b/stan/math/opencl/kernel_generator/indexing.hpp
index e997531c19b..bd1ecf586cc 100644
--- a/stan/math/opencl/kernel_generator/indexing.hpp
+++ b/stan/math/opencl/kernel_generator/indexing.hpp
@@ -3,11 +3,9 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
-#include <map>
 #include <string>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/load.hpp b/stan/math/opencl/kernel_generator/load.hpp
index 8615b4aefc2..32e3d877e7c 100644
--- a/stan/math/opencl/kernel_generator/load.hpp
+++ b/stan/math/opencl/kernel_generator/load.hpp
@@ -13,7 +13,6 @@
 #include <type_traits>
 #include <string>
 #include <utility>
-#include <map>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/multi_result_kernel.hpp b/stan/math/opencl/kernel_generator/multi_result_kernel.hpp
index 0b0cbadec57..d25eabfebdc 100644
--- a/stan/math/opencl/kernel_generator/multi_result_kernel.hpp
+++ b/stan/math/opencl/kernel_generator/multi_result_kernel.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/err/check_size_match.hpp>
-#include <stan/math/prim/meta/is_kernel_expression.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/assignment_ops.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
@@ -11,7 +10,6 @@
 #include <stan/math/opencl/kernel_generator/check_cl.hpp>
 #include <stan/math/opencl/kernel_generator/colwise_reduction.hpp>
 #include <stan/math/opencl/kernel_generator/reduction_2d.hpp>
-#include <stan/math/opencl/kernel_generator/load.hpp>
 #include <stan/math/opencl/opencl_context.hpp>
 #include <algorithm>
 #include <string>
diff --git a/stan/math/opencl/kernel_generator/opencl_code.hpp b/stan/math/opencl/kernel_generator/opencl_code.hpp
index 59485ed4c85..f317c38bd9c 100644
--- a/stan/math/opencl/kernel_generator/opencl_code.hpp
+++ b/stan/math/opencl/kernel_generator/opencl_code.hpp
@@ -3,15 +3,11 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
-#include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
-#include <stan/math/prim/functor/for_each.hpp>
 #include <algorithm>
-#include <set>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/operation_cl.hpp b/stan/math/opencl/kernel_generator/operation_cl.hpp
index 6372358f042..8c9c2f18963 100644
--- a/stan/math/opencl/kernel_generator/operation_cl.hpp
+++ b/stan/math/opencl/kernel_generator/operation_cl.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_nonnegative.hpp>
 #include <stan/math/opencl/kernel_generator/assignment_ops.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
@@ -15,7 +14,6 @@
 #include <string>
 #include <utility>
 #include <tuple>
-#include <map>
 #include <array>
 #include <numeric>
 #include <vector>
diff --git a/stan/math/opencl/kernel_generator/operation_cl_lhs.hpp b/stan/math/opencl/kernel_generator/operation_cl_lhs.hpp
index eb0ccc0212e..40660a85e9e 100644
--- a/stan/math/opencl/kernel_generator/operation_cl_lhs.hpp
+++ b/stan/math/opencl/kernel_generator/operation_cl_lhs.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <string>
-#include <map>
 #include <array>
 #include <numeric>
 #include <vector>
diff --git a/stan/math/opencl/kernel_generator/optional_broadcast.hpp b/stan/math/opencl/kernel_generator/optional_broadcast.hpp
index c9b5d19e83d..c597ae4de11 100644
--- a/stan/math/opencl/kernel_generator/optional_broadcast.hpp
+++ b/stan/math/opencl/kernel_generator/optional_broadcast.hpp
@@ -5,13 +5,11 @@
 #include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <limits>
 #include <string>
 #include <type_traits>
-#include <map>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernel_generator/reduction_2d.hpp b/stan/math/opencl/kernel_generator/reduction_2d.hpp
index 4d019f1012c..a2adaff537d 100644
--- a/stan/math/opencl/kernel_generator/reduction_2d.hpp
+++ b/stan/math/opencl/kernel_generator/reduction_2d.hpp
@@ -3,8 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/opencl_context.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
@@ -12,7 +10,6 @@
 #include <stan/math/opencl/kernel_generator/colwise_reduction.hpp>
 #include <stan/math/opencl/kernel_generator/rowwise_reduction.hpp>
 #include <stan/math/opencl/kernel_generator/calc_if.hpp>
-#include <map>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/rowwise_reduction.hpp b/stan/math/opencl/kernel_generator/rowwise_reduction.hpp
index 850935b01f6..b65e70cad47 100644
--- a/stan/math/opencl/kernel_generator/rowwise_reduction.hpp
+++ b/stan/math/opencl/kernel_generator/rowwise_reduction.hpp
@@ -10,7 +10,6 @@
 #include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <map>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/scalar.hpp b/stan/math/opencl/kernel_generator/scalar.hpp
index 34216ea9349..4a7ed247d08 100644
--- a/stan/math/opencl/kernel_generator/scalar.hpp
+++ b/stan/math/opencl/kernel_generator/scalar.hpp
@@ -3,14 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <limits>
-#include <map>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/stan/math/opencl/kernel_generator/select.hpp b/stan/math/opencl/kernel_generator/select.hpp
index 24b25e98534..0dd60b97f2d 100644
--- a/stan/math/opencl/kernel_generator/select.hpp
+++ b/stan/math/opencl/kernel_generator/select.hpp
@@ -4,14 +4,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/select.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <stan/math/opencl/kernel_generator/common_return_scalar.hpp>
 #include <algorithm>
-#include <set>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/transpose.hpp b/stan/math/opencl/kernel_generator/transpose.hpp
index 3809517a299..c5aecec9f1f 100644
--- a/stan/math/opencl/kernel_generator/transpose.hpp
+++ b/stan/math/opencl/kernel_generator/transpose.hpp
@@ -2,15 +2,11 @@
 #define STAN_MATH_OPENCL_KERNEL_GENERATOR_TRANSPOSE_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/opencl/kernel_generator/type_str.hpp>
-#include <stan/math/opencl/kernel_generator/name_generator.hpp>
 #include <stan/math/opencl/kernel_generator/operation_cl_lhs.hpp>
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <algorithm>
 #include <string>
-#include <set>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/stan/math/opencl/kernel_generator/unary_operation_cl.hpp b/stan/math/opencl/kernel_generator/unary_operation_cl.hpp
index d921ea0d492..948668e29b4 100644
--- a/stan/math/opencl/kernel_generator/unary_operation_cl.hpp
+++ b/stan/math/opencl/kernel_generator/unary_operation_cl.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/opencl/kernel_generator/as_operation_cl.hpp>
 #include <string>
 #include <type_traits>
-#include <set>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/opencl/kernels/add.hpp b/stan/math/opencl/kernels/add.hpp
index e37e2b21cdc..cc90d450657 100644
--- a/stan/math/opencl/kernels/add.hpp
+++ b/stan/math/opencl/kernels/add.hpp
@@ -4,8 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/batch_identity.hpp b/stan/math/opencl/kernels/batch_identity.hpp
index dda23be8b0f..89599f40f47 100644
--- a/stan/math/opencl/kernels/batch_identity.hpp
+++ b/stan/math/opencl/kernels/batch_identity.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/check_symmetric.hpp b/stan/math/opencl/kernels/check_symmetric.hpp
index 81efa9f5d9c..5e12467d0f6 100644
--- a/stan/math/opencl/kernels/check_symmetric.hpp
+++ b/stan/math/opencl/kernels/check_symmetric.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/cholesky_decompose.hpp b/stan/math/opencl/kernels/cholesky_decompose.hpp
index cac42c651bd..24107fadbe2 100644
--- a/stan/math/opencl/kernels/cholesky_decompose.hpp
+++ b/stan/math/opencl/kernels/cholesky_decompose.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/cumulative_sum.hpp b/stan/math/opencl/kernels/cumulative_sum.hpp
index 12e5d94ca97..b56dc7d3e8d 100644
--- a/stan/math/opencl/kernels/cumulative_sum.hpp
+++ b/stan/math/opencl/kernels/cumulative_sum.hpp
@@ -4,8 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/Phi.hpp b/stan/math/opencl/kernels/device_functions/Phi.hpp
index 0db9aa2167b..046b8cbb553 100644
--- a/stan/math/opencl/kernels/device_functions/Phi.hpp
+++ b/stan/math/opencl/kernels/device_functions/Phi.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/Phi_approx.hpp b/stan/math/opencl/kernels/device_functions/Phi_approx.hpp
index a86c3563951..9dd6dc6eaf8 100644
--- a/stan/math/opencl/kernels/device_functions/Phi_approx.hpp
+++ b/stan/math/opencl/kernels/device_functions/Phi_approx.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/atomic_add_double.hpp b/stan/math/opencl/kernels/device_functions/atomic_add_double.hpp
index b07e1246d24..c560485dc39 100644
--- a/stan/math/opencl/kernels/device_functions/atomic_add_double.hpp
+++ b/stan/math/opencl/kernels/device_functions/atomic_add_double.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/beta.hpp b/stan/math/opencl/kernels/device_functions/beta.hpp
index e634cddb07c..9089d7a4493 100644
--- a/stan/math/opencl/kernels/device_functions/beta.hpp
+++ b/stan/math/opencl/kernels/device_functions/beta.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/binomial_coefficient_log.hpp b/stan/math/opencl/kernels/device_functions/binomial_coefficient_log.hpp
index a5988f22cee..031a82b716a 100644
--- a/stan/math/opencl/kernels/device_functions/binomial_coefficient_log.hpp
+++ b/stan/math/opencl/kernels/device_functions/binomial_coefficient_log.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/digamma.hpp b/stan/math/opencl/kernels/device_functions/digamma.hpp
index 5552cfd822f..c559af4ffcb 100644
--- a/stan/math/opencl/kernels/device_functions/digamma.hpp
+++ b/stan/math/opencl/kernels/device_functions/digamma.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/erfcx.hpp b/stan/math/opencl/kernels/device_functions/erfcx.hpp
index f7188b20f6f..001d09a3a02 100644
--- a/stan/math/opencl/kernels/device_functions/erfcx.hpp
+++ b/stan/math/opencl/kernels/device_functions/erfcx.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/inv_Phi.hpp b/stan/math/opencl/kernels/device_functions/inv_Phi.hpp
index bec6070505a..c10b72dbf5c 100644
--- a/stan/math/opencl/kernels/device_functions/inv_Phi.hpp
+++ b/stan/math/opencl/kernels/device_functions/inv_Phi.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/inv_logit.hpp b/stan/math/opencl/kernels/device_functions/inv_logit.hpp
index 827b917496c..2ef1609ce2c 100644
--- a/stan/math/opencl/kernels/device_functions/inv_logit.hpp
+++ b/stan/math/opencl/kernels/device_functions/inv_logit.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/inv_square.hpp b/stan/math/opencl/kernels/device_functions/inv_square.hpp
index 90d2c89549d..54accdf2326 100644
--- a/stan/math/opencl/kernels/device_functions/inv_square.hpp
+++ b/stan/math/opencl/kernels/device_functions/inv_square.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/lbeta.hpp b/stan/math/opencl/kernels/device_functions/lbeta.hpp
index 27e721575ff..fda1e8ae8c8 100644
--- a/stan/math/opencl/kernels/device_functions/lbeta.hpp
+++ b/stan/math/opencl/kernels/device_functions/lbeta.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/lgamma_stirling.hpp b/stan/math/opencl/kernels/device_functions/lgamma_stirling.hpp
index a62510a5ef3..940e55bade5 100644
--- a/stan/math/opencl/kernels/device_functions/lgamma_stirling.hpp
+++ b/stan/math/opencl/kernels/device_functions/lgamma_stirling.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/lgamma_stirling_diff.hpp b/stan/math/opencl/kernels/device_functions/lgamma_stirling_diff.hpp
index 87e11dce6ff..f7a94d29b04 100644
--- a/stan/math/opencl/kernels/device_functions/lgamma_stirling_diff.hpp
+++ b/stan/math/opencl/kernels/device_functions/lgamma_stirling_diff.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/lmultiply.hpp b/stan/math/opencl/kernels/device_functions/lmultiply.hpp
index 8f8e6077a4c..0f0485b472d 100644
--- a/stan/math/opencl/kernels/device_functions/lmultiply.hpp
+++ b/stan/math/opencl/kernels/device_functions/lmultiply.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log1m.hpp b/stan/math/opencl/kernels/device_functions/log1m.hpp
index 62bdbdfa1dc..afe7eef0b8a 100644
--- a/stan/math/opencl/kernels/device_functions/log1m.hpp
+++ b/stan/math/opencl/kernels/device_functions/log1m.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log1m_exp.hpp b/stan/math/opencl/kernels/device_functions/log1m_exp.hpp
index 54993594780..79ba13b925f 100644
--- a/stan/math/opencl/kernels/device_functions/log1m_exp.hpp
+++ b/stan/math/opencl/kernels/device_functions/log1m_exp.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log1m_inv_logit.hpp b/stan/math/opencl/kernels/device_functions/log1m_inv_logit.hpp
index 11f5c0806ec..f80a3bb8f6c 100644
--- a/stan/math/opencl/kernels/device_functions/log1m_inv_logit.hpp
+++ b/stan/math/opencl/kernels/device_functions/log1m_inv_logit.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log1p_exp.hpp b/stan/math/opencl/kernels/device_functions/log1p_exp.hpp
index 2198bbe59a7..732586a4f0d 100644
--- a/stan/math/opencl/kernels/device_functions/log1p_exp.hpp
+++ b/stan/math/opencl/kernels/device_functions/log1p_exp.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log_diff_exp.hpp b/stan/math/opencl/kernels/device_functions/log_diff_exp.hpp
index bbcdfc1ac09..b04d37bec7b 100644
--- a/stan/math/opencl/kernels/device_functions/log_diff_exp.hpp
+++ b/stan/math/opencl/kernels/device_functions/log_diff_exp.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log_inv_logit.hpp b/stan/math/opencl/kernels/device_functions/log_inv_logit.hpp
index cd82005fc0f..b2a880d02d1 100644
--- a/stan/math/opencl/kernels/device_functions/log_inv_logit.hpp
+++ b/stan/math/opencl/kernels/device_functions/log_inv_logit.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/log_inv_logit_diff.hpp b/stan/math/opencl/kernels/device_functions/log_inv_logit_diff.hpp
index 201064d3212..b69d27d0c1c 100644
--- a/stan/math/opencl/kernels/device_functions/log_inv_logit_diff.hpp
+++ b/stan/math/opencl/kernels/device_functions/log_inv_logit_diff.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/logit.hpp b/stan/math/opencl/kernels/device_functions/logit.hpp
index 533750a5a37..fb82a79bbc4 100644
--- a/stan/math/opencl/kernels/device_functions/logit.hpp
+++ b/stan/math/opencl/kernels/device_functions/logit.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/multiply_log.hpp b/stan/math/opencl/kernels/device_functions/multiply_log.hpp
index b1f5071b070..1b51d6277b6 100644
--- a/stan/math/opencl/kernels/device_functions/multiply_log.hpp
+++ b/stan/math/opencl/kernels/device_functions/multiply_log.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp b/stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp
index c48ce98acea..82707b6ce7a 100644
--- a/stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp
+++ b/stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/device_functions/trigamma.hpp b/stan/math/opencl/kernels/device_functions/trigamma.hpp
index f93db4f724f..7877779c67f 100644
--- a/stan/math/opencl/kernels/device_functions/trigamma.hpp
+++ b/stan/math/opencl/kernels/device_functions/trigamma.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/stringify.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/diag_inv.hpp b/stan/math/opencl/kernels/diag_inv.hpp
index b8af6a9aa5e..13bc41a7f86 100644
--- a/stan/math/opencl/kernels/diag_inv.hpp
+++ b/stan/math/opencl/kernels/diag_inv.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/divide_columns.hpp b/stan/math/opencl/kernels/divide_columns.hpp
index 9bad330ebaa..b4b437ba325 100644
--- a/stan/math/opencl/kernels/divide_columns.hpp
+++ b/stan/math/opencl/kernels/divide_columns.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/fill_strict_tri.hpp b/stan/math/opencl/kernels/fill_strict_tri.hpp
index ee059e2226d..0b6fccb0fe6 100644
--- a/stan/math/opencl/kernels/fill_strict_tri.hpp
+++ b/stan/math/opencl/kernels/fill_strict_tri.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/gp_exp_quad_cov.hpp b/stan/math/opencl/kernels/gp_exp_quad_cov.hpp
index 8e6d47f6b81..44c222879c1 100644
--- a/stan/math/opencl/kernels/gp_exp_quad_cov.hpp
+++ b/stan/math/opencl/kernels/gp_exp_quad_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_cl.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/gp_exponential_cov.hpp b/stan/math/opencl/kernels/gp_exponential_cov.hpp
index 722d50cb11b..cf46724b316 100644
--- a/stan/math/opencl/kernels/gp_exponential_cov.hpp
+++ b/stan/math/opencl/kernels/gp_exponential_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_cl.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/gp_matern32_cov.hpp b/stan/math/opencl/kernels/gp_matern32_cov.hpp
index 973e58a6670..807bb550e6e 100644
--- a/stan/math/opencl/kernels/gp_matern32_cov.hpp
+++ b/stan/math/opencl/kernels/gp_matern32_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_cl.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/gp_matern52_cov.hpp b/stan/math/opencl/kernels/gp_matern52_cov.hpp
index 75d229872cf..46d7364f204 100644
--- a/stan/math/opencl/kernels/gp_matern52_cov.hpp
+++ b/stan/math/opencl/kernels/gp_matern52_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_cl.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/indexing_rev.hpp b/stan/math/opencl/kernels/indexing_rev.hpp
index c69d5d3f094..88910a50081 100644
--- a/stan/math/opencl/kernels/indexing_rev.hpp
+++ b/stan/math/opencl/kernels/indexing_rev.hpp
@@ -4,9 +4,7 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernels/device_functions/atomic_add_double.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/inv_lower_tri_multiply.hpp b/stan/math/opencl/kernels/inv_lower_tri_multiply.hpp
index 2052ce374cf..4be326e3da9 100644
--- a/stan/math/opencl/kernels/inv_lower_tri_multiply.hpp
+++ b/stan/math/opencl/kernels/inv_lower_tri_multiply.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/matrix_multiply.hpp b/stan/math/opencl/kernels/matrix_multiply.hpp
index eb8b8f3e890..1a9e1122be3 100644
--- a/stan/math/opencl/kernels/matrix_multiply.hpp
+++ b/stan/math/opencl/kernels/matrix_multiply.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/mergesort.hpp b/stan/math/opencl/kernels/mergesort.hpp
index 7f4dbd61308..0c7e7e07d2e 100644
--- a/stan/math/opencl/kernels/mergesort.hpp
+++ b/stan/math/opencl/kernels/mergesort.hpp
@@ -4,8 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/multiply_transpose.hpp b/stan/math/opencl/kernels/multiply_transpose.hpp
index 07616b5033d..cb18d522ee8 100644
--- a/stan/math/opencl/kernels/multiply_transpose.hpp
+++ b/stan/math/opencl/kernels/multiply_transpose.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/neg_rect_lower_tri_multiply.hpp b/stan/math/opencl/kernels/neg_rect_lower_tri_multiply.hpp
index 4864f025220..a3459bc30c1 100644
--- a/stan/math/opencl/kernels/neg_rect_lower_tri_multiply.hpp
+++ b/stan/math/opencl/kernels/neg_rect_lower_tri_multiply.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/pack.hpp b/stan/math/opencl/kernels/pack.hpp
index 111f9202efa..7c80edb8eaa 100644
--- a/stan/math/opencl/kernels/pack.hpp
+++ b/stan/math/opencl/kernels/pack.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/rep_matrix.hpp b/stan/math/opencl/kernels/rep_matrix.hpp
index efc699293b1..7c4b8733437 100644
--- a/stan/math/opencl/kernels/rep_matrix.hpp
+++ b/stan/math/opencl/kernels/rep_matrix.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/kernels/unpack.hpp b/stan/math/opencl/kernels/unpack.hpp
index cafa041d06c..b39e62961ea 100644
--- a/stan/math/opencl/kernels/unpack.hpp
+++ b/stan/math/opencl/kernels/unpack.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <stan/math/opencl/buffer_types.hpp>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/matrix_cl.hpp b/stan/math/opencl/matrix_cl.hpp
index 4114c1199c8..954b856f721 100644
--- a/stan/math/opencl/matrix_cl.hpp
+++ b/stan/math/opencl/matrix_cl.hpp
@@ -9,13 +9,10 @@
 #include <stan/math/opencl/ref_type_for_opencl.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/vec_concat.hpp>
 #include <CL/opencl.hpp>
 #include <tbb/concurrent_vector.h>
 #include <algorithm>
-#include <iostream>
-#include <string>
 #include <type_traits>
 #include <vector>
 
diff --git a/stan/math/opencl/mrrr.hpp b/stan/math/opencl/mrrr.hpp
index aec6125be18..103dcb5b08e 100644
--- a/stan/math/opencl/mrrr.hpp
+++ b/stan/math/opencl/mrrr.hpp
@@ -7,7 +7,6 @@
 #include <queue>
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/prim/multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/double_d.hpp>
diff --git a/stan/math/opencl/multiply_transpose.hpp b/stan/math/opencl/multiply_transpose.hpp
index 2194ab33fdd..c2e390a34fc 100644
--- a/stan/math/opencl/multiply_transpose.hpp
+++ b/stan/math/opencl/multiply_transpose.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/kernels/multiply_transpose.hpp>
 #include <stan/math/opencl/err.hpp>
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/bernoulli_logit_glm_lpmf.hpp b/stan/math/opencl/prim/bernoulli_logit_glm_lpmf.hpp
index 01d1bc0e23a..f39590c5c4e 100644
--- a/stan/math/opencl/prim/bernoulli_logit_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/bernoulli_logit_glm_lpmf.hpp
@@ -9,14 +9,10 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 
 #include <cmath>
 
diff --git a/stan/math/opencl/prim/beta_binomial_lpmf.hpp b/stan/math/opencl/prim/beta_binomial_lpmf.hpp
index 39406d1b38e..ce539d4d388 100644
--- a/stan/math/opencl/prim/beta_binomial_lpmf.hpp
+++ b/stan/math/opencl/prim/beta_binomial_lpmf.hpp
@@ -3,16 +3,12 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/beta_lpdf.hpp b/stan/math/opencl/prim/beta_lpdf.hpp
index f9c49122390..15b98eea77f 100644
--- a/stan/math/opencl/prim/beta_lpdf.hpp
+++ b/stan/math/opencl/prim/beta_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
diff --git a/stan/math/opencl/prim/beta_proportion_lpdf.hpp b/stan/math/opencl/prim/beta_proportion_lpdf.hpp
index aab78c62376..f8969dbde48 100644
--- a/stan/math/opencl/prim/beta_proportion_lpdf.hpp
+++ b/stan/math/opencl/prim/beta_proportion_lpdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
diff --git a/stan/math/opencl/prim/binomial_logit_glm_lpmf.hpp b/stan/math/opencl/prim/binomial_logit_glm_lpmf.hpp
index a569498f5e1..a9860d83696 100644
--- a/stan/math/opencl/prim/binomial_logit_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/binomial_logit_glm_lpmf.hpp
@@ -9,15 +9,9 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/max.hpp>
-#include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 
 #include <cmath>
 #include <cstdint>
diff --git a/stan/math/opencl/prim/categorical_logit_glm_lpmf.hpp b/stan/math/opencl/prim/categorical_logit_glm_lpmf.hpp
index 2396cd9e659..3b517dea4b1 100644
--- a/stan/math/opencl/prim/categorical_logit_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/categorical_logit_glm_lpmf.hpp
@@ -14,9 +14,7 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/eval.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/cholesky_decompose.hpp b/stan/math/opencl/prim/cholesky_decompose.hpp
index a87f86ce06a..e11b76da598 100644
--- a/stan/math/opencl/prim/cholesky_decompose.hpp
+++ b/stan/math/opencl/prim/cholesky_decompose.hpp
@@ -5,9 +5,6 @@
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/cholesky_decompose.hpp>
-#include <stan/math/prim/meta.hpp>
-#include <CL/opencl.hpp>
-#include <algorithm>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/columns_dot_product.hpp b/stan/math/opencl/prim/columns_dot_product.hpp
index 2c429953344..c29d849ffef 100644
--- a/stan/math/opencl/prim/columns_dot_product.hpp
+++ b/stan/math/opencl/prim/columns_dot_product.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_OPENCL_PRIM_COLUMNS_DOT_PRODUCT_HPP
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_vector.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/columns_dot_self.hpp b/stan/math/opencl/prim/columns_dot_self.hpp
index c007c331333..c352c9c3118 100644
--- a/stan/math/opencl/prim/columns_dot_self.hpp
+++ b/stan/math/opencl/prim/columns_dot_self.hpp
@@ -2,10 +2,7 @@
 #define STAN_MATH_OPENCL_PRIM_COLUMNS_DOT_SELF_HPP
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_vector.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/constraint/lb_constrain.hpp b/stan/math/opencl/prim/constraint/lb_constrain.hpp
index a80ad3cb783..e329a6b5b0b 100644
--- a/stan/math/opencl/prim/constraint/lb_constrain.hpp
+++ b/stan/math/opencl/prim/constraint/lb_constrain.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_CONSTRAINT_LB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/constraint/lub_constrain.hpp b/stan/math/opencl/prim/constraint/lub_constrain.hpp
index a5fa4c6e2ea..364c20bed80 100644
--- a/stan/math/opencl/prim/constraint/lub_constrain.hpp
+++ b/stan/math/opencl/prim/constraint/lub_constrain.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_CONSTRAINT_LUB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/constraint/offset_multiplier_constrain.hpp b/stan/math/opencl/prim/constraint/offset_multiplier_constrain.hpp
index 481287f6457..9b1c8c1a27f 100644
--- a/stan/math/opencl/prim/constraint/offset_multiplier_constrain.hpp
+++ b/stan/math/opencl/prim/constraint/offset_multiplier_constrain.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_CONSTRAINT_OFFSET_MULTIPLIER_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 
diff --git a/stan/math/opencl/prim/constraint/ub_constrain.hpp b/stan/math/opencl/prim/constraint/ub_constrain.hpp
index 846ef298cfd..4770ea8945c 100644
--- a/stan/math/opencl/prim/constraint/ub_constrain.hpp
+++ b/stan/math/opencl/prim/constraint/ub_constrain.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_CONSTRAINT_UB_CONSTRAIN_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/cumulative_sum.hpp b/stan/math/opencl/prim/cumulative_sum.hpp
index 45e21c01d37..1308d75e2bc 100644
--- a/stan/math/opencl/prim/cumulative_sum.hpp
+++ b/stan/math/opencl/prim/cumulative_sum.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_OPENCL_PRIM_CUMULATIVE_SUM_HPP
 #define STAN_MATH_OPENCL_PRIM_CUMULATIVE_SUM_HPP
 #ifdef STAN_OPENCL
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/opencl/kernels/cumulative_sum.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/opencl/prim/diag_matrix.hpp b/stan/math/opencl/prim/diag_matrix.hpp
index fe2189ea925..3396258f8c6 100644
--- a/stan/math/opencl/prim/diag_matrix.hpp
+++ b/stan/math/opencl/prim/diag_matrix.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/add_diag.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/dirichlet_lpdf.hpp b/stan/math/opencl/prim/dirichlet_lpdf.hpp
index 2fde1414a78..814890e361e 100644
--- a/stan/math/opencl/prim/dirichlet_lpdf.hpp
+++ b/stan/math/opencl/prim/dirichlet_lpdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
diff --git a/stan/math/opencl/prim/distance.hpp b/stan/math/opencl/prim/distance.hpp
index 2006220b276..d1bf83280ec 100644
--- a/stan/math/opencl/prim/distance.hpp
+++ b/stan/math/opencl/prim/distance.hpp
@@ -3,14 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/err.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/squared_distance.hpp>
-#include <stan/math/opencl/scalar_type.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <algorithm>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/dot_product.hpp b/stan/math/opencl/prim/dot_product.hpp
index 999f047644f..bb4583bf10a 100644
--- a/stan/math/opencl/prim/dot_product.hpp
+++ b/stan/math/opencl/prim/dot_product.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_vector.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/dot_self.hpp b/stan/math/opencl/prim/dot_self.hpp
index 9d2c0232e57..cbef22a6a65 100644
--- a/stan/math/opencl/prim/dot_self.hpp
+++ b/stan/math/opencl/prim/dot_self.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/double_exponential_cdf.hpp b/stan/math/opencl/prim/double_exponential_cdf.hpp
index 7428963c418..c9d8c8249e3 100644
--- a/stan/math/opencl/prim/double_exponential_cdf.hpp
+++ b/stan/math/opencl/prim/double_exponential_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp b/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp
index 14f67b9e5f3..59fc695aa54 100644
--- a/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp
+++ b/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/std_normal_lcdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/exponential_cdf.hpp b/stan/math/opencl/prim/exponential_cdf.hpp
index aa150618fde..c122f5c92a1 100644
--- a/stan/math/opencl/prim/exponential_cdf.hpp
+++ b/stan/math/opencl/prim/exponential_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/exponential_lccdf.hpp b/stan/math/opencl/prim/exponential_lccdf.hpp
index fe612a2792d..9a075e70b6b 100644
--- a/stan/math/opencl/prim/exponential_lccdf.hpp
+++ b/stan/math/opencl/prim/exponential_lccdf.hpp
@@ -4,8 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
diff --git a/stan/math/opencl/prim/exponential_lcdf.hpp b/stan/math/opencl/prim/exponential_lcdf.hpp
index b598b78276e..e0307d29ac0 100644
--- a/stan/math/opencl/prim/exponential_lcdf.hpp
+++ b/stan/math/opencl/prim/exponential_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/exponential_lpdf.hpp b/stan/math/opencl/prim/exponential_lpdf.hpp
index f20517ee955..bca302f68ca 100644
--- a/stan/math/opencl/prim/exponential_lpdf.hpp
+++ b/stan/math/opencl/prim/exponential_lpdf.hpp
@@ -3,11 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/frechet_cdf.hpp b/stan/math/opencl/prim/frechet_cdf.hpp
index 8c422aebb3e..099c2d24ce1 100644
--- a/stan/math/opencl/prim/frechet_cdf.hpp
+++ b/stan/math/opencl/prim/frechet_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/frechet_lccdf.hpp b/stan/math/opencl/prim/frechet_lccdf.hpp
index 7942d421675..961d31fcee2 100644
--- a/stan/math/opencl/prim/frechet_lccdf.hpp
+++ b/stan/math/opencl/prim/frechet_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/frechet_lcdf.hpp b/stan/math/opencl/prim/frechet_lcdf.hpp
index b162e27f864..8824724c80d 100644
--- a/stan/math/opencl/prim/frechet_lcdf.hpp
+++ b/stan/math/opencl/prim/frechet_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/frechet_lpdf.hpp b/stan/math/opencl/prim/frechet_lpdf.hpp
index 608882cbd60..bb0ecb56690 100644
--- a/stan/math/opencl/prim/frechet_lpdf.hpp
+++ b/stan/math/opencl/prim/frechet_lpdf.hpp
@@ -3,11 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/gamma_lpdf.hpp b/stan/math/opencl/prim/gamma_lpdf.hpp
index 35af358c658..cbc74b9d2af 100644
--- a/stan/math/opencl/prim/gamma_lpdf.hpp
+++ b/stan/math/opencl/prim/gamma_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/gp_exponential_cov.hpp b/stan/math/opencl/prim/gp_exponential_cov.hpp
index 8ed99d235d5..5998ca82478 100644
--- a/stan/math/opencl/prim/gp_exponential_cov.hpp
+++ b/stan/math/opencl/prim/gp_exponential_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/square.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernels/gp_exponential_cov.hpp>
 #include <stan/math/opencl/err.hpp>
diff --git a/stan/math/opencl/prim/gp_matern32_cov.hpp b/stan/math/opencl/prim/gp_matern32_cov.hpp
index 1e44c98da53..a56be8d8a70 100644
--- a/stan/math/opencl/prim/gp_matern32_cov.hpp
+++ b/stan/math/opencl/prim/gp_matern32_cov.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/square.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernels/gp_matern32_cov.hpp>
 #include <stan/math/opencl/err.hpp>
diff --git a/stan/math/opencl/prim/gumbel_cdf.hpp b/stan/math/opencl/prim/gumbel_cdf.hpp
index bd055acc488..9710c248a4c 100644
--- a/stan/math/opencl/prim/gumbel_cdf.hpp
+++ b/stan/math/opencl/prim/gumbel_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/gumbel_lccdf.hpp b/stan/math/opencl/prim/gumbel_lccdf.hpp
index 002805c6037..625176a137f 100644
--- a/stan/math/opencl/prim/gumbel_lccdf.hpp
+++ b/stan/math/opencl/prim/gumbel_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/gumbel_lcdf.hpp b/stan/math/opencl/prim/gumbel_lcdf.hpp
index 0d7418f252f..fb8c1e6e6c2 100644
--- a/stan/math/opencl/prim/gumbel_lcdf.hpp
+++ b/stan/math/opencl/prim/gumbel_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/gumbel_lpdf.hpp b/stan/math/opencl/prim/gumbel_lpdf.hpp
index abf6e5cf87b..965b80735dd 100644
--- a/stan/math/opencl/prim/gumbel_lpdf.hpp
+++ b/stan/math/opencl/prim/gumbel_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
diff --git a/stan/math/opencl/prim/inv.hpp b/stan/math/opencl/prim/inv.hpp
index cd04932bb60..c00cbfd0586 100644
--- a/stan/math/opencl/prim/inv.hpp
+++ b/stan/math/opencl/prim/inv.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/inv_chi_square_lpdf.hpp b/stan/math/opencl/prim/inv_chi_square_lpdf.hpp
index f58d52891c6..525698664fd 100644
--- a/stan/math/opencl/prim/inv_chi_square_lpdf.hpp
+++ b/stan/math/opencl/prim/inv_chi_square_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/inv_cloglog.hpp b/stan/math/opencl/prim/inv_cloglog.hpp
index b7d3a9a5a24..b867b6be1d0 100644
--- a/stan/math/opencl/prim/inv_cloglog.hpp
+++ b/stan/math/opencl/prim/inv_cloglog.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/inv_gamma_lpdf.hpp b/stan/math/opencl/prim/inv_gamma_lpdf.hpp
index d678c8dba58..b39a11a1bb6 100644
--- a/stan/math/opencl/prim/inv_gamma_lpdf.hpp
+++ b/stan/math/opencl/prim/inv_gamma_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/log_softmax.hpp b/stan/math/opencl/prim/log_softmax.hpp
index 32a961e9517..abde82eaf04 100644
--- a/stan/math/opencl/prim/log_softmax.hpp
+++ b/stan/math/opencl/prim/log_softmax.hpp
@@ -3,9 +3,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/log_sum_exp.hpp>
-#include <stan/math/opencl/ref_type.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/log_sum_exp.hpp b/stan/math/opencl/prim/log_sum_exp.hpp
index 49a5e376c48..a07a22908e9 100644
--- a/stan/math/opencl/prim/log_sum_exp.hpp
+++ b/stan/math/opencl/prim/log_sum_exp.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/ref_type.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/logistic_lpdf.hpp b/stan/math/opencl/prim/logistic_lpdf.hpp
index cfcfb2b5ba7..a4ee62c8e1d 100644
--- a/stan/math/opencl/prim/logistic_lpdf.hpp
+++ b/stan/math/opencl/prim/logistic_lpdf.hpp
@@ -3,12 +3,9 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <stan/math/prim/fun/exp.hpp>
diff --git a/stan/math/opencl/prim/lognormal_lpdf.hpp b/stan/math/opencl/prim/lognormal_lpdf.hpp
index 4b06ed80871..39a6bcd63b6 100644
--- a/stan/math/opencl/prim/lognormal_lpdf.hpp
+++ b/stan/math/opencl/prim/lognormal_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/opencl/prim/mean.hpp b/stan/math/opencl/prim/mean.hpp
index d06b439a05d..fad6cfa7c07 100644
--- a/stan/math/opencl/prim/mean.hpp
+++ b/stan/math/opencl/prim/mean.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_MEAN_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/sum.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/multi_normal_cholesky_lpdf.hpp b/stan/math/opencl/prim/multi_normal_cholesky_lpdf.hpp
index 996b31fb633..216ec8cceeb 100644
--- a/stan/math/opencl/prim/multi_normal_cholesky_lpdf.hpp
+++ b/stan/math/opencl/prim/multi_normal_cholesky_lpdf.hpp
@@ -8,10 +8,7 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
-#include <stan/math/prim/err/constraint_tolerance.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/multiply.hpp b/stan/math/opencl/prim/multiply.hpp
index 5198266f806..03aa94acc9d 100644
--- a/stan/math/opencl/prim/multiply.hpp
+++ b/stan/math/opencl/prim/multiply.hpp
@@ -7,8 +7,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/kernels/matrix_multiply.hpp>
 #include <stan/math/opencl/kernels/add.hpp>
-#include <stan/math/opencl/scalar_type.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <algorithm>
 
diff --git a/stan/math/opencl/prim/neg_binomial_2_log_glm_lpmf.hpp b/stan/math/opencl/prim/neg_binomial_2_log_glm_lpmf.hpp
index 7ee8051b17e..2e00c9dd0e2 100644
--- a/stan/math/opencl/prim/neg_binomial_2_log_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/neg_binomial_2_log_glm_lpmf.hpp
@@ -6,21 +6,15 @@
 #include <stan/math/opencl/rev/operands_and_partials.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/prim/multiply.hpp>
-#include <stan/math/opencl/plain_type.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/kernels/neg_binomial_2_log_glm_lpmf.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/eval.hpp>
-#include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/neg_binomial_2_log_lpmf.hpp b/stan/math/opencl/prim/neg_binomial_2_log_lpmf.hpp
index 2e5554f3d7f..6cb5f3f475c 100644
--- a/stan/math/opencl/prim/neg_binomial_2_log_lpmf.hpp
+++ b/stan/math/opencl/prim/neg_binomial_2_log_lpmf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/prim/fun/exp.hpp>
diff --git a/stan/math/opencl/prim/neg_binomial_2_lpmf.hpp b/stan/math/opencl/prim/neg_binomial_2_lpmf.hpp
index 9dc4eb9a774..152601a8724 100644
--- a/stan/math/opencl/prim/neg_binomial_2_lpmf.hpp
+++ b/stan/math/opencl/prim/neg_binomial_2_lpmf.hpp
@@ -4,10 +4,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
diff --git a/stan/math/opencl/prim/neg_binomial_lpmf.hpp b/stan/math/opencl/prim/neg_binomial_lpmf.hpp
index 6df44dfb881..aab78754f0b 100644
--- a/stan/math/opencl/prim/neg_binomial_lpmf.hpp
+++ b/stan/math/opencl/prim/neg_binomial_lpmf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/normal_id_glm_lpdf.hpp b/stan/math/opencl/prim/normal_id_glm_lpdf.hpp
index 37380ec370e..8eeecc78ddb 100644
--- a/stan/math/opencl/prim/normal_id_glm_lpdf.hpp
+++ b/stan/math/opencl/prim/normal_id_glm_lpdf.hpp
@@ -13,10 +13,7 @@
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/prob/normal_id_glm_lpdf.hpp>
 #include <cmath>
 
diff --git a/stan/math/opencl/prim/ordered_logistic_glm_lpmf.hpp b/stan/math/opencl/prim/ordered_logistic_glm_lpmf.hpp
index e53124a4e1b..e3833fd5e21 100644
--- a/stan/math/opencl/prim/ordered_logistic_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/ordered_logistic_glm_lpmf.hpp
@@ -12,12 +12,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/log1m_exp.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/ordered_logistic_lpmf.hpp b/stan/math/opencl/prim/ordered_logistic_lpmf.hpp
index 1b39ef317b7..e9524738320 100644
--- a/stan/math/opencl/prim/ordered_logistic_lpmf.hpp
+++ b/stan/math/opencl/prim/ordered_logistic_lpmf.hpp
@@ -3,15 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/kernels/add.hpp>
 #include <stan/math/opencl/kernels/ordered_logistic_lpmf.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
-#include <stan/math/prim/err/constraint_tolerance.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/pareto_type_2_cdf.hpp b/stan/math/opencl/prim/pareto_type_2_cdf.hpp
index f04b8254eaa..d6868774ab3 100644
--- a/stan/math/opencl/prim/pareto_type_2_cdf.hpp
+++ b/stan/math/opencl/prim/pareto_type_2_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/pareto_type_2_lccdf.hpp b/stan/math/opencl/prim/pareto_type_2_lccdf.hpp
index a2cd0de0d69..edbd7c70366 100644
--- a/stan/math/opencl/prim/pareto_type_2_lccdf.hpp
+++ b/stan/math/opencl/prim/pareto_type_2_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/pareto_type_2_lcdf.hpp b/stan/math/opencl/prim/pareto_type_2_lcdf.hpp
index e19bfdf214f..f6ddbc2d3ac 100644
--- a/stan/math/opencl/prim/pareto_type_2_lcdf.hpp
+++ b/stan/math/opencl/prim/pareto_type_2_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/pareto_type_2_lpdf.hpp b/stan/math/opencl/prim/pareto_type_2_lpdf.hpp
index ea887504b24..d158dd14bb7 100644
--- a/stan/math/opencl/prim/pareto_type_2_lpdf.hpp
+++ b/stan/math/opencl/prim/pareto_type_2_lpdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/poisson_log_glm_lpmf.hpp b/stan/math/opencl/prim/poisson_log_glm_lpmf.hpp
index d632f6a59d5..fcca81843b7 100644
--- a/stan/math/opencl/prim/poisson_log_glm_lpmf.hpp
+++ b/stan/math/opencl/prim/poisson_log_glm_lpmf.hpp
@@ -12,11 +12,8 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/poisson_log_lpmf.hpp b/stan/math/opencl/prim/poisson_log_lpmf.hpp
index d8315283b15..1cde52ee1c8 100644
--- a/stan/math/opencl/prim/poisson_log_lpmf.hpp
+++ b/stan/math/opencl/prim/poisson_log_lpmf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/poisson_lpmf.hpp b/stan/math/opencl/prim/poisson_lpmf.hpp
index 4d1644f1204..aca18b8eb08 100644
--- a/stan/math/opencl/prim/poisson_lpmf.hpp
+++ b/stan/math/opencl/prim/poisson_lpmf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/rayleigh_cdf.hpp b/stan/math/opencl/prim/rayleigh_cdf.hpp
index 7a91b7000e5..b0c0f8ad074 100644
--- a/stan/math/opencl/prim/rayleigh_cdf.hpp
+++ b/stan/math/opencl/prim/rayleigh_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/rayleigh_lccdf.hpp b/stan/math/opencl/prim/rayleigh_lccdf.hpp
index ace88bd71d5..57e0a80caec 100644
--- a/stan/math/opencl/prim/rayleigh_lccdf.hpp
+++ b/stan/math/opencl/prim/rayleigh_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/rayleigh_lcdf.hpp b/stan/math/opencl/prim/rayleigh_lcdf.hpp
index 0d8f881fdcf..d29773a5426 100644
--- a/stan/math/opencl/prim/rayleigh_lcdf.hpp
+++ b/stan/math/opencl/prim/rayleigh_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/rayleigh_lpdf.hpp b/stan/math/opencl/prim/rayleigh_lpdf.hpp
index cea9523ff4c..31e3103f8b8 100644
--- a/stan/math/opencl/prim/rayleigh_lpdf.hpp
+++ b/stan/math/opencl/prim/rayleigh_lpdf.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/size.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
diff --git a/stan/math/opencl/prim/rep_array.hpp b/stan/math/opencl/prim/rep_array.hpp
index a7b9db7fc90..86b380aa128 100644
--- a/stan/math/opencl/prim/rep_array.hpp
+++ b/stan/math/opencl/prim/rep_array.hpp
@@ -3,8 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/rep_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/rep_row_vector.hpp b/stan/math/opencl/prim/rep_row_vector.hpp
index 118eebf7371..159c984053f 100644
--- a/stan/math/opencl/prim/rep_row_vector.hpp
+++ b/stan/math/opencl/prim/rep_row_vector.hpp
@@ -3,8 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/rep_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/rep_vector.hpp b/stan/math/opencl/prim/rep_vector.hpp
index bd62290e6ee..88c31fcecdb 100644
--- a/stan/math/opencl/prim/rep_vector.hpp
+++ b/stan/math/opencl/prim/rep_vector.hpp
@@ -3,8 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/rep_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/rows_dot_product.hpp b/stan/math/opencl/prim/rows_dot_product.hpp
index dc34786a69d..0f98040b9ea 100644
--- a/stan/math/opencl/prim/rows_dot_product.hpp
+++ b/stan/math/opencl/prim/rows_dot_product.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_OPENCL_PRIM_ROWS_DOT_PRODUCT_HPP
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_vector.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/rows_dot_self.hpp b/stan/math/opencl/prim/rows_dot_self.hpp
index 43596bf2b7b..84d9717a4dd 100644
--- a/stan/math/opencl/prim/rows_dot_self.hpp
+++ b/stan/math/opencl/prim/rows_dot_self.hpp
@@ -2,10 +2,7 @@
 #define STAN_MATH_OPENCL_PRIM_ROWS_DOT_SELF_HPP
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_vector.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/sd.hpp b/stan/math/opencl/prim/sd.hpp
index 0d4c7df50bf..892f3359c87 100644
--- a/stan/math/opencl/prim/sd.hpp
+++ b/stan/math/opencl/prim/sd.hpp
@@ -3,10 +3,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/variance.hpp>
-#include <stan/math/opencl/ref_type.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/segment.hpp b/stan/math/opencl/prim/segment.hpp
index e35a781f5f2..d73843ce9f1 100644
--- a/stan/math/opencl/prim/segment.hpp
+++ b/stan/math/opencl/prim/segment.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/err.hpp>
 #include <stan/math/opencl/prim/block.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/skew_double_exponential_cdf.hpp b/stan/math/opencl/prim/skew_double_exponential_cdf.hpp
index f7dc0489b80..aeeedaed320 100644
--- a/stan/math/opencl/prim/skew_double_exponential_cdf.hpp
+++ b/stan/math/opencl/prim/skew_double_exponential_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/skew_double_exponential_lccdf.hpp b/stan/math/opencl/prim/skew_double_exponential_lccdf.hpp
index e4c7452a2cf..b4d1d182b9a 100644
--- a/stan/math/opencl/prim/skew_double_exponential_lccdf.hpp
+++ b/stan/math/opencl/prim/skew_double_exponential_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/skew_double_exponential_lcdf.hpp b/stan/math/opencl/prim/skew_double_exponential_lcdf.hpp
index 54b316657a6..732ed2b6fa2 100644
--- a/stan/math/opencl/prim/skew_double_exponential_lcdf.hpp
+++ b/stan/math/opencl/prim/skew_double_exponential_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/softmax.hpp b/stan/math/opencl/prim/softmax.hpp
index 7f34ac4fbea..91b1a4109a8 100644
--- a/stan/math/opencl/prim/softmax.hpp
+++ b/stan/math/opencl/prim/softmax.hpp
@@ -5,9 +5,6 @@
 #include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/ref_type.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/sort_asc.hpp b/stan/math/opencl/prim/sort_asc.hpp
index 2961030d150..ba452824a5e 100644
--- a/stan/math/opencl/prim/sort_asc.hpp
+++ b/stan/math/opencl/prim/sort_asc.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/kernels/mergesort.hpp>
 #include <algorithm>
 
-#include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/sort_desc.hpp b/stan/math/opencl/prim/sort_desc.hpp
index 2335f3eb3ee..df7ad58d580 100644
--- a/stan/math/opencl/prim/sort_desc.hpp
+++ b/stan/math/opencl/prim/sort_desc.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/kernels/mergesort.hpp>
 #include <algorithm>
 
-#include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/squared_distance.hpp b/stan/math/opencl/prim/squared_distance.hpp
index dce8e44148a..1ea4f346919 100644
--- a/stan/math/opencl/prim/squared_distance.hpp
+++ b/stan/math/opencl/prim/squared_distance.hpp
@@ -3,12 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/err.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/scalar_type.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <algorithm>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/std_normal_cdf.hpp b/stan/math/opencl/prim/std_normal_cdf.hpp
index 5a0cd0c1316..b5a368261e7 100644
--- a/stan/math/opencl/prim/std_normal_cdf.hpp
+++ b/stan/math/opencl/prim/std_normal_cdf.hpp
@@ -3,10 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/std_normal_lcdf.hpp b/stan/math/opencl/prim/std_normal_lcdf.hpp
index 463b59b6f49..b29429696f4 100644
--- a/stan/math/opencl/prim/std_normal_lcdf.hpp
+++ b/stan/math/opencl/prim/std_normal_lcdf.hpp
@@ -3,12 +3,8 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/kernels/device_functions/std_normal_lcdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/std_normal_lpdf.hpp b/stan/math/opencl/prim/std_normal_lpdf.hpp
index e2278d53e65..06c17118dec 100644
--- a/stan/math/opencl/prim/std_normal_lpdf.hpp
+++ b/stan/math/opencl/prim/std_normal_lpdf.hpp
@@ -3,9 +3,7 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
diff --git a/stan/math/opencl/prim/tcrossprod.hpp b/stan/math/opencl/prim/tcrossprod.hpp
index 0e3b5c2c677..628050e3fc2 100644
--- a/stan/math/opencl/prim/tcrossprod.hpp
+++ b/stan/math/opencl/prim/tcrossprod.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/multiply.hpp>
-#include <stan/math/opencl/kernel_generator.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/to_array_1d.hpp b/stan/math/opencl/prim/to_array_1d.hpp
index 87b7c3ec345..b7665a8388a 100644
--- a/stan/math/opencl/prim/to_array_1d.hpp
+++ b/stan/math/opencl/prim/to_array_1d.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_TO_ARRAY_1D_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/to_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/to_row_vector.hpp b/stan/math/opencl/prim/to_row_vector.hpp
index 8ef4286aace..328a903cc8d 100644
--- a/stan/math/opencl/prim/to_row_vector.hpp
+++ b/stan/math/opencl/prim/to_row_vector.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_TO_ROW_VECTOR_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/to_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/to_vector.hpp b/stan/math/opencl/prim/to_vector.hpp
index a52b2aa2288..476bb4bf993 100644
--- a/stan/math/opencl/prim/to_vector.hpp
+++ b/stan/math/opencl/prim/to_vector.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_PRIM_TO_VECTOR_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/prim/to_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/prim/uniform_cdf.hpp b/stan/math/opencl/prim/uniform_cdf.hpp
index a5c99c28820..b997615babd 100644
--- a/stan/math/opencl/prim/uniform_cdf.hpp
+++ b/stan/math/opencl/prim/uniform_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/uniform_lccdf.hpp b/stan/math/opencl/prim/uniform_lccdf.hpp
index 19a62e4e90e..e7b6d4c7927 100644
--- a/stan/math/opencl/prim/uniform_lccdf.hpp
+++ b/stan/math/opencl/prim/uniform_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/uniform_lcdf.hpp b/stan/math/opencl/prim/uniform_lcdf.hpp
index 7dfc44ae79f..6c2754c91d4 100644
--- a/stan/math/opencl/prim/uniform_lcdf.hpp
+++ b/stan/math/opencl/prim/uniform_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/uniform_lpdf.hpp b/stan/math/opencl/prim/uniform_lpdf.hpp
index caab6f55c98..f12fc94a099 100644
--- a/stan/math/opencl/prim/uniform_lpdf.hpp
+++ b/stan/math/opencl/prim/uniform_lpdf.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/opencl/prim/variance.hpp b/stan/math/opencl/prim/variance.hpp
index c1252b0b4c8..8d5304f6fdf 100644
--- a/stan/math/opencl/prim/variance.hpp
+++ b/stan/math/opencl/prim/variance.hpp
@@ -2,12 +2,9 @@
 #define STAN_MATH_OPENCL_PRIM_VARIANCE_HPP
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/log_sum_exp.hpp>
 #include <stan/math/opencl/prim/mean.hpp>
 #include <stan/math/opencl/ref_type.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/prim/weibull_cdf.hpp b/stan/math/opencl/prim/weibull_cdf.hpp
index 2788ed8842e..3eace60d83d 100644
--- a/stan/math/opencl/prim/weibull_cdf.hpp
+++ b/stan/math/opencl/prim/weibull_cdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/weibull_lccdf.hpp b/stan/math/opencl/prim/weibull_lccdf.hpp
index 8a0563490f7..ca098accae5 100644
--- a/stan/math/opencl/prim/weibull_lccdf.hpp
+++ b/stan/math/opencl/prim/weibull_lccdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/prim/weibull_lcdf.hpp b/stan/math/opencl/prim/weibull_lcdf.hpp
index f805f7579ed..e7c1f5b382a 100644
--- a/stan/math/opencl/prim/weibull_lcdf.hpp
+++ b/stan/math/opencl/prim/weibull_lcdf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
diff --git a/stan/math/opencl/qr_decomposition.hpp b/stan/math/opencl/qr_decomposition.hpp
index fd68adb2e9f..c1387db310e 100644
--- a/stan/math/opencl/qr_decomposition.hpp
+++ b/stan/math/opencl/qr_decomposition.hpp
@@ -4,15 +4,11 @@
 
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/zeros_strict_tri.hpp>
 #include <stan/math/opencl/prim/identity_matrix.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/multiply.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <CL/opencl.hpp>
 #include <algorithm>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/Phi.hpp b/stan/math/opencl/rev/Phi.hpp
index 8ef3365f50b..81c97f3c05a 100644
--- a/stan/math/opencl/rev/Phi.hpp
+++ b/stan/math/opencl/rev/Phi.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/Phi_approx.hpp b/stan/math/opencl/rev/Phi_approx.hpp
index 4653b7e542f..9e1e9c32a40 100644
--- a/stan/math/opencl/rev/Phi_approx.hpp
+++ b/stan/math/opencl/rev/Phi_approx.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/acos.hpp b/stan/math/opencl/rev/acos.hpp
index e9f0a0bad44..228f783ac60 100644
--- a/stan/math/opencl/rev/acos.hpp
+++ b/stan/math/opencl/rev/acos.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/acosh.hpp b/stan/math/opencl/rev/acosh.hpp
index 16824a39d69..082f228a720 100644
--- a/stan/math/opencl/rev/acosh.hpp
+++ b/stan/math/opencl/rev/acosh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/add.hpp b/stan/math/opencl/rev/add.hpp
index 1f297503a98..0c0c1deebc6 100644
--- a/stan/math/opencl/rev/add.hpp
+++ b/stan/math/opencl/rev/add.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/add_diag.hpp b/stan/math/opencl/rev/add_diag.hpp
index 00f4d7ca7a9..d3b144bad6a 100644
--- a/stan/math/opencl/rev/add_diag.hpp
+++ b/stan/math/opencl/rev/add_diag.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/append_col.hpp b/stan/math/opencl/rev/append_col.hpp
index 44d735e6e4f..242d92591af 100644
--- a/stan/math/opencl/rev/append_col.hpp
+++ b/stan/math/opencl/rev/append_col.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/append_row.hpp b/stan/math/opencl/rev/append_row.hpp
index 19a418ead62..0e55152e42e 100644
--- a/stan/math/opencl/rev/append_row.hpp
+++ b/stan/math/opencl/rev/append_row.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/arena_type.hpp b/stan/math/opencl/rev/arena_type.hpp
index 923e7515dea..dd044d929f6 100644
--- a/stan/math/opencl/rev/arena_type.hpp
+++ b/stan/math/opencl/rev/arena_type.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/rev/meta/arena_type.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 #include <stan/math/opencl/rev/arena_matrix_cl.hpp>
 
diff --git a/stan/math/opencl/rev/as_column_vector_or_scalar.hpp b/stan/math/opencl/rev/as_column_vector_or_scalar.hpp
index ef471770ed2..df4a66b1ecf 100644
--- a/stan/math/opencl/rev/as_column_vector_or_scalar.hpp
+++ b/stan/math/opencl/rev/as_column_vector_or_scalar.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/asin.hpp b/stan/math/opencl/rev/asin.hpp
index ad9dee407eb..67366495a02 100644
--- a/stan/math/opencl/rev/asin.hpp
+++ b/stan/math/opencl/rev/asin.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/asinh.hpp b/stan/math/opencl/rev/asinh.hpp
index c9259d14b19..124af0cd349 100644
--- a/stan/math/opencl/rev/asinh.hpp
+++ b/stan/math/opencl/rev/asinh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/atan.hpp b/stan/math/opencl/rev/atan.hpp
index db22f676181..fff4d015743 100644
--- a/stan/math/opencl/rev/atan.hpp
+++ b/stan/math/opencl/rev/atan.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/atanh.hpp b/stan/math/opencl/rev/atanh.hpp
index 94d47d086c2..9aa1becfffb 100644
--- a/stan/math/opencl/rev/atanh.hpp
+++ b/stan/math/opencl/rev/atanh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/block.hpp b/stan/math/opencl/rev/block.hpp
index 57010ca9dfd..5b1fa1fd89d 100644
--- a/stan/math/opencl/rev/block.hpp
+++ b/stan/math/opencl/rev/block.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/block.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/cbrt.hpp b/stan/math/opencl/rev/cbrt.hpp
index 73f01da1b4d..ed073704ee4 100644
--- a/stan/math/opencl/rev/cbrt.hpp
+++ b/stan/math/opencl/rev/cbrt.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/ceil.hpp b/stan/math/opencl/rev/ceil.hpp
index bb8fc2b7866..d8b412719de 100644
--- a/stan/math/opencl/rev/ceil.hpp
+++ b/stan/math/opencl/rev/ceil.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/cholesky_decompose.hpp b/stan/math/opencl/rev/cholesky_decompose.hpp
index 201bc4e3c8a..17f2077b435 100644
--- a/stan/math/opencl/rev/cholesky_decompose.hpp
+++ b/stan/math/opencl/rev/cholesky_decompose.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/prim/symmetrize_from_lower_tri.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/columns_dot_product.hpp b/stan/math/opencl/rev/columns_dot_product.hpp
index 4f43960a4e8..5a2b871537b 100644
--- a/stan/math/opencl/rev/columns_dot_product.hpp
+++ b/stan/math/opencl/rev/columns_dot_product.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 
diff --git a/stan/math/opencl/rev/columns_dot_self.hpp b/stan/math/opencl/rev/columns_dot_self.hpp
index 257e13e0c14..40c2609aff2 100644
--- a/stan/math/opencl/rev/columns_dot_self.hpp
+++ b/stan/math/opencl/rev/columns_dot_self.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 
diff --git a/stan/math/opencl/rev/constraint/lb_constrain.hpp b/stan/math/opencl/rev/constraint/lb_constrain.hpp
index 012d81a8bde..123dd906d22 100644
--- a/stan/math/opencl/rev/constraint/lb_constrain.hpp
+++ b/stan/math/opencl/rev/constraint/lb_constrain.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
diff --git a/stan/math/opencl/rev/constraint/lub_constrain.hpp b/stan/math/opencl/rev/constraint/lub_constrain.hpp
index 9fae858693d..b9aaa306f3a 100644
--- a/stan/math/opencl/rev/constraint/lub_constrain.hpp
+++ b/stan/math/opencl/rev/constraint/lub_constrain.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
diff --git a/stan/math/opencl/rev/constraint/ub_constrain.hpp b/stan/math/opencl/rev/constraint/ub_constrain.hpp
index c8748447593..4827d6a346b 100644
--- a/stan/math/opencl/rev/constraint/ub_constrain.hpp
+++ b/stan/math/opencl/rev/constraint/ub_constrain.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
diff --git a/stan/math/opencl/rev/constraint/unit_vector_constrain.hpp b/stan/math/opencl/rev/constraint/unit_vector_constrain.hpp
index 968005880fa..19191938f7f 100644
--- a/stan/math/opencl/rev/constraint/unit_vector_constrain.hpp
+++ b/stan/math/opencl/rev/constraint/unit_vector_constrain.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/copy.hpp b/stan/math/opencl/rev/copy.hpp
index 50201e3e565..e41c728aa9c 100644
--- a/stan/math/opencl/rev/copy.hpp
+++ b/stan/math/opencl/rev/copy.hpp
@@ -2,21 +2,14 @@
 #define STAN_MATH_OPENCL_REV_COPY_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/rev/vari.hpp>
-#include <stan/math/opencl/rev/arena_type.hpp>
 #include <stan/math/opencl/rev/to_arena.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/vec_concat.hpp>
 
-#include <CL/opencl.hpp>
-#include <iostream>
 #include <vector>
-#include <algorithm>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/cos.hpp b/stan/math/opencl/rev/cos.hpp
index 1e09db683da..7a89d9797aa 100644
--- a/stan/math/opencl/rev/cos.hpp
+++ b/stan/math/opencl/rev/cos.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/cosh.hpp b/stan/math/opencl/rev/cosh.hpp
index 4abf3b1bf9d..0932f09e17d 100644
--- a/stan/math/opencl/rev/cosh.hpp
+++ b/stan/math/opencl/rev/cosh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/cumulative_sum.hpp b/stan/math/opencl/rev/cumulative_sum.hpp
index a9a4112bc76..ab125e48565 100644
--- a/stan/math/opencl/rev/cumulative_sum.hpp
+++ b/stan/math/opencl/rev/cumulative_sum.hpp
@@ -3,9 +3,7 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/prim/cumulative_sum.hpp>
-#include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/diag_post_multiply.hpp b/stan/math/opencl/rev/diag_post_multiply.hpp
index 3a1ac6e2b37..7d7c4d4b20b 100644
--- a/stan/math/opencl/rev/diag_post_multiply.hpp
+++ b/stan/math/opencl/rev/diag_post_multiply.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/eval.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/diag_pre_multiply.hpp b/stan/math/opencl/rev/diag_pre_multiply.hpp
index 212ff3828f5..8ed63bac20c 100644
--- a/stan/math/opencl/rev/diag_pre_multiply.hpp
+++ b/stan/math/opencl/rev/diag_pre_multiply.hpp
@@ -6,8 +6,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/eval.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/diagonal.hpp b/stan/math/opencl/rev/diagonal.hpp
index 0ebbffd21ac..538208c0fba 100644
--- a/stan/math/opencl/rev/diagonal.hpp
+++ b/stan/math/opencl/rev/diagonal.hpp
@@ -3,7 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/diag_matrix.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/digamma.hpp b/stan/math/opencl/rev/digamma.hpp
index a41e2817acb..5b599270cc9 100644
--- a/stan/math/opencl/rev/digamma.hpp
+++ b/stan/math/opencl/rev/digamma.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/divide.hpp b/stan/math/opencl/rev/divide.hpp
index 17c572208e5..6ebc45b33be 100644
--- a/stan/math/opencl/rev/divide.hpp
+++ b/stan/math/opencl/rev/divide.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/dot_product.hpp b/stan/math/opencl/rev/dot_product.hpp
index 7386f809799..6d98044021a 100644
--- a/stan/math/opencl/rev/dot_product.hpp
+++ b/stan/math/opencl/rev/dot_product.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/dot_self.hpp b/stan/math/opencl/rev/dot_self.hpp
index 17daf037325..adb736a82ba 100644
--- a/stan/math/opencl/rev/dot_self.hpp
+++ b/stan/math/opencl/rev/dot_self.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_OPENCL_REV_DOT_SELF_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/dot_self.hpp>
 #include <stan/math/rev/core.hpp>
 
diff --git a/stan/math/opencl/rev/elt_divide.hpp b/stan/math/opencl/rev/elt_divide.hpp
index 3b7cd4d0df8..578409aca13 100644
--- a/stan/math/opencl/rev/elt_divide.hpp
+++ b/stan/math/opencl/rev/elt_divide.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/elt_multiply.hpp b/stan/math/opencl/rev/elt_multiply.hpp
index 296e289def4..800a6def3e7 100644
--- a/stan/math/opencl/rev/elt_multiply.hpp
+++ b/stan/math/opencl/rev/elt_multiply.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/erf.hpp b/stan/math/opencl/rev/erf.hpp
index da4afd44b27..51287ae2021 100644
--- a/stan/math/opencl/rev/erf.hpp
+++ b/stan/math/opencl/rev/erf.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/erfc.hpp b/stan/math/opencl/rev/erfc.hpp
index 2b3cd0f5a43..99f5e19001f 100644
--- a/stan/math/opencl/rev/erfc.hpp
+++ b/stan/math/opencl/rev/erfc.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/erfcx.hpp b/stan/math/opencl/rev/erfcx.hpp
index e5fdfeb097a..17a9490a391 100644
--- a/stan/math/opencl/rev/erfcx.hpp
+++ b/stan/math/opencl/rev/erfcx.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/exp.hpp b/stan/math/opencl/rev/exp.hpp
index 61b899417bf..5d580e7054d 100644
--- a/stan/math/opencl/rev/exp.hpp
+++ b/stan/math/opencl/rev/exp.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/exp2.hpp b/stan/math/opencl/rev/exp2.hpp
index 1a6a683529e..6e438b25148 100644
--- a/stan/math/opencl/rev/exp2.hpp
+++ b/stan/math/opencl/rev/exp2.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/expm1.hpp b/stan/math/opencl/rev/expm1.hpp
index a0ca6846d73..b37e9dc409a 100644
--- a/stan/math/opencl/rev/expm1.hpp
+++ b/stan/math/opencl/rev/expm1.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/fabs.hpp b/stan/math/opencl/rev/fabs.hpp
index 20390484a20..e1ee8ab14c8 100644
--- a/stan/math/opencl/rev/fabs.hpp
+++ b/stan/math/opencl/rev/fabs.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/fdim.hpp b/stan/math/opencl/rev/fdim.hpp
index 008cc8a36b0..372406a40db 100644
--- a/stan/math/opencl/rev/fdim.hpp
+++ b/stan/math/opencl/rev/fdim.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/floor.hpp b/stan/math/opencl/rev/floor.hpp
index 26601349810..7aba34d0647 100644
--- a/stan/math/opencl/rev/floor.hpp
+++ b/stan/math/opencl/rev/floor.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/fmax.hpp b/stan/math/opencl/rev/fmax.hpp
index 7441a775924..44d0c4b09b3 100644
--- a/stan/math/opencl/rev/fmax.hpp
+++ b/stan/math/opencl/rev/fmax.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/fmin.hpp b/stan/math/opencl/rev/fmin.hpp
index e2c2764023d..56277312bbd 100644
--- a/stan/math/opencl/rev/fmin.hpp
+++ b/stan/math/opencl/rev/fmin.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/fmod.hpp b/stan/math/opencl/rev/fmod.hpp
index 31c6effa2ee..fe26f96daaa 100644
--- a/stan/math/opencl/rev/fmod.hpp
+++ b/stan/math/opencl/rev/fmod.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/hypot.hpp b/stan/math/opencl/rev/hypot.hpp
index d6a9152322f..3904d2d38a4 100644
--- a/stan/math/opencl/rev/hypot.hpp
+++ b/stan/math/opencl/rev/hypot.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/inv.hpp b/stan/math/opencl/rev/inv.hpp
index 98f338ef440..aff643a93be 100644
--- a/stan/math/opencl/rev/inv.hpp
+++ b/stan/math/opencl/rev/inv.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/inv_Phi.hpp b/stan/math/opencl/rev/inv_Phi.hpp
index 373a234ed07..2cc66325cf1 100644
--- a/stan/math/opencl/rev/inv_Phi.hpp
+++ b/stan/math/opencl/rev/inv_Phi.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/inv_cloglog.hpp b/stan/math/opencl/rev/inv_cloglog.hpp
index 9f5d8f3e1af..765e9d4e8a8 100644
--- a/stan/math/opencl/rev/inv_cloglog.hpp
+++ b/stan/math/opencl/rev/inv_cloglog.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/inv_logit.hpp b/stan/math/opencl/rev/inv_logit.hpp
index aef65ee3c4a..018891fde4b 100644
--- a/stan/math/opencl/rev/inv_logit.hpp
+++ b/stan/math/opencl/rev/inv_logit.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/inv_sqrt.hpp b/stan/math/opencl/rev/inv_sqrt.hpp
index 4a2d6081bea..29e0b6174cf 100644
--- a/stan/math/opencl/rev/inv_sqrt.hpp
+++ b/stan/math/opencl/rev/inv_sqrt.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/inv_square.hpp b/stan/math/opencl/rev/inv_square.hpp
index a9d2e414c45..c2c102e9729 100644
--- a/stan/math/opencl/rev/inv_square.hpp
+++ b/stan/math/opencl/rev/inv_square.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/lbeta.hpp b/stan/math/opencl/rev/lbeta.hpp
index 8165027333f..67796e9e5f5 100644
--- a/stan/math/opencl/rev/lbeta.hpp
+++ b/stan/math/opencl/rev/lbeta.hpp
@@ -7,9 +7,7 @@
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/ldexp.hpp b/stan/math/opencl/rev/ldexp.hpp
index 27d51b1ade1..baf71e16f81 100644
--- a/stan/math/opencl/rev/ldexp.hpp
+++ b/stan/math/opencl/rev/ldexp.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/lgamma.hpp b/stan/math/opencl/rev/lgamma.hpp
index 63ce92a1da9..15dc81b6f28 100644
--- a/stan/math/opencl/rev/lgamma.hpp
+++ b/stan/math/opencl/rev/lgamma.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/lmultiply.hpp b/stan/math/opencl/rev/lmultiply.hpp
index 46295525cd5..44b2da9c3ba 100644
--- a/stan/math/opencl/rev/lmultiply.hpp
+++ b/stan/math/opencl/rev/lmultiply.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/log.hpp b/stan/math/opencl/rev/log.hpp
index bc5e1bb1340..fadd5f62229 100644
--- a/stan/math/opencl/rev/log.hpp
+++ b/stan/math/opencl/rev/log.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log10.hpp b/stan/math/opencl/rev/log10.hpp
index df345bb20ac..861597a80e2 100644
--- a/stan/math/opencl/rev/log10.hpp
+++ b/stan/math/opencl/rev/log10.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log1m.hpp b/stan/math/opencl/rev/log1m.hpp
index e0ad3631a88..66081276ce5 100644
--- a/stan/math/opencl/rev/log1m.hpp
+++ b/stan/math/opencl/rev/log1m.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log1m_exp.hpp b/stan/math/opencl/rev/log1m_exp.hpp
index 6ea6569a3d5..b9912ef8eda 100644
--- a/stan/math/opencl/rev/log1m_exp.hpp
+++ b/stan/math/opencl/rev/log1m_exp.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log1m_inv_logit.hpp b/stan/math/opencl/rev/log1m_inv_logit.hpp
index 88bde46fd26..c1aa3a12b08 100644
--- a/stan/math/opencl/rev/log1m_inv_logit.hpp
+++ b/stan/math/opencl/rev/log1m_inv_logit.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log1p.hpp b/stan/math/opencl/rev/log1p.hpp
index cb1b6c5c5f3..68257067e71 100644
--- a/stan/math/opencl/rev/log1p.hpp
+++ b/stan/math/opencl/rev/log1p.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log1p_exp.hpp b/stan/math/opencl/rev/log1p_exp.hpp
index cdda23e43c9..d2386979681 100644
--- a/stan/math/opencl/rev/log1p_exp.hpp
+++ b/stan/math/opencl/rev/log1p_exp.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log2.hpp b/stan/math/opencl/rev/log2.hpp
index e9727a267e3..834c99c1da2 100644
--- a/stan/math/opencl/rev/log2.hpp
+++ b/stan/math/opencl/rev/log2.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log_diff_exp.hpp b/stan/math/opencl/rev/log_diff_exp.hpp
index 3dcde588326..8cba8393c2f 100644
--- a/stan/math/opencl/rev/log_diff_exp.hpp
+++ b/stan/math/opencl/rev/log_diff_exp.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/log_inv_logit.hpp b/stan/math/opencl/rev/log_inv_logit.hpp
index a95e54e2dcb..b48685f7348 100644
--- a/stan/math/opencl/rev/log_inv_logit.hpp
+++ b/stan/math/opencl/rev/log_inv_logit.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log_inv_logit_diff.hpp b/stan/math/opencl/rev/log_inv_logit_diff.hpp
index e8eb5381f7a..cdaaf4820cb 100644
--- a/stan/math/opencl/rev/log_inv_logit_diff.hpp
+++ b/stan/math/opencl/rev/log_inv_logit_diff.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
diff --git a/stan/math/opencl/rev/log_softmax.hpp b/stan/math/opencl/rev/log_softmax.hpp
index 3dfaa1432bc..68bbb3c050f 100644
--- a/stan/math/opencl/rev/log_softmax.hpp
+++ b/stan/math/opencl/rev/log_softmax.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/log_softmax.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/log_sum_exp.hpp b/stan/math/opencl/rev/log_sum_exp.hpp
index 888f6ff2b37..c293db8e029 100644
--- a/stan/math/opencl/rev/log_sum_exp.hpp
+++ b/stan/math/opencl/rev/log_sum_exp.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/log_sum_exp.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/logit.hpp b/stan/math/opencl/rev/logit.hpp
index 67d65301568..1f46da0c760 100644
--- a/stan/math/opencl/rev/logit.hpp
+++ b/stan/math/opencl/rev/logit.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/multiply.hpp b/stan/math/opencl/rev/multiply.hpp
index acc7bb6e57a..a76d0489da8 100644
--- a/stan/math/opencl/rev/multiply.hpp
+++ b/stan/math/opencl/rev/multiply.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/multiply_log.hpp b/stan/math/opencl/rev/multiply_log.hpp
index 535129b3e77..0c244b97f05 100644
--- a/stan/math/opencl/rev/multiply_log.hpp
+++ b/stan/math/opencl/rev/multiply_log.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/multiply_lower_tri_self_transpose.hpp b/stan/math/opencl/rev/multiply_lower_tri_self_transpose.hpp
index 48b664075e6..192c56979f5 100644
--- a/stan/math/opencl/rev/multiply_lower_tri_self_transpose.hpp
+++ b/stan/math/opencl/rev/multiply_lower_tri_self_transpose.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/multiply_lower_tri_self_transpose.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/operands_and_partials.hpp b/stan/math/opencl/rev/operands_and_partials.hpp
index ab022b154b0..4cd35cae06d 100644
--- a/stan/math/opencl/rev/operands_and_partials.hpp
+++ b/stan/math/opencl/rev/operands_and_partials.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/rev/arena_type.hpp>
-#include <stan/math/opencl/rev/to_arena.hpp>
 #include <stan/math/prim/functor/broadcast_array.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/pow.hpp b/stan/math/opencl/rev/pow.hpp
index 09dfc133052..137d401ba51 100644
--- a/stan/math/opencl/rev/pow.hpp
+++ b/stan/math/opencl/rev/pow.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/prod.hpp b/stan/math/opencl/rev/prod.hpp
index 559543d236c..ee2a3a6bffe 100644
--- a/stan/math/opencl/rev/prod.hpp
+++ b/stan/math/opencl/rev/prod.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/prod.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/rep_matrix.hpp b/stan/math/opencl/rev/rep_matrix.hpp
index 624cb8ef0c1..12e6ceb6332 100644
--- a/stan/math/opencl/rev/rep_matrix.hpp
+++ b/stan/math/opencl/rev/rep_matrix.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_OPENCL_REV_REP_MATRIX_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/opencl/kernels/rep_matrix.hpp>
 #include <stan/math/opencl/prim/rep_matrix.hpp>
 #include <stan/math/opencl/prim/sum.hpp>
diff --git a/stan/math/opencl/rev/reverse.hpp b/stan/math/opencl/rev/reverse.hpp
index f6b3b793b47..b78a1e32c74 100644
--- a/stan/math/opencl/rev/reverse.hpp
+++ b/stan/math/opencl/rev/reverse.hpp
@@ -3,8 +3,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/block.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/round.hpp b/stan/math/opencl/rev/round.hpp
index 4e40ee172f1..efbc39c71fc 100644
--- a/stan/math/opencl/rev/round.hpp
+++ b/stan/math/opencl/rev/round.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/rows_dot_product.hpp b/stan/math/opencl/rev/rows_dot_product.hpp
index e81686f5406..c59b883d4b9 100644
--- a/stan/math/opencl/rev/rows_dot_product.hpp
+++ b/stan/math/opencl/rev/rows_dot_product.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/opencl/prim/rows_dot_product.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/rows_dot_self.hpp b/stan/math/opencl/rev/rows_dot_self.hpp
index 40697d3707e..3dea3a0a863 100644
--- a/stan/math/opencl/rev/rows_dot_self.hpp
+++ b/stan/math/opencl/rev/rows_dot_self.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/prim/rows_dot_self.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/sd.hpp b/stan/math/opencl/rev/sd.hpp
index cc497cd7566..9e87db57660 100644
--- a/stan/math/opencl/rev/sd.hpp
+++ b/stan/math/opencl/rev/sd.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/mean.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/sin.hpp b/stan/math/opencl/rev/sin.hpp
index 63c3de24a9c..5281871dc10 100644
--- a/stan/math/opencl/rev/sin.hpp
+++ b/stan/math/opencl/rev/sin.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/sinh.hpp b/stan/math/opencl/rev/sinh.hpp
index 2a643d59bd6..4fa85c9f835 100644
--- a/stan/math/opencl/rev/sinh.hpp
+++ b/stan/math/opencl/rev/sinh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/softmax.hpp b/stan/math/opencl/rev/softmax.hpp
index 5d888f85db1..f75f4eb66e4 100644
--- a/stan/math/opencl/rev/softmax.hpp
+++ b/stan/math/opencl/rev/softmax.hpp
@@ -5,9 +5,7 @@
 #include <stan/math/opencl/prim/dot_product.hpp>
 #include <stan/math/opencl/prim/softmax.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/sqrt.hpp b/stan/math/opencl/rev/sqrt.hpp
index 15860a6ad62..d1cacbf5a61 100644
--- a/stan/math/opencl/rev/sqrt.hpp
+++ b/stan/math/opencl/rev/sqrt.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/square.hpp b/stan/math/opencl/rev/square.hpp
index b369478b95a..a36aed3ebde 100644
--- a/stan/math/opencl/rev/square.hpp
+++ b/stan/math/opencl/rev/square.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/squared_distance.hpp b/stan/math/opencl/rev/squared_distance.hpp
index 869e0eea03e..102c7121131 100644
--- a/stan/math/opencl/rev/squared_distance.hpp
+++ b/stan/math/opencl/rev/squared_distance.hpp
@@ -3,13 +3,10 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/rev/adjoint_results.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/opencl/prim/squared_distance.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/subtract.hpp b/stan/math/opencl/rev/subtract.hpp
index b06b6e62fa7..086ed1d3158 100644
--- a/stan/math/opencl/rev/subtract.hpp
+++ b/stan/math/opencl/rev/subtract.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/opencl/rev/adjoint_results.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/meta/is_kernel_expression.hpp>
 
diff --git a/stan/math/opencl/rev/sum.hpp b/stan/math/opencl/rev/sum.hpp
index a981ee64479..a218c07d1c8 100644
--- a/stan/math/opencl/rev/sum.hpp
+++ b/stan/math/opencl/rev/sum.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/opencl/prim/sum.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/symmetrize_from_lower_tri.hpp b/stan/math/opencl/rev/symmetrize_from_lower_tri.hpp
index 799a5422ff2..3a3e5f001eb 100644
--- a/stan/math/opencl/rev/symmetrize_from_lower_tri.hpp
+++ b/stan/math/opencl/rev/symmetrize_from_lower_tri.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/symmetrize_from_upper_tri.hpp b/stan/math/opencl/rev/symmetrize_from_upper_tri.hpp
index c546ab88bde..76d3ae1e985 100644
--- a/stan/math/opencl/rev/symmetrize_from_upper_tri.hpp
+++ b/stan/math/opencl/rev/symmetrize_from_upper_tri.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/tan.hpp b/stan/math/opencl/rev/tan.hpp
index a5975670915..cc8aec5932a 100644
--- a/stan/math/opencl/rev/tan.hpp
+++ b/stan/math/opencl/rev/tan.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/tanh.hpp b/stan/math/opencl/rev/tanh.hpp
index 11df5849612..451489e06bd 100644
--- a/stan/math/opencl/rev/tanh.hpp
+++ b/stan/math/opencl/rev/tanh.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/tgamma.hpp b/stan/math/opencl/rev/tgamma.hpp
index 8ead3b011b8..93b3896e2bf 100644
--- a/stan/math/opencl/rev/tgamma.hpp
+++ b/stan/math/opencl/rev/tgamma.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/trace.hpp b/stan/math/opencl/rev/trace.hpp
index 1856b4f6df2..347261096f1 100644
--- a/stan/math/opencl/rev/trace.hpp
+++ b/stan/math/opencl/rev/trace.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/prim/trace.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/transpose.hpp b/stan/math/opencl/rev/transpose.hpp
index 2f3ae9b7528..187279c2541 100644
--- a/stan/math/opencl/rev/transpose.hpp
+++ b/stan/math/opencl/rev/transpose.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_OPENCL_REV_TRANSPOSE_HPP
 #ifdef STAN_OPENCL
 
-#include <stan/math/opencl/kernel_generator.hpp>
-#include <stan/math/opencl/prim/crossprod.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/opencl/rev/trunc.hpp b/stan/math/opencl/rev/trunc.hpp
index 63e6be9085f..875050bb67c 100644
--- a/stan/math/opencl/rev/trunc.hpp
+++ b/stan/math/opencl/rev/trunc.hpp
@@ -4,7 +4,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/rev/variance.hpp b/stan/math/opencl/rev/variance.hpp
index f9ef2304e3a..bf3a812c1f5 100644
--- a/stan/math/opencl/rev/variance.hpp
+++ b/stan/math/opencl/rev/variance.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/prim/mean.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/tri_inverse.hpp b/stan/math/opencl/tri_inverse.hpp
index 7134bc369df..2be1907df05 100644
--- a/stan/math/opencl/tri_inverse.hpp
+++ b/stan/math/opencl/tri_inverse.hpp
@@ -4,7 +4,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/plain_type.hpp>
-#include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/matrix_cl_view.hpp>
 #include <stan/math/opencl/kernels/diag_inv.hpp>
 #include <stan/math/opencl/kernels/inv_lower_tri_multiply.hpp>
@@ -16,7 +15,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <cmath>
 #include <string>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/opencl/zeros_strict_tri.hpp b/stan/math/opencl/zeros_strict_tri.hpp
index 339f987cb59..c28c8f7c9f2 100644
--- a/stan/math/opencl/zeros_strict_tri.hpp
+++ b/stan/math/opencl/zeros_strict_tri.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/err.hpp>
 #include <stan/math/opencl/kernels/fill_strict_tri.hpp>
-#include <stan/math/prim/meta.hpp>
 
 #include <CL/opencl.hpp>
 
diff --git a/stan/math/prim/constraint/cholesky_corr_constrain.hpp b/stan/math/prim/constraint/cholesky_corr_constrain.hpp
index 8ed2b1aa454..2400f8e43c8 100644
--- a/stan/math/prim/constraint/cholesky_corr_constrain.hpp
+++ b/stan/math/prim/constraint/cholesky_corr_constrain.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <cmath>
diff --git a/stan/math/prim/constraint/cholesky_factor_constrain.hpp b/stan/math/prim/constraint/cholesky_factor_constrain.hpp
index aae8b9973a9..04df831c5c8 100644
--- a/stan/math/prim/constraint/cholesky_factor_constrain.hpp
+++ b/stan/math/prim/constraint/cholesky_factor_constrain.hpp
@@ -3,12 +3,8 @@
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/constraint/cholesky_factor_free.hpp b/stan/math/prim/constraint/cholesky_factor_free.hpp
index 1ef81d0bfff..ae58321a1b4 100644
--- a/stan/math/prim/constraint/cholesky_factor_free.hpp
+++ b/stan/math/prim/constraint/cholesky_factor_free.hpp
@@ -3,10 +3,8 @@
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/constraint/corr_matrix_constrain.hpp b/stan/math/prim/constraint/corr_matrix_constrain.hpp
index a2d54131f6f..b024a508608 100644
--- a/stan/math/prim/constraint/corr_matrix_constrain.hpp
+++ b/stan/math/prim/constraint/corr_matrix_constrain.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <stan/math/prim/fun/read_corr_matrix.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/constraint/cov_matrix_constrain.hpp b/stan/math/prim/constraint/cov_matrix_constrain.hpp
index b8fda5ef83e..dbe809b4bcb 100644
--- a/stan/math/prim/constraint/cov_matrix_constrain.hpp
+++ b/stan/math/prim/constraint/cov_matrix_constrain.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/multiply_lower_tri_self_transpose.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/constraint/cov_matrix_free.hpp b/stan/math/prim/constraint/cov_matrix_free.hpp
index 81b614ca162..be3405e0fe2 100644
--- a/stan/math/prim/constraint/cov_matrix_free.hpp
+++ b/stan/math/prim/constraint/cov_matrix_free.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/constraint/lb_constrain.hpp b/stan/math/prim/constraint/lb_constrain.hpp
index 0a3d8936129..c213a714f14 100644
--- a/stan/math/prim/constraint/lb_constrain.hpp
+++ b/stan/math/prim/constraint/lb_constrain.hpp
@@ -5,12 +5,9 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/constraint/identity_constrain.hpp>
-#include <stan/math/prim/constraint/identity_free.hpp>
 #include <stan/math/prim/fun/add.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/eval.hpp>
-#include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/lb_free.hpp b/stan/math/prim/constraint/lb_free.hpp
index 7de070fe441..4b1f0b891c7 100644
--- a/stan/math/prim/constraint/lb_free.hpp
+++ b/stan/math/prim/constraint/lb_free.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/constraint/identity_free.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/subtract.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/lub_constrain.hpp b/stan/math/prim/constraint/lub_constrain.hpp
index e7815664e46..9df2de34c63 100644
--- a/stan/math/prim/constraint/lub_constrain.hpp
+++ b/stan/math/prim/constraint/lub_constrain.hpp
@@ -8,15 +8,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/add.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/elt_multiply.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/subtract.hpp>
-#include <stan/math/prim/fun/sum.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/offset_multiplier_constrain.hpp b/stan/math/prim/constraint/offset_multiplier_constrain.hpp
index 9e01e8303dc..5d712fd5a1e 100644
--- a/stan/math/prim/constraint/offset_multiplier_constrain.hpp
+++ b/stan/math/prim/constraint/offset_multiplier_constrain.hpp
@@ -4,13 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/fma.hpp>
-#include <stan/math/prim/constraint/identity_constrain.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/eval.hpp>
-#include <stan/math/prim/functor/apply.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/offset_multiplier_free.hpp b/stan/math/prim/constraint/offset_multiplier_free.hpp
index f3a6c2c3821..dd11b8dd07a 100644
--- a/stan/math/prim/constraint/offset_multiplier_free.hpp
+++ b/stan/math/prim/constraint/offset_multiplier_free.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/constraint/identity_free.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
diff --git a/stan/math/prim/constraint/ordered_free.hpp b/stan/math/prim/constraint/ordered_free.hpp
index dabf83aed84..a5ae029e275 100644
--- a/stan/math/prim/constraint/ordered_free.hpp
+++ b/stan/math/prim/constraint/ordered_free.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/constraint/positive_free.hpp b/stan/math/prim/constraint/positive_free.hpp
index 2e3637e2b94..60c57d954c1 100644
--- a/stan/math/prim/constraint/positive_free.hpp
+++ b/stan/math/prim/constraint/positive_free.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_CONSTRAINT_POSITIVE_FREE_HPP
 #define STAN_MATH_PRIM_CONSTRAINT_POSITIVE_FREE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <cmath>
diff --git a/stan/math/prim/constraint/positive_ordered_free.hpp b/stan/math/prim/constraint/positive_ordered_free.hpp
index face9f638e4..a86ba1f564e 100644
--- a/stan/math/prim/constraint/positive_ordered_free.hpp
+++ b/stan/math/prim/constraint/positive_ordered_free.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/constraint/simplex_constrain.hpp b/stan/math/prim/constraint/simplex_constrain.hpp
index 0daef856795..52cc188d9fe 100644
--- a/stan/math/prim/constraint/simplex_constrain.hpp
+++ b/stan/math/prim/constraint/simplex_constrain.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/fmax.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv_sqrt.hpp>
diff --git a/stan/math/prim/constraint/ub_constrain.hpp b/stan/math/prim/constraint/ub_constrain.hpp
index 5b389337e66..8da012b9ae3 100644
--- a/stan/math/prim/constraint/ub_constrain.hpp
+++ b/stan/math/prim/constraint/ub_constrain.hpp
@@ -6,10 +6,7 @@
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/constraint/identity_constrain.hpp>
-#include <stan/math/prim/constraint/identity_free.hpp>
 #include <stan/math/prim/fun/subtract.hpp>
-#include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/unit_vector_constrain.hpp b/stan/math/prim/constraint/unit_vector_constrain.hpp
index 920326a48c2..bad2ded53e4 100644
--- a/stan/math/prim/constraint/unit_vector_constrain.hpp
+++ b/stan/math/prim/constraint/unit_vector_constrain.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_PRIM_CONSTRAINT_UNIT_VECTOR_CONSTRAIN_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/dot_self.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/constraint/unit_vector_free.hpp b/stan/math/prim/constraint/unit_vector_free.hpp
index c69a7ac9421..187fcbe4117 100644
--- a/stan/math/prim/constraint/unit_vector_free.hpp
+++ b/stan/math/prim/constraint/unit_vector_free.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/err/check_3F2_converges.hpp b/stan/math/prim/err/check_3F2_converges.hpp
index 25d9b89afe8..955f6e4a630 100644
--- a/stan/math/prim/err/check_3F2_converges.hpp
+++ b/stan/math/prim/err/check_3F2_converges.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_3F2_CONVERGES_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_3F2_CONVERGES_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_not_nan.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <stan/math/prim/fun/is_nonpositive_integer.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <cmath>
diff --git a/stan/math/prim/err/check_cholesky_factor.hpp b/stan/math/prim/err/check_cholesky_factor.hpp
index 099d2bc3986..0f4f6e49bd5 100644
--- a/stan/math/prim/err/check_cholesky_factor.hpp
+++ b/stan/math/prim/err/check_cholesky_factor.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_CHOLESKY_FACTOR_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_CHOLESKY_FACTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
diff --git a/stan/math/prim/err/check_column_index.hpp b/stan/math/prim/err/check_column_index.hpp
index 41b875c0d39..db30fdb3dbc 100644
--- a/stan/math/prim/err/check_column_index.hpp
+++ b/stan/math/prim/err/check_column_index.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/out_of_range.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/err/check_consistent_sizes.hpp b/stan/math/prim/err/check_consistent_sizes.hpp
index d01636e33b0..4d9bbd99b16 100644
--- a/stan/math/prim/err/check_consistent_sizes.hpp
+++ b/stan/math/prim/err/check_consistent_sizes.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/err/invalid_argument.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/meta/is_container.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
-#include <algorithm>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/err/check_consistent_sizes_mvt.hpp b/stan/math/prim/err/check_consistent_sizes_mvt.hpp
index 75d411f403e..08dbb9aed20 100644
--- a/stan/math/prim/err/check_consistent_sizes_mvt.hpp
+++ b/stan/math/prim/err/check_consistent_sizes_mvt.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/err/invalid_argument.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
-#include <algorithm>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/err/check_cov_matrix.hpp b/stan/math/prim/err/check_cov_matrix.hpp
index ab1ab633f19..636e6f8cbec 100644
--- a/stan/math/prim/err/check_cov_matrix.hpp
+++ b/stan/math/prim/err/check_cov_matrix.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_COV_MATRIX_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_COV_MATRIX_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/err/check_pos_definite.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/check_finite.hpp b/stan/math/prim/err/check_finite.hpp
index c487e3182d8..0add39a1999 100644
--- a/stan/math/prim/err/check_finite.hpp
+++ b/stan/math/prim/err/check_finite.hpp
@@ -1,13 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_FINITE_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_FINITE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/elementwise_check.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/get.hpp>
-#include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/err/check_flag_sundials.hpp b/stan/math/prim/err/check_flag_sundials.hpp
index 31babebf14e..e37aeedac4d 100644
--- a/stan/math/prim/err/check_flag_sundials.hpp
+++ b/stan/math/prim/err/check_flag_sundials.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/domain_error.hpp>
-#include <kinsol/kinsol.h>
 #include <cvodes/cvodes.h>
 #include <idas/idas.h>
 #include <arkode/arkode.h>
diff --git a/stan/math/prim/err/check_greater.hpp b/stan/math/prim/err/check_greater.hpp
index 256426d893e..628c41b33dc 100644
--- a/stan/math/prim/err/check_greater.hpp
+++ b/stan/math/prim/err/check_greater.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_GREATER_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <stan/math/prim/err/throw_domain_error_vec.hpp>
diff --git a/stan/math/prim/err/check_greater_or_equal.hpp b/stan/math/prim/err/check_greater_or_equal.hpp
index a2b40f7e04d..1dd64ec592f 100644
--- a/stan/math/prim/err/check_greater_or_equal.hpp
+++ b/stan/math/prim/err/check_greater_or_equal.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_GREATER_OR_EQUAL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
 #include <stan/math/prim/err/throw_domain_error_vec.hpp>
 #include <stan/math/prim/err/throw_domain_error_mat.hpp>
diff --git a/stan/math/prim/err/check_less.hpp b/stan/math/prim/err/check_less.hpp
index 00960a9543b..c0b6fdc3430 100644
--- a/stan/math/prim/err/check_less.hpp
+++ b/stan/math/prim/err/check_less.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_LESS_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <stan/math/prim/err/throw_domain_error_mat.hpp>
diff --git a/stan/math/prim/err/check_less_or_equal.hpp b/stan/math/prim/err/check_less_or_equal.hpp
index ef76609a9cf..77bc4e5e8f1 100644
--- a/stan/math/prim/err/check_less_or_equal.hpp
+++ b/stan/math/prim/err/check_less_or_equal.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_LESS_OR_EQUAL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err/check_matching_dims.hpp>
-#include <stan/math/prim/err/check_matching_sizes.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <stan/math/prim/err/throw_domain_error_mat.hpp>
diff --git a/stan/math/prim/err/check_lower_triangular.hpp b/stan/math/prim/err/check_lower_triangular.hpp
index bfd978fd38e..16b3d30c747 100644
--- a/stan/math/prim/err/check_lower_triangular.hpp
+++ b/stan/math/prim/err/check_lower_triangular.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_LOWER_TRIANGULAR_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <sstream>
 #include <string>
diff --git a/stan/math/prim/err/check_matching_dims.hpp b/stan/math/prim/err/check_matching_dims.hpp
index 7856b9a7b97..1ac2a722e47 100644
--- a/stan/math/prim/err/check_matching_dims.hpp
+++ b/stan/math/prim/err/check_matching_dims.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_CHECK_MATCHING_DIMS_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/dims.hpp>
 #include <stan/math/prim/err/invalid_argument.hpp>
 #include <sstream>
diff --git a/stan/math/prim/err/check_matching_sizes.hpp b/stan/math/prim/err/check_matching_sizes.hpp
index 2274a62f64b..538705bed43 100644
--- a/stan/math/prim/err/check_matching_sizes.hpp
+++ b/stan/math/prim/err/check_matching_sizes.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_MATCHING_SIZES_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_MATCHING_SIZES_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_size_match.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/check_multiplicable.hpp b/stan/math/prim/err/check_multiplicable.hpp
index 3f7a6ab7cad..f89dbb9d864 100644
--- a/stan/math/prim/err/check_multiplicable.hpp
+++ b/stan/math/prim/err/check_multiplicable.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_MULTIPLICABLE_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_MULTIPLICABLE_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/err/check_size_match.hpp>
-#include <stan/math/prim/err/check_positive.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_nonnegative.hpp b/stan/math/prim/err/check_nonnegative.hpp
index 3b5f8cc4b76..1b14a40db7f 100644
--- a/stan/math/prim/err/check_nonnegative.hpp
+++ b/stan/math/prim/err/check_nonnegative.hpp
@@ -1,11 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_NONNEGATIVE_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_NONNEGATIVE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/elementwise_check.hpp>
-#include <stan/math/prim/fun/get.hpp>
-#include <stan/math/prim/fun/size.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_not_nan.hpp b/stan/math/prim/err/check_not_nan.hpp
index 352b7b3987e..d3286d7aac1 100644
--- a/stan/math/prim/err/check_not_nan.hpp
+++ b/stan/math/prim/err/check_not_nan.hpp
@@ -1,12 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_NOT_NAN_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_NOT_NAN_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/elementwise_check.hpp>
-#include <stan/math/prim/fun/get.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
-#include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_ordered.hpp b/stan/math/prim/err/check_ordered.hpp
index 4b8f34c5b2c..744d6c87dad 100644
--- a/stan/math/prim/err/check_ordered.hpp
+++ b/stan/math/prim/err/check_ordered.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <sstream>
 #include <string>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_pos_semidefinite.hpp b/stan/math/prim/err/check_pos_semidefinite.hpp
index 8fcd061f369..8523a00de97 100644
--- a/stan/math/prim/err/check_pos_semidefinite.hpp
+++ b/stan/math/prim/err/check_pos_semidefinite.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
-#include <sstream>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_positive.hpp b/stan/math/prim/err/check_positive.hpp
index 289573548c9..6aa24946b38 100644
--- a/stan/math/prim/err/check_positive.hpp
+++ b/stan/math/prim/err/check_positive.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/elementwise_check.hpp>
 #include <stan/math/prim/err/invalid_argument.hpp>
-#include <stan/math/prim/fun/get.hpp>
-#include <stan/math/prim/fun/size.hpp>
-#include <type_traits>
 #include <string>
 
 namespace stan {
diff --git a/stan/math/prim/err/check_positive_finite.hpp b/stan/math/prim/err/check_positive_finite.hpp
index 09f42a71930..68253690112 100644
--- a/stan/math/prim/err/check_positive_finite.hpp
+++ b/stan/math/prim/err/check_positive_finite.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_POSITIVE_FINITE_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_POSITIVE_FINITE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/elementwise_check.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/check_positive_ordered.hpp b/stan/math/prim/err/check_positive_ordered.hpp
index 4ca4ef1e6fe..a430b25ac35 100644
--- a/stan/math/prim/err/check_positive_ordered.hpp
+++ b/stan/math/prim/err/check_positive_ordered.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_POSITIVE_ORDERED_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_POSITIVE_ORDERED_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_ordered.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
diff --git a/stan/math/prim/err/check_row_index.hpp b/stan/math/prim/err/check_row_index.hpp
index fbf75ba1cd7..5da619021c0 100644
--- a/stan/math/prim/err/check_row_index.hpp
+++ b/stan/math/prim/err/check_row_index.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/out_of_range.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/err/check_square.hpp b/stan/math/prim/err/check_square.hpp
index ffb14b2e477..c61dcf2a953 100644
--- a/stan/math/prim/err/check_square.hpp
+++ b/stan/math/prim/err/check_square.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_PRIM_ERR_CHECK_SQUARE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/err/check_size_match.hpp>
-#include <sstream>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/check_stochastic_column.hpp b/stan/math/prim/err/check_stochastic_column.hpp
index 33f2e040059..a70a9aed29f 100644
--- a/stan/math/prim/err/check_stochastic_column.hpp
+++ b/stan/math/prim/err/check_stochastic_column.hpp
@@ -11,7 +11,6 @@
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <sstream>
 #include <string>
-#include <iostream>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/err/check_sum_to_zero.hpp b/stan/math/prim/err/check_sum_to_zero.hpp
index 3a5342235b8..dced8d3cd92 100644
--- a/stan/math/prim/err/check_sum_to_zero.hpp
+++ b/stan/math/prim/err/check_sum_to_zero.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_SUM_TO_ZERO_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_SUM_TO_ZERO_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/constraint_tolerance.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
diff --git a/stan/math/prim/err/check_unit_vector.hpp b/stan/math/prim/err/check_unit_vector.hpp
index 46b786bbaec..00eebeccbdc 100644
--- a/stan/math/prim/err/check_unit_vector.hpp
+++ b/stan/math/prim/err/check_unit_vector.hpp
@@ -1,14 +1,12 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_UNIT_VECTOR_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_UNIT_VECTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/check_nonzero_size.hpp>
 #include <stan/math/prim/err/constraint_tolerance.hpp>
 #include <stan/math/prim/err/make_iter_name.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 #include <stan/math/prim/fun/abs.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <sstream>
 #include <string>
diff --git a/stan/math/prim/err/check_vector.hpp b/stan/math/prim/err/check_vector.hpp
index 052f963ec87..b4b9f878357 100644
--- a/stan/math/prim/err/check_vector.hpp
+++ b/stan/math/prim/err/check_vector.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_PRIM_ERR_CHECK_VECTOR_HPP
 #define STAN_MATH_PRIM_ERR_CHECK_VECTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/invalid_argument.hpp>
 #include <sstream>
 #include <string>
-#include <typeinfo>
 
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/value_type.hpp>
diff --git a/stan/math/prim/err/check_vector_index.hpp b/stan/math/prim/err/check_vector_index.hpp
index 1bf466fd63b..a68a28c32f3 100644
--- a/stan/math/prim/err/check_vector_index.hpp
+++ b/stan/math/prim/err/check_vector_index.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/out_of_range.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/err/constraint_tolerance.hpp b/stan/math/prim/err/constraint_tolerance.hpp
index 51edae7d53f..503b2b3216a 100644
--- a/stan/math/prim/err/constraint_tolerance.hpp
+++ b/stan/math/prim/err/constraint_tolerance.hpp
@@ -5,7 +5,6 @@
 #define STAN_MATH_CONSTRAINT_TOLERANCE 1E-8
 #endif
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/err/domain_error.hpp b/stan/math/prim/err/domain_error.hpp
index 115d2a06153..c213b84b524 100644
--- a/stan/math/prim/err/domain_error.hpp
+++ b/stan/math/prim/err/domain_error.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_DOMAIN_ERROR_HPP
 #define STAN_MATH_PRIM_ERR_DOMAIN_ERROR_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/elementwise_check.hpp b/stan/math/prim/err/elementwise_check.hpp
index 708d405a637..195e55c15ad 100644
--- a/stan/math/prim/err/elementwise_check.hpp
+++ b/stan/math/prim/err/elementwise_check.hpp
@@ -9,9 +9,7 @@
 #include <stan/math/prim/meta/is_var_matrix.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
 #include <stan/math/prim/meta/is_stan_scalar.hpp>
-#include <string>
 #include <sstream>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/invalid_argument.hpp b/stan/math/prim/err/invalid_argument.hpp
index 130ebe7e7d5..67af8d8b895 100644
--- a/stan/math/prim/err/invalid_argument.hpp
+++ b/stan/math/prim/err/invalid_argument.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_INVALID_ARGUMENT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <typeinfo>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/stan/math/prim/err/is_cholesky_factor.hpp b/stan/math/prim/err/is_cholesky_factor.hpp
index 3c896cf4d52..aef119901bc 100644
--- a/stan/math/prim/err/is_cholesky_factor.hpp
+++ b/stan/math/prim/err/is_cholesky_factor.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_CHOLESKY_FACTOR_HPP
 #define STAN_MATH_PRIM_ERR_IS_CHOLESKY_FACTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/is_positive.hpp>
diff --git a/stan/math/prim/err/is_cholesky_factor_corr.hpp b/stan/math/prim/err/is_cholesky_factor_corr.hpp
index 05a94e142db..c418e230731 100644
--- a/stan/math/prim/err/is_cholesky_factor_corr.hpp
+++ b/stan/math/prim/err/is_cholesky_factor_corr.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_CHOLESKY_FACTOR_CORR_HPP
 #define STAN_MATH_PRIM_ERR_IS_CHOLESKY_FACTOR_CORR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/err/is_cholesky_factor.hpp>
diff --git a/stan/math/prim/err/is_column_index.hpp b/stan/math/prim/err/is_column_index.hpp
index 004dff90d80..47317fcb47d 100644
--- a/stan/math/prim/err/is_column_index.hpp
+++ b/stan/math/prim/err/is_column_index.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_COLUMN_INDEX_HPP
 #define STAN_MATH_PRIM_ERR_IS_COLUMN_INDEX_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/is_ldlt_factor.hpp b/stan/math/prim/err/is_ldlt_factor.hpp
index 1e89de9626c..22fe6b907ab 100644
--- a/stan/math/prim/err/is_ldlt_factor.hpp
+++ b/stan/math/prim/err/is_ldlt_factor.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_LDLT_FACTOR_HPP
 #define STAN_MATH_PRIM_ERR_IS_LDLT_FACTOR_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/LDLT_factor.hpp>
 
diff --git a/stan/math/prim/err/is_less_or_equal.hpp b/stan/math/prim/err/is_less_or_equal.hpp
index 8344e3c32e6..7effd84d342 100644
--- a/stan/math/prim/err/is_less_or_equal.hpp
+++ b/stan/math/prim/err/is_less_or_equal.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_LESS_OR_EQUAL_HPP
 #define STAN_MATH_PRIM_ERR_IS_LESS_OR_EQUAL_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/get.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/err/is_lower_triangular.hpp b/stan/math/prim/err/is_lower_triangular.hpp
index a587415be71..f3001edc24f 100644
--- a/stan/math/prim/err/is_lower_triangular.hpp
+++ b/stan/math/prim/err/is_lower_triangular.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_LOWER_TRIANGULAR_HPP
 #define STAN_MATH_PRIM_ERR_IS_LOWER_TRIANGULAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/err/is_not_nan.hpp>
 #include <stan/math/prim/meta.hpp>
 
diff --git a/stan/math/prim/err/is_mat_finite.hpp b/stan/math/prim/err/is_mat_finite.hpp
index 473f7126686..08f2cbc3d19 100644
--- a/stan/math/prim/err/is_mat_finite.hpp
+++ b/stan/math/prim/err/is_mat_finite.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_MAT_FINITE_HPP
 #define STAN_MATH_PRIM_ERR_IS_MAT_FINITE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/meta.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/is_matching_dims.hpp b/stan/math/prim/err/is_matching_dims.hpp
index 26bb4360a40..33fe7a1a3eb 100644
--- a/stan/math/prim/err/is_matching_dims.hpp
+++ b/stan/math/prim/err/is_matching_dims.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_MATCHING_DIMS_HPP
 #define STAN_MATH_PRIM_ERR_IS_MATCHING_DIMS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/is_size_match.hpp>
 
diff --git a/stan/math/prim/err/is_matching_size.hpp b/stan/math/prim/err/is_matching_size.hpp
index 336bcee0564..55029c54a2f 100644
--- a/stan/math/prim/err/is_matching_size.hpp
+++ b/stan/math/prim/err/is_matching_size.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_MATCHING_SIZE_HPP
 #define STAN_MATH_PRIM_ERR_IS_MATCHING_SIZE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/is_size_match.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/err/is_nonzero_size.hpp b/stan/math/prim/err/is_nonzero_size.hpp
index c232dc4f073..ffa71e73a5b 100644
--- a/stan/math/prim/err/is_nonzero_size.hpp
+++ b/stan/math/prim/err/is_nonzero_size.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_NONZERO_SIZE_HPP
 #define STAN_MATH_PRIM_ERR_IS_NONZERO_SIZE_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/err/is_not_nan.hpp b/stan/math/prim/err/is_not_nan.hpp
index 4e94a02cd13..b145bb84640 100644
--- a/stan/math/prim/err/is_not_nan.hpp
+++ b/stan/math/prim/err/is_not_nan.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_NOT_NAN_HPP
 #define STAN_MATH_PRIM_ERR_IS_NOT_NAN_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/get.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/err/is_ordered.hpp b/stan/math/prim/err/is_ordered.hpp
index a29dbd43251..515dae21c99 100644
--- a/stan/math/prim/err/is_ordered.hpp
+++ b/stan/math/prim/err/is_ordered.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <vector>
-#include <string>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/is_positive.hpp b/stan/math/prim/err/is_positive.hpp
index b33b3cb758e..e82a2392456 100644
--- a/stan/math/prim/err/is_positive.hpp
+++ b/stan/math/prim/err/is_positive.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_POSITIVE_HPP
 #define STAN_MATH_PRIM_ERR_IS_POSITIVE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/get.hpp>
 #include <stan/math/prim/fun/size.hpp>
 
diff --git a/stan/math/prim/err/is_scal_finite.hpp b/stan/math/prim/err/is_scal_finite.hpp
index bdebf549ab1..73e901ed712 100644
--- a/stan/math/prim/err/is_scal_finite.hpp
+++ b/stan/math/prim/err/is_scal_finite.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_SCAL_FINITE_HPP
 #define STAN_MATH_PRIM_ERR_IS_SCAL_FINITE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/get.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
diff --git a/stan/math/prim/err/is_size_match.hpp b/stan/math/prim/err/is_size_match.hpp
index 2bf516beb8e..520ff3daf9f 100644
--- a/stan/math/prim/err/is_size_match.hpp
+++ b/stan/math/prim/err/is_size_match.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_SIZE_MATCH_HPP
 #define STAN_MATH_PRIM_ERR_IS_SIZE_MATCH_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/err/is_square.hpp b/stan/math/prim/err/is_square.hpp
index 1440a9c87c3..46708630a32 100644
--- a/stan/math/prim/err/is_square.hpp
+++ b/stan/math/prim/err/is_square.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_SQUARE_HPP
 #define STAN_MATH_PRIM_ERR_IS_SQUARE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/is_size_match.hpp>
 
diff --git a/stan/math/prim/err/is_unit_vector.hpp b/stan/math/prim/err/is_unit_vector.hpp
index f59bcf8806d..bd2898ac8a9 100644
--- a/stan/math/prim/err/is_unit_vector.hpp
+++ b/stan/math/prim/err/is_unit_vector.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_PRIM_ERR_IS_UNIT_VECTOR_HPP
 #define STAN_MATH_PRIM_ERR_IS_UNIT_VECTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/is_nonzero_size.hpp>
 #include <stan/math/prim/err/constraint_tolerance.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/err/make_iter_name.hpp b/stan/math/prim/err/make_iter_name.hpp
index 71f7af7bd4c..6fb1df34b31 100644
--- a/stan/math/prim/err/make_iter_name.hpp
+++ b/stan/math/prim/err/make_iter_name.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_ERR_MAKE_ITER_NAME_HPP
 #define STAN_MATH_PRIM_ERR_MAKE_ITER_NAME_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <string>
 
diff --git a/stan/math/prim/err/out_of_range.hpp b/stan/math/prim/err/out_of_range.hpp
index 7655151a02b..cf40c638e45 100644
--- a/stan/math/prim/err/out_of_range.hpp
+++ b/stan/math/prim/err/out_of_range.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_ERR_OUT_OF_RANGE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <typeinfo>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/stan/math/prim/err/system_error.hpp b/stan/math/prim/err/system_error.hpp
index 3bce6545e62..44f5b948c68 100644
--- a/stan/math/prim/err/system_error.hpp
+++ b/stan/math/prim/err/system_error.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_ERR_SYSTEM_ERROR_HPP
 #define STAN_MATH_PRIM_ERR_SYSTEM_ERROR_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <typeinfo>
 #include <sstream>
-#include <stdexcept>
 #include <system_error>
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/err/throw_domain_error_mat.hpp b/stan/math/prim/err/throw_domain_error_mat.hpp
index d6e55ec7bcc..106aae197f9 100644
--- a/stan/math/prim/err/throw_domain_error_mat.hpp
+++ b/stan/math/prim/err/throw_domain_error_mat.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/throw_domain_error.hpp>
-#include <stan/math/prim/fun/get.hpp>
 #include <sstream>
 #include <string>
 
diff --git a/stan/math/prim/fun/LDLT_factor.hpp b/stan/math/prim/fun/LDLT_factor.hpp
index c01de57b4c8..31acff8b83c 100644
--- a/stan/math/prim/fun/LDLT_factor.hpp
+++ b/stan/math/prim/fun/LDLT_factor.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/err/check_square.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
-#include <memory>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/accumulator.hpp b/stan/math/prim/fun/accumulator.hpp
index 4194ee1450e..d8316f7d1a2 100644
--- a/stan/math/prim/fun/accumulator.hpp
+++ b/stan/math/prim/fun/accumulator.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_PRIM_FUN_ACCUMULATOR_HPP
 #define STAN_MATH_PRIM_FUN_ACCUMULATOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <vector>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/acos.hpp b/stan/math/prim/fun/acos.hpp
index 75eefe7221f..4637d0f41cc 100644
--- a/stan/math/prim/fun/acos.hpp
+++ b/stan/math/prim/fun/acos.hpp
@@ -5,11 +5,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/asin.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/isnan.hpp>
-#include <stan/math/prim/fun/polar.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/add.hpp b/stan/math/prim/fun/add.hpp
index 46410fbd72f..0217b16654a 100644
--- a/stan/math/prim/fun/add.hpp
+++ b/stan/math/prim/fun/add.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/append_array.hpp b/stan/math/prim/fun/append_array.hpp
index b141d168cb1..8d85c19af92 100644
--- a/stan/math/prim/fun/append_array.hpp
+++ b/stan/math/prim/fun/append_array.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/dims.hpp>
 #include <stan/math/prim/fun/resize.hpp>
 #include <stan/math/prim/fun/assign.hpp>
diff --git a/stan/math/prim/fun/append_col.hpp b/stan/math/prim/fun/append_col.hpp
index fc6245143ec..4b6d26dd876 100644
--- a/stan/math/prim/fun/append_col.hpp
+++ b/stan/math/prim/fun/append_col.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/append_row.hpp b/stan/math/prim/fun/append_row.hpp
index 76c7e43e461..c9816dfc34a 100644
--- a/stan/math/prim/fun/append_row.hpp
+++ b/stan/math/prim/fun/append_row.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/as_array_or_scalar.hpp b/stan/math/prim/fun/as_array_or_scalar.hpp
index ef0c1a5a098..334fd7e374b 100644
--- a/stan/math/prim/fun/as_array_or_scalar.hpp
+++ b/stan/math/prim/fun/as_array_or_scalar.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/as_bool.hpp b/stan/math/prim/fun/as_bool.hpp
index a43ee42740a..087334ade9a 100644
--- a/stan/math/prim/fun/as_bool.hpp
+++ b/stan/math/prim/fun/as_bool.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_AS_BOOL_HPP
 #define STAN_MATH_PRIM_FUN_AS_BOOL_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/as_column_vector_or_scalar.hpp b/stan/math/prim/fun/as_column_vector_or_scalar.hpp
index 1e5cfd6de2b..9712d59645e 100644
--- a/stan/math/prim/fun/as_column_vector_or_scalar.hpp
+++ b/stan/math/prim/fun/as_column_vector_or_scalar.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/as_value_array_or_scalar.hpp b/stan/math/prim/fun/as_value_array_or_scalar.hpp
index f47585d54c6..43d364a5d51 100644
--- a/stan/math/prim/fun/as_value_array_or_scalar.hpp
+++ b/stan/math/prim/fun/as_value_array_or_scalar.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_PRIM_FUN_AS_VALUE_ARRAY_OR_SCALAR_HPP
 #define STAN_MATH_PRIM_FUN_AS_VALUE_ARRAY_OR_SCALAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/as_value_column_array_or_scalar.hpp b/stan/math/prim/fun/as_value_column_array_or_scalar.hpp
index 247bdad5a03..b72f6ea15f3 100644
--- a/stan/math/prim/fun/as_value_column_array_or_scalar.hpp
+++ b/stan/math/prim/fun/as_value_column_array_or_scalar.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_PRIM_FUN_AS_VALUE_COLUMN_ARRAY_OR_SCALAR
 #define STAN_MATH_PRIM_FUN_AS_VALUE_COLUMN_ARRAY_OR_SCALAR
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/as_value_column_vector_or_scalar.hpp b/stan/math/prim/fun/as_value_column_vector_or_scalar.hpp
index d412af401e1..f489009dbca 100644
--- a/stan/math/prim/fun/as_value_column_vector_or_scalar.hpp
+++ b/stan/math/prim/fun/as_value_column_vector_or_scalar.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_PRIM_FUN_AS_VALUE_COLUMN_VECTOR_OR_SCALAR
 #define STAN_MATH_PRIM_FUN_AS_VALUE_COLUMN_VECTOR_OR_SCALAR
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/asin.hpp b/stan/math/prim/fun/asin.hpp
index fb940f48d85..d1db3778c61 100644
--- a/stan/math/prim/fun/asin.hpp
+++ b/stan/math/prim/fun/asin.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_PRIM_FUN_ASIN_HPP
 #define STAN_MATH_PRIM_FUN_ASIN_HPP
 
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/asinh.hpp>
 #include <stan/math/prim/fun/copysign.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/i_times.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/asinh.hpp b/stan/math/prim/fun/asinh.hpp
index b4a2d37a8e0..585d86ca2c8 100644
--- a/stan/math/prim/fun/asinh.hpp
+++ b/stan/math/prim/fun/asinh.hpp
@@ -3,14 +3,8 @@
 
 #include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/abs.hpp>
-#include <stan/math/prim/fun/arg.hpp>
 #include <stan/math/prim/fun/copysign.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
-#include <stan/math/prim/fun/isnan.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/polar.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/assign.hpp b/stan/math/prim/fun/assign.hpp
index 17e9195e6e7..97e32764e56 100644
--- a/stan/math/prim/fun/assign.hpp
+++ b/stan/math/prim/fun/assign.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <iostream>
-#include <sstream>
-#include <stdexcept>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/atan.hpp b/stan/math/prim/fun/atan.hpp
index 211f9cbf211..50c5da9b103 100644
--- a/stan/math/prim/fun/atan.hpp
+++ b/stan/math/prim/fun/atan.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_ATAN_HPP
 #define STAN_MATH_PRIM_FUN_ATAN_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/atanh.hpp>
 #include <stan/math/prim/fun/i_times.hpp>
diff --git a/stan/math/prim/fun/atan2.hpp b/stan/math/prim/fun/atan2.hpp
index 54b50d551cd..a6fb190651b 100644
--- a/stan/math/prim/fun/atan2.hpp
+++ b/stan/math/prim/fun/atan2.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_ATAN2_HPP
 #define STAN_MATH_PRIM_FUN_ATAN2_HPP
 
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/atanh.hpp b/stan/math/prim/fun/atanh.hpp
index e68cdf17033..fdbd6cd1a4b 100644
--- a/stan/math/prim/fun/atanh.hpp
+++ b/stan/math/prim/fun/atanh.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_ATANH_HPP
 #define STAN_MATH_PRIM_FUN_ATANH_HPP
 
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/copysign.hpp>
diff --git a/stan/math/prim/fun/binary_log_loss.hpp b/stan/math/prim/fun/binary_log_loss.hpp
index ba097e56574..da49ba0d6fe 100644
--- a/stan/math/prim/fun/binary_log_loss.hpp
+++ b/stan/math/prim/fun/binary_log_loss.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_BINARY_LOG_LOSS_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/block.hpp b/stan/math/prim/fun/block.hpp
index 54169fbe79a..fc9dce2e089 100644
--- a/stan/math/prim/fun/block.hpp
+++ b/stan/math/prim/fun/block.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_BLOCK_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/boost_policy.hpp b/stan/math/prim/fun/boost_policy.hpp
index 8cf418711e0..d633b90155b 100644
--- a/stan/math/prim/fun/boost_policy.hpp
+++ b/stan/math/prim/fun/boost_policy.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_BOOST_POLICY_HPP
 #define STAN_MATH_PRIM_FUN_BOOST_POLICY_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <boost/math/policies/policy.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/ceil.hpp b/stan/math/prim/fun/ceil.hpp
index d04e2ecaa54..c0b570e0bb4 100644
--- a/stan/math/prim/fun/ceil.hpp
+++ b/stan/math/prim/fun/ceil.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_CEIL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/col.hpp b/stan/math/prim/fun/col.hpp
index 0bf65dc328b..683ec23a5c8 100644
--- a/stan/math/prim/fun/col.hpp
+++ b/stan/math/prim/fun/col.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/cols.hpp b/stan/math/prim/fun/cols.hpp
index d207163d511..60cde07830e 100644
--- a/stan/math/prim/fun/cols.hpp
+++ b/stan/math/prim/fun/cols.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <cstdint>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/columns_dot_product.hpp b/stan/math/prim/fun/columns_dot_product.hpp
index f7ae12d539d..68c3a5394cf 100644
--- a/stan/math/prim/fun/columns_dot_product.hpp
+++ b/stan/math/prim/fun/columns_dot_product.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_COLUMNS_DOT_PRODUCT_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/columns_dot_self.hpp b/stan/math/prim/fun/columns_dot_self.hpp
index 941d84a92c5..7db59a7be86 100644
--- a/stan/math/prim/fun/columns_dot_self.hpp
+++ b/stan/math/prim/fun/columns_dot_self.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_COLUMNS_DOT_SELF_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/copysign.hpp b/stan/math/prim/fun/copysign.hpp
index 30ff3b9b66f..e73c2866aa7 100644
--- a/stan/math/prim/fun/copysign.hpp
+++ b/stan/math/prim/fun/copysign.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_SCAL_FUN_COPYSIGN_HPP
 #define STAN_MATH_PRIM_SCAL_FUN_COPYSIGN_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/prim/fun/cos.hpp b/stan/math/prim/fun/cos.hpp
index cdd850328d2..f079f8352fa 100644
--- a/stan/math/prim/fun/cos.hpp
+++ b/stan/math/prim/fun/cos.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/cosh.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/i_times.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/cosh.hpp b/stan/math/prim/fun/cosh.hpp
index c58cacf5e68..4fc55ecf5e0 100644
--- a/stan/math/prim/fun/cosh.hpp
+++ b/stan/math/prim/fun/cosh.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/cov_exp_quad.hpp b/stan/math/prim/fun/cov_exp_quad.hpp
index abaf040b5be..e9fb36be745 100644
--- a/stan/math/prim/fun/cov_exp_quad.hpp
+++ b/stan/math/prim/fun/cov_exp_quad.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/gp_exp_quad_cov.hpp>
-#include <stan/math/prim/fun/squared_distance.hpp>
 #include <vector>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/csr_extract_u.hpp b/stan/math/prim/fun/csr_extract_u.hpp
index 882a6031d6b..9823763ec3f 100644
--- a/stan/math/prim/fun/csr_extract_u.hpp
+++ b/stan/math/prim/fun/csr_extract_u.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <vector>
-#include <numeric>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/csr_extract_v.hpp b/stan/math/prim/fun/csr_extract_v.hpp
index 1dbb0041839..b1b97243511 100644
--- a/stan/math/prim/fun/csr_extract_v.hpp
+++ b/stan/math/prim/fun/csr_extract_v.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <vector>
-#include <numeric>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/csr_matrix_times_vector.hpp b/stan/math/prim/fun/csr_matrix_times_vector.hpp
index 56a466c1f68..c35f701376c 100644
--- a/stan/math/prim/fun/csr_matrix_times_vector.hpp
+++ b/stan/math/prim/fun/csr_matrix_times_vector.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/csr_u_to_z.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/dot_product.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/csr_u_to_z.hpp b/stan/math/prim/fun/csr_u_to_z.hpp
index 77cdbe54544..38e5b43fbc0 100644
--- a/stan/math/prim/fun/csr_u_to_z.hpp
+++ b/stan/math/prim/fun/csr_u_to_z.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_CSR_U_TO_Z
 
 #include <stan/math/prim/err.hpp>
-#include <stdexcept>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/determinant.hpp b/stan/math/prim/fun/determinant.hpp
index 7f7b3b5b01c..04409b19722 100644
--- a/stan/math/prim/fun/determinant.hpp
+++ b/stan/math/prim/fun/determinant.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/diag_post_multiply.hpp b/stan/math/prim/fun/diag_post_multiply.hpp
index 80ca261b1e2..4000a2166c4 100644
--- a/stan/math/prim/fun/diag_post_multiply.hpp
+++ b/stan/math/prim/fun/diag_post_multiply.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_DIAG_POST_MULTIPLY_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/diag_pre_multiply.hpp b/stan/math/prim/fun/diag_pre_multiply.hpp
index 0ed57eec1bc..38ea4897d8d 100644
--- a/stan/math/prim/fun/diag_pre_multiply.hpp
+++ b/stan/math/prim/fun/diag_pre_multiply.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_DIAG_PRE_MULTIPLY_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/diagonal.hpp b/stan/math/prim/fun/diagonal.hpp
index 7e22d87ad43..fe5620cfdf3 100644
--- a/stan/math/prim/fun/diagonal.hpp
+++ b/stan/math/prim/fun/diagonal.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_DIAGONAL_HPP
 #define STAN_MATH_PRIM_FUN_DIAGONAL_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/dims.hpp b/stan/math/prim/fun/dims.hpp
index 332a32e6089..3fa2460e9d8 100644
--- a/stan/math/prim/fun/dims.hpp
+++ b/stan/math/prim/fun/dims.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_DIMS_HPP
 #define STAN_MATH_PRIM_FUN_DIMS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <vector>
 
diff --git a/stan/math/prim/fun/distance.hpp b/stan/math/prim/fun/distance.hpp
index ec9552a4f49..3f684b57984 100644
--- a/stan/math/prim/fun/distance.hpp
+++ b/stan/math/prim/fun/distance.hpp
@@ -4,9 +4,7 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/abs.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/squared_distance.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/divide.hpp b/stan/math/prim/fun/divide.hpp
index 84b5d35a4bb..514fbc126ce 100644
--- a/stan/math/prim/fun/divide.hpp
+++ b/stan/math/prim/fun/divide.hpp
@@ -1,13 +1,10 @@
 #ifndef STAN_MATH_PRIM_FUN_DIVIDE_HPP
 #define STAN_MATH_PRIM_FUN_DIVIDE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <cstddef>
 #include <cstdlib>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/dot.hpp b/stan/math/prim/fun/dot.hpp
index a21b6b5ec92..0b1c7524396 100644
--- a/stan/math/prim/fun/dot.hpp
+++ b/stan/math/prim/fun/dot.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_DOT_HPP
 #define STAN_MATH_PRIM_FUN_DOT_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <vector>
 #include <cstddef>
 
diff --git a/stan/math/prim/fun/dot_product.hpp b/stan/math/prim/fun/dot_product.hpp
index 6d1813b3099..8cf03aeacf6 100644
--- a/stan/math/prim/fun/dot_product.hpp
+++ b/stan/math/prim/fun/dot_product.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/dot_self.hpp b/stan/math/prim/fun/dot_self.hpp
index 9a8ba106d1d..b03089bb773 100644
--- a/stan/math/prim/fun/dot_self.hpp
+++ b/stan/math/prim/fun/dot_self.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <cstddef>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/eigen_comparisons.hpp b/stan/math/prim/fun/eigen_comparisons.hpp
index aeb1fad0728..d9571801c77 100644
--- a/stan/math/prim/fun/eigen_comparisons.hpp
+++ b/stan/math/prim/fun/eigen_comparisons.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_EIGEN_COMPARISONS_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/elt_divide.hpp b/stan/math/prim/fun/elt_divide.hpp
index 86e685af25d..95607a7dfb1 100644
--- a/stan/math/prim/fun/elt_divide.hpp
+++ b/stan/math/prim/fun/elt_divide.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/divide.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/elt_multiply.hpp b/stan/math/prim/fun/elt_multiply.hpp
index 856f1504ca1..6443d78c3ec 100644
--- a/stan/math/prim/fun/elt_multiply.hpp
+++ b/stan/math/prim/fun/elt_multiply.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_ELT_MULTIPLY_HPP
 #define STAN_MATH_PRIM_FUN_ELT_MULTIPLY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
diff --git a/stan/math/prim/fun/eval.hpp b/stan/math/prim/fun/eval.hpp
index cc7f6718daf..41baecc6b28 100644
--- a/stan/math/prim/fun/eval.hpp
+++ b/stan/math/prim/fun/eval.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_EVAL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/exp.hpp b/stan/math/prim/fun/exp.hpp
index 6ba52c5a8b0..7fd18edee62 100644
--- a/stan/math/prim/fun/exp.hpp
+++ b/stan/math/prim/fun/exp.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_EXP_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/fabs.hpp b/stan/math/prim/fun/fabs.hpp
index 83ffdb6b183..6059618225e 100644
--- a/stan/math/prim/fun/fabs.hpp
+++ b/stan/math/prim/fun/fabs.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_FABS_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/factor_U.hpp b/stan/math/prim/fun/factor_U.hpp
index 9dc03b97887..cfdd1645f1b 100644
--- a/stan/math/prim/fun/factor_U.hpp
+++ b/stan/math/prim/fun/factor_U.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/fun/atanh.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <cstddef>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/fft.hpp b/stan/math/prim/fun/fft.hpp
index 06f6c732757..3e6943504eb 100644
--- a/stan/math/prim/fun/fft.hpp
+++ b/stan/math/prim/fun/fft.hpp
@@ -5,9 +5,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <unsupported/Eigen/FFT>
 #include <Eigen/Dense>
-#include <complex>
-#include <type_traits>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/fill.hpp b/stan/math/prim/fun/fill.hpp
index 6d9f4cbf5ca..48a5cb5acf9 100644
--- a/stan/math/prim/fun/fill.hpp
+++ b/stan/math/prim/fun/fill.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_FILL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/finite_diff_stepsize.hpp b/stan/math/prim/fun/finite_diff_stepsize.hpp
index b32ec098462..a2698b883e0 100644
--- a/stan/math/prim/fun/finite_diff_stepsize.hpp
+++ b/stan/math/prim/fun/finite_diff_stepsize.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_FINITE_DIFF_STEPSIZE_HPP
 
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/floor.hpp b/stan/math/prim/fun/floor.hpp
index c527e7de104..a486d7eb127 100644
--- a/stan/math/prim/fun/floor.hpp
+++ b/stan/math/prim/fun/floor.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_FLOOR_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/generalized_inverse.hpp b/stan/math/prim/fun/generalized_inverse.hpp
index fd03af80007..92bbb25a55c 100644
--- a/stan/math/prim/fun/generalized_inverse.hpp
+++ b/stan/math/prim/fun/generalized_inverse.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_GENERALIZED_INVERSE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/inverse.hpp>
diff --git a/stan/math/prim/fun/get.hpp b/stan/math/prim/fun/get.hpp
index 8a466561278..b0bcd38e5be 100644
--- a/stan/math/prim/fun/get.hpp
+++ b/stan/math/prim/fun/get.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_GET_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
diff --git a/stan/math/prim/fun/gp_exp_quad_cov.hpp b/stan/math/prim/fun/gp_exp_quad_cov.hpp
index 438cd8c47c0..6db4c29616e 100644
--- a/stan/math/prim/fun/gp_exp_quad_cov.hpp
+++ b/stan/math/prim/fun/gp_exp_quad_cov.hpp
@@ -6,10 +6,8 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/divide_columns.hpp>
 #include <stan/math/prim/fun/squared_distance.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <cmath>
-#include <type_traits>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/gp_exponential_cov.hpp b/stan/math/prim/fun/gp_exponential_cov.hpp
index 138e2d1165e..de5662786c3 100644
--- a/stan/math/prim/fun/gp_exponential_cov.hpp
+++ b/stan/math/prim/fun/gp_exponential_cov.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/distance.hpp>
 #include <stan/math/prim/fun/divide_columns.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/gp_matern32_cov.hpp b/stan/math/prim/fun/gp_matern32_cov.hpp
index 4d78a5658b8..67376004e15 100644
--- a/stan/math/prim/fun/gp_matern32_cov.hpp
+++ b/stan/math/prim/fun/gp_matern32_cov.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/divide_columns.hpp>
 #include <stan/math/prim/fun/distance.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/fun/gp_matern52_cov.hpp b/stan/math/prim/fun/gp_matern52_cov.hpp
index fceda0e2c1e..1c10ec4c186 100644
--- a/stan/math/prim/fun/gp_matern52_cov.hpp
+++ b/stan/math/prim/fun/gp_matern52_cov.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/divide_columns.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/squared_distance.hpp>
diff --git a/stan/math/prim/fun/grad_2F1.hpp b/stan/math/prim/fun/grad_2F1.hpp
index 8731c6d30b7..cf9e693b0e4 100644
--- a/stan/math/prim/fun/grad_2F1.hpp
+++ b/stan/math/prim/fun/grad_2F1.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/abs.hpp>
diff --git a/stan/math/prim/fun/grad_F32.hpp b/stan/math/prim/fun/grad_F32.hpp
index c8f2d56d5f7..5af0b949a14 100644
--- a/stan/math/prim/fun/grad_F32.hpp
+++ b/stan/math/prim/fun/grad_F32.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_GRAD_F32_HPP
 #define STAN_MATH_PRIM_FUN_GRAD_F32_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
diff --git a/stan/math/prim/fun/grad_pFq.hpp b/stan/math/prim/fun/grad_pFq.hpp
index 8970d3b85f0..44bc1c08ec5 100644
--- a/stan/math/prim/fun/grad_pFq.hpp
+++ b/stan/math/prim/fun/grad_pFq.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/abs.hpp>
 #include <stan/math/prim/fun/floor.hpp>
-#include <stan/math/prim/fun/max.hpp>
 #include <stan/math/prim/fun/select.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
diff --git a/stan/math/prim/fun/grad_reg_inc_beta.hpp b/stan/math/prim/fun/grad_reg_inc_beta.hpp
index f4fa1b58178..df914b0f632 100644
--- a/stan/math/prim/fun/grad_reg_inc_beta.hpp
+++ b/stan/math/prim/fun/grad_reg_inc_beta.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_GRAD_REG_INC_BETA_HPP
 #define STAN_MATH_PRIM_FUN_GRAD_REG_INC_BETA_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/grad_2F1.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/grad_reg_inc_gamma.hpp b/stan/math/prim/fun/grad_reg_inc_gamma.hpp
index 79f47def83e..50ffdaecc1d 100644
--- a/stan/math/prim/fun/grad_reg_inc_gamma.hpp
+++ b/stan/math/prim/fun/grad_reg_inc_gamma.hpp
@@ -4,12 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/is_any_nan.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp b/stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp
index fb6c3620904..b35760a392a 100644
--- a/stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp
+++ b/stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp
@@ -4,15 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/is_any_nan.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <limits>
diff --git a/stan/math/prim/fun/head.hpp b/stan/math/prim/fun/head.hpp
index 0d9a0f4fba6..2a4d3ff7bde 100644
--- a/stan/math/prim/fun/head.hpp
+++ b/stan/math/prim/fun/head.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_HEAD_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/hypergeometric_2F1.hpp b/stan/math/prim/fun/hypergeometric_2F1.hpp
index fc33f7062d0..67706c92061 100644
--- a/stan/math/prim/fun/hypergeometric_2F1.hpp
+++ b/stan/math/prim/fun/hypergeometric_2F1.hpp
@@ -5,12 +5,9 @@
 #include <stan/math/prim/fun/abs.hpp>
 #include <stan/math/prim/fun/asin.hpp>
 #include <stan/math/prim/fun/asinh.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/pow.hpp>
diff --git a/stan/math/prim/fun/inc_beta_dda.hpp b/stan/math/prim/fun/inc_beta_dda.hpp
index 4ed2c0e4758..ac21e7822bc 100644
--- a/stan/math/prim/fun/inc_beta_dda.hpp
+++ b/stan/math/prim/fun/inc_beta_dda.hpp
@@ -1,13 +1,10 @@
 #ifndef STAN_MATH_PRIM_FUN_INC_BETA_DDA_HPP
 #define STAN_MATH_PRIM_FUN_INC_BETA_DDA_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta_ddb.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/inc_beta_ddb.hpp b/stan/math/prim/fun/inc_beta_ddb.hpp
index 5514743f3e9..d4fbf1e4b4a 100644
--- a/stan/math/prim/fun/inc_beta_ddb.hpp
+++ b/stan/math/prim/fun/inc_beta_ddb.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_INC_BETA_DDB_HPP
 #define STAN_MATH_PRIM_FUN_INC_BETA_DDB_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta_dda.hpp>
 #include <stan/math/prim/fun/inv.hpp>
diff --git a/stan/math/prim/fun/inc_beta_ddz.hpp b/stan/math/prim/fun/inc_beta_ddz.hpp
index 4543df47880..672d7c82f26 100644
--- a/stan/math/prim/fun/inc_beta_ddz.hpp
+++ b/stan/math/prim/fun/inc_beta_ddz.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_INC_BETA_DDZ_HPP
 #define STAN_MATH_PRIM_FUN_INC_BETA_DDZ_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/initialize.hpp b/stan/math/prim/fun/initialize.hpp
index 0ff4843e22a..17ef639c02d 100644
--- a/stan/math/prim/fun/initialize.hpp
+++ b/stan/math/prim/fun/initialize.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <vector>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/initialize_fill.hpp b/stan/math/prim/fun/initialize_fill.hpp
index 38602a4ba19..ca89a8140cf 100644
--- a/stan/math/prim/fun/initialize_fill.hpp
+++ b/stan/math/prim/fun/initialize_fill.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_INITIALIZE_FILL_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/int_step.hpp b/stan/math/prim/fun/int_step.hpp
index 4f73927d2f5..7ae32c8d953 100644
--- a/stan/math/prim/fun/int_step.hpp
+++ b/stan/math/prim/fun/int_step.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_INT_STEP_HPP
 #define STAN_MATH_PRIM_FUN_INT_STEP_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/inv.hpp b/stan/math/prim/fun/inv.hpp
index fa29fe223fd..87fe5f61841 100644
--- a/stan/math/prim/fun/inv.hpp
+++ b/stan/math/prim/fun/inv.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_INV_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 
diff --git a/stan/math/prim/fun/inv_Phi.hpp b/stan/math/prim/fun/inv_Phi.hpp
index 5385819ba8c..8b84d073419 100644
--- a/stan/math/prim/fun/inv_Phi.hpp
+++ b/stan/math/prim/fun/inv_Phi.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/Phi.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/inv_logit.hpp b/stan/math/prim/fun/inv_logit.hpp
index 0c2810dfe54..450490200c0 100644
--- a/stan/math/prim/fun/inv_logit.hpp
+++ b/stan/math/prim/fun/inv_logit.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/inv_sqrt.hpp b/stan/math/prim/fun/inv_sqrt.hpp
index 27e0bb70244..2bbb488f095 100644
--- a/stan/math/prim/fun/inv_sqrt.hpp
+++ b/stan/math/prim/fun/inv_sqrt.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_INV_SQRT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/is_any_nan.hpp b/stan/math/prim/fun/is_any_nan.hpp
index a58ca09c958..7ab9fb52e94 100644
--- a/stan/math/prim/fun/is_any_nan.hpp
+++ b/stan/math/prim/fun/is_any_nan.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_IS_ANY_NAN_HPP
 
 #include <stan/math/prim/fun/is_nan.hpp>
-#include <utility>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/is_integer.hpp b/stan/math/prim/fun/is_integer.hpp
index fe61862c9fc..c233f0903ce 100644
--- a/stan/math/prim/fun/is_integer.hpp
+++ b/stan/math/prim/fun/is_integer.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_IS_INTEGER_HPP
 #define STAN_MATH_PRIM_FUN_IS_INTEGER_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/is_nonpositive_integer.hpp b/stan/math/prim/fun/is_nonpositive_integer.hpp
index 67a04d82d45..0a157fdfb24 100644
--- a/stan/math/prim/fun/is_nonpositive_integer.hpp
+++ b/stan/math/prim/fun/is_nonpositive_integer.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_IS_NONPOSITIVE_INTEGER_HPP
 #define STAN_MATH_PRIM_FUN_IS_NONPOSITIVE_INTEGER_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/is_uninitialized.hpp b/stan/math/prim/fun/is_uninitialized.hpp
index 712ea2ff4fb..41ff5c1838d 100644
--- a/stan/math/prim/fun/is_uninitialized.hpp
+++ b/stan/math/prim/fun/is_uninitialized.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_IS_UNINITIALIZED_HPP
 #define STAN_MATH_PRIM_FUN_IS_UNINITIALIZED_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/lgamma_stirling.hpp b/stan/math/prim/fun/lgamma_stirling.hpp
index 99505c3ff50..f78cadec1a4 100644
--- a/stan/math/prim/fun/lgamma_stirling.hpp
+++ b/stan/math/prim/fun/lgamma_stirling.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/lmultiply.hpp b/stan/math/prim/fun/lmultiply.hpp
index 8e38dc0695d..c36428e59b6 100644
--- a/stan/math/prim/fun/lmultiply.hpp
+++ b/stan/math/prim/fun/lmultiply.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LMULTIPLY_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/log.hpp b/stan/math/prim/fun/log.hpp
index 99b65d25275..14b1a9fb088 100644
--- a/stan/math/prim/fun/log.hpp
+++ b/stan/math/prim/fun/log.hpp
@@ -2,16 +2,13 @@
 #define STAN_MATH_PRIM_FUN_LOG_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
 #include <complex>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/log10.hpp b/stan/math/prim/fun/log10.hpp
index 044ccc547a1..e99e94ed2a0 100644
--- a/stan/math/prim/fun/log10.hpp
+++ b/stan/math/prim/fun/log10.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LOG10_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/log1m_exp.hpp b/stan/math/prim/fun/log1m_exp.hpp
index a7d2f6c3a36..a5ea71f5797 100644
--- a/stan/math/prim/fun/log1m_exp.hpp
+++ b/stan/math/prim/fun/log1m_exp.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/expm1.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/log1m_inv_logit.hpp b/stan/math/prim/fun/log1m_inv_logit.hpp
index 3cda5cbb44b..a371d2a6055 100644
--- a/stan/math/prim/fun/log1m_inv_logit.hpp
+++ b/stan/math/prim/fun/log1m_inv_logit.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LOG1M_INV_LOGIT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/log1p.hpp b/stan/math/prim/fun/log1p.hpp
index 5ff607fdebe..d15d0ec2f9c 100644
--- a/stan/math/prim/fun/log1p.hpp
+++ b/stan/math/prim/fun/log1p.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/log1p_exp.hpp b/stan/math/prim/fun/log1p_exp.hpp
index 426c7534a13..d8b2e4f2a63 100644
--- a/stan/math/prim/fun/log1p_exp.hpp
+++ b/stan/math/prim/fun/log1p_exp.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/log_determinant.hpp b/stan/math/prim/fun/log_determinant.hpp
index 32e05e9761d..227d4686074 100644
--- a/stan/math/prim/fun/log_determinant.hpp
+++ b/stan/math/prim/fun/log_determinant.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/log_determinant_spd.hpp b/stan/math/prim/fun/log_determinant_spd.hpp
index 738817a78b1..f4cdf20e9d0 100644
--- a/stan/math/prim/fun/log_determinant_spd.hpp
+++ b/stan/math/prim/fun/log_determinant_spd.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LOG_DETERMINANT_SPD_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
diff --git a/stan/math/prim/fun/log_gamma_q_dgamma.hpp b/stan/math/prim/fun/log_gamma_q_dgamma.hpp
index 742b23784ba..bbd15f21e9a 100644
--- a/stan/math/prim/fun/log_gamma_q_dgamma.hpp
+++ b/stan/math/prim/fun/log_gamma_q_dgamma.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
-#include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
diff --git a/stan/math/prim/fun/log_mix.hpp b/stan/math/prim/fun/log_mix.hpp
index 558dad2aa32..83490757df6 100644
--- a/stan/math/prim/fun/log_mix.hpp
+++ b/stan/math/prim/fun/log_mix.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
diff --git a/stan/math/prim/fun/log_modified_bessel_first_kind.hpp b/stan/math/prim/fun/log_modified_bessel_first_kind.hpp
index 49a17ac36bf..e6f33b2a0c3 100644
--- a/stan/math/prim/fun/log_modified_bessel_first_kind.hpp
+++ b/stan/math/prim/fun/log_modified_bessel_first_kind.hpp
@@ -14,12 +14,10 @@
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <boost/math/tools/rational.hpp>
diff --git a/stan/math/prim/fun/log_softmax.hpp b/stan/math/prim/fun/log_softmax.hpp
index d6c9017edb6..17b4f16395c 100644
--- a/stan/math/prim/fun/log_softmax.hpp
+++ b/stan/math/prim/fun/log_softmax.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LOG_SOFTMAX_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/log_sum_exp.hpp b/stan/math/prim/fun/log_sum_exp.hpp
index 237504b3801..9ba77055a96 100644
--- a/stan/math/prim/fun/log_sum_exp.hpp
+++ b/stan/math/prim/fun/log_sum_exp.hpp
@@ -3,11 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/log_sum_exp_signed.hpp b/stan/math/prim/fun/log_sum_exp_signed.hpp
index 97a74ac4407..a30e7d8de13 100644
--- a/stan/math/prim/fun/log_sum_exp_signed.hpp
+++ b/stan/math/prim/fun/log_sum_exp_signed.hpp
@@ -2,12 +2,9 @@
 #define STAN_MATH_PRIM_FUN_LOG_SUM_EXP_SIGNED_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log_diff_exp.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <cmath>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/logical_and.hpp b/stan/math/prim/fun/logical_and.hpp
index 0a274b7b829..917da8f3add 100644
--- a/stan/math/prim/fun/logical_and.hpp
+++ b/stan/math/prim/fun/logical_and.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_LOGICAL_AND_HPP
 #define STAN_MATH_PRIM_FUN_LOGICAL_AND_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/logical_eq.hpp b/stan/math/prim/fun/logical_eq.hpp
index 7cc0acb7512..6e1f8374263 100644
--- a/stan/math/prim/fun/logical_eq.hpp
+++ b/stan/math/prim/fun/logical_eq.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_LOGICAL_EQ_HPP
 #define STAN_MATH_PRIM_FUN_LOGICAL_EQ_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/logical_negation.hpp b/stan/math/prim/fun/logical_negation.hpp
index 7cca1691767..fb65eabcd3d 100644
--- a/stan/math/prim/fun/logical_negation.hpp
+++ b/stan/math/prim/fun/logical_negation.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_LOGICAL_NEGATION_HPP
 #define STAN_MATH_PRIM_FUN_LOGICAL_NEGATION_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/logical_neq.hpp b/stan/math/prim/fun/logical_neq.hpp
index 86f27b3c969..0b282471545 100644
--- a/stan/math/prim/fun/logical_neq.hpp
+++ b/stan/math/prim/fun/logical_neq.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_LOGICAL_NEQ_HPP
 #define STAN_MATH_PRIM_FUN_LOGICAL_NEQ_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/logical_or.hpp b/stan/math/prim/fun/logical_or.hpp
index 97e635a4c67..a9fdb6f864e 100644
--- a/stan/math/prim/fun/logical_or.hpp
+++ b/stan/math/prim/fun/logical_or.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_LOGICAL_OR_HPP
 #define STAN_MATH_PRIM_FUN_LOGICAL_OR_HPP
 
-#include <stan/math/prim/meta.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/prim/fun/logit.hpp b/stan/math/prim/fun/logit.hpp
index 298e81b5569..4b333441953 100644
--- a/stan/math/prim/fun/logit.hpp
+++ b/stan/math/prim/fun/logit.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_LOGIT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/matrix_exp_action_handler.hpp b/stan/math/prim/fun/matrix_exp_action_handler.hpp
index 5daf35f64d2..995cec27c28 100644
--- a/stan/math/prim/fun/matrix_exp_action_handler.hpp
+++ b/stan/math/prim/fun/matrix_exp_action_handler.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/ceil.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <unsupported/Eigen/MatrixFunctions>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/max.hpp b/stan/math/prim/fun/max.hpp
index 2f0af8187fc..859c823c2e7 100644
--- a/stan/math/prim/fun/max.hpp
+++ b/stan/math/prim/fun/max.hpp
@@ -3,10 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <algorithm>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/mdivide_left_tri.hpp b/stan/math/prim/fun/mdivide_left_tri.hpp
index 695981e78ca..9eda4260b8c 100644
--- a/stan/math/prim/fun/mdivide_left_tri.hpp
+++ b/stan/math/prim/fun/mdivide_left_tri.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/mdivide_right_ldlt.hpp b/stan/math/prim/fun/mdivide_right_ldlt.hpp
index 8ad77393a03..ea8b810650a 100644
--- a/stan/math/prim/fun/mdivide_right_ldlt.hpp
+++ b/stan/math/prim/fun/mdivide_right_ldlt.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/LDLT_factor.hpp>
 #include <stan/math/prim/fun/mdivide_left_ldlt.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/mdivide_right_spd.hpp b/stan/math/prim/fun/mdivide_right_spd.hpp
index c3c177dbb26..2afbc811d45 100644
--- a/stan/math/prim/fun/mdivide_right_spd.hpp
+++ b/stan/math/prim/fun/mdivide_right_spd.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/mdivide_left_spd.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/mdivide_right_tri.hpp b/stan/math/prim/fun/mdivide_right_tri.hpp
index c27019b24b9..cd1ec8623f5 100644
--- a/stan/math/prim/fun/mdivide_right_tri.hpp
+++ b/stan/math/prim/fun/mdivide_right_tri.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/mean.hpp b/stan/math/prim/fun/mean.hpp
index d0e17740b3f..2b8c46cf1c1 100644
--- a/stan/math/prim/fun/mean.hpp
+++ b/stan/math/prim/fun/mean.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_PRIM_FUN_MEAN_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/min.hpp b/stan/math/prim/fun/min.hpp
index a6e006f4c74..5005eca3cc9 100644
--- a/stan/math/prim/fun/min.hpp
+++ b/stan/math/prim/fun/min.hpp
@@ -2,10 +2,8 @@
 #define STAN_MATH_PRIM_FUN_MIN_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <algorithm>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/modulus.hpp b/stan/math/prim/fun/modulus.hpp
index 7adc2822557..f3ae86bb311 100644
--- a/stan/math/prim/fun/modulus.hpp
+++ b/stan/math/prim/fun/modulus.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <cstddef>
 #include <cstdlib>
 
 namespace stan {
diff --git a/stan/math/prim/fun/multiply.hpp b/stan/math/prim/fun/multiply.hpp
index c7e9d3c38c3..9a4df994448 100644
--- a/stan/math/prim/fun/multiply.hpp
+++ b/stan/math/prim/fun/multiply.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <type_traits>
diff --git a/stan/math/prim/fun/multiply_log.hpp b/stan/math/prim/fun/multiply_log.hpp
index fb5010d9e27..fa0390d6489 100644
--- a/stan/math/prim/fun/multiply_log.hpp
+++ b/stan/math/prim/fun/multiply_log.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_MULTIPLY_LOG_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/norm1.hpp b/stan/math/prim/fun/norm1.hpp
index a89f4136bd9..1dbc1f83997 100644
--- a/stan/math/prim/fun/norm1.hpp
+++ b/stan/math/prim/fun/norm1.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/norm2.hpp b/stan/math/prim/fun/norm2.hpp
index f2bed127ba5..f534f66ad9d 100644
--- a/stan/math/prim/fun/norm2.hpp
+++ b/stan/math/prim/fun/norm2.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/num_elements.hpp b/stan/math/prim/fun/num_elements.hpp
index 574d2739fa1..4290cd5c940 100644
--- a/stan/math/prim/fun/num_elements.hpp
+++ b/stan/math/prim/fun/num_elements.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_NUM_ELEMENTS_HPP
 #define STAN_MATH_PRIM_FUN_NUM_ELEMENTS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <cstdint>
 #include <vector>
diff --git a/stan/math/prim/fun/poisson_binomial_log_probs.hpp b/stan/math/prim/fun/poisson_binomial_log_probs.hpp
index 2e4cc9c79c9..bc6bb9f528f 100644
--- a/stan/math/prim/fun/poisson_binomial_log_probs.hpp
+++ b/stan/math/prim/fun/poisson_binomial_log_probs.hpp
@@ -4,9 +4,7 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <stan/math/prim/fun/log_mix.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/pow.hpp b/stan/math/prim/fun/pow.hpp
index 90db4a4fc85..318c64c1fe5 100644
--- a/stan/math/prim/fun/pow.hpp
+++ b/stan/math/prim/fun/pow.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_POW_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/prim/fun/primitive_value.hpp b/stan/math/prim/fun/primitive_value.hpp
index 27106ea3012..76bbbd9c133 100644
--- a/stan/math/prim/fun/primitive_value.hpp
+++ b/stan/math/prim/fun/primitive_value.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_PRIMITIVE_VALUE_HPP
 #define STAN_MATH_PRIM_FUN_PRIMITIVE_VALUE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <type_traits>
 
diff --git a/stan/math/prim/fun/promote_elements.hpp b/stan/math/prim/fun/promote_elements.hpp
index a40484487c4..a0d93de4875 100644
--- a/stan/math/prim/fun/promote_elements.hpp
+++ b/stan/math/prim/fun/promote_elements.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_PROMOTE_ELEMENTS_HPP
 #define STAN_MATH_PRIM_FUN_PROMOTE_ELEMENTS_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <cstddef>
 #include <vector>
diff --git a/stan/math/prim/fun/promote_scalar.hpp b/stan/math/prim/fun/promote_scalar.hpp
index 461ff45eeef..0c8e0fe9d26 100644
--- a/stan/math/prim/fun/promote_scalar.hpp
+++ b/stan/math/prim/fun/promote_scalar.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_PRIM_FUN_PROMOTE_SCALAR_HPP
 #define STAN_MATH_PRIM_FUN_PROMOTE_SCALAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <vector>
 #include <tuple>
 #include <type_traits>
 
diff --git a/stan/math/prim/fun/quad_form.hpp b/stan/math/prim/fun/quad_form.hpp
index 7af3e337b1a..8e6a0f51f50 100644
--- a/stan/math/prim/fun/quad_form.hpp
+++ b/stan/math/prim/fun/quad_form.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_QUAD_FORM_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/quad_form_diag.hpp b/stan/math/prim/fun/quad_form_diag.hpp
index 2e48916f5b7..f62a26621aa 100644
--- a/stan/math/prim/fun/quad_form_diag.hpp
+++ b/stan/math/prim/fun/quad_form_diag.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_QUAD_FORM_DIAG_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/quad_form_sym.hpp b/stan/math/prim/fun/quad_form_sym.hpp
index 4fe979e5e77..f7b8d17466c 100644
--- a/stan/math/prim/fun/quad_form_sym.hpp
+++ b/stan/math/prim/fun/quad_form_sym.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_QUAD_FORM_SYM_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/read_corr_L.hpp b/stan/math/prim/fun/read_corr_L.hpp
index 69846962124..41f302a5db6 100644
--- a/stan/math/prim/fun/read_corr_L.hpp
+++ b/stan/math/prim/fun/read_corr_L.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/sum.hpp>
 #include <cstddef>
 #include <cmath>
 
diff --git a/stan/math/prim/fun/reverse.hpp b/stan/math/prim/fun/reverse.hpp
index 82c58ca1d70..2a89af0b812 100644
--- a/stan/math/prim/fun/reverse.hpp
+++ b/stan/math/prim/fun/reverse.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_REVERSE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <algorithm>
 #include <vector>
 
diff --git a/stan/math/prim/fun/round.hpp b/stan/math/prim/fun/round.hpp
index 8fb73aa0455..9002a9c55a9 100644
--- a/stan/math/prim/fun/round.hpp
+++ b/stan/math/prim/fun/round.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_ROUND_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/row.hpp b/stan/math/prim/fun/row.hpp
index 9e4ce94f33a..d5ec58d829b 100644
--- a/stan/math/prim/fun/row.hpp
+++ b/stan/math/prim/fun/row.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_ROW_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/rows.hpp b/stan/math/prim/fun/rows.hpp
index b6e5f9925fe..0e54e56c02b 100644
--- a/stan/math/prim/fun/rows.hpp
+++ b/stan/math/prim/fun/rows.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_ROWS_HPP
 #define STAN_MATH_PRIM_FUN_ROWS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <cstdint>
 
diff --git a/stan/math/prim/fun/scalar_seq_view.hpp b/stan/math/prim/fun/scalar_seq_view.hpp
index 7808adbcb5f..5ac529e85f7 100644
--- a/stan/math/prim/fun/scalar_seq_view.hpp
+++ b/stan/math/prim/fun/scalar_seq_view.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SCALAR_SEQ_VIEW_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <type_traits>
 #include <utility>
 
diff --git a/stan/math/prim/fun/scaled_add.hpp b/stan/math/prim/fun/scaled_add.hpp
index e4c15e93bcf..c9bab3b312f 100644
--- a/stan/math/prim/fun/scaled_add.hpp
+++ b/stan/math/prim/fun/scaled_add.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_SCALED_ADD_HPP
 #define STAN_MATH_PRIM_FUN_SCALED_ADD_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <vector>
 #include <cstddef>
 
diff --git a/stan/math/prim/fun/sd.hpp b/stan/math/prim/fun/sd.hpp
index 0241e4bcfc9..4b09c3f9d9c 100644
--- a/stan/math/prim/fun/sd.hpp
+++ b/stan/math/prim/fun/sd.hpp
@@ -2,10 +2,7 @@
 #define STAN_MATH_PRIM_FUN_SD_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/variance.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/fun/segment.hpp b/stan/math/prim/fun/segment.hpp
index 38ef04a1697..7002015d84f 100644
--- a/stan/math/prim/fun/segment.hpp
+++ b/stan/math/prim/fun/segment.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SEGMENT_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/serializer.hpp b/stan/math/prim/fun/serializer.hpp
index 62fcc866f4e..d8943b50239 100644
--- a/stan/math/prim/fun/serializer.hpp
+++ b/stan/math/prim/fun/serializer.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/fun/to_vector.hpp>
 #include <stan/math/prim/fun/to_array_1d.hpp>
 #include <complex>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/sin.hpp b/stan/math/prim/fun/sin.hpp
index 13b06b5908c..43901198eb5 100644
--- a/stan/math/prim/fun/sin.hpp
+++ b/stan/math/prim/fun/sin.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SIN_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/i_times.hpp>
 #include <stan/math/prim/fun/sinh.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/singular_values.hpp b/stan/math/prim/fun/singular_values.hpp
index ad20913e41a..37c07ea6eaf 100644
--- a/stan/math/prim/fun/singular_values.hpp
+++ b/stan/math/prim/fun/singular_values.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/sinh.hpp b/stan/math/prim/fun/sinh.hpp
index ab0203e3113..92d81799b6e 100644
--- a/stan/math/prim/fun/sinh.hpp
+++ b/stan/math/prim/fun/sinh.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SINH_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/size.hpp b/stan/math/prim/fun/size.hpp
index a9005d97b39..a1df207e354 100644
--- a/stan/math/prim/fun/size.hpp
+++ b/stan/math/prim/fun/size.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_PRIM_FUN_SIZE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <cstdint>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/size_mvt.hpp b/stan/math/prim/fun/size_mvt.hpp
index 26b55e145d8..416880a192c 100644
--- a/stan/math/prim/fun/size_mvt.hpp
+++ b/stan/math/prim/fun/size_mvt.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SIZE_MVT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <cstdint>
 #include <stdexcept>
 #include <vector>
diff --git a/stan/math/prim/fun/size_zero.hpp b/stan/math/prim/fun/size_zero.hpp
index c6aa81da3fa..e469695537f 100644
--- a/stan/math/prim/fun/size_zero.hpp
+++ b/stan/math/prim/fun/size_zero.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SIZE_ZERO_HPP
 
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/meta.hpp>
-#include <utility>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/softmax.hpp b/stan/math/prim/fun/softmax.hpp
index 63a51876a60..d7498208c7c 100644
--- a/stan/math/prim/fun/softmax.hpp
+++ b/stan/math/prim/fun/softmax.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 
diff --git a/stan/math/prim/fun/sort_asc.hpp b/stan/math/prim/fun/sort_asc.hpp
index f4180005e12..9cd2b2b45f0 100644
--- a/stan/math/prim/fun/sort_asc.hpp
+++ b/stan/math/prim/fun/sort_asc.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <algorithm>
 #include <vector>
 
diff --git a/stan/math/prim/fun/sort_desc.hpp b/stan/math/prim/fun/sort_desc.hpp
index 4c8d7307d97..6d6347555da 100644
--- a/stan/math/prim/fun/sort_desc.hpp
+++ b/stan/math/prim/fun/sort_desc.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <algorithm>
 #include <functional>
 #include <vector>
diff --git a/stan/math/prim/fun/sort_indices.hpp b/stan/math/prim/fun/sort_indices.hpp
index a77800927c3..b9ffa7aa376 100644
--- a/stan/math/prim/fun/sort_indices.hpp
+++ b/stan/math/prim/fun/sort_indices.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SORT_INDICES_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <algorithm>
 #include <vector>
diff --git a/stan/math/prim/fun/sort_indices_asc.hpp b/stan/math/prim/fun/sort_indices_asc.hpp
index 079bdf3179e..08022560b8e 100644
--- a/stan/math/prim/fun/sort_indices_asc.hpp
+++ b/stan/math/prim/fun/sort_indices_asc.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_SORT_INDICES_ASC_HPP
 #define STAN_MATH_PRIM_FUN_SORT_INDICES_ASC_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/sort_indices.hpp>
-#include <algorithm>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/sort_indices_desc.hpp b/stan/math/prim/fun/sort_indices_desc.hpp
index 51b0ad7d0c6..57e823faa89 100644
--- a/stan/math/prim/fun/sort_indices_desc.hpp
+++ b/stan/math/prim/fun/sort_indices_desc.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_SORT_INDICES_DESC_HPP
 #define STAN_MATH_PRIM_FUN_SORT_INDICES_DESC_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/sort_indices.hpp>
-#include <algorithm>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/sqrt.hpp b/stan/math/prim/fun/sqrt.hpp
index 6208f20efe1..65e312b292e 100644
--- a/stan/math/prim/fun/sqrt.hpp
+++ b/stan/math/prim/fun/sqrt.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SQRT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 #include <cmath>
diff --git a/stan/math/prim/fun/square.hpp b/stan/math/prim/fun/square.hpp
index 9ab83c70691..d504504d2b3 100644
--- a/stan/math/prim/fun/square.hpp
+++ b/stan/math/prim/fun/square.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_SQUARE_HPP
 #define STAN_MATH_PRIM_FUN_SQUARE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/prim/fun/squared_distance.hpp b/stan/math/prim/fun/squared_distance.hpp
index 00d3c0b155b..90611c60a6e 100644
--- a/stan/math/prim/fun/squared_distance.hpp
+++ b/stan/math/prim/fun/squared_distance.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/square.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/stan_print.hpp b/stan/math/prim/fun/stan_print.hpp
index 4c5b5f8f3cb..3539821fd06 100644
--- a/stan/math/prim/fun/stan_print.hpp
+++ b/stan/math/prim/fun/stan_print.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_PRIM_FUN_STAN_PRINT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/for_each.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/sub_col.hpp b/stan/math/prim/fun/sub_col.hpp
index 109a73108f0..dd799874724 100644
--- a/stan/math/prim/fun/sub_col.hpp
+++ b/stan/math/prim/fun/sub_col.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SUB_COL_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/sub_row.hpp b/stan/math/prim/fun/sub_row.hpp
index 737cbd16953..5e0b863a183 100644
--- a/stan/math/prim/fun/sub_row.hpp
+++ b/stan/math/prim/fun/sub_row.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_SUB_ROW_HPP
 
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/subtract.hpp b/stan/math/prim/fun/subtract.hpp
index 4db3099e86e..4f58050ad87 100644
--- a/stan/math/prim/fun/subtract.hpp
+++ b/stan/math/prim/fun/subtract.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/sum.hpp b/stan/math/prim/fun/sum.hpp
index 27a197d1f14..807a7345dca 100644
--- a/stan/math/prim/fun/sum.hpp
+++ b/stan/math/prim/fun/sum.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_SUM_HPP
 #define STAN_MATH_PRIM_FUN_SUM_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <cstddef>
 #include <numeric>
 #include <vector>
 
diff --git a/stan/math/prim/fun/tail.hpp b/stan/math/prim/fun/tail.hpp
index 09697a91799..517713b767f 100644
--- a/stan/math/prim/fun/tail.hpp
+++ b/stan/math/prim/fun/tail.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/tan.hpp b/stan/math/prim/fun/tan.hpp
index 3a922f2222f..c332d3e7d5e 100644
--- a/stan/math/prim/fun/tan.hpp
+++ b/stan/math/prim/fun/tan.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_TAN_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/i_times.hpp>
 #include <stan/math/prim/fun/tanh.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/tanh.hpp b/stan/math/prim/fun/tanh.hpp
index 3937770416f..a87df343bd9 100644
--- a/stan/math/prim/fun/tanh.hpp
+++ b/stan/math/prim/fun/tanh.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_TANH_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/core/operator_division.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
diff --git a/stan/math/prim/fun/trace.hpp b/stan/math/prim/fun/trace.hpp
index 4ea721e5691..4a9d0301455 100644
--- a/stan/math/prim/fun/trace.hpp
+++ b/stan/math/prim/fun/trace.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_TRACE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/trace_dot.hpp b/stan/math/prim/fun/trace_dot.hpp
index 5d840c0a7e4..fe35000b8ae 100644
--- a/stan/math/prim/fun/trace_dot.hpp
+++ b/stan/math/prim/fun/trace_dot.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/trace_gen_inv_quad_form_ldlt.hpp b/stan/math/prim/fun/trace_gen_inv_quad_form_ldlt.hpp
index 0aeea174548..48c582463f6 100644
--- a/stan/math/prim/fun/trace_gen_inv_quad_form_ldlt.hpp
+++ b/stan/math/prim/fun/trace_gen_inv_quad_form_ldlt.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/LDLT_factor.hpp>
 #include <stan/math/prim/fun/mdivide_left_ldlt.hpp>
-#include <stan/math/prim/fun/trace.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/trace_gen_quad_form.hpp b/stan/math/prim/fun/trace_gen_quad_form.hpp
index 855cd19a660..8a0d0c010d0 100644
--- a/stan/math/prim/fun/trace_gen_quad_form.hpp
+++ b/stan/math/prim/fun/trace_gen_quad_form.hpp
@@ -3,12 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/trace.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
-#include <exception>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/trace_inv_quad_form_ldlt.hpp b/stan/math/prim/fun/trace_inv_quad_form_ldlt.hpp
index 25ec287321a..a2d53aca08f 100644
--- a/stan/math/prim/fun/trace_inv_quad_form_ldlt.hpp
+++ b/stan/math/prim/fun/trace_inv_quad_form_ldlt.hpp
@@ -3,12 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/LDLT_factor.hpp>
 #include <stan/math/prim/fun/mdivide_left_ldlt.hpp>
-#include <stan/math/prim/fun/trace.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
-#include <stan/math/prim/fun/multiply.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/trace_quad_form.hpp b/stan/math/prim/fun/trace_quad_form.hpp
index c2412ce1afa..b69ea107b5d 100644
--- a/stan/math/prim/fun/trace_quad_form.hpp
+++ b/stan/math/prim/fun/trace_quad_form.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/fun/transpose.hpp b/stan/math/prim/fun/transpose.hpp
index 2b1cf21f65f..469e5833b0a 100644
--- a/stan/math/prim/fun/transpose.hpp
+++ b/stan/math/prim/fun/transpose.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_TRANSPOSE_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/unitspaced_array.hpp b/stan/math/prim/fun/unitspaced_array.hpp
index 75f01faf3f4..2b32fb615c5 100644
--- a/stan/math/prim/fun/unitspaced_array.hpp
+++ b/stan/math/prim/fun/unitspaced_array.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/value_of.hpp b/stan/math/prim/fun/value_of.hpp
index 21d80deecc4..c063320b98c 100644
--- a/stan/math/prim/fun/value_of.hpp
+++ b/stan/math/prim/fun/value_of.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_PRIM_FUN_VALUE_OF_HPP
 #define STAN_MATH_PRIM_FUN_VALUE_OF_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/functor/make_holder_tuple.hpp>
-#include <cstddef>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/fun/value_of_rec.hpp b/stan/math/prim/fun/value_of_rec.hpp
index 32b81a3a5ca..702d463f205 100644
--- a/stan/math/prim/fun/value_of_rec.hpp
+++ b/stan/math/prim/fun/value_of_rec.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUN_VALUE_OF_REC_HPP
 #define STAN_MATH_PRIM_FUN_VALUE_OF_REC_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/functor/make_holder_tuple.hpp>
diff --git a/stan/math/prim/fun/variance.hpp b/stan/math/prim/fun/variance.hpp
index 072be627b1c..406eb1ee5f3 100644
--- a/stan/math/prim/fun/variance.hpp
+++ b/stan/math/prim/fun/variance.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/mean.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/vec_concat.hpp b/stan/math/prim/fun/vec_concat.hpp
index 67cd6f5b599..79b23b8ce3d 100644
--- a/stan/math/prim/fun/vec_concat.hpp
+++ b/stan/math/prim/fun/vec_concat.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUN_VEC_CONCAT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <type_traits>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/vector_seq_view.hpp b/stan/math/prim/fun/vector_seq_view.hpp
index 11b839786d9..431467f6794 100644
--- a/stan/math/prim/fun/vector_seq_view.hpp
+++ b/stan/math/prim/fun/vector_seq_view.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_PRIM_FUN_VECTOR_SEQ_VIEW_HPP
 #define STAN_MATH_PRIM_FUN_VECTOR_SEQ_VIEW_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <vector>
 
 namespace stan {
 namespace internal {
diff --git a/stan/math/prim/fun/welford_covar_estimator.hpp b/stan/math/prim/fun/welford_covar_estimator.hpp
index 819e1ad769a..8c8f9c924ea 100644
--- a/stan/math/prim/fun/welford_covar_estimator.hpp
+++ b/stan/math/prim/fun/welford_covar_estimator.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_WELFORD_COVAR_ESTIMATOR_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/welford_var_estimator.hpp b/stan/math/prim/fun/welford_var_estimator.hpp
index 73dab695153..83a8c17b476 100644
--- a/stan/math/prim/fun/welford_var_estimator.hpp
+++ b/stan/math/prim/fun/welford_var_estimator.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUN_WELFORD_VAR_ESTIMATOR_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/fun/zip_index.hpp b/stan/math/prim/fun/zip_index.hpp
index e9c93fdf0cd..f6247363121 100644
--- a/stan/math/prim/fun/zip_index.hpp
+++ b/stan/math/prim/fun/zip_index.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/functor/algebra_solver_adapter.hpp b/stan/math/prim/functor/algebra_solver_adapter.hpp
index 528912c660e..32dd469d247 100644
--- a/stan/math/prim/functor/algebra_solver_adapter.hpp
+++ b/stan/math/prim/functor/algebra_solver_adapter.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUNCTOR_ALGEBRA_SOLVER_ADAPTER_HPP
 
 #include <ostream>
-#include <vector>
 
 /**
  * Adapt the non-variadic algebra_solver_newton and algebra_solver_powell
diff --git a/stan/math/prim/functor/apply_scalar_binary.hpp b/stan/math/prim/functor/apply_scalar_binary.hpp
index 7605d615f7b..e3e794ed8d3 100644
--- a/stan/math/prim/functor/apply_scalar_binary.hpp
+++ b/stan/math/prim/functor/apply_scalar_binary.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/meta/is_stan_scalar.hpp>
-#include <stan/math/prim/meta/is_container.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/check_matching_sizes.hpp>
 #include <stan/math/prim/fun/num_elements.hpp>
diff --git a/stan/math/prim/functor/apply_scalar_ternary.hpp b/stan/math/prim/functor/apply_scalar_ternary.hpp
index 299712f422d..7b0e97f05ab 100644
--- a/stan/math/prim/functor/apply_scalar_ternary.hpp
+++ b/stan/math/prim/functor/apply_scalar_ternary.hpp
@@ -5,10 +5,8 @@
 #include <stan/math/prim/meta/is_stan_scalar.hpp>
 #include <stan/math/prim/meta/is_container.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/check_matching_sizes.hpp>
-#include <stan/math/prim/fun/num_elements.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/functor/apply_scalar_unary.hpp b/stan/math/prim/functor/apply_scalar_unary.hpp
index f37a57f8740..3fd954788d1 100644
--- a/stan/math/prim/functor/apply_scalar_unary.hpp
+++ b/stan/math/prim/functor/apply_scalar_unary.hpp
@@ -1,13 +1,11 @@
 #ifndef STAN_MATH_PRIM_FUNCTOR_APPLY_SCALAR_UNARY_HPP
 #define STAN_MATH_PRIM_FUNCTOR_APPLY_SCALAR_UNARY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/prim/meta/is_complex.hpp>
 #include <stan/math/prim/meta/holder.hpp>
 #include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
-#include <stan/math/prim/meta/is_vector_like.hpp>
 #include <stan/math/prim/meta/plain_type.hpp>
 #include <utility>
 #include <vector>
diff --git a/stan/math/prim/functor/apply_vector_unary.hpp b/stan/math/prim/functor/apply_vector_unary.hpp
index 61affed66a8..6aabe02c9f5 100644
--- a/stan/math/prim/functor/apply_vector_unary.hpp
+++ b/stan/math/prim/functor/apply_vector_unary.hpp
@@ -4,10 +4,8 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/meta/is_stan_scalar.hpp>
-#include <stan/math/prim/meta/is_container.hpp>
 #include <stan/math/prim/meta/is_eigen_matrix_base.hpp>
 #include <stan/math/prim/meta/plain_type.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/functor/broadcast_array.hpp b/stan/math/prim/functor/broadcast_array.hpp
index e6af2967f1b..bb443479b84 100644
--- a/stan/math/prim/functor/broadcast_array.hpp
+++ b/stan/math/prim/functor/broadcast_array.hpp
@@ -3,13 +3,9 @@
 
 #include <stan/math/prim/functor/broadcast_array_fwd.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/is_var_or_arithmetic.hpp>
 #include <stan/math/prim/meta/promote_scalar_type.hpp>
-#include <stan/math/prim/meta/ref_type.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <functional>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/functor/coupled_ode_system.hpp b/stan/math/prim/functor/coupled_ode_system.hpp
index c88802d2ce9..22892028185 100644
--- a/stan/math/prim/functor/coupled_ode_system.hpp
+++ b/stan/math/prim/functor/coupled_ode_system.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <ostream>
diff --git a/stan/math/prim/functor/filter_map.hpp b/stan/math/prim/functor/filter_map.hpp
index e6fa04fba3e..ac88dca4621 100644
--- a/stan/math/prim/functor/filter_map.hpp
+++ b/stan/math/prim/functor/filter_map.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/functor/make_holder_tuple.hpp>
 #include <stan/math/prim/functor/tuple_concat.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <functional>
 #include <tuple>
 #include <utility>
 
diff --git a/stan/math/prim/functor/for_each.hpp b/stan/math/prim/functor/for_each.hpp
index 4e617a83732..108a51a05e5 100644
--- a/stan/math/prim/functor/for_each.hpp
+++ b/stan/math/prim/functor/for_each.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUNCTOR_FOR_EACH_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <functional>
 #include <tuple>
 #include <utility>
 
diff --git a/stan/math/prim/functor/hcubature.hpp b/stan/math/prim/functor/hcubature.hpp
index 710bcaf4d0a..a44171b0891 100644
--- a/stan/math/prim/functor/hcubature.hpp
+++ b/stan/math/prim/functor/hcubature.hpp
@@ -19,13 +19,10 @@
 #define STAN_MATH_PRIM_FUNCTOR_HCUBATURE_HPP
 
 #include <stan/math/prim/fun/choose.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
 #include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/fmax.hpp>
-#include <stan/math/prim/fun/max.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/functor/integrate_1d.hpp>
-#include <queue>
 #include <tuple>
 
 namespace stan {
diff --git a/stan/math/prim/functor/integrate_1d.hpp b/stan/math/prim/functor/integrate_1d.hpp
index 73c3b9f35be..ee6c7d5fff8 100644
--- a/stan/math/prim/functor/integrate_1d.hpp
+++ b/stan/math/prim/functor/integrate_1d.hpp
@@ -9,7 +9,6 @@
 #include <boost/math/quadrature/sinh_sinh.hpp>
 #include <boost/math/quadrature/tanh_sinh.hpp>
 #include <cmath>
-#include <functional>
 #include <ostream>
 #include <vector>
 
diff --git a/stan/math/prim/functor/integrate_1d_double_exponential.hpp b/stan/math/prim/functor/integrate_1d_double_exponential.hpp
index a8aa4b83e48..c9fdac1b2bc 100644
--- a/stan/math/prim/functor/integrate_1d_double_exponential.hpp
+++ b/stan/math/prim/functor/integrate_1d_double_exponential.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/functor/integrate_1d_adapter.hpp>
 #include <boost/math/quadrature/exp_sinh.hpp>
 #include <boost/math/quadrature/sinh_sinh.hpp>
 #include <boost/math/quadrature/tanh_sinh.hpp>
diff --git a/stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp b/stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp
index 3a3ef788bbd..adedddd8669 100644
--- a/stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp
+++ b/stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/functor/integrate_1d_adapter.hpp>
 #include <boost/math/quadrature/gauss_kronrod.hpp>
 #include <algorithm>
 #include <cmath>
diff --git a/stan/math/prim/functor/make_holder_tuple.hpp b/stan/math/prim/functor/make_holder_tuple.hpp
index f436ccfcc28..01269daf893 100644
--- a/stan/math/prim/functor/make_holder_tuple.hpp
+++ b/stan/math/prim/functor/make_holder_tuple.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <functional>
 #include <tuple>
 #include <utility>
 
diff --git a/stan/math/prim/functor/map_if.hpp b/stan/math/prim/functor/map_if.hpp
index 05838502d69..221b803b9a0 100644
--- a/stan/math/prim/functor/map_if.hpp
+++ b/stan/math/prim/functor/map_if.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/functor/make_holder_tuple.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <functional>
-#include <tuple>
 #include <utility>
 
 namespace stan {
diff --git a/stan/math/prim/functor/map_rect.hpp b/stan/math/prim/functor/map_rect.hpp
index 540ad410521..1200fc81182 100644
--- a/stan/math/prim/functor/map_rect.hpp
+++ b/stan/math/prim/functor/map_rect.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/dims.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 
 #define STAN_REGISTER_MAP_RECT(CALLID, FUNCTOR)
 
diff --git a/stan/math/prim/functor/map_rect_combine.hpp b/stan/math/prim/functor/map_rect_combine.hpp
index a3e34aa0745..52e46837f09 100644
--- a/stan/math/prim/functor/map_rect_combine.hpp
+++ b/stan/math/prim/functor/map_rect_combine.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
-#include <stan/math/prim/functor/operands_and_partials.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 #include <vector>
diff --git a/stan/math/prim/functor/map_rect_concurrent.hpp b/stan/math/prim/functor/map_rect_concurrent.hpp
index 31dd3398747..a494cc3199b 100644
--- a/stan/math/prim/functor/map_rect_concurrent.hpp
+++ b/stan/math/prim/functor/map_rect_concurrent.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_FUNCTOR_MAP_RECT_CONCURRENT_HPP
 
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/prim/functor/map_rect_reduce.hpp b/stan/math/prim/functor/map_rect_reduce.hpp
index e7852e9e194..a01c295e8b1 100644
--- a/stan/math/prim/functor/map_rect_reduce.hpp
+++ b/stan/math/prim/functor/map_rect_reduce.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_FUNCTOR_MAP_RECT_REDUCE_HPP
 #define STAN_MATH_PRIM_FUNCTOR_MAP_RECT_REDUCE_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 
 #include <vector>
diff --git a/stan/math/prim/functor/mpi_cluster.hpp b/stan/math/prim/functor/mpi_cluster.hpp
index a44637acb56..a336517785c 100644
--- a/stan/math/prim/functor/mpi_cluster.hpp
+++ b/stan/math/prim/functor/mpi_cluster.hpp
@@ -5,17 +5,11 @@
 
 #include <stan/math/prim/functor/mpi_command.hpp>
 
-#include <boost/mpi/allocator.hpp>
 #include <boost/mpi/collectives.hpp>
 #include <boost/mpi/communicator.hpp>
-#include <boost/mpi/datatype.hpp>
 #include <boost/mpi/environment.hpp>
-#include <boost/mpi/nonblocking.hpp>
-#include <boost/mpi/operations.hpp>
 
 #include <boost/serialization/access.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 
 #include <mutex>
diff --git a/stan/math/prim/functor/mpi_parallel_call.hpp b/stan/math/prim/functor/mpi_parallel_call.hpp
index c06ef455683..450d587256a 100644
--- a/stan/math/prim/functor/mpi_parallel_call.hpp
+++ b/stan/math/prim/functor/mpi_parallel_call.hpp
@@ -12,7 +12,6 @@
 #include <mutex>
 #include <algorithm>
 #include <vector>
-#include <type_traits>
 #include <functional>
 
 namespace stan {
diff --git a/stan/math/prim/functor/operands_and_partials.hpp b/stan/math/prim/functor/operands_and_partials.hpp
index b2e42c5315b..c61819809b2 100644
--- a/stan/math/prim/functor/operands_and_partials.hpp
+++ b/stan/math/prim/functor/operands_and_partials.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_PRIM_FUNCTOR_OPERANDS_AND_PARTIALS_HPP
 #define STAN_MATH_PRIM_FUNCTOR_OPERANDS_AND_PARTIALS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/meta/return_type.hpp>
-#include <vector>
 #include <type_traits>
-#include <tuple>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/functor/partials_propagator.hpp b/stan/math/prim/functor/partials_propagator.hpp
index b28389a2818..305aea055c4 100644
--- a/stan/math/prim/functor/partials_propagator.hpp
+++ b/stan/math/prim/functor/partials_propagator.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_PRIM_FUNCTOR_PARTIALS_PROPOGATOR_HPP
 #define STAN_MATH_PRIM_FUNCTOR_PARTIALS_PROPOGATOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/require_generics.hpp>
 #include <stan/math/prim/meta/return_type.hpp>
 #include <stan/math/prim/meta/plain_type.hpp>
 #include <stan/math/prim/functor/operands_and_partials.hpp>
-#include <vector>
 #include <type_traits>
 #include <tuple>
 
diff --git a/stan/math/prim/functor/reduce_sum.hpp b/stan/math/prim/functor/reduce_sum.hpp
index ff0b4f5d592..e8de01b11f3 100644
--- a/stan/math/prim/functor/reduce_sum.hpp
+++ b/stan/math/prim/functor/reduce_sum.hpp
@@ -5,13 +5,10 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 
-#include <tbb/task_arena.h>
 #include <tbb/parallel_reduce.h>
 #include <tbb/blocked_range.h>
 
-#include <algorithm>
 #include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/functor/reduce_sum_static.hpp b/stan/math/prim/functor/reduce_sum_static.hpp
index 09d570fa20e..b9269f8d24f 100644
--- a/stan/math/prim/functor/reduce_sum_static.hpp
+++ b/stan/math/prim/functor/reduce_sum_static.hpp
@@ -4,12 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/functor/reduce_sum.hpp>
-#include <tbb/task_arena.h>
-#include <tbb/parallel_reduce.h>
-#include <tbb/blocked_range.h>
-
-#include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/functor/tuple_concat.hpp b/stan/math/prim/functor/tuple_concat.hpp
index 965ad233d6d..920ccb4050b 100644
--- a/stan/math/prim/functor/tuple_concat.hpp
+++ b/stan/math/prim/functor/tuple_concat.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_FUNCTOR_TUPLE_CONCAT_HPP
 
 #include <stan/math/prim/functor/make_holder_tuple.hpp>
-#include <stan/math/prim/meta.hpp>
-#include <functional>
 #include <tuple>
 #include <utility>
 
diff --git a/stan/math/prim/meta/base_type.hpp b/stan/math/prim/meta/base_type.hpp
index 26f52e875f5..21ff60801f6 100644
--- a/stan/math/prim/meta/base_type.hpp
+++ b/stan/math/prim/meta/base_type.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_PRIM_META_BASE_TYPE_HPP
 #define STAN_MATH_PRIM_META_BASE_TYPE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/value_type.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
 #include <type_traits>
-#include <vector>
 
 namespace stan {
 
diff --git a/stan/math/prim/meta/contains_std_vector.hpp b/stan/math/prim/meta/contains_std_vector.hpp
index 75b2dfba6b7..7f17da18340 100644
--- a/stan/math/prim/meta/contains_std_vector.hpp
+++ b/stan/math/prim/meta/contains_std_vector.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_PRIM_META_CONTAINS_STD_VECTOR_HPP
 #define STAN_MATH_PRIM_META_CONTAINS_STD_VECTOR_HPP
 
-#include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/disjunction.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
-#include <type_traits>
 
 namespace stan {
 /** \ingroup type_trait
diff --git a/stan/math/prim/meta/include_summand.hpp b/stan/math/prim/meta/include_summand.hpp
index 9d8d25fb96f..8b637e84c46 100644
--- a/stan/math/prim/meta/include_summand.hpp
+++ b/stan/math/prim/meta/include_summand.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/is_constant.hpp>
 #include <stan/math/prim/meta/scalar_type.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/meta/index_type.hpp b/stan/math/prim/meta/index_type.hpp
index b0d85caf8fe..ec8de9c75c8 100644
--- a/stan/math/prim/meta/index_type.hpp
+++ b/stan/math/prim/meta/index_type.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_PRIM_META_INDEX_TYPE_HPP
 #define STAN_MATH_PRIM_META_INDEX_TYPE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
-#include <stan/math/prim/meta/require_generics.hpp>
 #include <type_traits>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/meta/is_autodiff.hpp b/stan/math/prim/meta/is_autodiff.hpp
index a5eec9f62e3..7c14b275148 100644
--- a/stan/math/prim/meta/is_autodiff.hpp
+++ b/stan/math/prim/meta/is_autodiff.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_PRIM_META_IS_AUTODIFF_HPP
 #define STAN_MATH_PRIM_META_IS_AUTODIFF_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/bool_constant.hpp>
-#include <stan/math/prim/meta/conjunction.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/prim/meta/is_fvar.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
@@ -11,7 +9,6 @@
 #include <stan/math/prim/meta/require_helpers.hpp>
 #include <stan/math/prim/meta/scalar_type.hpp>
 #include <stan/math/prim/meta/value_type.hpp>
-#include <complex>
 #include <type_traits>
 
 namespace stan {
diff --git a/stan/math/prim/meta/is_constant.hpp b/stan/math/prim/meta/is_constant.hpp
index 1776d60d303..a8a3584e053 100644
--- a/stan/math/prim/meta/is_constant.hpp
+++ b/stan/math/prim/meta/is_constant.hpp
@@ -1,16 +1,12 @@
 #ifndef STAN_MATH_PRIM_META_IS_CONSTANT_HPP
 #define STAN_MATH_PRIM_META_IS_CONSTANT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/conjunction.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/scalar_type.hpp>
-#include <stan/math/prim/meta/value_type.hpp>
 #include <stan/math/prim/meta/require_generics.hpp>
 #include <type_traits>
-#include <vector>
 namespace stan {
 
 /** \ingroup type_trait
diff --git a/stan/math/prim/meta/is_container.hpp b/stan/math/prim/meta/is_container.hpp
index 9928a154c9b..0f87e6599fc 100644
--- a/stan/math/prim/meta/is_container.hpp
+++ b/stan/math/prim/meta/is_container.hpp
@@ -6,10 +6,8 @@
 #include <stan/math/prim/meta/is_autodiff.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/prim/meta/is_vector.hpp>
-#include <stan/math/prim/meta/is_var_matrix.hpp>
 #include <stan/math/prim/meta/base_type.hpp>
 #include <stan/math/prim/meta/scalar_type.hpp>
-#include <stan/math/prim/meta/value_type.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
 
 #include <type_traits>
diff --git a/stan/math/prim/meta/is_container_or_var_matrix.hpp b/stan/math/prim/meta/is_container_or_var_matrix.hpp
index 231d1a028f6..b1149220d20 100644
--- a/stan/math/prim/meta/is_container_or_var_matrix.hpp
+++ b/stan/math/prim/meta/is_container_or_var_matrix.hpp
@@ -3,15 +3,8 @@
 
 #include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/disjunction.hpp>
-#include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/is_vector.hpp>
 #include <stan/math/prim/meta/is_container.hpp>
 #include <stan/math/prim/meta/is_var_matrix.hpp>
-#include <stan/math/prim/meta/scalar_type.hpp>
-#include <stan/math/prim/meta/value_type.hpp>
-#include <stan/math/prim/meta/require_helpers.hpp>
-
-#include <type_traits>
 
 namespace stan {
 
diff --git a/stan/math/prim/meta/is_dense_dynamic.hpp b/stan/math/prim/meta/is_dense_dynamic.hpp
index f82c116223e..4cb8636e641 100644
--- a/stan/math/prim/meta/is_dense_dynamic.hpp
+++ b/stan/math/prim/meta/is_dense_dynamic.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_PRIM_META_IS_DENSE_DYNAMIC_HPP
 #define STAN_MATH_PRIM_META_IS_DENSE_DYNAMIC_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/is_base_pointer_convertible.hpp>
 #include <stan/math/prim/meta/is_eigen_matrix.hpp>
-#include <stan/math/prim/meta/is_eigen_dense_base.hpp>
 #include <stan/math/prim/meta/is_eigen_dense_dynamic.hpp>
 #include <stan/math/prim/meta/is_var.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
diff --git a/stan/math/prim/meta/is_double_or_int.hpp b/stan/math/prim/meta/is_double_or_int.hpp
index 147eca543e5..9f3bdd9a91b 100644
--- a/stan/math/prim/meta/is_double_or_int.hpp
+++ b/stan/math/prim/meta/is_double_or_int.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_PRIM_META_IS_DOUBLE_OR_INT_HPP
 
 #include <stan/math/prim/meta/require_helpers.hpp>
-#include <stan/math/prim/meta/scalar_type.hpp>
-#include <stan/math/prim/meta/value_type.hpp>
 #include <type_traits>
 
 namespace stan {
diff --git a/stan/math/prim/meta/is_eigen_dense_dynamic.hpp b/stan/math/prim/meta/is_eigen_dense_dynamic.hpp
index b536a5cabee..1367b73de15 100644
--- a/stan/math/prim/meta/is_eigen_dense_dynamic.hpp
+++ b/stan/math/prim/meta/is_eigen_dense_dynamic.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_PRIM_META_IS_EIGEN_DENSE_DYNAMIC_HPP
 #define STAN_MATH_PRIM_META_IS_EIGEN_DENSE_DYNAMIC_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/is_eigen_matrix.hpp>
 #include <stan/math/prim/meta/is_eigen_dense_base.hpp>
-#include <stan/math/prim/meta/is_base_pointer_convertible.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
 #include <type_traits>
 
diff --git a/stan/math/prim/meta/is_eigen_matrix.hpp b/stan/math/prim/meta/is_eigen_matrix.hpp
index 63e021d233e..85fc6cdb67d 100644
--- a/stan/math/prim/meta/is_eigen_matrix.hpp
+++ b/stan/math/prim/meta/is_eigen_matrix.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta/bool_constant.hpp>
-#include <stan/math/prim/meta/conjunction.hpp>
-#include <stan/math/prim/meta/disjunction.hpp>
 #include <stan/math/prim/meta/is_base_pointer_convertible.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
 #include <type_traits>
diff --git a/stan/math/prim/meta/is_real.hpp b/stan/math/prim/meta/is_real.hpp
index 1f7aaccab41..15e449a687c 100644
--- a/stan/math/prim/meta/is_real.hpp
+++ b/stan/math/prim/meta/is_real.hpp
@@ -6,8 +6,6 @@
 #include <stan/math/prim/meta/is_complex.hpp>
 #include <stan/math/prim/meta/is_fvar.hpp>
 #include <stan/math/prim/meta/is_var.hpp>
-#include <stan/math/prim/meta/is_var_or_arithmetic.hpp>
-#include <stan/math/prim/meta/scalar_type.hpp>
 #include <stan/math/prim/meta/value_type.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
 
diff --git a/stan/math/prim/meta/is_stan_scalar.hpp b/stan/math/prim/meta/is_stan_scalar.hpp
index 60abe7c7819..1cf82f82dbe 100644
--- a/stan/math/prim/meta/is_stan_scalar.hpp
+++ b/stan/math/prim/meta/is_stan_scalar.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/meta/is_complex.hpp>
 #include <stan/math/prim/meta/is_fvar.hpp>
 #include <stan/math/prim/meta/is_var.hpp>
-#include <stan/math/prim/meta/is_var_or_arithmetic.hpp>
 #include <stan/math/prim/meta/scalar_type.hpp>
 #include <stan/math/prim/meta/value_type.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
diff --git a/stan/math/prim/meta/is_stan_scalar_or_eigen.hpp b/stan/math/prim/meta/is_stan_scalar_or_eigen.hpp
index ffa04bea597..f00a6fe7b6b 100644
--- a/stan/math/prim/meta/is_stan_scalar_or_eigen.hpp
+++ b/stan/math/prim/meta/is_stan_scalar_or_eigen.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/meta/bool_constant.hpp>
 #include <stan/math/prim/meta/is_stan_scalar.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/scalar_type.hpp>
-#include <stan/math/prim/meta/conjunction.hpp>
 #include <stan/math/prim/meta/require_helpers.hpp>
 
 #include <type_traits>
diff --git a/stan/math/prim/meta/is_var_dense_dynamic.hpp b/stan/math/prim/meta/is_var_dense_dynamic.hpp
index e44d6622404..45313deec30 100644
--- a/stan/math/prim/meta/is_var_dense_dynamic.hpp
+++ b/stan/math/prim/meta/is_var_dense_dynamic.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_META_IS_VAR_DENSE_DYNAMIC
 
 #include <stan/math/prim/meta/conjunction.hpp>
-#include <stan/math/prim/meta/disjunction.hpp>
 #include <stan/math/prim/meta/is_var.hpp>
 #include <stan/math/prim/meta/is_eigen_dense_dynamic.hpp>
 
diff --git a/stan/math/prim/meta/is_var_eigen.hpp b/stan/math/prim/meta/is_var_eigen.hpp
index f86f37ac34a..e0c8ce33f75 100644
--- a/stan/math/prim/meta/is_var_eigen.hpp
+++ b/stan/math/prim/meta/is_var_eigen.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_META_IS_VAR_EIGEN
 
 #include <stan/math/prim/meta/conjunction.hpp>
-#include <stan/math/prim/meta/disjunction.hpp>
 #include <stan/math/prim/meta/is_var.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 
diff --git a/stan/math/prim/meta/partials_return_type.hpp b/stan/math/prim/meta/partials_return_type.hpp
index a220ea7af5b..778d103080c 100644
--- a/stan/math/prim/meta/partials_return_type.hpp
+++ b/stan/math/prim/meta/partials_return_type.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta/partials_type.hpp>
 #include <stan/math/prim/meta/promote_args.hpp>
 #include <stan/math/prim/meta/scalar_type.hpp>
-#include <type_traits>
 
 namespace stan {
 
diff --git a/stan/math/prim/meta/ref_type.hpp b/stan/math/prim/meta/ref_type.hpp
index 538370c997b..0e1da0a8480 100644
--- a/stan/math/prim/meta/ref_type.hpp
+++ b/stan/math/prim/meta/ref_type.hpp
@@ -2,11 +2,9 @@
 #define STAN_MATH_PRIM_META_REF_TYPE_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta/is_constant.hpp>
 #include <stan/math/prim/meta/is_autodiff.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/prim/meta/is_arena_matrix.hpp>
-#include <stan/math/prim/meta/is_vector.hpp>
 #include <stan/math/prim/meta/plain_type.hpp>
 #include <type_traits>
 
diff --git a/stan/math/prim/meta/scalar_type.hpp b/stan/math/prim/meta/scalar_type.hpp
index 0c74957edef..eb749f82a88 100644
--- a/stan/math/prim/meta/scalar_type.hpp
+++ b/stan/math/prim/meta/scalar_type.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_META_SCALAR_TYPE_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta/require_helpers.hpp>
 #include <type_traits>
 #include <vector>
 
diff --git a/stan/math/prim/meta/value_type.hpp b/stan/math/prim/meta/value_type.hpp
index f4b2808c6b4..ff8ecc74b7a 100644
--- a/stan/math/prim/meta/value_type.hpp
+++ b/stan/math/prim/meta/value_type.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_PRIM_META_VALUE_TYPE_HPP
 #define STAN_MATH_PRIM_META_VALUE_TYPE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta/require_helpers.hpp>
 #include <type_traits>
-#include <vector>
 
 namespace stan {
 
diff --git a/stan/math/prim/meta/void_t.hpp b/stan/math/prim/meta/void_t.hpp
index f51d9fa66fa..0fab845c063 100644
--- a/stan/math/prim/meta/void_t.hpp
+++ b/stan/math/prim/meta/void_t.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_PRIM_META_VOID_T_HPP
 
 #include <stan/math/prim/meta/bool_constant.hpp>
-#include <type_traits>
 
 namespace stan {
 
diff --git a/stan/math/prim/prob/bernoulli_cdf.hpp b/stan/math/prim/prob/bernoulli_cdf.hpp
index 649adcf674b..1b5b5e76288 100644
--- a/stan/math/prim/prob/bernoulli_cdf.hpp
+++ b/stan/math/prim/prob/bernoulli_cdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/any.hpp>
 #include <stan/math/prim/fun/select.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/prim/prob/bernoulli_lccdf.hpp b/stan/math/prim/prob/bernoulli_lccdf.hpp
index e8e8b4dce30..935ed2e79c5 100644
--- a/stan/math/prim/prob/bernoulli_lccdf.hpp
+++ b/stan/math/prim/prob/bernoulli_lccdf.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/select.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/prim/prob/bernoulli_logit_glm_lpmf.hpp b/stan/math/prim/prob/bernoulli_logit_glm_lpmf.hpp
index 29806c5b895..1ff565fe8be 100644
--- a/stan/math/prim/prob/bernoulli_logit_glm_lpmf.hpp
+++ b/stan/math/prim/prob/bernoulli_logit_glm_lpmf.hpp
@@ -7,10 +7,7 @@
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
diff --git a/stan/math/prim/prob/bernoulli_logit_glm_rng.hpp b/stan/math/prim/prob/bernoulli_logit_glm_rng.hpp
index 5a65aad3e57..3fd2fd0b801 100644
--- a/stan/math/prim/prob/bernoulli_logit_glm_rng.hpp
+++ b/stan/math/prim/prob/bernoulli_logit_glm_rng.hpp
@@ -5,12 +5,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <boost/random/bernoulli_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/bernoulli_logit_lpmf.hpp b/stan/math/prim/prob/bernoulli_logit_lpmf.hpp
index f3eca1096a6..5fd34c03e16 100644
--- a/stan/math/prim/prob/bernoulli_logit_lpmf.hpp
+++ b/stan/math/prim/prob/bernoulli_logit_lpmf.hpp
@@ -4,14 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_value_array_or_scalar.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
diff --git a/stan/math/prim/prob/bernoulli_lpmf.hpp b/stan/math/prim/prob/bernoulli_lpmf.hpp
index c13e4dee1ee..0d624efb26e 100644
--- a/stan/math/prim/prob/bernoulli_lpmf.hpp
+++ b/stan/math/prim/prob/bernoulli_lpmf.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
diff --git a/stan/math/prim/prob/beta_binomial_cdf.hpp b/stan/math/prim/prob/beta_binomial_cdf.hpp
index 7d90678d154..d6fa0a479c4 100644
--- a/stan/math/prim/prob/beta_binomial_cdf.hpp
+++ b/stan/math/prim/prob/beta_binomial_cdf.hpp
@@ -3,10 +3,7 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/beta.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
 #include <stan/math/prim/fun/grad_F32.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
@@ -14,7 +11,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/beta_binomial_lccdf.hpp b/stan/math/prim/prob/beta_binomial_lccdf.hpp
index d611d23b700..36f33e8cf4c 100644
--- a/stan/math/prim/prob/beta_binomial_lccdf.hpp
+++ b/stan/math/prim/prob/beta_binomial_lccdf.hpp
@@ -3,19 +3,15 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
 #include <stan/math/prim/fun/grad_F32.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/beta_binomial_lcdf.hpp b/stan/math/prim/prob/beta_binomial_lcdf.hpp
index eea4ceb5e1e..27e71450d91 100644
--- a/stan/math/prim/prob/beta_binomial_lcdf.hpp
+++ b/stan/math/prim/prob/beta_binomial_lcdf.hpp
@@ -3,19 +3,15 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
 #include <stan/math/prim/fun/grad_F32.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/beta_binomial_lpmf.hpp b/stan/math/prim/prob/beta_binomial_lpmf.hpp
index 12065ce56aa..ccd7aad6d4f 100644
--- a/stan/math/prim/prob/beta_binomial_lpmf.hpp
+++ b/stan/math/prim/prob/beta_binomial_lpmf.hpp
@@ -6,14 +6,11 @@
 #include <stan/math/prim/fun/binomial_coefficient_log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/grad_F32.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/beta_lccdf.hpp b/stan/math/prim/prob/beta_lccdf.hpp
index 66232243893..3ae5ef0590f 100644
--- a/stan/math/prim/prob/beta_lccdf.hpp
+++ b/stan/math/prim/prob/beta_lccdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/beta_lpdf.hpp b/stan/math/prim/prob/beta_lpdf.hpp
index 1424d7f5703..8d514a700ad 100644
--- a/stan/math/prim/prob/beta_lpdf.hpp
+++ b/stan/math/prim/prob/beta_lpdf.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
diff --git a/stan/math/prim/prob/beta_neg_binomial_cdf.hpp b/stan/math/prim/prob/beta_neg_binomial_cdf.hpp
index 00aa643ad8b..7edcbd19117 100644
--- a/stan/math/prim/prob/beta_neg_binomial_cdf.hpp
+++ b/stan/math/prim/prob/beta_neg_binomial_cdf.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
diff --git a/stan/math/prim/prob/beta_neg_binomial_lpmf.hpp b/stan/math/prim/prob/beta_neg_binomial_lpmf.hpp
index 8bb8eb14981..dcf35247bd2 100644
--- a/stan/math/prim/prob/beta_neg_binomial_lpmf.hpp
+++ b/stan/math/prim/prob/beta_neg_binomial_lpmf.hpp
@@ -3,15 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/beta_proportion_lccdf.hpp b/stan/math/prim/prob/beta_proportion_lccdf.hpp
index c615d23b0df..8bb8c7b58fc 100644
--- a/stan/math/prim/prob/beta_proportion_lccdf.hpp
+++ b/stan/math/prim/prob/beta_proportion_lccdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/prob/beta_proportion_lcdf.hpp b/stan/math/prim/prob/beta_proportion_lcdf.hpp
index 5566b8e5fe2..51ccb1b381f 100644
--- a/stan/math/prim/prob/beta_proportion_lcdf.hpp
+++ b/stan/math/prim/prob/beta_proportion_lcdf.hpp
@@ -4,12 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/beta.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/prob/beta_proportion_lpdf.hpp b/stan/math/prim/prob/beta_proportion_lpdf.hpp
index 1e60bf521a2..1c670d681c7 100644
--- a/stan/math/prim/prob/beta_proportion_lpdf.hpp
+++ b/stan/math/prim/prob/beta_proportion_lpdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
diff --git a/stan/math/prim/prob/beta_proportion_rng.hpp b/stan/math/prim/prob/beta_proportion_rng.hpp
index bd8504152ef..beef977d92d 100644
--- a/stan/math/prim/prob/beta_proportion_rng.hpp
+++ b/stan/math/prim/prob/beta_proportion_rng.hpp
@@ -6,8 +6,6 @@
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <boost/random/variate_generator.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/binomial_lccdf.hpp b/stan/math/prim/prob/binomial_lccdf.hpp
index 5fe97006126..4f049108061 100644
--- a/stan/math/prim/prob/binomial_lccdf.hpp
+++ b/stan/math/prim/prob/binomial_lccdf.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/prob/binomial_lcdf.hpp b/stan/math/prim/prob/binomial_lcdf.hpp
index bd0a4d882a6..9bda2ca200e 100644
--- a/stan/math/prim/prob/binomial_lcdf.hpp
+++ b/stan/math/prim/prob/binomial_lcdf.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/prob/binomial_logit_glm_lpmf.hpp b/stan/math/prim/prob/binomial_logit_glm_lpmf.hpp
index 77a85402271..8d32c4fb4fd 100644
--- a/stan/math/prim/prob/binomial_logit_glm_lpmf.hpp
+++ b/stan/math/prim/prob/binomial_logit_glm_lpmf.hpp
@@ -6,11 +6,8 @@
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/max.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
diff --git a/stan/math/prim/prob/binomial_logit_lpmf.hpp b/stan/math/prim/prob/binomial_logit_lpmf.hpp
index d441c1ec0dc..1c206fe6fe0 100644
--- a/stan/math/prim/prob/binomial_logit_lpmf.hpp
+++ b/stan/math/prim/prob/binomial_logit_lpmf.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/log1m_inv_logit.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
diff --git a/stan/math/prim/prob/binomial_lpmf.hpp b/stan/math/prim/prob/binomial_lpmf.hpp
index c694df2abe4..ef14f399f9f 100644
--- a/stan/math/prim/prob/binomial_lpmf.hpp
+++ b/stan/math/prim/prob/binomial_lpmf.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/binomial_coefficient_log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/categorical_logit_glm_lpmf.hpp b/stan/math/prim/prob/categorical_logit_glm_lpmf.hpp
index da7799774fc..0a3257f8a74 100644
--- a/stan/math/prim/prob/categorical_logit_glm_lpmf.hpp
+++ b/stan/math/prim/prob/categorical_logit_glm_lpmf.hpp
@@ -6,10 +6,6 @@
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/categorical_logit_lpmf.hpp b/stan/math/prim/prob/categorical_logit_lpmf.hpp
index f86ee9297dc..e2c89997285 100644
--- a/stan/math/prim/prob/categorical_logit_lpmf.hpp
+++ b/stan/math/prim/prob/categorical_logit_lpmf.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log_softmax.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
diff --git a/stan/math/prim/prob/categorical_logit_rng.hpp b/stan/math/prim/prob/categorical_logit_rng.hpp
index fd524b1332a..3202a4d08cd 100644
--- a/stan/math/prim/prob/categorical_logit_rng.hpp
+++ b/stan/math/prim/prob/categorical_logit_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_CATEGORICAL_LOGIT_RNG_HPP
 #define STAN_MATH_PRIM_PROB_CATEGORICAL_LOGIT_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/cumulative_sum.hpp>
 #include <stan/math/prim/fun/softmax.hpp>
diff --git a/stan/math/prim/prob/categorical_rng.hpp b/stan/math/prim/prob/categorical_rng.hpp
index e0ee88adddc..3462a3247a1 100644
--- a/stan/math/prim/prob/categorical_rng.hpp
+++ b/stan/math/prim/prob/categorical_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_CATEGORICAL_RNG_HPP
 #define STAN_MATH_PRIM_PROB_CATEGORICAL_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/cumulative_sum.hpp>
 #include <boost/random/uniform_01.hpp>
diff --git a/stan/math/prim/prob/cauchy_cdf.hpp b/stan/math/prim/prob/cauchy_cdf.hpp
index 2bcff3fadfd..6e1d2bc9df2 100644
--- a/stan/math/prim/prob/cauchy_cdf.hpp
+++ b/stan/math/prim/prob/cauchy_cdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/cauchy_lccdf.hpp b/stan/math/prim/prob/cauchy_lccdf.hpp
index a5274780421..4027642bb17 100644
--- a/stan/math/prim/prob/cauchy_lccdf.hpp
+++ b/stan/math/prim/prob/cauchy_lccdf.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/cauchy_lcdf.hpp b/stan/math/prim/prob/cauchy_lcdf.hpp
index 7bf11474eda..6e5a7cd4597 100644
--- a/stan/math/prim/prob/cauchy_lcdf.hpp
+++ b/stan/math/prim/prob/cauchy_lcdf.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/cauchy_lpdf.hpp b/stan/math/prim/prob/cauchy_lpdf.hpp
index 703939adf9f..96a283cdbd7 100644
--- a/stan/math/prim/prob/cauchy_lpdf.hpp
+++ b/stan/math/prim/prob/cauchy_lpdf.hpp
@@ -3,17 +3,13 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/chi_square_cdf.hpp b/stan/math/prim/prob/chi_square_cdf.hpp
index 46e0ea4e623..eecb90976a9 100644
--- a/stan/math/prim/prob/chi_square_cdf.hpp
+++ b/stan/math/prim/prob/chi_square_cdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -13,7 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/chi_square_lccdf.hpp b/stan/math/prim/prob/chi_square_lccdf.hpp
index 29da6302dc0..26d7c01eb20 100644
--- a/stan/math/prim/prob/chi_square_lccdf.hpp
+++ b/stan/math/prim/prob/chi_square_lccdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/chi_square_lcdf.hpp b/stan/math/prim/prob/chi_square_lcdf.hpp
index c75e14f8b14..96cca320382 100644
--- a/stan/math/prim/prob/chi_square_lcdf.hpp
+++ b/stan/math/prim/prob/chi_square_lcdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/chi_square_lpdf.hpp b/stan/math/prim/prob/chi_square_lpdf.hpp
index e8f1732c3aa..fa2739247a3 100644
--- a/stan/math/prim/prob/chi_square_lpdf.hpp
+++ b/stan/math/prim/prob/chi_square_lpdf.hpp
@@ -3,17 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/dirichlet_lpdf.hpp b/stan/math/prim/prob/dirichlet_lpdf.hpp
index 57d61668141..5e4798aeb9f 100644
--- a/stan/math/prim/prob/dirichlet_lpdf.hpp
+++ b/stan/math/prim/prob/dirichlet_lpdf.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size_mvt.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/prim/prob/dirichlet_multinomial_rng.hpp b/stan/math/prim/prob/dirichlet_multinomial_rng.hpp
index fbe8a55dea3..d4565c29409 100644
--- a/stan/math/prim/prob/dirichlet_multinomial_rng.hpp
+++ b/stan/math/prim/prob/dirichlet_multinomial_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_DIRICHLET_MULTINOMIAL_RNG_HPP
 #define STAN_MATH_PRIM_PROB_DIRICHLET_MULTINOMIAL_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/prob/dirichlet_rng.hpp>
diff --git a/stan/math/prim/prob/dirichlet_rng.hpp b/stan/math/prim/prob/dirichlet_rng.hpp
index bd4cd0c6232..954deee70d4 100644
--- a/stan/math/prim/prob/dirichlet_rng.hpp
+++ b/stan/math/prim/prob/dirichlet_rng.hpp
@@ -1,11 +1,7 @@
 #ifndef STAN_MATH_PRIM_PROB_DIRICHLET_RNG_HPP
 #define STAN_MATH_PRIM_PROB_DIRICHLET_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
-#include <boost/math/special_functions/gamma.hpp>
 #include <boost/random/gamma_distribution.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
diff --git a/stan/math/prim/prob/discrete_range_cdf.hpp b/stan/math/prim/prob/discrete_range_cdf.hpp
index 777e3f21769..0a975b5a031 100644
--- a/stan/math/prim/prob/discrete_range_cdf.hpp
+++ b/stan/math/prim/prob/discrete_range_cdf.hpp
@@ -1,11 +1,7 @@
 #ifndef STAN_MATH_PRIM_PROB_DISCRETE_RANGE_CDF_HPP
 #define STAN_MATH_PRIM_PROB_DISCRETE_RANGE_CDF_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/discrete_range_lccdf.hpp b/stan/math/prim/prob/discrete_range_lccdf.hpp
index 54e82deb0de..ac714dbe269 100644
--- a/stan/math/prim/prob/discrete_range_lccdf.hpp
+++ b/stan/math/prim/prob/discrete_range_lccdf.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_PRIM_PROB_DISCRETE_RANGE_LCCDF_HPP
 #define STAN_MATH_PRIM_PROB_DISCRETE_RANGE_LCCDF_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
diff --git a/stan/math/prim/prob/discrete_range_lcdf.hpp b/stan/math/prim/prob/discrete_range_lcdf.hpp
index 5d73f051949..e4da8c6e601 100644
--- a/stan/math/prim/prob/discrete_range_lcdf.hpp
+++ b/stan/math/prim/prob/discrete_range_lcdf.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_PRIM_PROB_DISCRETE_RANGE_LCDF_HPP
 #define STAN_MATH_PRIM_PROB_DISCRETE_RANGE_LCDF_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
diff --git a/stan/math/prim/prob/discrete_range_lpmf.hpp b/stan/math/prim/prob/discrete_range_lpmf.hpp
index f847eb95396..a25029bca7b 100644
--- a/stan/math/prim/prob/discrete_range_lpmf.hpp
+++ b/stan/math/prim/prob/discrete_range_lpmf.hpp
@@ -4,12 +4,9 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/prob/double_exponential_cdf.hpp b/stan/math/prim/prob/double_exponential_cdf.hpp
index b092928d214..28ccddb1006 100644
--- a/stan/math/prim/prob/double_exponential_cdf.hpp
+++ b/stan/math/prim/prob/double_exponential_cdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/eigen_comparisons.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/double_exponential_lccdf.hpp b/stan/math/prim/prob/double_exponential_lccdf.hpp
index 0c24a32825f..4e4118249af 100644
--- a/stan/math/prim/prob/double_exponential_lccdf.hpp
+++ b/stan/math/prim/prob/double_exponential_lccdf.hpp
@@ -4,13 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/double_exponential_lcdf.hpp b/stan/math/prim/prob/double_exponential_lcdf.hpp
index db264576c57..c6f9719db2a 100644
--- a/stan/math/prim/prob/double_exponential_lcdf.hpp
+++ b/stan/math/prim/prob/double_exponential_lcdf.hpp
@@ -4,13 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/double_exponential_lpdf.hpp b/stan/math/prim/prob/double_exponential_lpdf.hpp
index 6181e7853bf..f8719664b56 100644
--- a/stan/math/prim/prob/double_exponential_lpdf.hpp
+++ b/stan/math/prim/prob/double_exponential_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/fabs.hpp>
@@ -15,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/double_exponential_rng.hpp b/stan/math/prim/prob/double_exponential_rng.hpp
index 6913d43a939..d20e5c3729f 100644
--- a/stan/math/prim/prob/double_exponential_rng.hpp
+++ b/stan/math/prim/prob/double_exponential_rng.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
diff --git a/stan/math/prim/prob/exp_mod_normal_cdf.hpp b/stan/math/prim/prob/exp_mod_normal_cdf.hpp
index baf9a5fd25f..4ef8ad84a66 100644
--- a/stan/math/prim/prob/exp_mod_normal_cdf.hpp
+++ b/stan/math/prim/prob/exp_mod_normal_cdf.hpp
@@ -3,20 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exp_mod_normal_lccdf.hpp b/stan/math/prim/prob/exp_mod_normal_lccdf.hpp
index 2e5901704e0..ef5be4774d9 100644
--- a/stan/math/prim/prob/exp_mod_normal_lccdf.hpp
+++ b/stan/math/prim/prob/exp_mod_normal_lccdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
@@ -12,13 +10,11 @@
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exp_mod_normal_lcdf.hpp b/stan/math/prim/prob/exp_mod_normal_lcdf.hpp
index d5222619469..3d35f7237b3 100644
--- a/stan/math/prim/prob/exp_mod_normal_lcdf.hpp
+++ b/stan/math/prim/prob/exp_mod_normal_lcdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
@@ -12,13 +10,11 @@
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exp_mod_normal_lpdf.hpp b/stan/math/prim/prob/exp_mod_normal_lpdf.hpp
index cb3374ddc1b..bad8ee473f8 100644
--- a/stan/math/prim/prob/exp_mod_normal_lpdf.hpp
+++ b/stan/math/prim/prob/exp_mod_normal_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
@@ -15,7 +13,6 @@
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exp_mod_normal_rng.hpp b/stan/math/prim/prob/exp_mod_normal_rng.hpp
index a3d7307b8f6..b8228482f91 100644
--- a/stan/math/prim/prob/exp_mod_normal_rng.hpp
+++ b/stan/math/prim/prob/exp_mod_normal_rng.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/prob/exponential_rng.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/prob/normal_rng.hpp>
-#include <boost/random/normal_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/exponential_cdf.hpp b/stan/math/prim/prob/exponential_cdf.hpp
index aa7155bfe3d..eac0a8eb9de 100644
--- a/stan/math/prim/prob/exponential_cdf.hpp
+++ b/stan/math/prim/prob/exponential_cdf.hpp
@@ -3,14 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exponential_lccdf.hpp b/stan/math/prim/prob/exponential_lccdf.hpp
index a672c357bb9..34cace1c73a 100644
--- a/stan/math/prim/prob/exponential_lccdf.hpp
+++ b/stan/math/prim/prob/exponential_lccdf.hpp
@@ -3,12 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/exponential_lcdf.hpp b/stan/math/prim/prob/exponential_lcdf.hpp
index 5236fc1a9e8..947a40175b2 100644
--- a/stan/math/prim/prob/exponential_lcdf.hpp
+++ b/stan/math/prim/prob/exponential_lcdf.hpp
@@ -3,15 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/exponential_lpdf.hpp b/stan/math/prim/prob/exponential_lpdf.hpp
index e3987fcbe46..ec33b176158 100644
--- a/stan/math/prim/prob/exponential_lpdf.hpp
+++ b/stan/math/prim/prob/exponential_lpdf.hpp
@@ -3,17 +3,13 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/frechet_cdf.hpp b/stan/math/prim/prob/frechet_cdf.hpp
index e57a90f0bb0..17940d21ee6 100644
--- a/stan/math/prim/prob/frechet_cdf.hpp
+++ b/stan/math/prim/prob/frechet_cdf.hpp
@@ -3,19 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <boost/random/weibull_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/frechet_lccdf.hpp b/stan/math/prim/prob/frechet_lccdf.hpp
index 6226d64c92d..9083145f4a0 100644
--- a/stan/math/prim/prob/frechet_lccdf.hpp
+++ b/stan/math/prim/prob/frechet_lccdf.hpp
@@ -3,19 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/pow.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <boost/random/weibull_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/frechet_lcdf.hpp b/stan/math/prim/prob/frechet_lcdf.hpp
index 4770deaa202..498465a64b0 100644
--- a/stan/math/prim/prob/frechet_lcdf.hpp
+++ b/stan/math/prim/prob/frechet_lcdf.hpp
@@ -3,17 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <boost/random/weibull_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/frechet_lpdf.hpp b/stan/math/prim/prob/frechet_lpdf.hpp
index 3dba3f3ffd9..7c997a166a0 100644
--- a/stan/math/prim/prob/frechet_lpdf.hpp
+++ b/stan/math/prim/prob/frechet_lpdf.hpp
@@ -3,20 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <boost/random/weibull_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gamma_cdf.hpp b/stan/math/prim/prob/gamma_cdf.hpp
index 4112a61ac39..9ab79689c4f 100644
--- a/stan/math/prim/prob/gamma_cdf.hpp
+++ b/stan/math/prim/prob/gamma_cdf.hpp
@@ -5,18 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <boost/random/gamma_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gamma_lccdf.hpp b/stan/math/prim/prob/gamma_lccdf.hpp
index c5538fa5966..52aa16c9ac1 100644
--- a/stan/math/prim/prob/gamma_lccdf.hpp
+++ b/stan/math/prim/prob/gamma_lccdf.hpp
@@ -11,11 +11,9 @@
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
 #include <stan/math/prim/fun/value_of_rec.hpp>
diff --git a/stan/math/prim/prob/gamma_lcdf.hpp b/stan/math/prim/prob/gamma_lcdf.hpp
index acac32bf92f..9fa80193cf6 100644
--- a/stan/math/prim/prob/gamma_lcdf.hpp
+++ b/stan/math/prim/prob/gamma_lcdf.hpp
@@ -4,17 +4,12 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gamma_lpdf.hpp b/stan/math/prim/prob/gamma_lpdf.hpp
index 4c377665f46..626c84e0ddf 100644
--- a/stan/math/prim/prob/gamma_lpdf.hpp
+++ b/stan/math/prim/prob/gamma_lpdf.hpp
@@ -3,12 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -16,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gaussian_dlm_obs_lpdf.hpp b/stan/math/prim/prob/gaussian_dlm_obs_lpdf.hpp
index 3366026dcca..b2378ad75fd 100644
--- a/stan/math/prim/prob/gaussian_dlm_obs_lpdf.hpp
+++ b/stan/math/prim/prob/gaussian_dlm_obs_lpdf.hpp
@@ -3,17 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/add.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/inverse_spd.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_determinant_spd.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
-#include <stan/math/prim/fun/quad_form.hpp>
 #include <stan/math/prim/fun/quad_form_sym.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/subtract.hpp>
-#include <stan/math/prim/fun/tcrossprod.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/trace_quad_form.hpp>
 #include <stan/math/prim/fun/transpose.hpp>
diff --git a/stan/math/prim/prob/gaussian_dlm_obs_rng.hpp b/stan/math/prim/prob/gaussian_dlm_obs_rng.hpp
index b25d77fc07c..af148d8b413 100644
--- a/stan/math/prim/prob/gaussian_dlm_obs_rng.hpp
+++ b/stan/math/prim/prob/gaussian_dlm_obs_rng.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_PRIM_PROB_GAUSSIAN_DLM_OBS_RNG_HPP
 #define STAN_MATH_PRIM_PROB_GAUSSIAN_DLM_OBS_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <boost/random/normal_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/gumbel_cdf.hpp b/stan/math/prim/prob/gumbel_cdf.hpp
index 2850945c9e4..88e34bccf52 100644
--- a/stan/math/prim/prob/gumbel_cdf.hpp
+++ b/stan/math/prim/prob/gumbel_cdf.hpp
@@ -3,15 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gumbel_lccdf.hpp b/stan/math/prim/prob/gumbel_lccdf.hpp
index 52da2565307..9a7594ada8d 100644
--- a/stan/math/prim/prob/gumbel_lccdf.hpp
+++ b/stan/math/prim/prob/gumbel_lccdf.hpp
@@ -3,15 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gumbel_lcdf.hpp b/stan/math/prim/prob/gumbel_lcdf.hpp
index 91b710f18a5..0728b091012 100644
--- a/stan/math/prim/prob/gumbel_lcdf.hpp
+++ b/stan/math/prim/prob/gumbel_lcdf.hpp
@@ -3,14 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/gumbel_lpdf.hpp b/stan/math/prim/prob/gumbel_lpdf.hpp
index e84f9dfecc8..21641378653 100644
--- a/stan/math/prim/prob/gumbel_lpdf.hpp
+++ b/stan/math/prim/prob/gumbel_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -12,7 +10,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/hmm_hidden_state_prob.hpp b/stan/math/prim/prob/hmm_hidden_state_prob.hpp
index d90731d23ad..b13e6630e2f 100644
--- a/stan/math/prim/prob/hmm_hidden_state_prob.hpp
+++ b/stan/math/prim/prob/hmm_hidden_state_prob.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_PRIM_PROB_HMM_HIDDEN_STATE_PROB_HPP
 #define STAN_MATH_PRIM_PROB_HMM_HIDDEN_STATE_PROB_HPP
 
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/hmm_check.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <boost/random.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/hmm_latent_rng.hpp b/stan/math/prim/prob/hmm_latent_rng.hpp
index 24037e37df3..fb38cf87d92 100644
--- a/stan/math/prim/prob/hmm_latent_rng.hpp
+++ b/stan/math/prim/prob/hmm_latent_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_HMM_LATENT_RNG_HPP
 #define STAN_MATH_PRIM_PROB_HMM_LATENT_RNG_HPP
 
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err/hmm_check.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
diff --git a/stan/math/prim/prob/hmm_marginal.hpp b/stan/math/prim/prob/hmm_marginal.hpp
index 8ad907f0da7..ed945a3ef95 100644
--- a/stan/math/prim/prob/hmm_marginal.hpp
+++ b/stan/math/prim/prob/hmm_marginal.hpp
@@ -3,13 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/row.hpp>
-#include <stan/math/prim/fun/col.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <vector>
 
diff --git a/stan/math/prim/prob/hypergeometric_rng.hpp b/stan/math/prim/prob/hypergeometric_rng.hpp
index b6d7e410f46..63a018f4679 100644
--- a/stan/math/prim/prob/hypergeometric_rng.hpp
+++ b/stan/math/prim/prob/hypergeometric_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_HYPERGEOMETRIC_RNG_HPP
 #define STAN_MATH_PRIM_PROB_HYPERGEOMETRIC_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <boost/math/distributions/hypergeometric.hpp>
 
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/prim/prob/inv_chi_square_cdf.hpp b/stan/math/prim/prob/inv_chi_square_cdf.hpp
index d017fc1390f..ed0ed9bf5a9 100644
--- a/stan/math/prim/prob/inv_chi_square_cdf.hpp
+++ b/stan/math/prim/prob/inv_chi_square_cdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -13,7 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_chi_square_lccdf.hpp b/stan/math/prim/prob/inv_chi_square_lccdf.hpp
index 27f73e38512..4c064f80b49 100644
--- a/stan/math/prim/prob/inv_chi_square_lccdf.hpp
+++ b/stan/math/prim/prob/inv_chi_square_lccdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_chi_square_lcdf.hpp b/stan/math/prim/prob/inv_chi_square_lcdf.hpp
index 86280b86ad2..894cc8f59e7 100644
--- a/stan/math/prim/prob/inv_chi_square_lcdf.hpp
+++ b/stan/math/prim/prob/inv_chi_square_lcdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_chi_square_lpdf.hpp b/stan/math/prim/prob/inv_chi_square_lpdf.hpp
index 91cced06de6..3ca816813dd 100644
--- a/stan/math/prim/prob/inv_chi_square_lpdf.hpp
+++ b/stan/math/prim/prob/inv_chi_square_lpdf.hpp
@@ -3,12 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -16,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_gamma_cdf.hpp b/stan/math/prim/prob/inv_gamma_cdf.hpp
index 9c801521d03..3da2230262f 100644
--- a/stan/math/prim/prob/inv_gamma_cdf.hpp
+++ b/stan/math/prim/prob/inv_gamma_cdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -13,7 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_gamma_lccdf.hpp b/stan/math/prim/prob/inv_gamma_lccdf.hpp
index 55d4485c8eb..5ff1d86873e 100644
--- a/stan/math/prim/prob/inv_gamma_lccdf.hpp
+++ b/stan/math/prim/prob/inv_gamma_lccdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_gamma_lcdf.hpp b/stan/math/prim/prob/inv_gamma_lcdf.hpp
index 5e0a78c192d..a1ffde835b4 100644
--- a/stan/math/prim/prob/inv_gamma_lcdf.hpp
+++ b/stan/math/prim/prob/inv_gamma_lcdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/inv_gamma_lpdf.hpp b/stan/math/prim/prob/inv_gamma_lpdf.hpp
index 504a341da35..a928a22b89c 100644
--- a/stan/math/prim/prob/inv_gamma_lpdf.hpp
+++ b/stan/math/prim/prob/inv_gamma_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
@@ -15,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/lkj_corr_cholesky_lpdf.hpp b/stan/math/prim/prob/lkj_corr_cholesky_lpdf.hpp
index a675f42d4e1..5d6ecc93a34 100644
--- a/stan/math/prim/prob/lkj_corr_cholesky_lpdf.hpp
+++ b/stan/math/prim/prob/lkj_corr_cholesky_lpdf.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/make_nu.hpp>
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/prob/lkj_corr_lpdf.hpp>
diff --git a/stan/math/prim/prob/lkj_corr_cholesky_rng.hpp b/stan/math/prim/prob/lkj_corr_cholesky_rng.hpp
index 170ee4314b8..b88bf3b4bab 100644
--- a/stan/math/prim/prob/lkj_corr_cholesky_rng.hpp
+++ b/stan/math/prim/prob/lkj_corr_cholesky_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_LKJ_CORR_CHOLESKY_RNG_HPP
 #define STAN_MATH_PRIM_PROB_LKJ_CORR_CHOLESKY_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/prob/beta_rng.hpp>
 #include <stan/math/prim/fun/read_corr_L.hpp>
diff --git a/stan/math/prim/prob/lkj_corr_rng.hpp b/stan/math/prim/prob/lkj_corr_rng.hpp
index 70a81889010..91bd4f72afa 100644
--- a/stan/math/prim/prob/lkj_corr_rng.hpp
+++ b/stan/math/prim/prob/lkj_corr_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_LKJ_CORR_RNG_HPP
 #define STAN_MATH_PRIM_PROB_LKJ_CORR_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/multiply_lower_tri_self_transpose.hpp>
 #include <stan/math/prim/prob/lkj_corr_cholesky_rng.hpp>
diff --git a/stan/math/prim/prob/logistic_cdf.hpp b/stan/math/prim/prob/logistic_cdf.hpp
index 3465e44eae6..86359dad8cc 100644
--- a/stan/math/prim/prob/logistic_cdf.hpp
+++ b/stan/math/prim/prob/logistic_cdf.hpp
@@ -4,12 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/prob/logistic_lpdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
diff --git a/stan/math/prim/prob/logistic_lccdf.hpp b/stan/math/prim/prob/logistic_lccdf.hpp
index 016da2da39d..fbf67ab517e 100644
--- a/stan/math/prim/prob/logistic_lccdf.hpp
+++ b/stan/math/prim/prob/logistic_lccdf.hpp
@@ -4,14 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/prob/logistic_lpdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
diff --git a/stan/math/prim/prob/logistic_lcdf.hpp b/stan/math/prim/prob/logistic_lcdf.hpp
index 10b9be9e78c..7f4673b8a26 100644
--- a/stan/math/prim/prob/logistic_lcdf.hpp
+++ b/stan/math/prim/prob/logistic_lcdf.hpp
@@ -4,14 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/prob/logistic_lpdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
diff --git a/stan/math/prim/prob/logistic_lpdf.hpp b/stan/math/prim/prob/logistic_lpdf.hpp
index 181ce1c5650..23772d00bf9 100644
--- a/stan/math/prim/prob/logistic_lpdf.hpp
+++ b/stan/math/prim/prob/logistic_lpdf.hpp
@@ -3,18 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/loglogistic_cdf.hpp b/stan/math/prim/prob/loglogistic_cdf.hpp
index da7f8a950a0..f9c43c13586 100644
--- a/stan/math/prim/prob/loglogistic_cdf.hpp
+++ b/stan/math/prim/prob/loglogistic_cdf.hpp
@@ -3,20 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
 #include <cmath>
-#include <iostream>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/loglogistic_lpdf.hpp b/stan/math/prim/prob/loglogistic_lpdf.hpp
index 047f35a414a..ad5a495b017 100644
--- a/stan/math/prim/prob/loglogistic_lpdf.hpp
+++ b/stan/math/prim/prob/loglogistic_lpdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/lognormal_cdf.hpp b/stan/math/prim/prob/lognormal_cdf.hpp
index f739cc98acb..206ec6b2cd2 100644
--- a/stan/math/prim/prob/lognormal_cdf.hpp
+++ b/stan/math/prim/prob/lognormal_cdf.hpp
@@ -3,19 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/prod.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/lognormal_lccdf.hpp b/stan/math/prim/prob/lognormal_lccdf.hpp
index 39391bedb0f..374743d68a2 100644
--- a/stan/math/prim/prob/lognormal_lccdf.hpp
+++ b/stan/math/prim/prob/lognormal_lccdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
@@ -12,10 +10,8 @@
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/lognormal_lcdf.hpp b/stan/math/prim/prob/lognormal_lcdf.hpp
index 482f79885bd..51009660d86 100644
--- a/stan/math/prim/prob/lognormal_lcdf.hpp
+++ b/stan/math/prim/prob/lognormal_lcdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
@@ -12,10 +10,8 @@
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/lognormal_lpdf.hpp b/stan/math/prim/prob/lognormal_lpdf.hpp
index e9052070e31..3fb54be3f79 100644
--- a/stan/math/prim/prob/lognormal_lpdf.hpp
+++ b/stan/math/prim/prob/lognormal_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/inv.hpp>
@@ -14,7 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/matrix_normal_prec_rng.hpp b/stan/math/prim/prob/matrix_normal_prec_rng.hpp
index e7a1d275fb2..8ef3cc0853c 100644
--- a/stan/math/prim/prob/matrix_normal_prec_rng.hpp
+++ b/stan/math/prim/prob/matrix_normal_prec_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_MATRIX_NORMAL_PREC_RNG_HPP
 #define STAN_MATH_PRIM_PROB_MATRIX_NORMAL_PREC_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <boost/random/normal_distribution.hpp>
diff --git a/stan/math/prim/prob/multi_normal_cholesky_lpdf.hpp b/stan/math/prim/prob/multi_normal_cholesky_lpdf.hpp
index 59ca107df6d..2908ee9e253 100644
--- a/stan/math/prim/prob/multi_normal_cholesky_lpdf.hpp
+++ b/stan/math/prim/prob/multi_normal_cholesky_lpdf.hpp
@@ -12,7 +12,6 @@
 #include <stan/math/prim/fun/mdivide_right_tri.hpp>
 #include <stan/math/prim/fun/size_mvt.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/prim/prob/multi_normal_lpdf.hpp b/stan/math/prim/prob/multi_normal_lpdf.hpp
index 297e1e918d7..1dcc1f98694 100644
--- a/stan/math/prim/prob/multi_normal_lpdf.hpp
+++ b/stan/math/prim/prob/multi_normal_lpdf.hpp
@@ -3,18 +3,13 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/eval.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_determinant_ldlt.hpp>
 #include <stan/math/prim/fun/max_size_mvt.hpp>
 #include <stan/math/prim/fun/mdivide_left_ldlt.hpp>
 #include <stan/math/prim/fun/size_mvt.hpp>
-#include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/transpose.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
diff --git a/stan/math/prim/prob/multi_normal_prec_lpdf.hpp b/stan/math/prim/prob/multi_normal_prec_lpdf.hpp
index cf2d7d048a6..45b98ef4cf9 100644
--- a/stan/math/prim/prob/multi_normal_prec_lpdf.hpp
+++ b/stan/math/prim/prob/multi_normal_prec_lpdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/log_determinant_ldlt.hpp>
 #include <stan/math/prim/fun/max_size_mvt.hpp>
 #include <stan/math/prim/fun/size_mvt.hpp>
-#include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/trace_quad_form.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
diff --git a/stan/math/prim/prob/multi_student_t_cholesky_lpdf.hpp b/stan/math/prim/prob/multi_student_t_cholesky_lpdf.hpp
index d119460be62..1bf36648761 100644
--- a/stan/math/prim/prob/multi_student_t_cholesky_lpdf.hpp
+++ b/stan/math/prim/prob/multi_student_t_cholesky_lpdf.hpp
@@ -3,14 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/columns_dot_self.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
 #include <stan/math/prim/fun/dot_self.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
@@ -24,7 +21,6 @@
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <cstdlib>
-#include <iostream>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/multi_student_t_lpdf.hpp b/stan/math/prim/prob/multi_student_t_lpdf.hpp
index f4e0798d9c2..d263da81dbd 100644
--- a/stan/math/prim/prob/multi_student_t_lpdf.hpp
+++ b/stan/math/prim/prob/multi_student_t_lpdf.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size_mvt.hpp>
diff --git a/stan/math/prim/prob/neg_binomial_2_cdf.hpp b/stan/math/prim/prob/neg_binomial_2_cdf.hpp
index 47cab11d76d..70739786526 100644
--- a/stan/math/prim/prob/neg_binomial_2_cdf.hpp
+++ b/stan/math/prim/prob/neg_binomial_2_cdf.hpp
@@ -13,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <limits>
 
diff --git a/stan/math/prim/prob/neg_binomial_2_log_glm_lpmf.hpp b/stan/math/prim/prob/neg_binomial_2_log_glm_lpmf.hpp
index 52db7124971..4ec5e39769f 100644
--- a/stan/math/prim/prob/neg_binomial_2_log_glm_lpmf.hpp
+++ b/stan/math/prim/prob/neg_binomial_2_log_glm_lpmf.hpp
@@ -6,10 +6,8 @@
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
@@ -20,7 +18,6 @@
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/prob/neg_binomial_2_log_lpmf.hpp b/stan/math/prim/prob/neg_binomial_2_log_lpmf.hpp
index 44564538fbf..61d8af1aacc 100644
--- a/stan/math/prim/prob/neg_binomial_2_log_lpmf.hpp
+++ b/stan/math/prim/prob/neg_binomial_2_log_lpmf.hpp
@@ -6,14 +6,11 @@
 #include <stan/math/prim/fun/binomial_coefficient_log.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p_exp.hpp>
-#include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/neg_binomial_2_lpmf.hpp b/stan/math/prim/prob/neg_binomial_2_lpmf.hpp
index b708d4ce3a9..63da3c404fa 100644
--- a/stan/math/prim/prob/neg_binomial_2_lpmf.hpp
+++ b/stan/math/prim/prob/neg_binomial_2_lpmf.hpp
@@ -5,11 +5,7 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/binomial_coefficient_log.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/select.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
diff --git a/stan/math/prim/prob/neg_binomial_cdf.hpp b/stan/math/prim/prob/neg_binomial_cdf.hpp
index 31163102be1..6884f4d512d 100644
--- a/stan/math/prim/prob/neg_binomial_cdf.hpp
+++ b/stan/math/prim/prob/neg_binomial_cdf.hpp
@@ -13,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/prob/neg_binomial_lccdf.hpp b/stan/math/prim/prob/neg_binomial_lccdf.hpp
index cc24a6b79a7..483fdfd5636 100644
--- a/stan/math/prim/prob/neg_binomial_lccdf.hpp
+++ b/stan/math/prim/prob/neg_binomial_lccdf.hpp
@@ -9,13 +9,11 @@
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/prob/neg_binomial_lcdf.hpp b/stan/math/prim/prob/neg_binomial_lcdf.hpp
index ba85ba41d0d..ec22d24b53a 100644
--- a/stan/math/prim/prob/neg_binomial_lcdf.hpp
+++ b/stan/math/prim/prob/neg_binomial_lcdf.hpp
@@ -9,13 +9,11 @@
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/prob/neg_binomial_lpmf.hpp b/stan/math/prim/prob/neg_binomial_lpmf.hpp
index 61c88160c6b..846e137d05d 100644
--- a/stan/math/prim/prob/neg_binomial_lpmf.hpp
+++ b/stan/math/prim/prob/neg_binomial_lpmf.hpp
@@ -4,16 +4,11 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/binomial_coefficient_log.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/normal_cdf.hpp b/stan/math/prim/prob/normal_cdf.hpp
index 5cb9bce6e0d..f09c6028d83 100644
--- a/stan/math/prim/prob/normal_cdf.hpp
+++ b/stan/math/prim/prob/normal_cdf.hpp
@@ -6,12 +6,10 @@
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/normal_id_glm_lpdf.hpp b/stan/math/prim/prob/normal_id_glm_lpdf.hpp
index 58776618801..e82e862ceb4 100644
--- a/stan/math/prim/prob/normal_id_glm_lpdf.hpp
+++ b/stan/math/prim/prob/normal_id_glm_lpdf.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/normal_lcdf.hpp b/stan/math/prim/prob/normal_lcdf.hpp
index b7446c9fd82..59168de5745 100644
--- a/stan/math/prim/prob/normal_lcdf.hpp
+++ b/stan/math/prim/prob/normal_lcdf.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/fabs.hpp>
@@ -15,8 +14,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/prob/normal_lpdf.hpp b/stan/math/prim/prob/normal_lpdf.hpp
index 37ca01aad8d..a61911e0c31 100644
--- a/stan/math/prim/prob/normal_lpdf.hpp
+++ b/stan/math/prim/prob/normal_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -12,7 +10,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/normal_sufficient_lpdf.hpp b/stan/math/prim/prob/normal_sufficient_lpdf.hpp
index 996b5e2d052..8ffe26e6c0b 100644
--- a/stan/math/prim/prob/normal_sufficient_lpdf.hpp
+++ b/stan/math/prim/prob/normal_sufficient_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -13,8 +11,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
-#include <stan/math/prim/prob/normal_lpdf.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/ordered_logistic_glm_lpmf.hpp b/stan/math/prim/prob/ordered_logistic_glm_lpmf.hpp
index a1f398266a7..0c9aaa40f8b 100644
--- a/stan/math/prim/prob/ordered_logistic_glm_lpmf.hpp
+++ b/stan/math/prim/prob/ordered_logistic_glm_lpmf.hpp
@@ -7,8 +7,6 @@
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
 #include <stan/math/prim/fun/log1m_exp.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/stan/math/prim/prob/ordered_logistic_lpmf.hpp b/stan/math/prim/prob/ordered_logistic_lpmf.hpp
index db2b7d86d35..b307c750c66 100644
--- a/stan/math/prim/prob/ordered_logistic_lpmf.hpp
+++ b/stan/math/prim/prob/ordered_logistic_lpmf.hpp
@@ -3,12 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/fun/is_integer.hpp>
-#include <stan/math/prim/fun/log1p_exp.hpp>
 #include <stan/math/prim/fun/log_inv_logit_diff.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
@@ -16,7 +13,6 @@
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/ordered_logistic_rng.hpp b/stan/math/prim/prob/ordered_logistic_rng.hpp
index 59921364a26..25a57368a42 100644
--- a/stan/math/prim/prob/ordered_logistic_rng.hpp
+++ b/stan/math/prim/prob/ordered_logistic_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_ORDERED_LOGISTIC_RNG_HPP
 #define STAN_MATH_PRIM_PROB_ORDERED_LOGISTIC_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/inv_logit.hpp>
 #include <stan/math/prim/prob/categorical_rng.hpp>
diff --git a/stan/math/prim/prob/ordered_probit_lpmf.hpp b/stan/math/prim/prob/ordered_probit_lpmf.hpp
index 8cf027f2baf..a0f8a337fca 100644
--- a/stan/math/prim/prob/ordered_probit_lpmf.hpp
+++ b/stan/math/prim/prob/ordered_probit_lpmf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_diff_exp.hpp>
-#include <stan/math/prim/fun/log1m_exp.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size_mvt.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/prob/std_normal_lcdf.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
-#include <vector>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/prim/prob/ordered_probit_rng.hpp b/stan/math/prim/prob/ordered_probit_rng.hpp
index 1f11cebea27..32d81a36db2 100644
--- a/stan/math/prim/prob/ordered_probit_rng.hpp
+++ b/stan/math/prim/prob/ordered_probit_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_ORDERED_PROBIT_RNG_HPP
 #define STAN_MATH_PRIM_PROB_ORDERED_PROBIT_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Phi.hpp>
 #include <stan/math/prim/prob/categorical_rng.hpp>
diff --git a/stan/math/prim/prob/pareto_cdf.hpp b/stan/math/prim/prob/pareto_cdf.hpp
index 37d850a6138..c4651ac375f 100644
--- a/stan/math/prim/prob/pareto_cdf.hpp
+++ b/stan/math/prim/prob/pareto_cdf.hpp
@@ -4,13 +4,10 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_lccdf.hpp b/stan/math/prim/prob/pareto_lccdf.hpp
index 4c002b0dd0d..8bcfdd12829 100644
--- a/stan/math/prim/prob/pareto_lccdf.hpp
+++ b/stan/math/prim/prob/pareto_lccdf.hpp
@@ -3,18 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_lcdf.hpp b/stan/math/prim/prob/pareto_lcdf.hpp
index 6313c6778c6..f2351d9ee02 100644
--- a/stan/math/prim/prob/pareto_lcdf.hpp
+++ b/stan/math/prim/prob/pareto_lcdf.hpp
@@ -3,18 +3,13 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_lpdf.hpp b/stan/math/prim/prob/pareto_lpdf.hpp
index 1bb2cdab1b4..aefc643763e 100644
--- a/stan/math/prim/prob/pareto_lpdf.hpp
+++ b/stan/math/prim/prob/pareto_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -13,7 +11,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_type_2_cdf.hpp b/stan/math/prim/prob/pareto_type_2_cdf.hpp
index 7a492ee9cb8..fbd0271cdbe 100644
--- a/stan/math/prim/prob/pareto_type_2_cdf.hpp
+++ b/stan/math/prim/prob/pareto_type_2_cdf.hpp
@@ -3,15 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_type_2_lccdf.hpp b/stan/math/prim/prob/pareto_type_2_lccdf.hpp
index 746d1b17f83..cd2d22ce97f 100644
--- a/stan/math/prim/prob/pareto_type_2_lccdf.hpp
+++ b/stan/math/prim/prob/pareto_type_2_lccdf.hpp
@@ -3,15 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/pow.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_type_2_lcdf.hpp b/stan/math/prim/prob/pareto_type_2_lcdf.hpp
index 9d1c175a3a0..925264e5484 100644
--- a/stan/math/prim/prob/pareto_type_2_lcdf.hpp
+++ b/stan/math/prim/prob/pareto_type_2_lcdf.hpp
@@ -3,15 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_type_2_lpdf.hpp b/stan/math/prim/prob/pareto_type_2_lpdf.hpp
index 9cac66a418e..08604ba7d91 100644
--- a/stan/math/prim/prob/pareto_type_2_lpdf.hpp
+++ b/stan/math/prim/prob/pareto_type_2_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
@@ -12,7 +10,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/pareto_type_2_rng.hpp b/stan/math/prim/prob/pareto_type_2_rng.hpp
index e83886039ca..eb6762c2a67 100644
--- a/stan/math/prim/prob/pareto_type_2_rng.hpp
+++ b/stan/math/prim/prob/pareto_type_2_rng.hpp
@@ -7,8 +7,6 @@
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/prob/exponential_rng.hpp>
-#include <stan/math/prim/prob/normal_rng.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
 #include <cmath>
diff --git a/stan/math/prim/prob/poisson_binomial_cdf.hpp b/stan/math/prim/prob/poisson_binomial_cdf.hpp
index e11c9d57bd7..d520792d75a 100644
--- a/stan/math/prim/prob/poisson_binomial_cdf.hpp
+++ b/stan/math/prim/prob/poisson_binomial_cdf.hpp
@@ -3,16 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/binomial_coefficient_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/poisson_binomial_log_probs.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 
diff --git a/stan/math/prim/prob/poisson_binomial_lccdf.hpp b/stan/math/prim/prob/poisson_binomial_lccdf.hpp
index aa2787951a3..d63f5d2869e 100644
--- a/stan/math/prim/prob/poisson_binomial_lccdf.hpp
+++ b/stan/math/prim/prob/poisson_binomial_lccdf.hpp
@@ -3,17 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/binomial_coefficient_log.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <stan/math/prim/fun/log1m_exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/poisson_binomial_log_probs.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 
diff --git a/stan/math/prim/prob/poisson_binomial_lcdf.hpp b/stan/math/prim/prob/poisson_binomial_lcdf.hpp
index 116c01144c1..6ae587cff95 100644
--- a/stan/math/prim/prob/poisson_binomial_lcdf.hpp
+++ b/stan/math/prim/prob/poisson_binomial_lcdf.hpp
@@ -3,16 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/binomial_coefficient_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
-#include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/fun/poisson_binomial_log_probs.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
 
diff --git a/stan/math/prim/prob/poisson_binomial_lpmf.hpp b/stan/math/prim/prob/poisson_binomial_lpmf.hpp
index f672823f859..ac4312c1047 100644
--- a/stan/math/prim/prob/poisson_binomial_lpmf.hpp
+++ b/stan/math/prim/prob/poisson_binomial_lpmf.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/poisson_binomial_log_probs.hpp>
 #include <stan/math/prim/fun/vector_seq_view.hpp>
diff --git a/stan/math/prim/prob/poisson_binomial_rng.hpp b/stan/math/prim/prob/poisson_binomial_rng.hpp
index e05bedb07a4..42e7c3c053f 100644
--- a/stan/math/prim/prob/poisson_binomial_rng.hpp
+++ b/stan/math/prim/prob/poisson_binomial_rng.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <boost/random/bernoulli_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
 
diff --git a/stan/math/prim/prob/poisson_cdf.hpp b/stan/math/prim/prob/poisson_cdf.hpp
index c6ba4b866e0..2dbdf79e279 100644
--- a/stan/math/prim/prob/poisson_cdf.hpp
+++ b/stan/math/prim/prob/poisson_cdf.hpp
@@ -3,21 +3,15 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/poisson_lccdf.hpp b/stan/math/prim/prob/poisson_lccdf.hpp
index c3a622cfb9d..e04a60d6efa 100644
--- a/stan/math/prim/prob/poisson_lccdf.hpp
+++ b/stan/math/prim/prob/poisson_lccdf.hpp
@@ -3,23 +3,16 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/poisson_lcdf.hpp b/stan/math/prim/prob/poisson_lcdf.hpp
index 31baff192c3..1f7472247ad 100644
--- a/stan/math/prim/prob/poisson_lcdf.hpp
+++ b/stan/math/prim/prob/poisson_lcdf.hpp
@@ -3,23 +3,17 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/poisson_log_glm_lpmf.hpp b/stan/math/prim/prob/poisson_log_glm_lpmf.hpp
index 2ac54595dcf..ff845de47eb 100644
--- a/stan/math/prim/prob/poisson_log_glm_lpmf.hpp
+++ b/stan/math/prim/prob/poisson_log_glm_lpmf.hpp
@@ -6,10 +6,7 @@
 #include <stan/math/prim/fun/multiply.hpp>
 #include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
diff --git a/stan/math/prim/prob/poisson_log_lpmf.hpp b/stan/math/prim/prob/poisson_log_lpmf.hpp
index 0a169647e92..752776c2e28 100644
--- a/stan/math/prim/prob/poisson_log_lpmf.hpp
+++ b/stan/math/prim/prob/poisson_log_lpmf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
@@ -15,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/poisson_lpmf.hpp b/stan/math/prim/prob/poisson_lpmf.hpp
index a235c16be5a..3c184785d48 100644
--- a/stan/math/prim/prob/poisson_lpmf.hpp
+++ b/stan/math/prim/prob/poisson_lpmf.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
@@ -16,7 +13,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/rayleigh_cdf.hpp b/stan/math/prim/prob/rayleigh_cdf.hpp
index 84a17050667..6c56e0cd2fc 100644
--- a/stan/math/prim/prob/rayleigh_cdf.hpp
+++ b/stan/math/prim/prob/rayleigh_cdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/rayleigh_lccdf.hpp b/stan/math/prim/prob/rayleigh_lccdf.hpp
index 082f72a2522..07ddd2c0773 100644
--- a/stan/math/prim/prob/rayleigh_lccdf.hpp
+++ b/stan/math/prim/prob/rayleigh_lccdf.hpp
@@ -3,15 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/rayleigh_lcdf.hpp b/stan/math/prim/prob/rayleigh_lcdf.hpp
index a3e66b71ff3..e182ca23324 100644
--- a/stan/math/prim/prob/rayleigh_lcdf.hpp
+++ b/stan/math/prim/prob/rayleigh_lcdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/rayleigh_lpdf.hpp b/stan/math/prim/prob/rayleigh_lpdf.hpp
index 2ac376d4179..3983335815e 100644
--- a/stan/math/prim/prob/rayleigh_lpdf.hpp
+++ b/stan/math/prim/prob/rayleigh_lpdf.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/scaled_inv_chi_square_cdf.hpp b/stan/math/prim/prob/scaled_inv_chi_square_cdf.hpp
index 1ba20033d68..801b894f369 100644
--- a/stan/math/prim/prob/scaled_inv_chi_square_cdf.hpp
+++ b/stan/math/prim/prob/scaled_inv_chi_square_cdf.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
@@ -13,8 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/scaled_inv_chi_square_lccdf.hpp b/stan/math/prim/prob/scaled_inv_chi_square_lccdf.hpp
index 5d14e326e18..dfd8e8b486d 100644
--- a/stan/math/prim/prob/scaled_inv_chi_square_lccdf.hpp
+++ b/stan/math/prim/prob/scaled_inv_chi_square_lccdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/scaled_inv_chi_square_lcdf.hpp b/stan/math/prim/prob/scaled_inv_chi_square_lcdf.hpp
index ad017867c8d..8d84c225c62 100644
--- a/stan/math/prim/prob/scaled_inv_chi_square_lcdf.hpp
+++ b/stan/math/prim/prob/scaled_inv_chi_square_lcdf.hpp
@@ -5,16 +5,13 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/tgamma.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/scaled_inv_chi_square_lpdf.hpp b/stan/math/prim/prob/scaled_inv_chi_square_lpdf.hpp
index d2a19422727..c09c08da6b5 100644
--- a/stan/math/prim/prob/scaled_inv_chi_square_lpdf.hpp
+++ b/stan/math/prim/prob/scaled_inv_chi_square_lpdf.hpp
@@ -5,14 +5,11 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/grad_reg_inc_gamma.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_double_exponential_cdf.hpp b/stan/math/prim/prob/skew_double_exponential_cdf.hpp
index 8a96fc901a1..1bf00a31ca7 100644
--- a/stan/math/prim/prob/skew_double_exponential_cdf.hpp
+++ b/stan/math/prim/prob/skew_double_exponential_cdf.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/skew_double_exponential_lccdf.hpp b/stan/math/prim/prob/skew_double_exponential_lccdf.hpp
index abcf1b76c35..52204ff584b 100644
--- a/stan/math/prim/prob/skew_double_exponential_lccdf.hpp
+++ b/stan/math/prim/prob/skew_double_exponential_lccdf.hpp
@@ -3,13 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_double_exponential_lcdf.hpp b/stan/math/prim/prob/skew_double_exponential_lcdf.hpp
index a84ac2ca2b2..67989396ea0 100644
--- a/stan/math/prim/prob/skew_double_exponential_lcdf.hpp
+++ b/stan/math/prim/prob/skew_double_exponential_lcdf.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
-#include <limits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/prim/prob/skew_double_exponential_lpdf.hpp b/stan/math/prim/prob/skew_double_exponential_lpdf.hpp
index b83753f7168..48259cbb6e3 100644
--- a/stan/math/prim/prob/skew_double_exponential_lpdf.hpp
+++ b/stan/math/prim/prob/skew_double_exponential_lpdf.hpp
@@ -5,14 +5,10 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_double_exponential_rng.hpp b/stan/math/prim/prob/skew_double_exponential_rng.hpp
index 8df1529802c..73dbaa797af 100644
--- a/stan/math/prim/prob/skew_double_exponential_rng.hpp
+++ b/stan/math/prim/prob/skew_double_exponential_rng.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
diff --git a/stan/math/prim/prob/skew_normal_cdf.hpp b/stan/math/prim/prob/skew_normal_cdf.hpp
index 89487523e9a..88564e979ae 100644
--- a/stan/math/prim/prob/skew_normal_cdf.hpp
+++ b/stan/math/prim/prob/skew_normal_cdf.hpp
@@ -3,21 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
-#include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_normal_lccdf.hpp b/stan/math/prim/prob/skew_normal_lccdf.hpp
index af9a7e5918f..d96613fc0b3 100644
--- a/stan/math/prim/prob/skew_normal_lccdf.hpp
+++ b/stan/math/prim/prob/skew_normal_lccdf.hpp
@@ -3,19 +3,15 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_normal_lcdf.hpp b/stan/math/prim/prob/skew_normal_lcdf.hpp
index 97457163b4e..252c9d052bc 100644
--- a/stan/math/prim/prob/skew_normal_lcdf.hpp
+++ b/stan/math/prim/prob/skew_normal_lcdf.hpp
@@ -3,21 +3,16 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
-#include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_normal_lpdf.hpp b/stan/math/prim/prob/skew_normal_lpdf.hpp
index 50ed5217858..f3cb2565ad0 100644
--- a/stan/math/prim/prob/skew_normal_lpdf.hpp
+++ b/stan/math/prim/prob/skew_normal_lpdf.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -15,7 +12,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/skew_normal_rng.hpp b/stan/math/prim/prob/skew_normal_rng.hpp
index b64f7d4e86a..74e5b745ebb 100644
--- a/stan/math/prim/prob/skew_normal_rng.hpp
+++ b/stan/math/prim/prob/skew_normal_rng.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/prob/normal_rng.hpp>
 #include <boost/random/normal_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
 
diff --git a/stan/math/prim/prob/std_normal_cdf.hpp b/stan/math/prim/prob/std_normal_cdf.hpp
index 2fc86dc1d9f..23b2a5e84fc 100644
--- a/stan/math/prim/prob/std_normal_cdf.hpp
+++ b/stan/math/prim/prob/std_normal_cdf.hpp
@@ -6,11 +6,9 @@
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/std_normal_lcdf.hpp b/stan/math/prim/prob/std_normal_lcdf.hpp
index 738fe948765..60b39d52042 100644
--- a/stan/math/prim/prob/std_normal_lcdf.hpp
+++ b/stan/math/prim/prob/std_normal_lcdf.hpp
@@ -4,16 +4,12 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 #include <limits>
diff --git a/stan/math/prim/prob/std_normal_log_qf.hpp b/stan/math/prim/prob/std_normal_log_qf.hpp
index c21b7279890..7f71eb78975 100644
--- a/stan/math/prim/prob/std_normal_log_qf.hpp
+++ b/stan/math/prim/prob/std_normal_log_qf.hpp
@@ -4,12 +4,9 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log_diff_exp.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
-#include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/functor/apply_scalar_unary.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/std_normal_rng.hpp b/stan/math/prim/prob/std_normal_rng.hpp
index 9a5b5d0bbb3..680915ecbbd 100644
--- a/stan/math/prim/prob/std_normal_rng.hpp
+++ b/stan/math/prim/prob/std_normal_rng.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_PRIM_PROB_STD_NORMAL_RNG_HPP
 #define STAN_MATH_PRIM_PROB_STD_NORMAL_RNG_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <boost/random/normal_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
 
diff --git a/stan/math/prim/prob/student_t_cdf.hpp b/stan/math/prim/prob/student_t_cdf.hpp
index f9720c61209..6572f79e8bd 100644
--- a/stan/math/prim/prob/student_t_cdf.hpp
+++ b/stan/math/prim/prob/student_t_cdf.hpp
@@ -12,7 +12,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/student_t_lccdf.hpp b/stan/math/prim/prob/student_t_lccdf.hpp
index af8cb6208b0..075f546fa17 100644
--- a/stan/math/prim/prob/student_t_lccdf.hpp
+++ b/stan/math/prim/prob/student_t_lccdf.hpp
@@ -8,12 +8,10 @@
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/student_t_lcdf.hpp b/stan/math/prim/prob/student_t_lcdf.hpp
index 793b23273ed..28bbf6b9d8c 100644
--- a/stan/math/prim/prob/student_t_lcdf.hpp
+++ b/stan/math/prim/prob/student_t_lcdf.hpp
@@ -8,12 +8,10 @@
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/student_t_lpdf.hpp b/stan/math/prim/prob/student_t_lpdf.hpp
index b2c625840b9..f6bdce562b6 100644
--- a/stan/math/prim/prob/student_t_lpdf.hpp
+++ b/stan/math/prim/prob/student_t_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
@@ -16,7 +14,6 @@
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/uniform_cdf.hpp b/stan/math/prim/prob/uniform_cdf.hpp
index 52c2660ec1f..07aff00c925 100644
--- a/stan/math/prim/prob/uniform_cdf.hpp
+++ b/stan/math/prim/prob/uniform_cdf.hpp
@@ -3,15 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/uniform_lccdf.hpp b/stan/math/prim/prob/uniform_lccdf.hpp
index 0dd1f8c0b57..970db0bcb18 100644
--- a/stan/math/prim/prob/uniform_lccdf.hpp
+++ b/stan/math/prim/prob/uniform_lccdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/uniform_lcdf.hpp b/stan/math/prim/prob/uniform_lcdf.hpp
index 883d71bafea..5792f43dc59 100644
--- a/stan/math/prim/prob/uniform_lcdf.hpp
+++ b/stan/math/prim/prob/uniform_lcdf.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/uniform_lpdf.hpp b/stan/math/prim/prob/uniform_lpdf.hpp
index a681c3db40b..a5c547e8a20 100644
--- a/stan/math/prim/prob/uniform_lpdf.hpp
+++ b/stan/math/prim/prob/uniform_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -12,7 +10,6 @@
 #include <stan/math/prim/fun/promote_scalar.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/uniform_rng.hpp b/stan/math/prim/prob/uniform_rng.hpp
index f2011c5d189..70b3f2b4165 100644
--- a/stan/math/prim/prob/uniform_rng.hpp
+++ b/stan/math/prim/prob/uniform_rng.hpp
@@ -3,11 +3,9 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
 
diff --git a/stan/math/prim/prob/von_mises_lpdf.hpp b/stan/math/prim/prob/von_mises_lpdf.hpp
index b8d5a1ab63b..3736c289278 100644
--- a/stan/math/prim/prob/von_mises_lpdf.hpp
+++ b/stan/math/prim/prob/von_mises_lpdf.hpp
@@ -3,19 +3,14 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/cos.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <stan/math/prim/fun/log_modified_bessel_first_kind.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/modified_bessel_first_kind.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/weibull_cdf.hpp b/stan/math/prim/prob/weibull_cdf.hpp
index 6c6be0bdb78..01e77da097f 100644
--- a/stan/math/prim/prob/weibull_cdf.hpp
+++ b/stan/math/prim/prob/weibull_cdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/weibull_lccdf.hpp b/stan/math/prim/prob/weibull_lccdf.hpp
index 9fa25a575ea..8cff336c4fe 100644
--- a/stan/math/prim/prob/weibull_lccdf.hpp
+++ b/stan/math/prim/prob/weibull_lccdf.hpp
@@ -3,14 +3,10 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/weibull_lcdf.hpp b/stan/math/prim/prob/weibull_lcdf.hpp
index 12b70cf76e6..b360feacd0c 100644
--- a/stan/math/prim/prob/weibull_lcdf.hpp
+++ b/stan/math/prim/prob/weibull_lcdf.hpp
@@ -3,16 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/weibull_lpdf.hpp b/stan/math/prim/prob/weibull_lpdf.hpp
index e5313765f13..44a6700090f 100644
--- a/stan/math/prim/prob/weibull_lpdf.hpp
+++ b/stan/math/prim/prob/weibull_lpdf.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/as_value_column_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log.hpp>
@@ -13,7 +11,6 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 #include <cmath>
 
diff --git a/stan/math/prim/prob/wiener_lpdf.hpp b/stan/math/prim/prob/wiener_lpdf.hpp
index 05c785691cf..415cdc15b77 100644
--- a/stan/math/prim/prob/wiener_lpdf.hpp
+++ b/stan/math/prim/prob/wiener_lpdf.hpp
@@ -43,7 +43,6 @@
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
-#include <algorithm>
 #include <cmath>
 #include <string>
 
diff --git a/stan/math/prim/prob/wishart_cholesky_rng.hpp b/stan/math/prim/prob/wishart_cholesky_rng.hpp
index ab6cc671a1e..5497ffd81a3 100644
--- a/stan/math/prim/prob/wishart_cholesky_rng.hpp
+++ b/stan/math/prim/prob/wishart_cholesky_rng.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/crossprod.hpp>
 #include <stan/math/prim/prob/chi_square_rng.hpp>
 #include <stan/math/prim/prob/normal_rng.hpp>
 #include <cmath>
diff --git a/stan/math/prim/prob/yule_simon_cdf.hpp b/stan/math/prim/prob/yule_simon_cdf.hpp
index 10a5ba2637e..2eaf68763b9 100644
--- a/stan/math/prim/prob/yule_simon_cdf.hpp
+++ b/stan/math/prim/prob/yule_simon_cdf.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
 #include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
@@ -11,7 +10,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/yule_simon_lccdf.hpp b/stan/math/prim/prob/yule_simon_lccdf.hpp
index 335fa158e8c..12debb77fff 100644
--- a/stan/math/prim/prob/yule_simon_lccdf.hpp
+++ b/stan/math/prim/prob/yule_simon_lccdf.hpp
@@ -5,13 +5,11 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/beta.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/yule_simon_lcdf.hpp b/stan/math/prim/prob/yule_simon_lcdf.hpp
index b84e54a6a82..1774136bd8f 100644
--- a/stan/math/prim/prob/yule_simon_lcdf.hpp
+++ b/stan/math/prim/prob/yule_simon_lcdf.hpp
@@ -11,7 +11,6 @@
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/prim/prob/yule_simon_lpmf.hpp b/stan/math/prim/prob/yule_simon_lpmf.hpp
index 7ac83b3bf83..09ee5d04bb7 100644
--- a/stan/math/prim/prob/yule_simon_lpmf.hpp
+++ b/stan/math/prim/prob/yule_simon_lpmf.hpp
@@ -3,15 +3,11 @@
 
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/digamma.hpp>
-#include <stan/math/prim/fun/lbeta.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/max_size.hpp>
 #include <stan/math/prim/fun/scalar_seq_view.hpp>
-#include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/size_zero.hpp>
-#include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/partials_propagator.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/constraint/cholesky_corr_constrain.hpp b/stan/math/rev/constraint/cholesky_corr_constrain.hpp
index 576a1bb962e..de704be1eaf 100644
--- a/stan/math/rev/constraint/cholesky_corr_constrain.hpp
+++ b/stan/math/rev/constraint/cholesky_corr_constrain.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <cmath>
diff --git a/stan/math/rev/constraint/cholesky_factor_constrain.hpp b/stan/math/rev/constraint/cholesky_factor_constrain.hpp
index fcf26477fb5..522b00b194a 100644
--- a/stan/math/rev/constraint/cholesky_factor_constrain.hpp
+++ b/stan/math/rev/constraint/cholesky_factor_constrain.hpp
@@ -4,12 +4,7 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/sum.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/constraint/corr_matrix_constrain.hpp b/stan/math/rev/constraint/corr_matrix_constrain.hpp
index 8b8a028c9a5..15357411158 100644
--- a/stan/math/rev/constraint/corr_matrix_constrain.hpp
+++ b/stan/math/rev/constraint/corr_matrix_constrain.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <stan/math/prim/fun/read_corr_matrix.hpp>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/constraint/cov_matrix_constrain.hpp b/stan/math/rev/constraint/cov_matrix_constrain.hpp
index b71913f2d8a..621fd7576d6 100644
--- a/stan/math/rev/constraint/cov_matrix_constrain.hpp
+++ b/stan/math/rev/constraint/cov_matrix_constrain.hpp
@@ -6,8 +6,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/constraint/cov_matrix_constrain_lkj.hpp b/stan/math/rev/constraint/cov_matrix_constrain_lkj.hpp
index 115a396cf6c..cab26f330b3 100644
--- a/stan/math/rev/constraint/cov_matrix_constrain_lkj.hpp
+++ b/stan/math/rev/constraint/cov_matrix_constrain_lkj.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/constraint/corr_constrain.hpp>
 #include <stan/math/prim/constraint/positive_constrain.hpp>
 #include <stan/math/prim/fun/read_cov_matrix.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/constraint/ordered_constrain.hpp b/stan/math/rev/constraint/ordered_constrain.hpp
index fe8255e7c0d..5ea86a00e60 100644
--- a/stan/math/rev/constraint/ordered_constrain.hpp
+++ b/stan/math/rev/constraint/ordered_constrain.hpp
@@ -3,12 +3,9 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <cmath>
-#include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/constraint/positive_ordered_constrain.hpp b/stan/math/rev/constraint/positive_ordered_constrain.hpp
index d5c6b02f9e9..8e82b6c43eb 100644
--- a/stan/math/rev/constraint/positive_ordered_constrain.hpp
+++ b/stan/math/rev/constraint/positive_ordered_constrain.hpp
@@ -4,11 +4,8 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <cmath>
-#include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/constraint/simplex_constrain.hpp b/stan/math/rev/constraint/simplex_constrain.hpp
index f7c4534b352..0f0bc7a1f82 100644
--- a/stan/math/rev/constraint/simplex_constrain.hpp
+++ b/stan/math/rev/constraint/simplex_constrain.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/constraint/sum_to_zero_constrain.hpp>
 #include <stan/math/prim/constraint/simplex_constrain.hpp>
 #include <cmath>
diff --git a/stan/math/rev/constraint/stochastic_column_constrain.hpp b/stan/math/rev/constraint/stochastic_column_constrain.hpp
index bbc0e046b38..85f25d2c9cd 100644
--- a/stan/math/rev/constraint/stochastic_column_constrain.hpp
+++ b/stan/math/rev/constraint/stochastic_column_constrain.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/constraint/stochastic_column_constrain.hpp>
 #include <stan/math/rev/constraint/sum_to_zero_constrain.hpp>
diff --git a/stan/math/rev/constraint/stochastic_row_constrain.hpp b/stan/math/rev/constraint/stochastic_row_constrain.hpp
index 80fa461c3a6..71f23ef3f23 100644
--- a/stan/math/rev/constraint/stochastic_row_constrain.hpp
+++ b/stan/math/rev/constraint/stochastic_row_constrain.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/constraint/stochastic_row_constrain.hpp>
 #include <stan/math/rev/constraint/sum_to_zero_constrain.hpp>
diff --git a/stan/math/rev/constraint/sum_to_zero_constrain.hpp b/stan/math/rev/constraint/sum_to_zero_constrain.hpp
index c8004319ada..d7c3b6033fb 100644
--- a/stan/math/rev/constraint/sum_to_zero_constrain.hpp
+++ b/stan/math/rev/constraint/sum_to_zero_constrain.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/inv_sqrt.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
diff --git a/stan/math/rev/constraint/unit_vector_constrain.hpp b/stan/math/rev/constraint/unit_vector_constrain.hpp
index 86193c28e7e..ac66ef6e24b 100644
--- a/stan/math/rev/constraint/unit_vector_constrain.hpp
+++ b/stan/math/rev/constraint/unit_vector_constrain.hpp
@@ -4,12 +4,8 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/dot_self.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/dot_self.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <cmath>
diff --git a/stan/math/rev/core/accumulate_adjoints.hpp b/stan/math/rev/core/accumulate_adjoints.hpp
index 30e4869db76..3af50175daf 100644
--- a/stan/math/rev/core/accumulate_adjoints.hpp
+++ b/stan/math/rev/core/accumulate_adjoints.hpp
@@ -7,7 +7,6 @@
 #include <stan/math/rev/core/var.hpp>
 
 #include <utility>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/arena_matrix.hpp b/stan/math/rev/core/arena_matrix.hpp
index acaef275b9d..4b28edcec5d 100644
--- a/stan/math/rev/core/arena_matrix.hpp
+++ b/stan/math/rev/core/arena_matrix.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_ARENA_MATRIX_HPP
 
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/rev/core/chainable_alloc.hpp>
 #include <stan/math/rev/core/chainablestack.hpp>
 #include <stan/math/rev/core/chainable_object.hpp>
 #include <stan/math/rev/core/var_value_fwd_declare.hpp>
diff --git a/stan/math/rev/core/chainable_object.hpp b/stan/math/rev/core/chainable_object.hpp
index c2726c9d494..a965d79663b 100644
--- a/stan/math/rev/core/chainable_object.hpp
+++ b/stan/math/rev/core/chainable_object.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_CORE_CHAINABLE_OBJECT_HPP
 #define STAN_MATH_REV_CORE_CHAINABLE_OBJECT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core/chainable_alloc.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/count_vars.hpp b/stan/math/rev/core/count_vars.hpp
index d108f4b475a..3c7c5f2d3d7 100644
--- a/stan/math/rev/core/count_vars.hpp
+++ b/stan/math/rev/core/count_vars.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/functor/apply.hpp>
 
 #include <utility>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/filter_var_scalar_types.hpp b/stan/math/rev/core/filter_var_scalar_types.hpp
index 4b56cf80cf7..1d07ecfb03d 100644
--- a/stan/math/rev/core/filter_var_scalar_types.hpp
+++ b/stan/math/rev/core/filter_var_scalar_types.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_CORE_FILTER_VAR_SCALAR_TYPES_HPP
 #define STAN_MATH_REV_CORE_FILTER_VAR_SCALAR_TYPES_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/filter_map.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <type_traits>
 
 namespace stan::math::internal {
 /**
diff --git a/stan/math/rev/core/grad.hpp b/stan/math/rev/core/grad.hpp
index edcb3a11d1d..cb2fc711b5d 100644
--- a/stan/math/rev/core/grad.hpp
+++ b/stan/math/rev/core/grad.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_CORE_GRAD_HPP
 #define STAN_MATH_REV_CORE_GRAD_HPP
 
-#include <stan/math/rev/core/chainable_alloc.hpp>
 #include <stan/math/rev/core/chainablestack.hpp>
 #include <stan/math/rev/core/empty_nested.hpp>
 #include <stan/math/rev/core/nested_size.hpp>
diff --git a/stan/math/rev/core/init_chainablestack.hpp b/stan/math/rev/core/init_chainablestack.hpp
index cbe5bba8e03..983099ad791 100644
--- a/stan/math/rev/core/init_chainablestack.hpp
+++ b/stan/math/rev/core/init_chainablestack.hpp
@@ -7,7 +7,6 @@
 
 #include <mutex>
 #include <unordered_map>
-#include <utility>
 #include <thread>
 #include <tuple>
 
diff --git a/stan/math/rev/core/matrix_vari.hpp b/stan/math/rev/core/matrix_vari.hpp
index 3ed15c86b3f..6612326414f 100644
--- a/stan/math/rev/core/matrix_vari.hpp
+++ b/stan/math/rev/core/matrix_vari.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core/Eigen_NumTraits.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/vari.hpp>
 #include <stan/math/prim/meta.hpp>
 
diff --git a/stan/math/rev/core/operator_addition.hpp b/stan/math/rev/core/operator_addition.hpp
index fda648fbde5..3dc56bfa744 100644
--- a/stan/math/rev/core/operator_addition.hpp
+++ b/stan/math/rev/core/operator_addition.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
diff --git a/stan/math/rev/core/operator_division.hpp b/stan/math/rev/core/operator_division.hpp
index fa0872b0d4f..884fc20a111 100644
--- a/stan/math/rev/core/operator_division.hpp
+++ b/stan/math/rev/core/operator_division.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_CORE_OPERATOR_DIVISION_HPP
 #define STAN_MATH_REV_CORE_OPERATOR_DIVISION_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/core/operator_division.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/std_complex.hpp>
@@ -15,7 +12,6 @@
 #include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <complex>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_minus_equal.hpp b/stan/math/rev/core/operator_minus_equal.hpp
index 09b30a5e35f..e43fb5e80d3 100644
--- a/stan/math/rev/core/operator_minus_equal.hpp
+++ b/stan/math/rev/core/operator_minus_equal.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/operator_subtraction.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/size.hpp>
 namespace stan {
 namespace math {
 
diff --git a/stan/math/rev/core/operator_multiplication.hpp b/stan/math/rev/core/operator_multiplication.hpp
index 9bef65805f3..ec406c2af67 100644
--- a/stan/math/rev/core/operator_multiplication.hpp
+++ b/stan/math/rev/core/operator_multiplication.hpp
@@ -5,14 +5,9 @@
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/operator_addition.hpp>
 #include <stan/math/rev/core/operator_subtraction.hpp>
-#include <stan/math/rev/core/operator_plus_equal.hpp>
-#include <stan/math/rev/core/operator_minus_equal.hpp>
 #include <stan/math/rev/core/vv_vari.hpp>
 #include <stan/math/rev/core/vd_vari.hpp>
 #include <stan/math/prim/core/operator_multiplication.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
 #include <stan/math/prim/fun/isnan.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/core/operator_subtraction.hpp b/stan/math/rev/core/operator_subtraction.hpp
index 3290c738b9a..3c70a169833 100644
--- a/stan/math/rev/core/operator_subtraction.hpp
+++ b/stan/math/rev/core/operator_subtraction.hpp
@@ -3,12 +3,8 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_unary_decrement.hpp b/stan/math/rev/core/operator_unary_decrement.hpp
index 2570e6dc704..538b7b6519d 100644
--- a/stan/math/rev/core/operator_unary_decrement.hpp
+++ b/stan/math/rev/core/operator_unary_decrement.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_CORE_OPERATOR_UNARY_DECREMENT_HPP
 #define STAN_MATH_REV_CORE_OPERATOR_UNARY_DECREMENT_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_unary_increment.hpp b/stan/math/rev/core/operator_unary_increment.hpp
index fca17c6deb9..2118695f05f 100644
--- a/stan/math/rev/core/operator_unary_increment.hpp
+++ b/stan/math/rev/core/operator_unary_increment.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_CORE_OPERATOR_UNARY_INCREMENT_HPP
 #define STAN_MATH_REV_CORE_OPERATOR_UNARY_INCREMENT_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_unary_negative.hpp b/stan/math/rev/core/operator_unary_negative.hpp
index a118083bda5..6e3ad7c872e 100644
--- a/stan/math/rev/core/operator_unary_negative.hpp
+++ b/stan/math/rev/core/operator_unary_negative.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_unary_not.hpp b/stan/math/rev/core/operator_unary_not.hpp
index aa0234504ee..75963804fa3 100644
--- a/stan/math/rev/core/operator_unary_not.hpp
+++ b/stan/math/rev/core/operator_unary_not.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_OPERATOR_UNARY_NOT_HPP
 
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/prim/meta.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/operator_unary_plus.hpp b/stan/math/rev/core/operator_unary_plus.hpp
index 389aad555fc..876d7b72fb1 100644
--- a/stan/math/rev/core/operator_unary_plus.hpp
+++ b/stan/math/rev/core/operator_unary_plus.hpp
@@ -1,11 +1,7 @@
 #ifndef STAN_MATH_REV_CORE_OPERATOR_UNARY_PLUS_HPP
 #define STAN_MATH_REV_CORE_OPERATOR_UNARY_PLUS_HPP
 
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/rev/core/callback_vari.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/print_stack.hpp b/stan/math/rev/core/print_stack.hpp
index a81b03cc51e..02d961048b4 100644
--- a/stan/math/rev/core/print_stack.hpp
+++ b/stan/math/rev/core/print_stack.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_PRINT_STACK_HPP
 
 #include <stan/math/rev/core/chainablestack.hpp>
-#include <stan/math/rev/core/vari.hpp>
 #include <ostream>
 
 namespace stan {
diff --git a/stan/math/rev/core/profiling.hpp b/stan/math/rev/core/profiling.hpp
index d881ae57878..7807805d469 100644
--- a/stan/math/rev/core/profiling.hpp
+++ b/stan/math/rev/core/profiling.hpp
@@ -1,14 +1,11 @@
 #ifndef STAN_MATH_REV_CORE_PROFILING_HPP
 #define STAN_MATH_REV_CORE_PROFILING_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
-#include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/err.hpp>
 #include <tbb/concurrent_unordered_map.h>
-#include <iostream>
 #include <sstream>
 #include <thread>
 
diff --git a/stan/math/rev/core/save_varis.hpp b/stan/math/rev/core/save_varis.hpp
index 494447cdd20..8b07866f908 100644
--- a/stan/math/rev/core/save_varis.hpp
+++ b/stan/math/rev/core/save_varis.hpp
@@ -1,14 +1,12 @@
 #ifndef STAN_MATH_REV_CORE_SAVE_VARIS_HPP
 #define STAN_MATH_REV_CORE_SAVE_VARIS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
 
 #include <utility>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/scoped_chainablestack.hpp b/stan/math/rev/core/scoped_chainablestack.hpp
index a1c0f72594b..4820ea2e844 100644
--- a/stan/math/rev/core/scoped_chainablestack.hpp
+++ b/stan/math/rev/core/scoped_chainablestack.hpp
@@ -5,7 +5,6 @@
 
 #include <mutex>
 #include <stdexcept>
-#include <thread>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/set_zero_all_adjoints.hpp b/stan/math/rev/core/set_zero_all_adjoints.hpp
index b208004ec43..e80cf90a5be 100644
--- a/stan/math/rev/core/set_zero_all_adjoints.hpp
+++ b/stan/math/rev/core/set_zero_all_adjoints.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_SET_ZERO_ALL_ADJOINTS_HPP
 
 #include <stan/math/rev/core/vari.hpp>
-#include <stan/math/rev/core/chainable_alloc.hpp>
 #include <stan/math/rev/core/chainablestack.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/core/set_zero_all_adjoints_nested.hpp b/stan/math/rev/core/set_zero_all_adjoints_nested.hpp
index 282a199ebf4..f7018623a59 100644
--- a/stan/math/rev/core/set_zero_all_adjoints_nested.hpp
+++ b/stan/math/rev/core/set_zero_all_adjoints_nested.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_SET_ZERO_ALL_ADJOINTS_NESTED_HPP
 
 #include <stan/math/rev/core/vari.hpp>
-#include <stan/math/rev/core/chainable_alloc.hpp>
 #include <stan/math/rev/core/chainablestack.hpp>
 #include <stan/math/rev/core/empty_nested.hpp>
 #include <stdexcept>
diff --git a/stan/math/rev/core/std_iterator_traits.hpp b/stan/math/rev/core/std_iterator_traits.hpp
index 09560538e88..e1285967970 100644
--- a/stan/math/rev/core/std_iterator_traits.hpp
+++ b/stan/math/rev/core/std_iterator_traits.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_CORE_STD_ITERATOR_TRAITS_HPP
 
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <iterator>
 
 namespace std {
diff --git a/stan/math/rev/core/var.hpp b/stan/math/rev/core/var.hpp
index 7186990ca98..dfeabdd9f99 100644
--- a/stan/math/rev/core/var.hpp
+++ b/stan/math/rev/core/var.hpp
@@ -7,7 +7,6 @@
 #endif
 #include <stan/math/rev/core/vari.hpp>
 #include <stan/math/rev/core/grad.hpp>
-#include <stan/math/rev/core/chainable_alloc.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/meta/is_vari.hpp>
 #include <stan/math/rev/meta/arena_type.hpp>
diff --git a/stan/math/rev/core/vector_vari.hpp b/stan/math/rev/core/vector_vari.hpp
index 57f7ebed6c6..685d4d10b64 100644
--- a/stan/math/rev/core/vector_vari.hpp
+++ b/stan/math/rev/core/vector_vari.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_REV_CORE_VECTOR_VARI_HPP
 
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/vari.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/core/zero_adjoints.hpp b/stan/math/rev/core/zero_adjoints.hpp
index 4371f5184b1..237f2da3711 100644
--- a/stan/math/rev/core/zero_adjoints.hpp
+++ b/stan/math/rev/core/zero_adjoints.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_REV_CORE_ZERO_ADJOINTS_HPP
 
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/LDLT_factor.hpp b/stan/math/rev/fun/LDLT_factor.hpp
index 5e9bc0efdff..a99fced7711 100644
--- a/stan/math/rev/fun/LDLT_factor.hpp
+++ b/stan/math/rev/fun/LDLT_factor.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/LDLT_factor.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/abs.hpp b/stan/math/rev/fun/abs.hpp
index 9e29024ed63..889e690d54a 100644
--- a/stan/math/rev/fun/abs.hpp
+++ b/stan/math/rev/fun/abs.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_ABS_HPP
 #define STAN_MATH_REV_FUN_ABS_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/fabs.hpp>
 #include <stan/math/rev/fun/hypot.hpp>
 #include <stan/math/prim/fun/abs.hpp>
diff --git a/stan/math/rev/fun/accumulator.hpp b/stan/math/rev/fun/accumulator.hpp
index 73bf7e5f7c1..56a86bffbef 100644
--- a/stan/math/rev/fun/accumulator.hpp
+++ b/stan/math/rev/fun/accumulator.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_REV_FUN_ACCUMULATOR_HPP
 #define STAN_MATH_REV_FUN_ACCUMULATOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/sum.hpp>
 #include <stan/math/prim/fun/accumulator.hpp>
 #include <vector>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/acos.hpp b/stan/math/rev/fun/acos.hpp
index f8f3b41149f..f9801053c8a 100644
--- a/stan/math/rev/fun/acos.hpp
+++ b/stan/math/rev/fun/acos.hpp
@@ -3,12 +3,7 @@
 
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/fun/abs.hpp>
-#include <stan/math/rev/fun/arg.hpp>
 #include <stan/math/rev/fun/asin.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
-#include <stan/math/rev/fun/polar.hpp>
 #include <stan/math/prim/fun/acos.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/acosh.hpp b/stan/math/rev/fun/acosh.hpp
index 0cb36dce1ba..6e45d831b23 100644
--- a/stan/math/rev/fun/acosh.hpp
+++ b/stan/math/rev/fun/acosh.hpp
@@ -3,17 +3,10 @@
 
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/fun/abs.hpp>
-#include <stan/math/rev/fun/arg.hpp>
 #include <stan/math/rev/fun/cosh.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
 #include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/polar.hpp>
-#include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/isnan.hpp>
 #include <stan/math/prim/fun/acosh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/append_col.hpp b/stan/math/rev/fun/append_col.hpp
index 6622b23f7b3..a603637c0dd 100644
--- a/stan/math/rev/fun/append_col.hpp
+++ b/stan/math/rev/fun/append_col.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_REV_FUN_APPEND_COL_HPP
 #define STAN_MATH_REV_FUN_APPEND_COL_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/append_col.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/append_row.hpp b/stan/math/rev/fun/append_row.hpp
index e8e85be84d0..80a7e095ba9 100644
--- a/stan/math/rev/fun/append_row.hpp
+++ b/stan/math/rev/fun/append_row.hpp
@@ -1,12 +1,10 @@
 #ifndef STAN_MATH_REV_FUN_APPEND_ROW_HPP
 #define STAN_MATH_REV_FUN_APPEND_ROW_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/append_row.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/as_array_or_scalar.hpp b/stan/math/rev/fun/as_array_or_scalar.hpp
index fddebcad31d..b30541d7daa 100644
--- a/stan/math/rev/fun/as_array_or_scalar.hpp
+++ b/stan/math/rev/fun/as_array_or_scalar.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_AS_ARRAY_OR_SCALAR_HPP
 #define STAN_MATH_REV_FUN_AS_ARRAY_OR_SCALAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 
diff --git a/stan/math/rev/fun/as_bool.hpp b/stan/math/rev/fun/as_bool.hpp
index 7af605cf6cf..ed0febebf8d 100644
--- a/stan/math/rev/fun/as_bool.hpp
+++ b/stan/math/rev/fun/as_bool.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_AS_BOOL_HPP
 #define STAN_MATH_REV_FUN_AS_BOOL_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/as_column_vector_or_scalar.hpp b/stan/math/rev/fun/as_column_vector_or_scalar.hpp
index fe2d0cf37ad..12362fdee4a 100644
--- a/stan/math/rev/fun/as_column_vector_or_scalar.hpp
+++ b/stan/math/rev/fun/as_column_vector_or_scalar.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_AS_COLUMN_VECTOR_OR_SCALAR_HPP
 #define STAN_MATH_REV_FUN_AS_COLUMN_VECTOR_OR_SCALAR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/asin.hpp b/stan/math/rev/fun/asin.hpp
index 8609307bc24..df7be9be6fc 100644
--- a/stan/math/rev/fun/asin.hpp
+++ b/stan/math/rev/fun/asin.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/fun/abs.hpp>
 #include <stan/math/rev/fun/asinh.hpp>
 #include <stan/math/rev/fun/value_of_rec.hpp>
 #include <stan/math/prim/fun/asin.hpp>
diff --git a/stan/math/rev/fun/asinh.hpp b/stan/math/rev/fun/asinh.hpp
index 8834212a632..cd4edff3ea9 100644
--- a/stan/math/rev/fun/asinh.hpp
+++ b/stan/math/rev/fun/asinh.hpp
@@ -4,15 +4,8 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/rev/fun/abs.hpp>
-#include <stan/math/rev/fun/arg.hpp>
 #include <stan/math/rev/fun/cosh.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
 #include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/polar.hpp>
-#include <stan/math/rev/fun/sqrt.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/asinh.hpp>
 #include <cmath>
diff --git a/stan/math/rev/fun/atan.hpp b/stan/math/rev/fun/atan.hpp
index 7b5aeaa999d..435206bd507 100644
--- a/stan/math/rev/fun/atan.hpp
+++ b/stan/math/rev/fun/atan.hpp
@@ -2,15 +2,8 @@
 #define STAN_MATH_REV_FUN_ATAN_HPP
 
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/hypot.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/fun/abs.hpp>
-#include <stan/math/rev/fun/cos.hpp>
 #include <stan/math/rev/fun/atanh.hpp>
-#include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/sqrt.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
 #include <stan/math/prim/fun/atan.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/atanh.hpp b/stan/math/rev/fun/atanh.hpp
index 2532dfcaa21..9564ae28803 100644
--- a/stan/math/rev/fun/atanh.hpp
+++ b/stan/math/rev/fun/atanh.hpp
@@ -4,11 +4,8 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/rev/fun/atan2.hpp>
 #include <stan/math/rev/fun/cosh.hpp>
 #include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/sinh.hpp>
-#include <stan/math/rev/fun/hypot.hpp>
 #include <stan/math/prim/fun/atanh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/ceil.hpp b/stan/math/rev/fun/ceil.hpp
index 025caa71e82..fbb285f0133 100644
--- a/stan/math/rev/fun/ceil.hpp
+++ b/stan/math/rev/fun/ceil.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/ceil.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/fun/cholesky_decompose.hpp b/stan/math/rev/fun/cholesky_decompose.hpp
index 226674a8aa8..9173e25d33e 100644
--- a/stan/math/rev/fun/cholesky_decompose.hpp
+++ b/stan/math/rev/fun/cholesky_decompose.hpp
@@ -4,15 +4,11 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/cholesky_decompose.hpp>
 #include <stan/math/prim/err/check_pos_definite.hpp>
 #include <stan/math/prim/err/check_square.hpp>
 #include <stan/math/prim/err/check_symmetric.hpp>
 #include <algorithm>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/columns_dot_self.hpp b/stan/math/rev/fun/columns_dot_self.hpp
index e21b8a2e313..5835a94d5c2 100644
--- a/stan/math/rev/fun/columns_dot_self.hpp
+++ b/stan/math/rev/fun/columns_dot_self.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/dot_self.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/columns_dot_self.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/cosh.hpp b/stan/math/rev/fun/cosh.hpp
index 2b73be9f60a..45f771043ec 100644
--- a/stan/math/rev/fun/cosh.hpp
+++ b/stan/math/rev/fun/cosh.hpp
@@ -3,10 +3,8 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/operator_multiplication.hpp>
 #include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/rev/fun/sin.hpp>
-#include <stan/math/rev/fun/sinh.hpp>
 #include <stan/math/prim/fun/cosh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/cov_exp_quad.hpp b/stan/math/rev/fun/cov_exp_quad.hpp
index 5ade5d2460b..18b123c948c 100644
--- a/stan/math/rev/fun/cov_exp_quad.hpp
+++ b/stan/math/rev/fun/cov_exp_quad.hpp
@@ -7,9 +7,7 @@
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/rev/fun/gp_exp_quad_cov.hpp>
 #include <stan/math/rev/fun/squared_distance.hpp>
-#include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/prim/fun/cov_exp_quad.hpp>
-#include <type_traits>
 #include <vector>
 #include <cmath>
 
diff --git a/stan/math/rev/fun/cumulative_sum.hpp b/stan/math/rev/fun/cumulative_sum.hpp
index a4d75588979..879f970dbcd 100644
--- a/stan/math/rev/fun/cumulative_sum.hpp
+++ b/stan/math/rev/fun/cumulative_sum.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/fun/cumulative_sum.hpp>
-#include <vector>
-#include <numeric>
-#include <functional>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/determinant.hpp b/stan/math/rev/fun/determinant.hpp
index d824151e818..24302e67f7c 100644
--- a/stan/math/rev/fun/determinant.hpp
+++ b/stan/math/rev/fun/determinant.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/determinant.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/diag_post_multiply.hpp b/stan/math/rev/fun/diag_post_multiply.hpp
index 5d8affa18f6..4452b4a3f23 100644
--- a/stan/math/rev/fun/diag_post_multiply.hpp
+++ b/stan/math/rev/fun/diag_post_multiply.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_DIAG_POST_MULTIPLY_HPP
 #define STAN_MATH_REV_FUN_DIAG_POST_MULTIPLY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/diag_post_multiply.hpp>
diff --git a/stan/math/rev/fun/diag_pre_multiply.hpp b/stan/math/rev/fun/diag_pre_multiply.hpp
index 1636c5e7918..c426d877a2c 100644
--- a/stan/math/rev/fun/diag_pre_multiply.hpp
+++ b/stan/math/rev/fun/diag_pre_multiply.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_DIAG_PRE_MULTIPLY_HPP
 #define STAN_MATH_REV_FUN_DIAG_PRE_MULTIPLY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/diag_pre_multiply.hpp>
diff --git a/stan/math/rev/fun/dims.hpp b/stan/math/rev/fun/dims.hpp
index eda8ee0926a..a6e6d057f1b 100644
--- a/stan/math/rev/fun/dims.hpp
+++ b/stan/math/rev/fun/dims.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_DIMS_HPP
 #define STAN_MATH_REV_FUN_DIMS_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/dims.hpp>
 #include <vector>
diff --git a/stan/math/rev/fun/dot_product.hpp b/stan/math/rev/fun/dot_product.hpp
index 48c99d12bba..f8f38c153b9 100644
--- a/stan/math/rev/fun/dot_product.hpp
+++ b/stan/math/rev/fun/dot_product.hpp
@@ -5,15 +5,10 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/dot_product.hpp>
-#include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/dot_product.hpp>
-#include <type_traits>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/dot_self.hpp b/stan/math/rev/fun/dot_self.hpp
index 47b889fd6df..061476c4725 100644
--- a/stan/math/rev/fun/dot_self.hpp
+++ b/stan/math/rev/fun/dot_self.hpp
@@ -1,13 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_DOT_SELF_HPP
 #define STAN_MATH_REV_FUN_DOT_SELF_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/square.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/dot_self.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/eigendecompose_sym.hpp b/stan/math/rev/fun/eigendecompose_sym.hpp
index 873da174049..d3c4492ba58 100644
--- a/stan/math/rev/fun/eigendecompose_sym.hpp
+++ b/stan/math/rev/fun/eigendecompose_sym.hpp
@@ -4,10 +4,7 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of_rec.hpp>
 #include <stan/math/prim/err/check_symmetric.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/eigendecompose_sym.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/eigenvalues_sym.hpp b/stan/math/rev/fun/eigenvalues_sym.hpp
index a74ca07d237..527efb7d7f9 100644
--- a/stan/math/rev/fun/eigenvalues_sym.hpp
+++ b/stan/math/rev/fun/eigenvalues_sym.hpp
@@ -4,11 +4,7 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/err/check_symmetric.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/eigenvalues_sym.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/eigenvectors_sym.hpp b/stan/math/rev/fun/eigenvectors_sym.hpp
index 707acd38ac5..7bf15425b5a 100644
--- a/stan/math/rev/fun/eigenvectors_sym.hpp
+++ b/stan/math/rev/fun/eigenvectors_sym.hpp
@@ -4,12 +4,7 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/err/check_symmetric.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
-#include <stan/math/prim/fun/value_of_rec.hpp>
 #include <stan/math/prim/fun/eigenvectors_sym.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/elt_divide.hpp b/stan/math/rev/fun/elt_divide.hpp
index fe3b2e0ce65..f6a62fc9de1 100644
--- a/stan/math/rev/fun/elt_divide.hpp
+++ b/stan/math/rev/fun/elt_divide.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/fun/elt_divide.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/elt_multiply.hpp b/stan/math/rev/fun/elt_multiply.hpp
index d2e52f19159..97fe30bdf3d 100644
--- a/stan/math/rev/fun/elt_multiply.hpp
+++ b/stan/math/rev/fun/elt_multiply.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/rev/fun/multiply.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/erfcx.hpp b/stan/math/rev/fun/erfcx.hpp
index 066f142987a..eb997be21a9 100644
--- a/stan/math/rev/fun/erfcx.hpp
+++ b/stan/math/rev/fun/erfcx.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/erfcx.hpp>
 #include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
diff --git a/stan/math/rev/fun/exp.hpp b/stan/math/rev/fun/exp.hpp
index 88a9a22a179..b5ee52c662e 100644
--- a/stan/math/rev/fun/exp.hpp
+++ b/stan/math/rev/fun/exp.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/rev/fun/cos.hpp>
 #include <stan/math/rev/fun/is_inf.hpp>
 #include <stan/math/rev/fun/is_nan.hpp>
-#include <stan/math/rev/fun/sin.hpp>
 #include <stan/math/prim/fun/exp.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/fft.hpp b/stan/math/rev/fun/fft.hpp
index 18ed08ffde8..20e43b2b849 100644
--- a/stan/math/rev/fun/fft.hpp
+++ b/stan/math/rev/fun/fft.hpp
@@ -1,14 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_FFT_HPP
 #define STAN_MATH_REV_FUN_FFT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/to_complex.hpp>
 #include <stan/math/prim/fun/fft.hpp>
-#include <complex>
-#include <type_traits>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/fill.hpp b/stan/math/rev/fun/fill.hpp
index bb1e1e76377..efeb84839cc 100644
--- a/stan/math/rev/fun/fill.hpp
+++ b/stan/math/rev/fun/fill.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_FILL_HPP
 #define STAN_MATH_REV_FUN_FILL_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/fill.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/floor.hpp b/stan/math/rev/fun/floor.hpp
index bac9ab778ed..aad62fbef95 100644
--- a/stan/math/rev/fun/floor.hpp
+++ b/stan/math/rev/fun/floor.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/floor.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/fun/fma.hpp b/stan/math/rev/fun/fma.hpp
index 517eb3481d6..310e4d7e8a0 100644
--- a/stan/math/rev/fun/fma.hpp
+++ b/stan/math/rev/fun/fma.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
 #include <stan/math/prim/fun/fma.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/from_var_value.hpp b/stan/math/rev/fun/from_var_value.hpp
index 773c34d9403..8c64bef9b21 100644
--- a/stan/math/rev/fun/from_var_value.hpp
+++ b/stan/math/rev/fun/from_var_value.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/gamma_p.hpp b/stan/math/rev/fun/gamma_p.hpp
index e25d60132b7..26c29f61540 100644
--- a/stan/math/rev/fun/gamma_p.hpp
+++ b/stan/math/rev/fun/gamma_p.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_REV_FUN_GAMMA_P_HPP
 #define STAN_MATH_REV_FUN_GAMMA_P_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/lgamma.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/grad_reg_lower_inc_gamma.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
diff --git a/stan/math/rev/fun/gamma_q.hpp b/stan/math/rev/fun/gamma_q.hpp
index 73ccfb6c68c..f6e6477dd24 100644
--- a/stan/math/rev/fun/gamma_q.hpp
+++ b/stan/math/rev/fun/gamma_q.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_GAMMA_Q_HPP
 #define STAN_MATH_REV_FUN_GAMMA_Q_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/rev/fun/tgamma.hpp>
diff --git a/stan/math/rev/fun/generalized_inverse.hpp b/stan/math/rev/fun/generalized_inverse.hpp
index c8297d29264..f9455bd5eb4 100644
--- a/stan/math/rev/fun/generalized_inverse.hpp
+++ b/stan/math/rev/fun/generalized_inverse.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/inverse.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/add_diag.hpp>
 #include <stan/math/prim/fun/generalized_inverse.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/gp_exp_quad_cov.hpp b/stan/math/rev/fun/gp_exp_quad_cov.hpp
index d1a542e853b..12660e6732a 100644
--- a/stan/math/rev/fun/gp_exp_quad_cov.hpp
+++ b/stan/math/rev/fun/gp_exp_quad_cov.hpp
@@ -11,7 +11,6 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/gp_exp_quad_cov.hpp>
 #include <cmath>
-#include <type_traits>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/fun/gp_periodic_cov.hpp b/stan/math/rev/fun/gp_periodic_cov.hpp
index dae6b502e76..bbea4f638f7 100644
--- a/stan/math/rev/fun/gp_periodic_cov.hpp
+++ b/stan/math/rev/fun/gp_periodic_cov.hpp
@@ -6,15 +6,11 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/adjoint_of.hpp>
 #include <stan/math/rev/fun/exp.hpp>
-#include <stan/math/rev/fun/sin.hpp>
 #include <stan/math/rev/fun/square.hpp>
-#include <stan/math/rev/fun/squared_distance.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/gp_exp_quad_cov.hpp>
 #include <cmath>
-#include <type_traits>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/fun/grad.hpp b/stan/math/rev/fun/grad.hpp
index 632f3fbf016..36c3c137b0d 100644
--- a/stan/math/rev/fun/grad.hpp
+++ b/stan/math/rev/fun/grad.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_GRAD_HPP
 #define STAN_MATH_REV_FUN_GRAD_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 
diff --git a/stan/math/rev/fun/hypergeometric_1F0.hpp b/stan/math/rev/fun/hypergeometric_1F0.hpp
index aa5267271f1..4ce99816fe9 100644
--- a/stan/math/rev/fun/hypergeometric_1F0.hpp
+++ b/stan/math/rev/fun/hypergeometric_1F0.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/log1m.hpp>
-#include <stan/math/rev/fun/inv.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/hypergeometric_1F0.hpp>
diff --git a/stan/math/rev/fun/hypot.hpp b/stan/math/rev/fun/hypot.hpp
index fc5f2eb16a0..d16fbf22869 100644
--- a/stan/math/rev/fun/hypot.hpp
+++ b/stan/math/rev/fun/hypot.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_HYPOT_HPP
 #define STAN_MATH_REV_FUN_HYPOT_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/hypot.hpp>
 
diff --git a/stan/math/rev/fun/if_else.hpp b/stan/math/rev/fun/if_else.hpp
index 3b1d6a8c70a..29a364dc9b1 100644
--- a/stan/math/rev/fun/if_else.hpp
+++ b/stan/math/rev/fun/if_else.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_IF_ELSE_HPP
 #define STAN_MATH_REV_FUN_IF_ELSE_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/inc_beta.hpp b/stan/math/rev/fun/inc_beta.hpp
index be8a65b7b6a..aacf9401d11 100644
--- a/stan/math/rev/fun/inc_beta.hpp
+++ b/stan/math/rev/fun/inc_beta.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_INC_BETA_HPP
 #define STAN_MATH_REV_FUN_INC_BETA_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/beta.hpp>
-#include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/rev/fun/pow.hpp>
 #include <stan/math/prim/fun/grad_reg_inc_beta.hpp>
 #include <stan/math/prim/fun/inc_beta.hpp>
diff --git a/stan/math/rev/fun/initialize_fill.hpp b/stan/math/rev/fun/initialize_fill.hpp
index 9ce874b7212..e6d1cf7e64d 100644
--- a/stan/math/rev/fun/initialize_fill.hpp
+++ b/stan/math/rev/fun/initialize_fill.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_INITIALIZE_FILL_HPP
 #define STAN_MATH_REV_FUN_INITIALIZE_FILL_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/initialize_fill.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/initialize_variable.hpp b/stan/math/rev/fun/initialize_variable.hpp
index c774a0b46ca..936756ab0d7 100644
--- a/stan/math/rev/fun/initialize_variable.hpp
+++ b/stan/math/rev/fun/initialize_variable.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_INITIALIZE_VARIABLE_HPP
 #define STAN_MATH_REV_FUN_INITIALIZE_VARIABLE_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <vector>
diff --git a/stan/math/rev/fun/inv_Phi.hpp b/stan/math/rev/fun/inv_Phi.hpp
index 14909814e8e..e343cd2574d 100644
--- a/stan/math/rev/fun/inv_Phi.hpp
+++ b/stan/math/rev/fun/inv_Phi.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/inv_Phi.hpp>
 #include <stan/math/prim/prob/std_normal_lpdf.hpp>
-#include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <cmath>
 
 namespace stan {
diff --git a/stan/math/rev/fun/inv_inc_beta.hpp b/stan/math/rev/fun/inv_inc_beta.hpp
index 64f6b75e75f..3aff24be44a 100644
--- a/stan/math/rev/fun/inv_inc_beta.hpp
+++ b/stan/math/rev/fun/inv_inc_beta.hpp
@@ -3,18 +3,8 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/fabs.hpp>
 #include <stan/math/rev/fun/inc_beta.hpp>
-#include <stan/math/rev/fun/digamma.hpp>
-#include <stan/math/rev/fun/exp.hpp>
-#include <stan/math/rev/fun/hypergeometric_pFq.hpp>
-#include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/log_diff_exp.hpp>
 #include <stan/math/rev/fun/lbeta.hpp>
-#include <stan/math/rev/fun/lgamma.hpp>
-#include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/hypergeometric_3F2.hpp>
 #include <stan/math/prim/fun/inv_inc_beta.hpp>
 
diff --git a/stan/math/rev/fun/inv_sqrt.hpp b/stan/math/rev/fun/inv_sqrt.hpp
index 2ee72ef8ad7..07f5071677a 100644
--- a/stan/math/rev/fun/inv_sqrt.hpp
+++ b/stan/math/rev/fun/inv_sqrt.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/to_arena.hpp>
-#include <stan/math/rev/fun/inv.hpp>
 #include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/prim/fun/inv_sqrt.hpp>
 #include <cmath>
diff --git a/stan/math/rev/fun/inverse.hpp b/stan/math/rev/fun/inverse.hpp
index 4d34df0175c..4d6ba3111be 100644
--- a/stan/math/rev/fun/inverse.hpp
+++ b/stan/math/rev/fun/inverse.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_INVERSE_HPP
 #define STAN_MATH_REV_FUN_INVERSE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/inverse.hpp>
 
diff --git a/stan/math/rev/fun/is_inf.hpp b/stan/math/rev/fun/is_inf.hpp
index a5e61af64fa..cd47aee21a0 100644
--- a/stan/math/rev/fun/is_inf.hpp
+++ b/stan/math/rev/fun/is_inf.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_IS_INF_HPP
 #define STAN_MATH_REV_FUN_IS_INF_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/is_inf.hpp>
 
diff --git a/stan/math/rev/fun/is_nan.hpp b/stan/math/rev/fun/is_nan.hpp
index 2485813666d..d31d3e62fea 100644
--- a/stan/math/rev/fun/is_nan.hpp
+++ b/stan/math/rev/fun/is_nan.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_IS_NAN_HPP
 #define STAN_MATH_REV_FUN_IS_NAN_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 
diff --git a/stan/math/rev/fun/is_uninitialized.hpp b/stan/math/rev/fun/is_uninitialized.hpp
index b7ecfd95c87..9c5b05e1f0d 100644
--- a/stan/math/rev/fun/is_uninitialized.hpp
+++ b/stan/math/rev/fun/is_uninitialized.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_IS_UNINITIALIZED_HPP
 #define STAN_MATH_REV_FUN_IS_UNINITIALIZED_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/is_uninitialized.hpp>
 
diff --git a/stan/math/rev/fun/lambert_w.hpp b/stan/math/rev/fun/lambert_w.hpp
index 3fec7998062..22cbd5b1885 100644
--- a/stan/math/rev/fun/lambert_w.hpp
+++ b/stan/math/rev/fun/lambert_w.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/boost_policy.hpp>
 #include <stan/math/prim/fun/lambert_w.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/lbeta.hpp b/stan/math/rev/fun/lbeta.hpp
index e5a8b01f8b8..c6a37acf793 100644
--- a/stan/math/rev/fun/lbeta.hpp
+++ b/stan/math/rev/fun/lbeta.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_LBETA_HPP
 #define STAN_MATH_REV_FUN_LBETA_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
diff --git a/stan/math/rev/fun/lmgamma.hpp b/stan/math/rev/fun/lmgamma.hpp
index 0af915010a8..c4f5c6f79ef 100644
--- a/stan/math/rev/fun/lmgamma.hpp
+++ b/stan/math/rev/fun/lmgamma.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_LMGAMMA_HPP
 #define STAN_MATH_REV_FUN_LMGAMMA_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/prim/fun/lmgamma.hpp>
diff --git a/stan/math/rev/fun/lmultiply.hpp b/stan/math/rev/fun/lmultiply.hpp
index 912040e7f30..7a4a3b523c4 100644
--- a/stan/math/rev/fun/lmultiply.hpp
+++ b/stan/math/rev/fun/lmultiply.hpp
@@ -5,10 +5,7 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/log.hpp>
 #include <stan/math/rev/fun/elt_multiply.hpp>
-#include <stan/math/rev/fun/multiply.hpp>
 #include <stan/math/rev/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
 #include <stan/math/prim/fun/lmultiply.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/fun/log.hpp b/stan/math/rev/fun/log.hpp
index 79939cd13fd..174b6c8856e 100644
--- a/stan/math/rev/fun/log.hpp
+++ b/stan/math/rev/fun/log.hpp
@@ -4,12 +4,8 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/functor/apply_scalar_unary.hpp>
-#include <stan/math/rev/fun/abs.hpp>
 #include <stan/math/rev/fun/arg.hpp>
 #include <stan/math/rev/fun/atan2.hpp>
-#include <stan/math/rev/fun/cos.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
 #include <stan/math/rev/fun/norm.hpp>
 #include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/prim/fun/log.hpp>
diff --git a/stan/math/rev/fun/log10.hpp b/stan/math/rev/fun/log10.hpp
index fd37b97d7a4..facb6d21bba 100644
--- a/stan/math/rev/fun/log10.hpp
+++ b/stan/math/rev/fun/log10.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/atan2.hpp>
-#include <stan/math/rev/fun/hypot.hpp>
 #include <stan/math/rev/fun/log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log10.hpp>
diff --git a/stan/math/rev/fun/log_determinant.hpp b/stan/math/rev/fun/log_determinant.hpp
index 5e4b7a442ec..1f4e181824e 100644
--- a/stan/math/rev/fun/log_determinant.hpp
+++ b/stan/math/rev/fun/log_determinant.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_LOG_DETERMINANT_HPP
 #define STAN_MATH_REV_FUN_LOG_DETERMINANT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/log_determinant.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/log_determinant_ldlt.hpp b/stan/math/rev/fun/log_determinant_ldlt.hpp
index 71e4d43a685..a158337d300 100644
--- a/stan/math/rev/fun/log_determinant_ldlt.hpp
+++ b/stan/math/rev/fun/log_determinant_ldlt.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/LDLT_factor.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/fun/log_determinant_ldlt.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/log_determinant_spd.hpp b/stan/math/rev/fun/log_determinant_spd.hpp
index d94538b92e1..b769af3e4c0 100644
--- a/stan/math/rev/fun/log_determinant_spd.hpp
+++ b/stan/math/rev/fun/log_determinant_spd.hpp
@@ -4,9 +4,7 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/sum.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/log_determinant_spd.hpp>
diff --git a/stan/math/rev/fun/log_diff_exp.hpp b/stan/math/rev/fun/log_diff_exp.hpp
index edab7204bab..e7fb51f5188 100644
--- a/stan/math/rev/fun/log_diff_exp.hpp
+++ b/stan/math/rev/fun/log_diff_exp.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_REV_FUN_LOG_DIFF_EXP_HPP
 #define STAN_MATH_REV_FUN_LOG_DIFF_EXP_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/expm1.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log_diff_exp.hpp>
 
diff --git a/stan/math/rev/fun/log_inv_logit_diff.hpp b/stan/math/rev/fun/log_inv_logit_diff.hpp
index 132c5d2c85b..9a9b59ebc1a 100644
--- a/stan/math/rev/fun/log_inv_logit_diff.hpp
+++ b/stan/math/rev/fun/log_inv_logit_diff.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/expm1.hpp>
 #include <stan/math/rev/fun/inv_logit.hpp>
-#include <stan/math/rev/fun/inv.hpp>
 #include <stan/math/prim/fun/log_inv_logit_diff.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/log_rising_factorial.hpp b/stan/math/rev/fun/log_rising_factorial.hpp
index d1b048f84fd..d9d375a8c0a 100644
--- a/stan/math/rev/fun/log_rising_factorial.hpp
+++ b/stan/math/rev/fun/log_rising_factorial.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_LOG_RISING_FACTORIAL_HPP
 #define STAN_MATH_REV_FUN_LOG_RISING_FACTORIAL_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/prim/fun/log_rising_factorial.hpp>
diff --git a/stan/math/rev/fun/log_softmax.hpp b/stan/math/rev/fun/log_softmax.hpp
index 4c77c09e15f..4f3a8810e32 100644
--- a/stan/math/rev/fun/log_softmax.hpp
+++ b/stan/math/rev/fun/log_softmax.hpp
@@ -1,11 +1,9 @@
 #ifndef STAN_MATH_REV_FUN_LOG_SOFTMAX_HPP
 #define STAN_MATH_REV_FUN_LOG_SOFTMAX_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/log_softmax.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
diff --git a/stan/math/rev/fun/log_sum_exp.hpp b/stan/math/rev/fun/log_sum_exp.hpp
index ca6a1b483fb..9f05ac16174 100644
--- a/stan/math/rev/fun/log_sum_exp.hpp
+++ b/stan/math/rev/fun/log_sum_exp.hpp
@@ -1,16 +1,13 @@
 #ifndef STAN_MATH_REV_FUN_LOG_SUM_EXP_HPP
 #define STAN_MATH_REV_FUN_LOG_SUM_EXP_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/fun/inv_logit.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
 #include <cmath>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/matrix_exp_multiply.hpp b/stan/math/rev/fun/matrix_exp_multiply.hpp
index 01b1822bb79..b2d0100e4ca 100644
--- a/stan/math/rev/fun/matrix_exp_multiply.hpp
+++ b/stan/math/rev/fun/matrix_exp_multiply.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_FUN_MATRIX_EXP_MULTIPLY_HPP
 
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/multiply.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
diff --git a/stan/math/rev/fun/matrix_power.hpp b/stan/math/rev/fun/matrix_power.hpp
index a8cfa2a7392..38dc9a95760 100644
--- a/stan/math/rev/fun/matrix_power.hpp
+++ b/stan/math/rev/fun/matrix_power.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/matrix_power.hpp>
 #include <vector>
 
diff --git a/stan/math/rev/fun/mdivide_left.hpp b/stan/math/rev/fun/mdivide_left.hpp
index a440103fc42..c507eb2bca6 100644
--- a/stan/math/rev/fun/mdivide_left.hpp
+++ b/stan/math/rev/fun/mdivide_left.hpp
@@ -4,12 +4,9 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/core/chainable_object.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/mdivide_left.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/mdivide_left_ldlt.hpp b/stan/math/rev/fun/mdivide_left_ldlt.hpp
index aa423aee6cc..5577184b654 100644
--- a/stan/math/rev/fun/mdivide_left_ldlt.hpp
+++ b/stan/math/rev/fun/mdivide_left_ldlt.hpp
@@ -5,11 +5,8 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/LDLT_factor.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/mdivide_left_ldlt.hpp>
-#include <memory>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/mdivide_left_spd.hpp b/stan/math/rev/fun/mdivide_left_spd.hpp
index 26472797c28..5833ed237f8 100644
--- a/stan/math/rev/fun/mdivide_left_spd.hpp
+++ b/stan/math/rev/fun/mdivide_left_spd.hpp
@@ -9,7 +9,6 @@
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/mdivide_left_spd.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/modified_bessel_first_kind.hpp b/stan/math/rev/fun/modified_bessel_first_kind.hpp
index 2ca9fcce7d1..d55e541d0c1 100644
--- a/stan/math/rev/fun/modified_bessel_first_kind.hpp
+++ b/stan/math/rev/fun/modified_bessel_first_kind.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_MODIFIED_BESSEL_FIRST_KIND_HPP
 #define STAN_MATH_REV_FUN_MODIFIED_BESSEL_FIRST_KIND_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/modified_bessel_first_kind.hpp>
 
diff --git a/stan/math/rev/fun/modified_bessel_second_kind.hpp b/stan/math/rev/fun/modified_bessel_second_kind.hpp
index b6b639373b3..67c03502de0 100644
--- a/stan/math/rev/fun/modified_bessel_second_kind.hpp
+++ b/stan/math/rev/fun/modified_bessel_second_kind.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_MODIFIED_BESSEL_SECOND_KIND_HPP
 #define STAN_MATH_REV_FUN_MODIFIED_BESSEL_SECOND_KIND_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/modified_bessel_second_kind.hpp>
 
diff --git a/stan/math/rev/fun/multiply.hpp b/stan/math/rev/fun/multiply.hpp
index c2b55433e8d..d819c36c725 100644
--- a/stan/math/rev/fun/multiply.hpp
+++ b/stan/math/rev/fun/multiply.hpp
@@ -3,9 +3,7 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/multiply_log.hpp b/stan/math/rev/fun/multiply_log.hpp
index 397d952d804..9021436117d 100644
--- a/stan/math/rev/fun/multiply_log.hpp
+++ b/stan/math/rev/fun/multiply_log.hpp
@@ -5,9 +5,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/log.hpp>
 #include <stan/math/rev/fun/elt_multiply.hpp>
-#include <stan/math/rev/fun/multiply.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp b/stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp
index 5ac9494c0c0..4658f033855 100644
--- a/stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp
+++ b/stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp
@@ -4,10 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/dot_product.hpp>
-#include <stan/math/rev/fun/dot_self.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/multiply_lower_tri_self_transpose.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/norm1.hpp b/stan/math/rev/fun/norm1.hpp
index b0435562503..ffbd3ce4b82 100644
--- a/stan/math/rev/fun/norm1.hpp
+++ b/stan/math/rev/fun/norm1.hpp
@@ -3,9 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/sign.hpp>
 #include <stan/math/prim/fun/norm1.hpp>
 
diff --git a/stan/math/rev/fun/norm2.hpp b/stan/math/rev/fun/norm2.hpp
index 1a0d5c7813f..8b41ae95bb3 100644
--- a/stan/math/rev/fun/norm2.hpp
+++ b/stan/math/rev/fun/norm2.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_NORM2_HPP
 #define STAN_MATH_REV_FUN_NORM2_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/norm2.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/owens_t.hpp b/stan/math/rev/fun/owens_t.hpp
index 581f099ff07..9330ced1c11 100644
--- a/stan/math/rev/fun/owens_t.hpp
+++ b/stan/math/rev/fun/owens_t.hpp
@@ -2,7 +2,6 @@
 #define STAN_MATH_REV_FUN_OWENS_T_HPP
 
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/erf.hpp>
 #include <stan/math/rev/fun/square.hpp>
 #include <stan/math/prim/fun/constants.hpp>
diff --git a/stan/math/rev/fun/polar.hpp b/stan/math/rev/fun/polar.hpp
index 16c0636dc2f..8eabb8110ea 100644
--- a/stan/math/rev/fun/polar.hpp
+++ b/stan/math/rev/fun/polar.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_REV_FUN_POLAR_HPP
 
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
 #include <stan/math/rev/fun/cos.hpp>
-#include <stan/math/rev/fun/sin.hpp>
-#include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
 #include <stan/math/prim/fun/polar.hpp>
 #include <complex>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/pow.hpp b/stan/math/rev/fun/pow.hpp
index 42ad34cb926..30adfa98d0e 100644
--- a/stan/math/rev/fun/pow.hpp
+++ b/stan/math/rev/fun/pow.hpp
@@ -3,27 +3,17 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/rev/fun/inv.hpp>
 #include <stan/math/rev/fun/inv_sqrt.hpp>
 #include <stan/math/rev/fun/inv_square.hpp>
-#include <stan/math/rev/fun/is_nan.hpp>
 #include <stan/math/rev/fun/log.hpp>
 #include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/rev/fun/square.hpp>
-#include <stan/math/rev/fun/value_of_rec.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/copysign.hpp>
-#include <stan/math/prim/fun/is_any_nan.hpp>
-#include <stan/math/prim/fun/isnan.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/pow.hpp>
 
 #include <cmath>
-#include <complex>
 #include <type_traits>
 
 namespace stan {
diff --git a/stan/math/rev/fun/primitive_value.hpp b/stan/math/rev/fun/primitive_value.hpp
index 9338ad595d5..cc905aeced1 100644
--- a/stan/math/rev/fun/primitive_value.hpp
+++ b/stan/math/rev/fun/primitive_value.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_PRIMITIVE_VALUE_HPP
 #define STAN_MATH_REV_FUN_PRIMITIVE_VALUE_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/primitive_value.hpp>
 
diff --git a/stan/math/rev/fun/proj.hpp b/stan/math/rev/fun/proj.hpp
index 9831780bdd0..a933584afbc 100644
--- a/stan/math/rev/fun/proj.hpp
+++ b/stan/math/rev/fun/proj.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/is_inf.hpp>
 #include <stan/math/prim/fun/proj.hpp>
-#include <stan/math/prim/fun/is_inf.hpp>
 #include <complex>
 
 namespace stan {
diff --git a/stan/math/rev/fun/quad_form.hpp b/stan/math/rev/fun/quad_form.hpp
index b15a04a746f..9d83df52851 100644
--- a/stan/math/rev/fun/quad_form.hpp
+++ b/stan/math/rev/fun/quad_form.hpp
@@ -3,13 +3,11 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/to_var_value.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/quad_form.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/quad_form_sym.hpp b/stan/math/rev/fun/quad_form_sym.hpp
index 9906f19a481..6a9344c2989 100644
--- a/stan/math/rev/fun/quad_form_sym.hpp
+++ b/stan/math/rev/fun/quad_form_sym.hpp
@@ -1,14 +1,11 @@
 #ifndef STAN_MATH_REV_FUN_QUAD_FORM_SYM_HPP
 #define STAN_MATH_REV_FUN_QUAD_FORM_SYM_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/quad_form.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/quad_form_sym.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/read_corr_L.hpp b/stan/math/rev/fun/read_corr_L.hpp
index d8e8e329730..0e8a3abc610 100644
--- a/stan/math/rev/fun/read_corr_L.hpp
+++ b/stan/math/rev/fun/read_corr_L.hpp
@@ -3,10 +3,8 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/operator_multiplication.hpp>
 #include <stan/math/prim/fun/read_corr_L.hpp>
 #include <cmath>
-#include <complex>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/read_cov_matrix.hpp b/stan/math/rev/fun/read_cov_matrix.hpp
index 5a57b65cb87..8df0c34ffc5 100644
--- a/stan/math/rev/fun/read_cov_matrix.hpp
+++ b/stan/math/rev/fun/read_cov_matrix.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/rev/fun/read_corr_L.hpp>
 #include <stan/math/rev/fun/read_cov_L.hpp>
 #include <stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp>
-#include <stan/math/rev/fun/rows_dot_product.hpp>
 #include <stan/math/prim/fun/read_cov_matrix.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/rep_matrix.hpp b/stan/math/rev/fun/rep_matrix.hpp
index 06fb42ae847..f5709e0d4a3 100644
--- a/stan/math/rev/fun/rep_matrix.hpp
+++ b/stan/math/rev/fun/rep_matrix.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_REP_MATRIX_HPP
 #define STAN_MATH_REV_FUN_REP_MATRIX_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/rev/fun/rep_row_vector.hpp b/stan/math/rev/fun/rep_row_vector.hpp
index 49c3d57beec..aed3a6244f8 100644
--- a/stan/math/rev/fun/rep_row_vector.hpp
+++ b/stan/math/rev/fun/rep_row_vector.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_REP_ROW_VECTOR_HPP
 #define STAN_MATH_REV_FUN_REP_ROW_VECTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/rep_row_vector.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/rep_vector.hpp b/stan/math/rev/fun/rep_vector.hpp
index 7aa73bdb0a5..18410159e7e 100644
--- a/stan/math/rev/fun/rep_vector.hpp
+++ b/stan/math/rev/fun/rep_vector.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_REP_VECTOR_HPP
 #define STAN_MATH_REV_FUN_REP_VECTOR_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/rep_vector.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/rising_factorial.hpp b/stan/math/rev/fun/rising_factorial.hpp
index ec95ac455b8..1afb706e7eb 100644
--- a/stan/math/rev/fun/rising_factorial.hpp
+++ b/stan/math/rev/fun/rising_factorial.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_RISING_FACTORIAL_HPP
 #define STAN_MATH_REV_FUN_RISING_FACTORIAL_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/digamma.hpp>
 #include <stan/math/prim/fun/rising_factorial.hpp>
diff --git a/stan/math/rev/fun/round.hpp b/stan/math/rev/fun/round.hpp
index 591bfa0a524..5bc8aaa9783 100644
--- a/stan/math/rev/fun/round.hpp
+++ b/stan/math/rev/fun/round.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_REV_FUN_ROUND_HPP
 #define STAN_MATH_REV_FUN_ROUND_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/round.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/rows_dot_product.hpp b/stan/math/rev/fun/rows_dot_product.hpp
index 5f136d73a5a..04000ae8976 100644
--- a/stan/math/rev/fun/rows_dot_product.hpp
+++ b/stan/math/rev/fun/rows_dot_product.hpp
@@ -8,7 +8,6 @@
 #include <stan/math/rev/fun/dot_product.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/rows_dot_product.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/rows_dot_self.hpp b/stan/math/rev/fun/rows_dot_self.hpp
index 7cccd0bbb23..8de45a4d83c 100644
--- a/stan/math/rev/fun/rows_dot_self.hpp
+++ b/stan/math/rev/fun/rows_dot_self.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/dot_self.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/rows_dot_self.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/sd.hpp b/stan/math/rev/fun/sd.hpp
index 25c27cad876..780f41e2166 100644
--- a/stan/math/rev/fun/sd.hpp
+++ b/stan/math/rev/fun/sd.hpp
@@ -5,12 +5,9 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/inv_sqrt.hpp>
-#include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/sd.hpp>
 #include <cmath>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/sin.hpp b/stan/math/rev/fun/sin.hpp
index f0da3889d8a..65ac5ae57a7 100644
--- a/stan/math/rev/fun/sin.hpp
+++ b/stan/math/rev/fun/sin.hpp
@@ -5,10 +5,7 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/fun/cos.hpp>
 #include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/cosh.hpp>
 #include <stan/math/rev/fun/sinh.hpp>
-#include <stan/math/prim/fun/isfinite.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
 #include <stan/math/prim/fun/sin.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/singular_values.hpp b/stan/math/rev/fun/singular_values.hpp
index dd286aea421..ce216d92639 100644
--- a/stan/math/rev/fun/singular_values.hpp
+++ b/stan/math/rev/fun/singular_values.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/sinh.hpp b/stan/math/rev/fun/sinh.hpp
index 1322f6c1b88..4d939437bcb 100644
--- a/stan/math/rev/fun/sinh.hpp
+++ b/stan/math/rev/fun/sinh.hpp
@@ -4,9 +4,7 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/exp.hpp>
-#include <stan/math/prim/core.hpp>
 #include <stan/math/prim/meta.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
 #include <stan/math/prim/fun/sinh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/softmax.hpp b/stan/math/rev/fun/softmax.hpp
index cd377c9cb1d..dc9b4a34af5 100644
--- a/stan/math/rev/fun/softmax.hpp
+++ b/stan/math/rev/fun/softmax.hpp
@@ -1,13 +1,10 @@
 #ifndef STAN_MATH_REV_FUN_SOFTMAX_HPP
 #define STAN_MATH_REV_FUN_SOFTMAX_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/softmax.hpp>
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
 
diff --git a/stan/math/rev/fun/sqrt.hpp b/stan/math/rev/fun/sqrt.hpp
index 7b6cd6b7144..d9b059b2e7c 100644
--- a/stan/math/rev/fun/sqrt.hpp
+++ b/stan/math/rev/fun/sqrt.hpp
@@ -5,8 +5,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/atan2.hpp>
 #include <stan/math/rev/fun/cos.hpp>
-#include <stan/math/rev/fun/hypot.hpp>
-#include <stan/math/rev/fun/sin.hpp>
 #include <stan/math/prim/fun/sqrt.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/squared_distance.hpp b/stan/math/rev/fun/squared_distance.hpp
index 42042193f01..e2b36bca16a 100644
--- a/stan/math/rev/fun/squared_distance.hpp
+++ b/stan/math/rev/fun/squared_distance.hpp
@@ -10,7 +10,6 @@
 #include <stan/math/prim/fun/to_ref.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/squared_distance.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/stan_print.hpp b/stan/math/rev/fun/stan_print.hpp
index b9459135d11..6ee226eab21 100644
--- a/stan/math/rev/fun/stan_print.hpp
+++ b/stan/math/rev/fun/stan_print.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_STAN_PRINT_HPP
 #define STAN_MATH_REV_FUN_STAN_PRINT_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <ostream>
 
diff --git a/stan/math/rev/fun/step.hpp b/stan/math/rev/fun/step.hpp
index 14956433324..9fd28e18c35 100644
--- a/stan/math/rev/fun/step.hpp
+++ b/stan/math/rev/fun/step.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_STEP_HPP
 #define STAN_MATH_REV_FUN_STEP_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/step.hpp>
 
diff --git a/stan/math/rev/fun/sum.hpp b/stan/math/rev/fun/sum.hpp
index 1ab6f3352ca..4049d38eaa2 100644
--- a/stan/math/rev/fun/sum.hpp
+++ b/stan/math/rev/fun/sum.hpp
@@ -1,15 +1,10 @@
 #ifndef STAN_MATH_REV_FUN_SUM_HPP
 #define STAN_MATH_REV_FUN_SUM_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
-#include <stan/math/rev/core/reverse_pass_callback.hpp>
 #include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/fun/as_array_or_scalar.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <vector>
diff --git a/stan/math/rev/fun/svd.hpp b/stan/math/rev/fun/svd.hpp
index 903ac88cefd..942a986e109 100644
--- a/stan/math/rev/fun/svd.hpp
+++ b/stan/math/rev/fun/svd.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/svd.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/svd_U.hpp b/stan/math/rev/fun/svd_U.hpp
index 25d3c3be7fb..3c6746fe089 100644
--- a/stan/math/rev/fun/svd_U.hpp
+++ b/stan/math/rev/fun/svd_U.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/svd_U.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/svd_V.hpp b/stan/math/rev/fun/svd_V.hpp
index 38b2d1f116b..1d7c8ccc696 100644
--- a/stan/math/rev/fun/svd_V.hpp
+++ b/stan/math/rev/fun/svd_V.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/prim/err/check_nonzero_size.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/svd_V.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/tan.hpp b/stan/math/rev/fun/tan.hpp
index 34ed949db7b..9f98318f704 100644
--- a/stan/math/rev/fun/tan.hpp
+++ b/stan/math/rev/fun/tan.hpp
@@ -3,10 +3,7 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/is_inf.hpp>
-#include <stan/math/rev/fun/sinh.hpp>
 #include <stan/math/rev/fun/tanh.hpp>
-#include <stan/math/prim/fun/isinf.hpp>
 #include <stan/math/prim/fun/tan.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/tanh.hpp b/stan/math/rev/fun/tanh.hpp
index 0ebc7f43f81..4b8cf238b74 100644
--- a/stan/math/rev/fun/tanh.hpp
+++ b/stan/math/rev/fun/tanh.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/cosh.hpp>
-#include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/prim/fun/tanh.hpp>
 #include <cmath>
 #include <complex>
diff --git a/stan/math/rev/fun/tcrossprod.hpp b/stan/math/rev/fun/tcrossprod.hpp
index afab2bf9f05..f886e5e57f9 100644
--- a/stan/math/rev/fun/tcrossprod.hpp
+++ b/stan/math/rev/fun/tcrossprod.hpp
@@ -4,9 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
-#include <stan/math/rev/fun/dot_product.hpp>
-#include <stan/math/rev/fun/dot_self.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/tcrossprod.hpp>
 
diff --git a/stan/math/rev/fun/to_arena.hpp b/stan/math/rev/fun/to_arena.hpp
index 5ec5bb22d8a..cd14a040339 100644
--- a/stan/math/rev/fun/to_arena.hpp
+++ b/stan/math/rev/fun/to_arena.hpp
@@ -1,9 +1,7 @@
 #ifndef STAN_MATH_REV_FUN_TO_ARENA_HPP
 #define STAN_MATH_REV_FUN_TO_ARENA_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <vector>
 #include <cstring>
 
diff --git a/stan/math/rev/fun/to_var.hpp b/stan/math/rev/fun/to_var.hpp
index b235d61aa33..7f9ddb0eb89 100644
--- a/stan/math/rev/fun/to_var.hpp
+++ b/stan/math/rev/fun/to_var.hpp
@@ -1,10 +1,8 @@
 #ifndef STAN_MATH_REV_FUN_TO_VAR_HPP
 #define STAN_MATH_REV_FUN_TO_VAR_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/core/typedefs.hpp>
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <vector>
 
diff --git a/stan/math/rev/fun/to_var_value.hpp b/stan/math/rev/fun/to_var_value.hpp
index 2421e1e5e5b..eec0421ee8a 100644
--- a/stan/math/rev/fun/to_var_value.hpp
+++ b/stan/math/rev/fun/to_var_value.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/arena_matrix.hpp>
 #include <stan/math/rev/core/reverse_pass_callback.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/trace.hpp b/stan/math/rev/fun/trace.hpp
index c0e627dad7b..d93d2feb52a 100644
--- a/stan/math/rev/fun/trace.hpp
+++ b/stan/math/rev/fun/trace.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_TRACE_HPP
 #define STAN_MATH_REV_FUN_TRACE_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/meta.hpp>
diff --git a/stan/math/rev/fun/trace_dot.hpp b/stan/math/rev/fun/trace_dot.hpp
index b9cb99cdffd..78670d59d21 100644
--- a/stan/math/rev/fun/trace_dot.hpp
+++ b/stan/math/rev/fun/trace_dot.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/trace_dot.hpp>
diff --git a/stan/math/rev/fun/trace_gen_inv_quad_form_ldlt.hpp b/stan/math/rev/fun/trace_gen_inv_quad_form_ldlt.hpp
index fd2d64c8ea3..f24dbfec34f 100644
--- a/stan/math/rev/fun/trace_gen_inv_quad_form_ldlt.hpp
+++ b/stan/math/rev/fun/trace_gen_inv_quad_form_ldlt.hpp
@@ -1,13 +1,11 @@
 #ifndef STAN_MATH_REV_FUN_TRACE_GEN_INV_QUAD_FORM_LDLT_HPP
 #define STAN_MATH_REV_FUN_TRACE_GEN_INV_QUAD_FORM_LDLT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/trace_inv_quad_form_ldlt.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/trace_gen_inv_quad_form_ldlt.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/trace_gen_quad_form.hpp b/stan/math/rev/fun/trace_gen_quad_form.hpp
index 4466a126024..1fae2ca97a9 100644
--- a/stan/math/rev/fun/trace_gen_quad_form.hpp
+++ b/stan/math/rev/fun/trace_gen_quad_form.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
diff --git a/stan/math/rev/fun/trace_inv_quad_form_ldlt.hpp b/stan/math/rev/fun/trace_inv_quad_form_ldlt.hpp
index 8a03a4f46c1..824fc70ed24 100644
--- a/stan/math/rev/fun/trace_inv_quad_form_ldlt.hpp
+++ b/stan/math/rev/fun/trace_inv_quad_form_ldlt.hpp
@@ -1,16 +1,12 @@
 #ifndef STAN_MATH_REV_FUN_TRACE_INV_QUAD_FORM_LDLT_HPP
 #define STAN_MATH_REV_FUN_TRACE_INV_QUAD_FORM_LDLT_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/LDLT_factor.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/trace_inv_quad_form_ldlt.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/trace_quad_form.hpp b/stan/math/rev/fun/trace_quad_form.hpp
index f6a45a796e7..6e18d8de35c 100644
--- a/stan/math/rev/fun/trace_quad_form.hpp
+++ b/stan/math/rev/fun/trace_quad_form.hpp
@@ -5,12 +5,9 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
-#include <stan/math/rev/fun/to_var_value.hpp>
 #include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/trace_quad_form.hpp>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/fun/trigamma.hpp b/stan/math/rev/fun/trigamma.hpp
index 4c9934b13c1..771a13a4612 100644
--- a/stan/math/rev/fun/trigamma.hpp
+++ b/stan/math/rev/fun/trigamma.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_TRIGAMMA_HPP
 #define STAN_MATH_REV_FUN_TRIGAMMA_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/floor.hpp>
 #include <stan/math/rev/fun/sin.hpp>
diff --git a/stan/math/rev/fun/trunc.hpp b/stan/math/rev/fun/trunc.hpp
index 5444bb4193a..6fdc6c41fcd 100644
--- a/stan/math/rev/fun/trunc.hpp
+++ b/stan/math/rev/fun/trunc.hpp
@@ -1,10 +1,7 @@
 #ifndef STAN_MATH_REV_FUN_TRUNC_HPP
 #define STAN_MATH_REV_FUN_TRUNC_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/is_nan.hpp>
 #include <stan/math/prim/fun/trunc.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/value_of.hpp b/stan/math/rev/fun/value_of.hpp
index aa75121648d..a059eda7dd8 100644
--- a/stan/math/rev/fun/value_of.hpp
+++ b/stan/math/rev/fun/value_of.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_VALUE_OF_HPP
 #define STAN_MATH_REV_FUN_VALUE_OF_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/value_of_rec.hpp b/stan/math/rev/fun/value_of_rec.hpp
index 942778c5742..a61ca8704cf 100644
--- a/stan/math/rev/fun/value_of_rec.hpp
+++ b/stan/math/rev/fun/value_of_rec.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUN_VALUE_OF_REC_HPP
 #define STAN_MATH_REV_FUN_VALUE_OF_REC_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 
 namespace stan {
diff --git a/stan/math/rev/fun/zip_index.hpp b/stan/math/rev/fun/zip_index.hpp
index 0c137e7333e..4d740b863c9 100644
--- a/stan/math/rev/fun/zip_index.hpp
+++ b/stan/math/rev/fun/zip_index.hpp
@@ -6,7 +6,6 @@
 #include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/prim/err/check_size_match.hpp>
 #include <stan/math/prim/fun/zip_index.hpp>
-#include <vector>
 
 namespace stan::math {
 
diff --git a/stan/math/rev/functor/algebra_solver_fp.hpp b/stan/math/rev/functor/algebra_solver_fp.hpp
index 922eff29f82..d76c82d3d09 100644
--- a/stan/math/rev/functor/algebra_solver_fp.hpp
+++ b/stan/math/rev/functor/algebra_solver_fp.hpp
@@ -1,24 +1,17 @@
 #ifndef STAN_MATH_REV_FUNCTOR_FP_SOLVER_HPP
 #define STAN_MATH_REV_FUNCTOR_FP_SOLVER_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/rev/functor/algebra_system.hpp>
-#include <stan/math/rev/functor/kinsol_data.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/mdivide_left.hpp>
 #include <stan/math/prim/fun/to_array_1d.hpp>
-#include <stan/math/prim/fun/to_vector.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <sundials/sundials_context.h>
 #include <kinsol/kinsol.h>
-#include <sunmatrix/sunmatrix_dense.h>
-#include <sunlinsol/sunlinsol_dense.h>
 #include <nvector/nvector_serial.h>
 #include <algorithm>
 #include <iostream>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/functor/algebra_system.hpp b/stan/math/rev/functor/algebra_system.hpp
index 3839786e953..827f2690506 100644
--- a/stan/math/rev/functor/algebra_system.hpp
+++ b/stan/math/rev/functor/algebra_system.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_REV_FUNCTOR_ALGEBRA_SYSTEM_HPP
 #define STAN_MATH_REV_FUNCTOR_ALGEBRA_SYSTEM_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/functor/jacobian.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <iostream>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/functor/apply_scalar_binary.hpp b/stan/math/rev/functor/apply_scalar_binary.hpp
index eeacc6bafec..cba0e25c262 100644
--- a/stan/math/rev/functor/apply_scalar_binary.hpp
+++ b/stan/math/rev/functor/apply_scalar_binary.hpp
@@ -1,12 +1,9 @@
 #ifndef STAN_MATH_REV_FUNCTOR_APPLY_SCALAR_BINARY_HPP
 #define STAN_MATH_REV_FUNCTOR_APPLY_SCALAR_BINARY_HPP
 
-#include <stan/math/prim/fun/as_column_vector_or_scalar.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/err/check_matching_dims.hpp>
 #include <stan/math/prim/err/check_matching_sizes.hpp>
-#include <stan/math/prim/fun/num_elements.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/apply_vector_unary.hpp b/stan/math/rev/functor/apply_vector_unary.hpp
index ad047fbc8f3..0bd55f44fe2 100644
--- a/stan/math/rev/functor/apply_vector_unary.hpp
+++ b/stan/math/rev/functor/apply_vector_unary.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_REV_FUNCTOR_APPLY_VECTOR_UNARY_HPP
 
 #include <stan/math/prim/functor/apply_vector_unary.hpp>
-#include <stan/math/rev/core/var.hpp>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/broadcast_array.hpp b/stan/math/rev/functor/broadcast_array.hpp
index 45826579b11..a60720f200e 100644
--- a/stan/math/rev/functor/broadcast_array.hpp
+++ b/stan/math/rev/functor/broadcast_array.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUNCTOR_BROADCAST_ARRAY_HPP
 #define STAN_MATH_REV_FUNCTOR_BROADCAST_ARRAY_HPP
 
-#include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/fun/sum.hpp>
 #include <stan/math/prim/functor/broadcast_array.hpp>
 #include <stan/math/prim/meta.hpp>
diff --git a/stan/math/rev/functor/coupled_ode_system.hpp b/stan/math/rev/functor/coupled_ode_system.hpp
index 97297c3395b..b07ff872c36 100644
--- a/stan/math/rev/functor/coupled_ode_system.hpp
+++ b/stan/math/rev/functor/coupled_ode_system.hpp
@@ -2,14 +2,11 @@
 #define STAN_MATH_REV_FUNCTOR_COUPLED_ODE_SYSTEM_HPP
 
 #include <stan/math/prim/functor/coupled_ode_system.hpp>
-#include <stan/math/rev/functor/cvodes_utils.hpp>
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <stan/math/prim/functor/for_each.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stdexcept>
 #include <ostream>
 #include <vector>
 
diff --git a/stan/math/rev/functor/cvodes_integrator_adjoint.hpp b/stan/math/rev/functor/cvodes_integrator_adjoint.hpp
index d8e030355ee..4497d7430ad 100644
--- a/stan/math/rev/functor/cvodes_integrator_adjoint.hpp
+++ b/stan/math/rev/functor/cvodes_integrator_adjoint.hpp
@@ -14,7 +14,6 @@
 #include <nvector/nvector_serial.h>
 #include <sunmatrix/sunmatrix_dense.h>
 #include <sunlinsol/sunlinsol_dense.h>
-#include <algorithm>
 #include <ostream>
 #include <utility>
 #include <vector>
diff --git a/stan/math/rev/functor/cvodes_utils.hpp b/stan/math/rev/functor/cvodes_utils.hpp
index f035cb917e0..c57799cb6d1 100644
--- a/stan/math/rev/functor/cvodes_utils.hpp
+++ b/stan/math/rev/functor/cvodes_utils.hpp
@@ -4,8 +4,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/prim/err.hpp>
 #include <cvodes/cvodes.h>
-#include <sstream>
-#include <stdexcept>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/dae_system.hpp b/stan/math/rev/functor/dae_system.hpp
index 02b0096988d..7c24675c1f5 100644
--- a/stan/math/rev/functor/dae_system.hpp
+++ b/stan/math/rev/functor/dae_system.hpp
@@ -5,13 +5,9 @@
 #include <stan/math/rev/core/nested_rev_autodiff.hpp>
 #include <stan/math/rev/core/zero_adjoints.hpp>
 #include <stan/math/rev/core/accumulate_adjoints.hpp>
-#include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/dot_self.hpp>
-#include <stan/math/prim/fun/typedefs.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/for_each.hpp>
 #include <stan/math/prim/functor/apply.hpp>
-#include <idas/idas.h>
 #include <nvector/nvector_serial.h>
 #include <ostream>
 #include <vector>
diff --git a/stan/math/rev/functor/finite_diff_hessian_auto.hpp b/stan/math/rev/functor/finite_diff_hessian_auto.hpp
index d911804bf67..cfd41150b76 100644
--- a/stan/math/rev/functor/finite_diff_hessian_auto.hpp
+++ b/stan/math/rev/functor/finite_diff_hessian_auto.hpp
@@ -1,8 +1,6 @@
 #ifndef STAN_MATH_REV_FUNCTOR_HESSIAN_HPP
 #define STAN_MATH_REV_FUNCTOR_HESSIAN_HPP
 
-#include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/rev/functor/gradient.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/finite_diff_stepsize.hpp>
diff --git a/stan/math/rev/functor/finite_diff_hessian_times_vector_auto.hpp b/stan/math/rev/functor/finite_diff_hessian_times_vector_auto.hpp
index e3780c5bee6..24229503b2a 100644
--- a/stan/math/rev/functor/finite_diff_hessian_times_vector_auto.hpp
+++ b/stan/math/rev/functor/finite_diff_hessian_times_vector_auto.hpp
@@ -3,8 +3,6 @@
 
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core.hpp>
 #include <stan/math/rev/functor/gradient.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/functor/gradient.hpp b/stan/math/rev/functor/gradient.hpp
index 0d35456f9e7..68cd51d2658 100644
--- a/stan/math/rev/functor/gradient.hpp
+++ b/stan/math/rev/functor/gradient.hpp
@@ -5,7 +5,6 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/idas_integrator.hpp b/stan/math/rev/functor/idas_integrator.hpp
index d4ab69fe994..f2d6c6b357e 100644
--- a/stan/math/rev/functor/idas_integrator.hpp
+++ b/stan/math/rev/functor/idas_integrator.hpp
@@ -6,12 +6,8 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/err/check_flag_sundials.hpp>
 #include <idas/idas.h>
-#include <sunmatrix/sunmatrix_dense.h>
-#include <sunlinsol/sunlinsol_dense.h>
 #include <nvector/nvector_serial.h>
-#include <ostream>
 #include <vector>
-#include <algorithm>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/idas_service.hpp b/stan/math/rev/functor/idas_service.hpp
index 8dd2d8cc6e1..6dc000f676e 100644
--- a/stan/math/rev/functor/idas_service.hpp
+++ b/stan/math/rev/functor/idas_service.hpp
@@ -3,16 +3,12 @@
 
 #include <stan/math/rev/core/recover_memory.hpp>
 #include <stan/math/rev/meta/is_var.hpp>
-#include <stan/math/prim/meta/require_helpers.hpp>
 #include <stan/math/prim/err/check_flag_sundials.hpp>
 #include <idas/idas.h>
 #include <nvector/nvector_serial.h>
 #include <sunmatrix/sunmatrix_dense.h>
 #include <sunlinsol/sunlinsol_dense.h>
 #include <sundials/sundials_context.h>
-#include <ostream>
-#include <vector>
-#include <algorithm>
 #include <type_traits>
 
 namespace stan {
diff --git a/stan/math/rev/functor/integrate_1d_adjoint.hpp b/stan/math/rev/functor/integrate_1d_adjoint.hpp
index 064e9ba9acc..228f0ad4eed 100644
--- a/stan/math/rev/functor/integrate_1d_adjoint.hpp
+++ b/stan/math/rev/functor/integrate_1d_adjoint.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/fun/to_arena.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/functor/conditional_copy_and_promote.hpp>
 #include <stan/math/rev/functor/reverse_pass_collect_adjoints.hpp>
diff --git a/stan/math/rev/functor/integrate_1d_double_exponential.hpp b/stan/math/rev/functor/integrate_1d_double_exponential.hpp
index 4cb93445979..4b2b21b74cf 100644
--- a/stan/math/rev/functor/integrate_1d_double_exponential.hpp
+++ b/stan/math/rev/functor/integrate_1d_double_exponential.hpp
@@ -10,7 +10,6 @@
 #include <stan/math/prim/functor/integrate_1d_double_exponential.hpp>
 #include <cmath>
 #include <ostream>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/integrate_1d_gauss_kronrod.hpp b/stan/math/rev/functor/integrate_1d_gauss_kronrod.hpp
index d5b75a323e6..c60cc261126 100644
--- a/stan/math/rev/functor/integrate_1d_gauss_kronrod.hpp
+++ b/stan/math/rev/functor/integrate_1d_gauss_kronrod.hpp
@@ -10,7 +10,6 @@
 #include <stan/math/prim/functor/integrate_1d_gauss_kronrod.hpp>
 #include <cmath>
 #include <ostream>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/jacobian.hpp b/stan/math/rev/functor/jacobian.hpp
index 48351511833..e5d440661ec 100644
--- a/stan/math/rev/functor/jacobian.hpp
+++ b/stan/math/rev/functor/jacobian.hpp
@@ -1,11 +1,8 @@
 #ifndef STAN_MATH_REV_FUNCTOR_JACOBIAN_HPP
 #define STAN_MATH_REV_FUNCTOR_JACOBIAN_HPP
 
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/fun/Eigen.hpp>
-#include <stdexcept>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/kinsol_data.hpp b/stan/math/rev/functor/kinsol_data.hpp
index a0847cf9fbd..a3bb76ee301 100644
--- a/stan/math/rev/functor/kinsol_data.hpp
+++ b/stan/math/rev/functor/kinsol_data.hpp
@@ -1,7 +1,6 @@
 #ifndef STAN_MATH_REV_FUNCTOR_KINSOL_DATA_HPP
 #define STAN_MATH_REV_FUNCTOR_KINSOL_DATA_HPP
 
-#include <stan/math/rev/functor/algebra_system.hpp>
 #include <stan/math/rev/functor/jacobian.hpp>
 #include <stan/math/prim/fun/to_array_1d.hpp>
 #include <stan/math/prim/fun/to_vector.hpp>
diff --git a/stan/math/rev/functor/kinsol_solve.hpp b/stan/math/rev/functor/kinsol_solve.hpp
index 51b4fef4d57..092be0a36dd 100644
--- a/stan/math/rev/functor/kinsol_solve.hpp
+++ b/stan/math/rev/functor/kinsol_solve.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_REV_FUNCTOR_KINSOL_SOLVE_HPP
 
 #include <stan/math/rev/functor/kinsol_data.hpp>
-#include <stan/math/rev/functor/algebra_system.hpp>
 #include <stan/math/prim/err.hpp>
-#include <stan/math/prim/fun/to_array_1d.hpp>
-#include <stan/math/prim/fun/to_vector.hpp>
-#include <sundials/sundials_context.h>
 #include <kinsol/kinsol.h>
-#include <sunmatrix/sunmatrix_dense.h>
-#include <sunlinsol/sunlinsol_dense.h>
 #include <nvector/nvector_serial.h>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/map_rect_concurrent.hpp b/stan/math/rev/functor/map_rect_concurrent.hpp
index a6da55f9aa7..57cd1361000 100644
--- a/stan/math/rev/functor/map_rect_concurrent.hpp
+++ b/stan/math/rev/functor/map_rect_concurrent.hpp
@@ -6,12 +6,10 @@
 #include <stan/math/prim/functor/map_rect_concurrent.hpp>
 #include <stan/math/prim/functor/map_rect_reduce.hpp>
 #include <stan/math/prim/functor/map_rect_combine.hpp>
-#include <stan/math/rev/core/chainablestack.hpp>
 
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
 
-#include <algorithm>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/functor/operands_and_partials.hpp b/stan/math/rev/functor/operands_and_partials.hpp
index 420d04ebed7..0a9377ac20d 100644
--- a/stan/math/rev/functor/operands_and_partials.hpp
+++ b/stan/math/rev/functor/operands_and_partials.hpp
@@ -2,23 +2,16 @@
 #define STAN_MATH_REV_META_OPERANDS_AND_PARTIALS_HPP
 
 #include <stan/math/rev/meta.hpp>
-#include <stan/math/rev/core/chainablestack.hpp>
-#include <stan/math/rev/core/precomputed_gradients.hpp>
 #include <stan/math/rev/core/var.hpp>
 #include <stan/math/rev/core/vari.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/functor/broadcast_array.hpp>
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/is_vector_like.hpp>
 #include <stan/math/prim/meta/compiler_attributes.hpp>
 #include <stan/math/prim/meta/promote_scalar_type.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/functor/operands_and_partials.hpp>
 #include <stan/math/prim/functor/broadcast_array.hpp>
-#include <stan/math/prim/functor/apply.hpp>
-#include <stan/math/prim/functor/for_each.hpp>
 #include <vector>
-#include <tuple>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/partials_propagator.hpp b/stan/math/rev/functor/partials_propagator.hpp
index 392eb81550d..b8fd9ecb007 100644
--- a/stan/math/rev/functor/partials_propagator.hpp
+++ b/stan/math/rev/functor/partials_propagator.hpp
@@ -3,11 +3,8 @@
 
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core/var.hpp>
-#include <stan/math/rev/core/typedefs.hpp>
 #include <stan/math/rev/functor/operands_and_partials.hpp>
-#include <stan/math/rev/functor/broadcast_array.hpp>
 #include <stan/math/prim/functor/for_each.hpp>
-#include <vector>
 #include <tuple>
 
 namespace stan {
diff --git a/stan/math/rev/functor/reduce_sum.hpp b/stan/math/rev/functor/reduce_sum.hpp
index 4609e04fd13..66476fedf68 100644
--- a/stan/math/rev/functor/reduce_sum.hpp
+++ b/stan/math/rev/functor/reduce_sum.hpp
@@ -12,7 +12,6 @@
 #include <tuple>
 #include <memory>
 #include <utility>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/stan/math/rev/functor/solve_newton.hpp b/stan/math/rev/functor/solve_newton.hpp
index af7be472323..222cf04afab 100644
--- a/stan/math/rev/functor/solve_newton.hpp
+++ b/stan/math/rev/functor/solve_newton.hpp
@@ -2,16 +2,13 @@
 #define STAN_MATH_REV_FUNCTOR_SOLVE_NEWTON_HPP
 
 #include <stan/math/rev/core.hpp>
-#include <stan/math/rev/functor/algebra_system.hpp>
 #include <stan/math/rev/functor/kinsol_solve.hpp>
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <stan/math/prim/functor/algebra_solver_adapter.hpp>
 #include <stan/math/prim/functor/apply.hpp>
-#include <unsupported/Eigen/NonLinearOptimization>
 #include <iostream>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/functor/solve_powell.hpp b/stan/math/rev/functor/solve_powell.hpp
index 2696ff1d69d..8464d69d44e 100644
--- a/stan/math/rev/functor/solve_powell.hpp
+++ b/stan/math/rev/functor/solve_powell.hpp
@@ -11,7 +11,6 @@
 #include <stan/math/prim/functor/algebra_solver_adapter.hpp>
 #include <unsupported/Eigen/NonLinearOptimization>
 #include <iostream>
-#include <string>
 #include <vector>
 
 namespace stan {
diff --git a/stan/math/rev/meta/arena_type.hpp b/stan/math/rev/meta/arena_type.hpp
index 3cf68cb512d..c4243bdf654 100644
--- a/stan/math/rev/meta/arena_type.hpp
+++ b/stan/math/rev/meta/arena_type.hpp
@@ -2,8 +2,6 @@
 #define STAN_MATH_REV_META_ARENA_TYPE_HPP
 
 #include <stan/math/prim/meta/is_eigen.hpp>
-#include <stan/math/prim/meta/is_var.hpp>
-#include <stan/math/prim/meta/is_tuple.hpp>
 #include <stan/math/prim/meta/plain_type.hpp>
 #include <stan/math/rev/core/arena_allocator.hpp>
 #include <stan/math/rev/core/chainable_alloc.hpp>
diff --git a/stan/math/rev/meta/plain_type.hpp b/stan/math/rev/meta/plain_type.hpp
index edcd1ed8803..fa971945ec8 100644
--- a/stan/math/rev/meta/plain_type.hpp
+++ b/stan/math/rev/meta/plain_type.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/prim/meta/is_eigen.hpp>
 #include <stan/math/rev/meta/is_var.hpp>
-#include <type_traits>
 
 namespace stan {
 
diff --git a/stan/math/rev/prob/std_normal_log_qf.hpp b/stan/math/rev/prob/std_normal_log_qf.hpp
index 6578f301adf..6c3c2cc7014 100644
--- a/stan/math/rev/prob/std_normal_log_qf.hpp
+++ b/stan/math/rev/prob/std_normal_log_qf.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <stan/math/prim/prob/std_normal_log_qf.hpp>
-#include <stan/math/prim/functor/apply_scalar_binary.hpp>
 #include <stan/math/prim/fun/elt_multiply.hpp>
 #include <cmath>
 
diff --git a/stan/math/rev/prob/student_t_qf.hpp b/stan/math/rev/prob/student_t_qf.hpp
index e44d4cbbc9c..042ffe4ddb4 100644
--- a/stan/math/rev/prob/student_t_qf.hpp
+++ b/stan/math/rev/prob/student_t_qf.hpp
@@ -6,10 +6,7 @@
 #include <stan/math/rev/fun/exp.hpp>
 #include <stan/math/rev/fun/hypergeometric_pFq.hpp>
 #include <stan/math/rev/fun/hypergeometric_2F1.hpp>
-#include <stan/math/rev/fun/inv.hpp>
 #include <stan/math/rev/fun/inv_inc_beta.hpp>
-#include <stan/math/rev/fun/log.hpp>
-#include <stan/math/rev/fun/sqrt.hpp>
 #include <stan/math/rev/fun/value_of.hpp>
 #include <stan/math/prim/prob/student_t_lpdf.hpp>
 
diff --git a/test/prob/bernoulli/bernoulli_ccdf_log_test.hpp b/test/prob/bernoulli/bernoulli_ccdf_log_test.hpp
index 42921ee260a..35ace93c91e 100644
--- a/test/prob/bernoulli/bernoulli_ccdf_log_test.hpp
+++ b/test/prob/bernoulli/bernoulli_ccdf_log_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Ints, Doubles
 #include <stan/math/prim/prob/bernoulli_ccdf_log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/bernoulli/bernoulli_cdf_log_test.hpp b/test/prob/bernoulli/bernoulli_cdf_log_test.hpp
index 405645f9d4b..542f5d51ad4 100644
--- a/test/prob/bernoulli/bernoulli_cdf_log_test.hpp
+++ b/test/prob/bernoulli/bernoulli_cdf_log_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Ints, Doubles
 #include <stan/math/prim/prob/bernoulli_cdf_log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/bernoulli/bernoulli_logit_test.hpp b/test/prob/bernoulli/bernoulli_logit_test.hpp
index f3bb91bfffe..99e9a4a158e 100644
--- a/test/prob/bernoulli/bernoulli_logit_test.hpp
+++ b/test/prob/bernoulli/bernoulli_logit_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Ints, Doubles
 #include <stan/math/prim/prob/bernoulli_logit_lpmf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/beta/beta_test.hpp b/test/prob/beta/beta_test.hpp
index 6bc07a43383..7c6cbd7e73f 100644
--- a/test/prob/beta/beta_test.hpp
+++ b/test/prob/beta/beta_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/beta_lpdf.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 
 using stan::math::var;
diff --git a/test/prob/beta_binomial/beta_binomial_test.hpp b/test/prob/beta_binomial/beta_binomial_test.hpp
index 1320e917453..91da2e8672e 100644
--- a/test/prob/beta_binomial/beta_binomial_test.hpp
+++ b/test/prob/beta_binomial/beta_binomial_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Ints, Ints, Doubles, Doubles
 #include <stan/math/prim/prob/beta_binomial_lpmf.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/beta_proportion/beta_proportion_test.hpp b/test/prob/beta_proportion/beta_proportion_test.hpp
index eb9447b71bc..e03a6289da1 100644
--- a/test/prob/beta_proportion/beta_proportion_test.hpp
+++ b/test/prob/beta_proportion/beta_proportion_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/beta_proportion_lpdf.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/discrete_range/discrete_range_ccdf_log_test.hpp b/test/prob/discrete_range/discrete_range_ccdf_log_test.hpp
index ee2339e65ec..c0d77eef464 100644
--- a/test/prob/discrete_range/discrete_range_ccdf_log_test.hpp
+++ b/test/prob/discrete_range/discrete_range_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Ints, Ints, Ints
 #include <stan/math/prim/prob/discrete_range_lccdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::vector;
diff --git a/test/prob/discrete_range/discrete_range_cdf_log_test.hpp b/test/prob/discrete_range/discrete_range_cdf_log_test.hpp
index a0bd01ff7d1..90059b1c36a 100644
--- a/test/prob/discrete_range/discrete_range_cdf_log_test.hpp
+++ b/test/prob/discrete_range/discrete_range_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Ints, Ints, Ints
 #include <stan/math/prim/prob/discrete_range_lcdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/discrete_range/discrete_range_test.hpp b/test/prob/discrete_range/discrete_range_test.hpp
index 24e5ec03044..c24e058924e 100644
--- a/test/prob/discrete_range/discrete_range_test.hpp
+++ b/test/prob/discrete_range/discrete_range_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Ints, Ints, Ints
 #include <stan/math/prim/prob/discrete_range_lpmf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
 using std::vector;
diff --git a/test/prob/exp_mod_normal/exp_mod_normal_ccdf_log_test.hpp b/test/prob/exp_mod_normal/exp_mod_normal_ccdf_log_test.hpp
index 3e8e0bf5b4a..76aa1bf5d9c 100644
--- a/test/prob/exp_mod_normal/exp_mod_normal_ccdf_log_test.hpp
+++ b/test/prob/exp_mod_normal/exp_mod_normal_ccdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/exp_mod_normal_ccdf_log.hpp>
-#include <stan/math/prim/fun/erf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/exp_mod_normal/exp_mod_normal_cdf_log_test.hpp b/test/prob/exp_mod_normal/exp_mod_normal_cdf_log_test.hpp
index 525619ac3aa..e5da31b5afc 100644
--- a/test/prob/exp_mod_normal/exp_mod_normal_cdf_log_test.hpp
+++ b/test/prob/exp_mod_normal/exp_mod_normal_cdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/exp_mod_normal_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erf.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/exp_mod_normal/exp_mod_normal_cdf_test.hpp b/test/prob/exp_mod_normal/exp_mod_normal_cdf_test.hpp
index 08be90083c3..ffe19d83663 100644
--- a/test/prob/exp_mod_normal/exp_mod_normal_cdf_test.hpp
+++ b/test/prob/exp_mod_normal/exp_mod_normal_cdf_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/exp_mod_normal_cdf.hpp>
-#include <stan/math/prim/fun/erf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/exp_mod_normal/exp_mod_normal_test.hpp b/test/prob/exp_mod_normal/exp_mod_normal_test.hpp
index 67b3378c982..0d7974fbef5 100644
--- a/test/prob/exp_mod_normal/exp_mod_normal_test.hpp
+++ b/test/prob/exp_mod_normal/exp_mod_normal_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/exp_mod_normal_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/exponential/exponential_cdf_log_test.hpp b/test/prob/exponential/exponential_cdf_log_test.hpp
index cfb3062f901..d93e2cfca11 100644
--- a/test/prob/exponential/exponential_cdf_log_test.hpp
+++ b/test/prob/exponential/exponential_cdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/exponential_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/exponential/exponential_test.hpp b/test/prob/exponential/exponential_test.hpp
index 91a7983daf3..72b3f140a06 100644
--- a/test/prob/exponential/exponential_test.hpp
+++ b/test/prob/exponential/exponential_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/exponential_lpdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/frechet/frechet_cdf_test.hpp b/test/prob/frechet/frechet_cdf_test.hpp
index b5b2ce0dfdf..dca6d72e1b3 100644
--- a/test/prob/frechet/frechet_cdf_test.hpp
+++ b/test/prob/frechet/frechet_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/frechet_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/pow.hpp>
 
 using stan::math::var;
diff --git a/test/prob/gamma/gamma_cdf_log_test.hpp b/test/prob/gamma/gamma_cdf_log_test.hpp
index 24cf75eb1d7..2db2382d526 100644
--- a/test/prob/gamma/gamma_cdf_log_test.hpp
+++ b/test/prob/gamma/gamma_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gamma_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 
 using stan::math::var;
diff --git a/test/prob/gamma/gamma_test.hpp b/test/prob/gamma/gamma_test.hpp
index 123b0aa30a2..89f7bb94b08 100644
--- a/test/prob/gamma/gamma_test.hpp
+++ b/test/prob/gamma/gamma_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gamma_lpdf.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 
 using stan::math::var;
diff --git a/test/prob/gumbel/gumbel_ccdf_log_test.hpp b/test/prob/gumbel/gumbel_ccdf_log_test.hpp
index df0813fb3f1..f32ca877b12 100644
--- a/test/prob/gumbel/gumbel_ccdf_log_test.hpp
+++ b/test/prob/gumbel/gumbel_ccdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gumbel_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/gumbel/gumbel_cdf_log_test.hpp b/test/prob/gumbel/gumbel_cdf_log_test.hpp
index 8fa8624cd53..69732871ed0 100644
--- a/test/prob/gumbel/gumbel_cdf_log_test.hpp
+++ b/test/prob/gumbel/gumbel_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gumbel_cdf_log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/gumbel/gumbel_cdf_test.hpp b/test/prob/gumbel/gumbel_cdf_test.hpp
index 9e60c9073ef..c5c7f3d16fc 100644
--- a/test/prob/gumbel/gumbel_cdf_test.hpp
+++ b/test/prob/gumbel/gumbel_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gumbel_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/gumbel/gumbel_test.hpp b/test/prob/gumbel/gumbel_test.hpp
index f7797d96b89..6272172d72c 100644
--- a/test/prob/gumbel/gumbel_test.hpp
+++ b/test/prob/gumbel/gumbel_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/gumbel_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/inv_chi_square/inv_chi_square_ccdf_log_test.hpp b/test/prob/inv_chi_square/inv_chi_square_ccdf_log_test.hpp
index 93499f482b2..cf1480a660a 100644
--- a/test/prob/inv_chi_square/inv_chi_square_ccdf_log_test.hpp
+++ b/test/prob/inv_chi_square/inv_chi_square_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/inv_chi_square_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 
 using stan::math::var;
diff --git a/test/prob/inv_chi_square/inv_chi_square_cdf_log_test.hpp b/test/prob/inv_chi_square/inv_chi_square_cdf_log_test.hpp
index 4478c13ac96..dc613c99802 100644
--- a/test/prob/inv_chi_square/inv_chi_square_cdf_log_test.hpp
+++ b/test/prob/inv_chi_square/inv_chi_square_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/inv_chi_square_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 
 using stan::math::var;
diff --git a/test/prob/inv_gamma/inv_gamma_ccdf_log_test.hpp b/test/prob/inv_gamma/inv_gamma_ccdf_log_test.hpp
index c32f6d0f528..a9ee2b17f63 100644
--- a/test/prob/inv_gamma/inv_gamma_ccdf_log_test.hpp
+++ b/test/prob/inv_gamma/inv_gamma_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/inv_gamma_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 
 using stan::math::var;
diff --git a/test/prob/inv_gamma/inv_gamma_cdf_log_test.hpp b/test/prob/inv_gamma/inv_gamma_cdf_log_test.hpp
index add8a6f6b8b..6fb2316c1c0 100644
--- a/test/prob/inv_gamma/inv_gamma_cdf_log_test.hpp
+++ b/test/prob/inv_gamma/inv_gamma_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/inv_gamma_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 
 using stan::math::var;
diff --git a/test/prob/logistic/logistic_ccdf_log_test.hpp b/test/prob/logistic/logistic_ccdf_log_test.hpp
index b7736415382..5361c2fd950 100644
--- a/test/prob/logistic/logistic_ccdf_log_test.hpp
+++ b/test/prob/logistic/logistic_ccdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/logistic_ccdf_log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/logistic/logistic_cdf_log_test.hpp b/test/prob/logistic/logistic_cdf_log_test.hpp
index 017f5f2f2d4..13aad8d1ecf 100644
--- a/test/prob/logistic/logistic_cdf_log_test.hpp
+++ b/test/prob/logistic/logistic_cdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/logistic_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/logistic/logistic_cdf_test.hpp b/test/prob/logistic/logistic_cdf_test.hpp
index 5fc46510919..68ba1609949 100644
--- a/test/prob/logistic/logistic_cdf_test.hpp
+++ b/test/prob/logistic/logistic_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/logistic_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/logistic/logistic_test.hpp b/test/prob/logistic/logistic_test.hpp
index c0a5b2ae3f8..b13e1efefe6 100644
--- a/test/prob/logistic/logistic_test.hpp
+++ b/test/prob/logistic/logistic_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/logistic_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 
 using stan::math::var;
diff --git a/test/prob/loglogistic/loglogistic_test.hpp b/test/prob/loglogistic/loglogistic_test.hpp
index f56b4ffd1de..7672f3a55c5 100644
--- a/test/prob/loglogistic/loglogistic_test.hpp
+++ b/test/prob/loglogistic/loglogistic_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/loglogistic_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/inv.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 
diff --git a/test/prob/lognormal/lognormal_ccdf_log_test.hpp b/test/prob/lognormal/lognormal_ccdf_log_test.hpp
index a666fefbdb0..098cb28234c 100644
--- a/test/prob/lognormal/lognormal_ccdf_log_test.hpp
+++ b/test/prob/lognormal/lognormal_ccdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/lognormal_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/lognormal/lognormal_cdf_log_test.hpp b/test/prob/lognormal/lognormal_cdf_log_test.hpp
index 9eee80ff77d..d1cb5788a0c 100644
--- a/test/prob/lognormal/lognormal_cdf_log_test.hpp
+++ b/test/prob/lognormal/lognormal_cdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/lognormal_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/lognormal/lognormal_cdf_test.hpp b/test/prob/lognormal/lognormal_cdf_test.hpp
index 906e3f1f89a..e1c4a6e6704 100644
--- a/test/prob/lognormal/lognormal_cdf_test.hpp
+++ b/test/prob/lognormal/lognormal_cdf_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/lognormal_cdf.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/lognormal/lognormal_test.hpp b/test/prob/lognormal/lognormal_test.hpp
index 246808a7bfe..44af3dc28a7 100644
--- a/test/prob/lognormal/lognormal_test.hpp
+++ b/test/prob/lognormal/lognormal_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/lognormal_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/square.hpp>
 
 using stan::math::var;
diff --git a/test/prob/neg_binomial/neg_binomial_ccdf_log_test.hpp b/test/prob/neg_binomial/neg_binomial_ccdf_log_test.hpp
index 7484258485b..a88c42bda39 100644
--- a/test/prob/neg_binomial/neg_binomial_ccdf_log_test.hpp
+++ b/test/prob/neg_binomial/neg_binomial_ccdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial/neg_binomial_cdf_log_test.hpp b/test/prob/neg_binomial/neg_binomial_cdf_log_test.hpp
index 4b4746a45f1..7aa667b97eb 100644
--- a/test/prob/neg_binomial/neg_binomial_cdf_log_test.hpp
+++ b/test/prob/neg_binomial/neg_binomial_cdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_cdf_log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial/neg_binomial_cdf_test.hpp b/test/prob/neg_binomial/neg_binomial_cdf_test.hpp
index 9acb283a3f2..cd5811a5541 100644
--- a/test/prob/neg_binomial/neg_binomial_cdf_test.hpp
+++ b/test/prob/neg_binomial/neg_binomial_cdf_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_cdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial/neg_binomial_test.hpp b/test/prob/neg_binomial/neg_binomial_test.hpp
index 0871be96065..aaf9a777902 100644
--- a/test/prob/neg_binomial/neg_binomial_test.hpp
+++ b/test/prob/neg_binomial/neg_binomial_test.hpp
@@ -1,10 +1,5 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_lpmf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1p.hpp>
-#include <boost/math/special_functions/binomial.hpp>
-
-#include <stdexcept>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial_2/neg_binomial_2_ccdf_log_test.hpp b/test/prob/neg_binomial_2/neg_binomial_2_ccdf_log_test.hpp
index 35fa7499438..54f0b420ff0 100644
--- a/test/prob/neg_binomial_2/neg_binomial_2_ccdf_log_test.hpp
+++ b/test/prob/neg_binomial_2/neg_binomial_2_ccdf_log_test.hpp
@@ -1,9 +1,6 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_2_ccdf_log.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial_2/neg_binomial_2_cdf_log_test.hpp b/test/prob/neg_binomial_2/neg_binomial_2_cdf_log_test.hpp
index c012b0a91bf..070685ce688 100644
--- a/test/prob/neg_binomial_2/neg_binomial_2_cdf_log_test.hpp
+++ b/test/prob/neg_binomial_2/neg_binomial_2_cdf_log_test.hpp
@@ -1,9 +1,6 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_2_cdf_log.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial_2/neg_binomial_2_cdf_test.hpp b/test/prob/neg_binomial_2/neg_binomial_2_cdf_test.hpp
index cfbb54f83fa..36d54382700 100644
--- a/test/prob/neg_binomial_2/neg_binomial_2_cdf_test.hpp
+++ b/test/prob/neg_binomial_2/neg_binomial_2_cdf_test.hpp
@@ -1,9 +1,6 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_2_cdf.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial_2/neg_binomial_2_log_test.hpp b/test/prob/neg_binomial_2/neg_binomial_2_log_test.hpp
index 35e6367241b..31d844f61dd 100644
--- a/test/prob/neg_binomial_2/neg_binomial_2_log_test.hpp
+++ b/test/prob/neg_binomial_2/neg_binomial_2_log_test.hpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim/prob/neg_binomial_2_log_lpmf.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/log_sum_exp.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/neg_binomial_2/neg_binomial_2_test.hpp b/test/prob/neg_binomial_2/neg_binomial_2_test.hpp
index d7d16011505..1ba848149ec 100644
--- a/test/prob/neg_binomial_2/neg_binomial_2_test.hpp
+++ b/test/prob/neg_binomial_2/neg_binomial_2_test.hpp
@@ -1,8 +1,6 @@
 // Arguments: Ints, Doubles, Doubles
 #include <stan/math/prim/prob/neg_binomial_2_lpmf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/normal/normal_ccdf_log_test.hpp b/test/prob/normal/normal_ccdf_log_test.hpp
index fc75a9c147d..cd799a70942 100644
--- a/test/prob/normal/normal_ccdf_log_test.hpp
+++ b/test/prob/normal/normal_ccdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/normal_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
 using stan::math::var;
diff --git a/test/prob/normal/normal_cdf_test.hpp b/test/prob/normal/normal_cdf_test.hpp
index 73f4a857427..151b602730f 100644
--- a/test/prob/normal/normal_cdf_test.hpp
+++ b/test/prob/normal/normal_cdf_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/normal_cdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/normal/normal_test.hpp b/test/prob/normal/normal_test.hpp
index 81e2ca75927..6d7aabfc649 100644
--- a/test/prob/normal/normal_test.hpp
+++ b/test/prob/normal/normal_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/normal_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/normal_sufficient/normal_sufficient_test.hpp b/test/prob/normal_sufficient/normal_sufficient_test.hpp
index e18c42bb49a..0b4913d4bd7 100644
--- a/test/prob/normal_sufficient/normal_sufficient_test.hpp
+++ b/test/prob/normal_sufficient/normal_sufficient_test.hpp
@@ -1,8 +1,6 @@
 // Arguments: Doubles, Doubles, Ints, Doubles, Doubles
 #include <stan/math/prim/prob/normal_sufficient_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/pow.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/pareto/pareto_ccdf_log_test.hpp b/test/prob/pareto/pareto_ccdf_log_test.hpp
index b147125fefd..cfee1afdcb4 100644
--- a/test/prob/pareto/pareto_ccdf_log_test.hpp
+++ b/test/prob/pareto/pareto_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/pareto_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/pareto/pareto_cdf_log_test.hpp b/test/prob/pareto/pareto_cdf_log_test.hpp
index 2e6aea3d15b..5b793e2dd6f 100644
--- a/test/prob/pareto/pareto_cdf_log_test.hpp
+++ b/test/prob/pareto/pareto_cdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/pareto_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/pareto/pareto_cdf_test.hpp b/test/prob/pareto/pareto_cdf_test.hpp
index d4a874d35be..bb5216b1063 100644
--- a/test/prob/pareto/pareto_cdf_test.hpp
+++ b/test/prob/pareto/pareto_cdf_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/pareto_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/pareto/pareto_test.hpp b/test/prob/pareto/pareto_test.hpp
index bf49136d330..d01b6160f78 100644
--- a/test/prob/pareto/pareto_test.hpp
+++ b/test/prob/pareto/pareto_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/pareto_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 
 using stan::math::var;
diff --git a/test/prob/pareto_type_2/pareto_type_2_test.hpp b/test/prob/pareto_type_2/pareto_type_2_test.hpp
index 2aaa462bc29..53c21219ffb 100644
--- a/test/prob/pareto_type_2/pareto_type_2_test.hpp
+++ b/test/prob/pareto_type_2/pareto_type_2_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/pareto_type_2_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/log1p.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/poisson/poisson_log_test.hpp b/test/prob/poisson/poisson_log_test.hpp
index 9e83b97fe11..a59f23df970 100644
--- a/test/prob/poisson/poisson_log_test.hpp
+++ b/test/prob/poisson/poisson_log_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Ints, Doubles
 #include <stan/math/prim/prob/poisson_log_lpmf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
 
 using stan::math::var;
diff --git a/test/prob/rayleigh/rayleigh_cdf_log_test.hpp b/test/prob/rayleigh/rayleigh_cdf_log_test.hpp
index c97142b6c74..812c677dd19 100644
--- a/test/prob/rayleigh/rayleigh_cdf_log_test.hpp
+++ b/test/prob/rayleigh/rayleigh_cdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/rayleigh_cdf_log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/rayleigh/rayleigh_cdf_test.hpp b/test/prob/rayleigh/rayleigh_cdf_test.hpp
index af5848a9e7d..a21a2dc52c9 100644
--- a/test/prob/rayleigh/rayleigh_cdf_test.hpp
+++ b/test/prob/rayleigh/rayleigh_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/rayleigh_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/rayleigh/rayleigh_test.hpp b/test/prob/rayleigh/rayleigh_test.hpp
index 0fbe1b595f8..bc4dc965712 100644
--- a/test/prob/rayleigh/rayleigh_test.hpp
+++ b/test/prob/rayleigh/rayleigh_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles
 #include <stan/math/prim/prob/rayleigh_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_ccdf_log_test.hpp b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_ccdf_log_test.hpp
index 75105b10f17..b615c96b090 100644
--- a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_ccdf_log_test.hpp
+++ b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/scaled_inv_chi_square_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_p.hpp>
 
 using stan::math::var;
diff --git a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_cdf_log_test.hpp b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_cdf_log_test.hpp
index a82b08d6dfe..cd52ae59e36 100644
--- a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_cdf_log_test.hpp
+++ b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/scaled_inv_chi_square_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/gamma_q.hpp>
 
 using stan::math::var;
diff --git a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_test.hpp b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_test.hpp
index 7839a5d9bd8..dc748380ceb 100644
--- a/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_test.hpp
+++ b/test/prob/scaled_inv_chi_square/scaled_inv_chi_square_test.hpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim/prob/scaled_inv_chi_square_lpdf.hpp>
 #include <stan/math/prim/fun/multiply_log.hpp>
 #include <stan/math/prim/fun/square.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/skew_double_exponential/skew_double_exponential_ccdf_log_test.hpp b/test/prob/skew_double_exponential/skew_double_exponential_ccdf_log_test.hpp
index 921f86c1826..e582a4d0288 100644
--- a/test/prob/skew_double_exponential/skew_double_exponential_ccdf_log_test.hpp
+++ b/test/prob/skew_double_exponential/skew_double_exponential_ccdf_log_test.hpp
@@ -2,8 +2,6 @@
 #include <stan/math/prim/prob/skew_double_exponential_lccdf.hpp>
 #include <stan/math/prim/fun/log1m_exp.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/skew_double_exponential/skew_double_exponential_cdf_log_test.hpp b/test/prob/skew_double_exponential/skew_double_exponential_cdf_log_test.hpp
index 2e1ec4bce84..b852db621b6 100644
--- a/test/prob/skew_double_exponential/skew_double_exponential_cdf_log_test.hpp
+++ b/test/prob/skew_double_exponential/skew_double_exponential_cdf_log_test.hpp
@@ -1,8 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_double_exponential_lcdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/skew_double_exponential/skew_double_exponential_cdf_test.hpp b/test/prob/skew_double_exponential/skew_double_exponential_cdf_test.hpp
index 6afca103345..60ffb5abcb0 100644
--- a/test/prob/skew_double_exponential/skew_double_exponential_cdf_test.hpp
+++ b/test/prob/skew_double_exponential/skew_double_exponential_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_double_exponential_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/skew_double_exponential/skew_double_exponential_test.hpp b/test/prob/skew_double_exponential/skew_double_exponential_test.hpp
index 747db88e14b..3b6f295caa2 100644
--- a/test/prob/skew_double_exponential/skew_double_exponential_test.hpp
+++ b/test/prob/skew_double_exponential/skew_double_exponential_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_double_exponential_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 
 using stan::math::var;
diff --git a/test/prob/skew_normal/skew_normal_ccdf_log_test.hpp b/test/prob/skew_normal/skew_normal_ccdf_log_test.hpp
index 04a8150a6d0..39a8f6d8bd4 100644
--- a/test/prob/skew_normal/skew_normal_ccdf_log_test.hpp
+++ b/test/prob/skew_normal/skew_normal_ccdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_normal_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
 
 using stan::math::var;
diff --git a/test/prob/skew_normal/skew_normal_cdf_log_test.hpp b/test/prob/skew_normal/skew_normal_cdf_log_test.hpp
index e4ee5a4da47..a392b0c2f01 100644
--- a/test/prob/skew_normal/skew_normal_cdf_log_test.hpp
+++ b/test/prob/skew_normal/skew_normal_cdf_log_test.hpp
@@ -1,8 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_normal_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
 
 using stan::math::var;
diff --git a/test/prob/skew_normal/skew_normal_cdf_test.hpp b/test/prob/skew_normal/skew_normal_cdf_test.hpp
index f54bd6a1781..301880f03bf 100644
--- a/test/prob/skew_normal/skew_normal_cdf_test.hpp
+++ b/test/prob/skew_normal/skew_normal_cdf_test.hpp
@@ -1,8 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_normal_cdf.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/owens_t.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/skew_normal/skew_normal_test.hpp b/test/prob/skew_normal/skew_normal_test.hpp
index 26c49345ee2..cb0b93421ea 100644
--- a/test/prob/skew_normal/skew_normal_test.hpp
+++ b/test/prob/skew_normal/skew_normal_test.hpp
@@ -1,8 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/skew_normal_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/std_normal/std_normal_ccdf_log_test.hpp b/test/prob/std_normal/std_normal_ccdf_log_test.hpp
index 9f50b463628..9b2dc24d0f0 100644
--- a/test/prob/std_normal/std_normal_ccdf_log_test.hpp
+++ b/test/prob/std_normal/std_normal_ccdf_log_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles
 #include <stan/math/prim/prob/std_normal_lccdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
 using std::vector;
diff --git a/test/prob/std_normal/std_normal_cdf_log_test.hpp b/test/prob/std_normal/std_normal_cdf_log_test.hpp
index fb1a83a14ae..7860738fde2 100644
--- a/test/prob/std_normal/std_normal_cdf_log_test.hpp
+++ b/test/prob/std_normal/std_normal_cdf_log_test.hpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim/prob/std_normal_lcdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
-#include <stan/math/prim/fun/erfc.hpp>
 #include <stan/math/prim/fun/log.hpp>
 
 using stan::math::square;
diff --git a/test/prob/std_normal/std_normal_cdf_test.hpp b/test/prob/std_normal/std_normal_cdf_test.hpp
index e29a9dd08a9..b7a4d54b0ca 100644
--- a/test/prob/std_normal/std_normal_cdf_test.hpp
+++ b/test/prob/std_normal/std_normal_cdf_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles
 #include <stan/math/prim/prob/std_normal_cdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/erf.hpp>
 
 using std::vector;
 
diff --git a/test/prob/std_normal/std_normal_test.hpp b/test/prob/std_normal/std_normal_test.hpp
index 75e272a3817..79097997773 100644
--- a/test/prob/std_normal/std_normal_test.hpp
+++ b/test/prob/std_normal/std_normal_test.hpp
@@ -1,7 +1,5 @@
 // Arguments: Doubles
 #include <stan/math/prim/prob/std_normal_lpdf.hpp>
-#include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/sqrt.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/student_t/student_t_test.hpp b/test/prob/student_t/student_t_test.hpp
index 05c0e7b5e66..7ab41593cfd 100644
--- a/test/prob/student_t/student_t_test.hpp
+++ b/test/prob/student_t/student_t_test.hpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim/prob/student_t_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/lgamma.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/square.hpp>
 #include <stan/math/prim/fun/log1p.hpp>
 
diff --git a/test/prob/uniform/uniform_ccdf_log_test.hpp b/test/prob/uniform/uniform_ccdf_log_test.hpp
index c5276fded09..fc2b0f23377 100644
--- a/test/prob/uniform/uniform_ccdf_log_test.hpp
+++ b/test/prob/uniform/uniform_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/uniform_ccdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/uniform/uniform_cdf_log_test.hpp b/test/prob/uniform/uniform_cdf_log_test.hpp
index 2ffb4100b68..81c3bc051f8 100644
--- a/test/prob/uniform/uniform_cdf_log_test.hpp
+++ b/test/prob/uniform/uniform_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/uniform_cdf_log.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/uniform/uniform_test.hpp b/test/prob/uniform/uniform_test.hpp
index 2f0dd576ecf..bf6c3dcf996 100644
--- a/test/prob/uniform/uniform_test.hpp
+++ b/test/prob/uniform/uniform_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/uniform_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/von_mises/von_mises_ccdf_log_test.hpp b/test/prob/von_mises/von_mises_ccdf_log_test.hpp
index 11b1fffff83..011f0fc4727 100644
--- a/test/prob/von_mises/von_mises_ccdf_log_test.hpp
+++ b/test/prob/von_mises/von_mises_ccdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/von_mises_lccdf.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
diff --git a/test/prob/von_mises/von_mises_cdf_log_test.hpp b/test/prob/von_mises/von_mises_cdf_log_test.hpp
index 0822f5e3909..1ce931ce2ab 100644
--- a/test/prob/von_mises/von_mises_cdf_log_test.hpp
+++ b/test/prob/von_mises/von_mises_cdf_log_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/von_mises_lcdf.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 #include <stan/math/prim/fun/constants.hpp>
 
 using stan::math::var;
diff --git a/test/prob/von_mises/von_mises_cdf_test.hpp b/test/prob/von_mises/von_mises_cdf_test.hpp
index 50c8fc4c282..07146bc9ef7 100644
--- a/test/prob/von_mises/von_mises_cdf_test.hpp
+++ b/test/prob/von_mises/von_mises_cdf_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/von_mises_cdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/floor.hpp>
 using stan::math::var;
 using std::numeric_limits;
 using std::vector;
diff --git a/test/prob/von_mises/von_mises_test.hpp b/test/prob/von_mises/von_mises_test.hpp
index 8838f6109cb..032df092caa 100644
--- a/test/prob/von_mises/von_mises_test.hpp
+++ b/test/prob/von_mises/von_mises_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/von_mises_lpdf.hpp>
 #include <stan/math/prim/fun/constants.hpp>
-#include <stan/math/prim/fun/log.hpp>
 #include <stan/math/prim/fun/modified_bessel_first_kind.hpp>
 
 using stan::math::var;
diff --git a/test/prob/weibull/weibull_cdf_log_test.hpp b/test/prob/weibull/weibull_cdf_log_test.hpp
index 3b6446b1090..8bdae2b12fc 100644
--- a/test/prob/weibull/weibull_cdf_log_test.hpp
+++ b/test/prob/weibull/weibull_cdf_log_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/weibull_cdf_log.hpp>
 #include <stan/math/prim/fun/log.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 
 using stan::math::var;
 using std::numeric_limits;
diff --git a/test/prob/weibull/weibull_cdf_test.hpp b/test/prob/weibull/weibull_cdf_test.hpp
index 195d7f4e67a..aba7f13697f 100644
--- a/test/prob/weibull/weibull_cdf_test.hpp
+++ b/test/prob/weibull/weibull_cdf_test.hpp
@@ -1,6 +1,5 @@
 // Arguments: Doubles, Doubles, Doubles
 #include <stan/math/prim/prob/weibull_cdf.hpp>
-#include <stan/math/prim/fun/exp.hpp>
 #include <stan/math/prim/fun/pow.hpp>
 
 using stan::math::var;
diff --git a/test/prob/yule_simon/yule_simon_test.hpp b/test/prob/yule_simon/yule_simon_test.hpp
index 61784486944..6ecb61c470b 100644
--- a/test/prob/yule_simon/yule_simon_test.hpp
+++ b/test/prob/yule_simon/yule_simon_test.hpp
@@ -1,7 +1,6 @@
 // Arguments: Ints, Doubles
 #include <stan/math/prim/prob/yule_simon_lpmf.hpp>
 #include <stan/math/prim/fun/lbeta.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 
 using std::numeric_limits;
 using std::vector;
diff --git a/test/unit/math/fwd/fun/stan_print_test.cpp b/test/unit/math/fwd/fun/stan_print_test.cpp
index f13fe25c19c..51cce038d18 100644
--- a/test/unit/math/fwd/fun/stan_print_test.cpp
+++ b/test/unit/math/fwd/fun/stan_print_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 
diff --git a/test/unit/math/fwd/functor/gradient_test.cpp b/test/unit/math/fwd/functor/gradient_test.cpp
index 0bd887fc176..50cd1e7b800 100644
--- a/test/unit/math/fwd/functor/gradient_test.cpp
+++ b/test/unit/math/fwd/functor/gradient_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <stdexcept>
 
 using Eigen::Dynamic;
 using Eigen::Matrix;
diff --git a/test/unit/math/fwd/functor/jacobian_test.cpp b/test/unit/math/fwd/functor/jacobian_test.cpp
index f11292ddc1e..c5c0a28bce6 100644
--- a/test/unit/math/fwd/functor/jacobian_test.cpp
+++ b/test/unit/math/fwd/functor/jacobian_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <stdexcept>
 
 using Eigen::Dynamic;
 using Eigen::Matrix;
diff --git a/test/unit/math/fwd/meta/include_summand_test.cpp b/test/unit/math/fwd/meta/include_summand_test.cpp
index 50c211c0590..eeb2bf7c572 100644
--- a/test/unit/math/fwd/meta/include_summand_test.cpp
+++ b/test/unit/math/fwd/meta/include_summand_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 
 using stan::math::fvar;
 using stan::math::include_summand;
diff --git a/test/unit/math/fwd/meta/require_generics_test.cpp b/test/unit/math/fwd/meta/require_generics_test.cpp
index 3acedcf9bb6..040a61b3c6e 100644
--- a/test/unit/math/fwd/meta/require_generics_test.cpp
+++ b/test/unit/math/fwd/meta/require_generics_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/require_util.hpp>
 #include <gtest/gtest.h>
-#include <type_traits>
 #include <string>
 
 TEST(requires_fwd_scal, fvar_test) {
diff --git a/test/unit/math/fwd/prob/categorical_logit_test.cpp b/test/unit/math/fwd/prob/categorical_logit_test.cpp
index c0131c41d6d..f1d0e01734e 100644
--- a/test/unit/math/fwd/prob/categorical_logit_test.cpp
+++ b/test/unit/math/fwd/prob/categorical_logit_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(ProbDistributionsCategoricalLogit, fvar_double) {
diff --git a/test/unit/math/fwd/prob/categorical_test.cpp b/test/unit/math/fwd/prob/categorical_test.cpp
index f7700bc9389..d537fde6953 100644
--- a/test/unit/math/fwd/prob/categorical_test.cpp
+++ b/test/unit/math/fwd/prob/categorical_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <vector>
 
 TEST(ProbDistributionsCategorical, fvar_double) {
diff --git a/test/unit/math/fwd/prob/dirichlet_test.cpp b/test/unit/math/fwd/prob/dirichlet_test.cpp
index fc844a4f2ec..7c3bd30cf6a 100644
--- a/test/unit/math/fwd/prob/dirichlet_test.cpp
+++ b/test/unit/math/fwd/prob/dirichlet_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributions, fvar_double) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/fwd/prob/inv_wishart_test.cpp b/test/unit/math/fwd/prob/inv_wishart_test.cpp
index f996bf1a1bd..172c64abb23 100644
--- a/test/unit/math/fwd/prob/inv_wishart_test.cpp
+++ b/test/unit/math/fwd/prob/inv_wishart_test.cpp
@@ -1,10 +1,6 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/math/special_functions/digamma.hpp>
-
 TEST(ProbDistributionsInvWishart, fvar_double) {
   using Eigen::Dynamic;
   using Eigen::Matrix;
diff --git a/test/unit/math/fwd/prob/lkj_corr_test.cpp b/test/unit/math/fwd/prob/lkj_corr_test.cpp
index 820dd5fdc74..e990dbe0529 100644
--- a/test/unit/math/fwd/prob/lkj_corr_test.cpp
+++ b/test/unit/math/fwd/prob/lkj_corr_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsLkjCorr, fvar_double) {
   using stan::math::fvar;
diff --git a/test/unit/math/fwd/prob/multi_normal_cholesky_test.cpp b/test/unit/math/fwd/prob/multi_normal_cholesky_test.cpp
index 13a0825c06c..e928f67f511 100644
--- a/test/unit/math/fwd/prob/multi_normal_cholesky_test.cpp
+++ b/test/unit/math/fwd/prob/multi_normal_cholesky_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsMultiNormalCholesky, fvar_double) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/fwd/prob/multi_normal_test.cpp b/test/unit/math/fwd/prob/multi_normal_test.cpp
index 1f247efcf0e..c898f4cddb8 100644
--- a/test/unit/math/fwd/prob/multi_normal_test.cpp
+++ b/test/unit/math/fwd/prob/multi_normal_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsMultiNormal, fvar_double) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/fwd/prob/multi_student_t_test.cpp b/test/unit/math/fwd/prob/multi_student_t_test.cpp
index f57b8c0609a..274acb2da8e 100644
--- a/test/unit/math/fwd/prob/multi_student_t_test.cpp
+++ b/test/unit/math/fwd/prob/multi_student_t_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsMultiStudentT, fvar_double) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/fwd/prob/multinomial_test.cpp b/test/unit/math/fwd/prob/multinomial_test.cpp
index ab55eee58a8..18c9341cfaa 100644
--- a/test/unit/math/fwd/prob/multinomial_test.cpp
+++ b/test/unit/math/fwd/prob/multinomial_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <vector>
 
 TEST(ProbDistributionsMultinomial, fvar_double) {
diff --git a/test/unit/math/fwd/prob/wishart_test.cpp b/test/unit/math/fwd/prob/wishart_test.cpp
index ae9bd5ed936..c6a45d85c6c 100644
--- a/test/unit/math/fwd/prob/wishart_test.cpp
+++ b/test/unit/math/fwd/prob/wishart_test.cpp
@@ -1,8 +1,5 @@
 #include <stan/math/fwd.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/special_functions/digamma.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsWishart, fvar_double) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/laplace/aki_ex_test.cpp b/test/unit/math/laplace/aki_ex_test.cpp
index 60047348fd8..82a90509d38 100644
--- a/test/unit/math/laplace/aki_ex_test.cpp
+++ b/test/unit/math/laplace/aki_ex_test.cpp
@@ -1,16 +1,12 @@
 #include <test/unit/math/test_ad.hpp>
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/math/laplace/laplace_utility.hpp>
 #include <test/unit/math/laplace/roach_data/sigmaz.hpp>
 #include <test/unit/math/laplace/roach_data/y.hpp>
 #include <test/unit/math/laplace/csv_reader.hpp>
 
 #include <gtest/gtest.h>
 #include <iostream>
-#include <istream>
-#include <fstream>
 #include <vector>
 
 struct poisson_re_log_ll_functor {
diff --git a/test/unit/math/laplace/laplace_bernoulli_logit_rng_test.cpp b/test/unit/math/laplace/laplace_bernoulli_logit_rng_test.cpp
index 11c92e17770..e26429df652 100644
--- a/test/unit/math/laplace/laplace_bernoulli_logit_rng_test.cpp
+++ b/test/unit/math/laplace/laplace_bernoulli_logit_rng_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/mix.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 #include <gtest/gtest.h>
 #include <iostream>
diff --git a/test/unit/math/laplace/laplace_marginal_bernoulli_logit_lpmf_test.cpp b/test/unit/math/laplace/laplace_marginal_bernoulli_logit_lpmf_test.cpp
index 77dc178b1c5..bf682c0b97d 100644
--- a/test/unit/math/laplace/laplace_marginal_bernoulli_logit_lpmf_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_bernoulli_logit_lpmf_test.cpp
@@ -3,9 +3,6 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
 #include <test/unit/math/laplace/aki_synth_data/x1.hpp>
-#include <test/unit/pretty_print_types.hpp>
-
-#include <test/unit/math/rev/fun/util.hpp>
 
 #include <gtest/gtest.h>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_marginal_lpdf_moto_test.cpp b/test/unit/math/laplace/laplace_marginal_lpdf_moto_test.cpp
index f00974cf3c4..b771bedc1ca 100644
--- a/test/unit/math/laplace/laplace_marginal_lpdf_moto_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_lpdf_moto_test.cpp
@@ -2,11 +2,7 @@
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
-#include <test/unit/math/laplace/aki_synth_data/x1.hpp>
 #include <test/unit/math/laplace/motorcycle_gp/x_vec.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_marginal_lpdf_test.cpp b/test/unit/math/laplace/laplace_marginal_lpdf_test.cpp
index f494662b5a0..3dce80a8904 100644
--- a/test/unit/math/laplace/laplace_marginal_lpdf_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_lpdf_test.cpp
@@ -2,11 +2,7 @@
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
 #include <test/unit/math/laplace/aki_synth_data/x1.hpp>
-#include <test/unit/math/laplace/motorcycle_gp/x_vec.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_marginal_neg_binomial_log_lpmf_test.cpp b/test/unit/math/laplace/laplace_marginal_neg_binomial_log_lpmf_test.cpp
index c7ab6eafd77..d04022496e2 100644
--- a/test/unit/math/laplace/laplace_marginal_neg_binomial_log_lpmf_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_neg_binomial_log_lpmf_test.cpp
@@ -1,9 +1,7 @@
-#include <test/unit/pretty_print_types.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 
 #include <gtest/gtest.h>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_marginal_neg_binomial_log_summary_lpmf_test.cpp b/test/unit/math/laplace/laplace_marginal_neg_binomial_log_summary_lpmf_test.cpp
index fba6e8ac345..00a3491c9b2 100644
--- a/test/unit/math/laplace/laplace_marginal_neg_binomial_log_summary_lpmf_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_neg_binomial_log_summary_lpmf_test.cpp
@@ -1,9 +1,7 @@
-#include <test/unit/pretty_print_types.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 
 #include <gtest/gtest.h>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_marginal_poisson_log_lpmf_test.cpp b/test/unit/math/laplace/laplace_marginal_poisson_log_lpmf_test.cpp
index 2e40c30b95a..5abc7150ce7 100644
--- a/test/unit/math/laplace/laplace_marginal_poisson_log_lpmf_test.cpp
+++ b/test/unit/math/laplace/laplace_marginal_poisson_log_lpmf_test.cpp
@@ -2,8 +2,6 @@
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/pretty_print_types.hpp>
 
 #include <gtest/gtest.h>
 #include <sstream>
diff --git a/test/unit/math/laplace/laplace_neg_binomial_2_log_rng_test.cpp b/test/unit/math/laplace/laplace_neg_binomial_2_log_rng_test.cpp
index 3e248b8874e..bba67470873 100644
--- a/test/unit/math/laplace/laplace_neg_binomial_2_log_rng_test.cpp
+++ b/test/unit/math/laplace/laplace_neg_binomial_2_log_rng_test.cpp
@@ -1,9 +1,7 @@
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
-#include <test/unit/math/laplace/laplace_utility.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 #include <gtest/gtest.h>
 #include <iostream>
diff --git a/test/unit/math/laplace/laplace_poisson_log_rng_test.cpp b/test/unit/math/laplace/laplace_poisson_log_rng_test.cpp
index 6c5a13670f0..4dc00d6fa1d 100644
--- a/test/unit/math/laplace/laplace_poisson_log_rng_test.cpp
+++ b/test/unit/math/laplace/laplace_poisson_log_rng_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/laplace/laplace_utility.hpp>
 
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/laplace/laplace_types_test.cpp b/test/unit/math/laplace/laplace_types_test.cpp
index c1599aedd8e..715e7fee8a8 100644
--- a/test/unit/math/laplace/laplace_types_test.cpp
+++ b/test/unit/math/laplace/laplace_types_test.cpp
@@ -2,11 +2,6 @@
 #include <stan/math.hpp>
 #include <stan/math/mix.hpp>
 #include <test/unit/math/laplace/laplace_utility.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <stan/math/prim/fun/lgamma.hpp>
-#include <test/unit/math/laplace/aki_synth_data/x1.hpp>
-#include <test/unit/math/laplace/motorcycle_gp/x_vec.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <sstream>
diff --git a/test/unit/math/laplace/tuple_to_laplace_options_test.cpp b/test/unit/math/laplace/tuple_to_laplace_options_test.cpp
index c1ba5913bfb..13d7febb1e9 100644
--- a/test/unit/math/laplace/tuple_to_laplace_options_test.cpp
+++ b/test/unit/math/laplace/tuple_to_laplace_options_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/laplace/laplace_utility.hpp>
 
 TEST(laplace_utils, tuple_to_laplace_options) {
   using stan::math::laplace_options_user_supplied;
diff --git a/test/unit/math/memory/stack_alloc_test.cpp b/test/unit/math/memory/stack_alloc_test.cpp
index b395df387e9..b6ad784060f 100644
--- a/test/unit/math/memory/stack_alloc_test.cpp
+++ b/test/unit/math/memory/stack_alloc_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/memory/stack_alloc.hpp>
 #include <stdlib.h>
 #include <cmath>
-#include <utility>
 #include <vector>
 
 TEST(MemoryStackAlloc, allocArray) {
diff --git a/test/unit/math/mix/constraint/identity_constrain_test.cpp b/test/unit/math/mix/constraint/identity_constrain_test.cpp
index 750da07ad1e..f646aa51250 100644
--- a/test/unit/math/mix/constraint/identity_constrain_test.cpp
+++ b/test/unit/math/mix/constraint/identity_constrain_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 namespace identity_constrain_test {
 template <typename T>
diff --git a/test/unit/math/mix/constraint/lb_constrain_matvar_test.cpp b/test/unit/math/mix/constraint/lb_constrain_matvar_test.cpp
index 4b2cb37f018..d73b73ebf66 100644
--- a/test/unit/math/mix/constraint/lb_constrain_matvar_test.cpp
+++ b/test/unit/math/mix/constraint/lb_constrain_matvar_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 namespace lb_constrain_test {
 template <typename T1, typename T2>
diff --git a/test/unit/math/mix/constraint/lb_constrain_test.cpp b/test/unit/math/mix/constraint/lb_constrain_test.cpp
index 377507d4acd..969c71eadbf 100644
--- a/test/unit/math/mix/constraint/lb_constrain_test.cpp
+++ b/test/unit/math/mix/constraint/lb_constrain_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 namespace lb_constrain_test {
 template <typename T1, typename T2>
diff --git a/test/unit/math/mix/core/operator_addition_test.cpp b/test/unit/math/mix/core/operator_addition_test.cpp
index 5c2a2ad7ca7..0b462de97ab 100644
--- a/test/unit/math/mix/core/operator_addition_test.cpp
+++ b/test/unit/math/mix/core/operator_addition_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <stan/math/prim/core/operator_addition.hpp>
 #include <test/unit/math/test_ad.hpp>
 
 TEST(mathMixCore, operatorAddition) {
diff --git a/test/unit/math/mix/fun/atan2_test.cpp b/test/unit/math/mix/fun/atan2_test.cpp
index f01ef5c626c..ef2958adf6e 100644
--- a/test/unit/math/mix/fun/atan2_test.cpp
+++ b/test/unit/math/mix/fun/atan2_test.cpp
@@ -1,6 +1,5 @@
 #include <test/unit/math/test_ad.hpp>
 #include <limits>
-#include <vector>
 
 TEST(mathMixCore, atan2) {
   auto f = [](const auto& x1, const auto& x2) {
diff --git a/test/unit/math/mix/fun/diag_pre_multiply_test.cpp b/test/unit/math/mix/fun/diag_pre_multiply_test.cpp
index b874607edce..9622140c69f 100644
--- a/test/unit/math/mix/fun/diag_pre_multiply_test.cpp
+++ b/test/unit/math/mix/fun/diag_pre_multiply_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <iostream>
 
 inline void expect_diag_pre_multiply(const Eigen::VectorXd& v,
                                      const Eigen::MatrixXd& a) {
diff --git a/test/unit/math/mix/fun/dot_product_test.cpp b/test/unit/math/mix/fun/dot_product_test.cpp
index 0b3bf346d2d..8095e9ac916 100644
--- a/test/unit/math/mix/fun/dot_product_test.cpp
+++ b/test/unit/math/mix/fun/dot_product_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 #include <vector>
 
 TEST(mathMixMatFun, dotProduct) {
diff --git a/test/unit/math/mix/fun/fma_2_test.cpp b/test/unit/math/mix/fun/fma_2_test.cpp
index 3766c9225a3..566ddf9c12d 100644
--- a/test/unit/math/mix/fun/fma_2_test.cpp
+++ b/test/unit/math/mix/fun/fma_2_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, fma_vector) {
   auto f = [](const auto& x1, const auto& x2, const auto& x3) {
diff --git a/test/unit/math/mix/fun/fma_3_test.cpp b/test/unit/math/mix/fun/fma_3_test.cpp
index 4e06e18d7da..577be2b289d 100644
--- a/test/unit/math/mix/fun/fma_3_test.cpp
+++ b/test/unit/math/mix/fun/fma_3_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, fma_row_vector) {
   auto f = [](const auto& x1, const auto& x2, const auto& x3) {
diff --git a/test/unit/math/mix/fun/fma_4_test.cpp b/test/unit/math/mix/fun/fma_4_test.cpp
index d79675b844b..a819c2462a9 100644
--- a/test/unit/math/mix/fun/fma_4_test.cpp
+++ b/test/unit/math/mix/fun/fma_4_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, fma_matrix) {
   auto f = [](const auto& x1, const auto& x2, const auto& x3) {
diff --git a/test/unit/math/mix/fun/fma_5_test.cpp b/test/unit/math/mix/fun/fma_5_test.cpp
index 20f1aa13bc8..96da1a25c60 100644
--- a/test/unit/math/mix/fun/fma_5_test.cpp
+++ b/test/unit/math/mix/fun/fma_5_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, fma_matrix_error) {
   auto f = [](const auto& x1, const auto& x2, const auto& x3) {
diff --git a/test/unit/math/mix/fun/generalized_inverse_test.cpp b/test/unit/math/mix/fun/generalized_inverse_test.cpp
index 98610f02010..87f7127b064 100644
--- a/test/unit/math/mix/fun/generalized_inverse_test.cpp
+++ b/test/unit/math/mix/fun/generalized_inverse_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <vector>
 #include <gtest/gtest.h>
 
 TEST(mathMixMatFun, gen_inv_test_1) {
diff --git a/test/unit/math/mix/fun/grad_2F1_test.cpp b/test/unit/math/mix/fun/grad_2F1_test.cpp
index 14d15a5f773..c3ab0d9b513 100644
--- a/test/unit/math/mix/fun/grad_2F1_test.cpp
+++ b/test/unit/math/mix/fun/grad_2F1_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(ProbInternalMath, grad2F1_zero_z) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/fun/grad_F32_test.cpp b/test/unit/math/mix/fun/grad_F32_test.cpp
index 99adad20585..dfb536c1d69 100644
--- a/test/unit/math/mix/fun/grad_F32_test.cpp
+++ b/test/unit/math/mix/fun/grad_F32_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(ProbInternalMath, gradF32_fd1) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/fun/grad_reg_inc_beta_test.cpp b/test/unit/math/mix/fun/grad_reg_inc_beta_test.cpp
index e6613d43ea1..5ed0addcc06 100644
--- a/test/unit/math/mix/fun/grad_reg_inc_beta_test.cpp
+++ b/test/unit/math/mix/fun/grad_reg_inc_beta_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(ProbInternalMath, grad_reg_inc_beta_fv) {
   using stan::math::digamma;
diff --git a/test/unit/math/mix/fun/grad_reg_inc_gamma_test.cpp b/test/unit/math/mix/fun/grad_reg_inc_gamma_test.cpp
index 87bd0b1240a..e8325adbc98 100644
--- a/test/unit/math/mix/fun/grad_reg_inc_gamma_test.cpp
+++ b/test/unit/math/mix/fun/grad_reg_inc_gamma_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(ProbInternalMath, gradRegIncGamma_typical) {
   double a = 0.5;
diff --git a/test/unit/math/mix/fun/hypergeometric_3F2_test.cpp b/test/unit/math/mix/fun/hypergeometric_3F2_test.cpp
index 5151dd53df2..fc0c9aac41c 100644
--- a/test/unit/math/mix/fun/hypergeometric_3F2_test.cpp
+++ b/test/unit/math/mix/fun/hypergeometric_3F2_test.cpp
@@ -1,6 +1,5 @@
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(ProbInternalMath, F32_fd) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/fun/hypergeometric_pFq_test.cpp b/test/unit/math/mix/fun/hypergeometric_pFq_test.cpp
index c5e2b5bad4e..89dcd5f438b 100644
--- a/test/unit/math/mix/fun/hypergeometric_pFq_test.cpp
+++ b/test/unit/math/mix/fun/hypergeometric_pFq_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, hyper_2f2) {
   using stan::math::to_array_1d;
diff --git a/test/unit/math/mix/fun/is_any_nan_test.cpp b/test/unit/math/mix/fun/is_any_nan_test.cpp
index f911d668a66..be6323bc35b 100644
--- a/test/unit/math/mix/fun/is_any_nan_test.cpp
+++ b/test/unit/math/mix/fun/is_any_nan_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST(AgradMixIsAnyNan, Fvar) {
diff --git a/test/unit/math/mix/fun/lmultiply2_test.cpp b/test/unit/math/mix/fun/lmultiply2_test.cpp
index 000f89d8c78..3837ca33890 100644
--- a/test/unit/math/mix/fun/lmultiply2_test.cpp
+++ b/test/unit/math/mix/fun/lmultiply2_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, lmultiply2_vec) {
   auto f = [](const auto& x1, const auto& x2) {
diff --git a/test/unit/math/mix/fun/lmultiply3_test.cpp b/test/unit/math/mix/fun/lmultiply3_test.cpp
index 9b48faf2a15..01b2158a4ee 100644
--- a/test/unit/math/mix/fun/lmultiply3_test.cpp
+++ b/test/unit/math/mix/fun/lmultiply3_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, lmultiply3_vec) {
   auto f = [](const auto& x1, const auto& x2) {
diff --git a/test/unit/math/mix/fun/log_mix_part1_test.cpp b/test/unit/math/mix/fun/log_mix_part1_test.cpp
index e7cee02a9f6..082ea188a5c 100644
--- a/test/unit/math/mix/fun/log_mix_part1_test.cpp
+++ b/test/unit/math/mix/fun/log_mix_part1_test.cpp
@@ -1,6 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
-#include <vector>
 
 TEST(mathMixScalFun, logMix) {
   auto f = [](const auto& x1, const auto& x2, const auto& x3) {
diff --git a/test/unit/math/mix/fun/log_mix_part2_test.cpp b/test/unit/math/mix/fun/log_mix_part2_test.cpp
index f23883d360f..a4dff94312f 100644
--- a/test/unit/math/mix/fun/log_mix_part2_test.cpp
+++ b/test/unit/math/mix/fun/log_mix_part2_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 #include <vector>
 
 inline void expect_log_mix(const std::vector<double>& p,
diff --git a/test/unit/math/mix/fun/log_sum_exp_signed_test.cpp b/test/unit/math/mix/fun/log_sum_exp_signed_test.cpp
index efb4b2ea30e..74e7b91a0f8 100644
--- a/test/unit/math/mix/fun/log_sum_exp_signed_test.cpp
+++ b/test/unit/math/mix/fun/log_sum_exp_signed_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 #include <vector>
 
 TEST(mathMixScalFun, logSumExp_signed) {
diff --git a/test/unit/math/mix/fun/max_test.cpp b/test/unit/math/mix/fun/max_test.cpp
index fe60483fa67..1f3bfa39150 100644
--- a/test/unit/math/mix/fun/max_test.cpp
+++ b/test/unit/math/mix/fun/max_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <algorithm>
 
 template <typename T>
 inline void expect_max(const T& m) {
diff --git a/test/unit/math/mix/fun/min_test.cpp b/test/unit/math/mix/fun/min_test.cpp
index a0fedec9743..b9241a1b14c 100644
--- a/test/unit/math/mix/fun/min_test.cpp
+++ b/test/unit/math/mix/fun/min_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <algorithm>
 
 template <typename T>
 inline void expect_min(const T& m) {
diff --git a/test/unit/math/mix/fun/multiply_complex_test.cpp b/test/unit/math/mix/fun/multiply_complex_test.cpp
index f994dc8f664..288c1d65ddd 100644
--- a/test/unit/math/mix/fun/multiply_complex_test.cpp
+++ b/test/unit/math/mix/fun/multiply_complex_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/mix/fun/multiply_util.hpp>
 
 TEST(mathMix, complexMultiply) {
   auto f
diff --git a/test/unit/math/mix/fun/multiply_log2_test.cpp b/test/unit/math/mix/fun/multiply_log2_test.cpp
index a124be21bdb..baa4a0ea6bd 100644
--- a/test/unit/math/mix/fun/multiply_log2_test.cpp
+++ b/test/unit/math/mix/fun/multiply_log2_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, multiplyLog2_vec) {
   auto f = [](const auto& x1, const auto& x2) {
diff --git a/test/unit/math/mix/fun/multiply_log3_test.cpp b/test/unit/math/mix/fun/multiply_log3_test.cpp
index 3e4f29b073f..7fd9f25669d 100644
--- a/test/unit/math/mix/fun/multiply_log3_test.cpp
+++ b/test/unit/math/mix/fun/multiply_log3_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(mathMixScalFun, multiplyLog3_vec) {
   auto f = [](const auto& x1, const auto& x2) {
diff --git a/test/unit/math/mix/fun/norm_test.cpp b/test/unit/math/mix/fun/norm_test.cpp
index 9fec91afb6d..81e88d3304f 100644
--- a/test/unit/math/mix/fun/norm_test.cpp
+++ b/test/unit/math/mix/fun/norm_test.cpp
@@ -1,6 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <complex>
-#include <vector>
 
 TEST(mixScalFun, norm) {
   auto f = [](const auto& x) { return norm(x); };
diff --git a/test/unit/math/mix/fun/operator_addition_test.cpp b/test/unit/math/mix/fun/operator_addition_test.cpp
index c76c052b981..b00574f0ba5 100644
--- a/test/unit/math/mix/fun/operator_addition_test.cpp
+++ b/test/unit/math/mix/fun/operator_addition_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(AgradMixMatrixOperatorAddition, fv_scalar_matrix_1stDeriv) {
   using stan::math::add;
diff --git a/test/unit/math/mix/fun/operator_division_test.cpp b/test/unit/math/mix/fun/operator_division_test.cpp
index f26a4391f16..cd920b5936c 100644
--- a/test/unit/math/mix/fun/operator_division_test.cpp
+++ b/test/unit/math/mix/fun/operator_division_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST(AgradMixMatrixOperatorDivision, fv_scalar_1stDeriv) {
diff --git a/test/unit/math/mix/fun/operator_multiplication_test.cpp b/test/unit/math/mix/fun/operator_multiplication_test.cpp
index a0b9c64af77..a606faaf16c 100644
--- a/test/unit/math/mix/fun/operator_multiplication_test.cpp
+++ b/test/unit/math/mix/fun/operator_multiplication_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(AgradMixMatrixOperatorMultiplication, fv_vector_scalar_1stDeriv) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/fun/operator_subtraction_test.cpp b/test/unit/math/mix/fun/operator_subtraction_test.cpp
index f3a89809ba8..edbf2a1b53c 100644
--- a/test/unit/math/mix/fun/operator_subtraction_test.cpp
+++ b/test/unit/math/mix/fun/operator_subtraction_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(AgradMixMatrixOperatorSubtraction, fv_scalar_matrix_1stDeriv) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/fun/polar_test.cpp b/test/unit/math/mix/fun/polar_test.cpp
index f1a1a8805b9..1d2a741ca70 100644
--- a/test/unit/math/mix/fun/polar_test.cpp
+++ b/test/unit/math/mix/fun/polar_test.cpp
@@ -1,6 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <complex>
-#include <iostream>
 #include <vector>
 
 TEST(mathMixFun, polar) {
diff --git a/test/unit/math/mix/fun/pow_part1_test.cpp b/test/unit/math/mix/fun/pow_part1_test.cpp
index 2f100b24458..5e27bf909b0 100644
--- a/test/unit/math/mix/fun/pow_part1_test.cpp
+++ b/test/unit/math/mix/fun/pow_part1_test.cpp
@@ -1,7 +1,6 @@
 #include <test/unit/math/test_ad.hpp>
 #include <cmath>
 #include <limits>
-#include <vector>
 
 template <typename T>
 inline void expect_arith_instantiate() {
diff --git a/test/unit/math/mix/fun/pow_part2_test.cpp b/test/unit/math/mix/fun/pow_part2_test.cpp
index d3805f61cba..d73680f0f8c 100644
--- a/test/unit/math/mix/fun/pow_part2_test.cpp
+++ b/test/unit/math/mix/fun/pow_part2_test.cpp
@@ -1,6 +1,5 @@
 #include <test/unit/math/test_ad.hpp>
 #include <cmath>
-#include <limits>
 #include <vector>
 
 TEST(mathMixFun, complexPow) {
diff --git a/test/unit/math/mix/fun/primitive_value_test.cpp b/test/unit/math/mix/fun/primitive_value_test.cpp
index 2f0846d7b2e..1231bd9373d 100644
--- a/test/unit/math/mix/fun/primitive_value_test.cpp
+++ b/test/unit/math/mix/fun/primitive_value_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST(AgradMix, primitiveValueRevNested) {
diff --git a/test/unit/math/mix/fun/proj_test.cpp b/test/unit/math/mix/fun/proj_test.cpp
index ea0006cbc7c..d1e5f99e29b 100644
--- a/test/unit/math/mix/fun/proj_test.cpp
+++ b/test/unit/math/mix/fun/proj_test.cpp
@@ -1,6 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <complex>
-#include <vector>
 
 TEST(mixScalFun, proj) {
   auto f = [](const auto& x) { return proj(x); };
diff --git a/test/unit/math/mix/fun/promote_scalar_test.cpp b/test/unit/math/mix/fun/promote_scalar_test.cpp
index 84bb8101e75..27714e1d353 100644
--- a/test/unit/math/mix/fun/promote_scalar_test.cpp
+++ b/test/unit/math/mix/fun/promote_scalar_test.cpp
@@ -2,7 +2,6 @@
 #include <cmath>
 #include <complex>
 #include <vector>
-#include <type_traits>
 
 namespace stan {
 namespace math {
diff --git a/test/unit/math/mix/fun/qr_Q_test.cpp b/test/unit/math/mix/fun/qr_Q_test.cpp
index 0ac7afbc35c..1135ad04f25 100644
--- a/test/unit/math/mix/fun/qr_Q_test.cpp
+++ b/test/unit/math/mix/fun/qr_Q_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(MathMixMatFun, qrQ) {
   auto f = [](const auto& x) { return stan::math::qr_Q(x); };
diff --git a/test/unit/math/mix/fun/qr_R_test.cpp b/test/unit/math/mix/fun/qr_R_test.cpp
index e502f26f0ae..66e9e865d12 100644
--- a/test/unit/math/mix/fun/qr_R_test.cpp
+++ b/test/unit/math/mix/fun/qr_R_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(MathMixMatFun, qrR) {
   auto f = [](const auto& x) { return stan::math::qr_R(x); };
diff --git a/test/unit/math/mix/fun/qr_test.cpp b/test/unit/math/mix/fun/qr_test.cpp
index a3f7b1b8baf..f55af81f069 100644
--- a/test/unit/math/mix/fun/qr_test.cpp
+++ b/test/unit/math/mix/fun/qr_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(MathMixMatFun, qr) {
   auto f = [](const auto& x) { return std::get<0>(stan::math::qr(x)); };
diff --git a/test/unit/math/mix/fun/qr_thin_test.cpp b/test/unit/math/mix/fun/qr_thin_test.cpp
index caeaa48a54e..eb678d18b91 100644
--- a/test/unit/math/mix/fun/qr_thin_test.cpp
+++ b/test/unit/math/mix/fun/qr_thin_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 TEST(MathMixMatFun, qr_thin) {
   auto f = [](const auto& x) { return std::get<0>(stan::math::qr_thin(x)); };
diff --git a/test/unit/math/mix/fun/rows_test.cpp b/test/unit/math/mix/fun/rows_test.cpp
index 7abdfda18c6..569500cddc6 100644
--- a/test/unit/math/mix/fun/rows_test.cpp
+++ b/test/unit/math/mix/fun/rows_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(AgradMixMatrixRows, ffd_vector) {
   using stan::math::row_vector_ffd;
diff --git a/test/unit/math/mix/fun/singular_values_test.cpp b/test/unit/math/mix/fun/singular_values_test.cpp
index 5829d5425e3..40af6157021 100644
--- a/test/unit/math/mix/fun/singular_values_test.cpp
+++ b/test/unit/math/mix/fun/singular_values_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <stdexcept>
 
 TEST(MathMixMatFun, singularValues) {
   auto f = [](const auto& x) { return stan::math::singular_values(x); };
diff --git a/test/unit/math/mix/fun/softmax_test.cpp b/test/unit/math/mix/fun/softmax_test.cpp
index 97b3fc64332..4554682a1a0 100644
--- a/test/unit/math/mix/fun/softmax_test.cpp
+++ b/test/unit/math/mix/fun/softmax_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/util.hpp>
 
 TEST(MathMixMatFun, softmax) {
   using stan::test::expect_ad_matvar;
diff --git a/test/unit/math/mix/fun/stan_print_test.cpp b/test/unit/math/mix/fun/stan_print_test.cpp
index da01c636a4e..5c86f27b2db 100644
--- a/test/unit/math/mix/fun/stan_print_test.cpp
+++ b/test/unit/math/mix/fun/stan_print_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 
diff --git a/test/unit/math/mix/fun/sum_test.cpp b/test/unit/math/mix/fun/sum_test.cpp
index cce57b4d9f7..32f50539511 100644
--- a/test/unit/math/mix/fun/sum_test.cpp
+++ b/test/unit/math/mix/fun/sum_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 template <typename T>
 inline void expect_sum(const T& m) {
diff --git a/test/unit/math/mix/fun/svd_U_test.cpp b/test/unit/math/mix/fun/svd_U_test.cpp
index dfc3e31465f..6126eb63012 100644
--- a/test/unit/math/mix/fun/svd_U_test.cpp
+++ b/test/unit/math/mix/fun/svd_U_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <stdexcept>
 
 TEST(MathMixMatFun, svd_U) {
   auto f = [](const auto& x) { return stan::math::svd_U(x); };
diff --git a/test/unit/math/mix/fun/svd_V_test.cpp b/test/unit/math/mix/fun/svd_V_test.cpp
index f9b0bea2798..f344ae67c26 100644
--- a/test/unit/math/mix/fun/svd_V_test.cpp
+++ b/test/unit/math/mix/fun/svd_V_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <stdexcept>
 
 TEST(MathMixMatFun, svd_V) {
   auto f = [](const auto& x) { return stan::math::svd_V(x); };
diff --git a/test/unit/math/mix/fun/svd_test.cpp b/test/unit/math/mix/fun/svd_test.cpp
index 4304af7868a..90e1ca446c4 100644
--- a/test/unit/math/mix/fun/svd_test.cpp
+++ b/test/unit/math/mix/fun/svd_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <stdexcept>
 
 TEST(MathMixMatFun, svd) {
   auto f = [](const auto& x) { return std::get<0>(stan::math::svd(x)); };
diff --git a/test/unit/math/mix/fun/to_fvar_test.cpp b/test/unit/math/mix/fun/to_fvar_test.cpp
index f20dfb64604..462ffdf776b 100644
--- a/test/unit/math/mix/fun/to_fvar_test.cpp
+++ b/test/unit/math/mix/fun/to_fvar_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(AgradMixMatrixToFvar, fv_vector) {
   using stan::math::vector_d;
diff --git a/test/unit/math/mix/fun/ub_constrain_matvar_test.cpp b/test/unit/math/mix/fun/ub_constrain_matvar_test.cpp
index a739e72c91a..2312e8445d2 100644
--- a/test/unit/math/mix/fun/ub_constrain_matvar_test.cpp
+++ b/test/unit/math/mix/fun/ub_constrain_matvar_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 namespace ub_constrain_test {
 template <typename T1, typename T2>
diff --git a/test/unit/math/mix/fun/ub_constrain_test.cpp b/test/unit/math/mix/fun/ub_constrain_test.cpp
index e1c79d55ddc..a3808906e61 100644
--- a/test/unit/math/mix/fun/ub_constrain_test.cpp
+++ b/test/unit/math/mix/fun/ub_constrain_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <limits>
 
 namespace ub_constrain_test {
 template <typename T1, typename T2>
diff --git a/test/unit/math/mix/functor/autodiff_test.cpp b/test/unit/math/mix/functor/autodiff_test.cpp
index 9780b3f5c53..16c9e634797 100644
--- a/test/unit/math/mix/functor/autodiff_test.cpp
+++ b/test/unit/math/mix/functor/autodiff_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/fun/util.hpp>
-#include <iostream>
-#include <stdexcept>
 #include <vector>
 
 using Eigen::Dynamic;
diff --git a/test/unit/math/mix/functor/finite_diff_grad_hessian_auto_test.cpp b/test/unit/math/mix/functor/finite_diff_grad_hessian_auto_test.cpp
index d5946aac4f5..59756c76895 100644
--- a/test/unit/math/mix/functor/finite_diff_grad_hessian_auto_test.cpp
+++ b/test/unit/math/mix/functor/finite_diff_grad_hessian_auto_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/unit/math/mix/functor/finite_diff_gradient_auto_test.cpp b/test/unit/math/mix/functor/finite_diff_gradient_auto_test.cpp
index eeae792742a..b255209fd5e 100644
--- a/test/unit/math/mix/functor/finite_diff_gradient_auto_test.cpp
+++ b/test/unit/math/mix/functor/finite_diff_gradient_auto_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 template <typename F>
 inline void expect_match_autodiff(const F& f, Eigen::VectorXd x) {
diff --git a/test/unit/math/mix/functor/reduce_sum_part1_test.cpp b/test/unit/math/mix/functor/reduce_sum_part1_test.cpp
index ad219f26182..51972d3759c 100644
--- a/test/unit/math/mix/functor/reduce_sum_part1_test.cpp
+++ b/test/unit/math/mix/functor/reduce_sum_part1_test.cpp
@@ -1,8 +1,6 @@
-#include <stan/math/prim/meta.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/math/mix/functor/reduce_sum_util.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <limits>
 #include <vector>
 
 // Reduce sum tests are broken up into four files to avoid windows compiler
diff --git a/test/unit/math/mix/functor/reduce_sum_part2_test.cpp b/test/unit/math/mix/functor/reduce_sum_part2_test.cpp
index 16a9c7b4b2d..30a9a7ff81a 100644
--- a/test/unit/math/mix/functor/reduce_sum_part2_test.cpp
+++ b/test/unit/math/mix/functor/reduce_sum_part2_test.cpp
@@ -1,9 +1,7 @@
-#include <stan/math/prim/meta.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/math/mix/functor/reduce_sum_util.hpp>
 #include <test/unit/math/rev/util.hpp>
 
-#include <limits>
 #include <vector>
 
 // Reduce sum tests are broken up into four files to avoid windows compiler
diff --git a/test/unit/math/mix/functor/reduce_sum_part3_test.cpp b/test/unit/math/mix/functor/reduce_sum_part3_test.cpp
index 1999ce0d871..441a0badb24 100644
--- a/test/unit/math/mix/functor/reduce_sum_part3_test.cpp
+++ b/test/unit/math/mix/functor/reduce_sum_part3_test.cpp
@@ -1,9 +1,7 @@
-#include <stan/math/prim/meta.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/math/mix/functor/reduce_sum_util.hpp>
 #include <test/unit/math/rev/util.hpp>
 
-#include <limits>
 #include <vector>
 
 // Reduce sum tests are broken up into four files to avoid windows compiler
diff --git a/test/unit/math/mix/functor/reduce_sum_part4_test.cpp b/test/unit/math/mix/functor/reduce_sum_part4_test.cpp
index 95d7ccf2fa7..8346f0c27e8 100644
--- a/test/unit/math/mix/functor/reduce_sum_part4_test.cpp
+++ b/test/unit/math/mix/functor/reduce_sum_part4_test.cpp
@@ -1,9 +1,7 @@
-#include <stan/math/prim/meta.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/math/mix/functor/reduce_sum_util.hpp>
 #include <test/unit/math/rev/util.hpp>
 
-#include <limits>
 #include <vector>
 
 // Reduce sum tests are broken up into four files to avoid windows compiler
diff --git a/test/unit/math/mix/functor/reduce_sum_util.hpp b/test/unit/math/mix/functor/reduce_sum_util.hpp
index 6666d7eea2f..21aba0a0b59 100644
--- a/test/unit/math/mix/functor/reduce_sum_util.hpp
+++ b/test/unit/math/mix/functor/reduce_sum_util.hpp
@@ -1,14 +1,8 @@
 #ifndef TEST_UNIT_MATH_MIX_FUNCTOR_REDUCE_SUM_UTIL
 #define TEST_UNIT_MATH_MIX_FUNCTOR_REDUCE_SUM_UTIL
 
-#include <stan/math.hpp>
 #include <test/unit/math/prim/functor/reduce_sum_util.hpp>
 #include <test/unit/math/test_ad.hpp>
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <sstream>
-#include <tuple>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/test/unit/math/mix/meta/include_summand_test.cpp b/test/unit/math/mix/meta/include_summand_test.cpp
index 77c09c31fe4..11ede369397 100644
--- a/test/unit/math/mix/meta/include_summand_test.cpp
+++ b/test/unit/math/mix/meta/include_summand_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 
 TEST(MathMetaMix, IncludeSummandProptoTrueFvarVar) {
   using stan::math::fvar;
diff --git a/test/unit/math/mix/meta/is_complex_test.cpp b/test/unit/math/mix/meta/is_complex_test.cpp
index 9d2dda8c90c..364b7d245a4 100644
--- a/test/unit/math/mix/meta/is_complex_test.cpp
+++ b/test/unit/math/mix/meta/is_complex_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <complex>
 #include <string>
 
diff --git a/test/unit/math/mix/meta/is_dense_dynamic_test.cpp b/test/unit/math/mix/meta/is_dense_dynamic_test.cpp
index 8171ce88e3a..b7fa8a0382f 100644
--- a/test/unit/math/mix/meta/is_dense_dynamic_test.cpp
+++ b/test/unit/math/mix/meta/is_dense_dynamic_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_dense_dynamic_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_eigen_dense_dynamic_test.cpp b/test/unit/math/mix/meta/is_eigen_dense_dynamic_test.cpp
index 47c4e463515..fd8a3ae4151 100644
--- a/test/unit/math/mix/meta/is_eigen_dense_dynamic_test.cpp
+++ b/test/unit/math/mix/meta/is_eigen_dense_dynamic_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_eigen_dense_dynamic_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_eigen_matrix_base_test.cpp b/test/unit/math/mix/meta/is_eigen_matrix_base_test.cpp
index 72499f677a4..8d2141c068a 100644
--- a/test/unit/math/mix/meta/is_eigen_matrix_base_test.cpp
+++ b/test/unit/math/mix/meta/is_eigen_matrix_base_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_eigen_matrix_base_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_eigen_matrix_test.cpp b/test/unit/math/mix/meta/is_eigen_matrix_test.cpp
index 80393fb2452..a0caf2c5dab 100644
--- a/test/unit/math/mix/meta/is_eigen_matrix_test.cpp
+++ b/test/unit/math/mix/meta/is_eigen_matrix_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_eigen_matrix_dynamic_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_eigen_sparse_base_test.cpp b/test/unit/math/mix/meta/is_eigen_sparse_base_test.cpp
index cc513e83160..5fe99491268 100644
--- a/test/unit/math/mix/meta/is_eigen_sparse_base_test.cpp
+++ b/test/unit/math/mix/meta/is_eigen_sparse_base_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_eigen_sparse_base_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_eigen_test.cpp b/test/unit/math/mix/meta/is_eigen_test.cpp
index 418ce085712..8e922a2f1d4 100644
--- a/test/unit/math/mix/meta/is_eigen_test.cpp
+++ b/test/unit/math/mix/meta/is_eigen_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/mix/meta/eigen_utils.hpp>
-#include <Eigen/Sparse>
 #include <gtest/gtest.h>
 
 TEST(MathMetaPrim, is_eigen_hierarchy_tests) {
diff --git a/test/unit/math/mix/meta/is_matrix_like_test.cpp b/test/unit/math/mix/meta/is_matrix_like_test.cpp
index 325750a7381..7165e41a87f 100644
--- a/test/unit/math/mix/meta/is_matrix_like_test.cpp
+++ b/test/unit/math/mix/meta/is_matrix_like_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <test/unit/math/mix/meta/eigen_utils.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMetaMix, is_matrix_test) {
diff --git a/test/unit/math/mix/meta/is_var_dense_dynamic_test.cpp b/test/unit/math/mix/meta/is_var_dense_dynamic_test.cpp
index 94b149ce3f5..72bd79cb57b 100644
--- a/test/unit/math/mix/meta/is_var_dense_dynamic_test.cpp
+++ b/test/unit/math/mix/meta/is_var_dense_dynamic_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <test/unit/math/mix/meta/eigen_utils.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMetaMix, is_var_dense_dynamic_test) {
diff --git a/test/unit/math/mix/meta/is_var_eigen_test.cpp b/test/unit/math/mix/meta/is_var_eigen_test.cpp
index eefa0dfde98..984e2cd8145 100644
--- a/test/unit/math/mix/meta/is_var_eigen_test.cpp
+++ b/test/unit/math/mix/meta/is_var_eigen_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <test/unit/math/mix/meta/eigen_utils.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMetaMix, is_var_eigen_test) {
diff --git a/test/unit/math/mix/meta/is_var_matrix_test.cpp b/test/unit/math/mix/meta/is_var_matrix_test.cpp
index faa56061915..0bea2af3a57 100644
--- a/test/unit/math/mix/meta/is_var_matrix_test.cpp
+++ b/test/unit/math/mix/meta/is_var_matrix_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <test/unit/math/mix/meta/eigen_utils.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMetaMix, is_var_matrix_test) {
diff --git a/test/unit/math/mix/meta/is_vector_test.cpp b/test/unit/math/mix/meta/is_vector_test.cpp
index e65a7ebfecf..383f3886819 100644
--- a/test/unit/math/mix/meta/is_vector_test.cpp
+++ b/test/unit/math/mix/meta/is_vector_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/mix.hpp>
-#include <test/unit/math/mix/meta/eigen_utils.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMetaMix, is_row_vector_test) {
diff --git a/test/unit/math/mix/meta/require_generics_test.cpp b/test/unit/math/mix/meta/require_generics_test.cpp
index 466b331d963..3eab0c10b8a 100644
--- a/test/unit/math/mix/meta/require_generics_test.cpp
+++ b/test/unit/math/mix/meta/require_generics_test.cpp
@@ -1,7 +1,6 @@
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/math/require_util.hpp>
 #include <gtest/gtest.h>
-#include <type_traits>
 #include <string>
 
 TEST(requires_mix_scal, autodiff_mix_test) {
diff --git a/test/unit/math/mix/prob/categorical_test.cpp b/test/unit/math/mix/prob/categorical_test.cpp
index fa54fc94d75..bce67b8c501 100644
--- a/test/unit/math/mix/prob/categorical_test.cpp
+++ b/test/unit/math/mix/prob/categorical_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <vector>
 
 TEST_F(AgradRev, ProbDistributionsCategorical_fvar_var) {
diff --git a/test/unit/math/mix/prob/inv_wishart_cholesky_test.cpp b/test/unit/math/mix/prob/inv_wishart_cholesky_test.cpp
index 6309310197a..8875ac7a5ed 100644
--- a/test/unit/math/mix/prob/inv_wishart_cholesky_test.cpp
+++ b/test/unit/math/mix/prob/inv_wishart_cholesky_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, ProbDistributionsInvWishartCholesky_matvar) {
   auto f = [](const auto& Y, const auto& dof, const auto& Sigma) {
diff --git a/test/unit/math/mix/prob/lkj_corr_test.cpp b/test/unit/math/mix/prob/lkj_corr_test.cpp
index bb96388ade9..7839fd58586 100644
--- a/test/unit/math/mix/prob/lkj_corr_test.cpp
+++ b/test/unit/math/mix/prob/lkj_corr_test.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/prob/lkj_corr_cholesky_test_functors.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <test/unit/math/mix/prob/higher_order_utils.hpp>
 #include <vector>
 
diff --git a/test/unit/math/mix/prob/multinomial_test.cpp b/test/unit/math/mix/prob/multinomial_test.cpp
index 96f0bfbd59e..1afccb39bc0 100644
--- a/test/unit/math/mix/prob/multinomial_test.cpp
+++ b/test/unit/math/mix/prob/multinomial_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <vector>
 
 TEST_F(AgradRev, ProbDistributionsMultinomial_fvar_var) {
diff --git a/test/unit/math/mix/prob/neg_binomial_2_log_test.cpp b/test/unit/math/mix/prob/neg_binomial_2_log_test.cpp
index 2ef7f77b49d..1cebf218816 100644
--- a/test/unit/math/mix/prob/neg_binomial_2_log_test.cpp
+++ b/test/unit/math/mix/prob/neg_binomial_2_log_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/differentiation/finite_difference.hpp>
 
 TEST_F(AgradRev, mathMixScalFun_neg_binomial_2_log_lpmf_derivatives) {
   auto f1 = [](const auto& eta, const auto& phi) {
diff --git a/test/unit/math/mix/prob/neg_binomial_test.cpp b/test/unit/math/mix/prob/neg_binomial_test.cpp
index 7d69ade8b1c..4588c82eff0 100644
--- a/test/unit/math/mix/prob/neg_binomial_test.cpp
+++ b/test/unit/math/mix/prob/neg_binomial_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/differentiation/finite_difference.hpp>
 
 TEST_F(AgradRev, mathMixScalFun_neg_binomial_lpmf_derivatives) {
   auto f = [](const int y) {
diff --git a/test/unit/math/mix/prob/ordered_logistic_test.cpp b/test/unit/math/mix/prob/ordered_logistic_test.cpp
index 28d4e5856ff..f9f08d7673a 100644
--- a/test/unit/math/mix/prob/ordered_logistic_test.cpp
+++ b/test/unit/math/mix/prob/ordered_logistic_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/test/unit/math/mix/prob/von_mises_test.cpp b/test/unit/math/mix/prob/von_mises_test.cpp
index 4035b80ca79..0932d99ee7d 100644
--- a/test/unit/math/mix/prob/von_mises_test.cpp
+++ b/test/unit/math/mix/prob/von_mises_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST_F(AgradRev, mathMixScalFun_von_mises_lpdf) {
   auto f = [](const auto& y, const auto& mu, const auto& kappa) {
diff --git a/test/unit/math/mix/prob/wishart_cholesky_test.cpp b/test/unit/math/mix/prob/wishart_cholesky_test.cpp
index 6bea6752b50..7409638394c 100644
--- a/test/unit/math/mix/prob/wishart_cholesky_test.cpp
+++ b/test/unit/math/mix/prob/wishart_cholesky_test.cpp
@@ -1,5 +1,4 @@
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, ProbDistributionsWishartCholesky_matvar) {
   auto f = [](const auto& Y, const auto& dof, const auto& Sigma) {
diff --git a/test/unit/math/opencl/check_column_index_test.cpp b/test/unit/math/opencl/check_column_index_test.cpp
index 086e3830eaa..c54b239ae7a 100644
--- a/test/unit/math/opencl/check_column_index_test.cpp
+++ b/test/unit/math/opencl/check_column_index_test.cpp
@@ -1,8 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
-#include <vector>
 
 TEST(ErrorHandlingOpenCL, checkColumnIndexMatrix) {
   stan::math::matrix_cl<double> y;
diff --git a/test/unit/math/opencl/check_test.cpp b/test/unit/math/opencl/check_test.cpp
index 76b467d1f62..525ceb0e20e 100644
--- a/test/unit/math/opencl/check_test.cpp
+++ b/test/unit/math/opencl/check_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim.hpp>
 #include <stan/math/opencl/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(ErrorHandlingScalarCL, check_rv_v_symmetric_cl) {
   const char* function = "check_symmetric";
diff --git a/test/unit/math/opencl/copy_test.cpp b/test/unit/math/opencl/copy_test.cpp
index 210d215b3c5..32a75221b0f 100644
--- a/test/unit/math/opencl/copy_test.cpp
+++ b/test/unit/math/opencl/copy_test.cpp
@@ -1,11 +1,9 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
-#include <stan/math/opencl/opencl_context.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <algorithm>
 #include <vector>
 
 TEST(MathMatrixGPU, copy_rvalue_constructor) {
diff --git a/test/unit/math/opencl/device_functions/lmultiply_test.cpp b/test/unit/math/opencl/device_functions/lmultiply_test.cpp
index 6ec9bb82d88..7a6b49f6cc2 100644
--- a/test/unit/math/opencl/device_functions/lmultiply_test.cpp
+++ b/test/unit/math/opencl/device_functions/lmultiply_test.cpp
@@ -1,6 +1,5 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
-#include <stan/math/opencl/kernels/device_functions/multiply_log.hpp>
 #include <stan/math/opencl/kernel_cl.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/expect_near_rel.hpp>
diff --git a/test/unit/math/opencl/indexing_rev_test.cpp b/test/unit/math/opencl/indexing_rev_test.cpp
index 62ab4075515..0499276eff3 100644
--- a/test/unit/math/opencl/indexing_rev_test.cpp
+++ b/test/unit/math/opencl/indexing_rev_test.cpp
@@ -2,10 +2,8 @@
 #ifndef STAN_TEST_SKIP_REQUIRING_OPENCL_INT64_BASE_ATOMIC
 #include <stan/math/opencl/indexing_rev.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(indexing_rev, indexing_rev_small) {
   Eigen::MatrixXd res(3, 3);
diff --git a/test/unit/math/opencl/is_matrix_cl_test.cpp b/test/unit/math/opencl/is_matrix_cl_test.cpp
index 3580b09397d..99affe83d0c 100644
--- a/test/unit/math/opencl/is_matrix_cl_test.cpp
+++ b/test/unit/math/opencl/is_matrix_cl_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
 #include <gtest/gtest.h>
-#include <type_traits>
 
 TEST(type_trait, matrix_cl) {
   using stan::is_matrix_cl;
diff --git a/test/unit/math/opencl/kernel_cl_test.cpp b/test/unit/math/opencl/kernel_cl_test.cpp
index 6ff605ccdfd..af37d3a846a 100644
--- a/test/unit/math/opencl/kernel_cl_test.cpp
+++ b/test/unit/math/opencl/kernel_cl_test.cpp
@@ -4,7 +4,6 @@
 #include <stan/math/opencl/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathGpu, make_kernel) {
   stan::math::matrix_d m(3, 3);
diff --git a/test/unit/math/opencl/kernel_generator/as_column_vector_or_scalar_test.cpp b/test/unit/math/opencl/kernel_generator/as_column_vector_or_scalar_test.cpp
index f18c6811048..ae3ed55bcc1 100644
--- a/test/unit/math/opencl/kernel_generator/as_column_vector_or_scalar_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/as_column_vector_or_scalar_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <stan/math.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/kernel_generator/cast_test.cpp b/test/unit/math/opencl/kernel_generator/cast_test.cpp
index 6cdddf87a5b..2bbcfe66cd2 100644
--- a/test/unit/math/opencl/kernel_generator/cast_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/cast_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <test/unit/util.hpp>
 #include <Eigen/Dense>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/kernel_generator/check_cl_test.cpp b/test/unit/math/opencl/kernel_generator/check_cl_test.cpp
index 22db18d2ff0..c509b5f1e10 100644
--- a/test/unit/math/opencl/kernel_generator/check_cl_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/check_cl_test.cpp
@@ -2,10 +2,6 @@
 
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
-#include <stan/math/opencl/copy.hpp>
-#include <stan/math/prim/fun.hpp>
-#include <stan/math/prim/err.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <gtest/gtest.h>
 #include <string>
diff --git a/test/unit/math/opencl/kernel_generator/diagonal_test.cpp b/test/unit/math/opencl/kernel_generator/diagonal_test.cpp
index 6ce78c5c795..21a1b3614f7 100644
--- a/test/unit/math/opencl/kernel_generator/diagonal_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/diagonal_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 
 #include <stan/math/opencl/kernel_generator.hpp>
-#include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <test/unit/util.hpp>
diff --git a/test/unit/math/opencl/kernel_generator/opencl_code_test.cpp b/test/unit/math/opencl/kernel_generator/opencl_code_test.cpp
index 2d8500f1538..db126689b5e 100644
--- a/test/unit/math/opencl/kernel_generator/opencl_code_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/opencl_code_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <stan/math.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/kernel_generator/operation_test.cpp b/test/unit/math/opencl/kernel_generator/operation_test.cpp
index f67444a95ad..6bef046ec2f 100644
--- a/test/unit/math/opencl/kernel_generator/operation_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/operation_test.cpp
@@ -6,7 +6,6 @@
 #include <test/unit/util.hpp>
 #include <Eigen/Dense>
 #include <gtest/gtest.h>
-#include <exception>
 
 using Eigen::MatrixXd;
 using Eigen::MatrixXi;
diff --git a/test/unit/math/opencl/kernel_generator/unary_operation_cl_test.cpp b/test/unit/math/opencl/kernel_generator/unary_operation_cl_test.cpp
index d755ff0ecd6..98d72c8c51b 100644
--- a/test/unit/math/opencl/kernel_generator/unary_operation_cl_test.cpp
+++ b/test/unit/math/opencl/kernel_generator/unary_operation_cl_test.cpp
@@ -4,7 +4,6 @@
 #include <stan/math/opencl/kernel_generator.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
-#include <test/unit/math/opencl/kernel_generator/reference_kernel.hpp>
 #include <stan/math.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/matrix_cl_test.cpp b/test/unit/math/opencl/matrix_cl_test.cpp
index 92a50033378..c0de0d8d884 100644
--- a/test/unit/math/opencl/matrix_cl_test.cpp
+++ b/test/unit/math/opencl/matrix_cl_test.cpp
@@ -1,11 +1,9 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
-#include <stan/math/opencl/opencl_context.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <stan/math/opencl/copy.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 #include <vector>
 
 template <typename T>
diff --git a/test/unit/math/opencl/mrrr_test.cpp b/test/unit/math/opencl/mrrr_test.cpp
index bcc6412355a..d9dca92b0db 100644
--- a/test/unit/math/opencl/mrrr_test.cpp
+++ b/test/unit/math/opencl/mrrr_test.cpp
@@ -1,5 +1,4 @@
 #ifdef STAN_OPENCL
-#include <iostream>
 #include <stan/math/opencl/mrrr.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
 #include <test/unit/util.hpp>
diff --git a/test/unit/math/opencl/multiply_transpose_test.cpp b/test/unit/math/opencl/multiply_transpose_test.cpp
index 5f193aaacc1..cf0da02ce29 100644
--- a/test/unit/math/opencl/multiply_transpose_test.cpp
+++ b/test/unit/math/opencl/multiply_transpose_test.cpp
@@ -6,7 +6,6 @@
 #include <test/unit/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 boost::random::mt19937 rng;
 
 TEST(MathMatrixOpenCL, multiply_transpose_exception_fail_zero) {
diff --git a/test/unit/math/opencl/opencl_context_test.cpp b/test/unit/math/opencl/opencl_context_test.cpp
index b0f0a0365ee..21c31804b94 100644
--- a/test/unit/math/opencl/opencl_context_test.cpp
+++ b/test/unit/math/opencl/opencl_context_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <fstream>
 #include <string>
 
 TEST(MathGpu, getInfo) {
diff --git a/test/unit/math/opencl/prim/add_test.cpp b/test/unit/math/opencl/prim/add_test.cpp
index c8441ba7942..3cc962cd20c 100644
--- a/test/unit/math/opencl/prim/add_test.cpp
+++ b/test/unit/math/opencl/prim/add_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
-#include <test/unit/math/opencl/util.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLPrim, add_exceptions) {
   stan::math::vector_d vd1(2), vd2(3);
diff --git a/test/unit/math/opencl/prim/cols_test.cpp b/test/unit/math/opencl/prim/cols_test.cpp
index a0500259d30..0379d006e7f 100644
--- a/test/unit/math/opencl/prim/cols_test.cpp
+++ b/test/unit/math/opencl/prim/cols_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, cols_prim) {
   using stan::math::cols;
diff --git a/test/unit/math/opencl/prim/diag_matrix_test.cpp b/test/unit/math/opencl/prim/diag_matrix_test.cpp
index f76d86ae0db..3c81779b22e 100644
--- a/test/unit/math/opencl/prim/diag_matrix_test.cpp
+++ b/test/unit/math/opencl/prim/diag_matrix_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto diag_matrix_functor
     = [](const auto& a) { return stan::math::diag_matrix(a); };
diff --git a/test/unit/math/opencl/prim/divide_columns_test.cpp b/test/unit/math/opencl/prim/divide_columns_test.cpp
index f8713fc1f91..f956410c047 100644
--- a/test/unit/math/opencl/prim/divide_columns_test.cpp
+++ b/test/unit/math/opencl/prim/divide_columns_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/prim/divide_columns.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 using stan::math::divide_columns;
 using stan::math::from_matrix_cl;
diff --git a/test/unit/math/opencl/prim/divide_test.cpp b/test/unit/math/opencl/prim/divide_test.cpp
index 22ab864eff7..28ad3241f45 100644
--- a/test/unit/math/opencl/prim/divide_test.cpp
+++ b/test/unit/math/opencl/prim/divide_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathMatrixCL, divide_exception_pass) {
   stan::math::matrix_cl<double> m;
diff --git a/test/unit/math/opencl/prim/gp_exponential_cov_test.cpp b/test/unit/math/opencl/prim/gp_exponential_cov_test.cpp
index d93518a39a4..f4fe5b564ad 100644
--- a/test/unit/math/opencl/prim/gp_exponential_cov_test.cpp
+++ b/test/unit/math/opencl/prim/gp_exponential_cov_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLPrimGpExponentialCov, exceptions) {
   Eigen::VectorXd a(3);
diff --git a/test/unit/math/opencl/prim/gp_matern32_cov_test.cpp b/test/unit/math/opencl/prim/gp_matern32_cov_test.cpp
index 79cfe1aa065..8278eeb07c6 100644
--- a/test/unit/math/opencl/prim/gp_matern32_cov_test.cpp
+++ b/test/unit/math/opencl/prim/gp_matern32_cov_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLPrimGpMatern32Cov, exceptions) {
   Eigen::VectorXd a(3);
diff --git a/test/unit/math/opencl/prim/gp_matern52_cov_test.cpp b/test/unit/math/opencl/prim/gp_matern52_cov_test.cpp
index 3441c0824b1..8b8eef4910d 100644
--- a/test/unit/math/opencl/prim/gp_matern52_cov_test.cpp
+++ b/test/unit/math/opencl/prim/gp_matern52_cov_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLPrimGpMatern52Cov, exceptions) {
   Eigen::VectorXd a(3);
diff --git a/test/unit/math/opencl/prim/log1m_inv_logit_test.cpp b/test/unit/math/opencl/prim/log1m_inv_logit_test.cpp
index d32f0ea875b..f53bb0412b6 100644
--- a/test/unit/math/opencl/prim/log1m_inv_logit_test.cpp
+++ b/test/unit/math/opencl/prim/log1m_inv_logit_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
 #include <stan/math/prim/fun/log1m_inv_logit.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/prim/logit_test.cpp b/test/unit/math/opencl/prim/logit_test.cpp
index e0c000320b8..12e929454b2 100644
--- a/test/unit/math/opencl/prim/logit_test.cpp
+++ b/test/unit/math/opencl/prim/logit_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/prim.hpp>
 #include <stan/math/prim/fun/logit.hpp>
-#include <stan/math/prim/fun/constants.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/opencl/prim/mdivide_left_tri_low_test.cpp b/test/unit/math/opencl/prim/mdivide_left_tri_low_test.cpp
index c0151631ed1..d5262f6811a 100644
--- a/test/unit/math/opencl/prim/mdivide_left_tri_low_test.cpp
+++ b/test/unit/math/opencl/prim/mdivide_left_tri_low_test.cpp
@@ -2,10 +2,8 @@
 #include <stan/math/prim.hpp>
 #include <stan/math/opencl/prim.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
-#include <test/unit/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathMatrixCL, mdivide_left_tri_low_cl_exception) {
   stan::math::matrix_d m1(2, 3);
diff --git a/test/unit/math/opencl/prim/mdivide_right_tri_low_test.cpp b/test/unit/math/opencl/prim/mdivide_right_tri_low_test.cpp
index a339cfbb107..23881a2c7e3 100644
--- a/test/unit/math/opencl/prim/mdivide_right_tri_low_test.cpp
+++ b/test/unit/math/opencl/prim/mdivide_right_tri_low_test.cpp
@@ -2,10 +2,8 @@
 #include <stan/math/prim.hpp>
 #include <stan/math/opencl/prim.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
-#include <test/unit/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathMatrixCL, mdivide_right_tri_low_cl_exception) {
   stan::math::matrix_d m1(2, 3);
diff --git a/test/unit/math/opencl/prim/multiply_test.cpp b/test/unit/math/opencl/prim/multiply_test.cpp
index 163582b1b17..5250c67487a 100644
--- a/test/unit/math/opencl/prim/multiply_test.cpp
+++ b/test/unit/math/opencl/prim/multiply_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/opencl/util.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathMatrixOpenCLPrim, non_matching_dim_excpetion) {
   stan::math::matrix_d m0(5, 3);
diff --git a/test/unit/math/opencl/prim/num_elements_test.cpp b/test/unit/math/opencl/prim/num_elements_test.cpp
index e3074c5d563..11c845085a0 100644
--- a/test/unit/math/opencl/prim/num_elements_test.cpp
+++ b/test/unit/math/opencl/prim/num_elements_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, num_elements_prim) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/prim/row_test.cpp b/test/unit/math/opencl/prim/row_test.cpp
index aaa33579039..6e74f9070eb 100644
--- a/test/unit/math/opencl/prim/row_test.cpp
+++ b/test/unit/math/opencl/prim/row_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/opencl/prim/row.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, row_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/prim/rows_test.cpp b/test/unit/math/opencl/prim/rows_test.cpp
index dd48cddc45d..a80c55dd8bc 100644
--- a/test/unit/math/opencl/prim/rows_test.cpp
+++ b/test/unit/math/opencl/prim/rows_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, rows_prim) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/prim/size_test.cpp b/test/unit/math/opencl/prim/size_test.cpp
index 8066203a331..338f925ee25 100644
--- a/test/unit/math/opencl/prim/size_test.cpp
+++ b/test/unit/math/opencl/prim/size_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, size_prim) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/prim/subtract_test.cpp b/test/unit/math/opencl/prim/subtract_test.cpp
index 0c2de1650f6..a9cf62c2726 100644
--- a/test/unit/math/opencl/prim/subtract_test.cpp
+++ b/test/unit/math/opencl/prim/subtract_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/opencl/util.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLPrim, subtract_exceptions) {
   stan::math::vector_d vd1(2), vd2(3);
diff --git a/test/unit/math/opencl/prim/symmetric_eigensolver_test.cpp b/test/unit/math/opencl/prim/symmetric_eigensolver_test.cpp
index b7034f6e9ef..87ba1d66da6 100644
--- a/test/unit/math/opencl/prim/symmetric_eigensolver_test.cpp
+++ b/test/unit/math/opencl/prim/symmetric_eigensolver_test.cpp
@@ -1,5 +1,4 @@
 #ifdef STAN_OPENCL
-#include <iostream>
 #include <stan/math/opencl/mrrr.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
 #include <test/unit/util.hpp>
diff --git a/test/unit/math/opencl/qr_decomposition_test.cpp b/test/unit/math/opencl/qr_decomposition_test.cpp
index 525eda07e71..d76f76a3fff 100644
--- a/test/unit/math/opencl/qr_decomposition_test.cpp
+++ b/test/unit/math/opencl/qr_decomposition_test.cpp
@@ -2,7 +2,6 @@
 
 #include <stan/math/opencl/prim.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 using stan::math::matrix_cl;
 
diff --git a/test/unit/math/opencl/rev/add_diag_test.cpp b/test/unit/math/opencl/rev/add_diag_test.cpp
index 928bc7aae98..270973f2d50 100644
--- a/test/unit/math/opencl/rev/add_diag_test.cpp
+++ b/test/unit/math/opencl/rev/add_diag_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto add_diag_functor
     = [](const auto& a, const auto& b) { return stan::math::add_diag(a, b); };
diff --git a/test/unit/math/opencl/rev/add_test.cpp b/test/unit/math/opencl/rev/add_test.cpp
index f678fbc255c..b349c0f9cc3 100644
--- a/test/unit/math/opencl/rev/add_test.cpp
+++ b/test/unit/math/opencl/rev/add_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto add_functor
     = [](const auto& a, const auto& b) { return stan::math::add(a, b).eval(); };
diff --git a/test/unit/math/opencl/rev/append_col_test.cpp b/test/unit/math/opencl/rev/append_col_test.cpp
index 3428fbdeb3e..4d652b69787 100644
--- a/test/unit/math/opencl/rev/append_col_test.cpp
+++ b/test/unit/math/opencl/rev/append_col_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto append_col_functor
diff --git a/test/unit/math/opencl/rev/append_row_test.cpp b/test/unit/math/opencl/rev/append_row_test.cpp
index 9e1beaf68b5..73233b9ddb0 100644
--- a/test/unit/math/opencl/rev/append_row_test.cpp
+++ b/test/unit/math/opencl/rev/append_row_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto append_row_functor
diff --git a/test/unit/math/opencl/rev/arena_matrix_cl_test.cpp b/test/unit/math/opencl/rev/arena_matrix_cl_test.cpp
index 7176cfd947d..6261a96f42d 100644
--- a/test/unit/math/opencl/rev/arena_matrix_cl_test.cpp
+++ b/test/unit/math/opencl/rev/arena_matrix_cl_test.cpp
@@ -1,6 +1,5 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(AgradRev, arena_matrix_cl_shallow_copies) {
diff --git a/test/unit/math/opencl/rev/beta_lpdf_test.cpp b/test/unit/math/opencl/rev/beta_lpdf_test.cpp
index dd0c3fce94e..26c8d53b9cd 100644
--- a/test/unit/math/opencl/rev/beta_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/beta_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsBeta, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/beta_proportion_lpdf_test.cpp b/test/unit/math/opencl/rev/beta_proportion_lpdf_test.cpp
index 6709ea03e42..1463fda35a6 100644
--- a/test/unit/math/opencl/rev/beta_proportion_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/beta_proportion_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsBetaProportion, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/beta_test.cpp b/test/unit/math/opencl/rev/beta_test.cpp
index 6a2aa387cba..91e5d369c83 100644
--- a/test/unit/math/opencl/rev/beta_test.cpp
+++ b/test/unit/math/opencl/rev/beta_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto beta_functor
     = [](const auto& a, const auto& b) { return stan::math::beta(a, b); };
diff --git a/test/unit/math/opencl/rev/block_test.cpp b/test/unit/math/opencl/rev/block_test.cpp
index b1475abe8af..64fa74a4d06 100644
--- a/test/unit/math/opencl/rev/block_test.cpp
+++ b/test/unit/math/opencl/rev/block_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, block_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/cauchy_cdf_test.cpp b/test/unit/math/opencl/rev/cauchy_cdf_test.cpp
index 022f3ce1334..1096efbf253 100644
--- a/test/unit/math/opencl/rev/cauchy_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/cauchy_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsCauchyCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/cauchy_lccdf_test.cpp b/test/unit/math/opencl/rev/cauchy_lccdf_test.cpp
index 342bf34c129..1678c1793b7 100644
--- a/test/unit/math/opencl/rev/cauchy_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/cauchy_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace cauchy_lccdf_test {
 TEST(ProbDistributionsCauchyLccdf, error_checking) {
diff --git a/test/unit/math/opencl/rev/cauchy_lpdf_test.cpp b/test/unit/math/opencl/rev/cauchy_lpdf_test.cpp
index 7623819af84..fbf7e48c07b 100644
--- a/test/unit/math/opencl/rev/cauchy_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/cauchy_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsCauchy, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/chi_square_lpdf_test.cpp b/test/unit/math/opencl/rev/chi_square_lpdf_test.cpp
index aaa48c05a5d..7c4b3d4eca8 100644
--- a/test/unit/math/opencl/rev/chi_square_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/chi_square_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsChiSquare, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/col_test.cpp b/test/unit/math/opencl/rev/col_test.cpp
index 08f9176bbf8..9292dc4f0e6 100644
--- a/test/unit/math/opencl/rev/col_test.cpp
+++ b/test/unit/math/opencl/rev/col_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, col_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/cols_test.cpp b/test/unit/math/opencl/rev/cols_test.cpp
index 85b17fdafef..e0298a37e43 100644
--- a/test/unit/math/opencl/rev/cols_test.cpp
+++ b/test/unit/math/opencl/rev/cols_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, cols_rev) {
   using stan::math::cols;
diff --git a/test/unit/math/opencl/rev/copy_test.cpp b/test/unit/math/opencl/rev/copy_test.cpp
index f5fa1f855f7..a38e97b54c3 100644
--- a/test/unit/math/opencl/rev/copy_test.cpp
+++ b/test/unit/math/opencl/rev/copy_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 #include <vector>
 
 TEST(VariCL, var_matrix_to_matrix_cl) {
diff --git a/test/unit/math/opencl/rev/cumulative_sum_test.cpp b/test/unit/math/opencl/rev/cumulative_sum_test.cpp
index 34734516e59..d384dadebec 100644
--- a/test/unit/math/opencl/rev/cumulative_sum_test.cpp
+++ b/test/unit/math/opencl/rev/cumulative_sum_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto cumulative_sum_functor
     = [](const auto& a) { return stan::math::cumulative_sum(a); };
diff --git a/test/unit/math/opencl/rev/diag_post_multiply_test.cpp b/test/unit/math/opencl/rev/diag_post_multiply_test.cpp
index bb6a2d1ddda..839740fbfc5 100644
--- a/test/unit/math/opencl/rev/diag_post_multiply_test.cpp
+++ b/test/unit/math/opencl/rev/diag_post_multiply_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto diag_post_multiply_functor = [](const auto& a, const auto& b) {
   return stan::math::diag_post_multiply(a, b);
diff --git a/test/unit/math/opencl/rev/diag_pre_multiply_test.cpp b/test/unit/math/opencl/rev/diag_pre_multiply_test.cpp
index 45bcfbe2f44..a2ee2bc7e30 100644
--- a/test/unit/math/opencl/rev/diag_pre_multiply_test.cpp
+++ b/test/unit/math/opencl/rev/diag_pre_multiply_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto diag_pre_multiply_functor = [](const auto& a, const auto& b) {
   return stan::math::diag_pre_multiply(a, b);
diff --git a/test/unit/math/opencl/rev/distance_test.cpp b/test/unit/math/opencl/rev/distance_test.cpp
index badf9953c10..bc112e22904 100644
--- a/test/unit/math/opencl/rev/distance_test.cpp
+++ b/test/unit/math/opencl/rev/distance_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto distance_functor
diff --git a/test/unit/math/opencl/rev/divide_test.cpp b/test/unit/math/opencl/rev/divide_test.cpp
index 716616d1a5a..65146afa0f3 100644
--- a/test/unit/math/opencl/rev/divide_test.cpp
+++ b/test/unit/math/opencl/rev/divide_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto divide_functor
diff --git a/test/unit/math/opencl/rev/double_exponential_cdf_test.cpp b/test/unit/math/opencl/rev/double_exponential_cdf_test.cpp
index fc441df05e9..32467f16524 100644
--- a/test/unit/math/opencl/rev/double_exponential_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/double_exponential_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsDoubleExponentialCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/double_exponential_lccdf_test.cpp b/test/unit/math/opencl/rev/double_exponential_lccdf_test.cpp
index eca87505ee9..809d303be75 100644
--- a/test/unit/math/opencl/rev/double_exponential_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/double_exponential_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsDoubleExponentialLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/double_exponential_lcdf_test.cpp b/test/unit/math/opencl/rev/double_exponential_lcdf_test.cpp
index 6e8f2f57f90..29ac955bb9f 100644
--- a/test/unit/math/opencl/rev/double_exponential_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/double_exponential_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsDoubleExponentialLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/double_exponential_lpdf_test.cpp b/test/unit/math/opencl/rev/double_exponential_lpdf_test.cpp
index a4380a78ce2..eebf73d03b3 100644
--- a/test/unit/math/opencl/rev/double_exponential_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/double_exponential_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsDoubleExponential, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/elt_divide_test.cpp b/test/unit/math/opencl/rev/elt_divide_test.cpp
index df961b901b1..f1d9d5d7139 100644
--- a/test/unit/math/opencl/rev/elt_divide_test.cpp
+++ b/test/unit/math/opencl/rev/elt_divide_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto elt_divide_functor
diff --git a/test/unit/math/opencl/rev/elt_multiply_test.cpp b/test/unit/math/opencl/rev/elt_multiply_test.cpp
index 277d87c1a96..36a4d819072 100644
--- a/test/unit/math/opencl/rev/elt_multiply_test.cpp
+++ b/test/unit/math/opencl/rev/elt_multiply_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto elt_multiply_functor = [](const auto& a, const auto& b) {
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_cdf2_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_cdf2_test.cpp
index 8eff8fe2add..891d3c622bc 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_cdf2_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_cdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_cdf2_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_cdf_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_cdf_test.cpp
index 33c53bb16a7..870018c6201 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_cdf_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lccdf2_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lccdf2_test.cpp
index ecfd3828466..745b46ff5e4 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lccdf2_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lccdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lccdf2_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lccdf3_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lccdf3_test.cpp
index 077719c7d1f..d7fadd00ec5 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lccdf3_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lccdf3_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lccdf3_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lccdf4_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lccdf4_test.cpp
index 6f7437581a6..bf33426317e 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lccdf4_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lccdf4_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lccdf4_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lccdf_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lccdf_test.cpp
index 677ce2a2f89..23b54e8438c 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lccdf_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lcdf2_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lcdf2_test.cpp
index 7ae7f648364..eac9f2998fb 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lcdf2_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lcdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lcdf2_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lcdf3_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lcdf3_test.cpp
index 8cc2d775142..8dca1fec05c 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lcdf3_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lcdf3_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lcdf3_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lcdf4_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lcdf4_test.cpp
index ce4f919769f..bac4fec03c8 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lcdf4_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lcdf4_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lcdf4_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lcdf_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lcdf_test.cpp
index cb7631c0dba..7e459f927e0 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace exp_mod_normal_lcdf_test {
 
diff --git a/test/unit/math/opencl/rev/exp_mod_normal_lpdf_test.cpp b/test/unit/math/opencl/rev/exp_mod_normal_lpdf_test.cpp
index f418e4b68ff..f5ee2f193ad 100644
--- a/test/unit/math/opencl/rev/exp_mod_normal_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/exp_mod_normal_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsExpModNormal, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/exponential_cdf_test.cpp b/test/unit/math/opencl/rev/exponential_cdf_test.cpp
index 405ba03f6a5..915882ecef4 100644
--- a/test/unit/math/opencl/rev/exponential_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/exponential_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsExponentialCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/exponential_lccdf_test.cpp b/test/unit/math/opencl/rev/exponential_lccdf_test.cpp
index 99cea24f1d4..7acf824f8b0 100644
--- a/test/unit/math/opencl/rev/exponential_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/exponential_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsExponentialLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/exponential_lcdf_test.cpp b/test/unit/math/opencl/rev/exponential_lcdf_test.cpp
index 25d47a0248f..ce3e28e5522 100644
--- a/test/unit/math/opencl/rev/exponential_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/exponential_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsExponentialLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/exponential_lpdf_test.cpp b/test/unit/math/opencl/rev/exponential_lpdf_test.cpp
index 01e5671360a..ac54829b700 100644
--- a/test/unit/math/opencl/rev/exponential_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/exponential_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsExponential, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/fdim_test.cpp b/test/unit/math/opencl/rev/fdim_test.cpp
index bae318a090d..7e35731e5c0 100644
--- a/test/unit/math/opencl/rev/fdim_test.cpp
+++ b/test/unit/math/opencl/rev/fdim_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto fdim_functor
diff --git a/test/unit/math/opencl/rev/fmax_test.cpp b/test/unit/math/opencl/rev/fmax_test.cpp
index 881d5c80a2c..fbc13345e59 100644
--- a/test/unit/math/opencl/rev/fmax_test.cpp
+++ b/test/unit/math/opencl/rev/fmax_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto fmax_functor
diff --git a/test/unit/math/opencl/rev/fmin_test.cpp b/test/unit/math/opencl/rev/fmin_test.cpp
index 73fcfecbeaf..a5e5358e60c 100644
--- a/test/unit/math/opencl/rev/fmin_test.cpp
+++ b/test/unit/math/opencl/rev/fmin_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto fmin_functor
diff --git a/test/unit/math/opencl/rev/fmod_test.cpp b/test/unit/math/opencl/rev/fmod_test.cpp
index be169e16f6c..0274e46ae65 100644
--- a/test/unit/math/opencl/rev/fmod_test.cpp
+++ b/test/unit/math/opencl/rev/fmod_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto fmod_functor
diff --git a/test/unit/math/opencl/rev/frechet_cdf_test.cpp b/test/unit/math/opencl/rev/frechet_cdf_test.cpp
index 0fbab3d7f5d..12dc28766e5 100644
--- a/test/unit/math/opencl/rev/frechet_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/frechet_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsFrechetCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/frechet_lccdf_test.cpp b/test/unit/math/opencl/rev/frechet_lccdf_test.cpp
index 36405481bac..a97b023f91e 100644
--- a/test/unit/math/opencl/rev/frechet_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/frechet_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsFrechetLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/frechet_lcdf_test.cpp b/test/unit/math/opencl/rev/frechet_lcdf_test.cpp
index a9ab54e177c..85e24073fd0 100644
--- a/test/unit/math/opencl/rev/frechet_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/frechet_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsFrechetLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/frechet_lpdf_test.cpp b/test/unit/math/opencl/rev/frechet_lpdf_test.cpp
index 01a119a12e8..0b8004318b6 100644
--- a/test/unit/math/opencl/rev/frechet_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/frechet_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsFrechet, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/gamma_lpdf_test.cpp b/test/unit/math/opencl/rev/gamma_lpdf_test.cpp
index 8da53140fd3..410588bac82 100644
--- a/test/unit/math/opencl/rev/gamma_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/gamma_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsGamma, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/gp_dot_product_cov_test.cpp b/test/unit/math/opencl/rev/gp_dot_product_cov_test.cpp
index 673012f2097..33821e53f8a 100644
--- a/test/unit/math/opencl/rev/gp_dot_product_cov_test.cpp
+++ b/test/unit/math/opencl/rev/gp_dot_product_cov_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLRevGpDotProdCov, exceptions) {
   Eigen::VectorXd a(3);
diff --git a/test/unit/math/opencl/rev/grad_test.cpp b/test/unit/math/opencl/rev/grad_test.cpp
index 23d9ee330e7..b2048202ce6 100644
--- a/test/unit/math/opencl/rev/grad_test.cpp
+++ b/test/unit/math/opencl/rev/grad_test.cpp
@@ -1,9 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
-#include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(OpenCLGradTest, exceptions) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/rev/gumbel_cdf_test.cpp b/test/unit/math/opencl/rev/gumbel_cdf_test.cpp
index f65c838f4e6..02104780ddd 100644
--- a/test/unit/math/opencl/rev/gumbel_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/gumbel_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsGumbelCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/gumbel_lccdf_test.cpp b/test/unit/math/opencl/rev/gumbel_lccdf_test.cpp
index 859e48573c9..cd376cdca95 100644
--- a/test/unit/math/opencl/rev/gumbel_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/gumbel_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsGumbelLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/gumbel_lcdf_test.cpp b/test/unit/math/opencl/rev/gumbel_lcdf_test.cpp
index 9340c0b4183..21fe999a008 100644
--- a/test/unit/math/opencl/rev/gumbel_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/gumbel_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsGumbelLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/gumbel_lpdf_test.cpp b/test/unit/math/opencl/rev/gumbel_lpdf_test.cpp
index a4c67778f52..4d699cf9035 100644
--- a/test/unit/math/opencl/rev/gumbel_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/gumbel_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsGumbel, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/head_test.cpp b/test/unit/math/opencl/rev/head_test.cpp
index 5a239dd8584..3d197f85612 100644
--- a/test/unit/math/opencl/rev/head_test.cpp
+++ b/test/unit/math/opencl/rev/head_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixHeadCL, Head_size) {
   using stan::math::head;
diff --git a/test/unit/math/opencl/rev/hypot_test.cpp b/test/unit/math/opencl/rev/hypot_test.cpp
index beeee94c89d..d0376b29331 100644
--- a/test/unit/math/opencl/rev/hypot_test.cpp
+++ b/test/unit/math/opencl/rev/hypot_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto hypot_functor
diff --git a/test/unit/math/opencl/rev/identity_matrix_test.cpp b/test/unit/math/opencl/rev/identity_matrix_test.cpp
index 62ed27b2f18..59cbf790f71 100644
--- a/test/unit/math/opencl/rev/identity_matrix_test.cpp
+++ b/test/unit/math/opencl/rev/identity_matrix_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 
 auto identity_matrix_functorCPU
     = [](int n) { return stan::math::identity_matrix(n); };
diff --git a/test/unit/math/opencl/rev/inv_chi_square_lpdf_test.cpp b/test/unit/math/opencl/rev/inv_chi_square_lpdf_test.cpp
index e0ff451ed13..094331e2dea 100644
--- a/test/unit/math/opencl/rev/inv_chi_square_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/inv_chi_square_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsInvChiSquare, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/inv_gamma_lpdf_test.cpp b/test/unit/math/opencl/rev/inv_gamma_lpdf_test.cpp
index d86600bd966..3d4fb1a5241 100644
--- a/test/unit/math/opencl/rev/inv_gamma_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/inv_gamma_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsInvGamma, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/lbeta_test.cpp b/test/unit/math/opencl/rev/lbeta_test.cpp
index 19aef1a5068..582dd1948d0 100644
--- a/test/unit/math/opencl/rev/lbeta_test.cpp
+++ b/test/unit/math/opencl/rev/lbeta_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto lbeta_functor
     = [](const auto& a, const auto& b) { return stan::math::lbeta(a, b); };
diff --git a/test/unit/math/opencl/rev/ldexp_test.cpp b/test/unit/math/opencl/rev/ldexp_test.cpp
index 5b4c827c085..767f50f29e1 100644
--- a/test/unit/math/opencl/rev/ldexp_test.cpp
+++ b/test/unit/math/opencl/rev/ldexp_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto ldexp_functor
     = [](const auto& a, const auto& b) { return stan::math::ldexp(a, b); };
diff --git a/test/unit/math/opencl/rev/lmultiply_test.cpp b/test/unit/math/opencl/rev/lmultiply_test.cpp
index 4b33550e272..adf2d349004 100644
--- a/test/unit/math/opencl/rev/lmultiply_test.cpp
+++ b/test/unit/math/opencl/rev/lmultiply_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto lmultiply_functor
diff --git a/test/unit/math/opencl/rev/log_diff_exp_test.cpp b/test/unit/math/opencl/rev/log_diff_exp_test.cpp
index 9f1c01016ba..a1a5053b699 100644
--- a/test/unit/math/opencl/rev/log_diff_exp_test.cpp
+++ b/test/unit/math/opencl/rev/log_diff_exp_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto log_diff_exp_functor = [](const auto& a, const auto& b) {
diff --git a/test/unit/math/opencl/rev/log_inv_logit_diff_test.cpp b/test/unit/math/opencl/rev/log_inv_logit_diff_test.cpp
index b8df60796da..476426af05a 100644
--- a/test/unit/math/opencl/rev/log_inv_logit_diff_test.cpp
+++ b/test/unit/math/opencl/rev/log_inv_logit_diff_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto log_inv_logit_diff_functor = [](const auto& a, const auto& b) {
diff --git a/test/unit/math/opencl/rev/logistic_cdf_test.cpp b/test/unit/math/opencl/rev/logistic_cdf_test.cpp
index f279c45691e..dcb7ca616d1 100644
--- a/test/unit/math/opencl/rev/logistic_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/logistic_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLogisticCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/logistic_lccdf_test.cpp b/test/unit/math/opencl/rev/logistic_lccdf_test.cpp
index 50796ef91b6..267041a1bf3 100644
--- a/test/unit/math/opencl/rev/logistic_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/logistic_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLogisticLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/logistic_lcdf_test.cpp b/test/unit/math/opencl/rev/logistic_lcdf_test.cpp
index c3cb1cc9d4e..a456064ffb3 100644
--- a/test/unit/math/opencl/rev/logistic_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/logistic_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLogisticLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/logistic_lpdf_test.cpp b/test/unit/math/opencl/rev/logistic_lpdf_test.cpp
index 44cc923c6ea..f9d981a52f6 100644
--- a/test/unit/math/opencl/rev/logistic_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/logistic_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLogistic, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/lognormal_cdf_test.cpp b/test/unit/math/opencl/rev/lognormal_cdf_test.cpp
index bb45cc07d4a..432b16facaa 100644
--- a/test/unit/math/opencl/rev/lognormal_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/lognormal_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLognormalCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/lognormal_lccdf_test.cpp b/test/unit/math/opencl/rev/lognormal_lccdf_test.cpp
index 324864b55c3..f8271f1f874 100644
--- a/test/unit/math/opencl/rev/lognormal_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/lognormal_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLognormalLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/lognormal_lcdf_test.cpp b/test/unit/math/opencl/rev/lognormal_lcdf_test.cpp
index b3c9163b015..d7b969c60f7 100644
--- a/test/unit/math/opencl/rev/lognormal_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/lognormal_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLognormalLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/lognormal_lpdf_test.cpp b/test/unit/math/opencl/rev/lognormal_lpdf_test.cpp
index b3c0bdbd490..f1b8dfabf20 100644
--- a/test/unit/math/opencl/rev/lognormal_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/lognormal_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsLognormal, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/mdivide_left_tri_low_test.cpp b/test/unit/math/opencl/rev/mdivide_left_tri_low_test.cpp
index 269defe648c..eec7f01d840 100644
--- a/test/unit/math/opencl/rev/mdivide_left_tri_low_test.cpp
+++ b/test/unit/math/opencl/rev/mdivide_left_tri_low_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto mdivide_left_tri_low_functor1 = [](const auto& a, const auto& b) {
   return stan::math::mdivide_left_tri_low(a, b);
diff --git a/test/unit/math/opencl/rev/mdivide_right_tri_low_test.cpp b/test/unit/math/opencl/rev/mdivide_right_tri_low_test.cpp
index 0e1170dc757..f4d65d73266 100644
--- a/test/unit/math/opencl/rev/mdivide_right_tri_low_test.cpp
+++ b/test/unit/math/opencl/rev/mdivide_right_tri_low_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto mdivide_right_tri_low_functor = [](const auto& a, const auto& b) {
   return stan::math::mdivide_right_tri_low(a, b);
diff --git a/test/unit/math/opencl/rev/multiply_log_test.cpp b/test/unit/math/opencl/rev/multiply_log_test.cpp
index c5b9c25734f..5d279832b96 100644
--- a/test/unit/math/opencl/rev/multiply_log_test.cpp
+++ b/test/unit/math/opencl/rev/multiply_log_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto multiply_log_functor = [](const auto& a, const auto& b) {
diff --git a/test/unit/math/opencl/rev/multiply_test.cpp b/test/unit/math/opencl/rev/multiply_test.cpp
index 35bb68fdcdd..bc977576bb6 100644
--- a/test/unit/math/opencl/rev/multiply_test.cpp
+++ b/test/unit/math/opencl/rev/multiply_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto matrix_multiply_functor
diff --git a/test/unit/math/opencl/rev/normal_cdf_test.cpp b/test/unit/math/opencl/rev/normal_cdf_test.cpp
index 640e5f181b7..3cd028845a1 100644
--- a/test/unit/math/opencl/rev/normal_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/normal_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsNormalCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/normal_lccdf_test.cpp b/test/unit/math/opencl/rev/normal_lccdf_test.cpp
index e03341403ed..24646af55f5 100644
--- a/test/unit/math/opencl/rev/normal_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/normal_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsNormalLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/normal_lcdf_test.cpp b/test/unit/math/opencl/rev/normal_lcdf_test.cpp
index e264c5e1d9c..ccf847ee44f 100644
--- a/test/unit/math/opencl/rev/normal_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/normal_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsNormalLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/normal_lpdf_test.cpp b/test/unit/math/opencl/rev/normal_lpdf_test.cpp
index 0a8df483c48..57471e96427 100644
--- a/test/unit/math/opencl/rev/normal_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/normal_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsNormal, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/num_elements_test.cpp b/test/unit/math/opencl/rev/num_elements_test.cpp
index 9e23bba21e1..a6ab439eb06 100644
--- a/test/unit/math/opencl/rev/num_elements_test.cpp
+++ b/test/unit/math/opencl/rev/num_elements_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, num_elements_rev) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/rev/pareto_cdf_test.cpp b/test/unit/math/opencl/rev/pareto_cdf_test.cpp
index 89e7fcd3f8b..f5d11f865cf 100644
--- a/test/unit/math/opencl/rev/pareto_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_lccdf_test.cpp b/test/unit/math/opencl/rev/pareto_lccdf_test.cpp
index 64efae248b9..5f4d288937a 100644
--- a/test/unit/math/opencl/rev/pareto_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_lcdf_test.cpp b/test/unit/math/opencl/rev/pareto_lcdf_test.cpp
index 24c158cea90..15b666b691a 100644
--- a/test/unit/math/opencl/rev/pareto_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_lpdf_test.cpp b/test/unit/math/opencl/rev/pareto_lpdf_test.cpp
index 1ab39a71093..13bf71843c4 100644
--- a/test/unit/math/opencl/rev/pareto_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsPareto, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_type_2_cdf_test.cpp b/test/unit/math/opencl/rev/pareto_type_2_cdf_test.cpp
index e3bc404da15..5e71c838cab 100644
--- a/test/unit/math/opencl/rev/pareto_type_2_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_type_2_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoType2Cdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_type_2_lccdf_test.cpp b/test/unit/math/opencl/rev/pareto_type_2_lccdf_test.cpp
index fa71fc0cc8f..75445c52f41 100644
--- a/test/unit/math/opencl/rev/pareto_type_2_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_type_2_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoType2Lccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_type_2_lcdf_test.cpp b/test/unit/math/opencl/rev/pareto_type_2_lcdf_test.cpp
index 2242c01a8bc..f2a6067266a 100644
--- a/test/unit/math/opencl/rev/pareto_type_2_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_type_2_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoType2Lcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pareto_type_2_lpdf_test.cpp b/test/unit/math/opencl/rev/pareto_type_2_lpdf_test.cpp
index af5dce76eeb..0ea62128fa8 100644
--- a/test/unit/math/opencl/rev/pareto_type_2_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/pareto_type_2_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsParetoType2, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/pow_test.cpp b/test/unit/math/opencl/rev/pow_test.cpp
index 0f4e4f57fb8..268e5738b8c 100644
--- a/test/unit/math/opencl/rev/pow_test.cpp
+++ b/test/unit/math/opencl/rev/pow_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto pow_functor
diff --git a/test/unit/math/opencl/rev/rayleigh_cdf_test.cpp b/test/unit/math/opencl/rev/rayleigh_cdf_test.cpp
index 7db4882d0b8..b2524db6ccf 100644
--- a/test/unit/math/opencl/rev/rayleigh_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/rayleigh_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsRayleighCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/rayleigh_lccdf_test.cpp b/test/unit/math/opencl/rev/rayleigh_lccdf_test.cpp
index 4ab1ea7384d..890b89ffa33 100644
--- a/test/unit/math/opencl/rev/rayleigh_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/rayleigh_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsRayleighLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/rayleigh_lcdf_test.cpp b/test/unit/math/opencl/rev/rayleigh_lcdf_test.cpp
index 713b5639fb4..b8f6e629a71 100644
--- a/test/unit/math/opencl/rev/rayleigh_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/rayleigh_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsRayleighLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/rayleigh_lpdf_test.cpp b/test/unit/math/opencl/rev/rayleigh_lpdf_test.cpp
index 93460840c2f..57c90ff549f 100644
--- a/test/unit/math/opencl/rev/rayleigh_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/rayleigh_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsRayleigh, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/rep_array_test.cpp b/test/unit/math/opencl/rev/rep_array_test.cpp
index 47174acd9bc..80de14226d4 100644
--- a/test/unit/math/opencl/rev/rep_array_test.cpp
+++ b/test/unit/math/opencl/rev/rep_array_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 
 auto rep_array_functorCPU
     = [](const auto& a, int n) { return stan::math::rep_array(a, n); };
diff --git a/test/unit/math/opencl/rev/rep_row_vector_test.cpp b/test/unit/math/opencl/rev/rep_row_vector_test.cpp
index a1be849be38..2a5c6c94440 100644
--- a/test/unit/math/opencl/rev/rep_row_vector_test.cpp
+++ b/test/unit/math/opencl/rev/rep_row_vector_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 
 auto rep_row_vector_functorCPU
     = [](const auto& a, int n) { return stan::math::rep_row_vector(a, n); };
diff --git a/test/unit/math/opencl/rev/rep_vector_test.cpp b/test/unit/math/opencl/rev/rep_vector_test.cpp
index b0af2fc4fe3..ff448613335 100644
--- a/test/unit/math/opencl/rev/rep_vector_test.cpp
+++ b/test/unit/math/opencl/rev/rep_vector_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 
 auto rep_vector_functorCPU
     = [](const auto& a, int n) { return stan::math::rep_vector(a, n); };
diff --git a/test/unit/math/opencl/rev/row_test.cpp b/test/unit/math/opencl/rev/row_test.cpp
index 253160f8b0b..3d45605818b 100644
--- a/test/unit/math/opencl/rev/row_test.cpp
+++ b/test/unit/math/opencl/rev/row_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixRevCL, row_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/rows_test.cpp b/test/unit/math/opencl/rev/rows_test.cpp
index b6ac76ef191..d986d931726 100644
--- a/test/unit/math/opencl/rev/rows_test.cpp
+++ b/test/unit/math/opencl/rev/rows_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, rows_rev) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/rev/scaled_inv_chi_square_lpdf_test.cpp b/test/unit/math/opencl/rev/scaled_inv_chi_square_lpdf_test.cpp
index 90bafb1a806..f0beb5d6cb9 100644
--- a/test/unit/math/opencl/rev/scaled_inv_chi_square_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/scaled_inv_chi_square_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsScaledInvChiSquare, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/segment_test.cpp b/test/unit/math/opencl/rev/segment_test.cpp
index 8f78952a071..83e903782a3 100644
--- a/test/unit/math/opencl/rev/segment_test.cpp
+++ b/test/unit/math/opencl/rev/segment_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, segment_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/size_test.cpp b/test/unit/math/opencl/rev/size_test.cpp
index f831360d291..5d26727bf6e 100644
--- a/test/unit/math/opencl/rev/size_test.cpp
+++ b/test/unit/math/opencl/rev/size_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, size_rev) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_cdf2_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_cdf2_test.cpp
index 2aebe0edfa0..7f0ba38b92d 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_cdf2_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_cdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_cdf2_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_cdf_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_cdf_test.cpp
index 7d82bffb838..d83be47c99a 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_cdf_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_lccdf2_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_lccdf2_test.cpp
index 595e04c8282..fce67dc3801 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_lccdf2_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_lccdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_lccdf2_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_lccdf_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_lccdf_test.cpp
index 0628af47960..8748a122233 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_lccdf_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_lcdf2_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_lcdf2_test.cpp
index 0c453019371..581999c8ce2 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_lcdf2_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_lcdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_cdf2_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_lcdf_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_lcdf_test.cpp
index c8b5a250856..955f8e578f8 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 namespace skew_double_exponential_lcdf_test {
 
diff --git a/test/unit/math/opencl/rev/skew_double_exponential_lpdf_test.cpp b/test/unit/math/opencl/rev/skew_double_exponential_lpdf_test.cpp
index 6b1d49c31f6..ed619db9b39 100644
--- a/test/unit/math/opencl/rev/skew_double_exponential_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/skew_double_exponential_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsSkewDoubleExponential, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/skew_normal_lpdf_test.cpp b/test/unit/math/opencl/rev/skew_normal_lpdf_test.cpp
index 4e60315ee71..5ef8f2c5142 100644
--- a/test/unit/math/opencl/rev/skew_normal_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/skew_normal_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsSkewNormal, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/squared_distance_test.cpp b/test/unit/math/opencl/rev/squared_distance_test.cpp
index 365918fef79..d995f7ddc2c 100644
--- a/test/unit/math/opencl/rev/squared_distance_test.cpp
+++ b/test/unit/math/opencl/rev/squared_distance_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 auto squared_distance_functor = [](const auto& a, const auto& b) {
diff --git a/test/unit/math/opencl/rev/std_normal_cdf_test.cpp b/test/unit/math/opencl/rev/std_normal_cdf_test.cpp
index 1bf3edff524..4d5653bae37 100644
--- a/test/unit/math/opencl/rev/std_normal_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/std_normal_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsStdNormalCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/std_normal_lccdf_test.cpp b/test/unit/math/opencl/rev/std_normal_lccdf_test.cpp
index b261a062258..4bbb9226907 100644
--- a/test/unit/math/opencl/rev/std_normal_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/std_normal_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsStdNormalLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/std_normal_lcdf_test.cpp b/test/unit/math/opencl/rev/std_normal_lcdf_test.cpp
index 52f3562c6fe..b149d6cce0e 100644
--- a/test/unit/math/opencl/rev/std_normal_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/std_normal_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsStdNormalLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/std_normal_lpdf_test.cpp b/test/unit/math/opencl/rev/std_normal_lpdf_test.cpp
index 7f8fcea56bd..15775555df4 100644
--- a/test/unit/math/opencl/rev/std_normal_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/std_normal_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsStdNormal, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/student_t_lpdf2_test.cpp b/test/unit/math/opencl/rev/student_t_lpdf2_test.cpp
index 02a17b79d57..ca2a4dd2efb 100644
--- a/test/unit/math/opencl/rev/student_t_lpdf2_test.cpp
+++ b/test/unit/math/opencl/rev/student_t_lpdf2_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 auto student_t_lpdf2_functor
     = [](const auto& y, const auto& nu, const auto& mu, const auto& sigma) {
diff --git a/test/unit/math/opencl/rev/student_t_lpdf_test.cpp b/test/unit/math/opencl/rev/student_t_lpdf_test.cpp
index 886f9687735..14b2d367d42 100644
--- a/test/unit/math/opencl/rev/student_t_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/student_t_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsStudentT, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/sub_col_test.cpp b/test/unit/math/opencl/rev/sub_col_test.cpp
index 9c1a481b98a..aa6b2f75295 100644
--- a/test/unit/math/opencl/rev/sub_col_test.cpp
+++ b/test/unit/math/opencl/rev/sub_col_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, sub_col_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/sub_row_test.cpp b/test/unit/math/opencl/rev/sub_row_test.cpp
index 7c67abfcecc..8f119deca6a 100644
--- a/test/unit/math/opencl/rev/sub_row_test.cpp
+++ b/test/unit/math/opencl/rev/sub_row_test.cpp
@@ -1,10 +1,8 @@
 #ifdef STAN_OPENCL
 #include <stan/math/opencl/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <stan/math/prim/fun/typedefs.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixCL, sub_row_exception) {
   stan::math::matrix_cl<double> m1_cl(3, 3);
diff --git a/test/unit/math/opencl/rev/subtract_test.cpp b/test/unit/math/opencl/rev/subtract_test.cpp
index ea3dec339e2..ba91f69fb4e 100644
--- a/test/unit/math/opencl/rev/subtract_test.cpp
+++ b/test/unit/math/opencl/rev/subtract_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 auto subtract_functor = [](const auto& a, const auto& b) {
   return stan::math::subtract(a, b).eval();
diff --git a/test/unit/math/opencl/rev/tail_test.cpp b/test/unit/math/opencl/rev/tail_test.cpp
index c88a76531b7..e71ee04c4d4 100644
--- a/test/unit/math/opencl/rev/tail_test.cpp
+++ b/test/unit/math/opencl/rev/tail_test.cpp
@@ -1,9 +1,7 @@
 #ifdef STAN_OPENCL
 #include <stan/math/rev.hpp>
 #include <test/unit/math/opencl/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixTailCL, tail_size) {
   using stan::math::matrix_cl;
diff --git a/test/unit/math/opencl/rev/uniform_cdf_test.cpp b/test/unit/math/opencl/rev/uniform_cdf_test.cpp
index 262e6985897..4ef61cbc0c4 100644
--- a/test/unit/math/opencl/rev/uniform_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/uniform_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsUniformCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/uniform_lccdf_test.cpp b/test/unit/math/opencl/rev/uniform_lccdf_test.cpp
index bed3d490b85..9da6297915e 100644
--- a/test/unit/math/opencl/rev/uniform_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/uniform_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsUniformLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/uniform_lcdf_test.cpp b/test/unit/math/opencl/rev/uniform_lcdf_test.cpp
index 5e028cb777e..c5f4a8c04df 100644
--- a/test/unit/math/opencl/rev/uniform_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/uniform_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsUniformLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/uniform_lpdf_test.cpp b/test/unit/math/opencl/rev/uniform_lpdf_test.cpp
index 8f58bf84d32..44d030a1f04 100644
--- a/test/unit/math/opencl/rev/uniform_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/uniform_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsUniform, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/weibull_cdf_test.cpp b/test/unit/math/opencl/rev/weibull_cdf_test.cpp
index c8c6fe620c4..512e5f7163c 100644
--- a/test/unit/math/opencl/rev/weibull_cdf_test.cpp
+++ b/test/unit/math/opencl/rev/weibull_cdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsWeibullCdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/weibull_lccdf_test.cpp b/test/unit/math/opencl/rev/weibull_lccdf_test.cpp
index bf845190153..64d0f640301 100644
--- a/test/unit/math/opencl/rev/weibull_lccdf_test.cpp
+++ b/test/unit/math/opencl/rev/weibull_lccdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsWeibullLccdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/weibull_lcdf_test.cpp b/test/unit/math/opencl/rev/weibull_lcdf_test.cpp
index 4f0b1b89b63..00c36588eb5 100644
--- a/test/unit/math/opencl/rev/weibull_lcdf_test.cpp
+++ b/test/unit/math/opencl/rev/weibull_lcdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsWeibullLcdf, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/rev/weibull_lpdf_test.cpp b/test/unit/math/opencl/rev/weibull_lpdf_test.cpp
index c6c4e13ab69..b23534bf133 100644
--- a/test/unit/math/opencl/rev/weibull_lpdf_test.cpp
+++ b/test/unit/math/opencl/rev/weibull_lpdf_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/opencl/util.hpp>
-#include <vector>
 
 TEST(ProbDistributionsWeibull, error_checking) {
   int N = 3;
diff --git a/test/unit/math/opencl/tri_inverse_test.cpp b/test/unit/math/opencl/tri_inverse_test.cpp
index 98c36794892..9e6656880a8 100644
--- a/test/unit/math/opencl/tri_inverse_test.cpp
+++ b/test/unit/math/opencl/tri_inverse_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_OPENCL
 #include <stan/math/prim.hpp>
 #include <stan/math/opencl/prim.hpp>
-#include <test/unit/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <algorithm>
diff --git a/test/unit/math/opencl/zeros_strict_tri_test.cpp b/test/unit/math/opencl/zeros_strict_tri_test.cpp
index 367ce66f693..7b7a50aa042 100644
--- a/test/unit/math/opencl/zeros_strict_tri_test.cpp
+++ b/test/unit/math/opencl/zeros_strict_tri_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/opencl/copy.hpp>
 #include <stan/math/opencl/matrix_cl.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 
 TEST(MathMatrixCL, zeros_strict_m_value_check) {
   stan::math::matrix_d m0(2, 2);
diff --git a/test/unit/math/prim/constraint/cholesky_corr_transform_test.cpp b/test/unit/math/prim/constraint/cholesky_corr_transform_test.cpp
index 5644fcb446c..8fac692d6cc 100644
--- a/test/unit/math/prim/constraint/cholesky_corr_transform_test.cpp
+++ b/test/unit/math/prim/constraint/cholesky_corr_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(ProbTransform, CholeskyCorrelation4) {
diff --git a/test/unit/math/prim/constraint/cholesky_factor_transform_test.cpp b/test/unit/math/prim/constraint/cholesky_factor_transform_test.cpp
index 9605f40ae75..603865650ff 100644
--- a/test/unit/math/prim/constraint/cholesky_factor_transform_test.cpp
+++ b/test/unit/math/prim/constraint/cholesky_factor_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(ProbTransform, choleskyFactor) {
diff --git a/test/unit/math/prim/constraint/corr_transform_test.cpp b/test/unit/math/prim/constraint/corr_transform_test.cpp
index be15cc26b5f..5278107e595 100644
--- a/test/unit/math/prim/constraint/corr_transform_test.cpp
+++ b/test/unit/math/prim/constraint/corr_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(prob_transform, corr) {
diff --git a/test/unit/math/prim/constraint/identity_transform_test.cpp b/test/unit/math/prim/constraint/identity_transform_test.cpp
index 16193a7629d..d5fc6bb5060 100644
--- a/test/unit/math/prim/constraint/identity_transform_test.cpp
+++ b/test/unit/math/prim/constraint/identity_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(prob_transform, identity) {
diff --git a/test/unit/math/prim/constraint/lb_transform_test.cpp b/test/unit/math/prim/constraint/lb_transform_test.cpp
index e9322306878..ed86866b1ab 100644
--- a/test/unit/math/prim/constraint/lb_transform_test.cpp
+++ b/test/unit/math/prim/constraint/lb_transform_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(prob_transform, lb_constrain) {
   double x = -1.0;
diff --git a/test/unit/math/prim/constraint/lub_transform_test.cpp b/test/unit/math/prim/constraint/lub_transform_test.cpp
index 3f47378dce3..9c7b98d5cb9 100644
--- a/test/unit/math/prim/constraint/lub_transform_test.cpp
+++ b/test/unit/math/prim/constraint/lub_transform_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(prob_transform, lub) {
   EXPECT_FLOAT_EQ(2.0 + (5.0 - 2.0) * stan::math::inv_logit(-1.0),
diff --git a/test/unit/math/prim/constraint/offset_multiplier_transform_test.cpp b/test/unit/math/prim/constraint/offset_multiplier_transform_test.cpp
index 1139d77ac34..aaea0299016 100644
--- a/test/unit/math/prim/constraint/offset_multiplier_transform_test.cpp
+++ b/test/unit/math/prim/constraint/offset_multiplier_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 
diff --git a/test/unit/math/prim/constraint/prob_transform_test.cpp b/test/unit/math/prim/constraint/prob_transform_test.cpp
index 94e08a17154..198ca662425 100644
--- a/test/unit/math/prim/constraint/prob_transform_test.cpp
+++ b/test/unit/math/prim/constraint/prob_transform_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(prob_transform, prob) {
   EXPECT_FLOAT_EQ(stan::math::inv_logit(-1.0),
diff --git a/test/unit/math/prim/constraint/ub_transform_test.cpp b/test/unit/math/prim/constraint/ub_transform_test.cpp
index b2ef4bb2bbd..888dc0e9be2 100644
--- a/test/unit/math/prim/constraint/ub_transform_test.cpp
+++ b/test/unit/math/prim/constraint/ub_transform_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(prob_transform, ub_constrain) {
   double x = -1.0;
diff --git a/test/unit/math/prim/constraint/unit_vector_transform_test.cpp b/test/unit/math/prim/constraint/unit_vector_transform_test.cpp
index 4bf5a3957bf..8513acc8b12 100644
--- a/test/unit/math/prim/constraint/unit_vector_transform_test.cpp
+++ b/test/unit/math/prim/constraint/unit_vector_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 
diff --git a/test/unit/math/prim/core/init_threadpool_tbb_late_test.cpp b/test/unit/math/prim/core/init_threadpool_tbb_late_test.cpp
index 4cefd6b96c0..76fe39e1a57 100644
--- a/test/unit/math/prim/core/init_threadpool_tbb_late_test.cpp
+++ b/test/unit/math/prim/core/init_threadpool_tbb_late_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim/core.hpp>
 
-#include <test/unit/util.hpp>
 #include <test/unit/math/prim/functor/utils_threads.hpp>
 #include <tbb/task_arena.h>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/prim/core/init_threadpool_tbb_test.cpp b/test/unit/math/prim/core/init_threadpool_tbb_test.cpp
index b20adbf2e2e..497bffcf3a8 100644
--- a/test/unit/math/prim/core/init_threadpool_tbb_test.cpp
+++ b/test/unit/math/prim/core/init_threadpool_tbb_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim/core.hpp>
 
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <test/unit/math/prim/functor/utils_threads.hpp>
 
 TEST(intel_tbb_new_init, check_status) {
diff --git a/test/unit/math/prim/err/check_consistent_sizes_mvt_test.cpp b/test/unit/math/prim/err/check_consistent_sizes_mvt_test.cpp
index 38ffd05b6a4..e0a043ec475 100644
--- a/test/unit/math/prim/err/check_consistent_sizes_mvt_test.cpp
+++ b/test/unit/math/prim/err/check_consistent_sizes_mvt_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <vector>
 
 TEST(checkConsistentSizesMvt, checkConsistentSizesMvt) {
diff --git a/test/unit/math/prim/err/check_multiplicable_test.cpp b/test/unit/math/prim/err/check_multiplicable_test.cpp
index 59317459453..d422255a918 100644
--- a/test/unit/math/prim/err/check_multiplicable_test.cpp
+++ b/test/unit/math/prim/err/check_multiplicable_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <iostream>
 #include <limits>
 
 TEST(ErrorHandlingMatrix, checkMultiplicableMatrix) {
diff --git a/test/unit/math/prim/err/check_sum_to_zero_test.cpp b/test/unit/math/prim/err/check_sum_to_zero_test.cpp
index 1e6ad716a81..bab3676f745 100644
--- a/test/unit/math/prim/err/check_sum_to_zero_test.cpp
+++ b/test/unit/math/prim/err/check_sum_to_zero_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <limits>
 #include <string>
 
diff --git a/test/unit/math/prim/err/elementwise_check_test.cpp b/test/unit/math/prim/err/elementwise_check_test.cpp
index 377e7cdb1bc..f3e768c4758 100644
--- a/test/unit/math/prim/err/elementwise_check_test.cpp
+++ b/test/unit/math/prim/err/elementwise_check_test.cpp
@@ -2,7 +2,6 @@
 #include <stan/math/prim.hpp>
 #include <stan/math/prim/fun/is_nan.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 namespace elementwise_check_test {
diff --git a/test/unit/math/prim/err/is_matching_dims_test.cpp b/test/unit/math/prim/err/is_matching_dims_test.cpp
index dfb2fe90ec7..dd01099364a 100644
--- a/test/unit/math/prim/err/is_matching_dims_test.cpp
+++ b/test/unit/math/prim/err/is_matching_dims_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <limits>
 
 TEST(ErrorHandlingMatrix, isMatchingDimsMatrix) {
diff --git a/test/unit/math/prim/err/is_matching_size_test.cpp b/test/unit/math/prim/err/is_matching_size_test.cpp
index 76008f8feb4..768c769c56d 100644
--- a/test/unit/math/prim/err/is_matching_size_test.cpp
+++ b/test/unit/math/prim/err/is_matching_size_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(ErrorHandling, isMatchingSize) {
diff --git a/test/unit/math/prim/err/is_nonzero_size_test.cpp b/test/unit/math/prim/err/is_nonzero_size_test.cpp
index 2bd115f1205..4106f1acd17 100644
--- a/test/unit/math/prim/err/is_nonzero_size_test.cpp
+++ b/test/unit/math/prim/err/is_nonzero_size_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/prim/err/is_pos_definite_test.cpp b/test/unit/math/prim/err/is_pos_definite_test.cpp
index 6dc4df1ebb8..73e49f2cd02 100644
--- a/test/unit/math/prim/err/is_pos_definite_test.cpp
+++ b/test/unit/math/prim/err/is_pos_definite_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <limits>
 
 class ErrorHandlingMatrixIsPosDef : public ::testing::Test {
diff --git a/test/unit/math/prim/err/is_size_match_test.cpp b/test/unit/math/prim/err/is_size_match_test.cpp
index 6bf59c7d8b3..3eaff79eb99 100644
--- a/test/unit/math/prim/err/is_size_match_test.cpp
+++ b/test/unit/math/prim/err/is_size_match_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 
 TEST(ErrorHandlingMatrix, is_size_match) {
   using stan::math::is_size_match;
diff --git a/test/unit/math/prim/err/is_unit_vector_test.cpp b/test/unit/math/prim/err/is_unit_vector_test.cpp
index 22c901f1191..592f6460cf3 100644
--- a/test/unit/math/prim/err/is_unit_vector_test.cpp
+++ b/test/unit/math/prim/err/is_unit_vector_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <limits>
 
 TEST(ErrorHandlingMatrix, isUnitVector) {
diff --git a/test/unit/math/prim/err/validate_non_negative_index_test.cpp b/test/unit/math/prim/err/validate_non_negative_index_test.cpp
index 0ce7df64e7d..d41ef096ad9 100644
--- a/test/unit/math/prim/err/validate_non_negative_index_test.cpp
+++ b/test/unit/math/prim/err/validate_non_negative_index_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(ErrorHandling, validate_non_negative_index) {
   EXPECT_THROW(stan::math::validate_non_negative_index("unit_vector", "x", -5),
diff --git a/test/unit/math/prim/err/validate_positive_index_test.cpp b/test/unit/math/prim/err/validate_positive_index_test.cpp
index 76c9620698f..3b018f52838 100644
--- a/test/unit/math/prim/err/validate_positive_index_test.cpp
+++ b/test/unit/math/prim/err/validate_positive_index_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(ErrorHandling, validate_positive_index) {
   EXPECT_THROW(stan::math::validate_positive_index("unit_vector", "x", -1),
diff --git a/test/unit/math/prim/err/validate_unit_vector_index_test.cpp b/test/unit/math/prim/err/validate_unit_vector_index_test.cpp
index 06a862255dd..b51b85fc7c9 100644
--- a/test/unit/math/prim/err/validate_unit_vector_index_test.cpp
+++ b/test/unit/math/prim/err/validate_unit_vector_index_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST(ErrorHandling, validate_unit_vector_index) {
   EXPECT_THROW(stan::math::validate_unit_vector_index("unit_vector", "x", 0),
diff --git a/test/unit/math/prim/fun/add_diag_test.cpp b/test/unit/math/prim/fun/add_diag_test.cpp
index 426694db04f..b6a9ad4a9a8 100644
--- a/test/unit/math/prim/fun/add_diag_test.cpp
+++ b/test/unit/math/prim/fun/add_diag_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 #include <stan/math/prim.hpp>
-#include <limits>
 #include <string>
-#include <vector>
 
 TEST(MathPrimMat, zero_sizes_add_diag) {
   Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic> mat(0, 0);
diff --git a/test/unit/math/prim/fun/all_test.cpp b/test/unit/math/prim/fun/all_test.cpp
index bae7f5b0de8..dad39278a2f 100644
--- a/test/unit/math/prim/fun/all_test.cpp
+++ b/test/unit/math/prim/fun/all_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 #include <vector>
 
 TEST(MathFunctions, all) {
diff --git a/test/unit/math/prim/fun/any_test.cpp b/test/unit/math/prim/fun/any_test.cpp
index e7d0dc42cc8..f371c306a01 100644
--- a/test/unit/math/prim/fun/any_test.cpp
+++ b/test/unit/math/prim/fun/any_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 
 TEST(MathFunctions, any) {
   using stan::math::any;
diff --git a/test/unit/math/prim/fun/asinh_test.cpp b/test/unit/math/prim/fun/asinh_test.cpp
index 151afc2b3ef..af95c59eb14 100644
--- a/test/unit/math/prim/fun/asinh_test.cpp
+++ b/test/unit/math/prim/fun/asinh_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, asinh) {
   using stan::math::asinh;
diff --git a/test/unit/math/prim/fun/assign_test.cpp b/test/unit/math/prim/fun/assign_test.cpp
index be85d0f4924..faa0764321e 100644
--- a/test/unit/math/prim/fun/assign_test.cpp
+++ b/test/unit/math/prim/fun/assign_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <sstream>
 #include <stdexcept>
diff --git a/test/unit/math/prim/fun/autocorrelation_test.cpp b/test/unit/math/prim/fun/autocorrelation_test.cpp
index f06a0366ac6..80545a298b9 100644
--- a/test/unit/math/prim/fun/autocorrelation_test.cpp
+++ b/test/unit/math/prim/fun/autocorrelation_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <fstream>
 #include <vector>
-#include <stdexcept>
 
 TEST(ProbAutocorrelation, test1) {
   // ar1.csv generated in R with
diff --git a/test/unit/math/prim/fun/autocovariance_test.cpp b/test/unit/math/prim/fun/autocovariance_test.cpp
index e91714aa04e..f5c016a9c9a 100644
--- a/test/unit/math/prim/fun/autocovariance_test.cpp
+++ b/test/unit/math/prim/fun/autocovariance_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <fstream>
 #include <vector>
-#include <stdexcept>
 
 TEST(ProbAutocovariance, test1) {
   // ar1.csv generated in R with
diff --git a/test/unit/math/prim/fun/cbrt_test.cpp b/test/unit/math/prim/fun/cbrt_test.cpp
index 2ca66bbde53..ae7123639b9 100644
--- a/test/unit/math/prim/fun/cbrt_test.cpp
+++ b/test/unit/math/prim/fun/cbrt_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, cbrt) {
   using stan::math::cbrt;
diff --git a/test/unit/math/prim/fun/choose_test.cpp b/test/unit/math/prim/fun/choose_test.cpp
index 0630db85065..ddb985ee7e7 100644
--- a/test/unit/math/prim/fun/choose_test.cpp
+++ b/test/unit/math/prim/fun/choose_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/fun/binary_scalar_tester.hpp>
-#include <boost/math/special_functions/binomial.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 
diff --git a/test/unit/math/prim/fun/csr_extract_w_test.cpp b/test/unit/math/prim/fun/csr_extract_w_test.cpp
index a29f420f9fb..c3e49d14670 100644
--- a/test/unit/math/prim/fun/csr_extract_w_test.cpp
+++ b/test/unit/math/prim/fun/csr_extract_w_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 // Test that values from a dense matrix in sparse format are extracted.
 TEST(SparseStuff, csr_extract_w_dense) {
diff --git a/test/unit/math/prim/fun/csr_u_to_z_test.cpp b/test/unit/math/prim/fun/csr_u_to_z_test.cpp
index 5879f8918ad..06ee9b20fef 100644
--- a/test/unit/math/prim/fun/csr_u_to_z_test.cpp
+++ b/test/unit/math/prim/fun/csr_u_to_z_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <exception>
 
 TEST(MathUtoZ, sizeZeroInput) {
   using stan::math::csr_u_to_z;
diff --git a/test/unit/math/prim/fun/divide_columns_test.cpp b/test/unit/math/prim/fun/divide_columns_test.cpp
index 44a55198508..1f4e7e9b3fd 100644
--- a/test/unit/math/prim/fun/divide_columns_test.cpp
+++ b/test/unit/math/prim/fun/divide_columns_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 #include <string>
 #include <vector>
 
diff --git a/test/unit/math/prim/fun/dot_product_test.cpp b/test/unit/math/prim/fun/dot_product_test.cpp
index a398c845ded..25f26ea6742 100644
--- a/test/unit/math/prim/fun/dot_product_test.cpp
+++ b/test/unit/math/prim/fun/dot_product_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 #include <vector>
 
 TEST(MathMatrixPrimMat, dot_product) {
diff --git a/test/unit/math/prim/fun/erf_test.cpp b/test/unit/math/prim/fun/erf_test.cpp
index f01b192b8be..66193874436 100644
--- a/test/unit/math/prim/fun/erf_test.cpp
+++ b/test/unit/math/prim/fun/erf_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, erf) {
   using stan::math::erf;
diff --git a/test/unit/math/prim/fun/erfc_test.cpp b/test/unit/math/prim/fun/erfc_test.cpp
index aad40784135..0518c66caf6 100644
--- a/test/unit/math/prim/fun/erfc_test.cpp
+++ b/test/unit/math/prim/fun/erfc_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, erfc) {
   using stan::math::erfc;
diff --git a/test/unit/math/prim/fun/eval_test.cpp b/test/unit/math/prim/fun/eval_test.cpp
index 148cc2f1e12..858a9a80093 100644
--- a/test/unit/math/prim/fun/eval_test.cpp
+++ b/test/unit/math/prim/fun/eval_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 #include <type_traits>
 #include <vector>
 
diff --git a/test/unit/math/prim/fun/expm1_test.cpp b/test/unit/math/prim/fun/expm1_test.cpp
index 3e35d9873c1..67e5875ce52 100644
--- a/test/unit/math/prim/fun/expm1_test.cpp
+++ b/test/unit/math/prim/fun/expm1_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, expm1) {
   using stan::math::expm1;
diff --git a/test/unit/math/prim/fun/factor_cov_matrix_transform_test.cpp b/test/unit/math/prim/fun/factor_cov_matrix_transform_test.cpp
index 1461e92c145..6920bcdefef 100644
--- a/test/unit/math/prim/fun/factor_cov_matrix_transform_test.cpp
+++ b/test/unit/math/prim/fun/factor_cov_matrix_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(probTransform, factorCovMatrix) {
diff --git a/test/unit/math/prim/fun/grad_2F1_test.cpp b/test/unit/math/prim/fun/grad_2F1_test.cpp
index f2236c04167..e954d8bbcb6 100644
--- a/test/unit/math/prim/fun/grad_2F1_test.cpp
+++ b/test/unit/math/prim/fun/grad_2F1_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math/prim.hpp>
-#include <vector>
 
 TEST(MathPrimScalFun, grad2F1_negative_z) {
   double a1 = 3.70975;
diff --git a/test/unit/math/prim/fun/grad_pFq_test.cpp b/test/unit/math/prim/fun/grad_pFq_test.cpp
index da124aa1a31..5d8d84a2e08 100644
--- a/test/unit/math/prim/fun/grad_pFq_test.cpp
+++ b/test/unit/math/prim/fun/grad_pFq_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST(PrimMath, grad_2F2) {
   using stan::math::grad_pFq;
diff --git a/test/unit/math/prim/fun/grad_reg_lower_inc_gamma_test.cpp b/test/unit/math/prim/fun/grad_reg_lower_inc_gamma_test.cpp
index 6f52eae9851..0381f38bd7f 100644
--- a/test/unit/math/prim/fun/grad_reg_lower_inc_gamma_test.cpp
+++ b/test/unit/math/prim/fun/grad_reg_lower_inc_gamma_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 // NOLINT()
 TEST(PrimScalFun, lower_reg_inc_gamma_accuarcy) {
diff --git a/test/unit/math/prim/fun/hypergeometric_1F0_test.cpp b/test/unit/math/prim/fun/hypergeometric_1F0_test.cpp
index ae935f32145..e72e6ba487f 100644
--- a/test/unit/math/prim/fun/hypergeometric_1F0_test.cpp
+++ b/test/unit/math/prim/fun/hypergeometric_1F0_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 
 TEST(MathFunctions, hypergeometric_1F0Double) {
   using stan::math::hypergeometric_1F0;
diff --git a/test/unit/math/prim/fun/lambert_w_test.cpp b/test/unit/math/prim/fun/lambert_w_test.cpp
index 5736bdd7844..ae9640fe144 100644
--- a/test/unit/math/prim/fun/lambert_w_test.cpp
+++ b/test/unit/math/prim/fun/lambert_w_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <stdexcept>
 
 TEST(MathFunctions, lambert_w) {
   using stan::math::exp;
diff --git a/test/unit/math/prim/fun/linspaced_int_array_test.cpp b/test/unit/math/prim/fun/linspaced_int_array_test.cpp
index f2af610a958..dd3ef873a37 100644
--- a/test/unit/math/prim/fun/linspaced_int_array_test.cpp
+++ b/test/unit/math/prim/fun/linspaced_int_array_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(MathFunctions, linspaced_int_array) {
diff --git a/test/unit/math/prim/fun/lkj_cov_matrix_transform_test.cpp b/test/unit/math/prim/fun/lkj_cov_matrix_transform_test.cpp
index 0cf2cd8a047..d7be01d7240 100644
--- a/test/unit/math/prim/fun/lkj_cov_matrix_transform_test.cpp
+++ b/test/unit/math/prim/fun/lkj_cov_matrix_transform_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 using Eigen::Dynamic;
diff --git a/test/unit/math/prim/fun/log_sum_exp_signed_test.cpp b/test/unit/math/prim/fun/log_sum_exp_signed_test.cpp
index 0ebc710efbf..768babaaf94 100644
--- a/test/unit/math/prim/fun/log_sum_exp_signed_test.cpp
+++ b/test/unit/math/prim/fun/log_sum_exp_signed_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <tuple>
-#include <vector>
 
 TEST(MathFunctions, log_sum_exp_signed) {
   using stan::math::exp;
diff --git a/test/unit/math/prim/fun/matrix_exp_action_handler_test.cpp b/test/unit/math/prim/fun/matrix_exp_action_handler_test.cpp
index 78e0ed48f2f..9ad01a70769 100644
--- a/test/unit/math/prim/fun/matrix_exp_action_handler_test.cpp
+++ b/test/unit/math/prim/fun/matrix_exp_action_handler_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(MathMatrixRevMat, matrix_exp_action_diag) {
   using Eigen::MatrixXd;
diff --git a/test/unit/math/prim/fun/matrix_exp_multiply_test.cpp b/test/unit/math/prim/fun/matrix_exp_multiply_test.cpp
index b81df9f10a2..b24cb694032 100644
--- a/test/unit/math/prim/fun/matrix_exp_multiply_test.cpp
+++ b/test/unit/math/prim/fun/matrix_exp_multiply_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/test/unit/math/prim/fun/max_test.cpp b/test/unit/math/prim/fun/max_test.cpp
index df058555afe..5e082c81afa 100644
--- a/test/unit/math/prim/fun/max_test.cpp
+++ b/test/unit/math/prim/fun/max_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <limits>
-#include <algorithm>
 #include <vector>
 
 TEST(MathMatrixPrimMat, max) {
diff --git a/test/unit/math/prim/fun/min_test.cpp b/test/unit/math/prim/fun/min_test.cpp
index faeef955626..bd3a7ffa594 100644
--- a/test/unit/math/prim/fun/min_test.cpp
+++ b/test/unit/math/prim/fun/min_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <limits>
-#include <algorithm>
 #include <vector>
 
 TEST(MathMatrixPrimMat, min) {
diff --git a/test/unit/math/prim/fun/multiply_test.cpp b/test/unit/math/prim/fun/multiply_test.cpp
index aedf4c2df6f..4bcc0c7ad39 100644
--- a/test/unit/math/prim/fun/multiply_test.cpp
+++ b/test/unit/math/prim/fun/multiply_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST(MathMatrixPrim, multiply_c_v) {
diff --git a/test/unit/math/prim/fun/promote_scalar_type_test.cpp b/test/unit/math/prim/fun/promote_scalar_type_test.cpp
index e28bc0043af..d8860e974ac 100644
--- a/test/unit/math/prim/fun/promote_scalar_type_test.cpp
+++ b/test/unit/math/prim/fun/promote_scalar_type_test.cpp
@@ -1,4 +1,3 @@
-#include <stan/math/prim.hpp>
 #include <test/unit/math/prim/fun/promote_type_test_util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/prim/fun/resize_test.cpp b/test/unit/math/prim/fun/resize_test.cpp
index f2fe785180c..609731d28bd 100644
--- a/test/unit/math/prim/fun/resize_test.cpp
+++ b/test/unit/math/prim/fun/resize_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(MathMatrixPrimMat, resize_double) {
diff --git a/test/unit/math/prim/fun/scale_matrix_exp_multiply_test.cpp b/test/unit/math/prim/fun/scale_matrix_exp_multiply_test.cpp
index cfd75abb990..d63f7115ff0 100644
--- a/test/unit/math/prim/fun/scale_matrix_exp_multiply_test.cpp
+++ b/test/unit/math/prim/fun/scale_matrix_exp_multiply_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 template <int N, int M>
 inline void test_scale_matrix_exp_multiply() {
diff --git a/test/unit/math/prim/fun/select_test.cpp b/test/unit/math/prim/fun/select_test.cpp
index 1086b27e9fc..a1a02931bd4 100644
--- a/test/unit/math/prim/fun/select_test.cpp
+++ b/test/unit/math/prim/fun/select_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
-#include <limits>
 
 TEST(MathFunctions, select_scalar_scalar) {
   using stan::math::select;
diff --git a/test/unit/math/prim/fun/singular_values_test.cpp b/test/unit/math/prim/fun/singular_values_test.cpp
index 125108472e7..5a34ead8ff7 100644
--- a/test/unit/math/prim/fun/singular_values_test.cpp
+++ b/test/unit/math/prim/fun/singular_values_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <stdexcept>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <complex>
 
diff --git a/test/unit/math/prim/fun/sort_test.cpp b/test/unit/math/prim/fun/sort_test.cpp
index a2ca1f10c1e..a0b004d655a 100644
--- a/test/unit/math/prim/fun/sort_test.cpp
+++ b/test/unit/math/prim/fun/sort_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/fun/sort_test_util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
-#include <stdexcept>
 #include <vector>
 
 template <typename T>
diff --git a/test/unit/math/prim/fun/sum_test.cpp b/test/unit/math/prim/fun/sum_test.cpp
index c7742955c36..b383079d14c 100644
--- a/test/unit/math/prim/fun/sum_test.cpp
+++ b/test/unit/math/prim/fun/sum_test.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
-#include <type_traits>
 #include <vector>
 
 TEST(MathFunctions, sumZeroSize) {
diff --git a/test/unit/math/prim/fun/svd_U_test.cpp b/test/unit/math/prim/fun/svd_U_test.cpp
index 008f5f251c5..44765ca2a8e 100644
--- a/test/unit/math/prim/fun/svd_U_test.cpp
+++ b/test/unit/math/prim/fun/svd_U_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <stdexcept>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <complex>
 
diff --git a/test/unit/math/prim/fun/svd_V_test.cpp b/test/unit/math/prim/fun/svd_V_test.cpp
index 1b507e67ec0..5557ef32cc7 100644
--- a/test/unit/math/prim/fun/svd_V_test.cpp
+++ b/test/unit/math/prim/fun/svd_V_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <stdexcept>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <complex>
 
diff --git a/test/unit/math/prim/fun/svd_test.cpp b/test/unit/math/prim/fun/svd_test.cpp
index 97580285cd5..e57738741d7 100644
--- a/test/unit/math/prim/fun/svd_test.cpp
+++ b/test/unit/math/prim/fun/svd_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <stdexcept>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <complex>
 
diff --git a/test/unit/math/prim/fun/tgamma_test.cpp b/test/unit/math/prim/fun/tgamma_test.cpp
index 51e5b84261c..90e0ca966b8 100644
--- a/test/unit/math/prim/fun/tgamma_test.cpp
+++ b/test/unit/math/prim/fun/tgamma_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <boost/math/special_functions/gamma.hpp>
 #include <gtest/gtest.h>
 #include <cmath>
 #include <limits>
diff --git a/test/unit/math/prim/fun/to_array1d_test.cpp b/test/unit/math/prim/fun/to_array1d_test.cpp
index e771b673b7f..613c107e359 100644
--- a/test/unit/math/prim/fun/to_array1d_test.cpp
+++ b/test/unit/math/prim/fun/to_array1d_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <stdexcept>
 
 TEST(MathMatrix, to_array_1d_matrix) {
   using stan::math::to_array_1d;
diff --git a/test/unit/math/prim/fun/to_ref_test.cpp b/test/unit/math/prim/fun/to_ref_test.cpp
index e4c1d2a116a..e7111cfe609 100644
--- a/test/unit/math/prim/fun/to_ref_test.cpp
+++ b/test/unit/math/prim/fun/to_ref_test.cpp
@@ -1,9 +1,7 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <stdexcept>
 namespace {
 
 TEST(MathMatrix, to_ref_matrix_exprs_tuple) {
diff --git a/test/unit/math/prim/fun/unitspaced_array_test.cpp b/test/unit/math/prim/fun/unitspaced_array_test.cpp
index e1424641449..082bd0ea2b3 100644
--- a/test/unit/math/prim/fun/unitspaced_array_test.cpp
+++ b/test/unit/math/prim/fun/unitspaced_array_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(MathFunctions, unitspaced_array) {
diff --git a/test/unit/math/prim/fun/zip_index_test.cpp b/test/unit/math/prim/fun/zip_index_test.cpp
index 31b51f5304a..2cfa7d59f12 100644
--- a/test/unit/math/prim/fun/zip_index_test.cpp
+++ b/test/unit/math/prim/fun/zip_index_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/test/unit/math/prim/functor/apply_test.cpp b/test/unit/math/prim/functor/apply_test.cpp
index 08e139f4690..a30baa0b1a1 100644
--- a/test/unit/math/prim/functor/apply_test.cpp
+++ b/test/unit/math/prim/functor/apply_test.cpp
@@ -2,7 +2,6 @@
 #include <gtest/gtest.h>
 #include <tuple>
 #include <type_traits>
-#include <vector>
 
 namespace apply_test {
 struct func {
diff --git a/test/unit/math/prim/functor/coupled_ode_system_test.cpp b/test/unit/math/prim/functor/coupled_ode_system_test.cpp
index 679d2b33b7e..7f1f1303381 100644
--- a/test/unit/math/prim/functor/coupled_ode_system_test.cpp
+++ b/test/unit/math/prim/functor/coupled_ode_system_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <test/unit/math/prim/functor/harmonic_oscillator.hpp>
 #include <test/unit/math/prim/functor/mock_ode_functor.hpp>
 #include <test/unit/math/prim/functor/mock_throwing_ode_functor.hpp>
 #include <vector>
diff --git a/test/unit/math/prim/functor/filter_map_test.cpp b/test/unit/math/prim/functor/filter_map_test.cpp
index 56cfa71d844..cc29d8d94a6 100644
--- a/test/unit/math/prim/functor/filter_map_test.cpp
+++ b/test/unit/math/prim/functor/filter_map_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
 #include <tuple>
diff --git a/test/unit/math/prim/functor/for_each_test.cpp b/test/unit/math/prim/functor/for_each_test.cpp
index 941baeb2e3e..07c693cb4cd 100644
--- a/test/unit/math/prim/functor/for_each_test.cpp
+++ b/test/unit/math/prim/functor/for_each_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <tuple>
-#include <type_traits>
 #include <vector>
 
 TEST(MathFunctions, for_each_basic_unary) {
diff --git a/test/unit/math/prim/functor/hcubature_test.cpp b/test/unit/math/prim/functor/hcubature_test.cpp
index 006decbbf75..9ab08ae427e 100644
--- a/test/unit/math/prim/functor/hcubature_test.cpp
+++ b/test/unit/math/prim/functor/hcubature_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/prim/prob/wiener_full_lpdf.hpp>
 
 #include <gtest/gtest.h>
-#include <vector>
 
 namespace hcubature_test {
 
diff --git a/test/unit/math/prim/functor/integrate_1d_double_exponential_test.cpp b/test/unit/math/prim/functor/integrate_1d_double_exponential_test.cpp
index b84cadf069b..708c6b6c8fe 100644
--- a/test/unit/math/prim/functor/integrate_1d_double_exponential_test.cpp
+++ b/test/unit/math/prim/functor/integrate_1d_double_exponential_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
 #include <limits>
 #include <sstream>
diff --git a/test/unit/math/prim/functor/integrate_1d_gauss_kronrod_test.cpp b/test/unit/math/prim/functor/integrate_1d_gauss_kronrod_test.cpp
index f46f75e732d..bf197b2320f 100644
--- a/test/unit/math/prim/functor/integrate_1d_gauss_kronrod_test.cpp
+++ b/test/unit/math/prim/functor/integrate_1d_gauss_kronrod_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
-#include <test/unit/util.hpp>
 #include <cmath>
 #include <iostream>
 #include <limits>
diff --git a/test/unit/math/prim/functor/integrate_1d_impl_test.cpp b/test/unit/math/prim/functor/integrate_1d_impl_test.cpp
index 50b94969a66..c1775da516f 100644
--- a/test/unit/math/prim/functor/integrate_1d_impl_test.cpp
+++ b/test/unit/math/prim/functor/integrate_1d_impl_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
 #include <limits>
 #include <sstream>
diff --git a/test/unit/math/prim/functor/integrate_1d_test.cpp b/test/unit/math/prim/functor/integrate_1d_test.cpp
index 75d65d5916f..85f96a2f3d5 100644
--- a/test/unit/math/prim/functor/integrate_1d_test.cpp
+++ b/test/unit/math/prim/functor/integrate_1d_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
 #include <limits>
 #include <sstream>
diff --git a/test/unit/math/prim/functor/iter_tuple_nested_test.cpp b/test/unit/math/prim/functor/iter_tuple_nested_test.cpp
index 928aba055f1..a5f34846fa9 100644
--- a/test/unit/math/prim/functor/iter_tuple_nested_test.cpp
+++ b/test/unit/math/prim/functor/iter_tuple_nested_test.cpp
@@ -1,9 +1,6 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/pretty_print_types.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
 #include <tuple>
-#include <type_traits>
 #include <vector>
 
 namespace {
diff --git a/test/unit/math/prim/functor/make_holder_tuple_test.cpp b/test/unit/math/prim/functor/make_holder_tuple_test.cpp
index 3473802d447..0b9e2038045 100644
--- a/test/unit/math/prim/functor/make_holder_tuple_test.cpp
+++ b/test/unit/math/prim/functor/make_holder_tuple_test.cpp
@@ -1,9 +1,6 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
-#include <stdexcept>
 namespace {
 
 TEST(MathMatrix, partial_forward_as_tuples_rvalues) {
diff --git a/test/unit/math/prim/functor/map_if_test.cpp b/test/unit/math/prim/functor/map_if_test.cpp
index a96640ba0f9..44a17af8024 100644
--- a/test/unit/math/prim/functor/map_if_test.cpp
+++ b/test/unit/math/prim/functor/map_if_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/prim/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <stdexcept>
 namespace {
 template <typename T>
 using is_floating_point_decay = std::is_floating_point<std::decay_t<T>>;
diff --git a/test/unit/math/prim/functor/mock_ode_functor.hpp b/test/unit/math/prim/functor/mock_ode_functor.hpp
index e24320a54b0..b274151cdec 100644
--- a/test/unit/math/prim/functor/mock_ode_functor.hpp
+++ b/test/unit/math/prim/functor/mock_ode_functor.hpp
@@ -1,6 +1,5 @@
 #ifndef TEST_UNIT_MATH_PRIM_FUNCTOR_MOCK_ODE_FUNCTOR
 #define TEST_UNIT_MATH_PRIM_FUNCTOR_MOCK_ODE_FUNCTOR
-#include <vector>
 
 struct mock_ode_functor {
   template <typename T0, typename T1, typename T2, typename T3, typename T4>
diff --git a/test/unit/math/prim/functor/mpi_cluster_test.cpp b/test/unit/math/prim/functor/mpi_cluster_test.cpp
index 6a44906e27d..879729a323e 100644
--- a/test/unit/math/prim/functor/mpi_cluster_test.cpp
+++ b/test/unit/math/prim/functor/mpi_cluster_test.cpp
@@ -6,7 +6,6 @@
 
 #include <stan/math/prim.hpp>
 
-#include <iostream>
 #include <vector>
 #include <memory>
 
diff --git a/test/unit/math/prim/functor/reduce_sum_test.cpp b/test/unit/math/prim/functor/reduce_sum_test.cpp
index e87bedc14ca..d62b5aff9d9 100644
--- a/test/unit/math/prim/functor/reduce_sum_test.cpp
+++ b/test/unit/math/prim/functor/reduce_sum_test.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 
 #include <vector>
-#include <set>
 
 TEST(StanMathPrim_reduce_sum, value) {
   using stan::math::test::count_lpdf;
diff --git a/test/unit/math/prim/functor/reduce_sum_util.hpp b/test/unit/math/prim/functor/reduce_sum_util.hpp
index 18172224e22..3786907c465 100644
--- a/test/unit/math/prim/functor/reduce_sum_util.hpp
+++ b/test/unit/math/prim/functor/reduce_sum_util.hpp
@@ -3,9 +3,6 @@
 
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <sstream>
-#include <tuple>
 #include <vector>
 
 namespace stan {
diff --git a/test/unit/math/prim/meta/VectorBuilderHelper_test.cpp b/test/unit/math/prim/meta/VectorBuilderHelper_test.cpp
index a8be33072b4..d148ab88e58 100644
--- a/test/unit/math/prim/meta/VectorBuilderHelper_test.cpp
+++ b/test/unit/math/prim/meta/VectorBuilderHelper_test.cpp
@@ -1,4 +1,3 @@
-#include <stan/math/prim/meta.hpp>
 #include <stan/math/prim/fun/size.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/prim/meta/append_return_type_test.cpp b/test/unit/math/prim/meta/append_return_type_test.cpp
index fca8b47921f..f975bc78003 100644
--- a/test/unit/math/prim/meta/append_return_type_test.cpp
+++ b/test/unit/math/prim/meta/append_return_type_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim/meta.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <vector>
 
 TEST(MathMetaPrim, test_append_return_type) {
   EXPECT_SAME_TYPE(int, stan::math::append_return_type<int, int>::type);
diff --git a/test/unit/math/prim/meta/include_summand_test.cpp b/test/unit/math/prim/meta/include_summand_test.cpp
index 501f45c7483..efe53943462 100644
--- a/test/unit/math/prim/meta/include_summand_test.cpp
+++ b/test/unit/math/prim/meta/include_summand_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim/meta.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 
 TEST(MathMetaPrim, IncludeSummandProptoFalse) {
   EXPECT_TRUE(stan::math::include_summand<false>::value);
diff --git a/test/unit/math/prim/meta/is_base_pointer_convertible_test.cpp b/test/unit/math/prim/meta/is_base_pointer_convertible_test.cpp
index 0ec2992491f..131c517e69d 100644
--- a/test/unit/math/prim/meta/is_base_pointer_convertible_test.cpp
+++ b/test/unit/math/prim/meta/is_base_pointer_convertible_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim/meta.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 namespace stan {
 namespace math {
diff --git a/test/unit/math/prim/meta/is_detected_test.cpp b/test/unit/math/prim/meta/is_detected_test.cpp
index 102e3851d77..52b8eb081cc 100644
--- a/test/unit/math/prim/meta/is_detected_test.cpp
+++ b/test/unit/math/prim/meta/is_detected_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim/meta.hpp>
 #include <gtest/gtest.h>
-#include <type_traits>
 
 namespace stan {
 namespace test {
diff --git a/test/unit/math/prim/prob/VectorRNGTestRig.hpp b/test/unit/math/prim/prob/VectorRNGTestRig.hpp
index 1de8889e4b1..1becf660606 100644
--- a/test/unit/math/prim/prob/VectorRNGTestRig.hpp
+++ b/test/unit/math/prim/prob/VectorRNGTestRig.hpp
@@ -2,7 +2,6 @@
 #define TEST_UNIT_MATH_PRIM_PROB_VECTOR_RNG_TEST_RIG_HPP
 
 #include <stan/math/prim.hpp>
-#include <gtest/gtest.h>
 #include <vector>
 
 /*
diff --git a/test/unit/math/prim/prob/bernoulli_logit_glm_rng_test.cpp b/test/unit/math/prim/prob/bernoulli_logit_glm_rng_test.cpp
index 35e800b3a63..d9cc5568351 100644
--- a/test/unit/math/prim/prob/bernoulli_logit_glm_rng_test.cpp
+++ b/test/unit/math/prim/prob/bernoulli_logit_glm_rng_test.cpp
@@ -1,9 +1,7 @@
 #include <gtest/gtest.h>
 #include <stan/math/prim.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <limits>
 #include <vector>
 
 TEST(ProbDistributionsBernoulliLogitGlm, vectorized) {
diff --git a/test/unit/math/prim/prob/bernoulli_logit_test.cpp b/test/unit/math/prim/prob/bernoulli_logit_test.cpp
index e608decd807..813e703cea9 100644
--- a/test/unit/math/prim/prob/bernoulli_logit_test.cpp
+++ b/test/unit/math/prim/prob/bernoulli_logit_test.cpp
@@ -2,10 +2,8 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 class BernoulliLogitTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/bernoulli_test.cpp b/test/unit/math/prim/prob/bernoulli_test.cpp
index a1e3b722d7a..a3beca6f563 100644
--- a/test/unit/math/prim/prob/bernoulli_test.cpp
+++ b/test/unit/math/prim/prob/bernoulli_test.cpp
@@ -2,10 +2,8 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 class BernoulliTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/beta_binomial_test.cpp b/test/unit/math/prim/prob/beta_binomial_test.cpp
index 9adc12fe794..43f712a40b6 100644
--- a/test/unit/math/prim/prob/beta_binomial_test.cpp
+++ b/test/unit/math/prim/prob/beta_binomial_test.cpp
@@ -2,9 +2,7 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 class BetaBinomialTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/beta_neg_binomial_test.cpp b/test/unit/math/prim/prob/beta_neg_binomial_test.cpp
index 1a4a848daf3..f22e8e63511 100644
--- a/test/unit/math/prim/prob/beta_neg_binomial_test.cpp
+++ b/test/unit/math/prim/prob/beta_neg_binomial_test.cpp
@@ -2,9 +2,7 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 class BetaNegBinomialTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/beta_proportion_test.cpp b/test/unit/math/prim/prob/beta_proportion_test.cpp
index f38f7e71e16..bfea8247ccc 100644
--- a/test/unit/math/prim/prob/beta_proportion_test.cpp
+++ b/test/unit/math/prim/prob/beta_proportion_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/beta_test.cpp b/test/unit/math/prim/prob/beta_test.cpp
index 2fa451a1288..3d8d9014b1f 100644
--- a/test/unit/math/prim/prob/beta_test.cpp
+++ b/test/unit/math/prim/prob/beta_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/binomial_test.cpp b/test/unit/math/prim/prob/binomial_test.cpp
index c12507db534..a747b547a90 100644
--- a/test/unit/math/prim/prob/binomial_test.cpp
+++ b/test/unit/math/prim/prob/binomial_test.cpp
@@ -2,9 +2,7 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 class BinomialTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/cauchy_test.cpp b/test/unit/math/prim/prob/cauchy_test.cpp
index 7409f7bcc73..f12ff3a82e9 100644
--- a/test/unit/math/prim/prob/cauchy_test.cpp
+++ b/test/unit/math/prim/prob/cauchy_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/chi_square_test.cpp b/test/unit/math/prim/prob/chi_square_test.cpp
index 1e19844a18f..e51f840ae6b 100644
--- a/test/unit/math/prim/prob/chi_square_test.cpp
+++ b/test/unit/math/prim/prob/chi_square_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/double_exponential_test.cpp b/test/unit/math/prim/prob/double_exponential_test.cpp
index 8e8d677e226..36d7758d332 100644
--- a/test/unit/math/prim/prob/double_exponential_test.cpp
+++ b/test/unit/math/prim/prob/double_exponential_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/exp_mod_normal_test.cpp b/test/unit/math/prim/prob/exp_mod_normal_test.cpp
index d817dd10342..32bff4bd089 100644
--- a/test/unit/math/prim/prob/exp_mod_normal_test.cpp
+++ b/test/unit/math/prim/prob/exp_mod_normal_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/prim/prob/exponential_test.cpp b/test/unit/math/prim/prob/exponential_test.cpp
index c581dd64508..6f43939fd92 100644
--- a/test/unit/math/prim/prob/exponential_test.cpp
+++ b/test/unit/math/prim/prob/exponential_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/frechet_test.cpp b/test/unit/math/prim/prob/frechet_test.cpp
index 8dd29a48bfb..405b6e76e4d 100644
--- a/test/unit/math/prim/prob/frechet_test.cpp
+++ b/test/unit/math/prim/prob/frechet_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/gamma_test.cpp b/test/unit/math/prim/prob/gamma_test.cpp
index 63f7d396ee5..6a335ce17ad 100644
--- a/test/unit/math/prim/prob/gamma_test.cpp
+++ b/test/unit/math/prim/prob/gamma_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/gaussian_dlm_obs_rng_test.cpp b/test/unit/math/prim/prob/gaussian_dlm_obs_rng_test.cpp
index d49ae9a4d47..bf447642fdf 100644
--- a/test/unit/math/prim/prob/gaussian_dlm_obs_rng_test.cpp
+++ b/test/unit/math/prim/prob/gaussian_dlm_obs_rng_test.cpp
@@ -3,7 +3,6 @@
 #include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <exception>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/prim/prob/gumbel_test.cpp b/test/unit/math/prim/prob/gumbel_test.cpp
index 9de4ec2c765..b540d6731b5 100644
--- a/test/unit/math/prim/prob/gumbel_test.cpp
+++ b/test/unit/math/prim/prob/gumbel_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/hmm_hidden_state_prob_test.cpp b/test/unit/math/prim/prob/hmm_hidden_state_prob_test.cpp
index 747784ab5b9..288062e8b6c 100644
--- a/test/unit/math/prim/prob/hmm_hidden_state_prob_test.cpp
+++ b/test/unit/math/prim/prob/hmm_hidden_state_prob_test.cpp
@@ -1,12 +1,6 @@
 #include <test/unit/math/prim/prob/hmm_util.hpp>
 #include <stan/math/prim/prob/hmm_hidden_state_prob.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/random.hpp>
-#include <test/unit/math/test_ad.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
-#include <vector>
 
 TEST_F(hmm_test, hidden_state_single_outcome) {
   using stan::math::hmm_hidden_state_prob;
diff --git a/test/unit/math/prim/prob/hmm_latent_rng_test.cpp b/test/unit/math/prim/prob/hmm_latent_rng_test.cpp
index 0a5606e9abd..f5612213661 100644
--- a/test/unit/math/prim/prob/hmm_latent_rng_test.cpp
+++ b/test/unit/math/prim/prob/hmm_latent_rng_test.cpp
@@ -1,13 +1,7 @@
 #include <test/unit/math/prim/prob/hmm_util.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <stan/math/prim/prob/hmm_latent_rng.hpp>
-#include <stan/math/prim/prob/chi_square_lcdf.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/random.hpp>
-#include <test/unit/math/test_ad.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 TEST(hmm_rng_test, chiSquareGoodnessFitTest) {
diff --git a/test/unit/math/prim/prob/hmm_marginal_test.cpp b/test/unit/math/prim/prob/hmm_marginal_test.cpp
index 3f9b653eb31..c8310b47f9e 100644
--- a/test/unit/math/prim/prob/hmm_marginal_test.cpp
+++ b/test/unit/math/prim/prob/hmm_marginal_test.cpp
@@ -1,12 +1,8 @@
 #include <test/unit/math/prim/prob/hmm_util.hpp>
 #include <stan/math/prim/prob/hmm_marginal.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/random.hpp>
 #include <test/unit/math/test_ad.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
-#include <vector>
 
 // For evaluation of the density, the C++ code is benchmarked against
 // a forward algorithm written in R.
diff --git a/test/unit/math/prim/prob/hmm_util.hpp b/test/unit/math/prim/prob/hmm_util.hpp
index fe114281107..dd89138606f 100644
--- a/test/unit/math/prim/prob/hmm_util.hpp
+++ b/test/unit/math/prim/prob/hmm_util.hpp
@@ -1,12 +1,9 @@
 #ifndef TEST_UNIT_MATH_PRIM_PROB_HMM_UTIL
 #define TEST_UNIT_MATH_PRIM_PROB_HMM_UTIL
 #include <stan/math/prim/prob/hmm_marginal.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random.hpp>
 #include <test/unit/math/test_ad.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <vector>
 
 /**
diff --git a/test/unit/math/prim/prob/inv_chi_square_test.cpp b/test/unit/math/prim/prob/inv_chi_square_test.cpp
index f9fd797e1c6..1e0503b5ddd 100644
--- a/test/unit/math/prim/prob/inv_chi_square_test.cpp
+++ b/test/unit/math/prim/prob/inv_chi_square_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/inv_gamma_test.cpp b/test/unit/math/prim/prob/inv_gamma_test.cpp
index 4687a03df55..5c04fb80397 100644
--- a/test/unit/math/prim/prob/inv_gamma_test.cpp
+++ b/test/unit/math/prim/prob/inv_gamma_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <limits>
diff --git a/test/unit/math/prim/prob/inv_wishart_cholesky_rng_test.cpp b/test/unit/math/prim/prob/inv_wishart_cholesky_rng_test.cpp
index 95369fffa58..e8a53195d1b 100644
--- a/test/unit/math/prim/prob/inv_wishart_cholesky_rng_test.cpp
+++ b/test/unit/math/prim/prob/inv_wishart_cholesky_rng_test.cpp
@@ -1,10 +1,8 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <gtest/gtest.h>
 #include <stdexcept>
-#include <vector>
 
 TEST(ProbDistributionsInvWishartCholesky, rng) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/prim/prob/inv_wishart_cholesky_test.cpp b/test/unit/math/prim/prob/inv_wishart_cholesky_test.cpp
index 062de6d554c..9021482f1a8 100644
--- a/test/unit/math/prim/prob/inv_wishart_cholesky_test.cpp
+++ b/test/unit/math/prim/prob/inv_wishart_cholesky_test.cpp
@@ -1,8 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/math/special_functions/digamma.hpp>
 
 TEST(ProbDistributionsInvWishartCholesky, inv_wishart_cholesky_4x4) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/prim/prob/inv_wishart_test.cpp b/test/unit/math/prim/prob/inv_wishart_test.cpp
index 58f00da356d..979dade3bcb 100644
--- a/test/unit/math/prim/prob/inv_wishart_test.cpp
+++ b/test/unit/math/prim/prob/inv_wishart_test.cpp
@@ -1,8 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/math/special_functions/digamma.hpp>
 
 TEST(ProbDistributionsInvWishart, inv_wishart_symmetry) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/prim/prob/lkj_cov_test.cpp b/test/unit/math/prim/prob/lkj_cov_test.cpp
index 5e10b5d9ce5..a3131f67304 100644
--- a/test/unit/math/prim/prob/lkj_cov_test.cpp
+++ b/test/unit/math/prim/prob/lkj_cov_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsLkjCov, testIdentity) {
   boost::random::mt19937 rng;
diff --git a/test/unit/math/prim/prob/logistic_test.cpp b/test/unit/math/prim/prob/logistic_test.cpp
index 4af72d4c321..2c84f8e2241 100644
--- a/test/unit/math/prim/prob/logistic_test.cpp
+++ b/test/unit/math/prim/prob/logistic_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/loglogistic_test.cpp b/test/unit/math/prim/prob/loglogistic_test.cpp
index 38422afd7ee..2e69122a739 100644
--- a/test/unit/math/prim/prob/loglogistic_test.cpp
+++ b/test/unit/math/prim/prob/loglogistic_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/lognormal_test.cpp b/test/unit/math/prim/prob/lognormal_test.cpp
index bfc16aaa881..0103bc59008 100644
--- a/test/unit/math/prim/prob/lognormal_test.cpp
+++ b/test/unit/math/prim/prob/lognormal_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/prim/prob/matrix_normal_prec_rng_test.cpp b/test/unit/math/prim/prob/matrix_normal_prec_rng_test.cpp
index 18fad92196e..e80f55862fd 100644
--- a/test/unit/math/prim/prob/matrix_normal_prec_rng_test.cpp
+++ b/test/unit/math/prim/prob/matrix_normal_prec_rng_test.cpp
@@ -3,7 +3,6 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <exception>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/prim/prob/neg_binomial_2_ccdf_log_test.cpp b/test/unit/math/prim/prob/neg_binomial_2_ccdf_log_test.cpp
index 309a32c1bdc..0d8ed71ac06 100644
--- a/test/unit/math/prim/prob/neg_binomial_2_ccdf_log_test.cpp
+++ b/test/unit/math/prim/prob/neg_binomial_2_ccdf_log_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbNegBinomial2, ccdf_log_matches_lccdf) {
   double y = 0.8;
diff --git a/test/unit/math/prim/prob/neg_binomial_2_log_test.cpp b/test/unit/math/prim/prob/neg_binomial_2_log_test.cpp
index b1ae1b2d5d1..114b245736a 100644
--- a/test/unit/math/prim/prob/neg_binomial_2_log_test.cpp
+++ b/test/unit/math/prim/prob/neg_binomial_2_log_test.cpp
@@ -4,9 +4,6 @@
 #include <test/unit/math/expect_near_rel.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <algorithm>
-#include <limits>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/prim/prob/neg_binomial_2_test.cpp b/test/unit/math/prim/prob/neg_binomial_2_test.cpp
index 232e8b45289..0c0692ad639 100644
--- a/test/unit/math/prim/prob/neg_binomial_2_test.cpp
+++ b/test/unit/math/prim/prob/neg_binomial_2_test.cpp
@@ -5,8 +5,6 @@
 #include <test/unit/math/expect_near_rel.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <limits>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/prim/prob/neg_binomial_test.cpp b/test/unit/math/prim/prob/neg_binomial_test.cpp
index 7d1240ccd85..6856dc665c1 100644
--- a/test/unit/math/prim/prob/neg_binomial_test.cpp
+++ b/test/unit/math/prim/prob/neg_binomial_test.cpp
@@ -3,8 +3,6 @@
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <limits>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/prim/prob/normal_test.cpp b/test/unit/math/prim/prob/normal_test.cpp
index 1e4a2860ede..e717fdb804c 100644
--- a/test/unit/math/prim/prob/normal_test.cpp
+++ b/test/unit/math/prim/prob/normal_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/pareto_test.cpp b/test/unit/math/prim/prob/pareto_test.cpp
index df1c57c64ca..040ebaf95c3 100644
--- a/test/unit/math/prim/prob/pareto_test.cpp
+++ b/test/unit/math/prim/prob/pareto_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/prim/prob/pareto_type_2_test.cpp b/test/unit/math/prim/prob/pareto_type_2_test.cpp
index 5af75607cf6..81b04fdfe07 100644
--- a/test/unit/math/prim/prob/pareto_type_2_test.cpp
+++ b/test/unit/math/prim/prob/pareto_type_2_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <limits>
diff --git a/test/unit/math/prim/prob/poisson_log_test.cpp b/test/unit/math/prim/prob/poisson_log_test.cpp
index 0399d2bb712..e80d39d6741 100644
--- a/test/unit/math/prim/prob/poisson_log_test.cpp
+++ b/test/unit/math/prim/prob/poisson_log_test.cpp
@@ -2,9 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <limits>
 #include <vector>
 
 class PoissonLogTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/poisson_test.cpp b/test/unit/math/prim/prob/poisson_test.cpp
index 709395c481a..477cac2b4d9 100644
--- a/test/unit/math/prim/prob/poisson_test.cpp
+++ b/test/unit/math/prim/prob/poisson_test.cpp
@@ -3,8 +3,6 @@
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <limits>
 #include <vector>
 
 class PoissonTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/prim/prob/rayleigh_test.cpp b/test/unit/math/prim/prob/rayleigh_test.cpp
index 4ca66c9825f..d43c0abc012 100644
--- a/test/unit/math/prim/prob/rayleigh_test.cpp
+++ b/test/unit/math/prim/prob/rayleigh_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/scaled_inv_chi_square_test.cpp b/test/unit/math/prim/prob/scaled_inv_chi_square_test.cpp
index 0999d35b88c..5b97b49f27d 100644
--- a/test/unit/math/prim/prob/scaled_inv_chi_square_test.cpp
+++ b/test/unit/math/prim/prob/scaled_inv_chi_square_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/skew_double_exponential_ccdf_log_test.cpp b/test/unit/math/prim/prob/skew_double_exponential_ccdf_log_test.cpp
index f1769ee046c..0c956e90fe5 100644
--- a/test/unit/math/prim/prob/skew_double_exponential_ccdf_log_test.cpp
+++ b/test/unit/math/prim/prob/skew_double_exponential_ccdf_log_test.cpp
@@ -1,10 +1,6 @@
 #include <stan/math/prim.hpp>
-#include <stan/math/prim/fun/sign.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/math/tools/promotion.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/skew_double_exponential_cdf_log_test.cpp b/test/unit/math/prim/prob/skew_double_exponential_cdf_log_test.cpp
index ab096906b49..1ef2befa954 100644
--- a/test/unit/math/prim/prob/skew_double_exponential_cdf_log_test.cpp
+++ b/test/unit/math/prim/prob/skew_double_exponential_cdf_log_test.cpp
@@ -2,13 +2,9 @@
 #include <vector>
 #include <gtest/gtest.h>
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/math/tools/promotion.hpp>
 
 #include <stan/math/rev.hpp>
-#include <stan/math/prim/fun/sign.hpp>
-#include <stan/math/prim/fun/fabs.hpp>
 #include <stan/math/prim/fun/log1m.hpp>
 
 template <typename T1, typename T2, typename T3, typename T4>
diff --git a/test/unit/math/prim/prob/skew_double_exponential_test.cpp b/test/unit/math/prim/prob/skew_double_exponential_test.cpp
index 9132a2f188c..b0de2047d04 100644
--- a/test/unit/math/prim/prob/skew_double_exponential_test.cpp
+++ b/test/unit/math/prim/prob/skew_double_exponential_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/skew_normal_test.cpp b/test/unit/math/prim/prob/skew_normal_test.cpp
index 1fe061f3392..51fb5e651a3 100644
--- a/test/unit/math/prim/prob/skew_normal_test.cpp
+++ b/test/unit/math/prim/prob/skew_normal_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/std_normal_test.cpp b/test/unit/math/prim/prob/std_normal_test.cpp
index 3ed4aa6500f..c034926ce85 100644
--- a/test/unit/math/prim/prob/std_normal_test.cpp
+++ b/test/unit/math/prim/prob/std_normal_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/student_t_test.cpp b/test/unit/math/prim/prob/student_t_test.cpp
index 6d95ebbf347..0b83e2cd82d 100644
--- a/test/unit/math/prim/prob/student_t_test.cpp
+++ b/test/unit/math/prim/prob/student_t_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/uniform_test.cpp b/test/unit/math/prim/prob/uniform_test.cpp
index e0ff8592551..75ccfea6ace 100644
--- a/test/unit/math/prim/prob/uniform_test.cpp
+++ b/test/unit/math/prim/prob/uniform_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <gtest/gtest.h>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <limits>
 #include <vector>
diff --git a/test/unit/math/prim/prob/von_mises_test.cpp b/test/unit/math/prim/prob/von_mises_test.cpp
index d5c98f2d176..ff7005e64a5 100644
--- a/test/unit/math/prim/prob/von_mises_test.cpp
+++ b/test/unit/math/prim/prob/von_mises_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/prim/prob/weibull_test.cpp b/test/unit/math/prim/prob/weibull_test.cpp
index 19308aea778..8fbc65d609d 100644
--- a/test/unit/math/prim/prob/weibull_test.cpp
+++ b/test/unit/math/prim/prob/weibull_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/prim.hpp>
 #include <test/unit/math/prim/prob/vector_rng_test_helper.hpp>
 #include <test/unit/math/prim/prob/util.hpp>
-#include <boost/math/distributions.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/prim/prob/wiener_full_lccdf_unnorm_test.cpp b/test/unit/math/prim/prob/wiener_full_lccdf_unnorm_test.cpp
index ef6945f2d22..a39f6411ab2 100644
--- a/test/unit/math/prim/prob/wiener_full_lccdf_unnorm_test.cpp
+++ b/test/unit/math/prim/prob/wiener_full_lccdf_unnorm_test.cpp
@@ -1,10 +1,8 @@
-#include <stan/math/prim/functor.hpp>
 #include <stan/math/prim/fun.hpp>
 #include <stan/math/prim/prob.hpp>
 #include <stan/math/rev.hpp>
 
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(mathPrimScalProbWienerFullLccdfScal, valid) {
   using stan::math::INFTY;
diff --git a/test/unit/math/prim/prob/wiener_full_lcdf_unnorm_test.cpp b/test/unit/math/prim/prob/wiener_full_lcdf_unnorm_test.cpp
index 9a5195c60f7..ead0946599b 100644
--- a/test/unit/math/prim/prob/wiener_full_lcdf_unnorm_test.cpp
+++ b/test/unit/math/prim/prob/wiener_full_lcdf_unnorm_test.cpp
@@ -1,4 +1,3 @@
-#include <stan/math/prim/functor.hpp>
 #include <stan/math/prim/fun.hpp>
 #include <stan/math/prim/prob.hpp>
 #include <stan/math/rev.hpp>
diff --git a/test/unit/math/prim/prob/wiener_full_lpdf_test.cpp b/test/unit/math/prim/prob/wiener_full_lpdf_test.cpp
index 2a6a19a5484..a7e02012e09 100644
--- a/test/unit/math/prim/prob/wiener_full_lpdf_test.cpp
+++ b/test/unit/math/prim/prob/wiener_full_lpdf_test.cpp
@@ -1,4 +1,3 @@
-#include <stan/math/prim/functor.hpp>
 #include <stan/math/prim/fun.hpp>
 #include <stan/math/prim/prob.hpp>
 #include <stan/math/rev.hpp>
diff --git a/test/unit/math/prim/prob/wishart_cholesky_rng_test.cpp b/test/unit/math/prim/prob/wishart_cholesky_rng_test.cpp
index dab129f4ab9..5275c73f996 100644
--- a/test/unit/math/prim/prob/wishart_cholesky_rng_test.cpp
+++ b/test/unit/math/prim/prob/wishart_cholesky_rng_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/prim.hpp>
-#include <test/unit/math/prim/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/prim/prob/wishart_cholesky_test.cpp b/test/unit/math/prim/prob/wishart_cholesky_test.cpp
index 3a9d6d4f769..2ef8c117821 100644
--- a/test/unit/math/prim/prob/wishart_cholesky_test.cpp
+++ b/test/unit/math/prim/prob/wishart_cholesky_test.cpp
@@ -1,8 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/special_functions/digamma.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsWishartCholesky, wishart_symmetry) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/prim/prob/wishart_test.cpp b/test/unit/math/prim/prob/wishart_test.cpp
index 85df75934a4..0e34d5f5de9 100644
--- a/test/unit/math/prim/prob/wishart_test.cpp
+++ b/test/unit/math/prim/prob/wishart_test.cpp
@@ -1,8 +1,5 @@
 #include <stan/math/prim.hpp>
 #include <gtest/gtest.h>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/special_functions/digamma.hpp>
-#include <boost/math/distributions.hpp>
 
 TEST(ProbDistributionsWishart, wishart_symmetry) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/prim/prob/yule_simon_test.cpp b/test/unit/math/prim/prob/yule_simon_test.cpp
index 8935d088494..135ea18602e 100644
--- a/test/unit/math/prim/prob/yule_simon_test.cpp
+++ b/test/unit/math/prim/prob/yule_simon_test.cpp
@@ -4,8 +4,6 @@
 #include <test/unit/math/prim/prob/VectorIntRNGTestRig.hpp>
 #include <gtest/gtest.h>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <limits>
 #include <vector>
 
 class YuleSimonTestRig : public VectorIntRNGTestRig {
diff --git a/test/unit/math/relative_tolerance_test.cpp b/test/unit/math/relative_tolerance_test.cpp
index b6f20375172..bcc352823f8 100644
--- a/test/unit/math/relative_tolerance_test.cpp
+++ b/test/unit/math/relative_tolerance_test.cpp
@@ -1,7 +1,5 @@
 #include <test/unit/math/relative_tolerance.hpp>
-#include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 TEST(testUnitMath, RelativeTolerance) {
   using stan::test::relative_tolerance;
diff --git a/test/unit/math/rev/core/build_vari_array_test.cpp b/test/unit/math/rev/core/build_vari_array_test.cpp
index aca515b367a..9bb76e1f645 100644
--- a/test/unit/math/rev/core/build_vari_array_test.cpp
+++ b/test/unit/math/rev/core/build_vari_array_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev/core.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <sstream>
 
 TEST_F(AgradRev, RevBuild_build_vari_array) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/rev/core/chainable_object_test.cpp b/test/unit/math/rev/core/chainable_object_test.cpp
index a5ec06840bc..ad892feb75c 100644
--- a/test/unit/math/rev/core/chainable_object_test.cpp
+++ b/test/unit/math/rev/core/chainable_object_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 
 class ChainableObjectTest {
diff --git a/test/unit/math/rev/core/grad_test.cpp b/test/unit/math/rev/core/grad_test.cpp
index 7222c1ef419..6bc5eb204b0 100644
--- a/test/unit/math/rev/core/grad_test.cpp
+++ b/test/unit/math/rev/core/grad_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <stan/math/rev/fun/sin.hpp>
 #include <vector>
diff --git a/test/unit/math/rev/core/gradable.hpp b/test/unit/math/rev/core/gradable.hpp
index a4c198d1ed6..7b93da9a1bf 100644
--- a/test/unit/math/rev/core/gradable.hpp
+++ b/test/unit/math/rev/core/gradable.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <stan/math/rev/fun/quad_form.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <vector>
 
 struct gradable {
diff --git a/test/unit/math/rev/core/nested_rev_autodiff_test.cpp b/test/unit/math/rev/core/nested_rev_autodiff_test.cpp
index 133f515e4dc..40a50106e64 100644
--- a/test/unit/math/rev/core/nested_rev_autodiff_test.cpp
+++ b/test/unit/math/rev/core/nested_rev_autodiff_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev/core.hpp>
 #include <test/unit/math/rev/core/gradable.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <vector>
 
 struct AgradLocalNested : public testing::Test {
   void SetUp() {
diff --git a/test/unit/math/rev/core/operator_logical_or_test.cpp b/test/unit/math/rev/core/operator_logical_or_test.cpp
index 29256554754..ccae35423f8 100644
--- a/test/unit/math/rev/core/operator_logical_or_test.cpp
+++ b/test/unit/math/rev/core/operator_logical_or_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/rev/core/operator_unary_negative_test.cpp b/test/unit/math/rev/core/operator_unary_negative_test.cpp
index 23a0f31ae1d..4a07e4665d2 100644
--- a/test/unit/math/rev/core/operator_unary_negative_test.cpp
+++ b/test/unit/math/rev/core/operator_unary_negative_test.cpp
@@ -1,9 +1,7 @@
 #include <stan/math/rev/core.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 
 TEST_F(AgradRev, Rev_varmat_unary_negative) {
   stan::math::var_value<Eigen::MatrixXd> x = Eigen::MatrixXd::Random(2, 3);
diff --git a/test/unit/math/rev/core/operator_unary_not_test.cpp b/test/unit/math/rev/core/operator_unary_not_test.cpp
index 84b4d39c9dd..94af5379b89 100644
--- a/test/unit/math/rev/core/operator_unary_not_test.cpp
+++ b/test/unit/math/rev/core/operator_unary_not_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/rev/core/precomp_vv_vari_test.cpp b/test/unit/math/rev/core/precomp_vv_vari_test.cpp
index 6af78e9fbe7..1067b5f0346 100644
--- a/test/unit/math/rev/core/precomp_vv_vari_test.cpp
+++ b/test/unit/math/rev/core/precomp_vv_vari_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/core/precomp_vvv_vari_test.cpp b/test/unit/math/rev/core/precomp_vvv_vari_test.cpp
index de256c81810..e717e0018f6 100644
--- a/test/unit/math/rev/core/precomp_vvv_vari_test.cpp
+++ b/test/unit/math/rev/core/precomp_vvv_vari_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/core/profiling_threading_test.cpp b/test/unit/math/rev/core/profiling_threading_test.cpp
index b3c2c78fa2b..25844798eca 100644
--- a/test/unit/math/rev/core/profiling_threading_test.cpp
+++ b/test/unit/math/rev/core/profiling_threading_test.cpp
@@ -1,7 +1,6 @@
 #ifdef STAN_THREADS
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/prim/functor/utils_threads.hpp>
 #include <test/unit/math/prim/functor/reduce_sum_util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/core/scalar_type_t_test.cpp b/test/unit/math/rev/core/scalar_type_t_test.cpp
index ac105d0865d..1841b073d15 100644
--- a/test/unit/math/rev/core/scalar_type_t_test.cpp
+++ b/test/unit/math/rev/core/scalar_type_t_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <string>
-#include <vector>
 
 TEST_F(AgradRev, RevScalar_scalar_type_t_var_value) {
   EXPECT_TRUE(
diff --git a/test/unit/math/rev/core/scoped_chainablestack_test.cpp b/test/unit/math/rev/core/scoped_chainablestack_test.cpp
index c62a8d2d4ae..263d64f8eb1 100644
--- a/test/unit/math/rev/core/scoped_chainablestack_test.cpp
+++ b/test/unit/math/rev/core/scoped_chainablestack_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/core.hpp>
 #include <test/unit/math/rev/core/gradable.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <memory>
diff --git a/test/unit/math/rev/core/set_zero_all_adjoints_nested_test.cpp b/test/unit/math/rev/core/set_zero_all_adjoints_nested_test.cpp
index 4070dbe11e1..6eecd4f1a8e 100644
--- a/test/unit/math/rev/core/set_zero_all_adjoints_nested_test.cpp
+++ b/test/unit/math/rev/core/set_zero_all_adjoints_nested_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, RevZeroNested_set_zero_all_adjoints_nested_outside) {
diff --git a/test/unit/math/rev/core/thread_stack_instance_test.cpp b/test/unit/math/rev/core/thread_stack_instance_test.cpp
index a458cc37485..57dac0e0d1d 100644
--- a/test/unit/math/rev/core/thread_stack_instance_test.cpp
+++ b/test/unit/math/rev/core/thread_stack_instance_test.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 
 #include <thread>
diff --git a/test/unit/math/rev/core/var_stack_test.cpp b/test/unit/math/rev/core/var_stack_test.cpp
index 72bc2abe89c..c7e099e49a3 100644
--- a/test/unit/math/rev/core/var_stack_test.cpp
+++ b/test/unit/math/rev/core/var_stack_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/test/unit/math/rev/core/var_test.cpp b/test/unit/math/rev/core/var_test.cpp
index 01a27cead04..6e08441f531 100644
--- a/test/unit/math/rev/core/var_test.cpp
+++ b/test/unit/math/rev/core/var_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/pretty_print_types.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/core/gradable.hpp>
 #include <gtest/gtest.h>
 #include <string>
diff --git a/test/unit/math/rev/core/vari_test.cpp b/test/unit/math/rev/core/vari_test.cpp
index 55860ffd9b8..ddc08a7f1bf 100644
--- a/test/unit/math/rev/core/vari_test.cpp
+++ b/test/unit/math/rev/core/vari_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/core.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <sstream>
diff --git a/test/unit/math/rev/core/zero_adjoints_test.cpp b/test/unit/math/rev/core/zero_adjoints_test.cpp
index bbc1c72cd1c..8e17bf1f7da 100644
--- a/test/unit/math/rev/core/zero_adjoints_test.cpp
+++ b/test/unit/math/rev/core/zero_adjoints_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <stan/math/rev/fun/sin.hpp>
 #include <vector>
 #include <tuple>
 #include <gtest/gtest.h>
diff --git a/test/unit/math/rev/err/check_matching_dims_test.cpp b/test/unit/math/rev/err/check_matching_dims_test.cpp
index 51eee9e86fe..a2a02cd9000 100644
--- a/test/unit/math/rev/err/check_matching_dims_test.cpp
+++ b/test/unit/math/rev/err/check_matching_dims_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
-#include <limits>
 
 TEST_F(AgradRev, ErrorHandlingMatrix_checkMatchingDims_double_var) {
   using stan::math::check_matching_dims;
diff --git a/test/unit/math/rev/err/check_positive_test.cpp b/test/unit/math/rev/err/check_positive_test.cpp
index d08e951b718..d7fb7456172 100644
--- a/test/unit/math/rev/err/check_positive_test.cpp
+++ b/test/unit/math/rev/err/check_positive_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <exception>
 #include <limits>
 #include <vector>
 
diff --git a/test/unit/math/rev/err/invalid_argument_test.cpp b/test/unit/math/rev/err/invalid_argument_test.cpp
index 6a6fd9c225f..87fe0c8fde5 100644
--- a/test/unit/math/rev/err/invalid_argument_test.cpp
+++ b/test/unit/math/rev/err/invalid_argument_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <string>
 
diff --git a/test/unit/math/rev/err/invalid_argument_vec_test.cpp b/test/unit/math/rev/err/invalid_argument_vec_test.cpp
index adf41f1c481..44a47f190be 100644
--- a/test/unit/math/rev/err/invalid_argument_vec_test.cpp
+++ b/test/unit/math/rev/err/invalid_argument_vec_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <string>
diff --git a/test/unit/math/rev/err/out_of_range_test.cpp b/test/unit/math/rev/err/out_of_range_test.cpp
index 45ddde13ebb..c4687ea68dd 100644
--- a/test/unit/math/rev/err/out_of_range_test.cpp
+++ b/test/unit/math/rev/err/out_of_range_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
 #include <vector>
diff --git a/test/unit/math/rev/err/throw_domain_error_test.cpp b/test/unit/math/rev/err/throw_domain_error_test.cpp
index e6a1287c59c..d00406ca165 100644
--- a/test/unit/math/rev/err/throw_domain_error_test.cpp
+++ b/test/unit/math/rev/err/throw_domain_error_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <string>
 
diff --git a/test/unit/math/rev/err/throw_domain_error_vec_test.cpp b/test/unit/math/rev/err/throw_domain_error_vec_test.cpp
index fca45966446..ec3437f6ea4 100644
--- a/test/unit/math/rev/err/throw_domain_error_vec_test.cpp
+++ b/test/unit/math/rev/err/throw_domain_error_vec_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <string>
diff --git a/test/unit/math/rev/fun/as_bool_test.cpp b/test/unit/math/rev/fun/as_bool_test.cpp
index 6922262a846..b63e82e518e 100644
--- a/test/unit/math/rev/fun/as_bool_test.cpp
+++ b/test/unit/math/rev/fun/as_bool_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST_F(AgradRev, Rev_asBool) {
diff --git a/test/unit/math/rev/fun/assign_test.cpp b/test/unit/math/rev/fun/assign_test.cpp
index df344f6a5f4..19add54f71f 100644
--- a/test/unit/math/rev/fun/assign_test.cpp
+++ b/test/unit/math/rev/fun/assign_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, MathMatrixRevMat_getAssignRowVar) {
   using Eigen::Dynamic;
diff --git a/test/unit/math/rev/fun/binomial_coefficient_log_test.cpp b/test/unit/math/rev/fun/binomial_coefficient_log_test.cpp
index 022ad56976d..b30bf3acc86 100644
--- a/test/unit/math/rev/fun/binomial_coefficient_log_test.cpp
+++ b/test/unit/math/rev/fun/binomial_coefficient_log_test.cpp
@@ -3,8 +3,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
 #include <gtest/gtest.h>
-#include <limits>
-#include <algorithm>
 #include <vector>
 #include <string>
 #include <cmath>
diff --git a/test/unit/math/rev/fun/cols_test.cpp b/test/unit/math/rev/fun/cols_test.cpp
index 2ac1ad7f11b..2d616b00c15 100644
--- a/test/unit/math/rev/fun/cols_test.cpp
+++ b/test/unit/math/rev/fun/cols_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, RevMatrix_cols_vector) {
   using stan::math::cols;
diff --git a/test/unit/math/rev/fun/dimensions_test.cpp b/test/unit/math/rev/fun/dimensions_test.cpp
index 8c4b4d9865c..b0991d67d19 100644
--- a/test/unit/math/rev/fun/dimensions_test.cpp
+++ b/test/unit/math/rev/fun/dimensions_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, RevMatrix_col_varmat) {
diff --git a/test/unit/math/rev/fun/eigenvalues_sym_test.cpp b/test/unit/math/rev/fun/eigenvalues_sym_test.cpp
index 740756708fc..2fc8811416a 100644
--- a/test/unit/math/rev/fun/eigenvalues_sym_test.cpp
+++ b/test/unit/math/rev/fun/eigenvalues_sym_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <stan/math/rev/fun/eigenvalues_sym.hpp>
 #include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/rev/fun/log.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, Rev_eigenvaluesSymLogDet) {
diff --git a/test/unit/math/rev/fun/eigenvectors_sym_test.cpp b/test/unit/math/rev/fun/eigenvectors_sym_test.cpp
index a93aac0bc5d..d4d3200d435 100644
--- a/test/unit/math/rev/fun/eigenvectors_sym_test.cpp
+++ b/test/unit/math/rev/fun/eigenvectors_sym_test.cpp
@@ -1,9 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <stan/math/prim.hpp>
 #include <stan/math/rev/fun/eigenvectors_sym.hpp>
-#include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/rev/fun/log.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, Rev_eigenvectorsSym) {
diff --git a/test/unit/math/rev/fun/erfcx_test.cpp b/test/unit/math/rev/fun/erfcx_test.cpp
index 62e0bc4be60..a9cdbe0321e 100644
--- a/test/unit/math/rev/fun/erfcx_test.cpp
+++ b/test/unit/math/rev/fun/erfcx_test.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <array>
 #include <cmath>
-#include <limits>
 #include <utility>
 
 namespace {
diff --git a/test/unit/math/rev/fun/fill_test.cpp b/test/unit/math/rev/fun/fill_test.cpp
index 18cdbf10d0e..1600111ad9b 100644
--- a/test/unit/math/rev/fun/fill_test.cpp
+++ b/test/unit/math/rev/fun/fill_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/test/unit/math/rev/fun/from_var_value_test.cpp b/test/unit/math/rev/fun/from_var_value_test.cpp
index 3980de6649e..bfa65234c23 100644
--- a/test/unit/math/rev/fun/from_var_value_test.cpp
+++ b/test/unit/math/rev/fun/from_var_value_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/pretty_print_types.hpp>
 
 TEST_F(AgradRev, RevMatrix_from_var_value_types) {
   using stan::math::from_var_value;
diff --git a/test/unit/math/rev/fun/initialize_fill_test.cpp b/test/unit/math/rev/fun/initialize_fill_test.cpp
index 4cc4116a088..3d6b6021a8d 100644
--- a/test/unit/math/rev/fun/initialize_fill_test.cpp
+++ b/test/unit/math/rev/fun/initialize_fill_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <vector>
 
 TEST_F(AgradRev, RevMatrix_initialize_fill) {
diff --git a/test/unit/math/rev/fun/initialize_variable_test.cpp b/test/unit/math/rev/fun/initialize_variable_test.cpp
index 2284851c96b..29ea1d3fab5 100644
--- a/test/unit/math/rev/fun/initialize_variable_test.cpp
+++ b/test/unit/math/rev/fun/initialize_variable_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <vector>
 
 TEST_F(AgradRev, RevMatrix_initializeVariable) {
diff --git a/test/unit/math/rev/fun/int_step_test.cpp b/test/unit/math/rev/fun/int_step_test.cpp
index c5a49ac620e..e7fb8cc9bcd 100644
--- a/test/unit/math/rev/fun/int_step_test.cpp
+++ b/test/unit/math/rev/fun/int_step_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, Rev_int_step) {
   using stan::math::int_step;
diff --git a/test/unit/math/rev/fun/inv_inc_beta_test.cpp b/test/unit/math/rev/fun/inv_inc_beta_test.cpp
index 41c51bd2a2f..59c14121d2e 100644
--- a/test/unit/math/rev/fun/inv_inc_beta_test.cpp
+++ b/test/unit/math/rev/fun/inv_inc_beta_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, inv_inc_beta_values) {
diff --git a/test/unit/math/rev/fun/is_any_nan_test.cpp b/test/unit/math/rev/fun/is_any_nan_test.cpp
index e3b2a0ea7c9..2ecb385a689 100644
--- a/test/unit/math/rev/fun/is_any_nan_test.cpp
+++ b/test/unit/math/rev/fun/is_any_nan_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/test/unit/math/rev/fun/is_inf_test.cpp b/test/unit/math/rev/fun/is_inf_test.cpp
index c73d1d75467..2482c81ea07 100644
--- a/test/unit/math/rev/fun/is_inf_test.cpp
+++ b/test/unit/math/rev/fun/is_inf_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST_F(AgradRev, Rev_is_inf) {
diff --git a/test/unit/math/rev/fun/is_nan_test.cpp b/test/unit/math/rev/fun/is_nan_test.cpp
index 5c3a1f97679..2faaa5592fc 100644
--- a/test/unit/math/rev/fun/is_nan_test.cpp
+++ b/test/unit/math/rev/fun/is_nan_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <limits>
 
 TEST_F(AgradRev, Rev_is_nan) {
diff --git a/test/unit/math/rev/fun/jacobian.hpp b/test/unit/math/rev/fun/jacobian.hpp
index 287088a3fd5..7d8f723c02c 100644
--- a/test/unit/math/rev/fun/jacobian.hpp
+++ b/test/unit/math/rev/fun/jacobian.hpp
@@ -5,7 +5,6 @@
 // ********* superseded by version in autodiff.hpp for API ****
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <vector>
 
 namespace stan {
diff --git a/test/unit/math/rev/fun/log_sum_exp_test.cpp b/test/unit/math/rev/fun/log_sum_exp_test.cpp
index f020a0d1dd2..e85677c7796 100644
--- a/test/unit/math/rev/fun/log_sum_exp_test.cpp
+++ b/test/unit/math/rev/fun/log_sum_exp_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, log_sum_exp_tests_large_values) {
diff --git a/test/unit/math/rev/fun/misc_test.cpp b/test/unit/math/rev/fun/misc_test.cpp
index c7ce3b81926..161d5d58744 100644
--- a/test/unit/math/rev/fun/misc_test.cpp
+++ b/test/unit/math/rev/fun/misc_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <vector>
 
 TEST_F(AgradRev, RevMatrix_mv_squaredNorm) {
diff --git a/test/unit/math/rev/fun/primitive_value_test.cpp b/test/unit/math/rev/fun/primitive_value_test.cpp
index c64772ac409..d9ef907efd5 100644
--- a/test/unit/math/rev/fun/primitive_value_test.cpp
+++ b/test/unit/math/rev/fun/primitive_value_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, Rev_primitiveValue) {
   using stan::math::primitive_value;
diff --git a/test/unit/math/rev/fun/rep_matrix_test.cpp b/test/unit/math/rev/fun/rep_matrix_test.cpp
index 0f36a1b01ed..d2bbf46d820 100644
--- a/test/unit/math/rev/fun/rep_matrix_test.cpp
+++ b/test/unit/math/rev/fun/rep_matrix_test.cpp
@@ -1,11 +1,8 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/util.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <string>
-#include <vector>
 
 TEST_F(AgradRev, MathMixMatFun_repMatrixVar) {
   using stan::math::rep_matrix;
diff --git a/test/unit/math/rev/fun/rep_row_vector_test.cpp b/test/unit/math/rev/fun/rep_row_vector_test.cpp
index bafa613af2e..74ee4b5c71d 100644
--- a/test/unit/math/rev/fun/rep_row_vector_test.cpp
+++ b/test/unit/math/rev/fun/rep_row_vector_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, MathMixMatFun_repRowVectorVar) {
diff --git a/test/unit/math/rev/fun/rep_vector_test.cpp b/test/unit/math/rev/fun/rep_vector_test.cpp
index d1c049174ef..e672969dd46 100644
--- a/test/unit/math/rev/fun/rep_vector_test.cpp
+++ b/test/unit/math/rev/fun/rep_vector_test.cpp
@@ -1,11 +1,7 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
-#include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
-#include <limits>
 #include <string>
-#include <vector>
 
 TEST_F(AgradRev, MathMixMatFun_repVectorVar) {
   using stan::math::rep_vector;
diff --git a/test/unit/math/rev/fun/rows_test.cpp b/test/unit/math/rev/fun/rows_test.cpp
index ad2b4348487..24bbdcde1e2 100644
--- a/test/unit/math/rev/fun/rows_test.cpp
+++ b/test/unit/math/rev/fun/rows_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 TEST_F(AgradRev, RevMatrix_rows_vector) {
   using stan::math::row_vector_v;
diff --git a/test/unit/math/rev/fun/singular_values_test.cpp b/test/unit/math/rev/fun/singular_values_test.cpp
index cdad4a3b9f6..93d30398a46 100644
--- a/test/unit/math/rev/fun/singular_values_test.cpp
+++ b/test/unit/math/rev/fun/singular_values_test.cpp
@@ -3,7 +3,6 @@
 #include <stan/math/prim.hpp>
 #include <stan/math/rev/fun/singular_values.hpp>
 #include <stan/math/rev/fun/sum.hpp>
-#include <stan/math/rev/fun/log.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, Rev_singularvalues_gradient) {
diff --git a/test/unit/math/rev/fun/sort_indices_test.cpp b/test/unit/math/rev/fun/sort_indices_test.cpp
index d7b357b855e..bcd1cc0e9c7 100644
--- a/test/unit/math/rev/fun/sort_indices_test.cpp
+++ b/test/unit/math/rev/fun/sort_indices_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <vector>
 
 inline void test_sort_indices_asc(std::vector<double> val) {
diff --git a/test/unit/math/rev/fun/stan_print_test.cpp b/test/unit/math/rev/fun/stan_print_test.cpp
index da0f0e6691b..5a9d5fc100a 100644
--- a/test/unit/math/rev/fun/stan_print_test.cpp
+++ b/test/unit/math/rev/fun/stan_print_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, Rev_stan_print) {
diff --git a/test/unit/math/rev/fun/to_soa_sparse_matrix_test.cpp b/test/unit/math/rev/fun/to_soa_sparse_matrix_test.cpp
index fbc495ac432..f2e7cc56b51 100644
--- a/test/unit/math/rev/fun/to_soa_sparse_matrix_test.cpp
+++ b/test/unit/math/rev/fun/to_soa_sparse_matrix_test.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <stan/math/rev/fun/to_soa_sparse_matrix.hpp>
 #include <stan/math/rev/core.hpp>
diff --git a/test/unit/math/rev/fun/to_var_test.cpp b/test/unit/math/rev/fun/to_var_test.cpp
index 9f3b073ef22..5918fb2fc12 100644
--- a/test/unit/math/rev/fun/to_var_test.cpp
+++ b/test/unit/math/rev/fun/to_var_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, RevMatrix_to_var_scalar) {
diff --git a/test/unit/math/rev/fun/transpose_test.cpp b/test/unit/math/rev/fun/transpose_test.cpp
index 8c72b89410d..b19bbfdc296 100644
--- a/test/unit/math/rev/fun/transpose_test.cpp
+++ b/test/unit/math/rev/fun/transpose_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
 
 // Reproduces a compile error: calling `transpose` on a `var_value` that holds
 // a non-plain Eigen expression (e.g. a row/block of a `var_value` matrix). The
diff --git a/test/unit/math/rev/fun/util.hpp b/test/unit/math/rev/fun/util.hpp
index 7fdca697ef7..95ac0b27333 100644
--- a/test/unit/math/rev/fun/util.hpp
+++ b/test/unit/math/rev/fun/util.hpp
@@ -2,7 +2,6 @@
 #define TEST_UNIT_MATH_REV_FUN_UTIL_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <vector>
 
 // Returns a matrix with the contents of a
diff --git a/test/unit/math/rev/functor/algebra_solver_fp_test.cpp b/test/unit/math/rev/functor/algebra_solver_fp_test.cpp
index fd31b9da8d4..c70202bb5f7 100644
--- a/test/unit/math/rev/functor/algebra_solver_fp_test.cpp
+++ b/test/unit/math/rev/functor/algebra_solver_fp_test.cpp
@@ -1,12 +1,9 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <stan/math/prim.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/functor/util_algebra_solver.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
 #include <string>
 #include <limits>
diff --git a/test/unit/math/rev/functor/analytical_dae_typed_test.cpp b/test/unit/math/rev/functor/analytical_dae_typed_test.cpp
index 8bbbd66e8e7..a1f30bcc526 100644
--- a/test/unit/math/rev/functor/analytical_dae_typed_test.cpp
+++ b/test/unit/math/rev/functor/analytical_dae_typed_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_dae_analytical.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/chem_dae_sens_typed_test.cpp b/test/unit/math/rev/functor/chem_dae_sens_typed_test.cpp
index 49f2aec0de4..173f3c9ddb0 100644
--- a/test/unit/math/rev/functor/chem_dae_sens_typed_test.cpp
+++ b/test/unit/math/rev/functor/chem_dae_sens_typed_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_dae_chem.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/chem_dae_typed_test.cpp b/test/unit/math/rev/functor/chem_dae_typed_test.cpp
index be3b3743604..8c5f848f5ba 100644
--- a/test/unit/math/rev/functor/chem_dae_typed_test.cpp
+++ b/test/unit/math/rev/functor/chem_dae_typed_test.cpp
@@ -1,8 +1,5 @@
-#include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_dae_chem.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/cos_ode_typed_test.cpp b/test/unit/math/rev/functor/cos_ode_typed_test.cpp
index 327842289ee..d2def2f617c 100644
--- a/test/unit/math/rev/functor/cos_ode_typed_test.cpp
+++ b/test/unit/math/rev/functor/cos_ode_typed_test.cpp
@@ -1,8 +1,5 @@
-#include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_cos_scalar.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/coupled_mm.hpp b/test/unit/math/rev/functor/coupled_mm.hpp
index 47c5ba7d68b..cab2eb4f910 100644
--- a/test/unit/math/rev/functor/coupled_mm.hpp
+++ b/test/unit/math/rev/functor/coupled_mm.hpp
@@ -3,7 +3,6 @@
 
 #include <stan/math/rev/core.hpp>
 #include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <vector>
 
 struct coupled_mm_ode_fun {
diff --git a/test/unit/math/rev/functor/coupled_ode_system_test.cpp b/test/unit/math/rev/functor/coupled_ode_system_test.cpp
index f99ddac5da9..5eb63a1037c 100644
--- a/test/unit/math/rev/functor/coupled_ode_system_test.cpp
+++ b/test/unit/math/rev/functor/coupled_ode_system_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
 #include <test/unit/math/prim/functor/harmonic_oscillator.hpp>
diff --git a/test/unit/math/rev/functor/degenerated_ode_typed_test.cpp b/test/unit/math/rev/functor/degenerated_ode_typed_test.cpp
index 56b9984182d..c15328f95d0 100644
--- a/test/unit/math/rev/functor/degenerated_ode_typed_test.cpp
+++ b/test/unit/math/rev/functor/degenerated_ode_typed_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_linear_dae.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/fho_ode_typed_ts_test.cpp b/test/unit/math/rev/functor/fho_ode_typed_ts_test.cpp
index decc7957a70..d94b6f4deaa 100644
--- a/test/unit/math/rev/functor/fho_ode_typed_ts_test.cpp
+++ b/test/unit/math/rev/functor/fho_ode_typed_ts_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_fho.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/finite_diff_hessian_auto_test.cpp b/test/unit/math/rev/functor/finite_diff_hessian_auto_test.cpp
index f70cd0ae645..d130caf12ec 100644
--- a/test/unit/math/rev/functor/finite_diff_hessian_auto_test.cpp
+++ b/test/unit/math/rev/functor/finite_diff_hessian_auto_test.cpp
@@ -3,13 +3,7 @@
 #include <stan/math/mix.hpp>
 #include <gtest/gtest.h>
 
-#include <tbb/parallel_for.h>
-#include <tbb/blocked_range.h>
-
-#include <stdexcept>
 #include <vector>
-#include <thread>
-#include <future>
 
 using Eigen::Dynamic;
 using Eigen::Matrix;
diff --git a/test/unit/math/rev/functor/finite_diff_hessian_times_vector_test.cpp b/test/unit/math/rev/functor/finite_diff_hessian_times_vector_test.cpp
index c936d1fb20a..6ec9d5a5070 100644
--- a/test/unit/math/rev/functor/finite_diff_hessian_times_vector_test.cpp
+++ b/test/unit/math/rev/functor/finite_diff_hessian_times_vector_test.cpp
@@ -1,10 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <iostream>
-#include <stdexcept>
-#include <vector>
 
 using Eigen::Dynamic;
 using Eigen::Matrix;
diff --git a/test/unit/math/rev/functor/gradient_test.cpp b/test/unit/math/rev/functor/gradient_test.cpp
index 74da0ca14ab..2c960e1cb83 100644
--- a/test/unit/math/rev/functor/gradient_test.cpp
+++ b/test/unit/math/rev/functor/gradient_test.cpp
@@ -7,7 +7,6 @@
 
 #include <stdexcept>
 #include <vector>
-#include <thread>
 #include <future>
 
 using Eigen::Dynamic;
diff --git a/test/unit/math/rev/functor/idas_system_test.cpp b/test/unit/math/rev/functor/idas_system_test.cpp
index bc0c92ee0d1..71220458dc3 100644
--- a/test/unit/math/rev/functor/idas_system_test.cpp
+++ b/test/unit/math/rev/functor/idas_system_test.cpp
@@ -1,18 +1,12 @@
 #include <stan/math.hpp>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <stan/math/rev/functor/dae_system.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <nvector/nvector_serial.h>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
-#include <limits>
 
 namespace idas_system_test {
 
diff --git a/test/unit/math/rev/functor/index_3_dae_typed_test.cpp b/test/unit/math/rev/functor/index_3_dae_typed_test.cpp
index 8d0ef27f34a..ac217bf83e5 100644
--- a/test/unit/math/rev/functor/index_3_dae_typed_test.cpp
+++ b/test/unit/math/rev/functor/index_3_dae_typed_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
diff --git a/test/unit/math/rev/functor/integrate_1d_double_exponential_test.cpp b/test/unit/math/rev/functor/integrate_1d_double_exponential_test.cpp
index 70b0dd2282e..6ea8fd2c69d 100644
--- a/test/unit/math/rev/functor/integrate_1d_double_exponential_test.cpp
+++ b/test/unit/math/rev/functor/integrate_1d_double_exponential_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/util.hpp>
 #include <vector>
 #include <iostream>
 #include <limits>
diff --git a/test/unit/math/rev/functor/integrate_1d_gauss_kronrod_test.cpp b/test/unit/math/rev/functor/integrate_1d_gauss_kronrod_test.cpp
index dfba6650b2b..d9e91178992 100644
--- a/test/unit/math/rev/functor/integrate_1d_gauss_kronrod_test.cpp
+++ b/test/unit/math/rev/functor/integrate_1d_gauss_kronrod_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/util.hpp>
 #include <vector>
 #include <iostream>
 #include <limits>
diff --git a/test/unit/math/rev/functor/integrate_1d_impl_test.cpp b/test/unit/math/rev/functor/integrate_1d_impl_test.cpp
index 6d7453dab33..615282c46a0 100644
--- a/test/unit/math/rev/functor/integrate_1d_impl_test.cpp
+++ b/test/unit/math/rev/functor/integrate_1d_impl_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
 #include <vector>
 #include <iostream>
 #include <limits>
diff --git a/test/unit/math/rev/functor/integrate_1d_test.cpp b/test/unit/math/rev/functor/integrate_1d_test.cpp
index 7f441942bc4..49232988444 100644
--- a/test/unit/math/rev/functor/integrate_1d_test.cpp
+++ b/test/unit/math/rev/functor/integrate_1d_test.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
-#include <test/unit/util.hpp>
 #include <vector>
 #include <iostream>
 #include <limits>
diff --git a/test/unit/math/rev/functor/linear_dae_typed_test.cpp b/test/unit/math/rev/functor/linear_dae_typed_test.cpp
index b78d2a0c2e9..f33a9e4012f 100644
--- a/test/unit/math/rev/functor/linear_dae_typed_test.cpp
+++ b/test/unit/math/rev/functor/linear_dae_typed_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_linear_dae.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/lorenz_ode_typed_fd_test.cpp b/test/unit/math/rev/functor/lorenz_ode_typed_fd_test.cpp
index 1663a4cf5d5..9d958b23117 100644
--- a/test/unit/math/rev/functor/lorenz_ode_typed_fd_test.cpp
+++ b/test/unit/math/rev/functor/lorenz_ode_typed_fd_test.cpp
@@ -1,8 +1,5 @@
-#include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_lorenz.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/map_rect_concurrent_prim_test.cpp b/test/unit/math/rev/functor/map_rect_concurrent_prim_test.cpp
index b7fe369ae98..d69fa7ae961 100644
--- a/test/unit/math/rev/functor/map_rect_concurrent_prim_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_concurrent_prim_test.cpp
@@ -7,12 +7,10 @@
 
 #include <gtest/gtest.h>
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 #include <test/unit/math/prim/functor/utils_threads.hpp>
 
-#include <iostream>
 #include <vector>
 
 STAN_REGISTER_MAP_RECT(0, hard_work)
diff --git a/test/unit/math/rev/functor/map_rect_concurrent_test.cpp b/test/unit/math/rev/functor/map_rect_concurrent_test.cpp
index 65b0dec034a..678d2122da4 100644
--- a/test/unit/math/rev/functor/map_rect_concurrent_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_concurrent_test.cpp
@@ -7,12 +7,10 @@
 
 #include <gtest/gtest.h>
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 #include <test/unit/math/prim/functor/utils_threads.hpp>
 
-#include <iostream>
 #include <vector>
 
 STAN_REGISTER_MAP_RECT(0, hard_work)
diff --git a/test/unit/math/rev/functor/map_rect_concurrent_threads_test.cpp b/test/unit/math/rev/functor/map_rect_concurrent_threads_test.cpp
index 40b20451e73..20dd5060fce 100644
--- a/test/unit/math/rev/functor/map_rect_concurrent_threads_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_concurrent_threads_test.cpp
@@ -10,12 +10,10 @@
 
 #include <gtest/gtest.h>
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 #include <test/unit/math/prim/functor/utils_threads.hpp>
 
-#include <iostream>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/rev/functor/map_rect_mpi_prim_test.cpp b/test/unit/math/rev/functor/map_rect_mpi_prim_test.cpp
index 0296aa087c2..758ba9b9a2d 100644
--- a/test/unit/math/rev/functor/map_rect_mpi_prim_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_mpi_prim_test.cpp
@@ -3,14 +3,12 @@
 #ifdef STAN_MPI
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 #include <test/unit/math/prim/functor/faulty_functor.hpp>
 
-#include <iostream>
 #include <vector>
 
 STAN_REGISTER_MAP_RECT(0, hard_work)
diff --git a/test/unit/math/rev/functor/map_rect_mpi_test.cpp b/test/unit/math/rev/functor/map_rect_mpi_test.cpp
index 40a2851ef51..e2d26baf251 100644
--- a/test/unit/math/rev/functor/map_rect_mpi_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_mpi_test.cpp
@@ -3,14 +3,12 @@
 #ifdef STAN_MPI
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 #include <test/unit/math/prim/functor/faulty_functor.hpp>
 
-#include <iostream>
 #include <vector>
 
 STAN_REGISTER_MAP_RECT(0, hard_work)
diff --git a/test/unit/math/rev/functor/map_rect_prim_test.cpp b/test/unit/math/rev/functor/map_rect_prim_test.cpp
index fbdd38ae275..10546ce9af4 100644
--- a/test/unit/math/rev/functor/map_rect_prim_test.cpp
+++ b/test/unit/math/rev/functor/map_rect_prim_test.cpp
@@ -1,10 +1,8 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
 #include <test/unit/math/prim/functor/hard_work.hpp>
 
-#include <iostream>
 #include <vector>
 
 // the tests here check that map_rect refuses mal-formatted input as
diff --git a/test/unit/math/rev/functor/ode_store_sensitivities_test.cpp b/test/unit/math/rev/functor/ode_store_sensitivities_test.cpp
index ae8f58c330c..9e0e1cb7bff 100644
--- a/test/unit/math/rev/functor/ode_store_sensitivities_test.cpp
+++ b/test/unit/math/rev/functor/ode_store_sensitivities_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/util.hpp>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/rev/functor/pph_dae_typed_test.cpp b/test/unit/math/rev/functor/pph_dae_typed_test.cpp
index 32ef720a14f..8e7d2dbcb30 100644
--- a/test/unit/math/rev/functor/pph_dae_typed_test.cpp
+++ b/test/unit/math/rev/functor/pph_dae_typed_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_dae_pph.hpp>
 #include <test/unit/math/rev/functor/dae_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/reduce_sum_test.cpp b/test/unit/math/rev/functor/reduce_sum_test.cpp
index b68c2ef6946..949959b53c2 100644
--- a/test/unit/math/rev/functor/reduce_sum_test.cpp
+++ b/test/unit/math/rev/functor/reduce_sum_test.cpp
@@ -2,11 +2,7 @@
 #include <test/unit/math/prim/functor/reduce_sum_util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <sstream>
-#include <tuple>
 #include <vector>
-#include <set>
 
 TEST_F(AgradRev, StanMathRev_reduce_sum_no_args) {
   using stan::math::var;
diff --git a/test/unit/math/rev/functor/reduce_sum_tuple_data_test.cpp b/test/unit/math/rev/functor/reduce_sum_tuple_data_test.cpp
index 984bcecb979..2d90bd12287 100644
--- a/test/unit/math/rev/functor/reduce_sum_tuple_data_test.cpp
+++ b/test/unit/math/rev/functor/reduce_sum_tuple_data_test.cpp
@@ -1,7 +1,6 @@
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <tuple>
 #include <vector>
 
 namespace {
diff --git a/test/unit/math/rev/functor/sho_ode_adjoint_typed_error_test.cpp b/test/unit/math/rev/functor/sho_ode_adjoint_typed_error_test.cpp
index 771f0a45be7..52f7f59bc60 100644
--- a/test/unit/math/rev/functor/sho_ode_adjoint_typed_error_test.cpp
+++ b/test/unit/math/rev/functor/sho_ode_adjoint_typed_error_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_sho_ctl.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/sho_ode_typed_error_test.cpp b/test/unit/math/rev/functor/sho_ode_typed_error_test.cpp
index dcd47f42e94..2563fffb010 100644
--- a/test/unit/math/rev/functor/sho_ode_typed_error_test.cpp
+++ b/test/unit/math/rev/functor/sho_ode_typed_error_test.cpp
@@ -1,8 +1,6 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_sho.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/sho_ode_typed_test.cpp b/test/unit/math/rev/functor/sho_ode_typed_test.cpp
index 38f641be8ce..a4e75a114ae 100644
--- a/test/unit/math/rev/functor/sho_ode_typed_test.cpp
+++ b/test/unit/math/rev/functor/sho_ode_typed_test.cpp
@@ -3,7 +3,6 @@
 #include <boost/mp11.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/prim/functor/harmonic_oscillator.hpp>
-#include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_sho.hpp>
 #include <test/unit/math/rev/functor/ode_test_functors.hpp>
 
diff --git a/test/unit/math/rev/functor/solve_newton_test.cpp b/test/unit/math/rev/functor/solve_newton_test.cpp
index 19d64274511..8d4daf94b32 100644
--- a/test/unit/math/rev/functor/solve_newton_test.cpp
+++ b/test/unit/math/rev/functor/solve_newton_test.cpp
@@ -1,12 +1,10 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/functor/solve_newton.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/math/rev/functor/util_algebra_solver.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/rev/functor/solve_powell_test.cpp b/test/unit/math/rev/functor/solve_powell_test.cpp
index a4d519ec49a..6a91430733c 100644
--- a/test/unit/math/rev/functor/solve_powell_test.cpp
+++ b/test/unit/math/rev/functor/solve_powell_test.cpp
@@ -1,12 +1,9 @@
 #include <stan/math/rev/core.hpp>
 #include <stan/math/rev/functor/solve_powell.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <test/unit/math/rev/functor/util_algebra_solver.hpp>
-#include <test/unit/util.hpp>
 #include <gtest/gtest.h>
 #include <iostream>
-#include <fstream>
 #include <vector>
 #include <string>
 
diff --git a/test/unit/math/rev/functor/test_fixture_dae_analytical.hpp b/test/unit/math/rev/functor/test_fixture_dae_analytical.hpp
index 4e883b13ab3..a6b2e0d0e28 100644
--- a/test/unit/math/rev/functor/test_fixture_dae_analytical.hpp
+++ b/test/unit/math/rev/functor/test_fixture_dae_analytical.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_TEST_FIXTURE_DAE_ANALYTICAL_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 template <typename T>
 struct analytical_dae_base {
diff --git a/test/unit/math/rev/functor/test_fixture_dae_chem.hpp b/test/unit/math/rev/functor/test_fixture_dae_chem.hpp
index 0946cf10e6d..2831f2b07d0 100644
--- a/test/unit/math/rev/functor/test_fixture_dae_chem.hpp
+++ b/test/unit/math/rev/functor/test_fixture_dae_chem.hpp
@@ -2,9 +2,7 @@
 #define STAN_MATH_TEST_FIXTURE_DAE_CHEM_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/util.hpp>
 #include <iostream>
diff --git a/test/unit/math/rev/functor/test_fixture_dae_index_3.hpp b/test/unit/math/rev/functor/test_fixture_dae_index_3.hpp
index a81f4cb8abe..a3813534c5f 100644
--- a/test/unit/math/rev/functor/test_fixture_dae_index_3.hpp
+++ b/test/unit/math/rev/functor/test_fixture_dae_index_3.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_TEST_FIXTURE_DAE_INDEX_3_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 /**
  * A DAE of index 3
diff --git a/test/unit/math/rev/functor/test_fixture_dae_pph.hpp b/test/unit/math/rev/functor/test_fixture_dae_pph.hpp
index 28a73401a79..3d25743cfc5 100644
--- a/test/unit/math/rev/functor/test_fixture_dae_pph.hpp
+++ b/test/unit/math/rev/functor/test_fixture_dae_pph.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_TEST_FIXTURE_DAE_PREY_PREDATOR_HARVEST_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 /**
  * A prey-predator-harvest model. Its stability is controled by the
diff --git a/test/unit/math/rev/functor/test_fixture_linear_dae.hpp b/test/unit/math/rev/functor/test_fixture_linear_dae.hpp
index 59f413f2185..f669399509e 100644
--- a/test/unit/math/rev/functor/test_fixture_linear_dae.hpp
+++ b/test/unit/math/rev/functor/test_fixture_linear_dae.hpp
@@ -2,16 +2,10 @@
 #define STAN_MATH_TEST_FIXTURE_DAE_LINEAR_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 /**
  * Linear constant coef DAE in the form
diff --git a/test/unit/math/rev/functor/test_fixture_ode.hpp b/test/unit/math/rev/functor/test_fixture_ode.hpp
index 48831c4308a..7dec011122a 100644
--- a/test/unit/math/rev/functor/test_fixture_ode.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode.hpp
@@ -2,16 +2,11 @@
 #define TEST_UNIT_MATH_REV_FUNCTOR_ODE_FIXTURE_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <test/prob/utility.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/util.hpp>
-#include <type_traits>
-#include <iostream>
 #include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 /**
  * The parent test fixture for ODEs, with CRTP dependence on child
diff --git a/test/unit/math/rev/functor/test_fixture_ode_cos_scalar.hpp b/test/unit/math/rev/functor/test_fixture_ode_cos_scalar.hpp
index ab3a043c2ad..4014a6db189 100644
--- a/test/unit/math/rev/functor/test_fixture_ode_cos_scalar.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode_cos_scalar.hpp
@@ -2,16 +2,11 @@
 #define STAN_MATH_TEST_FIXTURE_ODE_COS_SCALAR_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/prim/functor/ode_test_functors.hpp>
 #include <test/unit/util.hpp>
-#include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 struct cos_arg_ode_base {
   stan::test::CosArg1 f1;
diff --git a/test/unit/math/rev/functor/test_fixture_ode_fho.hpp b/test/unit/math/rev/functor/test_fixture_ode_fho.hpp
index e60b17c6523..f805757f4a3 100644
--- a/test/unit/math/rev/functor/test_fixture_ode_fho.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode_fho.hpp
@@ -2,15 +2,9 @@
 #define STAN_MATH_TEST_FIXTURE_ODE_FHO_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <gtest/gtest.h>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 template <typename T>
 struct forced_harm_osc_base {
diff --git a/test/unit/math/rev/functor/test_fixture_ode_lorenz.hpp b/test/unit/math/rev/functor/test_fixture_ode_lorenz.hpp
index 5976077900d..d9763dab93a 100644
--- a/test/unit/math/rev/functor/test_fixture_ode_lorenz.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode_lorenz.hpp
@@ -2,16 +2,9 @@
 #define STAN_MATH_TEST_FIXTURE_ODE_LORENZ_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <gtest/gtest.h>
-#include <test/unit/math/prim/functor/lorenz.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
-#include <test/unit/util.hpp>
 #include <iostream>
-#include <sstream>
 #include <vector>
-#include <limits>
-#include <string>
 
 struct lorenz_ode_base {
   struct lorenz_rhs {
diff --git a/test/unit/math/rev/functor/test_fixture_ode_sho.hpp b/test/unit/math/rev/functor/test_fixture_ode_sho.hpp
index a9d60fed708..d6c5a6f413f 100644
--- a/test/unit/math/rev/functor/test_fixture_ode_sho.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode_sho.hpp
@@ -2,10 +2,8 @@
 #define STAN_MATH_TEST_FIXTURE_ODE_SHO_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/prim/functor/harmonic_oscillator.hpp>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/util.hpp>
 #include <iostream>
diff --git a/test/unit/math/rev/functor/test_fixture_ode_sho_ctl.hpp b/test/unit/math/rev/functor/test_fixture_ode_sho_ctl.hpp
index 15eb0a2ba00..ab1b95b57bc 100644
--- a/test/unit/math/rev/functor/test_fixture_ode_sho_ctl.hpp
+++ b/test/unit/math/rev/functor/test_fixture_ode_sho_ctl.hpp
@@ -2,10 +2,7 @@
 #define STAN_MATH_TEST_FIXTURE_ODE_SHO_CTL_HPP
 
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <test/unit/math/prim/functor/harmonic_oscillator.hpp>
-#include <test/unit/math/rev/functor/coupled_mm.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode.hpp>
 #include <test/unit/math/rev/functor/test_fixture_ode_sho.hpp>
 #include <test/unit/util.hpp>
diff --git a/test/unit/math/rev/meta/VectorBuilderHelper_test.cpp b/test/unit/math/rev/meta/VectorBuilderHelper_test.cpp
index 3c16968d6ff..f8ce67b2731 100644
--- a/test/unit/math/rev/meta/VectorBuilderHelper_test.cpp
+++ b/test/unit/math/rev/meta/VectorBuilderHelper_test.cpp
@@ -1,4 +1,3 @@
-#include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <stan/math/prim/fun/size.hpp>
diff --git a/test/unit/math/rev/meta/include_summand_test.cpp b/test/unit/math/rev/meta/include_summand_test.cpp
index 6c2ecde818f..088db5c0202 100644
--- a/test/unit/math/rev/meta/include_summand_test.cpp
+++ b/test/unit/math/rev/meta/include_summand_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev/meta.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/meta/is_arena_matrix_test.cpp b/test/unit/math/rev/meta/is_arena_matrix_test.cpp
index b8d6b1bd4af..da26b720d15 100644
--- a/test/unit/math/rev/meta/is_arena_matrix_test.cpp
+++ b/test/unit/math/rev/meta/is_arena_matrix_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/meta/is_fvar_test.cpp b/test/unit/math/rev/meta/is_fvar_test.cpp
index 927e04d8a46..37f47eb08b7 100644
--- a/test/unit/math/rev/meta/is_fvar_test.cpp
+++ b/test/unit/math/rev/meta/is_fvar_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/meta/is_rev_matrix_test.cpp b/test/unit/math/rev/meta/is_rev_matrix_test.cpp
index 44ebf3ae8df..bb04bd16061 100644
--- a/test/unit/math/rev/meta/is_rev_matrix_test.cpp
+++ b/test/unit/math/rev/meta/is_rev_matrix_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/meta/is_var_matrix_test.cpp b/test/unit/math/rev/meta/is_var_matrix_test.cpp
index 97227016b7e..0254365b49d 100644
--- a/test/unit/math/rev/meta/is_var_matrix_test.cpp
+++ b/test/unit/math/rev/meta/is_var_matrix_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev/meta.hpp>
 #include <stan/math/rev/core.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/meta/require_generics_test.cpp b/test/unit/math/rev/meta/require_generics_test.cpp
index b13140a0f67..bb61f7f87b1 100644
--- a/test/unit/math/rev/meta/require_generics_test.cpp
+++ b/test/unit/math/rev/meta/require_generics_test.cpp
@@ -6,7 +6,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <type_traits>
-#include <vector>
 #include <string>
 
 TEST_F(AgradRev, requires_rev_scal_var_test) {
diff --git a/test/unit/math/rev/prob/dirichlet2_test.cpp b/test/unit/math/rev/prob/dirichlet2_test.cpp
index 7c866349628..8953f180ffd 100644
--- a/test/unit/math/rev/prob/dirichlet2_test.cpp
+++ b/test/unit/math/rev/prob/dirichlet2_test.cpp
@@ -1,5 +1,4 @@
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/prob/expect_eq_diffs.hpp>
 #include <string>
diff --git a/test/unit/math/rev/prob/gamma_lccdf_test.cpp b/test/unit/math/rev/prob/gamma_lccdf_test.cpp
index d069a365578..a09c83eb6b1 100644
--- a/test/unit/math/rev/prob/gamma_lccdf_test.cpp
+++ b/test/unit/math/rev/prob/gamma_lccdf_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <limits>
 
 TEST_F(AgradRev, ProbDistributionsGamma_lccdf_values) {
   using stan::math::gamma_lccdf;
diff --git a/test/unit/math/rev/prob/gamma_lcdf_test.cpp b/test/unit/math/rev/prob/gamma_lcdf_test.cpp
index f3b5db8caa3..9af5441a5d8 100644
--- a/test/unit/math/rev/prob/gamma_lcdf_test.cpp
+++ b/test/unit/math/rev/prob/gamma_lcdf_test.cpp
@@ -2,7 +2,6 @@
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
-#include <limits>
 
 TEST_F(AgradRev, ProbDistributionsGamma_lcdf_values) {
   using stan::math::gamma_lcdf;
diff --git a/test/unit/math/rev/prob/inv_gamma_test.cpp b/test/unit/math/rev/prob/inv_gamma_test.cpp
index ec7d3cb27ce..bcd2ffceefe 100644
--- a/test/unit/math/rev/prob/inv_gamma_test.cpp
+++ b/test/unit/math/rev/prob/inv_gamma_test.cpp
@@ -1,7 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <boost/math/differentiation/finite_difference.hpp>
-#include <boost/math/special_functions/digamma.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 #include <algorithm>
diff --git a/test/unit/math/rev/prob/lkj_corr_cholesky_test_functors.hpp b/test/unit/math/rev/prob/lkj_corr_cholesky_test_functors.hpp
index 3a4de3c204f..d1b8f6c25dc 100644
--- a/test/unit/math/rev/prob/lkj_corr_cholesky_test_functors.hpp
+++ b/test/unit/math/rev/prob/lkj_corr_cholesky_test_functors.hpp
@@ -1,8 +1,6 @@
 #ifndef TEST_UNIT_MATH_REV_PROB_LKJ_CORR_CHOLESKY_TEST_FUNCTORS
 #define TEST_UNIT_MATH_REV_PROB_LKJ_CORR_CHOLESKY_TEST_FUNCTORS
 #include <stan/math/rev.hpp>
-#include <test/unit/math/rev/util.hpp>
-#include <vector>
 
 namespace stan {
 
diff --git a/test/unit/math/rev/prob/lkj_corr_test.cpp b/test/unit/math/rev/prob/lkj_corr_test.cpp
index 6c912bd949a..00ae5a7d96c 100644
--- a/test/unit/math/rev/prob/lkj_corr_test.cpp
+++ b/test/unit/math/rev/prob/lkj_corr_test.cpp
@@ -3,7 +3,6 @@
 #include <test/unit/math/rev/prob/test_gradients.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
 #include <gtest/gtest.h>
 
 TEST_F(AgradRev, ProbDistributionsLkjCorr_var) {
diff --git a/test/unit/math/rev/prob/multi_normal_cholesky2_test.cpp b/test/unit/math/rev/prob/multi_normal_cholesky2_test.cpp
index c95873517a9..dc680097a4d 100644
--- a/test/unit/math/rev/prob/multi_normal_cholesky2_test.cpp
+++ b/test/unit/math/rev/prob/multi_normal_cholesky2_test.cpp
@@ -3,7 +3,6 @@
 #include <gtest/gtest.h>
 #include <test/unit/math/rev/prob/test_gradients.hpp>
 #include <test/unit/math/rev/prob/test_gradients_multi_normal.hpp>
-#include <test/unit/math/rev/prob/expect_eq_diffs.hpp>
 #include <vector>
 
 struct multi_normal_cholesky_fun {
diff --git a/test/unit/math/rev/prob/multi_student_t2_test.cpp b/test/unit/math/rev/prob/multi_student_t2_test.cpp
index d85e6183f4f..6bdcb355401 100644
--- a/test/unit/math/rev/prob/multi_student_t2_test.cpp
+++ b/test/unit/math/rev/prob/multi_student_t2_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/rev/prob/expect_eq_diffs.hpp>
 #include <test/unit/math/rev/prob/test_gradients.hpp>
 #include <test/unit/math/rev/prob/test_gradients_multi_student_t.hpp>
diff --git a/test/unit/math/rev/prob/multi_student_t_cholesky_test.cpp b/test/unit/math/rev/prob/multi_student_t_cholesky_test.cpp
index c165ec1baff..56d499852ea 100644
--- a/test/unit/math/rev/prob/multi_student_t_cholesky_test.cpp
+++ b/test/unit/math/rev/prob/multi_student_t_cholesky_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/util.hpp>
 #include <test/unit/math/rev/prob/expect_eq_diffs.hpp>
 #include <test/unit/math/rev/prob/test_gradients.hpp>
 #include <test/unit/math/rev/prob/test_gradients_multi_student_t_cholesky.hpp>
diff --git a/test/unit/math/rev/prob/neg_binomial_2_log_test.cpp b/test/unit/math/rev/prob/neg_binomial_2_log_test.cpp
index b68939a3920..f8ba2007a03 100644
--- a/test/unit/math/rev/prob/neg_binomial_2_log_test.cpp
+++ b/test/unit/math/rev/prob/neg_binomial_2_log_test.cpp
@@ -5,7 +5,6 @@
 #include <boost/math/differentiation/finite_difference.hpp>
 #include <boost/math/special_functions/digamma.hpp>
 #include <algorithm>
-#include <limits>
 #include <vector>
 
 namespace neg_binomial_2_log_test_internal {
diff --git a/test/unit/math/rev/prob/ordered_logistic_test.cpp b/test/unit/math/rev/prob/ordered_logistic_test.cpp
index 4d715914d07..bded3d40914 100644
--- a/test/unit/math/rev/prob/ordered_logistic_test.cpp
+++ b/test/unit/math/rev/prob/ordered_logistic_test.cpp
@@ -1,6 +1,5 @@
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <test/unit/math/rev/fun/util.hpp>
 #include <gtest/gtest.h>
 #include <vector>
 
diff --git a/test/unit/math/rev/prob/skew_double_exponential_ccdf_log_test.cpp b/test/unit/math/rev/prob/skew_double_exponential_ccdf_log_test.cpp
index 64641e76981..61fa1ed6319 100644
--- a/test/unit/math/rev/prob/skew_double_exponential_ccdf_log_test.cpp
+++ b/test/unit/math/rev/prob/skew_double_exponential_ccdf_log_test.cpp
@@ -1,10 +1,6 @@
 
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/math/distributions.hpp>
-#include <boost/math/tools/promotion.hpp>
-#include <limits>
 #include <vector>
 #include <gtest/gtest.h>
 
diff --git a/test/unit/math/rev/prob/test_gradients.hpp b/test/unit/math/rev/prob/test_gradients.hpp
index 2276896b591..8ab8836e9d8 100644
--- a/test/unit/math/rev/prob/test_gradients.hpp
+++ b/test/unit/math/rev/prob/test_gradients.hpp
@@ -4,7 +4,6 @@
 #include <gtest/gtest.h>
 #include <cmath>
 #include <vector>
-#include <iomanip>
 
 inline void test_grad_eq(Eigen::Matrix<double, -1, 1> grad_1,
                          Eigen::Matrix<double, -1, 1> grad_2) {
diff --git a/test/unit/math/rev/prob/test_gradients_multi_normal.hpp b/test/unit/math/rev/prob/test_gradients_multi_normal.hpp
index 121b773dc0f..9c87704002e 100644
--- a/test/unit/math/rev/prob/test_gradients_multi_normal.hpp
+++ b/test/unit/math/rev/prob/test_gradients_multi_normal.hpp
@@ -2,8 +2,6 @@
 #define TEST_UNIT_MATH_REV_PROB_TEST_GRADIENTS_MULTI_NORMAL
 #include <cmath>
 #include <vector>
-#include <iomanip>
-#include <stdexcept>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
 
diff --git a/test/unit/math/rev/prob/test_gradients_multi_student_t.hpp b/test/unit/math/rev/prob/test_gradients_multi_student_t.hpp
index 13b0a3d1103..f4ea05bffc2 100644
--- a/test/unit/math/rev/prob/test_gradients_multi_student_t.hpp
+++ b/test/unit/math/rev/prob/test_gradients_multi_student_t.hpp
@@ -2,8 +2,6 @@
 #define TEST_UNIT_MATH_REV_PROB_TEST_GRADIENTS_MULTI_STUDENT_T
 #include <cmath>
 #include <vector>
-#include <iomanip>
-#include <stdexcept>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
 
diff --git a/test/unit/math/rev/prob/test_gradients_multi_student_t_cholesky.hpp b/test/unit/math/rev/prob/test_gradients_multi_student_t_cholesky.hpp
index e7ffc22d875..5699cd39d38 100644
--- a/test/unit/math/rev/prob/test_gradients_multi_student_t_cholesky.hpp
+++ b/test/unit/math/rev/prob/test_gradients_multi_student_t_cholesky.hpp
@@ -2,8 +2,6 @@
 #define TEST_UNIT_MATH_REV_PROB_TEST_GRADIENTS_MULTI_STUDENT_T_CHOLESKY
 #include <cmath>
 #include <vector>
-#include <iomanip>
-#include <stdexcept>
 #include <stan/math.hpp>
 #include <test/unit/math/rev/util.hpp>
 
diff --git a/test/unit/math/rev/prob/wiener_full_test.cpp b/test/unit/math/rev/prob/wiener_full_test.cpp
index 77f0afeaac5..7be5d8c6e33 100644
--- a/test/unit/math/rev/prob/wiener_full_test.cpp
+++ b/test/unit/math/rev/prob/wiener_full_test.cpp
@@ -1,5 +1,3 @@
-#include <stan/math/prim/functor.hpp>
-#include <stan/math/prim/fun.hpp>
 #include <stan/math/prim/prob.hpp>
 #include <stan/math/rev.hpp>
 #include <test/unit/math/rev/util.hpp>
diff --git a/test/unit/math/test_ad.hpp b/test/unit/math/test_ad.hpp
index 6336f1b03d0..207663242b3 100644
--- a/test/unit/math/test_ad.hpp
+++ b/test/unit/math/test_ad.hpp
@@ -10,7 +10,6 @@
 #include <test/unit/util.hpp>
 #include <test/unit/math/rev/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/test/unit/math/test_ad_matvar.hpp b/test/unit/math/test_ad_matvar.hpp
index 265b896075e..5b203711d3e 100644
--- a/test/unit/math/test_ad_matvar.hpp
+++ b/test/unit/math/test_ad_matvar.hpp
@@ -4,12 +4,9 @@
 #include <stan/math/mix.hpp>
 #include <test/unit/pretty_print_types.hpp>
 #include <test/unit/math/ad_tolerances.hpp>
-#include <test/unit/math/is_finite.hpp>
 #include <test/unit/math/expect_near_rel.hpp>
-#include <stan/math/prim/fun/serializer.hpp>
 #include <test/unit/util.hpp>
 #include <gtest/gtest.h>
-#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/test/unit/math/test_ad_matvar_test.cpp b/test/unit/math/test_ad_matvar_test.cpp
index b1894dd5772..681af97f1d6 100644
--- a/test/unit/math/test_ad_matvar_test.cpp
+++ b/test/unit/math/test_ad_matvar_test.cpp
@@ -1,8 +1,6 @@
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
-#include <limits>
-#include <type_traits>
 #include <vector>
 
 template <typename T>
diff --git a/test/unit/math/test_ad_test.cpp b/test/unit/math/test_ad_test.cpp
index 72ed89ae9be..93815477db6 100644
--- a/test/unit/math/test_ad_test.cpp
+++ b/test/unit/math/test_ad_test.cpp
@@ -1,8 +1,6 @@
 #include <test/unit/math/test_ad.hpp>
 #include <gtest/gtest.h>
 #include <limits>
-#include <type_traits>
-#include <vector>
 
 TEST(test_unit_math_test_ad, test_ad_unary) {
   Eigen::MatrixXd x(2, 2);
diff --git a/test/unit/util.hpp b/test/unit/util.hpp
index 6d13989d579..9fef6b147f2 100644
--- a/test/unit/util.hpp
+++ b/test/unit/util.hpp
@@ -4,7 +4,6 @@
 #include <stan/math/prim/fun/Eigen.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
-#include <boost/typeof/typeof.hpp>
 #include <test/unit/pretty_print_types.hpp>
 #include <gtest/gtest.h>
 #include <type_traits>