diff --git a/effects.cpp b/effects.cpp
index 4ff8e9baf8..5dd773e293 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kplugininfo.h>
+#include <Plasma/Theme>
 
 #include <assert.h>
 
@@ -1852,4 +1853,9 @@ void EffectFrameImpl::autoResize()
     setGeometry(geometry);
 }
 
+QColor EffectFrameImpl::styledTextColor()
+{
+    return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
+}
+
 } // namespace
diff --git a/effects.h b/effects.h
index 57faa48fd3..17c92dc3d6 100644
--- a/effects.h
+++ b/effects.h
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QStack>
 #include <QHash>
+#include <Plasma/FrameSvg>
 
 
 class KService;
@@ -361,6 +362,10 @@ public:
     Plasma::FrameSvg& selectionFrame() {
         return m_selection;
     }
+    /**
+     * The foreground text color as specified by the default Plasma theme.
+     */
+    static QColor styledTextColor();
 
 private Q_SLOTS:
     void plasmaThemeChanged();
diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp
index 931e2f935d..ca5deaf15a 100644
--- a/effects/blur/blur.cpp
+++ b/effects/blur/blur.cpp
@@ -23,6 +23,7 @@
 #include <X11/Xatom.h>
 
 #include <QMatrix4x4>
+#include <KConfigGroup>
 #include <KDebug>
 
 namespace KWin
diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp
index 7053443f33..41f6a65621 100644
--- a/effects/dashboard/dashboard.cpp
+++ b/effects/dashboard/dashboard.cpp
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "dashboard.h"
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 866e6458d3..1a33e0f110 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -37,6 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobalsettings.h>
 #include <QtGui/QPainter>
 #include <QtGui/QGraphicsLinearLayout>
+#include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
 #include <Plasma/WindowEffects>
 
diff --git a/effects/desktopgrid/desktopgrid.h b/effects/desktopgrid/desktopgrid.h
index c283b1a5b1..9c192271c8 100644
--- a/effects/desktopgrid/desktopgrid.h
+++ b/effects/desktopgrid/desktopgrid.h
@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 namespace Plasma
 {
 class PushButton;
+class FrameSvg;
 }
 
 namespace KWin
diff --git a/effects/fallapart/fallapart.cpp b/effects/fallapart/fallapart.cpp
index 36bda5251d..e9f545ad2a 100644
--- a/effects/fallapart/fallapart.cpp
+++ b/effects/fallapart/fallapart.cpp
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <assert.h>
 #include <math.h>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index 3f2a96aedc..f86b16b1e3 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <KAction>
 #include <KActionCollection>
+#include <KLocale>
 
 #include <kwinglutils.h>
 
diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index a67e2705f2..a07bf62baa 100644
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -35,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMouseEvent>
 #include <QtGui/QPainter>
 #include <QtGui/QGraphicsLinearLayout>
+#include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
 #include <Plasma/WindowEffects>
 
diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h
index ea042f946a..4362bc7e1e 100644
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@@ -32,6 +32,7 @@ class QTimer;
 namespace Plasma
 {
 class PushButton;
+class FrameSvg;
 }
 
 namespace KWin
diff --git a/effects/resize/resize.cpp b/effects/resize/resize.cpp
index 51b4a2334d..98567dc5b7 100644
--- a/effects/resize/resize.cpp
+++ b/effects/resize/resize.cpp
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include <KColorScheme>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/showfps/showfps.h b/effects/showfps/showfps.h
index a4a24c8eea..88349566b5 100644
--- a/effects/showfps/showfps.h
+++ b/effects/showfps/showfps.h
@@ -21,6 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SHOWFPS_H
 #define KWIN_SHOWFPS_H
 
+#include <QtCore/QTime>
+
 #include <kwineffects.h>
 #include <kwinglutils.h>
 
diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp
index 12d7eceb7c..529db58f8c 100644
--- a/effects/slidingpopups/slidingpopups.cpp
+++ b/effects/slidingpopups/slidingpopups.cpp
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "slidingpopups.h"
 
 #include <kdebug.h>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp
index 722a1324ec..5197a6c278 100644
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@@ -22,6 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtCore/QSize>
 #include <QtGui/QPainter>
 // KDE
+#include <KDE/KConfigGroup>
+#include <KDE/KDebug>
 #include <KDE/KGlobal>
 #include <KDE/KIconLoader>
 #include <KDE/KStandardDirs>
diff --git a/effects/trackmouse/trackmouse.cpp b/effects/trackmouse/trackmouse.cpp
index 4c351edbf6..318e445de2 100644
--- a/effects/trackmouse/trackmouse.cpp
+++ b/effects/trackmouse/trackmouse.cpp
@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <KDE/KConfigGroup>
+#include <KDE/KLocale>
 
 #include <math.h>
 
diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp
index b125d01e99..3574d7f96a 100644
--- a/effects/windowgeometry/windowgeometry.cpp
+++ b/effects/windowgeometry/windowgeometry.cpp
@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwindowsystem.h>
 #include <KActionCollection>
 #include <kaction.h>
+#include <KDE/KLocale>
 
 using namespace KWin;
 
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index 668a384b4f..151797a573 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
+#include <KDE/KConfigGroup>
+#include <KDE/KLocale>
 
 #include <kwinglutils.h>
 #include <kwinxrenderutils.h>
diff --git a/effects/zoom/zoom.h b/effects/zoom/zoom.h
index ca65a7b816..74521a5570 100644
--- a/effects/zoom/zoom.h
+++ b/effects/zoom/zoom.h
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_ZOOM_H
 
 #include <kwineffects.h>
+#include <QtCore/QTime>
 
 namespace KWin
 {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index b5f3619ebb..33ae91ffc2 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -39,7 +39,7 @@ set(kwin_EFFECTSLIB_SRCS
     )
 
 kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
-target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTGUI_LIBRARY}
+target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
     ${X11_LIBRARIES} kephal)
 set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 
diff --git a/lib/kwineffects.cpp b/lib/kwineffects.cpp
index 30776b0ae8..01d5e5e30a 100644
--- a/lib/kwineffects.cpp
+++ b/lib/kwineffects.cpp
@@ -1336,9 +1336,4 @@ void EffectFrame::enableCrossFade(bool enable)
     d->crossFading = enable;
 }
 
-QColor EffectFrame::styledTextColor()
-{
-    return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
-}
-
 } // namespace
diff --git a/lib/kwineffects.h b/lib/kwineffects.h
index e8a44cecac..621c694936 100644
--- a/lib/kwineffects.h
+++ b/lib/kwineffects.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDE/KPluginFactory>
 #include <KDE/KShortcutsEditor>
 
-#include <KDE/Plasma/FrameSvg>
-#include <KDE/Plasma/Theme>
-
 #include <assert.h>
 #include <limits.h>
 
@@ -1796,11 +1793,6 @@ public:
      **/
     virtual GLShader* shader() const = 0;
 
-    /**
-     * The foreground text color as specified by the default Plasma theme.
-     */
-    static QColor styledTextColor();
-
     /**
      * If @p enable is @c true cross fading between icons and text is enabled
      * By default disabled. Use setCrossFadeProgress to cross fade.
diff --git a/tabbox.cpp b/tabbox.cpp
index a840165108..e2d07fe18a 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDebug>
+#include <KLocale>
 #include <kkeyserver.h>
 // X11
 #include <fixx11h.h>