diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index d0955d4fa5..6eb579d9c8 100644
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -3676,7 +3676,7 @@ MySqlConfigBackendDHCPv4::isUnusable() {
 
 DatabaseConnection::ParameterMap
 MySqlConfigBackendDHCPv4::getParameters() const {
-    return impl_->getParameters();
+    return (impl_->getParameters());
 }
 
 Subnet4Ptr
diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 48668e9b66..2955f973e7 100644
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -4141,7 +4141,7 @@ MySqlConfigBackendDHCPv6::isUnusable() {
 
 DatabaseConnection::ParameterMap
 MySqlConfigBackendDHCPv6::getParameters() const {
-    return impl_->getParameters();
+    return (impl_->getParameters());
 }
 
 Subnet6Ptr
diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index a2c9b60992..9deaa960db 100644
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -2067,7 +2067,7 @@ public:
     MySqlHostDataSourceImpl(const DatabaseConnection::ParameterMap& parameters);
 
     /// @brief Destructor.
-    ~MySqlHostDataSourceImpl();
+    ~MySqlHostDataSourceImpl() = default;
 
     /// @brief Attempts to reconnect the server to the host DB backend manager.
     ///
@@ -2849,9 +2849,6 @@ MySqlHostDataSourceImpl::createContext() const {
     return (ctx);
 }
 
-MySqlHostDataSourceImpl::~MySqlHostDataSourceImpl() {
-}
-
 bool
 MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     MultiThreadingCriticalSection cs;
@@ -3159,12 +3156,9 @@ MySqlHostDataSource::MySqlHostDataSource(const DatabaseConnection::ParameterMap&
     : impl_(new MySqlHostDataSourceImpl(parameters)) {
 }
 
-MySqlHostDataSource::~MySqlHostDataSource() {
-}
-
 DatabaseConnection::ParameterMap
 MySqlHostDataSource::getParameters() const {
-    return impl_->parameters_;
+    return (impl_->parameters_);
 }
 
 void
diff --git a/src/lib/dhcpsrv/mysql_host_data_source.h b/src/lib/dhcpsrv/mysql_host_data_source.h
index 879eb7e3b6..3f677f11cd 100644
--- a/src/lib/dhcpsrv/mysql_host_data_source.h
+++ b/src/lib/dhcpsrv/mysql_host_data_source.h
@@ -68,7 +68,7 @@ public:
     /// @brief Virtual destructor.
     ///
     /// Releases prepared MySQL statements used by the backend.
-    virtual ~MySqlHostDataSource();
+    virtual ~MySqlHostDataSource() = default;
 
     /// @brief Return backend parameters
     ///
diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc
index 9a8a217e1f..db9204efb2 100644
--- a/src/lib/dhcpsrv/pgsql_host_data_source.cc
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc
@@ -1428,7 +1428,7 @@ public:
     PgSqlHostDataSourceImpl(const DatabaseConnection::ParameterMap& parameters);
 
     /// @brief Destructor.
-    ~PgSqlHostDataSourceImpl();
+    ~PgSqlHostDataSourceImpl() = default;
 
     /// @brief Attempts to reconnect the server to the host DB backend manager.
     ///
@@ -2284,9 +2284,6 @@ PgSqlHostDataSourceImpl::createContext() const {
     return (ctx);
 }
 
-PgSqlHostDataSourceImpl::~PgSqlHostDataSourceImpl() {
-}
-
 bool
 PgSqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     MultiThreadingCriticalSection cs;
@@ -2567,12 +2564,9 @@ PgSqlHostDataSource::PgSqlHostDataSource(const DatabaseConnection::ParameterMap&
     : impl_(new PgSqlHostDataSourceImpl(parameters)) {
 }
 
-PgSqlHostDataSource::~PgSqlHostDataSource() {
-}
-
 DatabaseConnection::ParameterMap
 PgSqlHostDataSource::getParameters() const {
-    return impl_->parameters_;
+    return (impl_->parameters_);
 }
 
 void
diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.h b/src/lib/dhcpsrv/pgsql_host_data_source.h
index 1abada5757..a62e109ab7 100644
--- a/src/lib/dhcpsrv/pgsql_host_data_source.h
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.h
@@ -73,7 +73,7 @@ public:
     ///
     /// Frees database resources and closes the database connection through
     /// the destruction of member impl_.
-    virtual ~PgSqlHostDataSource();
+    virtual ~PgSqlHostDataSource() = default;
 
     /// @brief Return backend parameters
     ///