diff --git a/src/analyzer/protocol/ayiya/AYIYA.h b/src/analyzer/protocol/ayiya/AYIYA.h
index c1b60361d4..a73e785c8c 100644
--- a/src/analyzer/protocol/ayiya/AYIYA.h
+++ b/src/analyzer/protocol/ayiya/AYIYA.h
@@ -4,7 +4,7 @@
 
 namespace analyzer { namespace ayiya {
 
-class AYIYA_Analyzer : public analyzer::Analyzer {
+class AYIYA_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit AYIYA_Analyzer(Connection* conn);
 	virtual ~AYIYA_Analyzer();
@@ -20,4 +20,4 @@ protected:
 	binpac::AYIYA::AYIYA_Conn* interp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/bittorrent/BitTorrent.h b/src/analyzer/protocol/bittorrent/BitTorrent.h
index 089cf7f1bf..13a5e78707 100644
--- a/src/analyzer/protocol/bittorrent/BitTorrent.h
+++ b/src/analyzer/protocol/bittorrent/BitTorrent.h
@@ -8,7 +8,7 @@
 
 namespace analyzer { namespace bittorrent {
 
-class BitTorrent_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class BitTorrent_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit BitTorrent_Analyzer(Connection* conn);
 	~BitTorrent_Analyzer() override;
@@ -29,4 +29,4 @@ protected:
 	uint64_t stream_len_orig, stream_len_resp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/bittorrent/BitTorrentTracker.h b/src/analyzer/protocol/bittorrent/BitTorrentTracker.h
index 0663901229..ebd7e03955 100644
--- a/src/analyzer/protocol/bittorrent/BitTorrentTracker.h
+++ b/src/analyzer/protocol/bittorrent/BitTorrentTracker.h
@@ -43,7 +43,7 @@ enum btt_benc_states {
 	BENC_STATE_STR2,
 };
 
-class BitTorrentTracker_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class BitTorrentTracker_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit BitTorrentTracker_Analyzer(Connection* conn);
 	~BitTorrentTracker_Analyzer() override;
@@ -129,4 +129,4 @@ protected:
 	bool stop_orig, stop_resp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h
index 73b84c876a..b15f80db1d 100644
--- a/src/analyzer/protocol/dce-rpc/DCE_RPC.h
+++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.h
@@ -11,7 +11,7 @@
 
 namespace analyzer { namespace dce_rpc {
 
-class DCE_RPC_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class DCE_RPC_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit DCE_RPC_Analyzer(Connection* conn);
 	~DCE_RPC_Analyzer() override;
diff --git a/src/analyzer/protocol/dhcp/DHCP.h b/src/analyzer/protocol/dhcp/DHCP.h
index fd311900f6..a89373ce52 100644
--- a/src/analyzer/protocol/dhcp/DHCP.h
+++ b/src/analyzer/protocol/dhcp/DHCP.h
@@ -6,7 +6,7 @@
 
 namespace analyzer { namespace dhcp {
 
-class DHCP_Analyzer : public analyzer::Analyzer {
+class DHCP_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit DHCP_Analyzer(Connection* conn);
 	~DHCP_Analyzer() override;
@@ -22,4 +22,4 @@ protected:
 	binpac::DHCP::DHCP_Conn* interp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/dns/DNS.h b/src/analyzer/protocol/dns/DNS.h
index 51c297bbf1..5b7666ac5a 100644
--- a/src/analyzer/protocol/dns/DNS.h
+++ b/src/analyzer/protocol/dns/DNS.h
@@ -324,7 +324,7 @@ typedef enum {
 
 // Support analyzer which chunks the TCP stream into "packets".
 // ### This should be merged with TCP_Contents_RPC.
-class Contents_DNS : public tcp::TCP_SupportAnalyzer {
+class Contents_DNS final : public tcp::TCP_SupportAnalyzer {
 public:
 	Contents_DNS(Connection* c, bool orig, DNS_Interpreter* interp);
 	~Contents_DNS() override;
@@ -346,7 +346,7 @@ protected:
 };
 
 // Works for both TCP and UDP.
-class DNS_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class DNS_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit DNS_Analyzer(Connection* conn);
 	~DNS_Analyzer() override;
diff --git a/src/analyzer/protocol/ftp/FTP.h b/src/analyzer/protocol/ftp/FTP.h
index 47d93e8f10..385d3323c3 100644
--- a/src/analyzer/protocol/ftp/FTP.h
+++ b/src/analyzer/protocol/ftp/FTP.h
@@ -8,7 +8,7 @@ namespace analyzer { namespace login { class NVT_Analyzer; }}
 
 namespace analyzer { namespace ftp {
 
-class FTP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class FTP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit FTP_Analyzer(Connection* conn);
 
@@ -34,7 +34,7 @@ protected:
  * analyzer just decodes the tokens and passes them on to the parent, which must
  * be an SSL analyzer instance.
  */
-class FTP_ADAT_Analyzer : public analyzer::SupportAnalyzer {
+class FTP_ADAT_Analyzer final : public analyzer::SupportAnalyzer {
 public:
 	FTP_ADAT_Analyzer(Connection* conn, bool arg_orig)
 	    : SupportAnalyzer("FTP_ADAT", conn, arg_orig),
@@ -49,4 +49,4 @@ protected:
 	bool first_token;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/gssapi/GSSAPI.h b/src/analyzer/protocol/gssapi/GSSAPI.h
index aa9eb67044..feb1344ee5 100644
--- a/src/analyzer/protocol/gssapi/GSSAPI.h
+++ b/src/analyzer/protocol/gssapi/GSSAPI.h
@@ -9,9 +9,7 @@
 
 namespace analyzer { namespace gssapi {
 
-class GSSAPI_Analyzer
-
-: public tcp::TCP_ApplicationAnalyzer {
+class GSSAPI_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit GSSAPI_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/gtpv1/GTPv1.h b/src/analyzer/protocol/gtpv1/GTPv1.h
index dceb9b56e7..3ea329f963 100644
--- a/src/analyzer/protocol/gtpv1/GTPv1.h
+++ b/src/analyzer/protocol/gtpv1/GTPv1.h
@@ -4,7 +4,7 @@
 
 namespace analyzer { namespace gtpv1 {
 
-class GTPv1_Analyzer : public analyzer::Analyzer {
+class GTPv1_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit GTPv1_Analyzer(Connection* conn);
 	virtual ~GTPv1_Analyzer();
@@ -20,4 +20,4 @@ protected:
 	binpac::GTPv1::GTPv1_Conn* interp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/http/HTTP.h b/src/analyzer/protocol/http/HTTP.h
index 3eb0da80b1..20a1e1f239 100644
--- a/src/analyzer/protocol/http/HTTP.h
+++ b/src/analyzer/protocol/http/HTTP.h
@@ -27,7 +27,7 @@ class HTTP_Entity;
 class HTTP_Message;
 class HTTP_Analyzer;
 
-class HTTP_Entity : public mime::MIME_Entity {
+class HTTP_Entity final : public mime::MIME_Entity {
 public:
 	HTTP_Entity(HTTP_Message* msg, MIME_Entity* parent_entity,
 			int expect_body);
@@ -96,7 +96,7 @@ enum {
 // HTTP_Message::EndEntity	-> Message::Done
 // HTTP_MessageDone	-> {Request,Reply}Made
 
-class HTTP_Message : public mime::MIME_Message {
+class HTTP_Message final : public mime::MIME_Message {
 friend class HTTP_Entity;
 
 public:
@@ -148,7 +148,7 @@ protected:
 	Val* BuildMessageStat(bool interrupted, const char* msg);
 };
 
-class HTTP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class HTTP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	HTTP_Analyzer(Connection* conn);
 	~HTTP_Analyzer() override;
diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h
index baf1405e4e..93626e0f63 100644
--- a/src/analyzer/protocol/icmp/ICMP.h
+++ b/src/analyzer/protocol/icmp/ICMP.h
@@ -17,7 +17,7 @@ typedef enum {
 
 // We do not have an PIA for ICMP (yet) and therefore derive from
 // RuleMatcherState to perform our own matching.
-class ICMP_Analyzer : public analyzer::TransportLayerAnalyzer {
+class ICMP_Analyzer final : public analyzer::TransportLayerAnalyzer {
 public:
 	explicit ICMP_Analyzer(Connection* conn);
 
diff --git a/src/analyzer/protocol/imap/IMAP.h b/src/analyzer/protocol/imap/IMAP.h
index 56e998d2f8..4c2b1e1fd0 100644
--- a/src/analyzer/protocol/imap/IMAP.h
+++ b/src/analyzer/protocol/imap/IMAP.h
@@ -10,7 +10,7 @@
 
 namespace analyzer { namespace imap {
 
-class IMAP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class IMAP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit IMAP_Analyzer(Connection* conn);
 	~IMAP_Analyzer() override;
diff --git a/src/analyzer/protocol/irc/IRC.h b/src/analyzer/protocol/irc/IRC.h
index 1146a653aa..5bd11c47f7 100644
--- a/src/analyzer/protocol/irc/IRC.h
+++ b/src/analyzer/protocol/irc/IRC.h
@@ -9,7 +9,7 @@ namespace analyzer { namespace irc {
 /**
 * \brief Main class for analyzing IRC traffic.
 */
-class IRC_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class IRC_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 	enum { WAIT_FOR_REGISTRATION, REGISTERED, };
 	enum { NO_ZIP, ACCEPT_ZIP, ZIP_LOADED, };
 public:
diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h
index e8578be850..4d0de0e2a5 100644
--- a/src/analyzer/protocol/krb/KRB.h
+++ b/src/analyzer/protocol/krb/KRB.h
@@ -12,7 +12,7 @@
 
 namespace analyzer { namespace krb {
 
-class KRB_Analyzer : public analyzer::Analyzer {
+class KRB_Analyzer final : public analyzer::Analyzer {
 
 public:
 	explicit KRB_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/krb/KRB_TCP.h b/src/analyzer/protocol/krb/KRB_TCP.h
index 2c18c72357..0594bcb507 100644
--- a/src/analyzer/protocol/krb/KRB_TCP.h
+++ b/src/analyzer/protocol/krb/KRB_TCP.h
@@ -8,7 +8,7 @@
 
 namespace analyzer { namespace krb_tcp {
 
-class KRB_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class KRB_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit KRB_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/login/NVT.h b/src/analyzer/protocol/login/NVT.h
index 2320d38fc3..4f8f05345a 100644
--- a/src/analyzer/protocol/login/NVT.h
+++ b/src/analyzer/protocol/login/NVT.h
@@ -58,7 +58,7 @@ protected:
 	int active;
 };
 
-class TelnetTerminalOption : public TelnetOption {
+class TelnetTerminalOption final : public TelnetOption {
 public:
 	explicit TelnetTerminalOption(NVT_Analyzer* arg_endp)
 		: TelnetOption(arg_endp, TELNET_OPTION_TERMINAL)	{ }
@@ -66,7 +66,7 @@ public:
 	void RecvSubOption(u_char* data, int len) override;
 };
 
-class TelnetEncryptOption : public TelnetOption {
+class TelnetEncryptOption final : public TelnetOption {
 public:
 	explicit TelnetEncryptOption(NVT_Analyzer* arg_endp)
 		: TelnetOption(arg_endp, TELNET_OPTION_ENCRYPT)
@@ -82,7 +82,7 @@ protected:
 	int did_encrypt_request, doing_encryption;
 };
 
-class TelnetAuthenticateOption : public TelnetOption {
+class TelnetAuthenticateOption final : public TelnetOption {
 public:
 	explicit TelnetAuthenticateOption(NVT_Analyzer* arg_endp)
 		: TelnetOption(arg_endp, TELNET_OPTION_AUTHENTICATE)
@@ -98,7 +98,7 @@ protected:
 	int authentication_requested;
 };
 
-class TelnetEnvironmentOption : public TelnetOption {
+class TelnetEnvironmentOption final : public TelnetOption {
 public:
 	explicit TelnetEnvironmentOption(NVT_Analyzer* arg_endp)
 		: TelnetOption(arg_endp, TELNET_OPTION_ENVIRON)
@@ -110,7 +110,7 @@ protected:
 	char* ExtractEnv(u_char*& data, int& len, int& code);
 };
 
-class TelnetBinaryOption : public TelnetOption {
+class TelnetBinaryOption final : public TelnetOption {
 public:
 	explicit TelnetBinaryOption(NVT_Analyzer* arg_endp)
 		: TelnetOption(arg_endp, TELNET_OPTION_BINARY)
@@ -122,7 +122,7 @@ protected:
 	void InconsistentOption(unsigned int type) override;
 };
 
-class NVT_Analyzer : public tcp::ContentLine_Analyzer {
+class NVT_Analyzer final : public tcp::ContentLine_Analyzer {
 public:
 	NVT_Analyzer(Connection* conn, bool orig);
 	~NVT_Analyzer() override;
diff --git a/src/analyzer/protocol/login/RSH.h b/src/analyzer/protocol/login/RSH.h
index 6b298c936e..b790303008 100644
--- a/src/analyzer/protocol/login/RSH.h
+++ b/src/analyzer/protocol/login/RSH.h
@@ -22,7 +22,7 @@ typedef enum {
 
 class Rsh_Analyzer;
 
-class Contents_Rsh_Analyzer : public tcp::ContentLine_Analyzer {
+class Contents_Rsh_Analyzer final : public tcp::ContentLine_Analyzer {
 public:
 	Contents_Rsh_Analyzer(Connection* conn, bool orig, Rsh_Analyzer* analyzer);
 	~Contents_Rsh_Analyzer() override;
@@ -39,7 +39,7 @@ protected:
 	Rsh_Analyzer* analyzer;
 };
 
-class Rsh_Analyzer : public Login_Analyzer {
+class Rsh_Analyzer final : public Login_Analyzer {
 public:
 	explicit Rsh_Analyzer(Connection* conn);
 
@@ -55,4 +55,4 @@ public:
 	Contents_Rsh_Analyzer* contents_resp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/login/Rlogin.h b/src/analyzer/protocol/login/Rlogin.h
index 427dbed2de..21905ab138 100644
--- a/src/analyzer/protocol/login/Rlogin.h
+++ b/src/analyzer/protocol/login/Rlogin.h
@@ -30,7 +30,7 @@ typedef enum {
 
 class Rlogin_Analyzer;
 
-class Contents_Rlogin_Analyzer : public tcp::ContentLine_Analyzer {
+class Contents_Rlogin_Analyzer final : public tcp::ContentLine_Analyzer {
 public:
 	Contents_Rlogin_Analyzer(Connection* conn, bool orig,
 					Rlogin_Analyzer* analyzer);
@@ -53,7 +53,7 @@ protected:
 	Rlogin_Analyzer* analyzer;
 };
 
-class Rlogin_Analyzer : public Login_Analyzer {
+class Rlogin_Analyzer final : public Login_Analyzer {
 public:
 	explicit Rlogin_Analyzer(Connection* conn);
 
@@ -65,4 +65,4 @@ public:
 		{ return new Rlogin_Analyzer(conn); }
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h
index f7026bf758..e07954063c 100644
--- a/src/analyzer/protocol/mime/MIME.h
+++ b/src/analyzer/protocol/mime/MIME.h
@@ -230,7 +230,7 @@ protected:
 	TableVal* BuildHeaderTable(MIME_HeaderList& hlist);
 };
 
-class MIME_Mail : public MIME_Message {
+class MIME_Mail final : public MIME_Message {
 public:
 	MIME_Mail(analyzer::Analyzer* mail_conn, bool is_orig, int buf_size = 0);
 	~MIME_Mail() override;
diff --git a/src/analyzer/protocol/mqtt/MQTT.h b/src/analyzer/protocol/mqtt/MQTT.h
index 56bbeab651..5997d3430f 100644
--- a/src/analyzer/protocol/mqtt/MQTT.h
+++ b/src/analyzer/protocol/mqtt/MQTT.h
@@ -9,7 +9,7 @@ namespace binpac { namespace MQTT { class MQTT_Conn; } }
 
 namespace analyzer { namespace MQTT {
 
-class MQTT_Analyzer: public tcp::TCP_ApplicationAnalyzer {
+class MQTT_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	MQTT_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/mysql/MySQL.h b/src/analyzer/protocol/mysql/MySQL.h
index 7f19b3fbe9..226a5e16e1 100644
--- a/src/analyzer/protocol/mysql/MySQL.h
+++ b/src/analyzer/protocol/mysql/MySQL.h
@@ -9,9 +9,7 @@
 
 namespace analyzer { namespace MySQL {
 
-class MySQL_Analyzer
-
-: public tcp::TCP_ApplicationAnalyzer {
+class MySQL_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit MySQL_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.h b/src/analyzer/protocol/netbios/NetbiosSSN.h
index fb7800bd77..e775abf839 100644
--- a/src/analyzer/protocol/netbios/NetbiosSSN.h
+++ b/src/analyzer/protocol/netbios/NetbiosSSN.h
@@ -112,7 +112,7 @@ typedef enum {
 } NetbiosSSN_State;
 
 // ### This should be merged with TCP_Contents_RPC, TCP_Contents_DNS.
-class Contents_NetbiosSSN : public tcp::TCP_SupportAnalyzer {
+class Contents_NetbiosSSN final : public tcp::TCP_SupportAnalyzer {
 public:
 	Contents_NetbiosSSN(Connection* conn, bool orig,
 				NetbiosSSN_Interpreter* interp);
@@ -138,7 +138,7 @@ protected:
 	NetbiosSSN_State state;
 };
 
-class NetbiosSSN_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class NetbiosSSN_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit NetbiosSSN_Analyzer(Connection* conn);
 	~NetbiosSSN_Analyzer() override;
diff --git a/src/analyzer/protocol/ntlm/NTLM.h b/src/analyzer/protocol/ntlm/NTLM.h
index 1e4342072a..0fe048ce40 100644
--- a/src/analyzer/protocol/ntlm/NTLM.h
+++ b/src/analyzer/protocol/ntlm/NTLM.h
@@ -9,9 +9,7 @@
 
 namespace analyzer { namespace ntlm {
 
-class NTLM_Analyzer
-
-: public tcp::TCP_ApplicationAnalyzer {
+class NTLM_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit NTLM_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h
index 9a0da31515..494f8a6901 100644
--- a/src/analyzer/protocol/ntp/NTP.h
+++ b/src/analyzer/protocol/ntp/NTP.h
@@ -9,7 +9,7 @@
 
 namespace analyzer { namespace NTP {
 
-class NTP_Analyzer : public analyzer::Analyzer {
+class NTP_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit NTP_Analyzer(Connection* conn);
 	~NTP_Analyzer() override;
diff --git a/src/analyzer/protocol/pop3/POP3.h b/src/analyzer/protocol/pop3/POP3.h
index 1af2e4226c..827407d61b 100644
--- a/src/analyzer/protocol/pop3/POP3.h
+++ b/src/analyzer/protocol/pop3/POP3.h
@@ -61,7 +61,7 @@ typedef enum {
 	POP3_WOK,
 } POP3_SubState;
 
-class POP3_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class POP3_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit POP3_Analyzer(Connection* conn);
 	~POP3_Analyzer() override;
diff --git a/src/analyzer/protocol/radius/RADIUS.h b/src/analyzer/protocol/radius/RADIUS.h
index 00b3b21911..87a3ad8586 100644
--- a/src/analyzer/protocol/radius/RADIUS.h
+++ b/src/analyzer/protocol/radius/RADIUS.h
@@ -11,7 +11,7 @@
 
 namespace analyzer { namespace RADIUS {
 
-class RADIUS_Analyzer : public analyzer::Analyzer {
+class RADIUS_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit RADIUS_Analyzer(Connection* conn);
 	~RADIUS_Analyzer() override;
diff --git a/src/analyzer/protocol/rdp/RDP.h b/src/analyzer/protocol/rdp/RDP.h
index 99bad567a2..42c93a15fe 100644
--- a/src/analyzer/protocol/rdp/RDP.h
+++ b/src/analyzer/protocol/rdp/RDP.h
@@ -7,7 +7,7 @@
 
 namespace analyzer { namespace rdp {
 
-class RDP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class RDP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit RDP_Analyzer(Connection* conn);
@@ -24,9 +24,9 @@ public:
 
 protected:
 	binpac::RDP::RDP_Conn* interp;
-	
+
 	bool had_gap;
 	pia::PIA_TCP *pia;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/rdp/RDPEUDP.h b/src/analyzer/protocol/rdp/RDPEUDP.h
index dc874ca783..c38cb00cdb 100644
--- a/src/analyzer/protocol/rdp/RDPEUDP.h
+++ b/src/analyzer/protocol/rdp/RDPEUDP.h
@@ -5,7 +5,7 @@
 #include "rdpeudp_pac.h"
 
 namespace analyzer { namespace rdpeudp {
-class RDP_Analyzer : public analyzer::Analyzer {
+class RDP_Analyzer final : public analyzer::Analyzer {
 
 public:
 	explicit RDP_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/rfb/RFB.h b/src/analyzer/protocol/rfb/RFB.h
index ff2b55d9c1..01da03c569 100644
--- a/src/analyzer/protocol/rfb/RFB.h
+++ b/src/analyzer/protocol/rfb/RFB.h
@@ -9,9 +9,7 @@
 
 namespace analyzer { namespace rfb {
 
-class RFB_Analyzer
-
-: public tcp::TCP_ApplicationAnalyzer {
+class RFB_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 public:
 	explicit RFB_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h
index 60488cd6d0..29685cb77f 100644
--- a/src/analyzer/protocol/rpc/RPC.h
+++ b/src/analyzer/protocol/rpc/RPC.h
@@ -184,7 +184,7 @@ protected:
 };
 
 /* Support Analyzer for reassembling RPC-over-TCP messages */
-class Contents_RPC : public tcp::TCP_SupportAnalyzer {
+class Contents_RPC final : public tcp::TCP_SupportAnalyzer {
 public:
 	Contents_RPC(Connection* conn, bool orig, RPC_Interpreter* interp);
 	~Contents_RPC() override;
diff --git a/src/analyzer/protocol/sip/SIP.h b/src/analyzer/protocol/sip/SIP.h
index 453758a13b..c819d1d04f 100644
--- a/src/analyzer/protocol/sip/SIP.h
+++ b/src/analyzer/protocol/sip/SIP.h
@@ -7,7 +7,7 @@
 
 namespace analyzer { namespace SIP {
 
-class SIP_Analyzer : public analyzer::Analyzer {
+class SIP_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit SIP_Analyzer(Connection* conn);
 	~SIP_Analyzer() override;
diff --git a/src/analyzer/protocol/sip/SIP_TCP.h b/src/analyzer/protocol/sip/SIP_TCP.h
index a288997cda..d52c89cff1 100644
--- a/src/analyzer/protocol/sip/SIP_TCP.h
+++ b/src/analyzer/protocol/sip/SIP_TCP.h
@@ -11,7 +11,7 @@
 
 namespace analyzer { namespace sip_tcp {
 
-class SIP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class SIP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit SIP_Analyzer(Connection* conn);
 	~SIP_Analyzer() override;
diff --git a/src/analyzer/protocol/smb/SMB.h b/src/analyzer/protocol/smb/SMB.h
index 90d1664743..a3c2c3e521 100644
--- a/src/analyzer/protocol/smb/SMB.h
+++ b/src/analyzer/protocol/smb/SMB.h
@@ -5,7 +5,7 @@
 
 namespace analyzer { namespace smb {
 
-class SMB_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class SMB_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit SMB_Analyzer(Connection* conn);
 	~SMB_Analyzer() override;
diff --git a/src/analyzer/protocol/smtp/SMTP.h b/src/analyzer/protocol/smtp/SMTP.h
index 929bdda45c..c98b500a79 100644
--- a/src/analyzer/protocol/smtp/SMTP.h
+++ b/src/analyzer/protocol/smtp/SMTP.h
@@ -36,7 +36,7 @@ typedef enum {
 } SMTP_State;
 
 
-class SMTP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class SMTP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit SMTP_Analyzer(Connection* conn);
 	~SMTP_Analyzer() override;
diff --git a/src/analyzer/protocol/snmp/SNMP.h b/src/analyzer/protocol/snmp/SNMP.h
index 1525c1cca1..9328cd4970 100644
--- a/src/analyzer/protocol/snmp/SNMP.h
+++ b/src/analyzer/protocol/snmp/SNMP.h
@@ -6,7 +6,7 @@
 
 namespace analyzer { namespace snmp {
 
-class SNMP_Analyzer : public analyzer::Analyzer {
+class SNMP_Analyzer final : public analyzer::Analyzer {
 
 public:
 
diff --git a/src/analyzer/protocol/socks/SOCKS.h b/src/analyzer/protocol/socks/SOCKS.h
index 86591c6583..40ec1b8ea1 100644
--- a/src/analyzer/protocol/socks/SOCKS.h
+++ b/src/analyzer/protocol/socks/SOCKS.h
@@ -13,7 +13,7 @@ namespace binpac  {
 
 namespace analyzer { namespace socks {
 
-class SOCKS_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class SOCKS_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit SOCKS_Analyzer(Connection* conn);
 	~SOCKS_Analyzer() override;
@@ -37,4 +37,4 @@ protected:
 	binpac::SOCKS::SOCKS_Conn* interp;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h
index 71328b7dcf..6d4ebf8044 100644
--- a/src/analyzer/protocol/ssh/SSH.h
+++ b/src/analyzer/protocol/ssh/SSH.h
@@ -9,7 +9,7 @@
 
 namespace analyzer {
 	namespace SSH {
-		class SSH_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+		class SSH_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 
 		public:
 			explicit SSH_Analyzer(Connection* conn);
diff --git a/src/analyzer/protocol/ssl/DTLS.h b/src/analyzer/protocol/ssl/DTLS.h
index a8cc56958a..c260540ce1 100644
--- a/src/analyzer/protocol/ssl/DTLS.h
+++ b/src/analyzer/protocol/ssl/DTLS.h
@@ -10,7 +10,7 @@ namespace binpac { namespace TLSHandshake { class Handshake_Conn; } }
 
 namespace analyzer { namespace dtls {
 
-class DTLS_Analyzer : public analyzer::Analyzer {
+class DTLS_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit DTLS_Analyzer(Connection* conn);
 	~DTLS_Analyzer() override;
diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h
index 73b16e45df..b9ac0c3781 100644
--- a/src/analyzer/protocol/ssl/SSL.h
+++ b/src/analyzer/protocol/ssl/SSL.h
@@ -10,7 +10,7 @@ namespace binpac { namespace TLSHandshake { class Handshake_Conn; } }
 
 namespace analyzer { namespace ssl {
 
-class SSL_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class SSL_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit SSL_Analyzer(Connection* conn);
 	~SSL_Analyzer() override;
@@ -38,4 +38,4 @@ protected:
 
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h
index 1a2d29c8b2..e9d69f00c8 100644
--- a/src/analyzer/protocol/tcp/TCP.h
+++ b/src/analyzer/protocol/tcp/TCP.h
@@ -21,7 +21,7 @@ class TCP_Endpoint;
 class TCP_ApplicationAnalyzer;
 class TCP_Reassembler;
 
-class TCP_Analyzer : public analyzer::TransportLayerAnalyzer {
+class TCP_Analyzer final : public analyzer::TransportLayerAnalyzer {
 public:
 	explicit TCP_Analyzer(Connection* conn);
 	~TCP_Analyzer() override;
diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.h b/src/analyzer/protocol/tcp/TCP_Reassembler.h
index d519da5497..dffa55445a 100644
--- a/src/analyzer/protocol/tcp/TCP_Reassembler.h
+++ b/src/analyzer/protocol/tcp/TCP_Reassembler.h
@@ -15,7 +15,7 @@ namespace tcp {
 
 class TCP_Analyzer;
 
-class TCP_Reassembler : public Reassembler {
+class TCP_Reassembler final : public Reassembler {
 public:
 	enum Type {
 		Direct,		// deliver to destination analyzer itself
diff --git a/src/analyzer/protocol/teredo/Teredo.h b/src/analyzer/protocol/teredo/Teredo.h
index e76b6b7ba8..1fe9b76b57 100644
--- a/src/analyzer/protocol/teredo/Teredo.h
+++ b/src/analyzer/protocol/teredo/Teredo.h
@@ -6,7 +6,7 @@
 
 namespace analyzer { namespace teredo {
 
-class Teredo_Analyzer : public analyzer::Analyzer {
+class Teredo_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit Teredo_Analyzer(Connection* conn) : Analyzer("TEREDO", conn),
 	                                    valid_orig(false), valid_resp(false)
@@ -88,4 +88,4 @@ protected:
 	const Teredo_Analyzer* analyzer;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*
diff --git a/src/analyzer/protocol/udp/UDP.h b/src/analyzer/protocol/udp/UDP.h
index adaa65bbf1..1fa3877772 100644
--- a/src/analyzer/protocol/udp/UDP.h
+++ b/src/analyzer/protocol/udp/UDP.h
@@ -12,7 +12,7 @@ typedef enum {
 	UDP_ACTIVE,	// packets seen
 } UDP_EndpointState;
 
-class UDP_Analyzer : public analyzer::TransportLayerAnalyzer {
+class UDP_Analyzer final : public analyzer::TransportLayerAnalyzer {
 public:
 	explicit UDP_Analyzer(Connection* conn);
 	~UDP_Analyzer() override;
diff --git a/src/analyzer/protocol/vxlan/VXLAN.h b/src/analyzer/protocol/vxlan/VXLAN.h
index acc9accead..27c2538345 100644
--- a/src/analyzer/protocol/vxlan/VXLAN.h
+++ b/src/analyzer/protocol/vxlan/VXLAN.h
@@ -6,7 +6,7 @@
 
 namespace analyzer { namespace vxlan {
 
-class VXLAN_Analyzer : public analyzer::Analyzer {
+class VXLAN_Analyzer final : public analyzer::Analyzer {
 public:
 	explicit VXLAN_Analyzer(Connection* conn)
 	    : Analyzer("VXLAN", conn)
diff --git a/src/analyzer/protocol/xmpp/XMPP.h b/src/analyzer/protocol/xmpp/XMPP.h
index e068e42c74..bc1cd93a33 100644
--- a/src/analyzer/protocol/xmpp/XMPP.h
+++ b/src/analyzer/protocol/xmpp/XMPP.h
@@ -8,7 +8,7 @@
 
 namespace analyzer { namespace xmpp {
 
-class XMPP_Analyzer : public tcp::TCP_ApplicationAnalyzer {
+class XMPP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
 public:
 	explicit XMPP_Analyzer(Connection* conn);
 	~XMPP_Analyzer() override;
diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h
index d9b42147bd..2892ef4727 100644
--- a/src/analyzer/protocol/zip/ZIP.h
+++ b/src/analyzer/protocol/zip/ZIP.h
@@ -9,7 +9,7 @@
 
 namespace analyzer { namespace zip {
 
-class ZIP_Analyzer : public tcp::TCP_SupportAnalyzer {
+class ZIP_Analyzer final : public tcp::TCP_SupportAnalyzer {
 public:
 	enum Method { GZIP, DEFLATE };
 
@@ -27,4 +27,4 @@ protected:
 	Method method;
 };
 
-} } // namespace analyzer::* 
+} } // namespace analyzer::*