diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
index befd2570df..ee21587de8 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <nvector/nvector_serial.h>
 #include <string>
+#include <sundials/sundials_core.hpp>
 #include <sunlinsol/sunlinsol_dense.h>
 #include <sunmatrix/sunmatrix_dense.h>
 
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
index 45105d4056..f81d67d6ef 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <nvector/nvector_serial.h>
 #include <string>
+#include <sundials/sundials_core.hpp>
 
 #include "arkode/arkode_butcher.h"
 
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
index 705cc2df78..117253edea 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <nvector/nvector_serial.h>
 #include <string>
+#include <sundials/sundials_core.hpp>
 #include <sunlinsol/sunlinsol_dense.h>
 #include <sunmatrix/sunmatrix_dense.h>
 
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_getjac.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_getjac.cpp
index 46f0dbcdd2..3beeb7b8c8 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_getjac.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_getjac.cpp
@@ -41,6 +41,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "arkode/arkode_arkstep.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.cpp
index 068b317b1b..5f12139c51 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.cpp
@@ -42,6 +42,7 @@
 #include "arkode/arkode_arkstep.h"
 #include "arkode/arkode_mristep.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_getjac.cpp b/test/unit_tests/cvode/CXX_serial/cv_test_getjac.cpp
index 54d7c925ac..83e42ca082 100644
--- a/test/unit_tests/cvode/CXX_serial/cv_test_getjac.cpp
+++ b/test/unit_tests/cvode/CXX_serial/cv_test_getjac.cpp
@@ -41,6 +41,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "cvode/cvode.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
index ca7409e1bd..03493ed7aa 100644
--- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
+++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
@@ -27,6 +27,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "cvode/cvode.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
 
diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.cpp b/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.cpp
index 0a38c85cbb..be4530a4cb 100644
--- a/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.cpp
+++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.cpp
@@ -41,7 +41,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "cvodes/cvodes.h"
 #include "nvector/nvector_serial.h"
-#include "sundials/sundials_math.h"
+#include "sundials/sundials_core.hpp"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
 
diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
index a1a6a8580c..d6adfa0c5b 100644
--- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
+++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
@@ -27,6 +27,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "cvodes/cvodes.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
 
diff --git a/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp b/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
index 4e8dfc7ef5..4a6e875892 100644
--- a/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
+++ b/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
@@ -46,6 +46,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "ida/ida.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp b/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
index 5cc1046727..dd414411df 100644
--- a/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
+++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
@@ -27,6 +27,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "ida/ida.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
 
diff --git a/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp b/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
index 1cd38ab0dd..b68d55f016 100644
--- a/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
+++ b/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
@@ -46,6 +46,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "idas/idas.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp b/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
index 10a3bddb79..058935779a 100644
--- a/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
+++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
@@ -27,6 +27,7 @@
 // Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "idas/idas.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
 
diff --git a/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp b/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
index 344e3a1bcb..fffa17ac73 100644
--- a/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
+++ b/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
@@ -45,6 +45,7 @@
 // Include KINSOL,vectors, and linear solvers
 #include "kinsol/kinsol.h"
 #include "nvector/nvector_serial.h"
+#include "sundials/sundials_core.hpp"
 #include "sundials/sundials_math.h"
 #include "sunlinsol/sunlinsol_dense.h"
 #include "sunmatrix/sunmatrix_dense.h"
diff --git a/test/unit_tests/sunmemory/sys/test_sunmemory_sys.cpp b/test/unit_tests/sunmemory/sys/test_sunmemory_sys.cpp
index 92e463aa25..101e9658ad 100644
--- a/test/unit_tests/sunmemory/sys/test_sunmemory_sys.cpp
+++ b/test/unit_tests/sunmemory/sys/test_sunmemory_sys.cpp
@@ -11,8 +11,7 @@
  *-----------------------------------------------------------------*/
 
 #include <iostream>
-#include <sundials/sundials_memory.h>
-#include <sundials/sundials_types.h>
+#include <sundials/sundials_core.hpp>
 #include <sunmemory/sunmemory_system.h>
 
 int test_instance(SUNMemoryHelper helper, SUNMemoryType mem_type,