From 8c710360d7deed95be28ac22b947b63d24e10863 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Sat, 2 Feb 2019 19:50:43 +0100
Subject: Adjust forward declarations in searchcore.

---
 searchcore/src/vespa/searchcore/grouping/groupingmanager.h     |  2 +-
 .../searchcore/proton/attribute/attribute_aspect_delayer.h     |  2 +-
 .../vespa/searchcore/proton/attribute/attribute_initializer.h  |  2 +-
 .../proton/attribute/attribute_manager_initializer.h           |  2 +-
 .../src/vespa/searchcore/proton/attribute/i_attribute_writer.h |  2 +-
 .../src/vespa/searchcore/proton/bucketdb/ibucketdbhandler.h    |  2 +-
 searchcore/src/vespa/searchcore/proton/common/selectcontext.h  |  2 +-
 .../vespa/searchcore/proton/docsummary/summarycompacttarget.h  |  2 +-
 .../vespa/searchcore/proton/docsummary/summaryflushtarget.h    |  2 +-
 .../src/vespa/searchcore/proton/docsummary/summarymanager.h    |  2 +-
 .../searchcore/proton/documentmetastore/lidreusedelayer.h      |  4 ++--
 .../proton/flushengine/shrink_lid_space_flush_target.h         |  2 +-
 searchcore/src/vespa/searchcore/proton/matching/match_master.h |  4 ++--
 searchcore/src/vespa/searchcore/proton/matching/matcher.h      |  2 +-
 .../src/vespa/searchcore/proton/matching/result_processor.h    |  2 +-
 .../src/vespa/searchcore/proton/matching/sessionmanager.h      |  4 ++--
 .../src/vespa/searchcore/proton/metrics/metrics_engine.h       |  2 +-
 .../src/vespa/searchcore/proton/metrics/metricswireservice.h   |  2 +-
 .../vespa/searchcore/proton/reference/document_db_reference.h  |  4 ++--
 .../proton/reference/document_db_reference_resolver.h          |  2 +-
 .../proton/reference/dummy_gid_to_lid_change_handler.h         |  2 +-
 .../searchcore/proton/reference/gid_to_lid_change_handler.h    |  2 +-
 .../searchcore/proton/reference/gid_to_lid_mapper_factory.h    |  2 +-
 .../searchcore/proton/reference/i_document_db_reference.h      |  2 +-
 .../proton/reference/i_document_db_reference_resolver.h        |  2 +-
 .../vespa/searchcore/proton/server/document_scan_iterator.h    |  2 +-
 .../searchcore/proton/server/document_subdb_initializer.h      |  2 +-
 .../src/vespa/searchcore/proton/server/documentbucketmover.h   |  4 ++--
 searchcore/src/vespa/searchcore/proton/server/documentdb.h     |  2 +-
 .../src/vespa/searchcore/proton/server/documentretriever.h     |  2 +-
 .../vespa/searchcore/proton/server/documentsubdbcollection.h   | 10 +++++-----
 .../vespa/searchcore/proton/server/executor_thread_service.h   |  2 +-
 searchcore/src/vespa/searchcore/proton/server/feedhandler.h    | 10 +++++-----
 .../src/vespa/searchcore/proton/server/forcecommitcontext.h    |  2 +-
 .../src/vespa/searchcore/proton/server/forcecommitdonetask.h   |  2 +-
 searchcore/src/vespa/searchcore/proton/server/frozenbuckets.h  |  2 +-
 searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h | 10 +++++-----
 searchcore/src/vespa/searchcore/proton/server/ifeedview.h      |  2 +-
 .../src/vespa/searchcore/proton/server/ireplaypackethandler.h  |  4 ++--
 .../vespa/searchcore/proton/server/maintenance_jobs_injector.h |  6 +++---
 .../src/vespa/searchcore/proton/server/maintenancecontroller.h |  2 +-
 .../vespa/searchcore/proton/server/pruneremoveddocumentsjob.h  |  2 +-
 .../src/vespa/searchcore/proton/server/removedonecontext.h     |  2 +-
 searchcore/src/vespa/searchcore/proton/server/removedonetask.h |  2 +-
 .../searchcore/proton/server/sample_attribute_usage_job.h      |  2 +-
 .../searchcore/proton/server/searchable_doc_subdb_configurer.h |  2 +-
 .../src/vespa/searchcore/proton/server/searchabledocsubdb.h    |  4 ++--
 .../src/vespa/searchcore/proton/server/storeonlydocsubdb.h     |  4 ++--
 .../src/vespa/searchcore/proton/server/storeonlyfeedview.h     |  2 +-
 .../src/vespa/searchcore/proton/server/transactionlogmanager.h |  2 +-
 .../src/vespa/searchcore/proton/summaryengine/isearchhandler.h |  2 +-
 51 files changed, 73 insertions(+), 73 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/grouping/groupingmanager.h b/searchcore/src/vespa/searchcore/grouping/groupingmanager.h
index 5793c8576e5..cdbace405f0 100644
--- a/searchcore/src/vespa/searchcore/grouping/groupingmanager.h
+++ b/searchcore/src/vespa/searchcore/grouping/groupingmanager.h
@@ -5,7 +5,7 @@
 #include <vespa/searchcommon/attribute/iattributecontext.h>
 
 namespace search {
-    class RankedHit;
+    struct RankedHit;
     class BitVector;
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
index 76920f84866..3a2d1b5e0b1 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
@@ -13,7 +13,7 @@ class InternalSummarymapType;
 
 namespace proton {
 
-class IDocumentTypeInspector;
+struct IDocumentTypeInspector;
 class IIndexschemaInspector;
 
 /*
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.h
index c2ea83812cb..988f4d06d16 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.h
@@ -13,7 +13,7 @@ namespace search::attribute { class AttributeHeader; }
 namespace proton {
 
 class AttributeDirectory;
-class IAttributeFactory;
+struct IAttributeFactory;
 
 /**
  * Class used by an attribute manager to initialize and load attribute vectors from disk.
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h
index a132bc6b678..d56f4c25ace 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h
@@ -10,7 +10,7 @@
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/config-attributes.h>
 
-namespace searchcorespi { namespace index { class IThreadService; } }
+namespace searchcorespi { namespace index { struct IThreadService; } }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
index ac16c8b4073..99b5728fd3a 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
@@ -15,7 +15,7 @@ namespace document {
 
 namespace proton {
 
-class IFieldUpdateCallback;
+struct IFieldUpdateCallback;
 
 /**
  * Interface for an attribute writer that handles writes in form of put, update and remove
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/ibucketdbhandler.h b/searchcore/src/vespa/searchcore/proton/bucketdb/ibucketdbhandler.h
index 7d979b8069c..9743d86804c 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/ibucketdbhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/ibucketdbhandler.h
@@ -5,7 +5,7 @@
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/searchlib/common/serialnum.h>
 
-namespace proton { class IDocumentMetaStore; }
+namespace proton { struct IDocumentMetaStore; }
 
 namespace proton::bucketdb {
 
diff --git a/searchcore/src/vespa/searchcore/proton/common/selectcontext.h b/searchcore/src/vespa/searchcore/proton/common/selectcontext.h
index 72699a733ab..d37c6eb6f14 100644
--- a/searchcore/src/vespa/searchcore/proton/common/selectcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/common/selectcontext.h
@@ -7,7 +7,7 @@ namespace proton {
 
 class CachedSelect;
 
-namespace select { class Guards; }
+namespace select { struct Guards; }
 
 class SelectContext : public document::select::Context
 {
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
index ff56e480467..5dcfb2b9c10 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
@@ -4,7 +4,7 @@
 #include <vespa/searchlib/docstore/idocumentstore.h>
 #include <vespa/searchcorespi/flush/iflushtarget.h>
 
-namespace searchcorespi::index { class IThreadService; }
+namespace searchcorespi::index { struct IThreadService; }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
index 06b0940a8f0..7e450649a52 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
@@ -4,7 +4,7 @@
 #include <vespa/searchlib/docstore/idocumentstore.h>
 #include <vespa/searchcorespi/flush/iflushtarget.h>
 
-namespace searchcorespi::index { class IThreadService; }
+namespace searchcorespi::index { struct IThreadService; }
 namespace proton {
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
index c5acd483448..8df65e3e2ff 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
@@ -13,7 +13,7 @@
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/fastlib/text/normwordfolder.h>
 
-namespace searchcorespi::index { class IThreadService; }
+namespace searchcorespi::index { struct IThreadService; }
 namespace search { class IBucketizer; }
 namespace search::common { class FileHeaderContext; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
index 03bc562b39c..cb42e4ce152 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
@@ -10,7 +10,7 @@ namespace searchcorespi
 namespace index
 {
 
-class IThreadingService;
+struct IThreadingService;
 
 }
 
@@ -22,7 +22,7 @@ namespace proton
 namespace documentmetastore
 {
 
-class IStore;
+struct IStore;
 
 /**
  * This class delays reuse of lids until references to the lids have
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h b/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h
index d4075437c0d..f2123bf67b4 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h
@@ -3,7 +3,7 @@
 
 #include <vespa/searchcorespi/flush/iflushtarget.h>
 
-namespace search::common { class ICompactableLidSpace; }
+namespace search::common { struct ICompactableLidSpace; }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_master.h b/searchcore/src/vespa/searchcore/proton/matching/match_master.h
index 50f1a94b481..5de7fc144ce 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_master.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_master.h
@@ -5,13 +5,13 @@
 #include "result_processor.h"
 #include "matching_stats.h"
 
-namespace vespalib { class ThreadBundle; }
+namespace vespalib { struct ThreadBundle; }
 namespace search { class FeatureSet; }
 
 namespace proton::matching {
 
 class MatchToolsFactory;
-class MatchParams;
+struct MatchParams;
 
 /**
  * Handles overall matching and keeps track of match threads.
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.h b/searchcore/src/vespa/searchcore/proton/matching/matcher.h
index 0fed257f0c0..3fb1fb24c70 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.h
@@ -31,7 +31,7 @@ namespace search::engine {
     class DocsumRequest;
     class SearchReply;
 }
-namespace search { class IDocumentMetaStore; }
+namespace search { struct IDocumentMetaStore; }
 
 namespace proton::matching {
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.h b/searchcore/src/vespa/searchcore/proton/matching/result_processor.h
index d32a6986d18..41c764d247b 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.h
@@ -13,7 +13,7 @@ namespace search {
         class GroupingContext;
         class GroupingSession;
     }
-    class IDocumentMetaStore;
+    struct IDocumentMetaStore;
 }
 
 namespace proton::matching {
diff --git a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h
index 8426ab258e0..3e3c795784c 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h
@@ -11,8 +11,8 @@ namespace proton::matching {
 
 typedef vespalib::string SessionId;
 
-class GroupingSessionCache;
-class SearchSessionCache;
+struct GroupingSessionCache;
+struct SearchSessionCache;
 
 class SessionManager : public ISessionCachePruner {
 public:
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h
index dc8872c6c8b..ded156774ae 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h
@@ -17,7 +17,7 @@ namespace config {
 namespace proton {
 
 class AttributeMetrics;
-class DocumentDBTaggedMetrics;
+struct DocumentDBTaggedMetrics;
 
 class MetricsEngine : public MetricsWireService
 {
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metricswireservice.h b/searchcore/src/vespa/searchcore/proton/metrics/metricswireservice.h
index 70602adbd7b..5b4852cabe6 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/metricswireservice.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/metricswireservice.h
@@ -7,7 +7,7 @@
 namespace proton {
 
 class AttributeMetrics;
-class DocumentDBTaggedMetrics;
+struct DocumentDBTaggedMetrics;
 
 struct MetricsWireService {
     virtual void addAttribute(AttributeMetrics &subAttributes,
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h
index 56f06dca58e..0f7e7f86ac3 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h
@@ -3,11 +3,11 @@
 
 #include "i_document_db_reference.h"
 
-namespace search { class IDocumentMetaStoreContext; }
+namespace search { struct IDocumentMetaStoreContext; }
 
 namespace proton {
 
-class IAttributeManager;
+struct IAttributeManager;
 class IGidToLidChangeHandler;
 
 /*
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
index 1a2c28580cb..c23669cfc12 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
@@ -7,7 +7,7 @@
 #include <map>
 
 namespace document { class DocumentType; class DocumentTypeRepo; }
-namespace search { class ISequencedTaskExecutor; class IAttributeManager; class IDocumentMetaStoreContext;
+namespace search { class ISequencedTaskExecutor; class IAttributeManager; struct IDocumentMetaStoreContext;
     namespace attribute { class IAttributeVector; class ReferenceAttribute; } }
 namespace vespa { namespace config { namespace search { namespace internal { class InternalImportedFieldsType; } } } }
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
index 28eb281ec95..494edec78fc 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
@@ -8,7 +8,7 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/document/base/globalid.h>
 
-namespace searchcorespi { namespace index { class IThreadService; } }
+namespace searchcorespi { namespace index { struct IThreadService; } }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
index 264ece76eaa..c72e9a07078 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
@@ -8,7 +8,7 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/document/base/globalid.h>
 
-namespace searchcorespi { namespace index { class IThreadService; } }
+namespace searchcorespi { namespace index { struct IThreadService; } }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
index e0ffdc412a0..2b000d0d754 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
@@ -4,7 +4,7 @@
 
 #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h>
 
-namespace search { class IDocumentMetaStoreContext; }
+namespace search { struct IDocumentMetaStoreContext; }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
index 1029bda191c..03acb3d5bad 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h
@@ -8,7 +8,7 @@ namespace search::attribute { class ReadableAttributeVector; }
 namespace search {
 
 class IGidToLidMapperFactory;
-class IDocumentMetaStoreContext;
+struct IDocumentMetaStoreContext;
 
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
index 0aa44539f22..8db24855de4 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
@@ -4,7 +4,7 @@
 #include <vespa/fastos/timestamp.h>
 #include <memory>
 
-namespace search { class IAttributeManager; class IDocumentMetaStoreContext; }
+namespace search { class IAttributeManager; struct IDocumentMetaStoreContext; }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
index 361a65cb7b7..fec547236d2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
@@ -6,7 +6,7 @@
 
 namespace proton {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 /**
  * Iterator for scanning all documents in a document meta store.
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
index d6e37b34491..a2ae11346f5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
@@ -5,7 +5,7 @@
 #include "document_subdb_initializer_result.h"
 #include <vespa/searchcore/proton/initializer/initializer_task.h>
 
-namespace searchcorespi { namespace index { class IThreadService; } }
+namespace searchcorespi { namespace index { struct IThreadService; } }
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
index 06cbfb8fe8f..5ed2226ce65 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
@@ -11,8 +11,8 @@
 namespace proton {
 
 class BucketDBOwner;
-class IDocumentMoveHandler;
-class IMoveOperationLimiter;
+struct IDocumentMoveHandler;
+struct IMoveOperationLimiter;
 class MaintenanceDocumentSubDB;
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index 716a1058348..b4e58d6f178 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -45,7 +45,7 @@ namespace vespa::config::search::core::internal { class InternalProtonType; }
 
 namespace proton {
 class IDocumentDBOwner;
-class MetricsWireService;
+struct MetricsWireService;
 class StatusReport;
 class ExecutorThreadingServiceStats;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretriever.h b/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
index 0b6f8ad76b5..b51516b2fb9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
@@ -5,7 +5,7 @@
 #include "documentretrieverbase.h"
 
 namespace search {
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 class IAttributeManager;
 class IDocumentStore;
 namespace index { class Schema; }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
index 4f0e00c6ae5..934c11e485b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
@@ -22,16 +22,16 @@ namespace search {
 
 namespace searchcorespi {
     class IFlushTarget;
-    namespace index { class IThreadingService; }
+    namespace index { struct IThreadingService; }
 }
 
 namespace proton {
 class DocumentDBConfig;
-class DocumentDBTaggedMetrics;
+struct DocumentDBTaggedMetrics;
 class MaintenanceController;
-class MetricsWireService;
+struct MetricsWireService;
 class ICommitable;
-class IDocumentDBReferenceResolver;
+struct IDocumentDBReferenceResolver;
 class IGetSerialNum;
 class DocTypeName;
 class HwInfo;
@@ -49,7 +49,7 @@ namespace matching {
 
 namespace initializer { class InitializerTask; }
 
-namespace index { class IndexConfig; }
+namespace index { struct IndexConfig; }
 
 class DocumentSubDBCollection {
 public:
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h
index 4b1e8408c8e..521565358d9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h
+++ b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h
@@ -6,7 +6,7 @@
 
 namespace proton {
 
-namespace internal { class ThreadId; }
+namespace internal { struct ThreadId; }
 /**
  * Implementation of IThreadService using an underlying thread stack executor
  * with a single thread.
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
index 34f979b7115..ef554a2ee3a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
@@ -15,19 +15,19 @@
 #include <vespa/searchlib/transactionlog/translogclient.h>
 #include <mutex>
 
-namespace searchcorespi { namespace index { class IThreadingService; } }
+namespace searchcorespi { namespace index { struct IThreadingService; } }
 
 namespace proton {
-class ConfigStore;
+struct ConfigStore;
 class CreateBucketOperation;
 class DDBState;
 class DeleteBucketOperation;
-class FeedConfigStore;
+struct FeedConfigStore;
 class FeedState;
 class IDocumentDBOwner;
-class IFeedHandlerOwner;
+struct IFeedHandlerOwner;
 class IFeedView;
-class IResourceWriteFilter;
+struct IResourceWriteFilter;
 class IReplayConfig;
 class JoinBucketsOperation;
 class PutOperation;
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
index 727b2556af1..494e12002a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
@@ -12,7 +12,7 @@ namespace vespalib { class Executor; }
 namespace proton {
 
 class ForceCommitDoneTask;
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 class DocIdLimit;
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
index ca804c57db8..1b459ab6d02 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
@@ -7,7 +7,7 @@
 
 namespace proton {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 /**
  * Class for task to be executed when a forced commit has completed and
diff --git a/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.h b/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.h
index be4d28f1e9e..339bb7fa5d0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.h
+++ b/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 
-namespace searchcorespi { namespace index {class IThreadService; }}
+namespace searchcorespi { namespace index {struct IThreadService; }}
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
index 15ea112b7a3..eb297fc7987 100644
--- a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
@@ -16,7 +16,7 @@ namespace searchcorespi {
     class IIndexManager;
 }
 namespace proton::index {
-    class IndexConfig;
+    struct IndexConfig;
 }
 
 namespace proton {
@@ -27,11 +27,11 @@ class DocumentDBConfig;
 class DocumentSubDbInitializer;
 class DocumentSubDbInitializerResult;
 class FeedHandler;
-class IAttributeManager;
-class IBucketStateCalculator;
-class IDocumentDBReferenceResolver;
+struct IAttributeManager;
+struct IBucketStateCalculator;
+struct IDocumentDBReferenceResolver;
 class IDocumentDBReference;
-class IDocumentMetaStoreContext;
+struct IDocumentMetaStoreContext;
 class IDocumentRetriever;
 class IFeedView;
 class IIndexWriter;
diff --git a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
index 3ded41180d5..9acb02c9b0f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
@@ -13,7 +13,7 @@ namespace proton {
 
 class CompactLidSpaceOperation;
 class DeleteBucketOperation;
-class ISimpleDocumentMetaStore;
+struct ISimpleDocumentMetaStore;
 class MoveOperation;
 class PruneRemovedDocumentsOperation;
 class PutOperation;
diff --git a/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h b/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
index 9acc3a530d3..8df51780c9f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ireplaypackethandler.h
@@ -9,7 +9,7 @@ namespace proton {
 class PutOperation;
 class RemoveOperation;
 class UpdateOperation;
-class NoopOperation;
+struct NoopOperation;
 class NewConfigOperation;
 class WipeHistoryOperation;
 class DeleteBucketOperation;
@@ -20,7 +20,7 @@ class MoveOperation;
 class CreateBucketOperation;
 class CompactLidSpaceOperation;
 
-namespace feedoperation { class IStreamHandler; }
+namespace feedoperation { struct IStreamHandler; }
 
 /**
  * Interface used to handle the various feed operations during
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
index 55c218cca6d..94203e144dc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
@@ -13,12 +13,12 @@
 namespace proton {
 
 class IPruneRemovedDocumentsHandler;
-class IDocumentMoveHandler;
+struct IDocumentMoveHandler;
 class IBucketModifiedHandler;
 class IClusterStateChangedNotifier;
 class IBucketStateChangedNotifier;
-class IBucketStateCalculator;
-class IAttributeManager;
+struct IBucketStateCalculator;
+struct IAttributeManager;
 class AttributeUsageFilter;
 class IDiskMemUsageNotifier;
 namespace bucketdb { class IBucketCreateNotifier; }
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
index 434ef1e3532..69416ff63d7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.h
@@ -14,7 +14,7 @@ namespace vespalib {
     class ThreadExecutor;
     class Executor;
 }
-namespace searchcorespi { namespace index {class IThreadService; }}
+namespace searchcorespi { namespace index { struct IThreadService; }}
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h
index ab98882e6d1..551cf4615b0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h
@@ -8,7 +8,7 @@
 namespace proton
 {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 class IPruneRemovedDocumentsHandler;
 class IFrozenBucketHandler;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.h b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.h
index 912d31dde22..07057d1c431 100644
--- a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.h
+++ b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.h
@@ -10,7 +10,7 @@
 
 namespace proton {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonetask.h b/searchcore/src/vespa/searchcore/proton/server/removedonetask.h
index 11858d12f4d..d9059e6ad6a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/removedonetask.h
+++ b/searchcore/src/vespa/searchcore/proton/server/removedonetask.h
@@ -7,7 +7,7 @@
 namespace proton
 {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 /**
  * Class for task to be executed when a document remove completed and
diff --git a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
index c6174efd480..4f2b6155cb1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.h
@@ -6,7 +6,7 @@
 
 namespace proton {
 
-class IAttributeManager;
+struct IAttributeManager;
 class AttributeUsageFilter;
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
index 058c08b1ab4..5aac069853b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
@@ -25,7 +25,7 @@
 
 namespace proton {
 
-class IDocumentDBReferenceResolver;
+struct IDocumentDBReferenceResolver;
 class ReconfigParams;
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
index b43b697112e..52e0309dc16 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
@@ -24,8 +24,8 @@
 namespace proton {
 
 class DocumentDBConfig;
-class IDocumentDBReferenceResolver;
-class MetricsWireService;
+struct IDocumentDBReferenceResolver;
+struct MetricsWireService;
 class GidToLidChangeHandler;
 
 /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
index d377166226e..450779de7dd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
@@ -23,11 +23,11 @@
 
 namespace proton {
 
-class DocumentDBTaggedMetrics;
+struct DocumentDBTaggedMetrics;
 class DocumentMetaStoreInitializerResult;
 class FeedHandler;
 class IDocumentSubDBOwner;
-class MetricsWireService;
+struct MetricsWireService;
 class ShrinkLidSpaceFlushTarget;
 namespace initializer { class InitializerTask; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
index 37f67399f4d..18b78642814 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
@@ -33,7 +33,7 @@ class PutDoneContext;
 class RemoveDoneContext;
 class CommitTimeTracker;
 class IGidToLidChangeHandler;
-class IFieldUpdateCallback;
+struct IFieldUpdateCallback;
 class RemoveDocumentsOperation;
 class DocumentOperation;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h
index 3b2c276c62d..8f48b9adc48 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h
@@ -9,7 +9,7 @@
 #include <vespa/searchlib/transactionlog/translogclient.h>
 
 namespace proton {
-class ConfigStore;
+struct ConfigStore;
 
 /**
  * Class managing the initialization and replay of the transaction log.
diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/isearchhandler.h b/searchcore/src/vespa/searchcore/proton/summaryengine/isearchhandler.h
index 8c61a1c39d9..ffcdfbaf365 100644
--- a/searchcore/src/vespa/searchcore/proton/summaryengine/isearchhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/summaryengine/isearchhandler.h
@@ -7,7 +7,7 @@ namespace search::engine {
     class SearchRequest;
     class SearchReply;
     class DocsumRequest;
-    class DocsumReply;
+    struct DocsumReply;
 }
 
 namespace proton {
-- 
cgit v1.2.3