Reduce includes.

3 files changed, 9 insertions, 19 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index 8e252d9fcb4..df93d4cd1ff 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -148,8 +148,7 @@ DocsumContext::FillSummaryFeatures(search::docsummary::GetDocsumsState * state,
 {
     assert(&_docsumState == state);
     if (_matcher->canProduceSummaryFeatures()) {
-        state->_summaryFeatures =
-            _matcher->getSummaryFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
+        state->_summaryFeatures = _matcher->getSummaryFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
     }
     state->_summaryFeaturesCached = false;
 }
@@ -162,8 +161,7 @@ DocsumContext::FillRankFeatures(search::docsummary::GetDocsumsState * state, sea
     if ((state->_args.GetQueryFlags() & search::fs4transport::QFLAG_DUMP_FEATURES) == 0) {
         return;
     }
-    state->_rankFeatures =
-        _matcher->getRankFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
+    state->_rankFeatures = _matcher->getRankFeatures(_request, _searchCtx, _attrCtx, _sessionMgr);
 }
 
 namespace {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index 42e2db72dad..b4204ed8bb2 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
@@ -3,16 +3,13 @@
 #include "docsumformat.h"
 #include "summaryfeaturesdfw.h"
 #include "docsumstate.h"
-#include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
 #include <vespa/vespalib/data/slime/cursor.h>
-#include <cmath>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.summaryfeaturesdfw");
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 
 SummaryFeaturesDFW::SummaryFeaturesDFW() :
@@ -40,9 +37,9 @@ SummaryFeaturesDFW::insertField(uint32_t docid,
                                 ResType type,
                                 vespalib::slime::Inserter &target)
 {
-    if (state->_summaryFeatures.get() == 0) {
+    if ( ! state->_summaryFeatures) {
         state->_callback.FillSummaryFeatures(state, _env);
-        if (state->_summaryFeatures.get() == 0) { // still no summary features to write
+        if ( !state->_summaryFeatures) { // still no summary features to write
             return;
         }
     }
@@ -116,4 +113,3 @@ SummaryFeaturesDFW::writeString(const vespalib::stringref & str, ResType type, s
 }
 
 }
-}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
index ba9b9878f24..7f68abc6451 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
@@ -2,13 +2,11 @@
 
 #pragma once
 
-#include <map>
-#include <string>
-#include <vespa/searchsummary/docsummary/docsumfieldwriter.h>
-#include <vespa/vespalib/util/jsonwriter.h>
+#include "docsumfieldwriter.h"
 
-namespace search {
-namespace docsummary {
+namespace vespalib { class JSONStringer; }
+
+namespace search::docsummary {
 
 class IDocsumEnvironment;
 
@@ -41,5 +39,3 @@ public:
 };
 
 }
-}
-