diff --git a/include/boost/histogram/accumulators/mean.hpp b/include/boost/histogram/accumulators/mean.hpp
index 9905f388..374da1e7 100644
--- a/include/boost/histogram/accumulators/mean.hpp
+++ b/include/boost/histogram/accumulators/mean.hpp
@@ -7,6 +7,7 @@
 #ifndef BOOST_HISTOGRAM_ACCUMULATORS_MEAN_HPP
 #define BOOST_HISTOGRAM_ACCUMULATORS_MEAN_HPP
 
+#include <boost/histogram/histogram_fwd.hpp>
 #include <cstddef>
 
 namespace boost {
diff --git a/include/boost/histogram/accumulators/neumaier.hpp b/include/boost/histogram/accumulators/neumaier.hpp
index b14aa24f..394bfb20 100644
--- a/include/boost/histogram/accumulators/neumaier.hpp
+++ b/include/boost/histogram/accumulators/neumaier.hpp
@@ -7,6 +7,7 @@
 #ifndef BOOST_HISTOGRAM_ACCUMULATORS_NEUMAIER_HPP
 #define BOOST_HISTOGRAM_ACCUMULATORS_NEUMAIER_HPP
 
+#include <boost/histogram/histogram_fwd.hpp>
 #include <cmath>
 
 namespace boost {
diff --git a/include/boost/histogram/accumulators/weight.hpp b/include/boost/histogram/accumulators/weight.hpp
index fb40d3cf..36c5fec5 100644
--- a/include/boost/histogram/accumulators/weight.hpp
+++ b/include/boost/histogram/accumulators/weight.hpp
@@ -7,7 +7,7 @@
 #ifndef BOOST_HISTOGRAM_ACCUMULATORS_WEIGHT_HPP
 #define BOOST_HISTOGRAM_ACCUMULATORS_WEIGHT_HPP
 
-#include <stdexcept>
+#include <boost/histogram/histogram_fwd.hpp>
 
 namespace boost {
 namespace histogram {
diff --git a/include/boost/histogram/accumulators/weighted_mean.hpp b/include/boost/histogram/accumulators/weighted_mean.hpp
index 1add86d5..47317044 100644
--- a/include/boost/histogram/accumulators/weighted_mean.hpp
+++ b/include/boost/histogram/accumulators/weighted_mean.hpp
@@ -7,6 +7,8 @@
 #ifndef BOOST_HISTOGRAM_ACCUMULATORS_WEIGHTED_MEAN_HPP
 #define BOOST_HISTOGRAM_ACCUMULATORS_WEIGHTED_MEAN_HPP
 
+#include <boost/histogram/histogram_fwd.hpp>
+
 namespace boost {
 namespace histogram {
 namespace accumulators {
diff --git a/test/internal_accumulators_test.cpp b/test/internal_accumulators_test.cpp
index c9f348cc..1c734449 100644
--- a/test/internal_accumulators_test.cpp
+++ b/test/internal_accumulators_test.cpp
@@ -142,7 +142,7 @@ int main() {
   }
 
   {
-    accumulators::weight<accumulators::neumaier<>> w;
+    accumulators::weight<accumulators::neumaier<double>> w;
 
     w();
     w(1e100);