diff --git a/src/gui/gtk-base.hpp b/src/gui/gtk-base.hpp
index 8264a50e8..339880668 100644
--- a/src/gui/gtk-base.hpp
+++ b/src/gui/gtk-base.hpp
@@ -49,7 +49,6 @@
 //--------------------tricky special Include sequence
 
 #include "lib/error.hpp"
-#include "lib/util.hpp"
 
 
 #ifdef ENABLE_NLS
diff --git a/src/gui/workspace/window-list.cpp b/src/gui/workspace/window-list.cpp
index 0954996c2..282a0c75a 100644
--- a/src/gui/workspace/window-list.cpp
+++ b/src/gui/workspace/window-list.cpp
@@ -30,6 +30,7 @@
 #include "gui/workspace/ui-manager.hpp"
 #include "gui/workspace/window-list.hpp"
 #include "gui/workspace/workspace-window.hpp"
+#include "lib/util.hpp"
 
 #include <memory>
 #include <list>
diff --git a/src/lib/polymorphic-value.hpp b/src/lib/polymorphic-value.hpp
index b17ea5ca0..c4e683e5c 100644
--- a/src/lib/polymorphic-value.hpp
+++ b/src/lib/polymorphic-value.hpp
@@ -154,6 +154,7 @@
 
 #include "lib/error.hpp"
 #include "lib/meta/duck-detector.hpp"
+#include "lib/util.hpp"
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/static_assert.hpp>