optimize includes.

12 files changed, 22 insertions, 46 deletions

diff --git a/storage/src/vespa/storage/common/bucketoperationlogger.cpp b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
index ef4ab1ac8ce..c53ca237e81 100644
--- a/storage/src/vespa/storage/common/bucketoperationlogger.cpp
+++ b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
@@ -1,16 +1,15 @@
 // 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/storage/common/bucketoperationlogger.h>
+#include "bucketoperationlogger.h"
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storage/bucketdb/bucketcopy.h>
-#include <vespa/log/log.h>
+
 #include <vespa/storageapi/buckets/bucketinfo.h>
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <vespa/vespalib/util/backtrace.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 
 #ifdef ENABLE_BUCKET_OPERATION_LOGGING
-
+#include <vespa/log/log.h>
 LOG_SETUP(".debuglogger");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/common/messagesender.cpp b/storage/src/vespa/storage/common/messagesender.cpp
index 77fa024ab13..40d73ca0954 100644
--- a/storage/src/vespa/storage/common/messagesender.cpp
+++ b/storage/src/vespa/storage/common/messagesender.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/storage/common/messagesender.h>
+#include "messagesender.h"
 #include <vespa/storageapi/messageapi/storagemessage.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/messageapi/storagecommand.h>
diff --git a/storage/src/vespa/storage/common/messagesender.h b/storage/src/vespa/storage/common/messagesender.h
index 332103e12db..04765047692 100644
--- a/storage/src/vespa/storage/common/messagesender.h
+++ b/storage/src/vespa/storage/common/messagesender.h
@@ -41,5 +41,3 @@ struct ChainedMessageSender {
 };
 
 } // storage
-
-
diff --git a/storage/src/vespa/storage/common/storagelink.cpp b/storage/src/vespa/storage/common/storagelink.cpp
index 73338be9c1f..d3b6370347b 100644
--- a/storage/src/vespa/storage/common/storagelink.cpp
+++ b/storage/src/vespa/storage/common/storagelink.cpp
@@ -1,14 +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/storage/common/storagelink.h>
-
-#include <vespa/log/log.h>
-#include <sstream>
-#include <vespa/storageapi/messageapi/storagecommand.h>
-#include <vespa/storage/common/bucketmessages.h>
+#include "storagelink.h"
+#include "bucketmessages.h"
 #include <vespa/vespalib/util/backtrace.h>
+#include <sstream>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".application.link");
 
 using std::shared_ptr;
@@ -312,4 +309,3 @@ std::ostream& operator<<(std::ostream& out, StorageLink& link) {
 }
 
 }
-
diff --git a/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp b/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp
index f0465620253..5fe9c528709 100644
--- a/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/mergestatus.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/storage/persistence/filestorage/mergestatus.h>
+
+#include "mergestatus.h"
 #include <vespa/log/log.h>
 
 LOG_SETUP(".mergestatus");
diff --git a/storage/src/vespa/storage/persistence/filestorage/mergestatus.h b/storage/src/vespa/storage/persistence/filestorage/mergestatus.h
index ff7e9e5dfb4..e094393569b 100644
--- a/storage/src/vespa/storage/persistence/filestorage/mergestatus.h
+++ b/storage/src/vespa/storage/persistence/filestorage/mergestatus.h
@@ -3,7 +3,6 @@
 
 #include <vespa/persistence/spi/context.h>
 #include <vespa/storageframework/storageframework.h>
-#include <vespa/storageframework/storageframework.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucket.h>
@@ -29,20 +28,15 @@ public:
     framework::MilliSecTimer startTime;
     spi::Context context;
  	
-    MergeStatus(framework::Clock&, const metrics::LoadType&,
-                api::StorageMessage::Priority, uint32_t traceLevel);
+    MergeStatus(framework::Clock&, const metrics::LoadType&, api::StorageMessage::Priority, uint32_t traceLevel);
 
     /**
      * @return true if any entries were removed from the internal diff
      *   or the two diffs had entries with mismatching hasmasks, which
      *   indicates that bucket contents have changed during the merge.
      */
-    bool removeFromDiff(
-            const std::vector<api::ApplyBucketDiffCommand::Entry>& part,
-            uint16_t hasMask);
-    void print(std::ostream& out, bool verbose,
-               const std::string& indent) const override;
-
+    bool removeFromDiff(const std::vector<api::ApplyBucketDiffCommand::Entry>& part, uint16_t hasMask);
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
     bool isFirstNode() const { return (reply.get() != 0); }
 };
 
diff --git a/storage/src/vespa/storage/visiting/countvisitor.cpp b/storage/src/vespa/storage/visiting/countvisitor.cpp
index c3dd7cc4995..282e2f32873 100644
--- a/storage/src/vespa/storage/visiting/countvisitor.cpp
+++ b/storage/src/vespa/storage/visiting/countvisitor.cpp
@@ -1,12 +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/storage/visiting/countvisitor.h>
-
+#include "countvisitor.h"
 #include <vespa/document/fieldvalue/document.h>
-#include <vespa/log/log.h>
 #include <vespa/documentapi/messagebus/messages/visitor.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".visitor.instance.countvisitor");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/visiting/memory_bounded_trace.cpp b/storage/src/vespa/storage/visiting/memory_bounded_trace.cpp
index f29c07fdc03..a942b8f3612 100644
--- a/storage/src/vespa/storage/visiting/memory_bounded_trace.cpp
+++ b/storage/src/vespa/storage/visiting/memory_bounded_trace.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/storage/visiting/memory_bounded_trace.h>
+#include "memory_bounded_trace.h"
 #include <vespa/vespalib/util/stringfmt.h>
 
 namespace storage {
diff --git a/storage/src/vespa/storage/visiting/memory_bounded_trace.h b/storage/src/vespa/storage/visiting/memory_bounded_trace.h
index 3ec0aff2ece..e53064880fc 100644
--- a/storage/src/vespa/storage/visiting/memory_bounded_trace.h
+++ b/storage/src/vespa/storage/visiting/memory_bounded_trace.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <vespa/messagebus/trace.h>
-#include <stdint.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/visiting/testvisitor.cpp b/storage/src/vespa/storage/visiting/testvisitor.cpp
index 07b97b505c1..dde05697e07 100644
--- a/storage/src/vespa/storage/visiting/testvisitor.cpp
+++ b/storage/src/vespa/storage/visiting/testvisitor.cpp
@@ -1,15 +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/storage/visiting/testvisitor.h>
-
-#include <sstream>
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/log/log.h>
+#include "testvisitor.h"
 #include <vespa/documentapi/messagebus/messages/visitor.h>
-#include <vespa/vdslib/container/parameters.h>
-
+#include <sstream>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".visitor.instance.testvisitor");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/visiting/visitorlibraries.cpp b/storage/src/vespa/storage/visiting/visitorlibraries.cpp
index 8141250f5f7..022babd764d 100644
--- a/storage/src/vespa/storage/visiting/visitorlibraries.cpp
+++ b/storage/src/vespa/storage/visiting/visitorlibraries.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 "visitorlibraries.h"
 #include <vespa/defaults.h>
-#include <vespa/storage/visiting/visitorlibraries.h>
+
 #include <vespa/log/log.h>
 
 LOG_SETUP(".visiting.libraryloader");
diff --git a/storage/src/vespa/storage/visiting/visitorlibraries.h b/storage/src/vespa/storage/visiting/visitorlibraries.h
index 50d96f7849e..d64074c00c6 100644
--- a/storage/src/vespa/storage/visiting/visitorlibraries.h
+++ b/storage/src/vespa/storage/visiting/visitorlibraries.h
@@ -5,7 +5,7 @@
    This class handles ownership and creation of dynamic visitor libraries.
 */
 
-#include <vespa/storage/visiting/visitor.h>
+#include "visitor.h"
 
 namespace storage {
 
@@ -36,4 +36,3 @@ private:
 };
 
 }
-