diff --git a/GaudiKernel/include/Gaudi/Accumulators.h b/GaudiKernel/include/Gaudi/Accumulators.h
index 3ac803f85ff89f1b890a33dc8124e46b3eee2c75..fbda99e07b468282867d03dadc8d11f2c655a52a 100644
--- a/GaudiKernel/include/Gaudi/Accumulators.h
+++ b/GaudiKernel/include/Gaudi/Accumulators.h
@@ -909,10 +909,11 @@ namespace Gaudi::Accumulators {
   class BufferableCounter : public PrintableCounter, public Accumulator<Atomicity, Args...> {
   public:
     using Accumulator<Atomicity, Args...>::Accumulator;
+    using BufferType    = Buffer<Accumulator, Atomicity, Args...>;
     BufferableCounter() = default;
     template <typename OWNER>
     BufferableCounter( OWNER* o, std::string const& name ) : BufferableCounter( o, name, *this ) {}
-    Buffer<Accumulator, Atomicity, Args...> buffer() { return { *this }; }
+    BufferType buffer() { return { *this }; }
     BufferableCounter( BufferableCounter const& )            = delete;
     BufferableCounter& operator=( BufferableCounter const& ) = delete;
     ~BufferableCounter() {
diff --git a/GaudiKernel/include/Gaudi/Accumulators/HistogramWrapper.h b/GaudiKernel/include/Gaudi/Accumulators/HistogramWrapper.h
index caf7beff3e8c99882dcd9b74d3b177e6520d2a39..5c69260c5102add9931643d50eff34a4fcefee70 100644
--- a/GaudiKernel/include/Gaudi/Accumulators/HistogramWrapper.h
+++ b/GaudiKernel/include/Gaudi/Accumulators/HistogramWrapper.h
@@ -44,6 +44,7 @@ namespace Gaudi::Accumulators {
   public:
     using AxisTupleType      = typename HistogramType::AxisTupleType;
     using AxisArithmeticType = typename HistogramType::AxisArithmeticType;
+    using BufferType         = typename HistogramType::BufferType;
     template <unsigned int I>
     using AxisType = std::tuple_element_t<I, AxisTupleType>;