Merge pull request #24054 from vespa-engine/toregge/fix-forward-declarations

Fix forward declarations.

5 files changed, 6 insertions, 6 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.h b/searchcore/src/vespa/searchcore/proton/matching/match_tools.h
index 8012d7b1ec5..bc147e9c787 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.h
@@ -19,7 +19,7 @@
 #include <vespa/vespalib/util/clock.h>
 
 namespace vespalib { class ExecutionProfiler; }
-namespace vespalib { class ThreadBundle; }
+namespace vespalib { struct ThreadBundle; }
 
 namespace search::engine { class Trace; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.h b/searchcore/src/vespa/searchcore/proton/matching/query.h
index 8517ec2153f..1f9499b02d8 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.h
@@ -10,7 +10,7 @@
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/queryeval/irequestcontext.h>
 
-namespace vespalib { class ThreadBundle; }
+namespace vespalib { struct ThreadBundle; }
 namespace search::engine { class Trace; }
 
 namespace proton::matching {
diff --git a/searchlib/src/vespa/searchlib/queryeval/global_filter.h b/searchlib/src/vespa/searchlib/queryeval/global_filter.h
index 8504367e5b7..e93864db2c8 100644
--- a/searchlib/src/vespa/searchlib/queryeval/global_filter.h
+++ b/searchlib/src/vespa/searchlib/queryeval/global_filter.h
@@ -4,6 +4,7 @@
 
 #include <memory>
 #include <vespa/searchlib/common/bitvector.h>
+#include <vector>
 
 namespace search::queryeval {
 
diff --git a/searchsummary/src/vespa/juniper/query.h b/searchsummary/src/vespa/juniper/query.h
index 2b45909e0ac..f75949c6d06 100644
--- a/searchsummary/src/vespa/juniper/query.h
+++ b/searchsummary/src/vespa/juniper/query.h
@@ -35,9 +35,8 @@ const char* creator_text(ItemCreator);
 
 class IQueryVisitor;
 
-/** Opaque datatype implemented by provider
- */
-struct QueryItem;
+// Interface class for juniper query items
+class QueryItem;
 
 /** This is the basic query type, implemented by the query provider
  */
diff --git a/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h
index 0907783feaf..9f72e4f3687 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h
@@ -5,7 +5,7 @@
 #include <vespa/vsm/common/storagedocument.h>
 #include <vespa/document/fieldvalue/fieldvalues.h>
 
-namespace vespalib::slime { class Inserter; }
+namespace vespalib::slime { struct Inserter; }
 
 namespace vsm {