diff --git a/include/boost/math/special_functions/daubechies_scaling.hpp b/include/boost/math/special_functions/daubechies_scaling.hpp
index b18828d44..96147e20f 100644
--- a/include/boost/math/special_functions/daubechies_scaling.hpp
+++ b/include/boost/math/special_functions/daubechies_scaling.hpp
@@ -45,7 +45,7 @@ std::vector<Real> dyadic_grid(int64_t j_max)
 
     for (int64_t j = 1; j <= j_max; ++j)
     {
-        int64_t k_max = v.size()/(1 << (j_max-j));
+        int64_t k_max = v.size()/(int64_t(1) << (j_max-j));
         for (int64_t k = 1; k < k_max;  k += 2)
         {
             // Where this value will go:
@@ -58,7 +58,7 @@ std::vector<Real> dyadic_grid(int64_t j_max)
             Real term = 0;
             for (int64_t l = 0; l < (int64_t) c.size(); ++l)
             {
-                int64_t idx = k*(1 << (j_max - j + 1)) - l*(1 << j_max);
+                int64_t idx = k*(int64_t(1) << (j_max - j + 1)) - l*(int64_t(1) << j_max);
                 if (idx < 0)
                 {
                     break;
diff --git a/test/daubechies_scaling_test.cpp b/test/daubechies_scaling_test.cpp
index f2795c9f9..532eccdc4 100644
--- a/test/daubechies_scaling_test.cpp
+++ b/test/daubechies_scaling_test.cpp
@@ -257,11 +257,11 @@ void test_dyadic_grid()
 
         for (size_t j = 1; j < 10; ++j)
         {
-            auto phijk = boost::math::dyadic_grid<Real, i+2, 0>(j);
-            auto phik = boost::math::detail::daubechies_scaling_integer_grid<Real, i+2, 0>();
-            for (size_t i = 0; i < phik.size(); ++i)
+            phijk = boost::math::dyadic_grid<Real, i+2, 0>(j);
+            phik = boost::math::detail::daubechies_scaling_integer_grid<Real, i+2, 0>();
+            for (size_t l = 0; l < phik.size(); ++l)
             {
-                CHECK_ULP_CLOSE(phik[i], phijk[i*(1<<j)], 0);
+                CHECK_ULP_CLOSE(phik[l], phijk[l*(1<<j)], 0);
             }
 
             // This test is from Daubechies, Ten Lectures on Wavelets, Ch 7 "More About Compactly Supported Wavelets",
@@ -269,9 +269,9 @@ void test_dyadic_grid()
             for (size_t k = 1; k < j; ++k)
             {
                 auto cond = boost::math::tools::summation_condition_number<Real>(0);
-                for (size_t i = 0; i < phik.size(); ++i)
+                for (size_t l = 0; l < phik.size(); ++l)
                 {
-                    size_t idx = i*(1<<j) + k;
+                    size_t idx = l*(1<<j) + k;
                     if (idx < phijk.size())
                     {
                         cond += phijk[idx];
diff --git a/test/quintic_hermite_test.cpp b/test/quintic_hermite_test.cpp
index b6fd70471..997155f70 100644
--- a/test/quintic_hermite_test.cpp
+++ b/test/quintic_hermite_test.cpp
@@ -8,6 +8,8 @@
 #include "math_unit_test.hpp"
 #include <numeric>
 #include <utility>
+#include <vector>
+#include <array>
 #include <boost/random/uniform_real.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/math/interpolators/quintic_hermite.hpp>