Do not include the world.

2 files changed, 7 insertions, 5 deletions

diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp
index 76b0a3c4686..58e662a2b1d 100644
--- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp
+++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "metricpersistenceprovider.h"
+#include <vespa/metrics/valuemetric.h>
+#include <vespa/metrics/metrictimer.h>
 #include <cassert>
 
 #include <vespa/log/log.h>
diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h
index e169ad098c7..b804fd21550 100644
--- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h
+++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h
@@ -6,10 +6,10 @@
 #pragma once
 
 #include "persistenceprovider.h"
-#include <vespa/metrics/metrics.h>
+#include <vespa/metrics/metricset.h>
+#include <vespa/metrics/valuemetric.h>
 
-namespace storage {
-namespace spi {
+namespace storage::spi {
 
 class MetricPersistenceProvider : public PersistenceProvider,
                                   public metrics::MetricSet
@@ -61,5 +61,5 @@ private:
     void defineResultMetrics(int index, const char* name);
 };
 
-} // spi
-} // storage
+}
+