Targeted include.

3 files changed, 17 insertions, 22 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
index 096b1ea022c..c1e4077d82d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
@@ -6,6 +6,8 @@
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/util/fileutil.h>
+#include <vespa/fastos/file.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.attribute.attribute_initializer");
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index c6c1720c27b..ffda6b07480 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -16,6 +16,7 @@
 #include <vespa/searchcore/proton/bucketdb/splitbucketsession.h>
 #include <vespa/searchlib/util/bufferwriter.h>
 #include <vespa/searchlib/common/rcuvector.hpp>
+#include <vespa/fastos/file.h>
 
 
 using document::GlobalId;
@@ -37,7 +38,6 @@ using vespalib::IllegalStateException;
 using vespalib::make_string;
 using vespalib::GenerationHeldBase;
 
-
 namespace proton {
 
 namespace documentmetastore {
@@ -66,11 +66,11 @@ public:
               _header(),
               _headerLen(0u),
               _docIdLimit(0),
-              _datFileSize(0u) {
+              _datFileSize(0u)
+    {
         _headerLen = _header.readFile(*_datFile);
         _datFile->SetPosition(_headerLen);
-        if (!search::ReaderBase::extractFileSize(_header, *_datFile,
-                                                          _datFileSize)) {
+        if (!search::ReaderBase::extractFileSize(_header, *_datFile, _datFileSize)) {
             abort();
         }
         _docIdLimit = _header.getTag(DOCID_LIMIT).asInteger();
@@ -117,12 +117,9 @@ public:
     ShrinkBlockHeld(DocumentMetaStore &dms)
         : GenerationHeldBase(0),
           _dms(dms)
-    {
-    }
+    { }
 
-    virtual
-    ~ShrinkBlockHeld()
-    {
+    ~ShrinkBlockHeld() {
         _dms.unblockShrinkLidSpace();
     }
 };
@@ -1021,7 +1018,6 @@ DocumentMetaStore::getEstimatedSaveByteSize() const
     return minHeaderLen + numDocs * entrySize;
 }
 
-
 }  // namespace proton
 
 template class search::btree::
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index 9c2c6b2388f..389c4c7ec27 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -2,13 +2,6 @@
 
 #pragma once
 
-#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
-#include <vespa/searchcore/proton/common/subdbtype.h>
-#include <vespa/searchlib/attribute/iattributesavetarget.h>
-#include <vespa/searchlib/common/rcuvector.h>
-#include <vespa/searchlib/attribute/singlesmallnumericattribute.h>
-#include <vespa/searchlib/queryeval/blueprint.h>
-#include <vespa/searchlib/docstore/ibucketizer.h>
 #include "gid_compare.h"
 #include "document_meta_store_adapter.h"
 #include "documentmetastoreattribute.h"
@@ -17,20 +10,24 @@
 #include "lid_hold_list.h"
 #include "lidstatevector.h"
 #include "raw_document_meta_data.h"
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
+#include <vespa/searchcore/proton/common/subdbtype.h>
+#include <vespa/searchlib/attribute/iattributesavetarget.h>
+#include <vespa/searchlib/common/rcuvector.h>
+#include <vespa/searchlib/attribute/singlesmallnumericattribute.h>
+#include <vespa/searchlib/queryeval/blueprint.h>
+#include <vespa/searchlib/docstore/ibucketizer.h>
 
 namespace proton {
 
-namespace bucketdb
-{
+namespace bucketdb {
 
 class SplitBucketSession;
 class JoinBucketsSession;
 
 }
 
-namespace documentmetastore {
-    class Reader;
-};
+namespace documentmetastore { class Reader; }
 
 /**
  * This class provides a storage of <lid, meta data> pairs (local