diff --git a/src/BC1/BC1Encoder.cpp b/src/BC1/BC1Encoder.cpp
index 52d854a..872b94c 100644
--- a/src/BC1/BC1Encoder.cpp
+++ b/src/BC1/BC1Encoder.cpp
@@ -37,6 +37,7 @@
 #include "Histogram.h"
 #include "OrderTable.h"
 #include "SingleColorTable.h"
+#include "Tables.h"
 
 namespace rgbcx {
 using InterpolatorPtr = std::shared_ptr<Interpolator>;
diff --git a/src/BC1/Histogram.h b/src/BC1/Histogram.h
index 94d586e..613fd68 100644
--- a/src/BC1/Histogram.h
+++ b/src/BC1/Histogram.h
@@ -29,18 +29,16 @@
 
 #include "../Vector4.h"
 #include "../util.h"
-#include "OrderTable.h"
-#include "Tables.h"
 
 namespace rgbcx {
 template <size_t N> class Histogram {
    public:
     using Hash = uint16_t;
 
-    Histogram() { _bins = {0}; }
+    Histogram() { _bins.fill(0); }
 
     Histogram(std::array<uint8_t, 16> sels) {
-        _bins = {0};
+        _bins.fill(0);
         for (unsigned i = 0; i < 16; i++) {
             assert(sels[i] < N);
             _bins[sels[i]]++;
@@ -74,8 +72,6 @@ template <size_t N> class Histogram {
         unsigned packed = 0;
         for (unsigned i = 0; i < (N - 1); i++) { packed |= (_bins[i] << (4U * i)); }
 
-        //        assert(packed < HashCount);
-
         return packed;
     }