diff --git a/libs/ardour/ardour/vst3_host.h b/libs/ardour/ardour/vst3_host.h
index 12856bb226..af1b6f5531 100644
--- a/libs/ardour/ardour/vst3_host.h
+++ b/libs/ardour/ardour/vst3_host.h
@@ -44,9 +44,12 @@ tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE \
 #if defined(__clang__)
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#  pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
+#  pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#  pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
 #endif
 
 namespace Steinberg {
diff --git a/libs/ardour/ardour/vst3_plugin.h b/libs/ardour/ardour/vst3_plugin.h
index 3deee4adb8..f170fdfe86 100644
--- a/libs/ardour/ardour/vst3_plugin.h
+++ b/libs/ardour/ardour/vst3_plugin.h
@@ -41,9 +41,12 @@ class AutomationList;
 #if defined(__clang__)
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+# pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
+# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
 #endif
 
 namespace Steinberg {
diff --git a/libs/vst3/vst3.h b/libs/vst3/vst3.h
index 20e5b0ea89..cfac31223e 100644
--- a/libs/vst3/vst3.h
+++ b/libs/vst3/vst3.h
@@ -13,9 +13,12 @@
 #if defined(__clang__)
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#    pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
+#    pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#    pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
 #endif
 
 #if (__cplusplus < 201103L)