C++ style fix: Use foo() instead of foo(void)

106 files changed, 488 insertions, 488 deletions

diff --git a/searchcore/src/apps/fdispatch/fdispatch.cpp b/searchcore/src/apps/fdispatch/fdispatch.cpp
index 799c42887da..9f6b13bc858 100644
--- a/searchcore/src/apps/fdispatch/fdispatch.cpp
+++ b/searchcore/src/apps/fdispatch/fdispatch.cpp
@@ -34,17 +34,17 @@ protected:
         return (vespalib::SignalHandler::INT.check() || vespalib::SignalHandler::TERM.check());
     }
 
-    void Usage(void);
+    void Usage();
     bool GetOptions(int *exitCode);
 
 public:
     int Main() override;
-    FastS_FDispatchApp(void);
-    ~FastS_FDispatchApp(void);
+    FastS_FDispatchApp();
+    ~FastS_FDispatchApp();
 };
 
 
-FastS_FDispatchApp::FastS_FDispatchApp(void)
+FastS_FDispatchApp::FastS_FDispatchApp()
 {
 }
 
@@ -174,7 +174,7 @@ FastS_FDispatchApp::GetOptions(int *exitCode)
 }
 
 void
-FastS_FDispatchApp::Usage(void)
+FastS_FDispatchApp::Usage()
 {
     printf("FAST Search - fdispatch %s\n", FastS_VersionTag);
     printf("\n"
@@ -192,7 +192,7 @@ FastS_FDispatchApp::Usage(void)
 }
 
 
-FastS_FDispatchApp::~FastS_FDispatchApp(void)
+FastS_FDispatchApp::~FastS_FDispatchApp()
 {
 }
 
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp
index a0bb3cf8591..719abe08612 100644
--- a/searchcore/src/apps/tests/persistenceconformance_test.cpp
+++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp
@@ -232,7 +232,7 @@ public:
     }
 
     void
-    close(void)
+    close()
     {
         for (DocumentDBMap::iterator itr = _docDbs.begin();
              itr != _docDbs.end(); ++itr) {
@@ -259,12 +259,12 @@ protected:
     }
 
     virtual
-    ~DocDBRepoHolder(void)
+    ~DocDBRepoHolder()
     {
     }
 
     void
-    close(void)
+    close()
     {
         if (_docDbRepo.get() != NULL)
             _docDbRepo->close();
@@ -320,7 +320,7 @@ public:
     }
 
     void
-    removeHandlers(void)
+    removeHandlers()
     {
         if (_docDbRepo.get() == NULL)
             return;
@@ -332,7 +332,7 @@ public:
     }
 
     virtual
-    ~MyPersistenceEngine(void)
+    ~MyPersistenceEngine()
     {
         destroyIterators();
         removeHandlers(); // Block calls to document db from engine
@@ -385,12 +385,12 @@ public:
 
 struct FixtureBaseBase
 {
-    FixtureBaseBase(void)
+    FixtureBaseBase()
     {
         FastOS_FileInterface::EmptyAndRemoveDirectory("testdb");
     }
 
-    ~FixtureBaseBase(void)
+    ~FixtureBaseBase()
     {
         FastOS_FileInterface::EmptyAndRemoveDirectory("testdb");
     }
@@ -408,7 +408,7 @@ struct FixtureBase : public FixtureBaseBase
                                                                docType)))
     {
     }
-    ~FixtureBase(void)
+    ~FixtureBase()
     {
     }
 };
diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
index 7b7527da6ef..d9f6857754f 100644
--- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
+++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
@@ -20,7 +20,7 @@ using namespace vespalib::alloc;
 using vespalib::string;
 
 void
-usageHeader(void)
+usageHeader()
 {
     using std::cerr;
     cerr <<
@@ -148,13 +148,13 @@ public:
     FieldGenerator(const string &name);
 
     virtual
-    ~FieldGenerator(void);
+    ~FieldGenerator();
 
     virtual void
-    setup(void);
+    setup();
 
     virtual void
-    clear(void);
+    clear();
 
     virtual void
     deleteHistogram(const string &baseDir,
@@ -175,19 +175,19 @@ FieldGenerator::FieldGenerator(const string &name)
 {
 }
 
-FieldGenerator::~FieldGenerator(void)
+FieldGenerator::~FieldGenerator()
 {
 }
 
 
 void
-FieldGenerator::setup(void)
+FieldGenerator::setup()
 {
 }
 
 
 void
-FieldGenerator::clear(void)
+FieldGenerator::clear()
 {
 }
 
@@ -229,13 +229,13 @@ public:
                            uint32_t maxFill);
 
     virtual
-    ~RandTextFieldGenerator(void);
+    ~RandTextFieldGenerator();
 
     virtual void
-    setup(void) override;
+    setup() override;
 
     virtual void
-    clear(void) override;
+    clear() override;
 
     virtual void
     deleteHistogram(const string &baseDir, const string &name) override;
@@ -267,13 +267,13 @@ RandTextFieldGenerator::RandTextFieldGenerator(const string &name,
 
 
 
-RandTextFieldGenerator::~RandTextFieldGenerator(void)
+RandTextFieldGenerator::~RandTextFieldGenerator()
 {
 }
 
 
 void
-RandTextFieldGenerator::setup(void)
+RandTextFieldGenerator::setup()
 {
     LOG(info,
         "generating dictionary for field %s (%u words)",
@@ -284,7 +284,7 @@ RandTextFieldGenerator::setup(void)
 
 
 void
-RandTextFieldGenerator::clear(void)
+RandTextFieldGenerator::clear()
 {
     typedef std::vector<uint32_t>::iterator HI;
     for (HI i(_histogram.begin()), ie(_histogram.end()); i != ie; ++i) {
@@ -363,10 +363,10 @@ public:
                           const std::vector<uint32_t> &mods);
     
     virtual
-    ~ModTextFieldGenerator(void);
+    ~ModTextFieldGenerator();
 
     virtual void
-    clear(void) override;
+    clear() override;
 
     virtual void
     writeHistogram(const string &name);
@@ -386,13 +386,13 @@ ModTextFieldGenerator::ModTextFieldGenerator(const string &name,
 }
     
 
-ModTextFieldGenerator::~ModTextFieldGenerator(void)
+ModTextFieldGenerator::~ModTextFieldGenerator()
 {
 }
 
 
 void
-ModTextFieldGenerator::clear(void)
+ModTextFieldGenerator::clear()
 {
 }
 
@@ -427,10 +427,10 @@ public:
     IdTextFieldGenerator(const string &name);
     
     virtual
-    ~IdTextFieldGenerator(void);
+    ~IdTextFieldGenerator();
 
     virtual void
-    clear(void) override;
+    clear() override;
 
     virtual void
     writeHistogram(const string &name);
@@ -446,13 +446,13 @@ IdTextFieldGenerator::IdTextFieldGenerator(const string &name)
 }
     
 
-IdTextFieldGenerator::~IdTextFieldGenerator(void)
+IdTextFieldGenerator::~IdTextFieldGenerator()
 {
 }
 
 
 void
-IdTextFieldGenerator::clear(void)
+IdTextFieldGenerator::clear()
 {
 }
 
@@ -486,10 +486,10 @@ public:
                           uint32_t count);
     
     virtual
-    ~RandIntFieldGenerator(void);
+    ~RandIntFieldGenerator();
 
     virtual void
-    clear(void) override;
+    clear() override;
 
     virtual void
     writeHistogram(const string &name);
@@ -512,13 +512,13 @@ RandIntFieldGenerator::RandIntFieldGenerator(const string &name,
 }
     
 
-RandIntFieldGenerator::~RandIntFieldGenerator(void)
+RandIntFieldGenerator::~RandIntFieldGenerator()
 {
 }
 
 
 void
-RandIntFieldGenerator::clear(void)
+RandIntFieldGenerator::clear()
 {
 }
 
@@ -549,16 +549,16 @@ class DocumentGenerator
     const FieldVec _fields;
  
     void
-    setup(void);
+    setup();
 public:   
     DocumentGenerator(const string &docType,
                       const string &idPrefix,
                       const FieldVec &fields);
 
-    ~DocumentGenerator(void);
+    ~DocumentGenerator();
 
     void
-    clear(void);
+    clear();
 
     void
     deleteHistogram(const string &baseDir,
@@ -591,12 +591,12 @@ DocumentGenerator::DocumentGenerator(const string &docType,
 }
 
 
-DocumentGenerator::~DocumentGenerator(void)
+DocumentGenerator::~DocumentGenerator()
 {
 }
 
 void
-DocumentGenerator::setup(void)
+DocumentGenerator::setup()
 {
     typedef FieldVec::const_iterator FI;
     for (FI i(_fields.begin()), ie(_fields.end()); i != ie; ++i) {
@@ -606,7 +606,7 @@ DocumentGenerator::setup(void)
 
 
 void
-DocumentGenerator::clear(void)
+DocumentGenerator::clear()
 {
     typedef FieldVec::const_iterator FI;
     for (FI i(_fields.begin()), ie(_fields.end()); i != ie; ++i) {
@@ -694,7 +694,7 @@ public:
     }
 
     virtual
-    ~SubApp(void)
+    ~SubApp()
     {
     }
 
@@ -702,10 +702,10 @@ public:
     usage(bool showHeader) = 0;
 
     virtual bool
-    getOptions(void) = 0;
+    getOptions() = 0;
 
     virtual int
-    run(void) = 0;
+    run() = 0;
 };
 
 class GenTestDocsApp : public SubApp
@@ -748,7 +748,7 @@ public:
     }
 
     virtual
-    ~GenTestDocsApp(void)
+    ~GenTestDocsApp()
     {
     }
 
@@ -756,10 +756,10 @@ public:
     usage(bool showHeader) override;
 
     virtual bool
-    getOptions(void) override;
+    getOptions() override;
 
     virtual int
-    run(void) override;
+    run() override;
 };
 
 
@@ -785,7 +785,7 @@ GenTestDocsApp::usage(bool showHeader)
 }
 
 bool
-GenTestDocsApp::getOptions(void)
+GenTestDocsApp::getOptions()
 {
     int c;
     const char *optArgument = NULL;
@@ -898,7 +898,7 @@ GenTestDocsApp::getOptions(void)
 
 
 int
-GenTestDocsApp::run(void)
+GenTestDocsApp::run()
 {
     printf("Hello world\n");
     string idPrefix("id:test:");
@@ -918,21 +918,21 @@ class App : public FastOS_Application
 {
 public:
     void
-    usage(void);
+    usage();
 
     int
-    Main(void) override;
+    Main() override;
 };
 
 
 void
-App::usage(void)
+App::usage()
 {
     GenTestDocsApp(*this).usage(true);
 }
 
 int
-App::Main(void)
+App::Main()
 {
     if (_argc < 2) {
         usage();
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
index 3931daf7fdd..0214913f6ae 100644
--- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
+++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
@@ -87,7 +87,7 @@ public:
     }
 
     void
-    monitorLoop(void);
+    monitorLoop();
 
     void
     scanSpecs(slobrok::api::MirrorAPI::SpecList &specs,
@@ -421,7 +421,7 @@ public:
 
 
 void
-App::monitorLoop(void)
+App::monitorLoop()
 {
     for (;;) {
         FRT_RPCRequest *req = _supervisor->AllocRPCRequest();
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 73e1fcd09a5..95c6d39c51a 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -47,10 +47,10 @@ class ConfigFile
     std::vector<char> _content;
 
 public:
-    ConfigFile(void);
+    ConfigFile();
 
     const vespalib::string &
-    getName(void) const
+    getName() const
     {
         return _name;
     }
@@ -59,11 +59,11 @@ public:
     deserialize(vespalib::nbostream &stream);
 
     void
-    print(void) const;
+    print() const;
 };
 
 
-ConfigFile::ConfigFile(void)
+ConfigFile::ConfigFile()
     : _name(),
       _modTime(0),
       _content()
@@ -87,7 +87,7 @@ ConfigFile::deserialize(vespalib::nbostream &stream)
 }
 
 void
-ConfigFile::print(void) const
+ConfigFile::print() const
 {
     std::cout << "Name: " << _name << "\n" <<
         "ModTime: " << _modTime << "\n" <<
@@ -108,7 +108,7 @@ operator>>(vespalib::nbostream &stream, ConfigFile &configFile)
 struct DummyStreamHandler : public NewConfigOperation::IStreamHandler {
     std::map<std::string, ConfigFile> _cfs;
 
-    DummyStreamHandler(void)
+    DummyStreamHandler()
         : NewConfigOperation::IStreamHandler(),
           _cfs()
     {
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index 95d0492263d..a3b5d6dd2fb 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -54,7 +54,7 @@ public:
     }
 
     virtual void
-    run(void) override
+    run() override
     {
         _task->run();
         _gate->countDown();
@@ -104,7 +104,7 @@ public:
     startFlushing(uint64_t syncToken, FlushHandler & handler);
 
     void
-    run(void);
+    run();
 };
 
 
@@ -119,7 +119,7 @@ UpdaterTask::startFlushing(uint64_t syncToken, FlushHandler & handler)
 
 
 void
-UpdaterTask::run(void)
+UpdaterTask::run()
 {
     LOG(info, "UpdaterTask::run(begin)");
     uint32_t totalDocs = 2000000;
@@ -195,28 +195,28 @@ class Test : public vespalib::TestApp
 {
 private:
     void
-    requireThatUpdaterAndFlusherCanRunConcurrently(void);
+    requireThatUpdaterAndFlusherCanRunConcurrently();
 
     void
-    requireThatFlushableAttributeReportsMemoryUsage(void);
+    requireThatFlushableAttributeReportsMemoryUsage();
 
     void
     requireThatFlushableAttributeManagesSyncTokenInfo();
 
     void
-    requireThatFlushTargetsCanBeRetrieved(void);
+    requireThatFlushTargetsCanBeRetrieved();
 
     void
-    requireThatCleanUpIsPerformedAfterFlush(void);
+    requireThatCleanUpIsPerformedAfterFlush();
 
     void
-    requireThatFlushStatsAreUpdated(void);
+    requireThatFlushStatsAreUpdated();
 
     void
-    requireThatOnlyOneFlusherCanRunAtTheSameTime(void);
+    requireThatOnlyOneFlusherCanRunAtTheSameTime();
 
     void
-    requireThatLastFlushTimeIsReported(void);
+    requireThatLastFlushTimeIsReported();
 
     void
     requireThatShrinkWorks();
@@ -225,7 +225,7 @@ private:
     void requireThatFlushedAttributeCanBeLoaded();
 public:
     int
-    Main(void) override;
+    Main() override;
 };
 
 
@@ -298,7 +298,7 @@ struct Fixture : public BaseFixture, public AttributeManagerFixture
 
 
 void
-Test::requireThatUpdaterAndFlusherCanRunConcurrently(void)
+Test::requireThatUpdaterAndFlusherCanRunConcurrently()
 {
     Fixture f;
     AttributeManager &am = f._m;
@@ -330,7 +330,7 @@ Test::requireThatUpdaterAndFlusherCanRunConcurrently(void)
 
 
 void
-Test::requireThatFlushableAttributeReportsMemoryUsage(void)
+Test::requireThatFlushableAttributeReportsMemoryUsage()
 {
     Fixture f;
     AttributeManager &am = f._m;
@@ -383,7 +383,7 @@ Test::requireThatFlushableAttributeManagesSyncTokenInfo()
 
 
 void
-Test::requireThatFlushTargetsCanBeRetrieved(void)
+Test::requireThatFlushTargetsCanBeRetrieved()
 {
     Fixture f;
     AttributeManager &am = f._m;
@@ -399,7 +399,7 @@ Test::requireThatFlushTargetsCanBeRetrieved(void)
 
 
 void
-Test::requireThatCleanUpIsPerformedAfterFlush(void)
+Test::requireThatCleanUpIsPerformedAfterFlush()
 {
     Fixture f;
     AttributeVector::SP av = f.addAttribute("a6");
@@ -435,7 +435,7 @@ Test::requireThatCleanUpIsPerformedAfterFlush(void)
 
 
 void
-Test::requireThatFlushStatsAreUpdated(void)
+Test::requireThatFlushStatsAreUpdated()
 {
     Fixture f;
     AttributeManager &am = f._m;
@@ -451,7 +451,7 @@ Test::requireThatFlushStatsAreUpdated(void)
 
 
 void
-Test::requireThatOnlyOneFlusherCanRunAtTheSameTime(void)
+Test::requireThatOnlyOneFlusherCanRunAtTheSameTime()
 {
     Fixture f;
     AttributeManager &am = f._m;
@@ -484,7 +484,7 @@ Test::requireThatOnlyOneFlusherCanRunAtTheSameTime(void)
 
 
 void
-Test::requireThatLastFlushTimeIsReported(void)
+Test::requireThatLastFlushTimeIsReported()
 {
     BaseFixture f;
     FastOS_StatInfo stat;
@@ -610,7 +610,7 @@ Test::requireThatFlushedAttributeCanBeLoaded()
 }
 
 int
-Test::Main(void)
+Test::Main()
 {
     TEST_INIT("attributeflush_test");
 
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp
index 6d1f7735479..fb5e40767ab 100644
--- a/searchcore/src/tests/proton/common/cachedselect_test.cpp
+++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp
@@ -88,7 +88,7 @@ const int32_t noIntVal = std::numeric_limits<int32_t>::min();
 
 
 DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
 {
     DocumenttypesConfigBuilderHelper builder;
     builder.document(doc_type_id, type_name,
@@ -194,7 +194,7 @@ public:
     }
 
     uint32_t
-    getGets(void) const
+    getGets() const
     {
         return _gets;
     }
@@ -293,9 +293,9 @@ public:
     MyAttributeManager _amgr;
     MyDB::UP _db;
 
-    TestFixture(void);
+    TestFixture();
 
-    ~TestFixture(void);
+    ~TestFixture();
 
     CachedSelect::SP
     testParse(const string &selection,
@@ -304,7 +304,7 @@ public:
 };
 
 
-TestFixture::TestFixture(void)
+TestFixture::TestFixture()
     : _repoUP(),
       _hasFields(true),
       _amgr(),
@@ -320,7 +320,7 @@ TestFixture::TestFixture(void)
 }
 
 
-TestFixture::~TestFixture(void)
+TestFixture::~TestFixture()
 {
 }
 
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
index e323ef6fe8f..330d1cf0462 100644
--- a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
+++ b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
@@ -16,7 +16,7 @@ const vespalib::string header_name = type_name + ".header";
 const vespalib::string body_name = type_name + ".body";
 
 DocumentTypeRepo::UP
-makeOldDocTypeRepo(void)
+makeOldDocTypeRepo()
 {
     DocumenttypesConfigBuilderHelper builder;
     builder.document(doc_type_id, type_name,
@@ -29,7 +29,7 @@ makeOldDocTypeRepo(void)
 }
 
 DocumentTypeRepo::UP
-makeNewDocTypeRepo(void)
+makeNewDocTypeRepo()
 {
     DocumenttypesConfigBuilderHelper builder;
     builder.document(doc_type_id, type_name,
diff --git a/searchcore/src/tests/proton/common/selectpruner_test.cpp b/searchcore/src/tests/proton/common/selectpruner_test.cpp
index e167979d065..ee8dbf06d9d 100644
--- a/searchcore/src/tests/proton/common/selectpruner_test.cpp
+++ b/searchcore/src/tests/proton/common/selectpruner_test.cpp
@@ -60,7 +60,7 @@ const document::DocumentId docId("doc:test:1");
 
 
 DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
 {
     DocumenttypesConfigBuilderHelper builder;
     builder.document(doc_type_id, type_name,
@@ -131,9 +131,9 @@ public:
     DocumentTypeRepo::UP _repoUP;
     bool _hasFields;
 
-    TestFixture(void);
+    TestFixture();
 
-    ~TestFixture(void);
+    ~TestFixture();
 
     void
     testParse(const string &selection);
@@ -152,7 +152,7 @@ public:
 };
 
 
-TestFixture::TestFixture(void)
+TestFixture::TestFixture()
     : _amgr(),
       _repoUP(),
       _hasFields(true)
@@ -164,7 +164,7 @@ TestFixture::TestFixture(void)
 }
 
 
-TestFixture::~TestFixture(void)
+TestFixture::~TestFixture()
 {
 }
 
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index d7311a2cc63..5567eb970bb 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -106,7 +106,7 @@ public:
     {
     }
 
-    ~BuildContext(void)
+    ~BuildContext()
     {
     }
 
@@ -126,7 +126,7 @@ public:
 namespace {
 
 const char *
-getDocTypeName(void)
+getDocTypeName()
 {
     return "searchdocument";
 }
@@ -306,7 +306,7 @@ private:
     }
 
     const std::set<vespalib::string> &
-    getMarkupFields(void) const
+    getMarkupFields() const
     {
         return _markupFields;
     }
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 67eccb2fed2..351c4a3d405 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -111,7 +111,7 @@ struct MyOwner : public IFeedHandlerOwner
     virtual void onPerformPrune(SerialNum) override {}
 
     virtual bool
-    getAllowPrune(void) const override
+    getAllowPrune() const override
     {
         return _allowPrune;
     }
@@ -394,7 +394,7 @@ struct MyFeedMetrics : public metrics::MetricSet
 {
     PerDocTypeFeedMetrics       _feed;
 
-    MyFeedMetrics(void)
+    MyFeedMetrics()
         : metrics::MetricSet("myfeedmetrics", "", "My feed metrics", NULL),
           _feed(this)
     {
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 4fd2f7f0332..10d8cc8c3a2 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -63,7 +63,7 @@ saveBaseConfigSnapshot(const DocumentDBConfig &snap, SerialNum num)
 
 
 DocumentDBConfig::SP
-makeEmptyConfigSnapshot(void)
+makeEmptyConfigSnapshot()
 {
     return test::DocumentDBConfigBuilder(0, std::make_shared<Schema>(), "client", "test").build();
 }
diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
index fc22a629f23..ef994989a7b 100644
--- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
@@ -69,7 +69,7 @@ class ReverseGidCompare : public DocumentMetaStore::IGidCompare
 {
     GlobalId::BucketOrderCmp _comp;
 public:
-    ReverseGidCompare(void)
+    ReverseGidCompare()
         : IGidCompare(),
           _comp()
     {
@@ -90,7 +90,7 @@ struct BoolVector : public std::vector<bool> {
     BoolVector &F() { push_back(false); return *this; }
 
     uint32_t
-    countTrue(void) const
+    countTrue() const
     {
         uint32_t res(0);
         for (uint32_t i = 0; i < size(); ++i)
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 9c17b904eed..6077ca5fe76 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -94,7 +94,7 @@ void assertDocumentOperation(DocumentOperation &op, BucketId expBucket, uint32_t
 }
 
 DocumentTypeRepo::UP
-makeDocTypeRepo(void)
+makeDocTypeRepo()
 {
     DocumenttypesConfigBuilderHelper builder;
     builder.document(doc_type_id, type_name,
diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp
index 7de03c665a7..57302834441 100644
--- a/searchcore/src/tests/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp
@@ -231,7 +231,7 @@ public:
     }
 
     virtual search::SerialNum
-    getFlushSerial(void) const override
+    getFlushSerial() const override
     {
         return 0u;
     }
@@ -421,7 +421,7 @@ public:
         _done.countDown();
     }
     virtual search::SerialNum
-    getFlushSerial(void) const override
+    getFlushSerial() const override
     {
         return 0u;
     }
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
index 4d9cbd307ba..73a849c6211 100644
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
@@ -54,7 +54,7 @@ struct MyTask : public IReprocessingTask
     }
 
     virtual Progress
-    getProgress(void) const override
+    getProgress() const override
     {
         return Progress(_myProgress, _weight);
     }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/properties.h b/searchcore/src/vespa/searchcore/fdispatch/common/properties.h
index 948572bf616..1768ab8bc71 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/properties.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/properties.h
@@ -10,7 +10,7 @@ public:
     /**
      * Destructor.  No cleanup needed for base class.
      */
-    virtual ~FastS_IProperties(void) { }
+    virtual ~FastS_IProperties() { }
 
     virtual bool        IsSet    (const char *key)                         = 0;
     virtual bool        BoolVal  (const char *key)                         = 0;
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/search.h b/searchcore/src/vespa/searchcore/fdispatch/common/search.h
index 52c30b7a9d7..4765800baca 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/search.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/search.h
@@ -50,7 +50,7 @@ public:
     /**
      * Destructor.  No cleanup needed for base class.
      */
-    virtual ~FastS_ISearchOwner(void) { }
+    virtual ~FastS_ISearchOwner() { }
 
     virtual void DoneQuery(FastS_ISearch *search,
                            FastS_SearchContext context) = 0;
@@ -177,7 +177,7 @@ public:
     /**
      * Destructor.  No cleanup needed for base class.
      */
-    virtual ~FastS_ISearch(void) { }
+    virtual ~FastS_ISearch() { }
 
 
     enum RetCode {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp
index 57f951dc482..431a487c357 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp
@@ -20,7 +20,7 @@ FastS_TimeStatHistory::Reset()
 
 
 double
-FastS_TimeStatHistory::GetMaxTime(void) const
+FastS_TimeStatHistory::GetMaxTime() const
 {
     double max = 0.0;
     uint32_t idx = _sampleIdx;
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.h b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.h
index ab22fd18e61..ae707ea9700 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.h
@@ -12,7 +12,7 @@ public:
     uint32_t _totalTimeouts;
     double _totalAccTime;
 
-    FastS_TimeStatTotals(void)
+    FastS_TimeStatTotals()
         : _totalCount(0),
           _totalTimeouts(0u),
           _totalAccTime(0)
@@ -38,7 +38,7 @@ public:
     }
 
     double
-    getAvgTime(void) const
+    getAvgTime() const
     {
         if (_totalCount == 0)
             return 0.0;
@@ -46,7 +46,7 @@ public:
     }
 
     double
-    getTimeoutRate(void) const
+    getTimeoutRate() const
     {
         if (_totalCount == 0)
             return 0.0;
@@ -153,7 +153,7 @@ class FastS_TimeStatHistory
         return static_cast<double>(timeIdx) * SLOT_SIZE;
     }
 public:
-    FastS_TimeStatHistory(void)
+    FastS_TimeStatHistory()
         : _sampleAccTime(0.0),
           _totalAccTime(0.0),
           _sampleIdx(0),
@@ -169,13 +169,13 @@ public:
         Reset();
     }
 
-    void Reset(void);
+    void Reset();
 
-    double  GetSampleAccTime(void) const { return _sampleAccTime; }
-    uint32_t GetSampleCount(void) const { return _sampleCount; }
+    double  GetSampleAccTime() const { return _sampleAccTime; }
+    uint32_t GetSampleCount() const { return _sampleCount; }
 
     uint32_t
-    getSampleTimeouts(void) const
+    getSampleTimeouts() const
     {
         return _sampleTimeouts;
     }
@@ -186,15 +186,15 @@ public:
             return 0.0;
         return (_sampleAccTime / _sampleCount);
     }
-    double GetMaxTime(void) const;
+    double GetMaxTime() const;
 
     void Update(double tnow, double t, bool timedout);
 
-    uint32_t GetTotalCount(void) const { return _totalCount; }
-    double  GetTotalAccTime(void) const { return _totalAccTime; }
+    uint32_t GetTotalCount() const { return _totalCount; }
+    double  GetTotalAccTime() const { return _totalAccTime; }
 
     uint32_t
-    getTotalTimeouts(void) const
+    getTotalTimeouts() const
     {
         return _totalTimeouts;
     }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
index 3be1834a360..c4a222af3e1 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp
@@ -77,7 +77,7 @@ FastS_FNETAdapter::fini()
     }
 }
 
-Fdispatch::~Fdispatch(void)
+Fdispatch::~Fdispatch()
 {
     if (_transportServer) {
         _transportServer->shutDown(); // sync shutdown
@@ -135,13 +135,13 @@ Fdispatch::GetThreadPool()
 }
 
 bool
-Fdispatch::Failed(void)
+Fdispatch::Failed()
 {
     return ( (_transportServer && _transportServer->isFailed())) || _needRestart;
 }
 
 bool
-Fdispatch::CheckTempFail(void)
+Fdispatch::CheckTempFail()
 {
     bool ret;
     bool failflag = _nodeManager->GetTempFail();
@@ -281,7 +281,7 @@ convert(InternalFdispatchrcType::Packetcompresstype type)
 }
 
 bool
-Fdispatch::Init(void)
+Fdispatch::Init()
 {
     int  maxthreads;
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
index 00c10d5cfa9..58f68dfa9af 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h
@@ -98,14 +98,14 @@ public:
     virtual FastOS_ThreadPool *GetThreadPool() override;
     virtual void logPerformance() override;
     virtual uint32_t getDispatchLevel() override;
-    bool CheckTempFail(void);
-    bool Failed(void);
-    bool Init(void);
+    bool CheckTempFail();
+    bool Failed();
+    bool Init();
     int getHealthPort() const { return _healthPort; }
     vespalib::SimpleComponentConfigProducer &getComponentConfig() { return _componentConfig; }
 
     Fdispatch(const config::ConfigUri &configUri);
-    ~Fdispatch(void);
+    ~Fdispatch();
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
index 9f2a65c2f91..9103ef2e06f 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
@@ -38,17 +38,17 @@ public:
 
     void SetNext(FastS_EngineDesc *next) { _next = next; }
     void SetConfPartID(int32_t value) { assert(value >= 0); _confPartID = value; }
-    void SetConfPartIDOverrides(void) { _confPartIDOverrides = true; }
+    void SetConfPartIDOverrides() { _confPartIDOverrides = true; }
     void SetConfRowID(int32_t value) { assert(value >= 0); _confRowID = value; }
     void SetUnitRefCost(uint32_t value) { _unitrefcost = value; }
-    void MarkBad(void) { _isBad = true; }
-    FastS_EngineDesc * GetNext(void) const { return _next; }
-    const char * GetName(void) const { return _name.c_str(); }
-    uint32_t GetConfPartID(void) const { return _confPartID; }
-    bool GetConfPartIDOverrides(void) const { return _confPartIDOverrides; }
-    uint32_t GetConfRowID(void) const { return _confRowID; }
-    uint32_t GetUnitRefCost(void) const { return _unitrefcost; }
-    bool IsBad(void) const { return _isBad; }
+    void MarkBad() { _isBad = true; }
+    FastS_EngineDesc * GetNext() const { return _next; }
+    const char * GetName() const { return _name.c_str(); }
+    uint32_t GetConfPartID() const { return _confPartID; }
+    bool GetConfPartIDOverrides() const { return _confPartIDOverrides; }
+    uint32_t GetConfRowID() const { return _confRowID; }
+    uint32_t GetUnitRefCost() const { return _unitrefcost; }
+    bool IsBad() const { return _isBad; }
 };
 
 //-----------------------------------------------------------------------
@@ -168,9 +168,9 @@ private:
     uint32_t _mpp;	// Minimum number of engines per partition
 public:
     explicit FastS_DataSetDesc(uint32_t datasetid);
-    ~FastS_DataSetDesc(void);
+    ~FastS_DataSetDesc();
 
-    uint32_t GetID(void) const { return _id; }
+    uint32_t GetID() const { return _id; }
     void SetUnitRefCost(uint32_t value) { _unitRefCost = value; }
 
     void SetPartBits(uint32_t value) {
@@ -219,40 +219,40 @@ public:
     QueryDistributionMode GetQueryDistributionMode() { return _queryDistributionMode; }
 
     FastS_EngineDesc * AddEngine(const char *name);
-    uint32_t GetUnitRefCost(void) const { return _unitRefCost; }
-    uint32_t GetPartBits(void) const { return _partBits; }
-
-    uint32_t GetRowBits(void) const { return _rowBits; }
-    uint32_t GetNumParts(void) const { return _numParts; }
-    uint32_t GetFirstPart(void) const { return _firstPart; }
-    uint32_t GetMinChildParts(void) const { return _minChildParts; }
-    uint32_t getMaxNodesDownPerFixedRow(void) const { return _maxNodesDownPerFixedRow; }
-    bool useRoundRobinForFixedRow(void) const { return _useRoundRobinForFixedRow; }
-    uint32_t GetMaxHitsPerNode(void) const { return _maxHitsPerNode; }
-    uint32_t GetEstimateParts(void) const { return _estimateParts; }
-    uint32_t GetEstPartCutoff(void) const { return _estPartCutoff; }
-    bool IsEstimatePartsSet(void) const { return _estimatePartsSet; }
-    bool IsEstPartCutoffSet(void) const { return _estPartCutoffSet; }
-    uint32_t GetMinOurActive(void) const { return _minOurActive; }
-    uint32_t GetMaxOurActive(void) const { return _maxOurActive; }
-    uint32_t GetCutoffOurActive(void) const { return _cutoffOurActive; }
-    uint32_t GetMinEstActive(void) const { return _minEstActive; }
-    uint32_t GetMaxEstActive(void) const { return _maxEstActive; }
-    uint32_t GetCutoffEstActive(void) const { return _cutoffEstActive; }
-    double GetQueueDrainRate(void) const { return _queueDrainRate; }
-    double GetQueueMaxDrain(void) const { return _queueMaxDrain; }
-    double GetSlowQueryLimitFactor(void) const { return _slowQueryLimitFactor; }
-    double GetSlowQueryLimitBias(void) const { return _slowQueryLimitBias; }
-    double GetSlowDocsumLimitFactor(void) const { return _slowDocsumLimitFactor; }
-    double GetSlowDocsumLimitBias(void) const { return _slowDocsumLimitBias; }
-    uint32_t GetEngineCnt(void) const { return _engineCnt; }
-    FastS_EngineDesc * GetEngineList(void) const { return _enginesHead; }
+    uint32_t GetUnitRefCost() const { return _unitRefCost; }
+    uint32_t GetPartBits() const { return _partBits; }
+
+    uint32_t GetRowBits() const { return _rowBits; }
+    uint32_t GetNumParts() const { return _numParts; }
+    uint32_t GetFirstPart() const { return _firstPart; }
+    uint32_t GetMinChildParts() const { return _minChildParts; }
+    uint32_t getMaxNodesDownPerFixedRow() const { return _maxNodesDownPerFixedRow; }
+    bool useRoundRobinForFixedRow() const { return _useRoundRobinForFixedRow; }
+    uint32_t GetMaxHitsPerNode() const { return _maxHitsPerNode; }
+    uint32_t GetEstimateParts() const { return _estimateParts; }
+    uint32_t GetEstPartCutoff() const { return _estPartCutoff; }
+    bool IsEstimatePartsSet() const { return _estimatePartsSet; }
+    bool IsEstPartCutoffSet() const { return _estPartCutoffSet; }
+    uint32_t GetMinOurActive() const { return _minOurActive; }
+    uint32_t GetMaxOurActive() const { return _maxOurActive; }
+    uint32_t GetCutoffOurActive() const { return _cutoffOurActive; }
+    uint32_t GetMinEstActive() const { return _minEstActive; }
+    uint32_t GetMaxEstActive() const { return _maxEstActive; }
+    uint32_t GetCutoffEstActive() const { return _cutoffEstActive; }
+    double GetQueueDrainRate() const { return _queueDrainRate; }
+    double GetQueueMaxDrain() const { return _queueMaxDrain; }
+    double GetSlowQueryLimitFactor() const { return _slowQueryLimitFactor; }
+    double GetSlowQueryLimitBias() const { return _slowQueryLimitBias; }
+    double GetSlowDocsumLimitFactor() const { return _slowDocsumLimitFactor; }
+    double GetSlowDocsumLimitBias() const { return _slowDocsumLimitBias; }
+    uint32_t GetEngineCnt() const { return _engineCnt; }
+    FastS_EngineDesc * GetEngineList() const { return _enginesHead; }
     void setMPP(uint32_t mpp) { _mpp = mpp; }
-    uint32_t getMPP(void) const { return _mpp; }
+    uint32_t getMPP() const { return _mpp; }
 
     void
     setMonitorInterval(double monitorInterval) { _monitorInterval = monitorInterval; }
-    double getMonitorInterval(void) const { return _monitorInterval; }
+    double getMonitorInterval() const { return _monitorInterval; }
 
     void
     setHigherCoverageMaxSearchWait(double higherCoverageMaxSearchWait) {
@@ -260,7 +260,7 @@ public:
     }
 
     double
-    getHigherCoverageMaxSearchWait(void) const {
+    getHigherCoverageMaxSearchWait() const {
         return _higherCoverageMaxSearchWait;
     }
 
@@ -270,7 +270,7 @@ public:
     }
 
     double
-    getHigherCoverageMinSearchWait(void) const {
+    getHigherCoverageMinSearchWait() const {
         return _higherCoverageMinSearchWait;
     }
 
@@ -280,7 +280,7 @@ public:
     }
 
     double
-    getHigherCoverageBaseSearchWait(void) const {
+    getHigherCoverageBaseSearchWait() const {
         return _higherCoverageBaseSearchWait;
     }
 
@@ -290,7 +290,7 @@ public:
     }
 
     double
-    getMinimalSearchCoverage(void) const {
+    getMinimalSearchCoverage() const {
         return _minimalSearchCoverage;
     }
 
@@ -300,7 +300,7 @@ public:
     }
 
     double
-    getHigherCoverageMaxDocSumWait(void) const {
+    getHigherCoverageMaxDocSumWait() const {
         return _higherCoverageMaxDocSumWait;
     }
 
@@ -310,7 +310,7 @@ public:
     }
 
     double
-    getHigherCoverageMinDocSumWait(void) const {
+    getHigherCoverageMinDocSumWait() const {
         return _higherCoverageMinDocSumWait;
     }
 
@@ -320,7 +320,7 @@ public:
     }
 
     double
-    getHigherCoverageBaseDocSumWait(void) const {
+    getHigherCoverageBaseDocSumWait() const {
         return _higherCoverageBaseDocSumWait;
     }
 
@@ -330,11 +330,11 @@ public:
     }
 
     double
-    getMinimalDocSumCoverage(void) const {
+    getMinimalDocSumCoverage() const {
         return _minimalDocSumCoverage;
     }
 
-    void FinalizeConfig(void);
+    void FinalizeConfig();
 };
 
 //-----------------------------------------------------------------------
@@ -351,18 +351,18 @@ private:
     bool                _frozen;
     bool                _error;
 
-    void HandleDeprecatedFPEstPartsOption(void);
-    bool CheckIntegrity(void);
+    void HandleDeprecatedFPEstPartsOption();
+    bool CheckIntegrity();
 
 public:
-    FastS_DataSetCollDesc(void);
-    ~FastS_DataSetCollDesc(void);
+    FastS_DataSetCollDesc();
+    ~FastS_DataSetCollDesc();
 
     FastS_DataSetDesc *LookupCreateDataSet(uint32_t datasetid);
 
-    bool Freeze(void);
+    bool Freeze();
 
-    uint32_t GetMaxNumDataSets(void) const { return _datasets_size; }
+    uint32_t GetMaxNumDataSets() const { return _datasets_size; }
 
     FastS_DataSetDesc *GetDataSet(uint32_t datasetid) const {
         return (datasetid < _datasets_size)
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
index 34c8e75c5c0..6645cf493ec 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp
@@ -68,7 +68,7 @@ FastS_DataSetBase::queryQueue_t::QueueTail(queryQueued_t *newqueued)
 
 
 void
-FastS_DataSetBase::queryQueue_t::DeQueueHead(void)
+FastS_DataSetBase::queryQueue_t::DeQueueHead()
 {
     queryQueued_t *queued = _head;
     FastS_assert(_queueLen > 0);
@@ -112,7 +112,7 @@ FastS_DataSetBase::ScheduleCheckTempFail()
 
 
 void
-FastS_DataSetBase::DeQueueHeadWakeup_HasLock(void)
+FastS_DataSetBase::DeQueueHeadWakeup_HasLock()
 {
     queryQueued_t *queued;
     queued = _queryQueue.GetFirst();
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
index 13201210b79..92dda228487 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
@@ -101,28 +101,28 @@ public:
         {
         }
 
-        ~queryQueued_t(void)
+        ~queryQueued_t()
         {
             FastS_assert(!_isQueued);
         }
-        void Wait(void) {
+        void Wait() {
             _queueCond.Lock();
             while (_isQueued) {
                 _queueCond.Wait();
             }
             _queueCond.Unlock();
         }
-        bool IsAborted(void) const { return _isAborted; }
-        void MarkAbort(void) { _isAborted = true; }
-        void MarkQueued(void) { _isQueued = true; }
-        void UnmarkQueued(void) { _isQueued = false; }
-        bool IsQueued(void) const { return _isQueued; }
-        void LockCond(void) { _queueCond.Lock(); }
-        void UnlockCond(void) { _queueCond.Unlock(); }
-        void SignalCond(void) { _queueCond.Signal(); }
+        bool IsAborted() const { return _isAborted; }
+        void MarkAbort() { _isAborted = true; }
+        void MarkQueued() { _isQueued = true; }
+        void UnmarkQueued() { _isQueued = false; }
+        bool IsQueued() const { return _isQueued; }
+        void LockCond() { _queueCond.Lock(); }
+        void UnlockCond() { _queueCond.Unlock(); }
+        void SignalCond() { _queueCond.Signal(); }
 
         FNET_Task *
-        getDequeuedTask(void) const
+        getDequeuedTask() const
         {
             return _deQueuedTask;
         }
@@ -154,12 +154,12 @@ public:
         queryQueue_t(FastS_DataSetDesc *desc);
         ~queryQueue_t();
         void QueueTail(queryQueued_t *newquery);
-        void DeQueueHead(void);
+        void DeQueueHead();
         unsigned int GetQueueLen() const        { return _queueLen; }
         unsigned int GetActiveQueries() const   { return _active; }
         void SetActiveQuery()                   { _active++; }
         void ClearActiveQuery()                 { _active--; }
-        queryQueued_t *GetFirst(void) const { return _head; }
+        queryQueued_t *GetFirst() const { return _head; }
     };
 
     //----------------------------------------------------------------
@@ -209,9 +209,9 @@ public:
     void CountTimeout();
 
     void ScheduleCheckTempFail();
-    virtual void DeQueueHeadWakeup_HasLock(void);
+    virtual void DeQueueHeadWakeup_HasLock();
     virtual ChildInfo getChildInfo() const;
-    uint32_t GetMldDocStamp(void) const { return _mldDocStamp; }
+    uint32_t GetMldDocStamp() const { return _mldDocStamp; }
     void SetMldDocStamp(uint32_t mldDocStamp) { _mldDocStamp = mldDocStamp; }
 
     // common dataset API
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
index af296cadf1c..cab6b68d5f4 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.cpp
@@ -256,7 +256,7 @@ FastS_DataSetCollection::CheckQueryQueues(FastS_TimeKeeper *timeKeeper)
 
 
 void
-FastS_DataSetCollection::AbortQueryQueues(void)
+FastS_DataSetCollection::AbortQueryQueues()
 {
     for (uint32_t datasetidx(0); datasetidx < GetMaxNumDataSets(); datasetidx++) {
         FastS_DataSetBase *dataset = PeekDataSet(datasetidx);
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
index 1c1db158d27..3381c380ed1 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
@@ -82,8 +82,8 @@ public:
     FastS_ISearch *CreateSearch(uint32_t dataSetID, FastS_TimeKeeper *timeKeeper);
 
     // handle old query queues
-    bool IsLastRef(void) { return (refCount() == 1); }
+    bool IsLastRef() { return (refCount() == 1); }
     void CheckQueryQueues(FastS_TimeKeeper *timeKeeper);
-    void AbortQueryQueues(void);
+    void AbortQueryQueues();
 };
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp
index 5ca7bcd9103..44dcb02106b 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp
@@ -53,7 +53,7 @@ FastS_EngineBase::reported_t::reported_t()
 }
 
 
-FastS_EngineBase::reported_t::~reported_t(void)
+FastS_EngineBase::reported_t::~reported_t()
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
index d65367115d0..912c6c7594a 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
@@ -161,7 +161,7 @@ public:
 
     bool IsUp() const { return _isUp; }
     bool IsRealBad() const { return (_badness > BAD_NOT); }
-    bool isAdminBad(void) const { return _badness == BAD_ADMIN; }
+    bool isAdminBad() const { return _badness == BAD_ADMIN; }
     
     bool IsReady() const { return (IsUp() || IsRealBad()); }
     void SlowQuery(double limit, double secs, bool silent);
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.cpp
index bd4c585f27e..88aa04a9078 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.cpp
@@ -22,7 +22,7 @@ using namespace search::fs4transport;
 //----------------------------------------------------------------------
 
 void
-FastS_StaticMonitorQuery::Free(void)
+FastS_StaticMonitorQuery::Free()
 {
     _lock.Lock();
     _refcnt--;
@@ -34,7 +34,7 @@ FastS_StaticMonitorQuery::Free(void)
 }
 
 
-FastS_StaticMonitorQuery::FastS_StaticMonitorQuery(void)
+FastS_StaticMonitorQuery::FastS_StaticMonitorQuery()
     : FS4Packet_MONITORQUERYX(),
       _lock(),
       _refcnt(1)
@@ -43,7 +43,7 @@ FastS_StaticMonitorQuery::FastS_StaticMonitorQuery(void)
 }
 
 
-FastS_StaticMonitorQuery::~FastS_StaticMonitorQuery(void)
+FastS_StaticMonitorQuery::~FastS_StaticMonitorQuery()
 {
     FastS_assert(_refcnt == 0);
 }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h
index 068c072e844..d5fa8167a98 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h
@@ -18,19 +18,19 @@ class FastS_StaticMonitorQuery : public FS4Packet_MONITORQUERYX
 public:
     virtual void Free() override;
 
-    bool getBusy(void) const
+    bool getBusy() const
     {
         return _refcnt > 1;
     }
 
-    void markBusy(void)
+    void markBusy()
     {
         _lock.Lock();
         _refcnt++;
         _lock.Unlock();
     }
-    FastS_StaticMonitorQuery(void);
-    ~FastS_StaticMonitorQuery(void);
+    FastS_StaticMonitorQuery();
+    ~FastS_StaticMonitorQuery();
 };
 
 //----------------------------------------------------------------------
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
index 592c4f053e4..16a123eb8e7 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
@@ -584,7 +584,7 @@ FastS_FNET_Search::~FastS_FNET_Search()
 
 
 void
-FastS_FNET_Search::dropDatasetActiveCostRef(void)
+FastS_FNET_Search::dropDatasetActiveCostRef()
 {
     if (_datasetActiveCostRef) {
         _dataset->SubCost();
@@ -1483,7 +1483,7 @@ FastS_FNET_Search::adjustQueryTimeout()
 
 
 void
-FastS_FNET_Search::adjustDocsumTimeout(void)
+FastS_FNET_Search::adjustDocsumTimeout()
 {
     uint32_t pendingDocsums = getPendingDocsums();
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
index af747d887e0..1b8ed0dcb2c 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
@@ -103,15 +103,15 @@ public:
     uint32_t NT_GetNumHits() const { return (_hit_end - _hit_beg); }
     void NT_NextHit() { _hit_cur++; }
 
-    uint32_t getPartID(void) const     { return _partid; }
-    uint32_t GetRowID(void) const     { return _rowid; }
-    uint32_t GetTimeStamp(void) const { return _stamp; }
+    uint32_t getPartID() const     { return _partid; }
+    uint32_t GetRowID() const     { return _rowid; }
+    uint32_t GetTimeStamp() const { return _stamp; }
 
     FastS_FNET_SearchNode * allocExtraDocsumNode(bool mld, uint32_t rowid, uint32_t rowbits);
 
-    FastS_FNET_Engine *GetEngine(void) const { return _engine; }
+    FastS_FNET_Engine *GetEngine() const { return _engine; }
 
-    bool IsConnected(void) const { return _channel != NULL; }
+    bool IsConnected() const { return _channel != NULL; }
     void Connect(FastS_FNET_Engine *engine);
     void Connect_HasDSLock(FastS_FNET_Engine *engine);
     FastS_EngineBase * getPartition(const FastOS_Mutex & dsMutex, bool userow, FastS_FNET_DataSet *dataset);
@@ -126,7 +126,7 @@ public:
         return (_engine == NULL ? 0 : _engine->getPortNumber());
     }
 
-    void dropCost(void) {
+    void dropCost() {
         if (_engine != NULL && _flags._needSubCost) {
             _engine->SubCost();
             _flags._needSubCost = false;
@@ -174,13 +174,13 @@ public:
     {
     }
 
-    ExtraDocsumNodesIter & operator++(void) {
+    ExtraDocsumNodesIter & operator++() {
         _cur = _cur->_nextExtraDocsumNode;
         return *this;
     }
 
-    bool valid(void) const { return _cur != _head; }
-    FastS_FNET_SearchNode *operator*(void) const { return _cur; }
+    bool valid() const { return _cur != _head; }
+    FastS_FNET_SearchNode *operator*() const { return _cur; }
 };
 
 
@@ -258,7 +258,7 @@ private:
 
     std::vector<FastS_fullresult>  _resbuf;
 
-    void dropDatasetActiveCostRef(void);
+    void dropDatasetActiveCostRef();
 
     typedef std::vector<std::pair<FastS_EngineBase *, FastS_FNET_SearchNode *>> EngineNodeMap;
     void connectNodes(const EngineNodeMap & engines);
@@ -284,7 +284,7 @@ private:
                        FS4Packet_QUERYRESULTX::FS4_hit *pt,
                        FS4Packet_QUERYRESULTX::FS4_hit *end);
 
-    FastS_TimeKeeper *GetTimeKeeper(void) const { return _timeKeeper; }
+    FastS_TimeKeeper *GetTimeKeeper() const { return _timeKeeper; }
 
     FastS_FNET_SearchNode * getNode(size_t i) { return &_nodes[i]; }
 public:
@@ -345,23 +345,23 @@ public:
     FastS_QueryResult *ST_GetQueryResult() { return _util.GetQueryResult(); }
 
     void adjustQueryTimeout();
-    void adjustDocsumTimeout(void);
-    uint32_t getGoodQueries(void) const { return _goodQueries; }
-    uint32_t getRequestedQueries(void) const { return _queryNodes; }
-    uint32_t getPendingQueries(void) const { return _pendingQueries; }
-    uint32_t getDoneQueries(void) const {
+    void adjustDocsumTimeout();
+    uint32_t getGoodQueries() const { return _goodQueries; }
+    uint32_t getRequestedQueries() const { return _queryNodes; }
+    uint32_t getPendingQueries() const { return _pendingQueries; }
+    uint32_t getDoneQueries() const {
         return getRequestedQueries() - getPendingQueries();
     }
-    uint32_t getBadQueries(void) const {
+    uint32_t getBadQueries() const {
         return getDoneQueries() - getGoodQueries();
     }
-    uint32_t getGoodDocsums(void) const { return _goodDocsums; }
-    uint32_t getRequestedDocsums(void) const { return _requestedDocsums; }
-    uint32_t getPendingDocsums(void) const { return _pendingDocsums; }
-    uint32_t getDoneDocsums(void) const {
+    uint32_t getGoodDocsums() const { return _goodDocsums; }
+    uint32_t getRequestedDocsums() const { return _requestedDocsums; }
+    uint32_t getPendingDocsums() const { return _pendingDocsums; }
+    uint32_t getDoneDocsums() const {
         return getRequestedDocsums() - getPendingDocsums();
     }
-    uint32_t getBadDocsums(void) const {
+    uint32_t getBadDocsums() const {
         return getDoneDocsums() - getGoodDocsums();
     }
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
index 62aa7b33166..0aab44f0625 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
@@ -150,21 +150,21 @@ public:
     }
     uint32_t getNumRows() const { return _partMap.getNumRows(); }
     uint32_t getNumPartitions(size_t rowId) { return _partMap.getNumPartitions(rowId); }
-    uint32_t GetRowBits(void) const { return _partMap._rowBits; }
-    uint32_t GetPartBits(void) const { return _partMap._partBits; }
-    uint32_t GetFirstPart(void) const { return _partMap._first_partition; }
-    uint32_t GetLastPart(void) const {
+    uint32_t GetRowBits() const { return _partMap._rowBits; }
+    uint32_t GetPartBits() const { return _partMap._partBits; }
+    uint32_t GetFirstPart() const { return _partMap._first_partition; }
+    uint32_t GetLastPart() const {
         return _partMap._first_partition + _partMap._num_partitions;
     }
-    uint32_t GetPartitions(void) const { return _partMap._num_partitions; }
-    uint32_t GetEstimateParts(void) const { return _estimateParts; }
-    uint32_t GetEstimatePartCutoff(void) const { return _estimatePartCutoff; }
-    uint32_t GetMaxHitsPerNode(void) const { return _maxHitsPerNode; }
-    double GetSlowQueryLimitFactor(void) const { return _slowQueryLimitFactor; }
-    double GetSlowQueryLimitBias(void) const { return _slowQueryLimitBias; }
-    double GetSlowDocsumLimitFactor(void) const { return _slowDocsumLimitFactor; }
-    double GetSlowDocsumLimitBias(void) const { return _slowDocsumLimitBias; }
-    bool GetTempFail(void) const { return _partMap._childparts < _partMap._minchildparts; }
+    uint32_t GetPartitions() const { return _partMap._num_partitions; }
+    uint32_t GetEstimateParts() const { return _estimateParts; }
+    uint32_t GetEstimatePartCutoff() const { return _estimatePartCutoff; }
+    uint32_t GetMaxHitsPerNode() const { return _maxHitsPerNode; }
+    double GetSlowQueryLimitFactor() const { return _slowQueryLimitFactor; }
+    double GetSlowQueryLimitBias() const { return _slowQueryLimitBias; }
+    double GetSlowDocsumLimitFactor() const { return _slowDocsumLimitFactor; }
+    double GetSlowDocsumLimitBias() const { return _slowDocsumLimitBias; }
+    bool GetTempFail() const { return _partMap._childparts < _partMap._minchildparts; }
     void UpdateMaxHitsPerNodeLog(bool incomplete, bool fuzzy);
     uint32_t getMaxNodesDownPerFixedRow() const { return _partMap._maxNodesDownPerFixedRow; }
     uint32_t useRoundRobinForFixedRow() const { return _partMap._useRoundRobinForFixedRow; }
@@ -191,16 +191,16 @@ public:
 
     virtual ChildInfo getChildInfo() const override;
 
-    uint32_t getMPP(void) const { return _partMap._mpp; }
-    double getMonitorInterval(void) const { return _monitorInterval; }
-    double getHigherCoverageMaxSearchWait(void) const { return _higherCoverageMaxSearchWait; }
-    double getHigherCoverageMinSearchWait(void) const { return _higherCoverageMinSearchWait; }
-    double getHigherCoverageBaseSearchWait(void) const { return _higherCoverageBaseSearchWait; }
-    double getMinimalSearchCoverage(void) const { return _minimalSearchCoverage; }
-    double getHigherCoverageMaxDocSumWait(void) const { return _higherCoverageMaxDocSumWait; }
-    double getHigherCoverageMinDocSumWait(void) const { return _higherCoverageMinDocSumWait; }
-    double getHigherCoverageBaseDocSumWait(void) const { return _higherCoverageBaseDocSumWait; }
-    double getMinimalDocSumCoverage(void) const { return _minimalDocSumCoverage; }
+    uint32_t getMPP() const { return _partMap._mpp; }
+    double getMonitorInterval() const { return _monitorInterval; }
+    double getHigherCoverageMaxSearchWait() const { return _higherCoverageMaxSearchWait; }
+    double getHigherCoverageMinSearchWait() const { return _higherCoverageMinSearchWait; }
+    double getHigherCoverageBaseSearchWait() const { return _higherCoverageBaseSearchWait; }
+    double getMinimalSearchCoverage() const { return _minimalSearchCoverage; }
+    double getHigherCoverageMaxDocSumWait() const { return _higherCoverageMaxDocSumWait; }
+    double getHigherCoverageMinDocSumWait() const { return _higherCoverageMinDocSumWait; }
+    double getHigherCoverageBaseDocSumWait() const { return _higherCoverageBaseDocSumWait; }
+    double getMinimalDocSumCoverage() const { return _minimalDocSumCoverage; }
 
     // API
     //----
@@ -210,7 +210,7 @@ public:
 
     // Downcast
     //---------
-    virtual FastS_PlainDataSet * GetPlainDataSet(void) override { return this; }
+    virtual FastS_PlainDataSet * GetPlainDataSet() override { return this; }
 
     template <class FUN>
     FUN ForEachEngine(FUN fun) {
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp
index 73057061391..30ad3bcf9f4 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp
@@ -13,7 +13,7 @@ LOG_SETUP(".query");
 
 /** Marks as empty
  */
-FastS_query::FastS_query(void)
+FastS_query::FastS_query()
     : _dataset(0),
       _flags(0),
       _stackDump(),
@@ -57,7 +57,7 @@ FastS_query::getPrintableQuery()
     return  _printableQuery.c_str();
 }
 
-FastS_query::~FastS_query(void)
+FastS_query::~FastS_query()
 {
 }
 
@@ -95,7 +95,7 @@ class SizeCollector : public search::fef::IPropertiesVisitor
     static const size_t _mapFuzz = 15;
     size_t _size;
 public:
-    SizeCollector(void)
+    SizeCollector()
         : _size(0)
     {
     }
@@ -121,7 +121,7 @@ public:
     }
 
     size_t
-    getSize(void) const
+    getSize() const
     {
         return _size;
     }
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/query.h b/searchcore/src/vespa/searchcore/fdispatch/search/query.h
index aeea70125b0..077b5b1b226 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/query.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/query.h
@@ -23,9 +23,9 @@ public:
     FastS_query(const FastS_query &other);
     FastS_query &operator=(const FastS_query &other);
 public:
-    FastS_query(void);
+    FastS_query();
     FastS_query(const search::docsummary::GetDocsumArgs &docsumArgs);
-    ~FastS_query(void);
+    ~FastS_query();
 
     void SetStackDump(const vespalib::stringref& stackDump);
     void SetSortSpec(const char *spec) { _sortSpec = spec; }
@@ -42,7 +42,7 @@ public:
     const search::fef::Properties &GetRankProperties() const { return _rankProperties; }
     const search::fef::Properties &GetFeatureOverrides() const { return _featureOverrides; }
 
-    uint32_t GetQueryFlags(void) const { return _flags; }
+    uint32_t GetQueryFlags() const { return _flags; }
     const char *getPrintableQuery();
     bool IsFlagSet(uint32_t flag) const { return (_flags & flag) != 0; }
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp
index 7e95cf91325..62a6b470b73 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp
@@ -115,7 +115,7 @@ FastS_QueryCacheUtil::AdjustSearchParametersFinal(uint32_t partitions)
 }
 
 void
-FastS_QueryCacheUtil::DropResult(void)
+FastS_QueryCacheUtil::DropResult()
 {
     _queryResult._groupResultLen = 0;
     _queryResult._groupResult = NULL;
@@ -148,13 +148,13 @@ FastS_QueryCacheUtil::DropResult(void)
 
 
 bool
-FastS_QueryCacheUtil::IsEstimate(void) const
+FastS_QueryCacheUtil::IsEstimate() const
 {
     return _query.IsFlagSet(search::fs4transport::QFLAG_ESTIMATE);
 }
 
 void
-FastS_QueryCacheUtil::InitEstimateMode(void)
+FastS_QueryCacheUtil::InitEstimateMode()
 {
     _searchInfo._searchOffset = 0;
     _searchInfo._maxHits  = 0;
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h
index 0ef3fb0abf7..0b3373efcd0 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h
@@ -47,35 +47,35 @@ public:
 public:
     FastS_QueryCacheUtil();
     ~FastS_QueryCacheUtil();
-    bool AgeDropCheck(void);
-    void DropResult(void);
-    bool GotNoResultsYet(void) const { return _queryResult._hitbuf == NULL; }
-    uint32_t GetSearchOffset(void) const { return _searchInfo._searchOffset; }
-    uint32_t GetMaxHits(void) const { return _searchInfo._maxHits; }
-    uint32_t GetAlignedMaxHits(void) const { return _alignedMaxHits; }
-    uint32_t GetAlignedSearchOffset(void) const { return _alignedSearchOffset; }
-    const vespalib::string & GetRanking(void) const { return _ranking; }
-    uint32_t GetRandomSeed(void) const { return _randomSeed; }
-    uint32_t GetDateTime(void) const { return _dateTime; }
-    FastS_query &GetQuery(void) { return _query; }
+    bool AgeDropCheck();
+    void DropResult();
+    bool GotNoResultsYet() const { return _queryResult._hitbuf == NULL; }
+    uint32_t GetSearchOffset() const { return _searchInfo._searchOffset; }
+    uint32_t GetMaxHits() const { return _searchInfo._maxHits; }
+    uint32_t GetAlignedMaxHits() const { return _alignedMaxHits; }
+    uint32_t GetAlignedSearchOffset() const { return _alignedSearchOffset; }
+    const vespalib::string & GetRanking() const { return _ranking; }
+    uint32_t GetRandomSeed() const { return _randomSeed; }
+    uint32_t GetDateTime() const { return _dateTime; }
+    FastS_query &GetQuery() { return _query; }
     const char *GetSortSpec() const { return _query.GetSortSpec(); }
     const char *GetLocation() const { return _query.GetLocation(); }
     bool ShouldDropSortData() const {
         return _query.IsFlagSet(search::fs4transport::QFLAG_DROP_SORTDATA);
     }
     bool IsQueryFlagSet(uint32_t flag) const { return _query.IsFlagSet(flag); }
-    FastS_QueryResult *GetQueryResult(void) {
+    FastS_QueryResult *GetQueryResult() {
         return &_queryResult;
     }
-    FastS_DocsumsResult *GetDocsumsResult(void) { return &_docsumsResult; }
-    FastS_SearchInfo *GetSearchInfo(void) { return &_searchInfo; }
+    FastS_DocsumsResult *GetDocsumsResult() { return &_docsumsResult; }
+    FastS_SearchInfo *GetSearchInfo() { return &_searchInfo; }
     void SetStartTime(double timeref) { _startTime = timeref; }
     void AdjustSearchParameters(uint32_t partitions);
     void AdjustSearchParametersFinal(uint32_t partitions);
     void SetupQuery(uint32_t maxhits, uint32_t offset);
-    bool IsEstimate(void) const;
-    void ForceStrictLimits(void);
-    void InitEstimateMode(void);
+    bool IsEstimate() const;
+    void ForceStrictLimits();
+    void InitEstimateMode();
     double ElapsedSecs(double now) const {
         double ret = now - _startTime;
         if (ret < 0.0)
@@ -95,7 +95,7 @@ public:
         }
         _alignedHitCount = alignedHitCount;
     }
-    void CalcHitCount(void) {
+    void CalcHitCount() {
         if (_alignedHitCount + _alignedSearchOffset > _searchInfo._searchOffset) {
             _queryResult._hitCount = _alignedHitCount + _alignedSearchOffset - _searchInfo._searchOffset;
         } else {
@@ -105,7 +105,7 @@ public:
             _queryResult._hitCount = _searchInfo._maxHits;
         }
     }
-    void AllocAlignedHitBuf(void) {
+    void AllocAlignedHitBuf() {
         FastS_assert(_alignedHitBuf == NULL);
         if (_alignedHitCount != 0) {
             _alignedHitBuf = (FastS_hitresult*)malloc(sizeof(FastS_hitresult) * _alignedHitCount);
@@ -134,11 +134,11 @@ public:
     }
     uint32_t *GetSortIndex() const { return _sortIndex; }
     char *GetSortData() const { return _sortData; }
-    FastS_hitresult *GetAlignedHitBuf(void) const { return _alignedHitBuf; }
-    FastS_hitresult *GetAlignedHitBufEnd(void) const {
+    FastS_hitresult *GetAlignedHitBuf() const { return _alignedHitBuf; }
+    FastS_hitresult *GetAlignedHitBufEnd() const {
         return _alignedHitBuf + _alignedHitCount;
     }
-    uint32_t GetAlignedHitCount(void) const { return _alignedHitCount; }
+    uint32_t GetAlignedHitCount() const { return _alignedHitCount; }
     void SetGroupResult(const char *groupResult) {
         _queryResult._groupResult = groupResult;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
index 8be1a8868d1..d2e101436bf 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
@@ -53,7 +53,7 @@ public:
     virtual void run() override;
 
     virtual SerialNum
-    getFlushSerial(void) const override
+    getFlushSerial() const override
     {
         return _syncToken;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
index 6d2b3a0aede..d998d019c5e 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
@@ -12,7 +12,7 @@ namespace proton
 {
 
 
-BucketDB::BucketDB(void)
+BucketDB::BucketDB()
     : _map(),
       _cachedBucketId(),
       _cachedBucketState()
@@ -20,7 +20,7 @@ BucketDB::BucketDB(void)
 }
 
 
-BucketDB::~BucketDB(void)
+BucketDB::~BucketDB()
 {
     checkEmpty();
     clear();
@@ -161,20 +161,20 @@ BucketDB::getBuckets(BucketId::List &buckets) const
 }
 
 bool
-BucketDB::empty(void) const
+BucketDB::empty() const
 {
     return _map.empty();
 }
 
 void
-BucketDB::clear(void)
+BucketDB::clear()
 {
     _map.clear();
 }
 
 
 void
-BucketDB::checkEmpty(void) const
+BucketDB::checkEmpty() const
 {
     for (auto &entry : _map) {
         const BucketState &state = entry.second;
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
index 9582713fc00..b948cb63caf 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
@@ -31,11 +31,11 @@ private:
     BucketId _cachedBucketId;
     BucketState _cachedBucketState;
 
-    void clear(void);
-    void checkEmpty(void) const;
+    void clear();
+    void checkEmpty() const;
 public:
-    BucketDB(void);
-    virtual ~BucketDB(void);
+    BucketDB();
+    virtual ~BucketDB();
 
     const BucketState &
     add(const GlobalId &gid,
@@ -72,7 +72,7 @@ public:
     BucketState cachedGet(const BucketId &bucketId) const;
     bool hasBucket(const BucketId &bucketId) const;
     void getBuckets(BucketId::List & buckets) const;
-    bool empty(void) const;
+    bool empty() const;
     void setBucketState(const BucketId &bucketId, bool active);
     void createBucket(const BucketId &bucketId);
     void deleteEmptyBucket(const BucketId &bucketId);
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketstate.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketstate.cpp
index e8fad2054da..afaf9700e3f 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketstate.cpp
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketstate.cpp
@@ -104,7 +104,7 @@ BucketState::modify(const Timestamp &oldTimestamp, uint32_t oldDocSize,
 
 
 bool
-BucketState::empty(void) const
+BucketState::empty() const
 {
     if (getReadyCount() != 0 || getRemovedCount() != 0 ||
         getNotReadyCount() != 0)
diff --git a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h
index a5d35eebad2..38e532053d4 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h
+++ b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h
@@ -25,7 +25,7 @@ public:
                std::ostream& out) const override;
 
     document::select::ValueNode::UP
-    clone(void) const override
+    clone() const override
     {
         return wrapParens(new AttributeFieldValueNode(getDocType(),
                                                       getFieldName(),
diff --git a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp
index 934737122e7..861131642e4 100644
--- a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp
@@ -113,7 +113,7 @@ AttrVisitor::visitFieldValueNode(const FieldValueNode &expr)
 
 }
 
-CachedSelect::CachedSelect(void)
+CachedSelect::CachedSelect()
     : _attributes(),
       _select(),
       _fieldNodes(0u),
diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
index 9d0a63677e0..e1867776a5e 100644
--- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
@@ -77,7 +77,7 @@ FeedToken::State::ack(const FeedOperation::Type opType,
 
 
 void
-FeedToken::State::incNeededAcks(void)
+FeedToken::State::incNeededAcks()
 {
     assert(_reply.get() != NULL);
     uint32_t prev(_unAckedCount++);
diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.h b/searchcore/src/vespa/searchcore/proton/common/feedtoken.h
index fee84d53ce5..b73f7bc7faa 100644
--- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.h
+++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.h
@@ -43,7 +43,7 @@ private:
 
         void ack(const FeedOperation::Type opType, PerDocTypeFeedMetrics &metrics);
 
-        void incNeededAcks(void);
+        void incNeededAcks();
 
         void fail(uint32_t errNum, const vespalib::string &errMsg);
         void trace(uint32_t traceLevel, const vespalib::string &traceMsg);
@@ -95,7 +95,7 @@ public:
     }
 
     void
-    incNeededAcks(void) const
+    incNeededAcks() const
     {
         _state->incNeededAcks();
     }
diff --git a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
index 341a4d77f95..e4c8bdd8f84 100644
--- a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
+++ b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
@@ -148,7 +148,7 @@ public:
      * Clear all handlers.
      */
     void
-    clear(void)
+    clear()
     {
         _handlers.clear();
     }
diff --git a/searchcore/src/vespa/searchcore/proton/common/selectcontext.cpp b/searchcore/src/vespa/searchcore/proton/common/selectcontext.cpp
index 36fa242daec..1e8a15593c0 100644
--- a/searchcore/src/vespa/searchcore/proton/common/selectcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/selectcontext.cpp
@@ -29,7 +29,7 @@ SelectContext::SelectContext(const CachedSelect &cachedSelect)
 SelectContext::~SelectContext() { }
 
 void
-SelectContext::getAttributeGuards(void)
+SelectContext::getAttributeGuards()
 {
     _guards->resize(_cachedSelect._attributes.size());
     auto j(_cachedSelect._attributes.begin());
@@ -40,7 +40,7 @@ SelectContext::getAttributeGuards(void)
 
 
 void
-SelectContext::dropAttributeGuards(void)
+SelectContext::dropAttributeGuards()
 {
     _guards->clear();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp
index 12acfdcfd7e..fe6a89b0a40 100644
--- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp
@@ -439,7 +439,7 @@ SelectPruner::visitFieldValueNode(const FieldValueNode &expr)
 
 
 void
-SelectPruner::invertNode(void)
+SelectPruner::invertNode()
 {
     _resultSet = _resultSet.calcNot();
     if (isInvalid()) {
@@ -498,7 +498,7 @@ SelectPruner::addNodeCount(const SelectPruner &rhs)
 
 
 void
-SelectPruner::setInvalidVal(void)
+SelectPruner::setInvalidVal()
 {
     _constVal = true;
     _priority = InvalidValPriority;
@@ -507,7 +507,7 @@ SelectPruner::setInvalidVal(void)
 
 
 void
-SelectPruner::setInvalidConst(void)
+SelectPruner::setInvalidConst()
 {
     _constVal = true;
     _priority = InvalidConstPriority;
@@ -542,7 +542,7 @@ SelectPruner::resolveTernaryConst(bool wantInverted)
 
 
 bool
-SelectPruner::isFalse(void) const
+SelectPruner::isFalse() const
 {
     if (!_constVal)
         return false;
@@ -560,7 +560,7 @@ SelectPruner::isFalse(void) const
 
 
 bool
-SelectPruner::isTrue(void) const
+SelectPruner::isTrue() const
 {
     if (!_constVal)
         return false;
@@ -578,7 +578,7 @@ SelectPruner::isTrue(void) const
 
 
 bool
-SelectPruner::isInvalid(void) const
+SelectPruner::isInvalid() const
 {
     if (!_constVal)
         return false;
@@ -596,7 +596,7 @@ SelectPruner::isInvalid(void) const
 
 
 bool
-SelectPruner::isInvalidVal(void) const
+SelectPruner::isInvalidVal() const
 {
     if (!_constVal)
         return false;
@@ -606,7 +606,7 @@ SelectPruner::isInvalidVal(void) const
 
 
 bool
-SelectPruner::isNullVal(void) const
+SelectPruner::isNullVal() const
 {
     if (!_constVal)
         return false;
@@ -616,7 +616,7 @@ SelectPruner::isNullVal(void) const
 
 
 bool
-SelectPruner::isConst(void) const
+SelectPruner::isConst() const
 {
     return _constVal;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.h b/searchcore/src/vespa/searchcore/proton/common/selectpruner.h
index 92bbb435349..5d4bbc038b9 100644
--- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.h
+++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.h
@@ -52,37 +52,37 @@ public:
     SelectPruner(const SelectPruner *rhs);
 
     virtual
-    ~SelectPruner(void);
+    ~SelectPruner();
 
     uint32_t
-    getFieldNodes(void) const
+    getFieldNodes() const
     {
         return _fieldNodes;
     }
 
     uint32_t
-    getAttrFieldNodes(void) const
+    getAttrFieldNodes() const
     {
         return _attrFieldNodes;
     }
 
     const document::select::ResultSet &
-    getResultSet(void) const
+    getResultSet() const
     {
         return _resultSet;
     }
 
     bool
-    isFalse(void) const;
+    isFalse() const;
 
     bool
-    isTrue(void) const;
+    isTrue() const;
 
     bool
-    isInvalid(void) const;
+    isInvalid() const;
 
     bool
-    isConst(void) const;
+    isConst() const;
 
     void
     trace(std::ostream &t);
@@ -115,7 +115,7 @@ private:
     visitFieldValueNode(const document::select::FieldValueNode &expr) override;
 
     void
-    invertNode(void);
+    invertNode();
 
     const document::select::Operator &
     getOperator(const document::select::Operator &op);
@@ -124,10 +124,10 @@ private:
     addNodeCount(const SelectPruner &rhs);
 
     void
-    setInvalidVal(void);
+    setInvalidVal();
 
     void
-    setInvalidConst(void);
+    setInvalidConst();
 
     void
     setTernaryConst(bool val);
@@ -136,10 +136,10 @@ private:
     resolveTernaryConst(bool wantInverted);
 
     bool
-    isInvalidVal(void) const;
+    isInvalidVal() const;
 
     bool
-    isNullVal(void) const;
+    isNullVal() const;
 
     void
     swap(SelectPruner &rhs);
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
index f2007b2f988..319750b9473 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
@@ -40,7 +40,7 @@ public:
     }
 
     virtual SerialNum
-    getFlushSerial(void) const override
+    getFlushSerial() const override
     {
         return _currSerial;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index 03c0c1bd771..742764f7c64 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -95,12 +95,12 @@ public:
     }
 
     uint8_t
-    getNextBucketUsedBits(void) {
+    getNextBucketUsedBits() {
         return _bucketUsedBitsReader.readHostOrder();
     }
 
     Timestamp
-    getNextTimestamp(void) {
+    getNextTimestamp() {
         return _timestampReader.readHostOrder();
     }
 
@@ -988,7 +988,7 @@ DocumentMetaStore::compactLidSpace(uint32_t wantedLidLimit)
 }
 
 void
-DocumentMetaStore::holdUnblockShrinkLidSpace(void)
+DocumentMetaStore::holdUnblockShrinkLidSpace()
 {
     assert(_shrinkLidSpaceBlockers > 0);
     GenerationHeldBase::UP hold(new ShrinkBlockHeld(*this));
@@ -997,14 +997,14 @@ DocumentMetaStore::holdUnblockShrinkLidSpace(void)
 }
 
 void
-DocumentMetaStore::unblockShrinkLidSpace(void)
+DocumentMetaStore::unblockShrinkLidSpace()
 {
     assert(_shrinkLidSpaceBlockers > 0);
     --_shrinkLidSpaceBlockers;
 }
 
 bool
-DocumentMetaStore::canShrinkLidSpace(void) const
+DocumentMetaStore::canShrinkLidSpace() const
 {
     return AttributeVector::canShrinkLidSpace() &&
         _shrinkLidSpaceBlockers == 0;
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
index 68b33438642..26f63b6f121 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
@@ -31,7 +31,7 @@ DocumentMetaStoreContext::DocumentMetaStoreContext(const search::AttributeVector
 DocumentMetaStoreContext::~DocumentMetaStoreContext() {}
 
 void
-DocumentMetaStoreContext::constructFreeList(void)
+DocumentMetaStoreContext::constructFreeList()
 {
     _metaStore->constructFreeList();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
index f3158cc4661..881604491ae 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
@@ -55,7 +55,7 @@ public:
     virtual void run() override;
 
     virtual SerialNum
-    getFlushSerial(void) const override
+    getFlushSerial() const override
     {
         return _syncToken;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
index 8d3264ba241..7dc46504d18 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
@@ -68,7 +68,7 @@ LidStateVector::resizeVector(uint32_t newSize, uint32_t newCapacity)
 
 
 void
-LidStateVector::updateLowest(void)
+LidStateVector::updateLowest()
 {
     if (_lowest >= _bv.size())
         return;
@@ -81,7 +81,7 @@ LidStateVector::updateLowest(void)
 
 
 void
-LidStateVector::updateHighest(void)
+LidStateVector::updateHighest()
 {
     if (_highest == 0)
         return;
@@ -124,28 +124,28 @@ LidStateVector::clearBit(unsigned int idx)
 
 
 bool
-LidStateVector::empty(void) const
+LidStateVector::empty() const
 {
     return _count == 0u;
 }
 
 
 unsigned int
-LidStateVector::getLowest(void) const
+LidStateVector::getLowest() const
 {
     return _lowest;
 }
 
 
 unsigned int
-LidStateVector::getHighest(void) const
+LidStateVector::getHighest() const
 {
     return _highest;
 }
 
 
 uint32_t
-LidStateVector::internalCount(void)
+LidStateVector::internalCount()
 {
     // Called by document db executor thread.
     return _bv.countTrueBits();
@@ -153,7 +153,7 @@ LidStateVector::internalCount(void)
 
 
 uint32_t
-LidStateVector::count(void) const
+LidStateVector::count() const
 {
     // Called by document db executor thread or metrics related threads
     return _count;
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.h
index 8c8c41f6184..c870fe0d953 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.h
@@ -17,20 +17,20 @@ class LidStateVector
     bool _trackHighest;
 
     void
-    updateLowest(void);
+    updateLowest();
 
     void
-    updateHighest(void);
+    updateHighest();
 
     inline void
-    maybeUpdateLowest(void)
+    maybeUpdateLowest()
     {
         if (_trackLowest && _lowest < _bv.size() && !_bv.testBit(_lowest))
             updateLowest();
     }
 
     inline void
-    maybeUpdateHighest(void)
+    maybeUpdateHighest()
     {
         if (_trackHighest && _highest != 0 && !_bv.testBit(_highest))
             updateHighest();
@@ -41,7 +41,7 @@ class LidStateVector
      * write thread.
      */
     uint32_t
-    internalCount(void);
+    internalCount();
 public:
     
     LidStateVector(unsigned int newSize,
@@ -68,32 +68,32 @@ public:
     }
 
     inline unsigned int
-    size(void) const
+    size() const
     {
         return _bv.size();
     }
 
     inline unsigned int
-    byteSize(void) const
+    byteSize() const
     {
         return _bv.extraByteSize() + sizeof(LidStateVector);
     }
 
     bool
-    empty(void) const;
+    empty() const;
 
     unsigned int
-    getLowest(void) const;
+    getLowest() const;
     
     unsigned int
-    getHighest(void) const;
+    getHighest() const;
 
     /**
      * Get cached number of bits set in vector.  Called by read or
      * write thread.  Write thread must updated cached number as needed.
      */
     uint32_t
-    count(void) const;
+    count() const;
 
     unsigned int
     getNextTrueBit(unsigned int idx) const
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/raw_document_meta_data.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/raw_document_meta_data.h
index 29fa597b3ec..68a354c9984 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/raw_document_meta_data.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/raw_document_meta_data.h
@@ -23,7 +23,7 @@ struct RawDocumentMetaData
     uint16_t  _docSizeHigh;
     Timestamp _timestamp;
 
-    RawDocumentMetaData(void)
+    RawDocumentMetaData()
         : _gid(),
           _bucketUsedBits(BucketId::minNumBits),
           _docSizeLow(0),
@@ -80,7 +80,7 @@ struct RawDocumentMetaData
         _bucketUsedBits = bucketUsedBits;
     }
 
-    Timestamp getTimestamp(void) const { return _timestamp; }
+    Timestamp getTimestamp() const { return _timestamp; }
 
     void setTimestamp(const Timestamp &timestamp) { _timestamp = timestamp; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
index 4b22c868628..28cff31d624 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
@@ -31,19 +31,19 @@ protected:
 
 public:
     virtual
-    ~DocumentOperation(void)
+    ~DocumentOperation()
     {
     }
 
     const
     document::BucketId &
-    getBucketId(void) const
+    getBucketId() const
     {
         return _bucketId;
     }
 
     storage::spi::Timestamp
-    getTimestamp(void) const
+    getTimestamp() const
     {
         return _timestamp;
     }
@@ -61,19 +61,19 @@ public:
     }
 
     uint32_t
-    getSubDbId(void) const
+    getSubDbId() const
     {
         return _dbdId.getSubDbId();
     }
 
     uint32_t
-    getPrevSubDbId(void) const
+    getPrevSubDbId() const
     {
         return _prevDbdId.getSubDbId();
     }
 
     bool
-    getValidDbdId(void) const
+    getValidDbdId() const
     {
         return _dbdId.valid();
     }
@@ -85,7 +85,7 @@ public:
     }
 
     bool
-    getValidPrevDbdId(void) const
+    getValidPrevDbdId() const
     {
         return _prevDbdId.valid();
     }
@@ -97,12 +97,12 @@ public:
     }
 
     bool
-    changedDbdId(void) const
+    changedDbdId() const
     {
         return _dbdId != _prevDbdId;
     }
     bool
-    getPrevMarkedAsRemoved(void) const
+    getPrevMarkedAsRemoved() const
     {
         return _prevMarkedAsRemoved;
     }
@@ -114,13 +114,13 @@ public:
     }
 
     DbDocumentId
-    getDbDocumentId(void) const
+    getDbDocumentId() const
     {
         return _dbdId;
     }
 
     DbDocumentId
-    getPrevDbDocumentId(void) const
+    getPrevDbDocumentId() const
     {
         return _prevDbdId;
     }
@@ -148,13 +148,13 @@ public:
     }
 
     bool
-    getValidNewOrPrevDbdId(void) const
+    getValidNewOrPrevDbdId() const
     {
         return getValidDbdId() || getValidPrevDbdId();
     }
 
     bool
-    notMovingLidInSameSubDb(void) const
+    notMovingLidInSameSubDb() const
     {
         return !getValidDbdId() ||
             !getValidPrevDbdId() ||
@@ -163,7 +163,7 @@ public:
     }
 
     bool
-    movingLidIfInSameSubDb(void) const
+    movingLidIfInSameSubDb() const
     {
         return !getValidDbdId() ||
             !getValidPrevDbdId() ||
@@ -172,7 +172,7 @@ public:
     }
 
     storage::spi::Timestamp
-    getPrevTimestamp(void) const
+    getPrevTimestamp() const
     {
         return _prevTimestamp;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
index e75b44a2235..f036d12145d 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
@@ -118,7 +118,7 @@ FlushEngine::triggerFlush()
 }
 
 void
-FlushEngine::kick(void)
+FlushEngine::kick()
 {
     MonitorGuard guard(_monitor);
     LOG(debug, "Kicking flush engine");
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
index d4ebb687e87..f89bf15db80 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
@@ -130,7 +130,7 @@ public:
      */
     void triggerFlush();
 
-    void kick(void);
+    void kick();
 
     /**
      * Registers a new flush handler for the given document type. If another
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
index 8574770352c..999c997d221 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
@@ -144,7 +144,7 @@ Query::optimize()
 }
 
 void
-Query::fetchPostings(void)
+Query::fetchPostings()
 {
     _blueprint->fetchPostings(true);
 }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.h b/searchcore/src/vespa/searchcore/proton/matching/query.h
index aa9ee52d82c..484d961870b 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.h
@@ -84,7 +84,7 @@ public:
      * test to verify the original query without optimization.
      **/
     void optimize();
-    void fetchPostings(void);
+    void fetchPostings();
     void freeze();
 
     /**
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h
index b8952edb990..ef3000dc1f7 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h
@@ -11,7 +11,7 @@ class IPersistenceEngineOwner
 {
 public:
     virtual
-    ~IPersistenceEngineOwner(void)
+    ~IPersistenceEngineOwner()
     {
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
index 2a17cb97952..734e3e2da55 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
@@ -656,7 +656,7 @@ PersistenceEngine::maintain(const Bucket& , MaintenanceLevel)
 }
 
 void
-PersistenceEngine::destroyIterators(void)
+PersistenceEngine::destroyIterators()
 {
     Context context(storage::spi::LoadType(0, "default"),
                     storage::spi::Priority(0x80),
@@ -689,7 +689,7 @@ PersistenceEngine::saveClusterState(const ClusterState &calc)
 }
 
 PersistenceEngine::ClusterState::SP
-PersistenceEngine::savedClusterState(void) const
+PersistenceEngine::savedClusterState() const
 {
     LockGuard guard(_lock);
     return _clusterState;
@@ -738,7 +738,7 @@ public:
         }
     }
 
-    const BucketIdMap & getBucketMap(void) const { return _bucketMap; }
+    const BucketIdMap & getBucketMap() const { return _bucketMap; }
 };
 
 void
@@ -773,7 +773,7 @@ PersistenceEngine::populateInitialBucketDB(IPersistenceHandler &targetHandler)
 }
 
 std::unique_lock<std::shared_timed_mutex>
-PersistenceEngine::getWLock(void) const
+PersistenceEngine::getWLock() const
 {
     return std::unique_lock<std::shared_timed_mutex>(_rwMutex);
 }
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
index 40d59453673..c3cda712385 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
@@ -92,7 +92,7 @@ private:
     HandlerSnapshot::UP getHandlerSnapshot(const document::DocumentId &) const;
 
     void saveClusterState(const ClusterState &calc);
-    ClusterState::SP savedClusterState(void) const;
+    ClusterState::SP savedClusterState() const;
 
 public:
     typedef std::unique_ptr<PersistenceEngine> UP;
@@ -134,7 +134,7 @@ public:
     void propagateSavedClusterState(IPersistenceHandler &handler);
     void grabExtraModifiedBuckets(IPersistenceHandler &handler);
     void populateInitialBucketDB(IPersistenceHandler &targetHandler);
-    std::unique_lock<std::shared_timed_mutex> getWLock(void) const;
+    std::unique_lock<std::shared_timed_mutex> getWLock() const;
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
index ca20d65f34b..5599b7be360 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp
@@ -51,7 +51,7 @@ BootstrapConfig::operator==(const BootstrapConfig &rhs) const
 
 
 bool
-BootstrapConfig::valid(void) const
+BootstrapConfig::valid() const
 {
     return _documenttypes.get() != NULL &&
                     _repo.get() != NULL &&
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
index 0f83ae379b3..749aa5a48fb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
@@ -62,19 +62,19 @@ public:
     }
 
     const vespa::config::search::core::ProtonConfig &
-    getProtonConfig(void) const
+    getProtonConfig() const
     {
         return *_proton;
     }
 
     const ProtonConfigSP &
-    getProtonConfigSP(void) const
+    getProtonConfigSP() const
     {
         return _proton;
     }
 
     const search::TuneFileDocumentDB::SP &
-    getTuneFileDocumentDBSP(void) const
+    getTuneFileDocumentDBSP() const
     {
         return _tuneFileDocumentDB;
     }
@@ -98,7 +98,7 @@ public:
     operator==(const BootstrapConfig &rhs) const;
 
     bool
-    valid(void) const;
+    valid() const;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/buckethandler.h b/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
index d1188c022f7..efdb7b8b073 100644
--- a/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
@@ -38,7 +38,7 @@ private:
      * up to down in cluster state.  Called by document db executor thread.
      */
     void
-    deactivateAllActiveBuckets(void);
+    deactivateAllActiveBuckets();
 
 public:
     /**
diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
index 7472a321437..7b432588b7a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
@@ -70,7 +70,7 @@ public:
         bool      hasReadyBucketDocs() const { return _itr->second.getReadyCount() != 0; }
         bool   hasNotReadyBucketDocs() const { return _itr->second.getNotReadyCount() != 0; }
 
-        ScanIterator & operator++(void) {
+        ScanIterator & operator++() {
             ++_itr;
             return *this;
         }
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
index 665507b5bc0..b2ea64f6070 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
@@ -53,13 +53,13 @@ CombiningFeedView::CombiningFeedView(const std::vector<IFeedView::SP> &views,
 }
 
 
-CombiningFeedView::~CombiningFeedView(void)
+CombiningFeedView::~CombiningFeedView()
 {
 }
 
 
 const ISimpleDocumentMetaStore *
-CombiningFeedView::getDocumentMetaStorePtr(void) const
+CombiningFeedView::getDocumentMetaStorePtr() const
 {
     return NULL;
 }
@@ -94,7 +94,7 @@ CombiningFeedView::findPrevDbdId(const document::GlobalId &gid,
 
 
 const DocumentTypeRepo::SP &
-CombiningFeedView::getDocumentTypeRepo(void) const
+CombiningFeedView::getDocumentTypeRepo() const
 {
     return _repo;
 }
@@ -247,7 +247,7 @@ CombiningFeedView::heartBeat(search::SerialNum serialNum)
 
 
 void
-CombiningFeedView::sync(void)
+CombiningFeedView::sync()
 {
     getReadyFeedView()->sync();
     // Assume this synced all feed views due to sharing of threads.
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
index 879fc75a802..0b6b9538721 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
@@ -30,7 +30,7 @@ private:
     bool                                          _clusterUp;
     bool                                          _forceReady;
 
-    const ISimpleDocumentMetaStore * getDocumentMetaStorePtr(void) const override;
+    const ISimpleDocumentMetaStore * getDocumentMetaStorePtr() const override;
 
     void findPrevDbdId(const document::GlobalId &gid, DocumentOperation &op);
     uint32_t getReadyFeedViewId() const { return 0u; }
@@ -63,7 +63,7 @@ public:
 
     virtual ~CombiningFeedView();
 
-    const document::DocumentTypeRepo::SP & getDocumentTypeRepo(void) const override;
+    const document::DocumentTypeRepo::SP & getDocumentTypeRepo() const override;
 
     /**
      * Similar to IPersistenceHandler functions.
diff --git a/searchcore/src/vespa/searchcore/proton/server/ddbstate.h b/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
index 8c8bf0bd162..041e161c920 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
@@ -87,7 +87,7 @@ public:
     enterDeadState();
 
     State
-    getState(void) const
+    getState() const
     {
         return _state;
     }
@@ -96,21 +96,21 @@ public:
     getStateString(State state);
     
     bool
-    getClosed(void) const
+    getClosed() const
     {
         State state(_state);
         return state >= State::SHUTDOWN;
     }
 
     bool
-    getAllowReconfig(void) const
+    getAllowReconfig() const
     {
         State state(_state);
         return state >= State::APPLY_LIVE_CONFIG && state < State::SHUTDOWN;
     }
 
     bool
-    getAllowPrune(void) const
+    getAllowPrune() const
     {
         State state(_state);
         return state == State::ONLINE;
diff --git a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.cpp b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.cpp
index fc6b7b9eeee..200ced19d02 100644
--- a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.cpp
@@ -59,7 +59,7 @@ DocStoreValidator::visit(uint32_t lid)
 
 
 void
-DocStoreValidator::visitDone(void)
+DocStoreValidator::visitDone()
 {
     _invalid->invalidateCachedCount();
     _orphans->invalidateCachedCount();
@@ -68,13 +68,13 @@ DocStoreValidator::visitDone(void)
 }
 
 uint32_t
-DocStoreValidator::getInvalidCount(void) const
+DocStoreValidator::getInvalidCount() const
 {
     return _invalid->countTrueBits();
 }
 
 uint32_t
-DocStoreValidator::getOrphanCount(void) const
+DocStoreValidator::getOrphanCount() const
 {
     return _orphans->countTrueBits();
 }
@@ -93,7 +93,7 @@ DocStoreValidator::killOrphans(search::IDocumentStore &store,
 
 
 LidVectorContext::SP
-DocStoreValidator::getInvalidLids(void) const
+DocStoreValidator::getInvalidLids() const
 {
     LidVectorContext::SP res(new LidVectorContext(_docIdLimit));
     assert(_invalid->size() == _docIdLimit);
diff --git a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h
index f0eaa4bb01d..fd74ef45583 100644
--- a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h
+++ b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h
@@ -24,7 +24,7 @@ public:
     virtual void visit(uint32_t lid, const document::Document &doc) override;
     virtual void visit(uint32_t lid) override;
 
-    void visitDone(void);
+    void visitDone();
     void killOrphans(search::IDocumentStore &store, search::SerialNum serialNum);
     uint32_t getInvalidCount() const;
     uint32_t getOrphanCount() const;
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
index 2b724f41ae4..4b48de6fa5b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.h
@@ -15,7 +15,7 @@ private:
     double _age;
 
 public:
-    DocumentDBPruneConfig(void);
+    DocumentDBPruneConfig();
     DocumentDBPruneConfig(double interval, double age);
 
     bool operator==(const DocumentDBPruneConfig &rhs) const;
@@ -32,11 +32,11 @@ private:
     double _interval;
 
 public:
-    DocumentDBHeartBeatConfig(void);
+    DocumentDBHeartBeatConfig();
     DocumentDBHeartBeatConfig(double interval);
 
     bool operator==(const DocumentDBHeartBeatConfig &rhs) const;
-    double getInterval(void) const { return _interval; }
+    double getInterval() const { return _interval; }
 };
 
 class DocumentDBLidSpaceCompactionConfig
@@ -83,7 +83,7 @@ private:
     double                                _resourceLimitFactor;
 
 public:
-    DocumentDBMaintenanceConfig(void);
+    DocumentDBMaintenanceConfig();
 
     DocumentDBMaintenanceConfig(const DocumentDBPruneRemovedDocumentsConfig &pruneRemovedDocuments,
                                 const DocumentDBHeartBeatConfig &heartBeat,
@@ -98,13 +98,13 @@ public:
     operator==(const DocumentDBMaintenanceConfig &rhs) const;
 
     const DocumentDBPruneRemovedDocumentsConfig &
-    getPruneRemovedDocumentsConfig(void) const
+    getPruneRemovedDocumentsConfig() const
     {
         return _pruneRemovedDocuments;
     }
 
     const DocumentDBHeartBeatConfig &
-    getHeartBeatConfig(void) const
+    getHeartBeatConfig() const
     {
         return _heartBeat;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
index 5f8b5c8fe45..989e9fcdff4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.h
@@ -47,7 +47,7 @@ public:
     void moveDocuments(size_t maxDocsToMove);
     void cancel() { setBucketDone(); }
     bool bucketDone() const { return _bucketDone; }
-    const MaintenanceDocumentSubDB * getSource(void) const { return _source; }
+    const MaintenanceDocumentSubDB * getSource() const { return _source; }
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
index 46a6a8e76db..30633ec122a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
@@ -144,7 +144,7 @@ public:
 
     const vespalib::string &getDocTypeName() const { return _docTypeName; }
 
-    int64_t getGeneration(void) const { return _generation; }
+    int64_t getGeneration() const { return _generation; }
 
     const RankProfilesConfig &getRankProfilesConfig() const { return *_rankProfiles; }
     const RankingConstants &getRankingConstants() const { return *_rankingConstants; }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index 52d75e1ff63..959e5565753 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -351,7 +351,7 @@ DocumentDBConfigHelper::nextGeneration(int timeoutInMillis)
 }
 
 DocumentDBConfig::SP
-DocumentDBConfigHelper::getConfig(void) const
+DocumentDBConfigHelper::getConfig() const
 {
     return _mgr.getConfig();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
index cb74350684f..be132509e45 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
@@ -42,7 +42,7 @@ public:
     DocumentDBConfig::SP getConfig() const;
 
     void forwardConfig(const BootstrapConfigSP & config);
-    const config::ConfigKeySet createConfigKeySet(void) const;
+    const config::ConfigKeySet createConfigKeySet() const;
     void setExtraConfigKeys(const config::ConfigKeySet & extraConfigKeys) { _extraConfigKeys = extraConfigKeys; }
     const config::ConfigKeySet & getExtraConfigKeys() const { return _extraConfigKeys; }
     const vespalib::string & getConfigId() const { return _configId; }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
index 09c68c567fa..a3566de66b9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
@@ -138,7 +138,7 @@ void DocumentRetriever::populate(DocumentIdT lid, Document & doc) const
 }
 
 const IAttributeManager *
-DocumentRetriever::getAttrMgr(void) const
+DocumentRetriever::getAttrMgr() const
 {
     return &_attr_manager;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretriever.h b/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
index 7873c17401f..db085217a5d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretriever.h
@@ -34,7 +34,7 @@ private:
     PositionFields                   _possiblePositionFields;
     AttributeFields                  _attributeFields;
 
-    const search::IAttributeManager * getAttrMgr(void) const override;
+    const search::IAttributeManager * getAttrMgr() const override;
 };
 
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.cpp b/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.cpp
index 6f7e4423396..07a04905beb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.cpp
@@ -61,7 +61,7 @@ DocumentRetrieverBase::getDocumentMetaData(const DocumentId &id) const {
 
 
 const search::IAttributeManager *
-DocumentRetrieverBase::getAttrMgr(void) const
+DocumentRetrieverBase::getAttrMgr() const
 {
     return NULL;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.h b/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.h
index 63fcdcd1f98..d28b3e0ead2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretrieverbase.h
@@ -25,7 +25,7 @@ class DocumentRetrieverBase : public IDocumentRetriever
     const bool             _hasFields;
 
 protected:
-    virtual const search::IAttributeManager * getAttrMgr(void) const;
+    virtual const search::IAttributeManager * getAttrMgr() const;
 public:
     DocumentRetrieverBase(const DocTypeName &docTypeName,
                           const document::DocumentTypeRepo &repo,
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
index 4ecd9d55b94..cf085feaad9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h
@@ -130,11 +130,11 @@ public:
     initViews(const DocumentDBConfig &configSnapshot,
               const SessionManagerSP &sessionManager);
 
-    void clearViews(void);
-    void onReplayDone(void);
+    void clearViews();
+    void onReplayDone();
     void onReprocessDone(SerialNum serialNum);
-    SerialNum getOldestFlushedSerial(void);
-    SerialNum getNewestFlushedSerial(void);
+    SerialNum getOldestFlushedSerial();
+    SerialNum getNewestFlushedSerial();
 
     void pruneRemovedFields(SerialNum serialNum);
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/emptysearchview.h b/searchcore/src/vespa/searchcore/proton/server/emptysearchview.h
index 68d7a2e9190..7b7378dea45 100644
--- a/searchcore/src/vespa/searchcore/proton/server/emptysearchview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/emptysearchview.h
@@ -11,7 +11,7 @@ class EmptySearchView : public ISearchHandler
 public:
     typedef std::shared_ptr<EmptySearchView> SP;
 
-    EmptySearchView(void);
+    EmptySearchView();
 
     /**
      * Implements ISearchHandler
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index 9fa9ae27206..2f36f5140df 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -591,7 +591,7 @@ FeedHandler::flushDone(SerialNum flushedSerial)
                             flushedSerial)));
 }
 
-void FeedHandler::changeToNormalFeedState(void) {
+void FeedHandler::changeToNormalFeedState() {
     changeFeedState(FeedState::SP(new NormalState(*this)));
 }
 
@@ -743,7 +743,7 @@ FeedHandler::handleMove(MoveOperation &op)
 
 
 void
-FeedHandler::heartBeat(void)
+FeedHandler::heartBeat()
 {
     assert(_writeService.master().isCurrentThread());
     _activeFeedView->heartBeat(_serialNum);
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
index 726039e0be7..0d81cb2f6ae 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h
@@ -285,10 +285,10 @@ public:
      * Implements IHeartBeatHandler
      */
     virtual void
-    heartBeat(void) override;
+    heartBeat() override;
 
     virtual void
-    sync(void);
+    sync();
 
     /**
      * Implements TransLogClient::Session::Callback.
@@ -297,10 +297,10 @@ public:
     receive(const Packet &packet) override;
 
     virtual void
-    eof(void) override;
+    eof() override;
 
     virtual void
-    inSync(void) override;
+    inSync() override;
 
     /**
      * Implements IPruneRemovedDocumentsHandler
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index 80c8b8adac1..9c95b094623 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -268,13 +268,13 @@ FileConfigManager::FileConfigManager(const vespalib::string &baseDir,
 }
 
 
-FileConfigManager::~FileConfigManager(void)
+FileConfigManager::~FileConfigManager()
 {
 }
 
 
 SerialNum
-FileConfigManager::getBestSerialNum(void) const
+FileConfigManager::getBestSerialNum() const
 {
     Snapshot snap = _info.getBestSnapshot();
     return snap.valid ? snap.syncToken : UINT64_C(0);
@@ -282,7 +282,7 @@ FileConfigManager::getBestSerialNum(void) const
 
 
 SerialNum
-FileConfigManager::getOldestSerialNum(void) const
+FileConfigManager::getOldestSerialNum() const
 {
     SerialNum res = 0;
     const SnapshotList &snaps = _info.snapshots();
@@ -410,7 +410,7 @@ FileConfigManager::loadConfig(const DocumentDBConfig &currentSnapshot,
 
 
 void
-FileConfigManager::removeInvalid(void)
+FileConfigManager::removeInvalid()
 {
     typedef std::vector<SerialNum> RemVec;
     RemVec toRem;
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
index eb8b1a8c690..a8dfc139d4c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
@@ -34,7 +34,7 @@ public:
                       const vespalib::string &docTypeName);
 
     virtual
-    ~FileConfigManager(void);
+    ~FileConfigManager();
 
     virtual SerialNum getBestSerialNum() const override;
     virtual SerialNum getOldestSerialNum() const override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
index 6ecdbf8e51d..8080140deb3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
@@ -18,21 +18,21 @@ FlushHandlerProxy::FlushHandlerProxy(const DocumentDB::SP &documentDB)
 }
 
 
-FlushHandlerProxy::~FlushHandlerProxy(void)
+FlushHandlerProxy::~FlushHandlerProxy()
 {
     _documentDB->release();
 }
 
 
 std::vector<IFlushTarget::SP>
-FlushHandlerProxy::getFlushTargets(void)
+FlushHandlerProxy::getFlushTargets()
 {
     return _documentDB->getFlushTargets();
 }
 
 
 IFlushHandler::SerialNum
-FlushHandlerProxy::getCurrentSerialNumber(void) const
+FlushHandlerProxy::getCurrentSerialNumber() const
 {
     return _documentDB->getCurrentSerialNumber();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
index 0fcf29b50c6..402f4b5643a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
@@ -6,7 +6,7 @@
 namespace proton
 {
 
-IDocumentDBOwner::~IDocumentDBOwner(void)
+IDocumentDBOwner::~IDocumentDBOwner()
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h b/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
index 705f7ec8408..7ad0e218c85 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ifrozenbuckethandler.h
@@ -22,7 +22,7 @@ public:
         document::BucketId _bucketId;
     };
 
-    virtual ~IFrozenBucketHandler(void) { }
+    virtual ~IFrozenBucketHandler() { }
     virtual ExclusiveBucketGuard::UP acquireExclusiveBucket(document::BucketId bucket) = 0;
     virtual void addListener(IBucketFreezeListener *listener) = 0;
     virtual void removeListener(IBucketFreezeListener *listener) = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/server/iheartbeathandler.h b/searchcore/src/vespa/searchcore/proton/server/iheartbeathandler.h
index f863bcc7b4a..a9391f680d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/iheartbeathandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/iheartbeathandler.h
@@ -11,10 +11,10 @@ class IHeartBeatHandler
 {
 public:
     virtual void
-    heartBeat(void) = 0;
+    heartBeat() = 0;
 
     virtual
-    ~IHeartBeatHandler(void)
+    ~IHeartBeatHandler()
     {
     }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/ipruneremoveddocumentshandler.h b/searchcore/src/vespa/searchcore/proton/server/ipruneremoveddocumentshandler.h
index 3ff8dfcab2e..187ca882778 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ipruneremoveddocumentshandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ipruneremoveddocumentshandler.h
@@ -14,7 +14,7 @@ public:
     performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp) = 0;
 
     virtual
-    ~IPruneRemovedDocumentsHandler(void)
+    ~IPruneRemovedDocumentsHandler()
     {
     }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
index 16ed662b310..ef8efcbdea6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
@@ -6,7 +6,7 @@
 namespace proton
 {
 
-IReplayConfig::~IReplayConfig(void)
+IReplayConfig::~IReplayConfig()
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.h b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.h
index 6da62888208..9d15ad8acc4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.h
@@ -11,7 +11,7 @@ class IReplayConfig
 {
 public:
     virtual
-    ~IReplayConfig(void);
+    ~IReplayConfig();
 
     virtual void
     replayConfig(search::SerialNum serialNum) = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h b/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
index 165af7c3eee..edae33e45c1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
+++ b/searchcore/src/vespa/searchcore/proton/server/isummaryadapter.h
@@ -30,7 +30,7 @@ public:
     heartBeat(search::SerialNum serialNum) = 0;
 
     virtual const search::IDocumentStore &
-    getDocumentStore(void) const = 0;
+    getDocumentStore() const = 0;
 
     virtual std::unique_ptr<document::Document>
     get(const search::DocumentIdT lid,
diff --git a/searchcore/src/vespa/searchcore/proton/server/itlssyncer.h b/searchcore/src/vespa/searchcore/proton/server/itlssyncer.h
index f8c79d6485d..3f65e1b2d2f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/itlssyncer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/itlssyncer.h
@@ -12,7 +12,7 @@ namespace proton
 class ITlsSyncer
 {
 public:
-    virtual ~ITlsSyncer(void) = default;
+    virtual ~ITlsSyncer() = default;
     virtual void sync() = 0;
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
index 7bec456d0f5..8e9b711f627 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp
@@ -132,7 +132,7 @@ MaintenanceController::performClearJobs()
 
 
 void
-MaintenanceController::stop(void)
+MaintenanceController::stop()
 {
     assert(!_masterThread.isCurrentThread());
     _stopping = true;
@@ -160,7 +160,7 @@ MaintenanceController::start(const DocumentDBMaintenanceConfig::SP &config)
 
 
 void
-MaintenanceController::restart(void)
+MaintenanceController::restart()
 {
     // Called by master write thread
     if (!_started || _stopping || !_readySubDB.valid()) {
diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.h b/searchcore/src/vespa/searchcore/proton/server/matchview.h
index 984695867e6..9878205f354 100644
--- a/searchcore/src/vespa/searchcore/proton/server/matchview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/matchview.h
@@ -43,7 +43,7 @@ public:
     const IAttributeManager::SP & getAttributeManager() const { return _attrMgr; }
     const matching::SessionManager::SP & getSessionManager() const { return _sessionMgr; }
     const IDocumentMetaStoreContext::SP & getDocumentMetaStore() const { return _metaStore; }
-    DocIdLimit & getDocIdLimit(void) const { return _docIdLimit; }
+    DocIdLimit & getDocIdLimit() const { return _docIdLimit; }
 
     // Throws on error.
     matching::Matcher::SP getMatcher(const vespalib::string & rankProfile) const;
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
index 6d67a989df1..3d8b5c1363f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
@@ -65,7 +65,7 @@ PruneRemovedDocumentsJob::flush(DocId lowLid, DocId nextLowLid,
 
 
 bool
-PruneRemovedDocumentsJob::run(void)
+PruneRemovedDocumentsJob::run()
 {
     uint64_t tshz = 1000000;
     fastos::TimeStamp now = fastos::ClockSystem::now();
diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
index ba0ddaea310..1dd92922a36 100644
--- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
+++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
@@ -35,12 +35,12 @@ private:
         fastos::TimeStamp getCreateTime() const { return _createTime; }
         Session & setGen(int64_t gen) { _gen = gen; return *this; }
 
-        int64_t getNumDocs(void) const { return _numDocs; }
+        int64_t getNumDocs() const { return _numDocs; }
         void setNumDocs(int64_t numDocs) { _numDocs = numDocs; }
-        bool getDown(void) const { return _down; }
-        void setDown(void) { _down = true; }
+        bool getDown() const { return _down; }
+        void setDown() { _down = true; }
 
-        const vespalib::string & getDelayedConfigs(void) const {
+        const vespalib::string & getDelayedConfigs() const {
             return _delayedConfigs;
         }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp
index 8bb6b29b73a..a653f479cf4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp
@@ -17,7 +17,7 @@ SearchHandlerProxy::SearchHandlerProxy(const DocumentDB::SP &documentDB)
     _documentDB->retain();
 }
 
-SearchHandlerProxy::~SearchHandlerProxy(void)
+SearchHandlerProxy::~SearchHandlerProxy()
 {
     _documentDB->release();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
index 2b7f5ff7944..217657e9df5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.cpp
@@ -81,7 +81,7 @@ TransactionLogManagerBase::internalStartReplay()
 
 
 void
-TransactionLogManagerBase::markReplayStarted(void)
+TransactionLogManagerBase::markReplayStarted()
 {
     vespalib::MonitorGuard guard(_replayMonitor);
     _replayStarted = true;
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
index 8c1de1fb14f..4d56b912f36 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanagerbase.h
@@ -68,7 +68,7 @@ public:
     { return _tlc.getRPCTarget(); }
 
     void
-    markReplayStarted(void);
+    markReplayStarted();
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/util/autoptr.h b/searchcore/src/vespa/searchcore/util/autoptr.h
index 9fe58babe3a..e2a3a560b70 100644
--- a/searchcore/src/vespa/searchcore/util/autoptr.h
+++ b/searchcore/src/vespa/searchcore/util/autoptr.h
@@ -12,23 +12,23 @@ private:
     FastS_AutoPtr& operator=(const FastS_AutoPtr &);
 
     T *_val;
-    void Clean(void) {
+    void Clean() {
         if (_val != NULL) {
             delete _val;
             _val = NULL;
         }
     }
 public:
-    FastS_AutoPtr(void) : _val(NULL) { }
+    FastS_AutoPtr() : _val(NULL) { }
     explicit FastS_AutoPtr(T *val)
         : _val(val)
     {
     }
-    ~FastS_AutoPtr(void) { Clean(); }
+    ~FastS_AutoPtr() { Clean(); }
     void Set(T *val) { Clean(); _val = val; }
-    T *Get(void) const { return _val; }
-    T *HandOver(void) { T *ret = _val; _val = NULL; return ret; }
-    void Drop(void) {
+    T *Get() const { return _val; }
+    T *HandOver() { T *ret = _val; _val = NULL; return ret; }
+    void Drop() {
         if (_val != NULL) {
             delete _val;
             _val = NULL;
@@ -45,14 +45,14 @@ private:
     FastS_AutoRefCntPtr& operator=(const FastS_AutoRefCntPtr &);
 
     T *_val;
-    void Clean(void) {
+    void Clean() {
         if (_val != NULL)
             _val->subRef();
     }
 public:
-    FastS_AutoRefCntPtr(void) : _val(NULL) { }
+    FastS_AutoRefCntPtr() : _val(NULL) { }
     explicit FastS_AutoRefCntPtr(T *val) {_val = val; }
-    ~FastS_AutoRefCntPtr(void) { Clean(); }
+    ~FastS_AutoRefCntPtr() { Clean(); }
     void Set(T *val) { Clean(); _val = val; }
     void SetDup(T *val) {
         Clean();
@@ -60,14 +60,14 @@ public:
             val->addRef();
         _val = val;
     }
-    T *Get(void) const { return _val; }
-    T *GetDup(void) {
+    T *Get() const { return _val; }
+    T *GetDup() {
         if (_val != NULL)
             _val->addRef();
         return _val;
     }
-    T *HandOver(void) { T *ret = _val; _val = NULL; return ret; }
-    void Drop(void) {
+    T *HandOver() { T *ret = _val; _val = NULL; return ret; }
+    void Drop() {
         if (_val != NULL) {
             _val->subRef();
             _val = NULL;
@@ -83,12 +83,12 @@ private:
     FastS_AutoCharPtr& operator=(const FastS_AutoCharPtr &);
 
     char *_val;
-    void Clean(void) {
+    void Clean() {
         if (_val != NULL)
             free(_val);
     }
 public:
-    FastS_AutoCharPtr(void)
+    FastS_AutoCharPtr()
         : _val(NULL)
     {
     }
@@ -96,11 +96,11 @@ public:
         : _val(val)
     {
     }
-    ~FastS_AutoCharPtr(void) { Clean(); }
+    ~FastS_AutoCharPtr() { Clean(); }
     void Set(char *val) { Clean(); _val = val; }
-    char *Get(void) const { return _val; }
-    char *HandOver(void)  { char *ret = _val; _val = NULL; return ret; }
-    void Drop(void) {
+    char *Get() const { return _val; }
+    char *HandOver()  { char *ret = _val; _val = NULL; return ret; }
+    void Drop() {
         if (_val != NULL) {
             free(_val);
             _val = NULL;