diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc
index 1bbca1659b..79a93388a7 100644
--- a/src/DNS_Mgr.cc
+++ b/src/DNS_Mgr.cc
@@ -206,7 +206,7 @@ class DNS_Request
 public:
 	DNS_Request(std::string host, int request_type, bool async = false);
 	DNS_Request(const IPAddr& addr, bool async = false);
-	~DNS_Request();
+	~DNS_Request() = default;
 
 	std::string Host() const { return host; }
 	const IPAddr& Addr() const { return addr; }
@@ -241,8 +241,6 @@ DNS_Request::DNS_Request(const IPAddr& addr, bool async) : addr(addr), async(asy
 	request_type = T_PTR;
 	}
 
-DNS_Request::~DNS_Request() { }
-
 void DNS_Request::MakeRequest(ares_channel channel, DNS_Mgr* mgr)
 	{
 	// This needs to get deleted at the end of the callback method.
diff --git a/src/Dict.cc b/src/Dict.cc
index a1540787dd..a8fc362f12 100644
--- a/src/Dict.cc
+++ b/src/Dict.cc
@@ -340,7 +340,7 @@ class DictTestDummy
 	{
 public:
 	DictTestDummy(int v) : v(v) { }
-	~DictTestDummy() { }
+	~DictTestDummy() = default;
 	int v = 0;
 	};
 
diff --git a/src/Discard.cc b/src/Discard.cc
index 4ccf71f1df..d55c718b52 100644
--- a/src/Discard.cc
+++ b/src/Discard.cc
@@ -27,8 +27,6 @@ Discarder::Discarder()
 	discarder_maxlen = static_cast<int>(id::find_val("discarder_maxlen")->AsCount());
 	}
 
-Discarder::~Discarder() { }
-
 bool Discarder::IsActive()
 	{
 	return check_ip || check_tcp || check_udp || check_icmp;
diff --git a/src/Discard.h b/src/Discard.h
index 9f082bdccc..2aa3dc4bf8 100644
--- a/src/Discard.h
+++ b/src/Discard.h
@@ -18,11 +18,11 @@ using FuncPtr = IntrusivePtr<Func>;
 namespace detail
 	{
 
-class Discarder
+class Discarder final
 	{
 public:
 	Discarder();
-	~Discarder();
+	~Discarder() = default;
 
 	bool IsActive();
 
diff --git a/src/EventRegistry.cc b/src/EventRegistry.cc
index 7a3d1c5081..1b4cb963b9 100644
--- a/src/EventRegistry.cc
+++ b/src/EventRegistry.cc
@@ -169,8 +169,6 @@ EventGroupPtr EventRegistry::LookupGroup(EventGroupKind kind, std::string_view n
 
 EventGroup::EventGroup(EventGroupKind kind, std::string_view name) : kind(kind), name(name) { }
 
-EventGroup::~EventGroup() noexcept { }
-
 // Run through all ScriptFunc instances associated with this group and
 // update their bodies after a group's enable/disable state has changed.
 // Once that has completed, also update the Func's has_enabled_bodies
diff --git a/src/EventRegistry.h b/src/EventRegistry.h
index f79951224d..b1189f5a5e 100644
--- a/src/EventRegistry.h
+++ b/src/EventRegistry.h
@@ -37,7 +37,7 @@ using ScriptFuncPtr = zeek::IntrusivePtr<ScriptFunc>;
 	}
 
 // The registry keeps track of all events that we provide or handle.
-class EventRegistry
+class EventRegistry final
 	{
 public:
 	EventRegistry();
@@ -135,11 +135,11 @@ private:
  * bodies of the tracked ScriptFuncs and updates them to reflect the current
  * group state.
  */
-class EventGroup
+class EventGroup final
 	{
 public:
 	EventGroup(EventGroupKind kind, std::string_view name);
-	~EventGroup() noexcept;
+	~EventGroup() noexcept = default;
 	EventGroup(const EventGroup& g) = delete;
 	EventGroup& operator=(const EventGroup&) = delete;
 
diff --git a/src/EventTrace.cc b/src/EventTrace.cc
index ff52f079da..baac235a57 100644
--- a/src/EventTrace.cc
+++ b/src/EventTrace.cc
@@ -101,8 +101,6 @@ ValTrace::ValTrace(const ValPtr& _v) : v(_v)
 		}
 	}
 
-ValTrace::~ValTrace() { }
-
 bool ValTrace::operator==(const ValTrace& vt) const
 	{
 	auto& vt_v = vt.GetVal();
diff --git a/src/EventTrace.h b/src/EventTrace.h
index d958cd058d..092f2badd6 100644
--- a/src/EventTrace.h
+++ b/src/EventTrace.h
@@ -47,7 +47,7 @@ class ValTrace
 	{
 public:
 	ValTrace(const ValPtr& v);
-	~ValTrace();
+	~ValTrace() = default;
 
 	const ValPtr& GetVal() const { return v; }
 	const TypePtr& GetType() const { return t; }
diff --git a/src/Expr.cc b/src/Expr.cc
index 1d490c22f8..96bbefaa76 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -4237,8 +4237,6 @@ TableCoerceExpr::TableCoerceExpr(ExprPtr arg_op, TableTypePtr tt, bool type_chec
 		ExprError("coercion of non-table/set to table/set");
 	}
 
-TableCoerceExpr::~TableCoerceExpr() { }
-
 ValPtr TableCoerceExpr::Fold(Val* v) const
 	{
 	TableVal* tv = v->AsTableVal();
@@ -4264,8 +4262,6 @@ VectorCoerceExpr::VectorCoerceExpr(ExprPtr arg_op, VectorTypePtr v)
 		ExprError("coercion of non-vector to vector");
 	}
 
-VectorCoerceExpr::~VectorCoerceExpr() { }
-
 ValPtr VectorCoerceExpr::Fold(Val* v) const
 	{
 	VectorVal* vv = v->AsVectorVal();
@@ -4281,8 +4277,6 @@ ScheduleTimer::ScheduleTimer(const EventHandlerPtr& arg_event, Args arg_args, do
 	{
 	}
 
-ScheduleTimer::~ScheduleTimer() { }
-
 void ScheduleTimer::Dispatch(double /* t */, bool /* is_expire */)
 	{
 	if ( event )
diff --git a/src/Expr.h b/src/Expr.h
index 5b3f5ec6ef..b92ae708c8 100644
--- a/src/Expr.h
+++ b/src/Expr.h
@@ -1330,7 +1330,7 @@ class TableCoerceExpr final : public UnaryExpr
 	{
 public:
 	TableCoerceExpr(ExprPtr op, TableTypePtr r, bool type_check = true);
-	~TableCoerceExpr() override;
+	~TableCoerceExpr() override = default;
 
 	// Optimization-related:
 	ExprPtr Duplicate() override;
@@ -1343,7 +1343,7 @@ class VectorCoerceExpr final : public UnaryExpr
 	{
 public:
 	VectorCoerceExpr(ExprPtr op, VectorTypePtr v);
-	~VectorCoerceExpr() override;
+	~VectorCoerceExpr() override = default;
 
 	// Optimization-related:
 	ExprPtr Duplicate() override;
@@ -1356,7 +1356,7 @@ class ScheduleTimer final : public Timer
 	{
 public:
 	ScheduleTimer(const EventHandlerPtr& event, zeek::Args args, double t);
-	~ScheduleTimer() override;
+	~ScheduleTimer() override = default;
 
 	void Dispatch(double t, bool is_expire) override;
 
diff --git a/src/Func.cc b/src/Func.cc
index feca7bbdeb..2afe542c0f 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -801,8 +801,6 @@ BuiltinFunc::BuiltinFunc(built_in_func arg_func, const char* arg_name, bool arg_
 	id->SetConst();
 	}
 
-BuiltinFunc::~BuiltinFunc() { }
-
 bool BuiltinFunc::IsPure() const
 	{
 	return is_pure;
diff --git a/src/Func.h b/src/Func.h
index e1b8f7995b..bdf725598d 100644
--- a/src/Func.h
+++ b/src/Func.h
@@ -336,7 +336,7 @@ class BuiltinFunc final : public Func
 	{
 public:
 	BuiltinFunc(built_in_func func, const char* name, bool is_pure);
-	~BuiltinFunc() override;
+	~BuiltinFunc() override = default;
 
 	bool IsPure() const override;
 	ValPtr Invoke(zeek::Args* args, Frame* parent) const override;
diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc
index f4ddc8867b..d02a740a61 100644
--- a/src/OpaqueVal.cc
+++ b/src/OpaqueVal.cc
@@ -50,8 +50,6 @@ OpaqueMgr* OpaqueMgr::mgr()
 
 OpaqueVal::OpaqueVal(OpaqueTypePtr t) : Val(std::move(t)) { }
 
-OpaqueVal::~OpaqueVal() { }
-
 const std::string& OpaqueMgr::TypeID(const OpaqueVal* v) const
 	{
 	auto x = _types.find(v->OpaqueName());
diff --git a/src/OpaqueVal.h b/src/OpaqueVal.h
index 0e33db0d88..94dbb59035 100644
--- a/src/OpaqueVal.h
+++ b/src/OpaqueVal.h
@@ -118,7 +118,7 @@ class OpaqueVal : public Val
 	{
 public:
 	explicit OpaqueVal(OpaqueTypePtr t);
-	~OpaqueVal() override;
+	~OpaqueVal() override = default;
 
 	/**
 	 * Serializes the value into a Broker representation.
diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc
index f8c67a3c52..5d2b17fc7a 100644
--- a/src/SerializationFormat.cc
+++ b/src/SerializationFormat.cc
@@ -103,10 +103,6 @@ bool SerializationFormat::WriteData(const void* b, size_t count)
 	return true;
 	}
 
-BinarySerializationFormat::BinarySerializationFormat() { }
-
-BinarySerializationFormat::~BinarySerializationFormat() { }
-
 bool BinarySerializationFormat::Read(int* v, const char* tag)
 	{
 	uint32_t tmp;
diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h
index 44215792bb..1b3c1f03f5 100644
--- a/src/SerializationFormat.h
+++ b/src/SerializationFormat.h
@@ -106,8 +106,8 @@ protected:
 class BinarySerializationFormat final : public SerializationFormat
 	{
 public:
-	BinarySerializationFormat();
-	~BinarySerializationFormat() override;
+	BinarySerializationFormat() = default;
+	~BinarySerializationFormat() override = default;
 
 	bool Read(int* v, const char* tag) override;
 	bool Read(uint16_t* v, const char* tag) override;
diff --git a/src/Val.cc b/src/Val.cc
index 6c9e214bc2..581e971a72 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -1563,8 +1563,6 @@ ListVal::ListVal(TypeTag t) : Val(make_intrusive<TypeList>(t == TYPE_ANY ? nullp
 	tag = t;
 	}
 
-ListVal::~ListVal() { }
-
 ValPtr ListVal::SizeVal() const
 	{
 	return val_mgr->Count(vals.size());
diff --git a/src/Val.h b/src/Val.h
index 6909f4807c..71b4eee1b4 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -663,7 +663,7 @@ class ListVal final : public Val
 public:
 	explicit ListVal(TypeTag t);
 
-	~ListVal() override;
+	~ListVal() override = default;
 
 	TypeTag BaseTag() const { return tag; }
 
diff --git a/src/analyzer/protocol/conn-size/ConnSize.cc b/src/analyzer/protocol/conn-size/ConnSize.cc
index 47c6606e96..47e15c1a1c 100644
--- a/src/analyzer/protocol/conn-size/ConnSize.cc
+++ b/src/analyzer/protocol/conn-size/ConnSize.cc
@@ -21,8 +21,6 @@ ConnSize_Analyzer::ConnSize_Analyzer(Connection* c)
 	start_time = c->StartTime();
 	}
 
-ConnSize_Analyzer::~ConnSize_Analyzer() { }
-
 void ConnSize_Analyzer::Init()
 	{
 	Analyzer::Init();
diff --git a/src/analyzer/protocol/conn-size/ConnSize.h b/src/analyzer/protocol/conn-size/ConnSize.h
index f8b748190a..7c48aec2fc 100644
--- a/src/analyzer/protocol/conn-size/ConnSize.h
+++ b/src/analyzer/protocol/conn-size/ConnSize.h
@@ -12,7 +12,7 @@ class ConnSize_Analyzer : public analyzer::Analyzer
 	{
 public:
 	explicit ConnSize_Analyzer(Connection* c);
-	~ConnSize_Analyzer() override;
+	~ConnSize_Analyzer() override = default;
 
 	void Init() override;
 	void Done() override;
diff --git a/src/analyzer/protocol/dnp3/DNP3.cc b/src/analyzer/protocol/dnp3/DNP3.cc
index 3f589aa616..626201a865 100644
--- a/src/analyzer/protocol/dnp3/DNP3.cc
+++ b/src/analyzer/protocol/dnp3/DNP3.cc
@@ -403,8 +403,6 @@ DNP3_TCP_Analyzer::DNP3_TCP_Analyzer(Connection* c)
 	{
 	}
 
-DNP3_TCP_Analyzer::~DNP3_TCP_Analyzer() { }
-
 void DNP3_TCP_Analyzer::Done()
 	{
 	TCP_ApplicationAnalyzer::Done();
@@ -444,8 +442,6 @@ void DNP3_TCP_Analyzer::EndpointEOF(bool is_orig)
 
 DNP3_UDP_Analyzer::DNP3_UDP_Analyzer(Connection* c) : DNP3_Base(this), Analyzer("DNP3_UDP", c) { }
 
-DNP3_UDP_Analyzer::~DNP3_UDP_Analyzer() { }
-
 void DNP3_UDP_Analyzer::DeliverPacket(int len, const u_char* data, bool orig, uint64_t seq,
                                       const IP_Hdr* ip, int caplen)
 	{
diff --git a/src/analyzer/protocol/dnp3/DNP3.h b/src/analyzer/protocol/dnp3/DNP3.h
index d40600407a..c8ee54c1e5 100644
--- a/src/analyzer/protocol/dnp3/DNP3.h
+++ b/src/analyzer/protocol/dnp3/DNP3.h
@@ -71,7 +71,7 @@ class DNP3_TCP_Analyzer : public detail::DNP3_Base, public analyzer::tcp::TCP_Ap
 	{
 public:
 	explicit DNP3_TCP_Analyzer(Connection* conn);
-	~DNP3_TCP_Analyzer() override;
+	~DNP3_TCP_Analyzer() override = default;
 
 	void Done() override;
 	void DeliverStream(int len, const u_char* data, bool orig) override;
@@ -85,7 +85,7 @@ class DNP3_UDP_Analyzer : public detail::DNP3_Base, public analyzer::Analyzer
 	{
 public:
 	explicit DNP3_UDP_Analyzer(Connection* conn);
-	~DNP3_UDP_Analyzer() override;
+	~DNP3_UDP_Analyzer() override = default;
 
 	void DeliverPacket(int len, const u_char* data, bool orig, uint64_t seq, const IP_Hdr* ip,
 	                   int caplen) override;
diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc
index 34cdd92ba6..582c91bbe8 100644
--- a/src/analyzer/protocol/login/RSH.cc
+++ b/src/analyzer/protocol/login/RSH.cc
@@ -30,8 +30,6 @@ Contents_Rsh_Analyzer::Contents_Rsh_Analyzer(Connection* conn, bool orig,
 		}
 	}
 
-Contents_Rsh_Analyzer::~Contents_Rsh_Analyzer() { }
-
 void Contents_Rsh_Analyzer::DoDeliver(int len, const u_char* data)
 	{
 	int endp_state;
diff --git a/src/analyzer/protocol/login/RSH.h b/src/analyzer/protocol/login/RSH.h
index 3fdc0d765c..334449338f 100644
--- a/src/analyzer/protocol/login/RSH.h
+++ b/src/analyzer/protocol/login/RSH.h
@@ -28,7 +28,7 @@ class Contents_Rsh_Analyzer final : public analyzer::tcp::ContentLine_Analyzer
 	{
 public:
 	Contents_Rsh_Analyzer(Connection* conn, bool orig, Rsh_Analyzer* analyzer);
-	~Contents_Rsh_Analyzer() override;
+	~Contents_Rsh_Analyzer() override = default;
 
 	rsh_state RshSaveState() const { return save_state; }
 
diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc
index 3b7fc0ce29..406f6aad45 100644
--- a/src/analyzer/protocol/login/Rlogin.cc
+++ b/src/analyzer/protocol/login/Rlogin.cc
@@ -26,8 +26,6 @@ Contents_Rlogin_Analyzer::Contents_Rlogin_Analyzer(Connection* conn, bool orig,
 		state = save_state = RLOGIN_SERVER_ACK;
 	}
 
-Contents_Rlogin_Analyzer::~Contents_Rlogin_Analyzer() { }
-
 void Contents_Rlogin_Analyzer::DoDeliver(int len, const u_char* data)
 	{
 	int endp_state;
diff --git a/src/analyzer/protocol/login/Rlogin.h b/src/analyzer/protocol/login/Rlogin.h
index 24968564d2..b4030f9f33 100644
--- a/src/analyzer/protocol/login/Rlogin.h
+++ b/src/analyzer/protocol/login/Rlogin.h
@@ -36,7 +36,7 @@ class Contents_Rlogin_Analyzer final : public analyzer::tcp::ContentLine_Analyze
 	{
 public:
 	Contents_Rlogin_Analyzer(Connection* conn, bool orig, Rlogin_Analyzer* analyzer);
-	~Contents_Rlogin_Analyzer() override;
+	~Contents_Rlogin_Analyzer() override = default;
 
 	void SetPeer(Contents_Rlogin_Analyzer* arg_peer) { peer = arg_peer; }
 
diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc
index fd00345bb5..76701c815e 100644
--- a/src/analyzer/protocol/ncp/NCP.cc
+++ b/src/analyzer/protocol/ncp/NCP.cc
@@ -169,8 +169,6 @@ Contents_NCP_Analyzer::Contents_NCP_Analyzer(Connection* conn, bool orig,
 	resync_set = false;
 	}
 
-Contents_NCP_Analyzer::~Contents_NCP_Analyzer() { }
-
 void Contents_NCP_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
 	{
 	analyzer::tcp::TCP_SupportAnalyzer::DeliverStream(len, data, orig);
diff --git a/src/analyzer/protocol/ncp/NCP.h b/src/analyzer/protocol/ncp/NCP.h
index 2ad61a0e74..d5f05672d3 100644
--- a/src/analyzer/protocol/ncp/NCP.h
+++ b/src/analyzer/protocol/ncp/NCP.h
@@ -91,7 +91,7 @@ class Contents_NCP_Analyzer : public analyzer::tcp::TCP_SupportAnalyzer
 	{
 public:
 	Contents_NCP_Analyzer(Connection* conn, bool orig, detail::NCP_Session* session);
-	~Contents_NCP_Analyzer() override;
+	~Contents_NCP_Analyzer() override = default;
 
 protected:
 	void DeliverStream(int len, const u_char* data, bool orig) override;
diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc
index 2890225bb8..cc5a976316 100644
--- a/src/analyzer/protocol/pop3/POP3.cc
+++ b/src/analyzer/protocol/pop3/POP3.cc
@@ -52,8 +52,6 @@ POP3_Analyzer::POP3_Analyzer(Connection* conn)
 	AddSupportAnalyzer(cl_resp);
 	}
 
-POP3_Analyzer::~POP3_Analyzer() { }
-
 void POP3_Analyzer::Done()
 	{
 	analyzer::tcp::TCP_ApplicationAnalyzer::Done();
diff --git a/src/analyzer/protocol/pop3/POP3.h b/src/analyzer/protocol/pop3/POP3.h
index 9e4317e1a7..4a62848f0a 100644
--- a/src/analyzer/protocol/pop3/POP3.h
+++ b/src/analyzer/protocol/pop3/POP3.h
@@ -74,7 +74,7 @@ class POP3_Analyzer final : public analyzer::tcp::TCP_ApplicationAnalyzer
 	{
 public:
 	explicit POP3_Analyzer(Connection* conn);
-	~POP3_Analyzer() override;
+	~POP3_Analyzer() override = default;
 
 	void Done() override;
 	void DeliverStream(int len, const u_char* data, bool orig) override;
diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc
index f75037d74a..2574037f4d 100644
--- a/src/analyzer/protocol/rpc/Portmap.cc
+++ b/src/analyzer/protocol/rpc/Portmap.cc
@@ -297,8 +297,6 @@ Portmapper_Analyzer::Portmapper_Analyzer(Connection* conn)
 	orig_rpc = resp_rpc = nullptr;
 	}
 
-Portmapper_Analyzer::~Portmapper_Analyzer() { }
-
 void Portmapper_Analyzer::Init()
 	{
 	RPC_Analyzer::Init();
diff --git a/src/analyzer/protocol/rpc/Portmap.h b/src/analyzer/protocol/rpc/Portmap.h
index ac8a49a9b9..df5f398bd3 100644
--- a/src/analyzer/protocol/rpc/Portmap.h
+++ b/src/analyzer/protocol/rpc/Portmap.h
@@ -33,7 +33,7 @@ class Portmapper_Analyzer : public RPC_Analyzer
 	{
 public:
 	explicit Portmapper_Analyzer(Connection* conn);
-	~Portmapper_Analyzer() override;
+	~Portmapper_Analyzer() override = default;
 	void Init() override;
 
 	static analyzer::Analyzer* Instantiate(Connection* conn)
diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc
index 789918cd06..d43a15c7f4 100644
--- a/src/analyzer/protocol/rpc/RPC.cc
+++ b/src/analyzer/protocol/rpc/RPC.cc
@@ -423,8 +423,6 @@ void Contents_RPC::Init()
 	analyzer::tcp::TCP_SupportAnalyzer::Init();
 	}
 
-Contents_RPC::~Contents_RPC() { }
-
 void Contents_RPC::Undelivered(uint64_t seq, int len, bool orig)
 	{
 	analyzer::tcp::TCP_SupportAnalyzer::Undelivered(seq, len, orig);
diff --git a/src/analyzer/protocol/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h
index 5b1264d813..726e3a547b 100644
--- a/src/analyzer/protocol/rpc/RPC.h
+++ b/src/analyzer/protocol/rpc/RPC.h
@@ -212,7 +212,7 @@ class Contents_RPC final : public analyzer::tcp::TCP_SupportAnalyzer
 	{
 public:
 	Contents_RPC(Connection* conn, bool orig, detail::RPC_Interpreter* interp);
-	~Contents_RPC() override;
+	~Contents_RPC() override = default;
 
 protected:
 	enum state_t
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 0c47096c34..a42fb11f19 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -246,8 +246,6 @@ Manager::Manager(bool arg_use_real_time)
 	writer_id_type = nullptr;
 	}
 
-Manager::~Manager() { }
-
 void Manager::InitPostScript()
 	{
 	DBG_LOG(DBG_BROKER, "Initializing");
diff --git a/src/broker/Manager.h b/src/broker/Manager.h
index eb3d050b9b..60bc376fca 100644
--- a/src/broker/Manager.h
+++ b/src/broker/Manager.h
@@ -96,7 +96,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~Manager() override;
+	~Manager() override = default;
 
 	/**
 	 * Initialization of the manager. This is called late during Zeek's
diff --git a/src/file_analysis/Component.cc b/src/file_analysis/Component.cc
index c2a377c656..64690ebab5 100644
--- a/src/file_analysis/Component.cc
+++ b/src/file_analysis/Component.cc
@@ -23,8 +23,6 @@ void Component::Initialize()
 	file_mgr->RegisterComponent(this, "ANALYZER_");
 	}
 
-Component::~Component() { }
-
 void Component::DoDescribe(ODesc* d) const
 	{
 	if ( factory_func )
diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h
index 3047a5a77a..e7ac9ec9dc 100644
--- a/src/file_analysis/Component.h
+++ b/src/file_analysis/Component.h
@@ -60,7 +60,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~Component() override;
+	~Component() override = default;
 
 	/**
 	 * Initialization function. This function has to be called before any
diff --git a/src/input/Component.cc b/src/input/Component.cc
index 9411ee7855..e4bbdf33aa 100644
--- a/src/input/Component.cc
+++ b/src/input/Component.cc
@@ -21,8 +21,6 @@ void Component::Initialize()
 	input_mgr->RegisterComponent(this, "READER_");
 	}
 
-Component::~Component() { }
-
 void Component::DoDescribe(ODesc* d) const
 	{
 	d->Add("Input::READER_");
diff --git a/src/input/Component.h b/src/input/Component.h
index e471b9e2f8..c474d444ae 100644
--- a/src/input/Component.h
+++ b/src/input/Component.h
@@ -36,7 +36,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~Component() override;
+	~Component() override = default;
 
 	/**
 	 * Initialization function. This function has to be called before any
diff --git a/src/input/Manager.cc b/src/input/Manager.cc
index 6db091ed53..dbe8454b23 100644
--- a/src/input/Manager.cc
+++ b/src/input/Manager.cc
@@ -130,7 +130,7 @@ public:
 	string file_id;
 
 	AnalysisStream();
-	~AnalysisStream() override;
+	~AnalysisStream() override = default;
 	};
 
 Manager::TableStream::TableStream()
@@ -177,8 +177,6 @@ Manager::TableStream::~TableStream()
 
 Manager::AnalysisStream::AnalysisStream() : Manager::Stream::Stream(ANALYSIS_STREAM), file_id() { }
 
-Manager::AnalysisStream::~AnalysisStream() { }
-
 Manager::Manager() : plugin::ComponentManager<input::Component>("Input", "Reader")
 	{
 	end_of_data = event_registry->Register("Input::end_of_data");
diff --git a/src/input/readers/config/Config.cc b/src/input/readers/config/Config.cc
index ad2f46da41..a698a174d0 100644
--- a/src/input/readers/config/Config.cc
+++ b/src/input/readers/config/Config.cc
@@ -54,8 +54,6 @@ Config::Config(ReaderFrontend* frontend) : ReaderBackend(frontend)
 		}
 	}
 
-Config::~Config() { }
-
 void Config::DoClose() { }
 
 bool Config::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fields)
diff --git a/src/input/readers/config/Config.h b/src/input/readers/config/Config.h
index cc9089d1cf..8dd5f074d6 100644
--- a/src/input/readers/config/Config.h
+++ b/src/input/readers/config/Config.h
@@ -23,7 +23,7 @@ class Config : public ReaderBackend
 	{
 public:
 	explicit Config(ReaderFrontend* frontend);
-	~Config() override;
+	~Config() override = default;
 
 	// prohibit copying and moving
 	Config(const Config&) = delete;
diff --git a/src/input/readers/raw/Plugin.cc b/src/input/readers/raw/Plugin.cc
index cf3af675c4..b23bcd8a0c 100644
--- a/src/input/readers/raw/Plugin.cc
+++ b/src/input/readers/raw/Plugin.cc
@@ -7,8 +7,6 @@ namespace zeek::plugin::detail::Zeek_RawReader
 
 Plugin plugin;
 
-Plugin::Plugin() { }
-
 zeek::plugin::Configuration Plugin::Configure()
 	{
 	AddComponent(new zeek::input::Component("Raw", zeek::input::reader::detail::Raw::Instantiate));
diff --git a/src/input/readers/raw/Plugin.h b/src/input/readers/raw/Plugin.h
index ade1469812..17e5490f63 100644
--- a/src/input/readers/raw/Plugin.h
+++ b/src/input/readers/raw/Plugin.h
@@ -13,7 +13,7 @@ namespace zeek::plugin::detail::Zeek_RawReader
 class Plugin : public plugin::Plugin
 	{
 public:
-	Plugin();
+	Plugin() = default;
 
 	plugin::Configuration Configure() override;
 
diff --git a/src/iosource/Component.cc b/src/iosource/Component.cc
index 1766341a50..cb9e76434b 100644
--- a/src/iosource/Component.cc
+++ b/src/iosource/Component.cc
@@ -17,8 +17,6 @@ Component::Component(plugin::component::Type type, const std::string& name)
 	{
 	}
 
-Component::~Component() { }
-
 PktSrcComponent::PktSrcComponent(const std::string& arg_name, const std::string& arg_prefix,
                                  InputType arg_type, factory_callback arg_factory)
 	: Component(plugin::component::PKTSRC, arg_name)
@@ -28,8 +26,6 @@ PktSrcComponent::PktSrcComponent(const std::string& arg_name, const std::string&
 	factory = arg_factory;
 	}
 
-PktSrcComponent::~PktSrcComponent() { }
-
 const std::vector<std::string>& PktSrcComponent::Prefixes() const
 	{
 	return prefixes;
@@ -110,8 +106,6 @@ PktDumperComponent::PktDumperComponent(const std::string& name, const std::strin
 	factory = arg_factory;
 	}
 
-PktDumperComponent::~PktDumperComponent() { }
-
 PktDumperComponent::factory_callback PktDumperComponent::Factory() const
 	{
 	return factory;
diff --git a/src/iosource/Component.h b/src/iosource/Component.h
index 0452a65dd6..79b86fc0d5 100644
--- a/src/iosource/Component.h
+++ b/src/iosource/Component.h
@@ -33,7 +33,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~Component() override;
+	~Component() override = default;
 
 protected:
 	/**
@@ -84,7 +84,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~PktSrcComponent() override;
+	~PktSrcComponent() override = default;
 
 	/**
 	 * Returns the prefix(es) passed to the constructor.
@@ -145,7 +145,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~PktDumperComponent() override;
+	~PktDumperComponent() override = default;
 
 	/**
 	 * Returns the prefix(es) passed to the constructor.
diff --git a/src/iosource/PktDumper.cc b/src/iosource/PktDumper.cc
index ec65615267..04f2315665 100644
--- a/src/iosource/PktDumper.cc
+++ b/src/iosource/PktDumper.cc
@@ -16,8 +16,6 @@ PktDumper::PktDumper()
 	errmsg = "";
 	}
 
-PktDumper::~PktDumper() { }
-
 void PktDumper::Init()
 	{
 	Open();
diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h
index 81ded1cbff..6ed7b03f1c 100644
--- a/src/iosource/PktDumper.h
+++ b/src/iosource/PktDumper.h
@@ -28,7 +28,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	virtual ~PktDumper();
+	virtual ~PktDumper() = default;
 
 	/**
 	 * Returns the path associated with the dumper.
diff --git a/src/iosource/pcap/Dumper.cc b/src/iosource/pcap/Dumper.cc
index 24a5628fec..61a44bfd25 100644
--- a/src/iosource/pcap/Dumper.cc
+++ b/src/iosource/pcap/Dumper.cc
@@ -20,8 +20,6 @@ PcapDumper::PcapDumper(const std::string& path, bool arg_append)
 	pd = nullptr;
 	}
 
-PcapDumper::~PcapDumper() { }
-
 void PcapDumper::Open()
 	{
 	int linktype = -1;
diff --git a/src/iosource/pcap/Dumper.h b/src/iosource/pcap/Dumper.h
index ce24ecba06..6fc90caa1c 100644
--- a/src/iosource/pcap/Dumper.h
+++ b/src/iosource/pcap/Dumper.h
@@ -18,7 +18,7 @@ class PcapDumper : public PktDumper
 	{
 public:
 	PcapDumper(const std::string& path, bool append);
-	~PcapDumper() override;
+	~PcapDumper() override = default;
 
 	static PktDumper* Instantiate(const std::string& path, bool append);
 
diff --git a/src/logging/Component.cc b/src/logging/Component.cc
index 7b7188a1f1..4ee0713803 100644
--- a/src/logging/Component.cc
+++ b/src/logging/Component.cc
@@ -21,8 +21,6 @@ void Component::Initialize()
 	log_mgr->RegisterComponent(this, "WRITER_");
 	}
 
-Component::~Component() { }
-
 void Component::DoDescribe(ODesc* d) const
 	{
 	d->Add("Log::WRITER_");
diff --git a/src/logging/Component.h b/src/logging/Component.h
index c39bbdded2..278b95d461 100644
--- a/src/logging/Component.h
+++ b/src/logging/Component.h
@@ -36,7 +36,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~Component() override;
+	~Component() override = default;
 
 	/**
 	 * Initialization function. This function has to be called before any
diff --git a/src/plugin/Plugin.cc b/src/plugin/Plugin.cc
index 21fbf37341..4694c68ef6 100644
--- a/src/plugin/Plugin.cc
+++ b/src/plugin/Plugin.cc
@@ -66,8 +66,6 @@ BifItem& BifItem::operator=(const BifItem& other)
 	return *this;
 	}
 
-BifItem::~BifItem() { }
-
 void HookArgument::Describe(ODesc* d) const
 	{
 	switch ( type )
diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h
index 89c0d3515a..77863646ec 100644
--- a/src/plugin/Plugin.h
+++ b/src/plugin/Plugin.h
@@ -190,7 +190,7 @@ private:
 /**
  * A class describing an item defined in \c *.bif file.
  */
-class BifItem
+class BifItem final
 	{
 public:
 	/**
@@ -228,7 +228,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~BifItem();
+	~BifItem() = default;
 
 	/**
 	 * Returns the script-level ID as passed into the constructor.
diff --git a/src/probabilistic/CardinalityCounter.cc b/src/probabilistic/CardinalityCounter.cc
index c6de5c6581..5061412e65 100644
--- a/src/probabilistic/CardinalityCounter.cc
+++ b/src/probabilistic/CardinalityCounter.cc
@@ -115,8 +115,6 @@ CardinalityCounter::CardinalityCounter(uint64_t arg_size, uint64_t arg_V, double
 	p = log2(m);
 	}
 
-CardinalityCounter::~CardinalityCounter() { }
-
 uint8_t CardinalityCounter::Rank(uint64_t hash_modified) const
 	{
 	hash_modified = hash_modified >> p;
diff --git a/src/probabilistic/CardinalityCounter.h b/src/probabilistic/CardinalityCounter.h
index 9650e207fb..0a22ba68fc 100644
--- a/src/probabilistic/CardinalityCounter.h
+++ b/src/probabilistic/CardinalityCounter.h
@@ -61,7 +61,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	~CardinalityCounter();
+	~CardinalityCounter() = default;
 
 	/**
 	 * Add a new element to the counter.
diff --git a/src/scan.l b/src/scan.l
index 7d8d0063fe..cd79dfb255 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -813,8 +813,7 @@ void begin_RE()
 
 class LocalNameFinder : public zeek::detail::TraversalCallback {
 public:
-	LocalNameFinder()
-		{}
+	LocalNameFinder() = default;
 
 	virtual zeek::detail::TraversalCode PreExpr(const zeek::detail::Expr* expr)
 		{
diff --git a/src/telemetry/Manager.cc b/src/telemetry/Manager.cc
index 7e07476f05..3310a930af 100644
--- a/src/telemetry/Manager.cc
+++ b/src/telemetry/Manager.cc
@@ -58,8 +58,6 @@ Manager::Manager()
 	pimpl.swap(ptr);
 	}
 
-Manager::~Manager() { }
-
 void Manager::InitPostScript() { }
 
 void Manager::InitPostBrokerSetup(broker::endpoint& ep)
diff --git a/src/telemetry/Manager.h b/src/telemetry/Manager.h
index a0b00794df..cd61dc2325 100644
--- a/src/telemetry/Manager.h
+++ b/src/telemetry/Manager.h
@@ -50,7 +50,7 @@ public:
 
 	Manager& operator=(const Manager&) = delete;
 
-	virtual ~Manager();
+	virtual ~Manager() = default;
 
 	/**
 	 * Initialization of the manager. This is called late during Zeek's
diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc
index e9683a0687..959bad458c 100644
--- a/src/threading/Formatter.cc
+++ b/src/threading/Formatter.cc
@@ -20,8 +20,6 @@ Formatter::Formatter(threading::MsgThread* t)
 	thread = t;
 	}
 
-Formatter::~Formatter() { }
-
 std::string Formatter::Render(const threading::Value::addr_t& addr)
 	{
 	if ( addr.family == IPv4 )
diff --git a/src/threading/Formatter.h b/src/threading/Formatter.h
index 1a83bc52ff..1f99f51b5d 100644
--- a/src/threading/Formatter.h
+++ b/src/threading/Formatter.h
@@ -33,7 +33,7 @@ public:
 	/**
 	 * Destructor.
 	 */
-	virtual ~Formatter();
+	virtual ~Formatter() = default;
 
 	/**
 	 * Convert a list of threading values into an implementation specific
diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc
index 306432854f..3d75bb31eb 100644
--- a/src/threading/formatters/Ascii.cc
+++ b/src/threading/formatters/Ascii.cc
@@ -53,8 +53,6 @@ Ascii::Ascii(MsgThread* t, const SeparatorInfo& info) : Formatter(t)
 	separators = info;
 	}
 
-Ascii::~Ascii() { }
-
 bool Ascii::Describe(ODesc* desc, int num_fields, const Field* const* fields, Value** vals) const
 	{
 	for ( int i = 0; i < num_fields; i++ )
diff --git a/src/threading/formatters/Ascii.h b/src/threading/formatters/Ascii.h
index da20c1b89b..04223c41fd 100644
--- a/src/threading/formatters/Ascii.h
+++ b/src/threading/formatters/Ascii.h
@@ -47,7 +47,7 @@ public:
 	 * separators.
 	 */
 	Ascii(MsgThread* t, const SeparatorInfo& info);
-	~Ascii() override;
+	~Ascii() override = default;
 
 	virtual bool Describe(ODesc* desc, Value* val, const std::string& name = "") const override;
 	virtual bool Describe(ODesc* desc, int num_fields, const Field* const* fields,
diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc
index 0a89db329d..1386514077 100644
--- a/src/threading/formatters/JSON.cc
+++ b/src/threading/formatters/JSON.cc
@@ -37,8 +37,6 @@ JSON::JSON(MsgThread* t, TimeFormat tf, bool arg_include_unset_fields)
 	{
 	}
 
-JSON::~JSON() { }
-
 bool JSON::Describe(ODesc* desc, int num_fields, const Field* const* fields, Value** vals) const
 	{
 	rapidjson::StringBuffer buffer;
diff --git a/src/threading/formatters/JSON.h b/src/threading/formatters/JSON.h
index 74bc89c8ae..cd3f4f9f09 100644
--- a/src/threading/formatters/JSON.h
+++ b/src/threading/formatters/JSON.h
@@ -36,7 +36,7 @@ public:
 		};
 
 	JSON(MsgThread* t, TimeFormat tf, bool include_unset_fields = false);
-	~JSON() override;
+	~JSON() override = default;
 
 	bool Describe(ODesc* desc, Value* val, const std::string& name = "") const override;
 	bool Describe(ODesc* desc, int num_fields, const Field* const* fields,