diff --git a/include/boost/histogram.hpp b/include/boost/histogram.hpp
index 4df37431..99126689 100644
--- a/include/boost/histogram.hpp
+++ b/include/boost/histogram.hpp
@@ -8,9 +8,12 @@
 #define BOOST_HISTOGRAM_HPP_
 
 #include <boost/histogram/axis/axis.hpp>
-#include <boost/histogram/histogram.hpp>
 #include <boost/histogram/literals.hpp>
+#include <boost/histogram/dynamic_histogram.hpp>
+#include <boost/histogram/static_histogram.hpp>
 #include <boost/histogram/storage/adaptive_storage.hpp>
+#include <boost/histogram/storage/array_storage.hpp>
+#include <boost/histogram/storage/weight_counter.hpp>
 
 /**
  * \file boost/histogram.hpp
diff --git a/include/boost/histogram/dynamic_histogram.hpp b/include/boost/histogram/dynamic_histogram.hpp
index b23b5330..a1453075 100644
--- a/include/boost/histogram/dynamic_histogram.hpp
+++ b/include/boost/histogram/dynamic_histogram.hpp
@@ -16,6 +16,7 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/detail/utility.hpp>
 #include <boost/histogram/histogram_fwd.hpp>
+#include <boost/histogram/arithmetic_operators.hpp>
 #include <boost/histogram/iterator.hpp>
 #include <boost/histogram/storage/array_storage.hpp>
 #include <boost/histogram/storage/operators.hpp>
diff --git a/include/boost/histogram/histogram.hpp b/include/boost/histogram/histogram.hpp
deleted file mode 100644
index 87bba5d8..00000000
--- a/include/boost/histogram/histogram.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015-2017 Hans Dembinski
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt
-// or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef _BOOST_HISTOGRAM_HISTOGRAM_HPP_
-#define _BOOST_HISTOGRAM_HISTOGRAM_HPP_
-
-#include <boost/histogram/arithmetic_operators.hpp>
-#include <boost/histogram/dynamic_histogram.hpp>
-#include <boost/histogram/static_histogram.hpp>
-
-#endif
diff --git a/include/boost/histogram/serialization.hpp b/include/boost/histogram/serialization.hpp
index c5de3ce4..8a132697 100644
--- a/include/boost/histogram/serialization.hpp
+++ b/include/boost/histogram/serialization.hpp
@@ -10,7 +10,8 @@
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/fusion/include/for_each.hpp>
 #include <boost/histogram/detail/utility.hpp>
-#include <boost/histogram/histogram.hpp>
+#include <boost/histogram/static_histogram.hpp>
+#include <boost/histogram/dynamic_histogram.hpp>
 #include <boost/histogram/storage/adaptive_storage.hpp>
 #include <boost/histogram/storage/array_storage.hpp>
 #include <boost/histogram/storage/weight_counter.hpp>
diff --git a/include/boost/histogram/static_histogram.hpp b/include/boost/histogram/static_histogram.hpp
index 046bfe04..1f085f07 100644
--- a/include/boost/histogram/static_histogram.hpp
+++ b/include/boost/histogram/static_histogram.hpp
@@ -24,8 +24,10 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/detail/utility.hpp>
 #include <boost/histogram/histogram_fwd.hpp>
+#include <boost/histogram/arithmetic_operators.hpp>
 #include <boost/histogram/iterator.hpp>
 #include <boost/histogram/storage/operators.hpp>
+#include <boost/histogram/storage/weight_counter.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/count_if.hpp>
 #include <boost/mpl/deref.hpp>
diff --git a/src/python/histogram.cpp b/src/python/histogram.cpp
index 1116b227..21a35684 100644
--- a/src/python/histogram.cpp
+++ b/src/python/histogram.cpp
@@ -7,6 +7,7 @@
 #include "serialization_suite.hpp"
 #include "utility.hpp"
 #include <boost/histogram/dynamic_histogram.hpp>
+#include <boost/histogram/storage/adaptive_storage.hpp>
 #include <boost/histogram/ostream_operators.hpp>
 #include <boost/histogram/serialization.hpp>
 #include <boost/python.hpp>
@@ -29,7 +30,7 @@ namespace mpl = boost::mpl;
 namespace bh = boost::histogram;
 namespace bp = boost::python;
 
-using pyhistogram = bh::histogram<bh::dynamic_tag, bh::axis::builtins>;
+using pyhistogram = bh::dynamic_histogram<>;
 
 namespace boost {
 namespace python {
diff --git a/test/histogram_test.cpp b/test/histogram_test.cpp
index fa37a337..6fc3d943 100644
--- a/test/histogram_test.cpp
+++ b/test/histogram_test.cpp
@@ -8,7 +8,8 @@
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/histogram/histogram.hpp>
+#include <boost/histogram/dynamic_histogram.hpp>
+#include <boost/histogram/static_histogram.hpp>
 #include <boost/histogram/literals.hpp>
 #include <boost/histogram/ostream_operators.hpp>
 #include <boost/histogram/serialization.hpp>
diff --git a/test/speed_cpp.cpp b/test/speed_cpp.cpp
index 141865c4..052fd5b5 100644
--- a/test/speed_cpp.cpp
+++ b/test/speed_cpp.cpp
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <boost/histogram.hpp>
-#include <boost/histogram/storage/array_storage.hpp>
 #include <cstdio>
 #include <ctime>
 #include <limits>