diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 0b6bbe36cf9..394c04d5c89 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -43,16 +43,26 @@ if (COMPILER_CLANG)
     add_warning(range-loop-analysis)
     add_warning(redundant-parens)
     add_warning(reserved-id-macro)
-    add_warning(shadow-field) # clang 8+
+    add_warning(shadow-field)
     add_warning(shadow-uncaptured-local)
     add_warning(shadow)
-    add_warning(string-plus-int) # clang 8+
+    add_warning(string-plus-int)
     add_warning(undef)
     add_warning(unreachable-code-return)
     add_warning(unreachable-code)
     add_warning(unused-exception-parameter)
     add_warning(unused-macros)
     add_warning(unused-member-function)
+    add_warning(unneeded-internal-declaration)
+    add_warning(implicit-int-float-conversion)
+    add_warning(no-delete-null-pointer-checks)
+    add_warning(anon-enum-enum-conversion)
+    add_warning(assign-enum)
+    add_warning(bitwise-op-parentheses)
+    add_warning(int-in-bool-context)
+    add_warning(sometimes-uninitialized)
+    add_warning(tautological-bitwise-compare)
+
     # XXX: libstdc++ has some of these for 3way compare
     if (USE_LIBCXX)
         add_warning(zero-as-null-pointer-constant)