string.h does not need alloc.h

3 files changed, 10 insertions, 22 deletions

diff --git a/storage/src/vespa/storage/distributor/clusterinformation.h b/storage/src/vespa/storage/distributor/clusterinformation.h
index 49abb5e8e75..feb88008f7d 100644
--- a/storage/src/vespa/storage/distributor/clusterinformation.h
+++ b/storage/src/vespa/storage/distributor/clusterinformation.h
@@ -1,37 +1,26 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <stdint.h>
-#include <vector>
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <cstdint>
+#include <vector>
+#include <memory>
 
-namespace storage {
-
-namespace lib {
-
-class ClusterStateBundle;
-
-}
+namespace storage::lib { class ClusterStateBundle; }
 
-namespace distributor {
+namespace storage::distributor {
 
 class ClusterInformation
 {
 public:
-    typedef std::shared_ptr<const ClusterInformation> CSP;
-
-    virtual ~ClusterInformation() {}
+    using CSP = std::shared_ptr<const ClusterInformation>;
 
+    virtual ~ClusterInformation() = default;
     virtual uint16_t getDistributorIndex() const = 0;
-
     virtual const lib::ClusterStateBundle& getClusterStateBundle() const = 0;
-
     virtual const char* getStorageUpStates() const = 0;
-
     uint16_t getStorageNodeCount() const;
 };
 
 }
-}
-
diff --git a/storage/src/vespa/storage/persistence/diskthread.h b/storage/src/vespa/storage/persistence/diskthread.h
index 114257c38d4..08862c4251a 100644
--- a/storage/src/vespa/storage/persistence/diskthread.h
+++ b/storage/src/vespa/storage/persistence/diskthread.h
@@ -13,14 +13,12 @@
 #pragma once
 
 #include <vespa/storageframework/generic/thread/runnable.h>
+#include <memory>
 
+namespace storage::framework { class Thread; }
 
 namespace storage {
 
-namespace framework {
-    class Thread;
-}
-
 class DiskThread : public framework::Runnable
 {
 public:
diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h b/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h
index 675341e4a1d..01c899c47db 100644
--- a/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h
+++ b/storage/src/vespa/storage/storageserver/rpc/rpc_target_pool.h
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <cstdint>
 #include <vector>
+#include <memory>
 
 namespace storage::rpc {