Include only what you need.

4 files changed, 8 insertions, 10 deletions

diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp
index 044bf1ea56e..5cbaef2363f 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp
@@ -3,7 +3,7 @@
 
 #include "environment.h"
 #include <vespa/vespalib/util/random.h>
-#include <vespa/vespalib/util/vstringfmt.h>
+#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <vespa/config/subscription/configuri.h>
 #include <vespa/vespalib/stllike/asciistream.h>
@@ -85,12 +85,12 @@ Environment::calculatePathInDir(const Types::BucketId& id, Directory& dir)
     vespalib::RandomGen randomizer(static_cast<uint32_t>(seed) ^ 0xba5eba11);
 
     for (uint32_t i = 1; i <= (uint32_t)_config->dirLevels; ++i) {
-        os << vespalib::make_vespa_string(
+        os << vespalib::make_string(
                 "%.4x/",
                 randomizer.nextUint32() % _config->dirSpread);
     }
 
-    os << vespalib::make_vespa_string("%.8" PRIx64 ".0", id.getId());
+    os << vespalib::make_string("%.8" PRIx64 ".0", id.getId());
     return os.str();
 }
 
diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp
index 39530d4d8d1..5e1d835e3a2 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp
@@ -10,6 +10,7 @@
 #include <vespa/vespalib/util/guard.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <fstream>
+#include <sys/stat.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".persistence.mountpointlist");
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp
index ee908fb6c6f..c4f4e7e8bc1 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <sstream>
+#include <cassert>
 
 #include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.memfile.bufferedfilewriter");
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
index 2370665f3d6..993004c01f0 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.h
@@ -16,16 +16,15 @@
 
 #pragma once
 
-#include <vespa/fastos/types.h>
 #include <vector>
+#include <cstring>
+#include <cstdint>
 
 namespace vespalib {
     class File;
 }
 
-namespace storage {
-
-namespace memfile {
+namespace storage::memfile {
 
 class BufferedFileWriter {
 public:
@@ -115,6 +114,3 @@ private:
 };
 
 }
-
-}
-