Forward declare XmlOutputStream and FieldValue::IteratorHandler.

2 files changed, 4 insertions, 7 deletions

diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
index 95c6d39c51a..0fdfb09ecef 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -8,6 +8,7 @@
 #include <vespa/searchlib/transactionlog/translogclient.h>
 #include <vespa/searchlib/transactionlog/translogserver.h>
 #include <vespa/vespalib/util/programoptions.h>
+#include <vespa/vespalib/util/xmlstream.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <iostream>
 #include <vespa/config/helper/configgetter.hpp>
diff --git a/searchcore/src/vespa/searchcore/proton/test/userdocuments.h b/searchcore/src/vespa/searchcore/proton/test/userdocuments.h
index d1ea6f6ab4c..6b5a911352b 100644
--- a/searchcore/src/vespa/searchcore/proton/test/userdocuments.h
+++ b/searchcore/src/vespa/searchcore/proton/test/userdocuments.h
@@ -2,10 +2,9 @@
 #pragma once
 
 #include "bucketdocuments.h"
+#include <map>
 
-namespace proton {
-
-namespace test {
+namespace proton::test {
 
 /**
  * Collection of documents for a set of users,
@@ -48,7 +47,4 @@ public:
     void clear() { _docs.clear(); }
 };
 
-} // namespace test
-
-} // namespace proton
-
+}