diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 8c50f01e..78d45217 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -599,11 +599,11 @@ target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source)
 
 target_compile_options(scwx-qt PRIVATE
     $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=delete-non-abstract-non-virtual-dtor>
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 target_compile_options(supercell-wx PRIVATE
     $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=delete-non-abstract-non-virtual-dtor>
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
 if (MSVC)
diff --git a/scwx-qt/source/scwx/qt/gl/gl.hpp b/scwx-qt/source/scwx/qt/gl/gl.hpp
index e87454c8..55601b36 100644
--- a/scwx-qt/source/scwx/qt/gl/gl.hpp
+++ b/scwx-qt/source/scwx/qt/gl/gl.hpp
@@ -1,7 +1,16 @@
 #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 99609210..b55c06e8 100644
--- a/scwx-qt/source/scwx/qt/map/alert_layer.hpp
+++ b/scwx-qt/source/scwx/qt/map/alert_layer.hpp
@@ -1,6 +1,16 @@
 #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/text_settings.cpp b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
index 942ad4f8..e17031d6 100644
--- a/scwx-qt/source/scwx/qt/settings/text_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
@@ -1,8 +1,17 @@
+#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
diff --git a/wxdata/source/scwx/common/color_table.cpp b/wxdata/source/scwx/common/color_table.cpp
index aff48f3d..32a4684f 100644
--- a/wxdata/source/scwx/common/color_table.cpp
+++ b/wxdata/source/scwx/common/color_table.cpp
@@ -10,8 +10,18 @@
 #include <sstream>
 
 #include <boost/algorithm/string.hpp>
+
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+
 #include <boost/gil.hpp>
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
+
 #include <hsluv.h>
 
 namespace scwx
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index ce2cb3a8..47ada181 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -260,7 +260,7 @@ target_include_directories(wxdata INTERFACE ${scwx-data_SOURCE_DIR}/include)
 
 target_compile_options(wxdata PRIVATE
     $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=unused-parameter>
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
 if (MSVC)