compat: split/cleanup util.hpp

Some of the headers are clearly useless. Remove them.

Move what's inside util.hpp into separate headers.

Adjust usages.

Will remove util.hpp.

2 files changed, 1 insertions, 4 deletions

diff --git a/options/options.hpp b/options/options.hpp
index 0528b0d9..45697597 100644
--- a/options/options.hpp
+++ b/options/options.hpp
@@ -6,8 +6,6 @@
  */
 #pragma once
 
-#include "compat/ndebug-guard.hpp"
-
 #include "compat/util.hpp"
 
 #include "defs.hpp"
diff --git a/options/value-traits.hpp b/options/value-traits.hpp
index 3548c77a..ac5f6e5c 100644
--- a/options/value-traits.hpp
+++ b/options/value-traits.hpp
@@ -1,6 +1,5 @@
 #include "export.hpp"
 
-#include "compat/functional.hpp"
 #include "slider.hpp"
 
 #include <QString>
@@ -37,7 +36,7 @@ struct value_traits<slider_value> : default_value_traits<slider_value>
 
 // Qt uses int a lot in slots so use it for all enums
 template<typename t>
-struct value_traits<t, t, std::enable_if_t<is_enum_v<t>>> : public default_value_traits<int, t>
+struct value_traits<t, t, std::enable_if_t<std::is_enum_v<t>>> : public default_value_traits<int, t>
 {
 };