Targeted include

2 files changed, 9 insertions, 13 deletions

diff --git a/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp b/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
index e4c89b81f18..0304da45a38 100644
--- a/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
+++ b/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
@@ -1,6 +1,5 @@
 // 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/storageapi/buckets/bucketinfo.h>
+#include "bucketinfo.h"
 
 namespace storage {
 namespace api {
@@ -92,9 +91,7 @@ BucketInfo::print(vespalib::asciistream& out, const PrintProperties&) const
 {
     out << "BucketInfo(";
     if (valid()) {
-        std::ostringstream ost;
-        ost << std::hex << _checksum;
-        out << "crc 0x" << ost.str()
+        out << "crc 0x" << vespalib::hex << _checksum << vespalib::dec
             << ", docCount " << _docCount
             << ", totDocSize " << _totDocSize;
         if (_totDocSize != _usedFileSize) {
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
index 7e1e3815dc5..27fb603db24 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
@@ -1,14 +1,13 @@
 // 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/storageapi/mbusprot/storageprotocol.h>
-
-#include <vespa/log/log.h>
-#include <vespa/storageapi/mbusprot/protocolserialization.h>
-#include <vespa/storageapi/mbusprot/serializationhelper.h>
-#include <vespa/storageapi/mbusprot/storagecommand.h>
-#include <vespa/storageapi/mbusprot/storagereply.h>
+#include "storageprotocol.h"
+#include "protocolserialization.h"
+#include "serializationhelper.h"
+#include "storagecommand.h"
+#include "storagereply.h"
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/document/util/stringutil.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".storage.api.mbusprot.protocol");
 
 namespace storage {