Only include what you need

14 files changed, 33 insertions, 60 deletions

diff --git a/storageapi/src/tests/buckets/bucketinfotest.cpp b/storageapi/src/tests/buckets/bucketinfotest.cpp
index bc079ce8cad..5cfbdf97664 100644
--- a/storageapi/src/tests/buckets/bucketinfotest.cpp
+++ b/storageapi/src/tests/buckets/bucketinfotest.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 <cppunit/extensions/HelperMacros.h>
 #include <vespa/storageapi/buckets/bucketinfo.h>
 
diff --git a/storageapi/src/tests/testrunner.cpp b/storageapi/src/tests/testrunner.cpp
index d6a42e57fb4..9a07796a3f4 100644
--- a/storageapi/src/tests/testrunner.cpp
+++ b/storageapi/src/tests/testrunner.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/log/log.h>
 #include <vespa/vdstestlib/cppunit/cppunittestrunner.h>
 
diff --git a/storageapi/src/vespa/storageapi/app/getbucketid.cpp b/storageapi/src/vespa/storageapi/app/getbucketid.cpp
index bb9130a49b8..e25a9cfb64f 100644
--- a/storageapi/src/vespa/storageapi/app/getbucketid.cpp
+++ b/storageapi/src/vespa/storageapi/app/getbucketid.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/bucket/bucketidfactory.h>
 #include <vespa/document/base/documentid.h>
 #include <iostream>
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
index 1b3427b5784..334816fe93c 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
@@ -1,9 +1,10 @@
 // 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/protocolserialization5_0.h>
-
-#include <vespa/log/log.h>
+#include "protocolserialization5_0.h"
+#include "serializationhelper.h"
+#include "storagecommand.h"
+#include "storagereply.h"
+#include "storageprotocol.h"
 #include <vespa/messagebus/blob.h>
 #include <vespa/messagebus/blobref.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
@@ -11,16 +12,10 @@
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/multioperation.h>
-#include <vespa/storageapi/mbusprot/serializationhelper.h>
-#include <vespa/storageapi/mbusprot/storagecommand.h>
-#include <vespa/storageapi/mbusprot/storagereply.h>
-#include <vespa/storageapi/mbusprot/storageprotocol.h>
 #include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/document/select/orderingspecification.h>
 #include <vespa/storageapi/messageapi/returncode.h>
 
-LOG_SETUP(".storage.api.mbusprot.serialization.5_0");
-
 namespace storage {
 namespace mbusprot {
 
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
index 9244189da1f..c1941b475e4 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
@@ -1,9 +1,11 @@
 // 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/protocolserialization5_1.h>
+#include "protocolserialization5_1.h"
+#include "serializationhelper.h"
+#include "storagecommand.h"
+#include "storagereply.h"
+#include "storageprotocol.h"
 
-#include <vespa/log/log.h>
 #include <vespa/messagebus/blob.h>
 #include <vespa/messagebus/blobref.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
@@ -11,16 +13,10 @@
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/multioperation.h>
-#include <vespa/storageapi/mbusprot/serializationhelper.h>
-#include <vespa/storageapi/mbusprot/storagecommand.h>
-#include <vespa/storageapi/mbusprot/storagereply.h>
-#include <vespa/storageapi/mbusprot/storageprotocol.h>
 #include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/document/select/orderingspecification.h>
 #include <vespa/storageapi/messageapi/returncode.h>
 
-LOG_SETUP(".storage.api.mbusprot.serialization.5_1");
-
 namespace storage {
 namespace mbusprot {
 
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
index 68b8449cf4c..0b9cd6e5311 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
@@ -1,13 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // @author Vegard Sjonfjell
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/storageapi/mbusprot/protocolserialization5_2.h>
-#include <vespa/storageapi/mbusprot/storagecommand.h>
-#include <vespa/storageapi/mbusprot/serializationhelper.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP(".storage.api.mbusprot.serialization.5_2");
+#include "protocolserialization5_2.h"
+#include "storagecommand.h"
+#include "serializationhelper.h"
 
 namespace storage {
 namespace mbusprot {
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp
index 04d92b8fa9e..b0df3bc3e04 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.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/mbusprot/storagecommand.h>
+#include "storagecommand.h"
 
 namespace storage {
 namespace mbusprot {
@@ -8,8 +7,7 @@ namespace mbusprot {
 StorageCommand::StorageCommand(const storage::api::StorageCommand::SP& cmd)
     : mbus::Message(),
       _cmd(cmd)
-{
-}
+{ }
 
 } // mbusprot
 } // storage
diff --git a/storageapi/src/vespa/storageapi/message/batch.cpp b/storageapi/src/vespa/storageapi/message/batch.cpp
index 6da213efaf5..a3dcea3d13f 100644
--- a/storageapi/src/vespa/storageapi/message/batch.cpp
+++ b/storageapi/src/vespa/storageapi/message/batch.cpp
@@ -1,8 +1,8 @@
 // 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 <algorithm>
-#include <vespa/storageapi/message/batch.h>
+//
+#include "batch.h"
 #include <vespa/document/bucket/bucketidfactory.h>
+#include <algorithm>
 
 using namespace storage::api;
 
diff --git a/storageapi/src/vespa/storageapi/message/datagram.cpp b/storageapi/src/vespa/storageapi/message/datagram.cpp
index 8d93bc68944..11ad170eb5e 100644
--- a/storageapi/src/vespa/storageapi/message/datagram.cpp
+++ b/storageapi/src/vespa/storageapi/message/datagram.cpp
@@ -1,7 +1,7 @@
 // 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 "datagram.h"
 #include <cassert>
-#include <vespa/storageapi/message/datagram.h>
 
 namespace storage {
 namespace api {
diff --git a/storageapi/src/vespa/storageapi/message/documentsummary.cpp b/storageapi/src/vespa/storageapi/message/documentsummary.cpp
index cfb56489459..67f23fdb816 100644
--- a/storageapi/src/vespa/storageapi/message/documentsummary.cpp
+++ b/storageapi/src/vespa/storageapi/message/documentsummary.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/message/documentsummary.h>
+#include "documentsummary.h"
 
 namespace storage {
 namespace api {
@@ -11,8 +10,7 @@ IMPLEMENT_REPLY(DocumentSummaryReply)
 DocumentSummaryCommand::DocumentSummaryCommand()
     : StorageCommand(MessageType::DOCUMENTSUMMARY),
       DocumentSummary()
-{
-}
+{ }
 
 void
 DocumentSummaryCommand::print(std::ostream& out, bool verbose,
@@ -27,8 +25,7 @@ DocumentSummaryCommand::print(std::ostream& out, bool verbose,
 
 DocumentSummaryReply::DocumentSummaryReply(const DocumentSummaryCommand& cmd)
     : StorageReply(cmd)
-{
-}
+{ }
 
 void
 DocumentSummaryReply::print(std::ostream& out, bool verbose,
diff --git a/storageapi/src/vespa/storageapi/message/queryresult.cpp b/storageapi/src/vespa/storageapi/message/queryresult.cpp
index 0bef270b6ce..8981afc4131 100644
--- a/storageapi/src/vespa/storageapi/message/queryresult.cpp
+++ b/storageapi/src/vespa/storageapi/message/queryresult.cpp
@@ -1,6 +1,6 @@
 // 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/message/queryresult.h>
+
+#include "queryresult.h"
 
 namespace storage {
 namespace api {
@@ -12,8 +12,7 @@ QueryResultCommand::QueryResultCommand()
     : StorageCommand(MessageType::QUERYRESULT),
       _searchResult(),
       _summary()
-{
-}
+{ }
 
 void
 QueryResultCommand::print(std::ostream& out, bool verbose,
@@ -28,8 +27,7 @@ QueryResultCommand::print(std::ostream& out, bool verbose,
 
 QueryResultReply::QueryResultReply(const QueryResultCommand& cmd)
     : StorageReply(cmd)
-{
-}
+{ }
 
 void
 QueryResultReply::print(std::ostream& out, bool verbose,
diff --git a/storageapi/src/vespa/storageapi/message/searchresult.cpp b/storageapi/src/vespa/storageapi/message/searchresult.cpp
index b344ce8566a..700191d46e4 100644
--- a/storageapi/src/vespa/storageapi/message/searchresult.cpp
+++ b/storageapi/src/vespa/storageapi/message/searchresult.cpp
@@ -1,6 +1,6 @@
 // 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/message/searchresult.h>
+
+#include "searchresult.h"
 
 using vdslib::SearchResult;
 
@@ -29,8 +29,7 @@ SearchResultCommand::print(std::ostream& out, bool verbose,
 
 SearchResultReply::SearchResultReply(const SearchResultCommand& cmd)
     : StorageReply(cmd)
-{
-}
+{ }
 
 void
 SearchResultReply::print(std::ostream& out, bool verbose,
diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp
index feb03e58c71..9f671b953f1 100644
--- a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp
@@ -1,7 +1,6 @@
 // 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/messageapi/bucketinfocommand.h>
+#include "bucketinfocommand.h"
 
 #include <vespa/storageapi/message/persistence.h>
 
diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
index 6b2a80563c8..f11d91b7079 100644
--- a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
@@ -1,13 +1,11 @@
 // 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/messageapi/returncode.h>
+#include "returncode.h"
 #include <vespa/messagebus/errorcode.h>
 
 #include <vespa/document/util/bytebuffer.h>
 #include <vespa/fnet/frt/error.h>
-#include <iostream>
-#include <vector>
+#include <ostream>
 
 namespace storage {
 namespace api {