diff --git a/CMakeLists.txt b/CMakeLists.txt
index edfa9d7..84bae83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,24 +22,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(DEBUG_CXXFLAGS
-  "-Wall"
-  "-Wextra"
-  "-Wpedantic"
-  "-ftrapv"
-  "-fsanitize=undefined"
-  "-g"
-  "-Og"
-  "-fno-omit-frame-pointer")
-set(DEBUG_LDFLAGS
-  "-fsanitize=undefined")
-add_compile_options("$<$<CONFIG:Debug>:${DEBUG_CXXFLAGS}>")
-# add_link_options was introduced in version 3.13.
-if(${CMAKE_VERSION} VERSION_LESS 3.13)
-  set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${DEBUG_LDFLAGS}")
-else()
-  add_link_options("$<$<CONFIG:Debug>:${DEBUG_LDFLAGS}>")
-endif()
+include(cmake/debug_flags.cmake)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(jsoncpp REQUIRED IMPORTED_TARGET jsoncpp)
diff --git a/cmake/debug_flags.cmake b/cmake/debug_flags.cmake
new file mode 100644
index 0000000..7390512
--- /dev/null
+++ b/cmake/debug_flags.cmake
@@ -0,0 +1,62 @@
+# Set compiler flags for Debug builds.
+# Only has an effect on GCC/Clang >= 5.0.
+
+set(tmp_CXXFLAGS "")
+set(tmp_LDFLAGS "")
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+    AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5")
+  list(APPEND tmp_CXXFLAGS
+    "-Wall"
+    "-Wextra"
+    "-Wpedantic"
+    "-Wuninitialized"
+    "-Wshadow"
+    "-Wnon-virtual-dtor"
+    "-Wconversion"
+    "-Wsign-conversion"
+    "-Wold-style-cast"
+    "-Wzero-as-null-pointer-constant"
+    "-Wmissing-declarations"
+    "-Wcast-align"
+    "-Wunused"
+    "-Woverloaded-virtual"
+    "-Wdouble-promotion"
+    "-Wformat=2"
+    "-ftrapv"
+    "-fsanitize=undefined"
+    "-Og"
+    "-fno-omit-frame-pointer")
+  if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    list(APPEND tmp_CXXFLAGS
+      "-Wlogical-op"
+      "-Wuseless-cast")
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6")
+      list(APPEND tmp_CXXFLAGS
+        "-Wmisleading-indentation"
+        "-Wduplicated-cond"
+        "-Wnull-dereference")
+      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7")
+        list(APPEND tmp_CXXFLAGS
+          "-Wduplicated-branches")
+      endif()
+    endif()
+  endif()
+  add_compile_options("$<$<CONFIG:Debug>:${tmp_CXXFLAGS}>")
+
+  list(APPEND tmp_LDFLAGS
+    "-fsanitize=undefined")
+  # add_link_options was introduced in version 3.13.
+  if(${CMAKE_VERSION} VERSION_LESS 3.13)
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${tmp_LDFLAGS}")
+  else()
+    add_link_options("$<$<CONFIG:Debug>:${tmp_LDFLAGS}>")
+  endif()
+else()
+  message(STATUS
+    "No additional compiler flags were set, "
+    "because your compiler was not anticipated.")
+endif()
+
+unset(tmp_CXXFLAGS)
+unset(tmp_LDFLAGS)