Do not bring in nbostream everywhere.

2 files changed, 4 insertions, 5 deletions

diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.cpp b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
index 7cf782376c9..dd9a231536a 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.cpp
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
@@ -1,5 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/memfilepersistence/spi/memfilepersistenceprovider.h>
@@ -9,6 +8,7 @@
 #include <vespa/storageframework/defaultimplementation/memory/simplememorylogic.h>
 #include <vespa/document/update/assignvalueupdate.h>
 #include <sys/time.h>
+#include <vespa/vespalib/objects/nbostream.h>
 
 using document::DocumentType;
 
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h
index d305d6a8e25..f5c8914d40d 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h
@@ -9,11 +9,10 @@
 #include <vespa/vespalib/util/exception.h>
 #include <vespa/vespalib/util/alloc.h>
 #include <vespa/memfilepersistence/mapper/versionserializer.h>
+#include <vespa/vespalib/objects/nbostream.h>
 
-namespace storage
-{
-namespace memfile
-{
+namespace storage {
+namespace memfile {
 
 namespace util {