diff --git a/abstract_client.h b/abstract_client.h
index db48176e40..61808834d1 100644
--- a/abstract_client.h
+++ b/abstract_client.h
@@ -46,6 +46,7 @@ class Decoration;
 
 namespace KWin
 {
+class Group;
 
 namespace TabBox
 {
diff --git a/effects.h b/effects.h
index 218eff8d0f..299bd80e4c 100644
--- a/effects.h
+++ b/effects.h
@@ -58,6 +58,7 @@ class AbstractClient;
 class Compositor;
 class Deleted;
 class EffectLoader;
+class Group;
 class Toplevel;
 class Unmanaged;
 class WindowPropertyNotifyX11Filter;
diff --git a/toplevel.h b/toplevel.h
index 32266a13ea..a99556108d 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -52,6 +52,7 @@ namespace KWin
 {
 
 class ClientMachine;
+class Deleted;
 class EffectWindowImpl;
 class Shadow;
 
diff --git a/utils.h b/utils.h
index a66b8232c9..0271967ce5 100644
--- a/utils.h
+++ b/utils.h
@@ -43,15 +43,6 @@ namespace KWin
 
 const QPoint invalidPoint(INT_MIN, INT_MIN);
 
-class Toplevel;
-class X11Client;
-class Unmanaged;
-class Deleted;
-class Group;
-class Options;
-
-extern Options* options;
-
 enum Layer {
     UnknownLayer = -1,
     FirstLayer = 0,
diff --git a/workspace.h b/workspace.h
index bbe955d338..e14641557f 100644
--- a/workspace.h
+++ b/workspace.h
@@ -53,9 +53,13 @@ class Window;
 
 class AbstractClient;
 class Compositor;
+class Deleted;
+class Group;
 class InternalClient;
 class KillWindow;
 class ShortcutDialog;
+class Toplevel;
+class Unmanaged;
 class UserActionsMenu;
 class X11Client;
 class X11EventFilter;