Include only what you need.

8 files changed, 23 insertions, 16 deletions

diff --git a/metrics/src/vespa/metrics/jsonwriter.cpp b/metrics/src/vespa/metrics/jsonwriter.cpp
index d0b269a1521..8dd5e8fdbcb 100644
--- a/metrics/src/vespa/metrics/jsonwriter.cpp
+++ b/metrics/src/vespa/metrics/jsonwriter.cpp
@@ -1,13 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/metrics/jsonwriter.h>
+#include "jsonwriter.h"
 
-#include <vespa/metrics/countmetric.h>
-#include <vespa/metrics/valuemetric.h>
-#include <vespa/metrics/metricsnapshot.h>
-#include <vespa/vespalib/util/jsonstream.h>
+#include "countmetric.h"
+#include "valuemetric.h"
+#include "metricsnapshot.h"
 
-#include <algorithm>
 #include <iterator>
+#include <cassert>
 
 namespace metrics {
 
diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp
index 781a26a718d..0a66f985867 100644
--- a/metrics/src/vespa/metrics/loadmetric.hpp
+++ b/metrics/src/vespa/metrics/loadmetric.hpp
@@ -4,6 +4,7 @@
 #include "loadmetric.h"
 #include "memoryconsumption.h"
 #include <vespa/vespalib/stllike/hash_map.hpp>
+#include <cassert>
 
 namespace metrics {
 
diff --git a/metrics/src/vespa/metrics/metric.cpp b/metrics/src/vespa/metrics/metric.cpp
index 42096031486..5f39fccab07 100644
--- a/metrics/src/vespa/metrics/metric.cpp
+++ b/metrics/src/vespa/metrics/metric.cpp
@@ -10,6 +10,7 @@
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <iterator>
+#include <cassert>
 
 namespace metrics {
 
diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h
index 7819dc5f012..1b97dcb7d27 100644
--- a/metrics/src/vespa/metrics/metric.h
+++ b/metrics/src/vespa/metrics/metric.h
@@ -4,7 +4,6 @@
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/regexp.h>
-#include <assert.h>
 
 namespace metrics {
 
diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp
index 0bc2f3363dc..af6d9c43d08 100644
--- a/metrics/src/vespa/metrics/metricset.cpp
+++ b/metrics/src/vespa/metrics/metricset.cpp
@@ -6,6 +6,7 @@
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <list>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".metrics.metricsset");
@@ -74,6 +75,15 @@ MetricSet::getMetricInternal(const String& name) const
     return 0;
 }
 
+int64_t MetricSet::getLongValue(const stringref &) const {
+    assert(false);
+    return 0;
+}
+double MetricSet::getDoubleValue(const stringref &) const {
+    assert(false);
+    return 0;
+}
+
 const Metric*
 MetricSet::getMetric(const String& name) const
 {
diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h
index 5851cdea43c..e6f7cfc0deb 100644
--- a/metrics/src/vespa/metrics/metricset.h
+++ b/metrics/src/vespa/metrics/metricset.h
@@ -10,9 +10,7 @@
  */
 #pragma once
 
-#include <map>
-#include <vespa/metrics/metric.h>
-#include <assert.h>
+#include "metric.h"
 
 namespace metrics {
 
@@ -65,10 +63,8 @@ public:
     void print(std::ostream&, bool verbose, const std::string& indent, uint64_t secondsPassed) const override;
 
     // These should never be called on metrics set.
-    int64_t getLongValue(const stringref & id) const override
-    { (void) id; assert(false); return 0; }
-    double getDoubleValue(const stringref & id) const override
-    { (void) id; assert(false); return 0; }
+    int64_t getLongValue(const stringref & id) const override;
+    double getDoubleValue(const stringref & id) const override;
 
     const Metric* getMetric(const String& name) const;
     Metric* getMetric(const String& name) {
diff --git a/metrics/src/vespa/metrics/metricsnapshot.cpp b/metrics/src/vespa/metrics/metricsnapshot.cpp
index 78fbf6e57a2..0b6ad8f9acd 100644
--- a/metrics/src/vespa/metrics/metricsnapshot.cpp
+++ b/metrics/src/vespa/metrics/metricsnapshot.cpp
@@ -113,8 +113,8 @@ MetricSnapshotSet::timeForAnotherSnapshot(time_t currentTime) {
         if (currentTime >= lastTime + 2 * getPeriod()) {
             LOG(warning, "Metric snapshot set %s was asked if it was time for "
                          "another snapshot, a whole period beyond when it "
-                         "should have been done (Last update was at time %"
-                         PRIu64 ", current time is %" PRIu64 " and period is %u). "
+                         "should have been done (Last update was at time %lu"
+                         ", current time is %lu and period is %u). "
                          "Clearing data and updating time to current time.",
                 getName().c_str(), lastTime, currentTime, getPeriod());
             reset(currentTime);
diff --git a/metrics/src/vespa/metrics/summetric.hpp b/metrics/src/vespa/metrics/summetric.hpp
index 484d4f08169..01e4f5c5dfe 100644
--- a/metrics/src/vespa/metrics/summetric.hpp
+++ b/metrics/src/vespa/metrics/summetric.hpp
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <ostream>
+#include <cassert>
 
 namespace metrics {