diff --git a/options.cpp b/options.cpp
index e6d016bea3..5e9e60251c 100644
--- a/options.cpp
+++ b/options.cpp
@@ -25,15 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef KCMRULES
 
-#include <QPalette>
-#include <QPixmap>
 #include <QProcess>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
 
-#include "client.h"
 #include "compositingprefs.h"
 #include "settings.h"
 #include "xcbutils.h"
diff --git a/options.h b/options.h
index 3ac9947b75..040eb614ef 100644
--- a/options.h
+++ b/options.h
@@ -24,18 +24,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_OPTIONS_H
 
 #include <QObject>
-#include <QFont>
-#include <QPalette>
 #include <kdecoration.h>
 
 #include "placement.h"
-#include "utils.h"
 
 namespace KWin
 {
 
-class Client;
-class CompositingPrefs;
+// Whether to keep all windows mapped when compositing (i.e. whether to have
+// actively updated window pixmaps).
+enum HiddenPreviews {
+    // The normal mode with regard to mapped windows. Hidden (minimized, etc.)
+    // and windows on inactive virtual desktops are not mapped, their pixmaps
+    // are only their icons.
+    HiddenPreviewsNever,
+    // Like normal mode, but shown windows (i.e. on inactive virtual desktops)
+    // are kept mapped, only hidden windows are unmapped.
+    HiddenPreviewsShown,
+    // All windows are kept mapped regardless of their state.
+    HiddenPreviewsAlways
+};
+
 class Settings;
 
 class Options : public QObject, public KDecorationOptions
diff --git a/utils.h b/utils.h
index 750d2256d3..4348b98bd4 100644
--- a/utils.h
+++ b/utils.h
@@ -142,20 +142,6 @@ enum ShadeMode {
     ShadeActivated // "shaded", but visible due to alt+tab to the window
 };
 
-// Whether to keep all windows mapped when compositing (i.e. whether to have
-// actively updated window pixmaps).
-enum HiddenPreviews {
-    // The normal mode with regard to mapped windows. Hidden (minimized, etc.)
-    // and windows on inactive virtual desktops are not mapped, their pixmaps
-    // are only their icons.
-    HiddenPreviewsNever,
-    // Like normal mode, but shown windows (i.e. on inactive virtual desktops)
-    // are kept mapped, only hidden windows are unmapped.
-    HiddenPreviewsShown,
-    // All windows are kept mapped regardless of their state.
-    HiddenPreviewsAlways
-};
-
 class Motif
 {
 public: