track namespace move in documenttypes.def

* For C++ code this introduces a "document::config" namespace, which will
  sometimes conflict with the global "config" namespace.
* Move all forward-declarations of the types DocumenttypesConfig and
  DocumenttypesConfigBuilder to a common header file.

67 files changed, 111 insertions, 94 deletions

diff --git a/config/src/vespa/config/common/configvalue.hpp b/config/src/vespa/config/common/configvalue.hpp
index 3bf149f17b1..665ce69c7a5 100644
--- a/config/src/vespa/config/common/configvalue.hpp
+++ b/config/src/vespa/config/common/configvalue.hpp
@@ -8,7 +8,7 @@ ConfigValue::newInstance() const
 {
     if (_payload) {
         const vespalib::slime::Inspector & payload(_payload->getSlimePayload());
-        return std::unique_ptr<ConfigType>(new ConfigType(config::ConfigPayload(payload)));
+        return std::unique_ptr<ConfigType>(new ConfigType(::config::ConfigPayload(payload)));
     } else {
         return std::unique_ptr<ConfigType>(new ConfigType(*this));
     }
diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp
index d71ef94a595..e4516ab6d70 100644
--- a/document/src/tests/fieldpathupdatetestcase.cpp
+++ b/document/src/tests/fieldpathupdatetestcase.cpp
@@ -41,7 +41,7 @@ protected:
 
 namespace {
 
-document::DocumenttypesConfig getRepoConfig() {
+DocumenttypesConfig getRepoConfig() {
     const int struct2_id = 64;
     DocumenttypesConfigBuilderHelper builder;
     builder.document(
diff --git a/document/src/tests/select/select_test.cpp b/document/src/tests/select/select_test.cpp
index e01564f4b3b..5a743fb93cd 100644
--- a/document/src/tests/select/select_test.cpp
+++ b/document/src/tests/select/select_test.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/document/base/documentid.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/datatype/referencedatatype.h>
 #include <vespa/document/fieldvalue/document.h>
@@ -16,7 +17,6 @@ LOG_SETUP("document_select_test");
 
 using document::Document;
 using document::DocumentId;
-using document::DocumenttypesConfig;
 using document::DocumentType;
 using document::DocumentTypeRepo;
 using document::DocumentTypeRepoFactory;
diff --git a/document/src/tests/serialization/annotationserializer_test.cpp b/document/src/tests/serialization/annotationserializer_test.cpp
index c3c9b09477b..073544b1bc9 100644
--- a/document/src/tests/serialization/annotationserializer_test.cpp
+++ b/document/src/tests/serialization/annotationserializer_test.cpp
@@ -4,6 +4,7 @@
 #include <vespa/document/annotation/alternatespanlist.h>
 #include <vespa/document/annotation/annotation.h>
 #include <vespa/document/annotation/spantree.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
 #include <vespa/document/serialization/annotationdeserializer.h>
 #include <vespa/document/serialization/annotationserializer.h>
@@ -17,7 +18,6 @@
 #include <algorithm>
 
 
-using document::DocumenttypesConfig;
 using std::fstream;
 using std::ostringstream;
 using std::string;
diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp
index 443c7d1885a..9a0786c846f 100644
--- a/document/src/tests/serialization/vespadocumentserializer_test.cpp
+++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp
@@ -5,6 +5,7 @@
 #include <vespa/document/annotation/span.h>
 #include <vespa/document/annotation/spantree.h>
 #include <vespa/document/config/config-documenttypes.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/annotationreferencedatatype.h>
 #include <vespa/document/datatype/arraydatatype.h>
 #include <vespa/document/datatype/documenttype.h>
@@ -46,7 +47,6 @@
 #include <vespa/document/base/exceptions.h>
 #include <vespa/vespalib/util/compressionconfig.h>
 
-using document::DocumenttypesConfig;
 using vespalib::File;
 using vespalib::Slime;
 using vespalib::nbostream;
diff --git a/document/src/vespa/document/base/testdocrepo.cpp b/document/src/vespa/document/base/testdocrepo.cpp
index e6ed37dce92..d48bac0ff74 100644
--- a/document/src/vespa/document/base/testdocrepo.cpp
+++ b/document/src/vespa/document/base/testdocrepo.cpp
@@ -75,7 +75,7 @@ TestDocRepo::getDocumentType(const vespalib::string &t) const {
 }
 
 DocumenttypesConfig readDocumenttypesConfig(const char *file_name) {
-    config::FileConfigReader<DocumenttypesConfig> reader(file_name);
+    ::config::FileConfigReader<DocumenttypesConfig> reader(file_name);
     return DocumenttypesConfig(*reader.read());
 }
 
diff --git a/document/src/vespa/document/base/testdocrepo.h b/document/src/vespa/document/base/testdocrepo.h
index 594057887e3..fa2689a94f4 100644
--- a/document/src/vespa/document/base/testdocrepo.h
+++ b/document/src/vespa/document/base/testdocrepo.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/document/config/config-documenttypes.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/datatype.h>
 
 namespace document {
diff --git a/document/src/vespa/document/config/doctypecfg.h b/document/src/vespa/document/config/doctypecfg.h
new file mode 100644
index 00000000000..a1f7cfcb308
--- /dev/null
+++ b/document/src/vespa/document/config/doctypecfg.h
@@ -0,0 +1,16 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+/**
+ * Forward-declaration of the types
+ * DocumenttypesConfig and DocumenttypesConfigBuilder
+ * (globally visible).
+ **/
+
+namespace document::config::internal {
+class InternalDocumenttypesType;
+}
+
+using DocumenttypesConfigBuilder = document::config::internal::InternalDocumenttypesType;
+using DocumenttypesConfig = const document::config::internal::InternalDocumenttypesType;
diff --git a/document/src/vespa/document/config/documentmanager.def b/document/src/vespa/document/config/documentmanager.def
index 6d4b12207bd..b9e7cc0f0d1 100644
--- a/document/src/vespa/document/config/documentmanager.def
+++ b/document/src/vespa/document/config/documentmanager.def
@@ -66,7 +66,7 @@ datatype[].structtype[].field[].datatype int
 ## (necessarily) causing field incompatibility
 datatype[].structtype[].field[].detailedtype string default=""
 
-## Specify a document type to inherit
+## Specify a struct type to inherit
 datatype[].structtype[].inherits[].name string
 
 ## Version is not in use
diff --git a/document/src/vespa/document/repo/configbuilder.h b/document/src/vespa/document/repo/configbuilder.h
index 0bcebe7ddf6..6774ca060f1 100644
--- a/document/src/vespa/document/repo/configbuilder.h
+++ b/document/src/vespa/document/repo/configbuilder.h
@@ -4,6 +4,7 @@
 
 #include <vespa/document/base/field.h>
 #include <vespa/document/config/config-documenttypes.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/datatype.h>
 #include <vespa/document/datatype/structdatatype.h>
 #include <vespa/vespalib/stllike/string.h>
@@ -136,7 +137,7 @@ struct DocTypeRep {
 };
 
 class DocumenttypesConfigBuilderHelper {
-    ::document::DocumenttypesConfigBuilder _config;
+    ::document::config::DocumenttypesConfigBuilder _config;
 
 public:
     DocumenttypesConfigBuilderHelper() {}
@@ -147,7 +148,7 @@ public:
                         const DatatypeConfig &header,
                         const DatatypeConfig &body);
 
-    ::document::DocumenttypesConfigBuilder &config() { return _config; }
+    ::document::config::DocumenttypesConfigBuilder &config() { return _config; }
 };
 
 }
diff --git a/document/src/vespa/document/repo/document_type_repo_factory.h b/document/src/vespa/document/repo/document_type_repo_factory.h
index 4dc75a04e38..28b87566d5d 100644
--- a/document/src/vespa/document/repo/document_type_repo_factory.h
+++ b/document/src/vespa/document/repo/document_type_repo_factory.h
@@ -5,13 +5,10 @@
 #include <memory>
 #include <mutex>
 #include <map>
+#include <vespa/document/config/doctypecfg.h>
 
 namespace document {
 
-namespace internal {
-    class InternalDocumenttypesType;
-}
-
 class DocumentTypeRepo;
 
 /*
@@ -19,7 +16,6 @@ class DocumentTypeRepo;
  * for equal config.
  */
 class DocumentTypeRepoFactory {
-    using DocumenttypesConfig = const internal::InternalDocumenttypesType;
     struct DocumentTypeRepoEntry {
         std::weak_ptr<const DocumentTypeRepo> repo;
         std::unique_ptr<const DocumenttypesConfig> config;
diff --git a/document/src/vespa/document/repo/documenttyperepo.cpp b/document/src/vespa/document/repo/documenttyperepo.cpp
index 15730d14a86..20e3d0c712d 100644
--- a/document/src/vespa/document/repo/documenttyperepo.cpp
+++ b/document/src/vespa/document/repo/documenttyperepo.cpp
@@ -2,6 +2,7 @@
 
 #include "documenttyperepo.h"
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/annotationreferencedatatype.h>
 #include <vespa/document/datatype/arraydatatype.h>
 #include <vespa/document/datatype/documenttype.h>
@@ -229,6 +230,8 @@ struct DataTypeRepo {
 };
 
 namespace {
+
+
 void addAnnotationType(const DocumenttypesConfig::Documenttype::Annotationtype &type, AnnotationTypeRepo &annotations)
 {
     auto a = std::make_unique<AnnotationType>(type.id, type.name);
diff --git a/document/src/vespa/document/repo/documenttyperepo.h b/document/src/vespa/document/repo/documenttyperepo.h
index 87830b0aa1c..fe2158639e6 100644
--- a/document/src/vespa/document/repo/documenttyperepo.h
+++ b/document/src/vespa/document/repo/documenttyperepo.h
@@ -4,11 +4,11 @@
 
 #include <memory>
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/document/config/doctypecfg.h>
 
 namespace document {
 
 namespace internal {
-    class InternalDocumenttypesType;
     class DocumentTypeMap;
 }
 
@@ -19,7 +19,6 @@ class DocumentType;
 
 class DocumentTypeRepo {
 public:
-    using DocumenttypesConfig = const internal::InternalDocumenttypesType;
     struct Handler {
         virtual ~Handler() = default;
         virtual void handle(const DocumentType & type) = 0;
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 7dd47a0b93e..1ae280601f6 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index 343f7d0b0ae..08905968a7a 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -3,6 +3,7 @@
 #include "testbase.h"
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/vespalib/util/exception.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <fcntl.h>
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index f17114d8cd7..600d065d425 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -18,6 +18,7 @@
 #include <vespa/messagebus/testlib/testserver.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/fieldvalue/longfieldvalue.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp
index e2b07a03e2b..4ff851e1735 100644
--- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp
+++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp
@@ -15,7 +15,7 @@ struct DummyPersistenceFactory : public ConformanceTest::PersistenceFactory {
     using Repo = document::DocumentTypeRepo;
 
     std::unique_ptr<PersistenceProvider>
-    getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const Repo::DocumenttypesConfig&) override {
+    getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const DocumenttypesConfig&) override {
         return std::make_unique<dummy::DummyPersistence>(repo);
     }
 
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h
index 5c3f20b1900..e07fc138487 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h
@@ -8,6 +8,7 @@
  */
 #pragma once
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/persistence/spi/persistenceprovider.h>
 #include <gtest/gtest.h>
 
@@ -19,8 +20,6 @@ class TestDocMan;
 
 }
 
-namespace document::internal { class InternalDocumenttypesType; }
-
 namespace storage::spi {
 
 class ConformanceTest : public ::testing::Test {
@@ -29,7 +28,6 @@ public:
     using PersistenceProviderUP = std::unique_ptr<PersistenceProvider>;
     struct PersistenceFactory {
         typedef std::unique_ptr<PersistenceFactory> UP;
-        using DocumenttypesConfig = const document::internal::InternalDocumenttypesType;
 
         virtual ~PersistenceFactory() = default;
         virtual PersistenceProviderUP getPersistenceImplementation(
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp
index be9d394a2b6..38af604c4eb 100644
--- a/searchcore/src/apps/tests/persistenceconformance_test.cpp
+++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp
@@ -11,6 +11,7 @@
 #include <vespa/config-summary.h>
 #include <vespa/config-summarymap.h>
 #include <vespa/document/base/testdocman.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/fastos/file.h>
@@ -55,7 +56,6 @@ using std::shared_ptr;
 using document::BucketSpace;
 using document::DocumentType;
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
 using document::TestDocMan;
 using document::test::makeBucketSpace;
 using search::TuneFileDocumentDB;
diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
index 8db828920c0..9819a1d50af 100644
--- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
+++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
@@ -146,7 +146,7 @@ std::unique_ptr<CFG> getConfig() {
 }
 
 std::shared_ptr<const document::DocumentTypeRepo> getRepo() {
-    typedef document::DocumenttypesConfig DCFG;
+    typedef document::config::DocumenttypesConfig DCFG;
     std::unique_ptr<DCFG> dcfg = getConfig<DCFG>();
     std::shared_ptr<const document::DocumentTypeRepo> ret;
     if (dcfg.get() != 0) {
@@ -180,7 +180,7 @@ App::Main()
     fprintf(stderr, "input feed: %s\n", feedFile.c_str());
     fprintf(stderr, "output directory: %s\n", dirName.c_str());
     vespalib::mkdir(dirName);
-    typedef document::DocumenttypesConfig DCFG;
+    typedef document::config::DocumenttypesConfig DCFG;
     if (!writeConfig(getConfig<DCFG>(), dirName)) {
         fprintf(stderr, "error: could not save config to disk\n");
         return 1;
diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
index 1ccd8221aff..4e29166e9c4 100644
--- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
+++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
@@ -1,5 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -36,8 +37,6 @@ using namespace std::chrono_literals;
 
 using document::DocumentTypeRepo;
 using document::DocumentTypeRepoFactory;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using search::bmcluster::AvgSampler;
 using search::bmcluster::BmClusterController;
 using search::bmcluster::IBmFeedHandler;
diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
index f9833b430a0..335db5d3b08 100644
--- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
+++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
@@ -1,5 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -38,8 +39,6 @@ using namespace std::chrono_literals;
 
 using document::DocumentTypeRepo;
 using document::DocumentTypeRepoFactory;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using search::bmcluster::AvgSampler;
 using search::bmcluster::BmClusterController;
 using search::bmcluster::IBmFeedHandler;
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 5c777baa3bb..8d286d599c4 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/vespalib/util/programoptions.h>
 #include <vespa/vespalib/util/xmlstream.h>
 #include <vespa/vespalib/util/time.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/fieldvalue/document.h>
@@ -25,7 +26,6 @@ using namespace search;
 using namespace search::common;
 using namespace search::transactionlog;
 
-using document::DocumenttypesConfig;
 using document::DocumentTypeRepo;
 
 typedef std::shared_ptr<DocumenttypesConfig> DocumenttypesConfigSP;
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
index 62145a118b0..3318105220c 100644
--- a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
@@ -1,5 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/fieldvalue/intfieldvalue.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/searchcore/proton/attribute/attribute_populator.h>
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp
index 5799753f075..d888063643b 100644
--- a/searchcore/src/tests/proton/common/cachedselect_test.cpp
+++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/document/base/documentid.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/intfieldvalue.h>
diff --git a/searchcore/src/tests/proton/common/selectpruner_test.cpp b/searchcore/src/tests/proton/common/selectpruner_test.cpp
index 3c793c4e6c3..0e980ab9db7 100644
--- a/searchcore/src/tests/proton/common/selectpruner_test.cpp
+++ b/searchcore/src/tests/proton/common/selectpruner_test.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index c5a01de6b3b..d7285121647 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -3,6 +3,7 @@
 #include <tests/proton/common/dummydbowner.h>
 #include <vespa/config-bucketspaces.h>
 #include <vespa/config/helper/configgetter.hpp>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/eval/eval/simple_value.h>
@@ -46,6 +47,8 @@
 #include <vespa/log/log.h>
 LOG_SETUP("docsummary_test");
 
+using config::ConfigGetter;
+
 using namespace cloud::config::filedistribution;
 using namespace document;
 using namespace search::docsummary;
@@ -56,7 +59,6 @@ using namespace search;
 using namespace std::chrono_literals;
 
 using vespalib::IDestructorCallback;
-using document::DocumenttypesConfig;
 using document::test::makeBucketSpace;
 using search::TuneFileDocumentDB;
 using search::index::DummyFileHeaderContext;
@@ -183,7 +185,7 @@ public:
     matching::QueryLimiter _queryLimiter;
     vespalib::Clock _clock;
     DummyWireService _dummy;
-    config::DirSpec _spec;
+    ::config::DirSpec _spec;
     DocumentDBConfigHelper _configMgr;
     DocumentDBConfig::DocumenttypesConfigSP _documenttypesConfig;
     const std::shared_ptr<const DocumentTypeRepo> _repo;
@@ -1127,12 +1129,12 @@ Fixture::Fixture()
       _markupFields()
 {
     std::string cfgId("summary");
-    _summaryCfg = config::ConfigGetter<vespa::config::search::SummaryConfig>::getConfig(
-        cfgId, config::FileSpec(TEST_PATH("summary.cfg")));
+    _summaryCfg = ConfigGetter<vespa::config::search::SummaryConfig>::getConfig(
+        cfgId, ::config::FileSpec(TEST_PATH("summary.cfg")));
     _resultCfg.ReadConfig(*_summaryCfg, cfgId.c_str());
     std::string mapCfgId("summarymap");
-    std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig(
-        mapCfgId, config::FileSpec(TEST_PATH("summarymap.cfg")));
+    std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = ::config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig(
+        mapCfgId, ::config::FileSpec(TEST_PATH("summarymap.cfg")));
     for (size_t i = 0; i < mapCfg->override.size(); ++i) {
         const vespa::config::search::SummarymapConfig::Override & o = mapCfg->override[i];
         if (o.command == "dynamicteaser") {
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 1fe32c8c1b3..7649949dc0e 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -8,6 +8,7 @@
 #include <vespa/document/base/documentid.h>
 #include <vespa/document/base/exceptions.h>
 #include <vespa/document/base/field.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/annotationtype.h>
 #include <vespa/document/datatype/arraydatatype.h>
 #include <vespa/document/datatype/datatype.h>
@@ -61,8 +62,6 @@ using document::Document;
 using document::DocumentId;
 using document::DocumentType;
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using document::DoubleFieldValue;
 using document::FeatureSet;
 using document::Field;
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index cd694cb938c..85b0774c748 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/vespalib/testkit/testapp.h>
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
 #include <vespa/searchcore/proton/attribute/attributemanager.h>
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index b80cd08ae8e..7f28ccd0737 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -274,7 +274,7 @@ struct MyConfigSnapshot
                                  std::make_shared<FiledistributorrpcConfig>(),
                                  std::make_shared<BucketspacesConfig>(),
                                  tuneFileDocumentDB, HwInfo());
-        config::DirSpec spec(cfgDir);
+        ::config::DirSpec spec(cfgDir);
         DocumentDBConfigHelper mgr(spec, "searchdocument");
         mgr.forwardConfig(_bootstrap);
         mgr.nextGeneration(1ms);
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index b31534c011c..7e99789476f 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -2,6 +2,7 @@
 
 #include <tests/proton/common/dummydbowner.h>
 #include <vespa/config-bucketspaces.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_bucket_space.h>
@@ -43,7 +44,6 @@ using namespace std::chrono_literals;
 
 using document::DocumentType;
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
 using document::test::makeBucketSpace;
 using search::SerialNum;
 using search::TuneFileDocumentDB;
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
index 0d07da8858a..94ea7e07322 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
@@ -8,6 +8,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/config-summary.h>
 #include <vespa/config-summarymap.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 469cffaa31a..2fa2742b3df 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -8,6 +8,7 @@
 #include <vespa/config-summary.h>
 #include <vespa/config-summarymap.h>
 #include <vespa/config/helper/configgetter.hpp>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/searchcore/proton/server/bootstrapconfig.h>
 #include <vespa/searchcore/proton/server/fileconfigmanager.h>
@@ -40,10 +41,10 @@ vespalib::string myId("myconfigid");
 DocumentDBConfig::SP
 makeBaseConfigSnapshot()
 {
-    config::DirSpec spec(TEST_PATH("cfg"));
+    ::config::DirSpec spec(TEST_PATH("cfg"));
 
     DBCM dbcm(spec, "test");
-    DocumenttypesConfigSP dtcfg(config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release());
+    DocumenttypesConfigSP dtcfg(::config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release());
     auto b = std::make_shared<BootstrapConfig>(1, dtcfg,
                                                std::make_shared<DocumentTypeRepo>(*dtcfg),
                                                std::make_shared<ProtonConfig>(),
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 567fbf5dfec..56b1f7ec1cc 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -16,6 +16,7 @@
 #include <vespa/searchlib/query/base.h>
 #include <persistence/spi/types.h>
 #include <vespa/document/base/documentid.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/datatype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/update/documentupdate.h>
diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp
index a95c4a00f0b..2496de0aaa0 100644
--- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp
+++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp
@@ -13,6 +13,7 @@
 #include <vespa/searchcore/config/config-ranking-expressions.h>
 #include <vespa/searchcore/config/config-onnx-models.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/fileacquirer/config-filedistributorrpc.h>
 #include <vespa/vespalib/util/varholder.h>
@@ -40,8 +41,6 @@ using vespa::config::content::core::BucketspacesConfigBuilder;
 
 using config::ConfigUri;
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using search::TuneFileDocumentDB;
 using std::map;
 using vespalib::VarHolder;
diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index 55b2c7194ba..e3999e8f3a9 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -7,6 +7,7 @@
 #include <vespa/config-rank-profiles.h>
 #include <vespa/config-summary.h>
 #include <vespa/config-summarymap.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/fileacquirer/config-filedistributorrpc.h>
 #include <vespa/searchcore/proton/common/alloc_config.h>
@@ -41,8 +42,6 @@ using vespa::config::content::core::BucketspacesConfigBuilder;
 using InitializeThreads = std::shared_ptr<vespalib::ThreadStackExecutorBase>;
 using config::ConfigUri;
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using search::TuneFileDocumentDB;
 using std::map;
 using search::index::Schema;
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp
index aed9f44799a..e631388c9b8 100644
--- a/searchcore/src/tests/proton/server/documentretriever_test.cpp
+++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp
@@ -190,7 +190,7 @@ struct MyDocumentStore : proton::test::DummyDocumentStore {
 
 MyDocumentStore::~MyDocumentStore() = default;
 
-document::DocumenttypesConfig getRepoConfig() {
+DocumenttypesConfig getRepoConfig() {
     const int32_t doc_type_id = 787121340;
 
     DocumenttypesConfigBuilderHelper builder;
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h
index 9fd1743321e..1c679ab5b14 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <vespa/document/config/doctypecfg.h>
 #include "bm_cluster_params.h"
 #include <memory>
 #include <vector>
@@ -19,7 +20,6 @@ class DocumentTypeRepo;
 class FieldSetRepo;
 
 }
-namespace document::internal { class InternalDocumenttypesType; }
 namespace mbus { class Slobrok; }
 namespace storage::rpc { class SharedRpcResources; }
 
@@ -41,7 +41,6 @@ class IBmFeedHandler;
 class BmCluster {
     struct MessageBusConfigSet;
     struct RpcClientConfigSet;
-    using DocumenttypesConfig = const document::internal::InternalDocumenttypesType;
     BmClusterParams                                   _params;
     int                                               _slobrok_port;
     int                                               _rpc_client_port;
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index 62d86ce895d..d4b12e96f1f 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -29,6 +29,7 @@
 #include <vespa/config-upgrading.h>
 #include <vespa/config/common/configcontext.h>
 #include <vespa/document/bucket/bucketspace.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -85,8 +86,6 @@ using cloud::config::SlobroksConfigBuilder;
 using cloud::config::filedistribution::FiledistributorrpcConfig;
 using config::ConfigSet;
 using document::BucketSpace;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using document::DocumentType;
 using document::DocumentTypeRepo;
 using document::Field;
@@ -483,7 +482,7 @@ class MyBmNode : public BmNode
 
     void create_document_db(const BmClusterParams&  params);
 public:
-    MyBmNode(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port);
+    MyBmNode(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port);
     ~MyBmNode() override;
     void initialize_persistence_provider() override;
     void create_bucket(const document::Bucket& bucket) override;
@@ -500,7 +499,7 @@ public:
     void merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::ClusterState &baseline_state) override;
 };
 
-MyBmNode::MyBmNode(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port)
+MyBmNode::MyBmNode(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port)
     : BmNode(),
       _cluster(cluster),
       _document_types(std::move(document_types)),
@@ -800,7 +799,7 @@ MyBmNode::merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::C
 }
 
 std::unique_ptr<BmNode>
-BmNode::create(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster &cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port)
+BmNode::create(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster &cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port)
 {
     return std::make_unique<MyBmNode>(base_dir, base_port, node_idx, cluster, params, std::move(document_types), slobrok_port);
 }
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h
index 49c80db44ce..86c5b2ee095 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h
@@ -15,8 +15,6 @@ class Field;
 
 };
 
-namespace document::internal { class InternalDocumenttypesType; }
-
 namespace storage::lib { class ClusterState; }
 namespace storage::spi { struct PersistenceProvider; }
 
@@ -52,7 +50,7 @@ public:
     virtual storage::spi::PersistenceProvider *get_persistence_provider() = 0;
     virtual void merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::ClusterState &baseline_state) = 0;
     static unsigned int num_ports();
-    static std::unique_ptr<BmNode> create(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<const document::internal::InternalDocumenttypesType> document_types, int slobrok_port);
+    static std::unique_ptr<BmNode> create(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port);
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 6f65d76789a..eaf5a907808 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -96,7 +96,7 @@ SummarySetup(const vespalib::string & baseDir, const DocTypeName & docTypeName,
     auto resultConfig = std::make_unique<ResultConfig>();
     if (!resultConfig->ReadConfig(summaryCfg, make_string("SummaryManager(%s)", baseDir.c_str()).c_str())) {
         std::ostringstream oss;
-        config::OstreamConfigWriter writer(oss);
+        ::config::OstreamConfigWriter writer(oss);
         writer.write(summaryCfg);
         throw IllegalArgumentException
             (make_string("Could not initialize summary result config for directory '%s' based on summary config '%s'",
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
index bc1c16ed5b9..4286f5ffbfa 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
@@ -2,13 +2,13 @@
 
 #include "bootstrapconfig.h"
 #include <vespa/config-bucketspaces.h>
+#include <vespa/document/config/doctypecfg.h>
 
 using namespace vespa::config::search;
 using namespace config;
 using document::DocumentTypeRepo;
 using search::TuneFileDocumentDB;
 using vespa::config::search::core::ProtonConfig;
-using document::DocumenttypesConfig;
 
 namespace {
     template <typename T>
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
index b8ed1226220..4ae0adeb5a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
@@ -50,7 +50,7 @@ public:
                     const HwInfo & hwInfo);
     ~BootstrapConfig();
 
-    const document::DocumenttypesConfig &getDocumenttypesConfig() const { return *_documenttypes; }
+    const document::config::DocumenttypesConfig &getDocumenttypesConfig() const { return *_documenttypes; }
     const FiledistributorrpcConfig &getFiledistributorrpcConfig() const { return *_fileDistributorRpc; }
     const FiledistributorrpcConfigSP &getFiledistributorrpcConfigSP() const { return _fileDistributorRpc; }
     const DocumenttypesConfigSP &getDocumenttypesConfigSP() const { return _documenttypes; }
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
index e81f576cf46..a581c602380 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
@@ -2,6 +2,7 @@
 
 #include "bootstrapconfigmanager.h"
 #include "bootstrapconfig.h"
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/config-bucketspaces.h>
@@ -19,7 +20,6 @@ using search::TuneFileDocumentDB;
 using vespa::config::search::core::ProtonConfig;
 using cloud::config::filedistribution::FiledistributorrpcConfig;
 using vespa::config::content::core::BucketspacesConfig;
-using document::DocumenttypesConfig;
 using document::DocumentTypeRepoFactory;
 using BucketspacesConfigSP = std::shared_ptr<BucketspacesConfig>;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
index 4b2ef276077..51b7934111f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
@@ -9,6 +9,7 @@
 #include <vespa/config-summary.h>
 #include <vespa/config-summarymap.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/searchcore/config/config-ranking-constants.h>
@@ -23,7 +24,6 @@ using namespace vespa::config::search::summary;
 using namespace vespa::config::search;
 
 using document::DocumentTypeRepo;
-using document::DocumenttypesConfig;
 using search::TuneFileDocumentDB;
 using search::index::Schema;
 using vespa::config::search::SummarymapConfig;
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
index fb29b086718..983460797c1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "document_db_maintenance_config.h"
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/searchcommon/common/schema.h>
 #include <vespa/searchcore/proton/matching/ranking_constants.h>
@@ -26,7 +27,6 @@ namespace document {
     class DocumentTypeRepo;
     class DocumentType;
 }
-namespace document::internal { class InternalDocumenttypesType; }
 
 namespace proton {
 
@@ -112,7 +112,6 @@ public:
     using SummarymapConfigSP = std::shared_ptr<SummarymapConfig>;
     using JuniperrcConfig = const vespa::config::search::summary::internal::InternalJuniperrcType;
     using JuniperrcConfigSP = std::shared_ptr<JuniperrcConfig>;
-    using DocumenttypesConfig = const document::internal::InternalDocumenttypesType;
     using DocumenttypesConfigSP = std::shared_ptr<DocumenttypesConfig>;
     using MaintenanceConfigSP = DocumentDBMaintenanceConfig::SP;
     using ImportedFieldsConfig = const vespa::config::search::internal::InternalImportedFieldsType;
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index 9641f6157c4..cde6875526d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -5,6 +5,7 @@
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/config/print/fileconfigwriter.h>
 #include <vespa/config-bucketspaces.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/searchcommon/common/schemaconfigurer.h>
 #include <vespa/vespalib/io/fileutil.h>
@@ -25,7 +26,6 @@ LOG_SETUP(".proton.server.fileconfigmanager");
 
 using document::DocumentTypeRepo;
 using document::DocumentTypeRepoFactory;
-using document::DocumenttypesConfig;
 using search::IndexMetaInfo;
 using search::SerialNum;
 using search::index::Schema;
diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
index b147667202a..c4f10d084bc 100644
--- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
@@ -6,6 +6,7 @@
 #include <vespa/config-rank-profiles.h>
 #include <vespa/config-attributes.h>
 #include <vespa/config-indexschema.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/document/config/config-documenttypes.h>
@@ -13,7 +14,6 @@
 #include <vespa/searchcore/proton/common/alloc_config.h>
 #include <vespa/searchcore/proton/server/threading_service_config.h>
 
-using document::DocumenttypesConfig;
 using search::TuneFileDocumentDB;
 using search::index::Schema;
 using vespa::config::search::RankProfilesConfig;
diff --git a/searchlib/src/apps/tests/memoryindexstress_test.cpp b/searchlib/src/apps/tests/memoryindexstress_test.cpp
index 54864702a47..fcac0be8f85 100644
--- a/searchlib/src/apps/tests/memoryindexstress_test.cpp
+++ b/searchlib/src/apps/tests/memoryindexstress_test.cpp
@@ -73,7 +73,7 @@ makeSchema()
     return schema;
 }
 
-document::DocumenttypesConfig
+document::config::DocumenttypesConfig
 makeDocTypeRepoConfig()
 {
     const int32_t doc_type_id = 787121340;
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index 792cc48c338..072efb06a07 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -36,7 +36,7 @@ const string doc_type_name = "test";
 const string header_name = doc_type_name + ".header";
 const string body_name = doc_type_name + ".body";
 
-document::DocumenttypesConfig
+document::config::DocumenttypesConfig
 makeDocTypeRepoConfig()
 {
     const int32_t doc_type_id = 787121340;
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index 242a3c31663..07652dfd336 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -399,7 +399,7 @@ const string doc_type_name = "test";
 const string header_name = doc_type_name + ".header";
 const string body_name = doc_type_name + ".body";
 
-document::DocumenttypesConfig
+document::config::DocumenttypesConfig
 makeDocTypeRepoConfig()
 {
     const int32_t doc_type_id = 787121340;
diff --git a/searchlib/src/tests/index/doctypebuilder/doctypebuilder_test.cpp b/searchlib/src/tests/index/doctypebuilder/doctypebuilder_test.cpp
index 4b7062be4f8..f8a07270292 100644
--- a/searchlib/src/tests/index/doctypebuilder/doctypebuilder_test.cpp
+++ b/searchlib/src/tests/index/doctypebuilder/doctypebuilder_test.cpp
@@ -26,7 +26,7 @@ TEST("testSearchDocType") {
     s.addSummaryField(Schema::SummaryField("sa", DataType::STRING));
 
     DocTypeBuilder docTypeBuilder(s);
-    document::DocumenttypesConfig config = docTypeBuilder.makeConfig();
+    document::config::DocumenttypesConfig config = docTypeBuilder.makeConfig();
     DocumentTypeRepo repo(config);
     const DocumentType *docType = repo.getDocumentType("searchdocument");
     ASSERT_TRUE(docType);
@@ -57,7 +57,7 @@ TEST("require that multiple fields can have the same type") {
     s.addIndexField(Schema::IndexField("array1", DataType::STRING, CollectionType::ARRAY));
     s.addIndexField(Schema::IndexField("array2", DataType::STRING, CollectionType::ARRAY));
     DocTypeBuilder docTypeBuilder(s);
-    document::DocumenttypesConfig config = docTypeBuilder.makeConfig();
+    document::config::DocumenttypesConfig config = docTypeBuilder.makeConfig();
     DocumentTypeRepo repo(config);
     const DocumentType *docType = repo.getDocumentType("searchdocument");
     ASSERT_TRUE(docType);
diff --git a/searchlib/src/vespa/searchlib/index/docbuilder.h b/searchlib/src/vespa/searchlib/index/docbuilder.h
index 2b60446bd4e..2ee28c90827 100644
--- a/searchlib/src/vespa/searchlib/index/docbuilder.h
+++ b/searchlib/src/vespa/searchlib/index/docbuilder.h
@@ -253,7 +253,7 @@ private:
     };
 
     const Schema & _schema;
-    document::DocumenttypesConfig _doctypes_config;
+    document::config::DocumenttypesConfig _doctypes_config;
     std::shared_ptr<const document::DocumentTypeRepo> _repo;
     const document::DocumentType &_docType;
     document::Document::UP _doc;    // the document we are about to generate
@@ -300,7 +300,7 @@ public:
 
     const document::DocumentType &getDocumentType() const { return _docType; }
     const std::shared_ptr<const document::DocumentTypeRepo> &getDocumentTypeRepo() const { return _repo; }
-    document::DocumenttypesConfig getDocumenttypesConfig() const { return _doctypes_config; }
+    document::config::DocumenttypesConfig getDocumenttypesConfig() const { return _doctypes_config; }
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
index 9f0a44d2b73..1ddfbff54a8 100644
--- a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
+++ b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
@@ -43,9 +43,9 @@ DataType::Type convert(Schema::DataType type) {
 }
 
 void
-insertStructType(document::DocumenttypesConfig::Documenttype & cfg, const StructDataType & structType)
+insertStructType(document::config::DocumenttypesConfig::Documenttype & cfg, const StructDataType & structType)
 {
-    typedef document::DocumenttypesConfig DTC;
+    typedef document::config::DocumenttypesConfig DTC;
     DTC::Documenttype::Datatype::Sstruct cfgStruct;
     cfgStruct.name = structType.getName();
     Field::Set fieldSet = structType.getFieldSet();
@@ -97,7 +97,7 @@ DocTypeBuilder::DocTypeBuilder(const Schema &schema)
     _iFields.setup(schema);
 }
 
-document::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
+document::config::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
     using namespace document::config_builder;
     TypeCache type_cache;
 
@@ -168,10 +168,10 @@ document::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
     return builder.config();
 }
 
-document::DocumenttypesConfig
+document::config::DocumenttypesConfig
 DocTypeBuilder::makeConfig(const DocumentType &docType)
 {
-    typedef document::DocumenttypesConfigBuilder DTC;
+    typedef document::config::DocumenttypesConfigBuilder DTC;
     DTC cfg;
     { // document type
         DTC::Documenttype dtype;
diff --git a/searchlib/src/vespa/searchlib/index/doctypebuilder.h b/searchlib/src/vespa/searchlib/index/doctypebuilder.h
index 98b52e955fc..c66ae66e250 100644
--- a/searchlib/src/vespa/searchlib/index/doctypebuilder.h
+++ b/searchlib/src/vespa/searchlib/index/doctypebuilder.h
@@ -20,9 +20,9 @@ class DocTypeBuilder {
 
 public:
     DocTypeBuilder(const Schema & schema);
-    document::DocumenttypesConfig makeConfig() const;
+    document::config::DocumenttypesConfig makeConfig() const;
 
-    static document::DocumenttypesConfig
+    static document::config::DocumenttypesConfig
     makeConfig(const document::DocumentType &docType);
 };
 
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index aefda3660df..dd539c3daa5 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/config/helper/configgetter.hpp>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/fieldvalue/document.h>
@@ -29,7 +30,6 @@
 LOG_SETUP(".test.bucketdb.bucketmanager");
 
 using config::ConfigGetter;
-using document::DocumenttypesConfig;
 using config::FileSpec;
 using document::DocumentType;
 using document::DocumentTypeRepo;
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp
index 41f811a77a6..66c8969acc3 100644
--- a/storage/src/tests/distributor/getoperationtest.cpp
+++ b/storage/src/tests/distributor/getoperationtest.cpp
@@ -3,6 +3,7 @@
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/config/helper/configgetter.h>
 #include <vespa/config/helper/configgetter.hpp>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -20,7 +21,6 @@
 
 using std::shared_ptr;
 using config::ConfigGetter;
-using document::DocumenttypesConfig;
 using config::FileSpec;
 using document::test::makeDocumentBucket;
 using document::BucketId;
diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp
index dca54e22f0d..2d41b0f4d32 100644
--- a/storage/src/tests/distributor/operationtargetresolvertest.cpp
+++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp
@@ -34,7 +34,7 @@ struct OperationTargetResolverTest : Test, DistributorStripeTestUtil {
 
     void SetUp() override {
         _repo.reset(new document::DocumentTypeRepo(
-                *config::ConfigGetter<document::DocumenttypesConfig>::getConfig(
+                *config::ConfigGetter<DocumenttypesConfig>::getConfig(
                     "config-doctypes",
                     config::FileSpec("../config-doctypes.cfg"))));
         _html_type = _repo->getDocumentType("text/html");
diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp
index 6ad67ab91c2..017207d0b56 100644
--- a/storage/src/tests/distributor/putoperationtest.cpp
+++ b/storage/src/tests/distributor/putoperationtest.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <tests/distributor/distributor_stripe_test_util.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/top_level_distributor.h>
@@ -15,7 +16,6 @@
 
 using std::shared_ptr;
 using config::ConfigGetter;
-using document::DocumenttypesConfig;
 using config::FileSpec;
 using vespalib::string;
 using namespace document;
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index 9b229198043..c1aece58183 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -3,6 +3,7 @@
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/config/helper/configgetter.h>
 #include <vespa/document/base/testdocrepo.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
@@ -19,7 +20,6 @@ namespace storage::distributor {
 
 using document::test::makeDocumentBucket;
 using config::ConfigGetter;
-using document::DocumenttypesConfig;
 using namespace document;
 using namespace storage;
 using namespace storage::distributor;
diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp
index db974e2202c..f0cb30368cb 100644
--- a/storage/src/tests/distributor/updateoperationtest.cpp
+++ b/storage/src/tests/distributor/updateoperationtest.cpp
@@ -14,15 +14,15 @@
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
+using config::ConfigGetter;
+using config::FileSpec;
+using vespalib::string;
+using document::test::makeDocumentBucket;
 using namespace document;
 using namespace storage::api;
 using namespace std;
 using namespace storage::lib;
 using namespace ::testing;
-using config::ConfigGetter;
-using config::FileSpec;
-using vespalib::string;
-using document::test::makeDocumentBucket;
 
 namespace storage::distributor {
 
diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp
index ae4ff1c1b21..e6f5eec6bab 100644
--- a/storage/src/tests/storageserver/documentapiconvertertest.cpp
+++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp
@@ -3,6 +3,7 @@
 #include <vespa/config/subscription/configuri.h>
 #include <vespa/document/base/testdocrepo.h>
 #include <vespa/document/bucket/bucketidfactory.h>
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/select/parser.h>
diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp
index 2e199db1f07..c19fca8c58c 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.cpp
+++ b/storage/src/vespa/storage/storageserver/storagenode.cpp
@@ -485,7 +485,7 @@ void StorageNode::configure(std::unique_ptr<StorDistributionConfig> config) {
     }
 }
 void
-StorageNode::configure(std::unique_ptr<document::DocumenttypesConfig> config,
+StorageNode::configure(std::unique_ptr<document::config::DocumenttypesConfig> config,
                        bool hasChanged, int64_t generation)
 {
     log_config_received(*config);
diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h
index 74a070cb105..c49737af78b 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.h
+++ b/storage/src/vespa/storage/storageserver/storagenode.h
@@ -133,7 +133,7 @@ private:
     void configure(std::unique_ptr<StorServerConfig> config) override;
     void configure(std::unique_ptr<UpgradingConfig> config) override;
     void configure(std::unique_ptr<StorDistributionConfig> config) override;
-    virtual void configure(std::unique_ptr<document::DocumenttypesConfig> config,
+    virtual void configure(std::unique_ptr<document::config::DocumenttypesConfig> config,
                            bool hasChanged, int64_t generation);
     void configure(std::unique_ptr<BucketspacesConfig>) override;
     void updateUpgradeFlag(const UpgradingConfig&);
@@ -148,13 +148,13 @@ protected:
     std::unique_ptr<StorServerConfig> _serverConfig;
     std::unique_ptr<UpgradingConfig> _clusterConfig;
     std::unique_ptr<StorDistributionConfig> _distributionConfig;
-    std::unique_ptr<document::DocumenttypesConfig> _doctypesConfig;
+    std::unique_ptr<document::config::DocumenttypesConfig> _doctypesConfig;
     std::unique_ptr<BucketspacesConfig> _bucketSpacesConfig;
         // New configs gotten that has yet to have been handled
     std::unique_ptr<StorServerConfig> _newServerConfig;
     std::unique_ptr<UpgradingConfig> _newClusterConfig;
     std::unique_ptr<StorDistributionConfig> _newDistributionConfig;
-    std::unique_ptr<document::DocumenttypesConfig> _newDoctypesConfig;
+    std::unique_ptr<document::config::DocumenttypesConfig> _newDoctypesConfig;
     std::unique_ptr<BucketspacesConfig> _newBucketSpacesConfig;
     std::unique_ptr<StorageComponent> _component;
     std::unique_ptr<NodeIdentity> _node_identity;
diff --git a/storageserver/src/vespa/storageserver/app/process.cpp b/storageserver/src/vespa/storageserver/app/process.cpp
index 9ec1ed2bd10..8480f1427f2 100644
--- a/storageserver/src/vespa/storageserver/app/process.cpp
+++ b/storageserver/src/vespa/storageserver/app/process.cpp
@@ -21,7 +21,7 @@ Process::Process(const config::ConfigUri & configUri)
 void
 Process::setupConfig(milliseconds subscribeTimeout)
 {
-    _documentHandler = _configSubscriber.subscribe<document::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
+    _documentHandler = _configSubscriber.subscribe<document::config::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
     if (!_configSubscriber.nextConfig()) {
         throw vespalib::TimeoutException("Could not subscribe to document config within timeout");
     }
diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h
index 5f22906896b..407c8cf8881 100644
--- a/storageserver/src/vespa/storageserver/app/process.h
+++ b/storageserver/src/vespa/storageserver/app/process.h
@@ -34,7 +34,7 @@ protected:
     config::ConfigSubscriber _configSubscriber;
 
 private:
-    config::ConfigHandle<document::DocumenttypesConfig>::UP _documentHandler;
+    config::ConfigHandle<document::config::DocumenttypesConfig>::UP _documentHandler;
     std::vector<DocumentTypeRepoSP> _repos;
 
 public:
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
index aaa588c0353..47328c2e135 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
@@ -2,6 +2,7 @@
 
 #include "application.h"
 
+#include <vespa/document/config/doctypecfg.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/documentapi/messagebus/documentprotocol.h>
@@ -18,7 +19,6 @@
 #include <vespa/fnet/frt/supervisor.h>
 
 using config::ConfigGetter;
-using document::DocumenttypesConfig;
 using messagebus::MessagebusConfig;
 using document::DocumentTypeRepo;