diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp
index b4174b6b09..12f7e849c0 100644
--- a/effects/blur/blur.cpp
+++ b/effects/blur/blur.cpp
@@ -60,9 +60,9 @@ BlurEffect::BlurEffect()
     } else {
         XDeleteProperty(display(), rootWindow(), net_wm_blur_region);
     }
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
     connect(effects, SIGNAL(screenGeometryChanged(QSize)), this, SLOT(slotScreenGeometryChanged()));
 }
 
diff --git a/effects/blur/blur.h b/effects/blur/blur.h
index 9b51aaefec..ce2eac40ff 100644
--- a/effects/blur/blur.h
+++ b/effects/blur/blur.h
@@ -49,9 +49,9 @@ public:
     void paintEffectFrame(EffectFrame *frame, QRegion region, double opacity, double frameOpacity);
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotPropertyNotify(EffectWindow *w, long atom);
+    void slotWindowAdded(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotPropertyNotify(KWin::EffectWindow *w, long atom);
     void slotScreenGeometryChanged();
 
 private:
diff --git a/effects/boxswitch/boxswitch.cpp b/effects/boxswitch/boxswitch.cpp
index 68a820c90d..a24173613d 100644
--- a/effects/boxswitch/boxswitch.cpp
+++ b/effects/boxswitch/boxswitch.cpp
@@ -57,12 +57,12 @@ BoxSwitchEffect::BoxSwitchEffect()
 
     highlight_margin = 10;
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
     connect(effects, SIGNAL(tabBoxAdded(int)), this, SLOT(slotTabBoxAdded(int)));
     connect(effects, SIGNAL(tabBoxClosed()), this, SLOT(slotTabBoxClosed()));
     connect(effects, SIGNAL(tabBoxUpdated()), this, SLOT(slotTabBoxUpdated()));
-    connect(effects, SIGNAL(windowGeometryShapeChanged(EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(EffectWindow*,QRect)));
-    connect(effects, SIGNAL(windowDamaged(EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(KWin::EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowDamaged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(KWin::EffectWindow*,QRect)));
 }
 
 BoxSwitchEffect::~BoxSwitchEffect()
diff --git a/effects/boxswitch/boxswitch.h b/effects/boxswitch/boxswitch.h
index cfb6b47a55..54228df11c 100644
--- a/effects/boxswitch/boxswitch.h
+++ b/effects/boxswitch/boxswitch.h
@@ -60,12 +60,12 @@ public:
     void paintWindowsBox(const QRegion& region);
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow* w);
+    void slotWindowClosed(KWin::EffectWindow* w);
     void slotTabBoxAdded(int mode);
     void slotTabBoxClosed();
     void slotTabBoxUpdated();
-    void slotWindowGeometryShapeChanged(EffectWindow *w, const QRect &old);
-    void slotWindowDamaged(EffectWindow* w, const QRect& damage);
+    void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
+    void slotWindowDamaged(KWin::EffectWindow* w, const QRect& damage);
 
 private:
     class ItemInfo;
diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp
index bdf2fbe65e..fe517d0312 100644
--- a/effects/coverswitch/coverswitch.cpp
+++ b/effects/coverswitch/coverswitch.cpp
@@ -70,7 +70,7 @@ CoverSwitchEffect::CoverSwitchEffect()
 
     const QString fragmentshader = KGlobal::dirs()->findResource("data", "kwin/coverswitch-reflection.glsl");
     m_reflectionShader = ShaderManager::instance()->loadFragmentShader(ShaderManager::GenericShader, fragmentshader);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
     connect(effects, SIGNAL(tabBoxAdded(int)), this, SLOT(slotTabBoxAdded(int)));
     connect(effects, SIGNAL(tabBoxClosed()), this, SLOT(slotTabBoxClosed()));
     connect(effects, SIGNAL(tabBoxUpdated()), this, SLOT(slotTabBoxUpdated()));
diff --git a/effects/coverswitch/coverswitch.h b/effects/coverswitch/coverswitch.h
index b49a36e660..b7a9da3672 100644
--- a/effects/coverswitch/coverswitch.h
+++ b/effects/coverswitch/coverswitch.h
@@ -53,7 +53,7 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *c);
+    void slotWindowClosed(KWin::EffectWindow *c);
     void slotTabBoxAdded(int mode);
     void slotTabBoxClosed();
     void slotTabBoxUpdated();
diff --git a/effects/cube/cubeslide.cpp b/effects/cube/cubeslide.cpp
index ed1f51875b..6d4bc47bbe 100644
--- a/effects/cube/cubeslide.cpp
+++ b/effects/cube/cubeslide.cpp
@@ -39,8 +39,8 @@ CubeSlideEffect::CubeSlideEffect()
     , progressRestriction(0.0f)
 {
     connect(effects, SIGNAL(desktopChanged(int,int)), this, SLOT(slotDesktopChanged(int,int)));
-    connect(effects, SIGNAL(windowStepUserMovedResized(EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(EffectWindow*)));
+    connect(effects, SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(KWin::EffectWindow*)));
     reconfigure(ReconfigureAll);
 }
 
diff --git a/effects/cube/cubeslide.h b/effects/cube/cubeslide.h
index ffbda88f6a..96b814840c 100644
--- a/effects/cube/cubeslide.h
+++ b/effects/cube/cubeslide.h
@@ -48,8 +48,8 @@ public:
 
 private Q_SLOTS:
     void slotDesktopChanged(int old, int current);
-    void slotWindowStepUserMovedResized(EffectWindow *w);
-    void slotWindowFinishUserMovedResized(EffectWindow *w);
+    void slotWindowStepUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowFinishUserMovedResized(KWin::EffectWindow *w);
 
 private:
     enum RotationDirection {
diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp
index 4f6dc65acf..bb803a9b6a 100644
--- a/effects/dashboard/dashboard.cpp
+++ b/effects/dashboard/dashboard.cpp
@@ -37,9 +37,9 @@ DashboardEffect::DashboardEffect()
 
     // read settings
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
 }
 
 DashboardEffect::~DashboardEffect()
diff --git a/effects/dashboard/dashboard.h b/effects/dashboard/dashboard.h
index 46d3e98129..80df408c26 100644
--- a/effects/dashboard/dashboard.h
+++ b/effects/dashboard/dashboard.h
@@ -46,9 +46,9 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* c);
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowActivated(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowActivated(KWin::EffectWindow *w);
 private:
     bool blur;
     bool isDashboard(EffectWindow* w);
diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index e0beace1c0..21770eb880 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -74,11 +74,11 @@ DesktopGridEffect::DesktopGridEffect()
     shortcut = a->globalShortcut();
     connect(a, SIGNAL(triggered(bool)), this, SLOT(toggle()));
     connect(a, SIGNAL(globalShortcutChanged(QKeySequence)), this, SLOT(globalShortcutChanged(QKeySequence)));
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
     connect(effects, SIGNAL(numberDesktopsChanged(int)), this, SLOT(slotNumberDesktopsChanged(int)));
-    connect(effects, SIGNAL(windowGeometryShapeChanged(EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(KWin::EffectWindow*,QRect)));
 
     // Load all other configuration details
     reconfigure(ReconfigureAll);
diff --git a/effects/desktopgrid/desktopgrid.h b/effects/desktopgrid/desktopgrid.h
index b420389a01..ecab0ce917 100644
--- a/effects/desktopgrid/desktopgrid.h
+++ b/effects/desktopgrid/desktopgrid.h
@@ -86,11 +86,11 @@ private slots:
     void globalShortcutChanged(const QKeySequence& seq);
     void slotAddDesktop();
     void slotRemoveDesktop();
-    void slotWindowAdded(EffectWindow* w);
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
     void slotNumberDesktopsChanged(int old);
-    void slotWindowGeometryShapeChanged(EffectWindow *w, const QRect &old);
+    void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
 
 private:
     QPointF scalePos(const QPoint& pos, int desktop, int screen = -1) const;
diff --git a/effects/dialogparent/dialogparent.cpp b/effects/dialogparent/dialogparent.cpp
index ac9493a555..bf9e24b018 100644
--- a/effects/dialogparent/dialogparent.cpp
+++ b/effects/dialogparent/dialogparent.cpp
@@ -29,8 +29,8 @@ KWIN_EFFECT(dialogparent, DialogParentEffect)
 DialogParentEffect::DialogParentEffect()
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
 }
 
 void DialogParentEffect::reconfigure(ReconfigureFlags)
diff --git a/effects/dialogparent/dialogparent.h b/effects/dialogparent/dialogparent.h
index 439c67eb73..95814b0188 100644
--- a/effects/dialogparent/dialogparent.h
+++ b/effects/dialogparent/dialogparent.h
@@ -49,8 +49,8 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowActivated(EffectWindow *c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowActivated(KWin::EffectWindow *c);
 protected:
     bool hasModalWindow(EffectWindow* t);
 private:
diff --git a/effects/diminactive/diminactive.cpp b/effects/diminactive/diminactive.cpp
index 6978f36317..e1f8f6eced 100644
--- a/effects/diminactive/diminactive.cpp
+++ b/effects/diminactive/diminactive.cpp
@@ -35,8 +35,8 @@ DimInactiveEffect::DimInactiveEffect()
     previousActiveTimeline.setDuration(animationTime(250));
     active = effects->activeWindow();
     previousActive = NULL;
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
 }
 
 void DimInactiveEffect::reconfigure(ReconfigureFlags)
diff --git a/effects/diminactive/diminactive.h b/effects/diminactive/diminactive.h
index 24a80de8a5..b9c3c281d9 100644
--- a/effects/diminactive/diminactive.h
+++ b/effects/diminactive/diminactive.h
@@ -41,8 +41,8 @@ public:
     virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
 
 public Q_SLOTS:
-    void slotWindowActivated(EffectWindow* c);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowActivated(KWin::EffectWindow* c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
 
 private:
     bool dimWindow(const EffectWindow* w) const;
diff --git a/effects/dimscreen/dimscreen.cpp b/effects/dimscreen/dimscreen.cpp
index fd4c15a6b3..6563f47368 100644
--- a/effects/dimscreen/dimscreen.cpp
+++ b/effects/dimscreen/dimscreen.cpp
@@ -32,7 +32,7 @@ DimScreenEffect::DimScreenEffect()
     , deactivateAnimation(false)
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
 }
 
 DimScreenEffect::~DimScreenEffect()
diff --git a/effects/dimscreen/dimscreen.h b/effects/dimscreen/dimscreen.h
index ee8c114c41..571684ed37 100644
--- a/effects/dimscreen/dimscreen.h
+++ b/effects/dimscreen/dimscreen.h
@@ -42,7 +42,7 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowActivated(EffectWindow *w);
+    void slotWindowActivated(KWin::EffectWindow *w);
 
 private:
     bool mActivated;
diff --git a/effects/explosion/explosion.cpp b/effects/explosion/explosion.cpp
index dc9cd1441e..49c5d3add2 100644
--- a/effects/explosion/explosion.cpp
+++ b/effects/explosion/explosion.cpp
@@ -47,8 +47,8 @@ ExplosionEffect::ExplosionEffect() : Effect()
     mActiveAnimations = 0;
     mValid = true;
     mInited = false;
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
 }
 
 ExplosionEffect::~ExplosionEffect()
diff --git a/effects/explosion/explosion.h b/effects/explosion/explosion.h
index 8a343c7908..2528e8d3fd 100644
--- a/effects/explosion/explosion.h
+++ b/effects/explosion/explosion.h
@@ -52,8 +52,8 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
 
 protected:
     bool loadData();
diff --git a/effects/fade/fade.cpp b/effects/fade/fade.cpp
index 213516bd85..4428c9a271 100644
--- a/effects/fade/fade.cpp
+++ b/effects/fade/fade.cpp
@@ -35,10 +35,10 @@ FadeEffect::FadeEffect()
     , fadeWindows(false)
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowOpacityChanged(EffectWindow*,qreal,qreal)), this, SLOT(slotWindowOpacityChanged(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowOpacityChanged(KWin::EffectWindow*,qreal,qreal)), this, SLOT(slotWindowOpacityChanged(KWin::EffectWindow*)));
 }
 
 void FadeEffect::reconfigure(ReconfigureFlags)
diff --git a/effects/fade/fade.h b/effects/fade/fade.h
index 38c00405e5..a51ff67460 100644
--- a/effects/fade/fade.h
+++ b/effects/fade/fade.h
@@ -43,10 +43,10 @@ public:
     bool isFadeWindow(EffectWindow* w);
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* c);
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowOpacityChanged(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowOpacityChanged(KWin::EffectWindow *w);
 private:
     class WindowInfo;
     QHash< const EffectWindow*, WindowInfo > windows;
diff --git a/effects/fallapart/fallapart.cpp b/effects/fallapart/fallapart.cpp
index 5db5ee7350..8040952032 100644
--- a/effects/fallapart/fallapart.cpp
+++ b/effects/fallapart/fallapart.cpp
@@ -32,8 +32,8 @@ KWIN_EFFECT(fallapart, FallApartEffect)
 FallApartEffect::FallApartEffect()
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
 }
 
 void FallApartEffect::reconfigure(ReconfigureFlags)
diff --git a/effects/fallapart/fallapart.h b/effects/fallapart/fallapart.h
index acc1446d6f..8dfcf29a3a 100644
--- a/effects/fallapart/fallapart.h
+++ b/effects/fallapart/fallapart.h
@@ -40,8 +40,8 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
 
 private:
     QHash< const EffectWindow*, double > windows;
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index 26036459c8..a32c47ceac 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -70,8 +70,8 @@ FlipSwitchEffect::FlipSwitchEffect()
     m_shortcutAll = b->globalShortcut();
     connect(b, SIGNAL(triggered(bool)), this, SLOT(toggleActiveAllDesktops()));
     connect(b, SIGNAL(globalShortcutChanged(QKeySequence)), this, SLOT(globalShortcutChangedAll(QKeySequence)));
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
     connect(effects, SIGNAL(tabBoxAdded(int)), this, SLOT(slotTabBoxAdded(int)));
     connect(effects, SIGNAL(tabBoxClosed()), this, SLOT(slotTabBoxClosed()));
     connect(effects, SIGNAL(tabBoxUpdated()), this, SLOT(slotTabBoxUpdated()));
diff --git a/effects/flipswitch/flipswitch.h b/effects/flipswitch/flipswitch.h
index 559e88ba1a..f3fca73e3b 100644
--- a/effects/flipswitch/flipswitch.h
+++ b/effects/flipswitch/flipswitch.h
@@ -55,8 +55,8 @@ private Q_SLOTS:
     void toggleActiveAllDesktops();
     void globalShortcutChangedCurrent(QKeySequence shortcut);
     void globalShortcutChangedAll(QKeySequence shortcut);
-    void slotWindowAdded(EffectWindow* w);
-    void slotWindowClosed(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* w);
+    void slotWindowClosed(KWin::EffectWindow *w);
     void slotTabBoxAdded(int mode);
     void slotTabBoxClosed();
     void slotTabBoxUpdated();
diff --git a/effects/glide/glide.cpp b/effects/glide/glide.cpp
index 99a8c8b0b1..2dcdfc381e 100644
--- a/effects/glide/glide.cpp
+++ b/effects/glide/glide.cpp
@@ -41,9 +41,9 @@ GlideEffect::GlideEffect()
     slideAtom = XInternAtom( display(), "_KDE_SLIDE", False );
     effects->registerPropertyType( slideAtom, true );
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
 }
 
 GlideEffect::~GlideEffect()
diff --git a/effects/glide/glide.h b/effects/glide/glide.h
index 000334595d..6e0cbda6ee 100644
--- a/effects/glide/glide.h
+++ b/effects/glide/glide.h
@@ -46,9 +46,9 @@ public:
 
     static bool supported();
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* c);
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
 
 private:
     class WindowInfo;
diff --git a/effects/highlightwindow/highlightwindow.cpp b/effects/highlightwindow/highlightwindow.cpp
index e57a6f9081..816526d59b 100644
--- a/effects/highlightwindow/highlightwindow.cpp
+++ b/effects/highlightwindow/highlightwindow.cpp
@@ -38,10 +38,10 @@ HighlightWindowEffect::HighlightWindowEffect()
     // Announce support by creating a dummy version on the root window
     unsigned char dummy = 0;
     XChangeProperty(display(), rootWindow(), m_atom, m_atom, 8, PropModeReplace, &dummy, 1);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
 }
 
 HighlightWindowEffect::~HighlightWindowEffect()
diff --git a/effects/highlightwindow/highlightwindow.h b/effects/highlightwindow/highlightwindow.h
index 8b46bd4476..2adefb2d02 100644
--- a/effects/highlightwindow/highlightwindow.h
+++ b/effects/highlightwindow/highlightwindow.h
@@ -39,10 +39,10 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* w);
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotPropertyNotify(EffectWindow* w, long atom);
+    void slotWindowAdded(KWin::EffectWindow* w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotPropertyNotify(KWin::EffectWindow* w, long atom);
 
 private:
     void prepareHighlighting();
diff --git a/effects/invert/invert.cpp b/effects/invert/invert.cpp
index 6f0efb3d4a..e87851605a 100644
--- a/effects/invert/invert.cpp
+++ b/effects/invert/invert.cpp
@@ -54,7 +54,7 @@ InvertEffect::InvertEffect()
     b->setText(i18n("Toggle Invert Effect on Window"));
     b->setGlobalShortcut(KShortcut(Qt::CTRL + Qt::META + Qt::Key_U));
     connect(b, SIGNAL(triggered(bool)), this, SLOT(toggleWindow()));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
 }
 
 InvertEffect::~InvertEffect()
diff --git a/effects/invert/invert.h b/effects/invert/invert.h
index 3dc49fb06f..d02a5707fa 100644
--- a/effects/invert/invert.h
+++ b/effects/invert/invert.h
@@ -51,7 +51,7 @@ public:
 public slots:
     void toggle();
     void toggleWindow();
-    void slotWindowClosed(EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *w);
 
 protected:
     bool loadData();
diff --git a/effects/login/login.cpp b/effects/login/login.cpp
index a9da287ddc..cbbda1b2a3 100644
--- a/effects/login/login.cpp
+++ b/effects/login/login.cpp
@@ -34,7 +34,7 @@ LoginEffect::LoginEffect()
     , login_window(NULL)
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
 }
 
 void LoginEffect::prePaintScreen(ScreenPrePaintData& data, int time)
diff --git a/effects/login/login.h b/effects/login/login.h
index db30044ccc..a25da79a80 100644
--- a/effects/login/login.h
+++ b/effects/login/login.h
@@ -41,7 +41,7 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *w);
 
 private:
     bool isLoginSplash(EffectWindow* w);
diff --git a/effects/logout/logout.cpp b/effects/logout/logout.cpp
index 4e97ebe82f..6d30927f38 100644
--- a/effects/logout/logout.cpp
+++ b/effects/logout/logout.cpp
@@ -60,10 +60,10 @@ LogoutEffect::LogoutEffect()
     blurTarget = NULL;
 #endif
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
 }
 
 LogoutEffect::~LogoutEffect()
diff --git a/effects/logout/logout.h b/effects/logout/logout.h
index f08152f2a3..a64244224e 100644
--- a/effects/logout/logout.h
+++ b/effects/logout/logout.h
@@ -46,10 +46,10 @@ public:
     virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
     virtual bool isActive() const;
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* w);
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotPropertyNotify(EffectWindow *w, long a);
+    void slotWindowAdded(KWin::EffectWindow* w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotPropertyNotify(KWin::EffectWindow *w, long a);
 private:
     bool isLogoutDialog(EffectWindow* w);
     double progress; // 0-1
diff --git a/effects/magiclamp/magiclamp.cpp b/effects/magiclamp/magiclamp.cpp
index f7f73b4605..e5c1018c87 100644
--- a/effects/magiclamp/magiclamp.cpp
+++ b/effects/magiclamp/magiclamp.cpp
@@ -36,9 +36,9 @@ MagicLampEffect::MagicLampEffect()
 {
     mActiveAnimations = 0;
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowMinimized(EffectWindow*)), this, SLOT(slotWindowMinimized(EffectWindow*)));
-    connect(effects, SIGNAL(windowUnminimized(EffectWindow*)), this, SLOT(slotWindowUnminimized(EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowMinimized(KWin::EffectWindow*)), this, SLOT(slotWindowMinimized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowUnminimized(KWin::EffectWindow*)), this, SLOT(slotWindowUnminimized(KWin::EffectWindow*)));
 }
 
 bool MagicLampEffect::supported()
diff --git a/effects/magiclamp/magiclamp.h b/effects/magiclamp/magiclamp.h
index 8000081632..6131a16293 100644
--- a/effects/magiclamp/magiclamp.h
+++ b/effects/magiclamp/magiclamp.h
@@ -45,9 +45,9 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowMinimized(EffectWindow *w);
-    void slotWindowUnminimized(EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowMinimized(KWin::EffectWindow *w);
+    void slotWindowUnminimized(KWin::EffectWindow *w);
 
 private:
     QHash< EffectWindow*, QTimeLine* > mTimeLineWindows;
diff --git a/effects/minimizeanimation/minimizeanimation.cpp b/effects/minimizeanimation/minimizeanimation.cpp
index 44d15ec049..eb7f6f1d19 100644
--- a/effects/minimizeanimation/minimizeanimation.cpp
+++ b/effects/minimizeanimation/minimizeanimation.cpp
@@ -29,9 +29,9 @@ KWIN_EFFECT(minimizeanimation, MinimizeAnimationEffect)
 MinimizeAnimationEffect::MinimizeAnimationEffect()
 {
     mActiveAnimations = 0;
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowMinimized(EffectWindow*)), this, SLOT(slotWindowMinimized(EffectWindow*)));
-    connect(effects, SIGNAL(windowUnminimized(EffectWindow*)), this, SLOT(slotWindowUnminimized(EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowMinimized(KWin::EffectWindow*)), this, SLOT(slotWindowMinimized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowUnminimized(KWin::EffectWindow*)), this, SLOT(slotWindowUnminimized(KWin::EffectWindow*)));
 }
 
 
diff --git a/effects/minimizeanimation/minimizeanimation.h b/effects/minimizeanimation/minimizeanimation.h
index 27e0dd37f9..7e71625657 100644
--- a/effects/minimizeanimation/minimizeanimation.h
+++ b/effects/minimizeanimation/minimizeanimation.h
@@ -46,9 +46,9 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowMinimized(EffectWindow *w);
-    void slotWindowUnminimized(EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowMinimized(KWin::EffectWindow *w);
+    void slotWindowUnminimized(KWin::EffectWindow *w);
 
 private:
     QHash< EffectWindow*, QTimeLine* > mTimeLineWindows;
diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index db1e86a7a8..f3159c0e37 100755
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -104,15 +104,15 @@ PresentWindowsEffect::PresentWindowsEffect()
     connect(c, SIGNAL(globalShortcutChanged(QKeySequence)), this, SLOT(globalShortcutChangedClass(QKeySequence)));
     shortcutClass = c->globalShortcut();
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowGeometryShapeChanged(EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(KWin::EffectWindow*,QRect)));
     connect(effects, SIGNAL(tabBoxAdded(int)), this, SLOT(slotTabBoxAdded(int)));
     connect(effects, SIGNAL(tabBoxClosed()), this, SLOT(slotTabBoxClosed()));
     connect(effects, SIGNAL(tabBoxUpdated()), this, SLOT(slotTabBoxUpdated()));
     connect(effects, SIGNAL(tabBoxKeyEvent(QKeyEvent*)), this, SLOT(slotTabBoxKeyEvent(QKeyEvent*)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
 }
 
 PresentWindowsEffect::~PresentWindowsEffect()
diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h
index 08aa26236d..4073ee6458 100644
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@@ -148,17 +148,17 @@ public slots:
     void globalShortcutChangedAll(const QKeySequence& seq);
     void globalShortcutChangedClass(const QKeySequence& seq);
     // EffectsHandler
-    void slotWindowAdded(EffectWindow *w);
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowGeometryShapeChanged(EffectWindow *w, const QRect &old);
+    void slotWindowAdded(KWin::EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
     // Tab box
     void slotTabBoxAdded(int mode);
     void slotTabBoxClosed();
     void slotTabBoxUpdated();
     void slotTabBoxKeyEvent(QKeyEvent* event);
     // atoms
-    void slotPropertyNotify(EffectWindow* w, long atom);
+    void slotPropertyNotify(KWin::EffectWindow* w, long atom);
 
 private slots:
     void closeWindow();
diff --git a/effects/resize/resize.cpp b/effects/resize/resize.cpp
index 84bdd7f7db..df7725a5be 100644
--- a/effects/resize/resize.cpp
+++ b/effects/resize/resize.cpp
@@ -41,9 +41,9 @@ ResizeEffect::ResizeEffect()
     , m_resizeWindow(0)
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowStartUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowStepUserMovedResized(EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(EffectWindow*,QRect)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(EffectWindow*)));
+    connect(effects, SIGNAL(windowStartUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(KWin::EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(KWin::EffectWindow*)));
 }
 
 ResizeEffect::~ResizeEffect()
diff --git a/effects/resize/resize.h b/effects/resize/resize.h
index 0411d6d813..d6c815c6c1 100644
--- a/effects/resize/resize.h
+++ b/effects/resize/resize.h
@@ -43,9 +43,9 @@ public:
     virtual void reconfigure(ReconfigureFlags);
 
 public Q_SLOTS:
-    void slotWindowStartUserMovedResized(EffectWindow *w);
-    void slotWindowStepUserMovedResized(EffectWindow *w, const QRect &geometry);
-    void slotWindowFinishUserMovedResized(EffectWindow *w);
+    void slotWindowStartUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowStepUserMovedResized(KWin::EffectWindow *w, const QRect &geometry);
+    void slotWindowFinishUserMovedResized(KWin::EffectWindow *w);
 
 private:
     enum Feature { TextureScale = 1 << 0, Outline = 1 << 1 };
diff --git a/effects/scalein/scalein.cpp b/effects/scalein/scalein.cpp
index 25d78df31d..17cf105e88 100644
--- a/effects/scalein/scalein.cpp
+++ b/effects/scalein/scalein.cpp
@@ -29,8 +29,8 @@ KWIN_EFFECT(scalein, ScaleInEffect)
 ScaleInEffect::ScaleInEffect()
     : Effect()
 {
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
 }
 
 void ScaleInEffect::prePaintScreen(ScreenPrePaintData& data, int time)
diff --git a/effects/scalein/scalein.h b/effects/scalein/scalein.h
index 8ae7504864..0b3ae56eb6 100644
--- a/effects/scalein/scalein.h
+++ b/effects/scalein/scalein.h
@@ -41,8 +41,8 @@ public:
     virtual bool isActive() const;
     // TODO react also on virtual desktop changes
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* c);
-    void slotWindowClosed(EffectWindow *c);
+    void slotWindowAdded(KWin::EffectWindow* c);
+    void slotWindowClosed(KWin::EffectWindow *c);
 private:
     bool isScaleWindow(EffectWindow* w);
     QHash< const EffectWindow*, QTimeLine* > mTimeLineWindows;
diff --git a/effects/screenshot/screenshot.cpp b/effects/screenshot/screenshot.cpp
index 6bd18e3e85..113228b0ff 100644
--- a/effects/screenshot/screenshot.cpp
+++ b/effects/screenshot/screenshot.cpp
@@ -43,7 +43,7 @@ bool ScreenShotEffect::supported()
 ScreenShotEffect::ScreenShotEffect()
     : m_scheduledScreenshot(0)
 {
-    connect ( effects, SIGNAL(windowClosed(EffectWindow*)), SLOT(windowClosed(EffectWindow*)) );
+    connect ( effects, SIGNAL(windowClosed(KWin::EffectWindow*)), SLOT(windowClosed(KWin::EffectWindow*)) );
     QDBusConnection::sessionBus().registerObject("/Screenshot", this, QDBusConnection::ExportScriptableContents);
     QDBusConnection::sessionBus().registerService("org.kde.kwin.Screenshot");
 }
diff --git a/effects/screenshot/screenshot.h b/effects/screenshot/screenshot.h
index 22385a32c6..f05d0ec19a 100644
--- a/effects/screenshot/screenshot.h
+++ b/effects/screenshot/screenshot.h
@@ -74,7 +74,7 @@ Q_SIGNALS:
     Q_SCRIPTABLE void screenshotCreated(qulonglong handle);
 
 private slots:
-    void windowClosed( EffectWindow* w );
+    void windowClosed( KWin::EffectWindow* w );
 
 private:
     void grabPointerImage(QImage& snapshot, int offsetx, int offsety);
diff --git a/effects/sheet/sheet.cpp b/effects/sheet/sheet.cpp
index 9156f0dd0b..622403a8c5 100644
--- a/effects/sheet/sheet.cpp
+++ b/effects/sheet/sheet.cpp
@@ -37,9 +37,9 @@ static const int IsSheetWindow = 0x22A982D5;
 SheetEffect::SheetEffect()
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
 }
 
 bool SheetEffect::supported()
diff --git a/effects/sheet/sheet.h b/effects/sheet/sheet.h
index 7ec739b20c..abee09ae25 100644
--- a/effects/sheet/sheet.h
+++ b/effects/sheet/sheet.h
@@ -45,9 +45,9 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow* c);
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
+    void slotWindowAdded(KWin::EffectWindow* c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
 private:
     class WindowInfo;
     typedef QMap< const EffectWindow*, WindowInfo > InfoMap;
diff --git a/effects/slideback/slideback.cpp b/effects/slideback/slideback.cpp
index 74abcdd605..628ac81a90 100644
--- a/effects/slideback/slideback.cpp
+++ b/effects/slideback/slideback.cpp
@@ -33,11 +33,11 @@ SlideBackEffect::SlideBackEffect()
     updateStackingOrder();
     disabled = false;
     unminimizedWindow = NULL;
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowUnminimized(EffectWindow*)), this, SLOT(slotWindowUnminimized(EffectWindow*)));
-    connect(effects, SIGNAL(clientGroupItemSwitched(EffectWindow*,EffectWindow*)), this, SLOT(slotClientGroupItemSwitched(EffectWindow*,EffectWindow*)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowUnminimized(KWin::EffectWindow*)), this, SLOT(slotWindowUnminimized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(clientGroupItemSwitched(KWin::EffectWindow*,KWin::EffectWindow*)), this, SLOT(slotClientGroupItemSwitched(KWin::EffectWindow*,KWin::EffectWindow*)));
     connect(effects, SIGNAL(tabBoxClosed()), this, SLOT(slotTabBoxClosed()));
 }
 
diff --git a/effects/slideback/slideback.h b/effects/slideback/slideback.h
index 0cba5561e7..34e2bfe84d 100644
--- a/effects/slideback/slideback.h
+++ b/effects/slideback/slideback.h
@@ -43,11 +43,11 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow *w);
-    void slotWindowActivated(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowUnminimized(EffectWindow *w);
-    void slotClientGroupItemSwitched(EffectWindow* from, EffectWindow* to);
+    void slotWindowAdded(KWin::EffectWindow *w);
+    void slotWindowActivated(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowUnminimized(KWin::EffectWindow *w);
+    void slotClientGroupItemSwitched(KWin::EffectWindow* from, KWin::EffectWindow* to);
     void slotTabBoxClosed();
 
 private:
diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp
index 74346ce786..137ff97fab 100644
--- a/effects/slidingpopups/slidingpopups.cpp
+++ b/effects/slidingpopups/slidingpopups.cpp
@@ -36,10 +36,10 @@ SlidingPopupsEffect::SlidingPopupsEffect()
     // TODO hackish way to announce support, make better after 4.0
     unsigned char dummy = 0;
     XChangeProperty(display(), rootWindow(), mAtom, mAtom, 8, PropModeReplace, &dummy, 1);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
     reconfigure(ReconfigureAll);
 }
 
diff --git a/effects/slidingpopups/slidingpopups.h b/effects/slidingpopups/slidingpopups.h
index eca9e2e5a4..dd51af9d98 100644
--- a/effects/slidingpopups/slidingpopups.h
+++ b/effects/slidingpopups/slidingpopups.h
@@ -45,10 +45,10 @@ public:
     // TODO react also on virtual desktop changes
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow *c);
-    void slotWindowClosed(EffectWindow *c);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotPropertyNotify(EffectWindow *w, long a);
+    void slotWindowAdded(KWin::EffectWindow *c);
+    void slotWindowClosed(KWin::EffectWindow *c);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotPropertyNotify(KWin::EffectWindow *w, long a);
 private:
     enum Position {
         West = 0,
diff --git a/effects/snaphelper/snaphelper.cpp b/effects/snaphelper/snaphelper.cpp
index a30cc60f50..bb44e50e8f 100644
--- a/effects/snaphelper/snaphelper.cpp
+++ b/effects/snaphelper/snaphelper.cpp
@@ -35,9 +35,9 @@ SnapHelperEffect::SnapHelperEffect()
 {
     m_timeline.setCurveShape(QTimeLine::LinearCurve);
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowStartUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStartUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(KWin::EffectWindow*)));
 
     /*if ( effects->compositingType() == XRenderCompositing )
         {
diff --git a/effects/snaphelper/snaphelper.h b/effects/snaphelper/snaphelper.h
index ee60f8fe43..594fdf06ed 100644
--- a/effects/snaphelper/snaphelper.h
+++ b/effects/snaphelper/snaphelper.h
@@ -44,9 +44,9 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowStartUserMovedResized(EffectWindow *w);
-    void slotWindowFinishUserMovedResized(EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowStartUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowFinishUserMovedResized(KWin::EffectWindow *w);
 
 private:
     bool m_active;
diff --git a/effects/taskbarthumbnail/taskbarthumbnail.cpp b/effects/taskbarthumbnail/taskbarthumbnail.cpp
index ac68876faa..ae362129c6 100644
--- a/effects/taskbarthumbnail/taskbarthumbnail.cpp
+++ b/effects/taskbarthumbnail/taskbarthumbnail.cpp
@@ -43,10 +43,10 @@ TaskbarThumbnailEffect::TaskbarThumbnailEffect()
     // TODO hackish way to announce support, make better after 4.0
     unsigned char dummy = 0;
     XChangeProperty(display(), rootWindow(), atom, atom, 8, PropModeReplace, &dummy, 1);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowDeleted(EffectWindow*)), this, SLOT(slotWindowDeleted(EffectWindow*)));
-    connect(effects, SIGNAL(windowDamaged(EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(EffectWindow*,QRect)));
-    connect(effects, SIGNAL(propertyNotify(EffectWindow*,long)), this, SLOT(slotPropertyNotify(EffectWindow*,long)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowDamaged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(KWin::EffectWindow*,QRect)));
+    connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
 }
 
 TaskbarThumbnailEffect::~TaskbarThumbnailEffect()
diff --git a/effects/taskbarthumbnail/taskbarthumbnail.h b/effects/taskbarthumbnail/taskbarthumbnail.h
index 77e5294cb8..2fb6e39d98 100644
--- a/effects/taskbarthumbnail/taskbarthumbnail.h
+++ b/effects/taskbarthumbnail/taskbarthumbnail.h
@@ -41,10 +41,10 @@ public:
     virtual bool isActive() const;
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow *w);
-    void slotWindowDeleted(EffectWindow *w);
-    void slotWindowDamaged(EffectWindow* w, const QRect& damage);
-    void slotPropertyNotify(EffectWindow *w, long atom);
+    void slotWindowAdded(KWin::EffectWindow *w);
+    void slotWindowDeleted(KWin::EffectWindow *w);
+    void slotWindowDamaged(KWin::EffectWindow* w, const QRect& damage);
+    void slotPropertyNotify(KWin::EffectWindow *w, long atom);
 private:
     struct Data {
         Window window; // thumbnail of this window
diff --git a/effects/thumbnailaside/thumbnailaside.cpp b/effects/thumbnailaside/thumbnailaside.cpp
index 3a1b4e0bba..10160193d9 100644
--- a/effects/thumbnailaside/thumbnailaside.cpp
+++ b/effects/thumbnailaside/thumbnailaside.cpp
@@ -38,9 +38,9 @@ ThumbnailAsideEffect::ThumbnailAsideEffect()
     a->setText(i18n("Toggle Thumbnail for Current Window"));
     a->setGlobalShortcut(KShortcut(Qt::CTRL + Qt::META + Qt::Key_T));
     connect(a, SIGNAL(triggered(bool)), this, SLOT(toggleCurrentThumbnail()));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowGeometryShapeChanged(EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(EffectWindow*,QRect)));
-    connect(effects, SIGNAL(windowDamaged(EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowGeometryShapeChanged(KWin::EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowDamaged(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowDamaged(KWin::EffectWindow*,QRect)));
     reconfigure(ReconfigureAll);
 }
 
diff --git a/effects/thumbnailaside/thumbnailaside.h b/effects/thumbnailaside/thumbnailaside.h
index 323e2fdc45..5bb66589cf 100644
--- a/effects/thumbnailaside/thumbnailaside.h
+++ b/effects/thumbnailaside/thumbnailaside.h
@@ -45,9 +45,9 @@ public:
     virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
 private slots:
     void toggleCurrentThumbnail();
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowGeometryShapeChanged(EffectWindow *w, const QRect &old);
-    void slotWindowDamaged(EffectWindow* w, const QRect& damage);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
+    void slotWindowDamaged(KWin::EffectWindow* w, const QRect& damage);
     virtual bool isActive() const;
 private:
     void addThumbnail(EffectWindow* w);
diff --git a/effects/translucency/translucency.cpp b/effects/translucency/translucency.cpp
index e11e2a09a5..f176ff3b52 100644
--- a/effects/translucency/translucency.cpp
+++ b/effects/translucency/translucency.cpp
@@ -34,9 +34,9 @@ TranslucencyEffect::TranslucencyEffect()
 {
     reconfigure(ReconfigureAll);
     active = effects->activeWindow();
-    connect(effects, SIGNAL(windowActivated(EffectWindow*)), this, SLOT(slotWindowActivated(EffectWindow*)));
-    connect(effects, SIGNAL(windowStartUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartStopUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartStopUserMovedResized(EffectWindow*)));
+    connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStartUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartStopUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartStopUserMovedResized(KWin::EffectWindow*)));
 }
 
 void TranslucencyEffect::reconfigure(ReconfigureFlags)
diff --git a/effects/translucency/translucency.h b/effects/translucency/translucency.h
index fa7b85cc09..193af57fea 100644
--- a/effects/translucency/translucency.h
+++ b/effects/translucency/translucency.h
@@ -38,8 +38,8 @@ public:
     virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
 
 public Q_SLOTS:
-    void slotWindowActivated(EffectWindow* w);
-    void slotWindowStartStopUserMovedResized(EffectWindow *w);
+    void slotWindowActivated(KWin::EffectWindow* w);
+    void slotWindowStartStopUserMovedResized(KWin::EffectWindow *w);
 
 private:
     bool isInactive(const EffectWindow *w) const;
diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp
index a9fd796a63..5119f7e53b 100644
--- a/effects/windowgeometry/windowgeometry.cpp
+++ b/effects/windowgeometry/windowgeometry.cpp
@@ -60,9 +60,9 @@ WindowGeometry::WindowGeometry()
     a->setText(i18n("Toggle window geometry display (effect only)"));
     a->setGlobalShortcut(KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F11));
     connect(a, SIGNAL(triggered(bool)), this, SLOT(toggle()));
-    connect(effects, SIGNAL(windowStartUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowStepUserMovedResized(EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowStartUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(KWin::EffectWindow*,QRect)));
 }
 
 WindowGeometry::~WindowGeometry()
diff --git a/effects/windowgeometry/windowgeometry.h b/effects/windowgeometry/windowgeometry.h
index ba20c05d05..789ccfc395 100644
--- a/effects/windowgeometry/windowgeometry.h
+++ b/effects/windowgeometry/windowgeometry.h
@@ -42,9 +42,9 @@ public:
 
 private slots:
     void toggle();
-    void slotWindowStartUserMovedResized(EffectWindow *w);
-    void slotWindowFinishUserMovedResized(EffectWindow *w);
-    void slotWindowStepUserMovedResized(EffectWindow *w, const QRect &geometry);
+    void slotWindowStartUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowFinishUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowStepUserMovedResized(KWin::EffectWindow *w, const QRect &geometry);
 private:
     EffectWindow *myResizeWindow;
     EffectFrame *myMeasure[3];
diff --git a/effects/wobblywindows/wobblywindows.cpp b/effects/wobblywindows/wobblywindows.cpp
index 4855570441..c9fde65f3d 100644
--- a/effects/wobblywindows/wobblywindows.cpp
+++ b/effects/wobblywindows/wobblywindows.cpp
@@ -165,12 +165,12 @@ KWIN_EFFECT_SUPPORTED(wobblywindows, WobblyWindowsEffect::supported())
 WobblyWindowsEffect::WobblyWindowsEffect()
 {
     reconfigure(ReconfigureAll);
-    connect(effects, SIGNAL(windowAdded(EffectWindow*)), this, SLOT(slotWindowAdded(EffectWindow*)));
-    connect(effects, SIGNAL(windowClosed(EffectWindow*)), this, SLOT(slotWindowClosed(EffectWindow*)));
-    connect(effects, SIGNAL(windowStartUserMovedResized(EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowStepUserMovedResized(EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(EffectWindow*,QRect)));
-    connect(effects, SIGNAL(windowFinishUserMovedResized(EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(EffectWindow*)));
-    connect(effects, SIGNAL(windowMaximizedStateChanged(EffectWindow*,bool,bool)), this, SLOT(slotWindowMaximizeStateChanged(EffectWindow*,bool,bool)));
+    connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowClosed(KWin::EffectWindow*)), this, SLOT(slotWindowClosed(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStartUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowStartUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), this, SLOT(slotWindowStepUserMovedResized(KWin::EffectWindow*,QRect)));
+    connect(effects, SIGNAL(windowFinishUserMovedResized(KWin::EffectWindow*)), this, SLOT(slotWindowFinishUserMovedResized(KWin::EffectWindow*)));
+    connect(effects, SIGNAL(windowMaximizedStateChanged(KWin::EffectWindow*,bool,bool)), this, SLOT(slotWindowMaximizeStateChanged(KWin::EffectWindow*,bool,bool)));
 }
 
 WobblyWindowsEffect::~WobblyWindowsEffect()
diff --git a/effects/wobblywindows/wobblywindows.h b/effects/wobblywindows/wobblywindows.h
index d4844d3bb1..94c2e9abf4 100644
--- a/effects/wobblywindows/wobblywindows.h
+++ b/effects/wobblywindows/wobblywindows.h
@@ -58,12 +58,12 @@ public:
     static bool supported();
 
 public Q_SLOTS:
-    void slotWindowAdded(EffectWindow *w);
-    void slotWindowClosed(EffectWindow *w);
-    void slotWindowStartUserMovedResized(EffectWindow *w);
-    void slotWindowStepUserMovedResized(EffectWindow *w, const QRect &geometry);
-    void slotWindowFinishUserMovedResized(EffectWindow *w);
-    void slotWindowMaximizeStateChanged(EffectWindow *w, bool horizontal, bool vertical);
+    void slotWindowAdded(KWin::EffectWindow *w);
+    void slotWindowClosed(KWin::EffectWindow *w);
+    void slotWindowStartUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowStepUserMovedResized(KWin::EffectWindow *w, const QRect &geometry);
+    void slotWindowFinishUserMovedResized(KWin::EffectWindow *w);
+    void slotWindowMaximizeStateChanged(KWin::EffectWindow *w, bool horizontal, bool vertical);
 
 private:
 
diff --git a/libkwineffects/kwinanimationeffect.cpp b/libkwineffects/kwinanimationeffect.cpp
index 00a7887b69..ee0772dbe4 100644
--- a/libkwineffects/kwinanimationeffect.cpp
+++ b/libkwineffects/kwinanimationeffect.cpp
@@ -51,8 +51,8 @@ void AnimationEffect::init()
      * connect it we can provide auto-referencing of animated and closed windows, since at the time
      * our slot will be called, the slot of the subclass has been (SIGNAL/SLOT connections are FIFO)
      * and has pot. started an animation so we have the window in our hash :) */
-    connect ( effects, SIGNAL(windowClosed(EffectWindow*)), SLOT(_windowClosed(EffectWindow*)) );
-    connect ( effects, SIGNAL(windowDeleted(EffectWindow*)), SLOT(_windowDeleted(EffectWindow*)) );
+    connect ( effects, SIGNAL(windowClosed(KWin::EffectWindow*)), SLOT(_windowClosed(KWin::EffectWindow*)) );
+    connect ( effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), SLOT(_windowDeleted(KWin::EffectWindow*)) );
 }
 
 bool AnimationEffect::isActive() const
diff --git a/libkwineffects/kwinanimationeffect.h b/libkwineffects/kwinanimationeffect.h
index 106155cfe1..eefc25ba71 100644
--- a/libkwineffects/kwinanimationeffect.h
+++ b/libkwineffects/kwinanimationeffect.h
@@ -167,8 +167,8 @@ private:
 private Q_SLOTS:
     void init();
     void triggerRepaint();
-    void _windowClosed( EffectWindow* w );
-    void _windowDeleted( EffectWindow* w );
+    void _windowClosed( KWin::EffectWindow* w );
+    void _windowDeleted( KWin::EffectWindow* w );
 private:
     typedef QMap< EffectWindow*, QList<AniData> > AniMap;
     AnimationEffectPrivate * const d_ptr;
diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index 582a8cba8b..2be649853d 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -828,7 +828,7 @@ Q_SIGNALS:
      * @param w The added window
      * @since 4.7
      **/
-    void windowAdded(EffectWindow *w);
+    void windowAdded(KWin::EffectWindow *w);
     /**
      * Signal emitted when a window is being removed from the Workspace.
      * An effect which wants to animate the window closing should connect
@@ -837,13 +837,13 @@ Q_SIGNALS:
      * @param w The window which is being closed
      * @since 4.7
      **/
-    void windowClosed(EffectWindow *w);
+    void windowClosed(KWin::EffectWindow *w);
     /**
      * Signal emitted when a window get's activated.
      * @param w The new active window, or @c NULL if there is no active window.
      * @since 4.7
      **/
-    void windowActivated(EffectWindow *w);
+    void windowActivated(KWin::EffectWindow *w);
     /**
      * Signal emitted when a window is deleted.
      * This means that a closed window is not referenced any more.
@@ -855,7 +855,7 @@ Q_SIGNALS:
      * @see windowClosed
      * @since 4.7
      **/
-    void windowDeleted(EffectWindow *w);
+    void windowDeleted(KWin::EffectWindow *w);
     /**
      * Signal emitted when a user begins a window move or resize operation.
      * To figure out whether the user resizes or moves the window use
@@ -871,7 +871,7 @@ Q_SIGNALS:
      * @see EffectWindow::isUserResize
      * @since 4.7
      **/
-    void windowStartUserMovedResized(EffectWindow *w);
+    void windowStartUserMovedResized(KWin::EffectWindow *w);
     /**
      * Signal emitted during a move/resize operation when the user changed the geometry.
      * Please note: KWin supports two operation modes. In one mode all changes are applied
@@ -888,7 +888,7 @@ Q_SIGNALS:
      * @see EffectWindow::isUserResize
      * @since 4.7
      **/
-    void windowStepUserMovedResized(EffectWindow *w, const QRect &geometry);
+    void windowStepUserMovedResized(KWin::EffectWindow *w, const QRect &geometry);
     /**
      * Signal emitted when the user finishes move/resize of window @p w.
      * @param w The window which has been moved/resized
@@ -896,7 +896,7 @@ Q_SIGNALS:
      * @see windowFinishUserMovedResized
      * @since 4.7
      **/
-    void windowFinishUserMovedResized(EffectWindow *w);
+    void windowFinishUserMovedResized(KWin::EffectWindow *w);
     /**
      * Signal emitted when the maximized state of the window @p w changed.
      * A window can be in one of four states:
@@ -909,7 +909,7 @@ Q_SIGNALS:
      * @param vertical If @c true maximized vertically
      * @since 4.7
      **/
-    void windowMaximizedStateChanged(EffectWindow *w, bool horizontal, bool vertical);
+    void windowMaximizedStateChanged(KWin::EffectWindow *w, bool horizontal, bool vertical);
     /**
      * Signal emitted when the geometry or shape of a window changed.
      * This is caused if the window changes geometry without user interaction.
@@ -920,7 +920,7 @@ Q_SIGNALS:
      * @see windowUserMovedResized
      * @since 4.7
      **/
-    void windowGeometryShapeChanged(EffectWindow *w, const QRect &old);
+    void windowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
     /**
      * Signal emitted when the windows opacity is changed.
      * @param w The window whose opacity level is changed.
@@ -928,19 +928,19 @@ Q_SIGNALS:
      * @param newOpacity The new opacity level
      * @since 4.7
      **/
-    void windowOpacityChanged(EffectWindow *w, qreal oldOpacity, qreal newOpacity);
+    void windowOpacityChanged(KWin::EffectWindow *w, qreal oldOpacity, qreal newOpacity);
     /**
      * Signal emitted when a window got minimized.
      * @param w The window which was minimized
      * @since 4.7
      **/
-    void windowMinimized(EffectWindow *w);
+    void windowMinimized(KWin::EffectWindow *w);
     /**
      * Signal emitted when a window got unminimized.
      * @param w The window which was unminimized
      * @since 4.7
      **/
-    void windowUnminimized(EffectWindow *w);
+    void windowUnminimized(KWin::EffectWindow *w);
     /**
      * Signal emitted when an area of a window is scheduled for repainting.
      * Use this signal in an effect if another area needs to be synced as well.
@@ -948,7 +948,7 @@ Q_SIGNALS:
      * @param r The damaged rect
      * @since 4.7
      **/
-    void windowDamaged(EffectWindow *w, const QRect &r);
+    void windowDamaged(KWin::EffectWindow *w, const QRect &r);
     /**
      * Signal emitted when a tabbox is added.
      * An effect who wants to replace the tabbox with itself should use @link refTabBox.
@@ -988,9 +988,9 @@ Q_SIGNALS:
      * @since 4.7
      **/
     void tabBoxKeyEvent(QKeyEvent* event);
-    void currentTabAboutToChange(EffectWindow* from, EffectWindow* to);
-    void tabAdded(EffectWindow* from, EffectWindow* to);   // from merged with to
-    void tabRemoved(EffectWindow* c, EffectWindow* group);   // c removed from group
+    void currentTabAboutToChange(KWin::EffectWindow* from, KWin::EffectWindow* to);
+    void tabAdded(KWin::EffectWindow* from, KWin::EffectWindow* to);   // from merged with to
+    void tabRemoved(KWin::EffectWindow* c, KWin::EffectWindow* group);   // c removed from group
     /**
      * Signal emitted when mouse changed.
      * If an effect needs to get updated mouse positions, it needs to first call @link startMousePolling.
@@ -1017,7 +1017,7 @@ Q_SIGNALS:
      * @param atom The property
      * @since 4.7
      */
-    void propertyNotify(EffectWindow* w, long atom);
+    void propertyNotify(KWin::EffectWindow* w, long atom);
     /**
      * Requests to show an outline. An effect providing to show an outline should
      * connect to the signal and render an outline.
@@ -2156,6 +2156,7 @@ void Motion<T>::finish()
 }
 
 } // namespace
+Q_DECLARE_METATYPE(KWin::EffectWindow*)
 
 /** @} */