diff --git a/arangod/Agency/AgencyComm.h b/arangod/Agency/AgencyComm.h
index 6e8c9f7d4a..259510ed43 100644
--- a/arangod/Agency/AgencyComm.h
+++ b/arangod/Agency/AgencyComm.h
@@ -401,7 +401,7 @@ struct AgencyWriteTransaction : public AgencyTransaction {
               std::back_inserter(preconditions));
   }
 
-  AgencyWriteTransaction() : clientId(randomClientId()) {};
+  AgencyWriteTransaction() : clientId(randomClientId()) {}
 
   void toVelocyPack(arangodb::velocypack::Builder& builder) const override final;
 
diff --git a/arangod/Agency/AgentInterface.h b/arangod/Agency/AgentInterface.h
index bbf5e40873..06edf47489 100644
--- a/arangod/Agency/AgentInterface.h
+++ b/arangod/Agency/AgentInterface.h
@@ -37,7 +37,7 @@ class AgentInterface {
     bool _discardStartup;
     bool _privileged;
     WriteMode(bool d = false, bool p = false)
-        : _discardStartup(d), _privileged(p){};
+        : _discardStartup(d), _privileged(p) {}
     bool privileged() const { return _privileged; }
     bool discardStartup() const { return _discardStartup; }
   };
diff --git a/arangod/Aql/EnumerateListExecutor.cpp b/arangod/Aql/EnumerateListExecutor.cpp
index f4a564dd1d..d967725401 100644
--- a/arangod/Aql/EnumerateListExecutor.cpp
+++ b/arangod/Aql/EnumerateListExecutor.cpp
@@ -58,7 +58,7 @@ EnumerateListExecutor::EnumerateListExecutor(Fetcher& fetcher, EnumerateListExec
       _currentRow{CreateInvalidInputRowHint{}},
       _rowState(ExecutionState::HASMORE),
       _inputArrayPosition(0),
-      _inputArrayLength(0){};
+      _inputArrayLength(0) {}
 
 std::pair<ExecutionState, NoStats> EnumerateListExecutor::produceRows(OutputAqlItemRow& output) {
   while (true) {
diff --git a/arangod/Aql/IdExecutor.cpp b/arangod/Aql/IdExecutor.cpp
index 7dd9fcb93f..ed2d90dc15 100644
--- a/arangod/Aql/IdExecutor.cpp
+++ b/arangod/Aql/IdExecutor.cpp
@@ -43,7 +43,7 @@ IdExecutorInfos::IdExecutorInfos(RegisterId nrInOutRegisters,
 
 template <class UsedFetcher>
 IdExecutor<UsedFetcher>::IdExecutor(Fetcher& fetcher, IdExecutorInfos& infos)
-    : _fetcher(fetcher){};
+    : _fetcher(fetcher) {}
 
 template <class UsedFetcher>
 IdExecutor<UsedFetcher>::~IdExecutor() = default;
diff --git a/arangod/Aql/ReturnExecutor.cpp b/arangod/Aql/ReturnExecutor.cpp
index 2e7953b94e..4a03e876a7 100644
--- a/arangod/Aql/ReturnExecutor.cpp
+++ b/arangod/Aql/ReturnExecutor.cpp
@@ -42,6 +42,6 @@ ReturnExecutorInfos::ReturnExecutorInfos(RegisterId inputRegister, RegisterId nr
       _doCount(doCount) {}
 
 ReturnExecutor::ReturnExecutor(Fetcher& fetcher, ReturnExecutorInfos& infos)
-    : _infos(infos), _fetcher(fetcher){};
+    : _infos(infos), _fetcher(fetcher) {}
 
 ReturnExecutor::~ReturnExecutor() = default;
diff --git a/arangod/Aql/SortExecutor.cpp b/arangod/Aql/SortExecutor.cpp
index cf1b5188cf..4f0f5ad258 100644
--- a/arangod/Aql/SortExecutor.cpp
+++ b/arangod/Aql/SortExecutor.cpp
@@ -109,7 +109,7 @@ std::vector<SortRegister>& SortExecutorInfos::sortRegisters() {
 bool SortExecutorInfos::stable() const { return _stable; }
 
 SortExecutor::SortExecutor(Fetcher& fetcher, SortExecutorInfos& infos)
-    : _infos(infos), _fetcher(fetcher), _input(nullptr), _returnNext(0){};
+    : _infos(infos), _fetcher(fetcher), _input(nullptr), _returnNext(0) {}
 SortExecutor::~SortExecutor() = default;
 
 std::pair<ExecutionState, NoStats> SortExecutor::produceRows(OutputAqlItemRow& output) {
diff --git a/arangod/Cluster/ClusterComm.cpp b/arangod/Cluster/ClusterComm.cpp
index 0a764029f2..220daee94e 100644
--- a/arangod/Cluster/ClusterComm.cpp
+++ b/arangod/Cluster/ClusterComm.cpp
@@ -605,8 +605,8 @@ std::unique_ptr<ClusterCommResult> ClusterComm::syncRequest(
     std::atomic<bool> wasSignaled;
 
     SharedVariables() = delete;
-    SharedVariables(ClusterCommResult * preparedResult)
-      : result(preparedResult), wasSignaled(false) {};
+    explicit SharedVariables(ClusterCommResult* preparedResult)
+      : result(preparedResult), wasSignaled(false) {}
   };
 
   // this shared_ptr is not atomic (until c++20), careful
diff --git a/arangod/Cluster/ClusterRepairOperations.cpp b/arangod/Cluster/ClusterRepairOperations.cpp
index 6281662780..daa045f0cd 100644
--- a/arangod/Cluster/ClusterRepairOperations.cpp
+++ b/arangod/Cluster/ClusterRepairOperations.cpp
@@ -251,7 +251,7 @@ class StreamRepairOperationVisitor : public boost::static_visitor<std::ostream&>
   StreamRepairOperationVisitor() = delete;
 
   explicit StreamRepairOperationVisitor(std::ostream& stream_)
-      : _stream(stream_){};
+      : _stream(stream_) {}
 
   std::ostream& operator()(BeginRepairsOperation const& op) {
     return _stream << op;
diff --git a/arangod/Cluster/CreateDatabase.cpp b/arangod/Cluster/CreateDatabase.cpp
index 55112e39cc..345e2a67f9 100644
--- a/arangod/Cluster/CreateDatabase.cpp
+++ b/arangod/Cluster/CreateDatabase.cpp
@@ -55,7 +55,7 @@ CreateDatabase::CreateDatabase(MaintenanceFeature& feature, ActionDescription co
   }
 }
 
-CreateDatabase::~CreateDatabase(){};
+CreateDatabase::~CreateDatabase() {}
 
 bool CreateDatabase::first() {
   VPackSlice users;
diff --git a/arangod/Cluster/DropCollection.cpp b/arangod/Cluster/DropCollection.cpp
index a6645e0921..0badaa4ac5 100644
--- a/arangod/Cluster/DropCollection.cpp
+++ b/arangod/Cluster/DropCollection.cpp
@@ -60,7 +60,7 @@ DropCollection::DropCollection(MaintenanceFeature& feature, ActionDescription co
   }
 }
 
-DropCollection::~DropCollection(){};
+DropCollection::~DropCollection() {}
 
 bool DropCollection::first() {
   auto const& database = _description.get(DATABASE);
diff --git a/arangod/Cluster/DropDatabase.cpp b/arangod/Cluster/DropDatabase.cpp
index 5a5be73e24..44e00f4878 100644
--- a/arangod/Cluster/DropDatabase.cpp
+++ b/arangod/Cluster/DropDatabase.cpp
@@ -53,7 +53,7 @@ DropDatabase::DropDatabase(MaintenanceFeature& feature, ActionDescription const&
   }
 }
 
-DropDatabase::~DropDatabase(){};
+DropDatabase::~DropDatabase() {}
 
 bool DropDatabase::first() {
   std::string const database = _description.get(DATABASE);
diff --git a/arangod/Cluster/DropIndex.cpp b/arangod/Cluster/DropIndex.cpp
index 36568a924f..6c57a45fa4 100644
--- a/arangod/Cluster/DropIndex.cpp
+++ b/arangod/Cluster/DropIndex.cpp
@@ -63,7 +63,7 @@ DropIndex::DropIndex(MaintenanceFeature& feature, ActionDescription const& d)
   }
 }
 
-DropIndex::~DropIndex(){};
+DropIndex::~DropIndex() {}
 
 bool DropIndex::first() {
   auto const& database = _description.get(DATABASE);
diff --git a/arangod/Cluster/MaintenanceFeature.h b/arangod/Cluster/MaintenanceFeature.h
index 7681c4fda1..e008605b99 100644
--- a/arangod/Cluster/MaintenanceFeature.h
+++ b/arangod/Cluster/MaintenanceFeature.h
@@ -82,7 +82,7 @@ class MaintenanceFeature : public application_features::ApplicationFeature {
   virtual void stop() override;
 
   // shut down the feature
-  virtual void unprepare() override{};
+  virtual void unprepare() override {}
 
   //
   // api features
diff --git a/arangod/Cluster/ResignShardLeadership.cpp b/arangod/Cluster/ResignShardLeadership.cpp
index 79a5c6db78..0f92dffa51 100644
--- a/arangod/Cluster/ResignShardLeadership.cpp
+++ b/arangod/Cluster/ResignShardLeadership.cpp
@@ -72,7 +72,7 @@ ResignShardLeadership::ResignShardLeadership(MaintenanceFeature& feature,
   }
 }
 
-ResignShardLeadership::~ResignShardLeadership(){};
+ResignShardLeadership::~ResignShardLeadership() {}
 
 bool ResignShardLeadership::first() {
   std::string const& database = _description.get(DATABASE);
diff --git a/arangod/Cluster/SynchronizeShard.cpp b/arangod/Cluster/SynchronizeShard.cpp
index 344f33aa6b..d43d8db766 100644
--- a/arangod/Cluster/SynchronizeShard.cpp
+++ b/arangod/Cluster/SynchronizeShard.cpp
@@ -123,7 +123,7 @@ SynchronizeShard::~SynchronizeShard() {}
 
 class SynchronizeShardCallback : public arangodb::ClusterCommCallback {
  public:
-  explicit SynchronizeShardCallback(SynchronizeShard* callie){};
+  explicit SynchronizeShardCallback(SynchronizeShard* callee) {}
   virtual bool operator()(arangodb::ClusterCommResult*) override final {
     return true;
   }
diff --git a/arangod/Cluster/UpdateCollection.cpp b/arangod/Cluster/UpdateCollection.cpp
index f48a1399c5..cc1a15f271 100644
--- a/arangod/Cluster/UpdateCollection.cpp
+++ b/arangod/Cluster/UpdateCollection.cpp
@@ -143,7 +143,7 @@ void handleLeadership(LogicalCollection& collection, std::string const& localLea
   }
 }
 
-UpdateCollection::~UpdateCollection(){};
+UpdateCollection::~UpdateCollection() {}
 
 bool UpdateCollection::first() {
   auto const& database = _description.get(DATABASE);
diff --git a/arangod/Graph/GraphCache.cpp b/arangod/Graph/GraphCache.cpp
index 0614d4c60c..3ea14b3efc 100644
--- a/arangod/Graph/GraphCache.cpp
+++ b/arangod/Graph/GraphCache.cpp
@@ -55,7 +55,7 @@ struct Success {
   std::shared_ptr<Graph const> graph;
 
   explicit Success(std::shared_ptr<Graph const> graph_)
-      : graph(std::move(graph_)){};
+      : graph(std::move(graph_)) {}
   Success& operator=(Success const& other) = default;
   Success() = delete;
 };
diff --git a/arangod/Graph/GraphManager.h b/arangod/Graph/GraphManager.h
index ad12aaba8b..62217f6c2e 100644
--- a/arangod/Graph/GraphManager.h
+++ b/arangod/Graph/GraphManager.h
@@ -62,7 +62,7 @@ class GraphManager {
 
  public:
   explicit GraphManager(TRI_vocbase_t& vocbase)
-      : GraphManager(vocbase, false){};
+      : GraphManager(vocbase, false) {}
 
   GraphManager(TRI_vocbase_t& vocbase, bool isInTransaction)
       : _vocbase(vocbase), _isInTransaction(isInTransaction) {}