diff --git a/scwx-qt/source/scwx/qt/gl/draw/draw_item.hpp b/scwx-qt/source/scwx/qt/gl/draw/draw_item.hpp
index f7df44c4..281b189a 100644
--- a/scwx-qt/source/scwx/qt/gl/draw/draw_item.hpp
+++ b/scwx-qt/source/scwx/qt/gl/draw/draw_item.hpp
@@ -22,7 +22,7 @@ class DrawItem
 {
 public:
    explicit DrawItem(OpenGLFunctions& gl);
-   ~DrawItem();
+   virtual ~DrawItem();
 
    DrawItem(const DrawItem&)            = delete;
    DrawItem& operator=(const DrawItem&) = delete;
diff --git a/scwx-qt/source/scwx/qt/gl/gl.hpp b/scwx-qt/source/scwx/qt/gl/gl.hpp
index 55601b36..e87454c8 100644
--- a/scwx-qt/source/scwx/qt/gl/gl.hpp
+++ b/scwx-qt/source/scwx/qt/gl/gl.hpp
@@ -1,16 +1,7 @@
 #pragma once
 
-#if defined(__clang__)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
-#endif
-
 #include <QOpenGLFunctions_3_3_Core>
 
-#if defined(__clang__)
-#   pragma clang diagnostic pop
-#endif
-
 #define SCWX_GL_CHECK_ERROR()                                                  \
    {                                                                           \
       GLenum err;                                                              \
diff --git a/scwx-qt/source/scwx/qt/map/alert_layer.hpp b/scwx-qt/source/scwx/qt/map/alert_layer.hpp
index b55c06e8..d51391e3 100644
--- a/scwx-qt/source/scwx/qt/map/alert_layer.hpp
+++ b/scwx-qt/source/scwx/qt/map/alert_layer.hpp
@@ -1,16 +1,7 @@
 #pragma once
 
-#if defined(__clang__)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
-#endif
-
 #include <scwx/awips/phenomenon.hpp>
 
-#if defined(__clang__)
-#   pragma clang diagnostic pop
-#endif
-
 #include <scwx/qt/map/draw_layer.hpp>
 #include <scwx/qt/types/text_event_key.hpp>
 
diff --git a/scwx-qt/source/scwx/qt/settings/settings_category.hpp b/scwx-qt/source/scwx/qt/settings/settings_category.hpp
index d7c86abd..2da7b9ab 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_category.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_category.hpp
@@ -18,7 +18,7 @@ class SettingsCategory
 {
 public:
    explicit SettingsCategory(const std::string& name);
-   ~SettingsCategory();
+   virtual ~SettingsCategory();
 
    SettingsCategory(const SettingsCategory&)            = delete;
    SettingsCategory& operator=(const SettingsCategory&) = delete;
diff --git a/scwx-qt/source/scwx/qt/settings/text_settings.cpp b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
index e17031d6..942ad4f8 100644
--- a/scwx-qt/source/scwx/qt/settings/text_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
@@ -1,17 +1,8 @@
-#if defined(__clang__)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
-#endif
-
 #include <scwx/qt/settings/text_settings.hpp>
 #include <scwx/qt/types/text_types.hpp>
 
 #include <boost/algorithm/string.hpp>
 
-#if defined(__clang__)
-#   pragma clang diagnostic pop
-#endif
-
 namespace scwx
 {
 namespace qt