diff --git a/src/plasma/applet.cpp b/src/plasma/applet.cpp
index 511d07ad0..ee8fd0115 100644
--- a/src/plasma/applet.cpp
+++ b/src/plasma/applet.cpp
@@ -28,35 +28,21 @@
 #include <cmath>
 #include <limits>
 
-#include <QApplication>
-#include <QEvent>
 #include <QFile>
-#include <QHostInfo>
-#include <QLabel>
 #include <QList>
-#include <QPainter>
-#include <QRegExp>
-#include <QSize>
-#include <QStyleOptionGraphicsItem>
-#include <QTextDocument>
 #include <QUiLoader>
-#include <QVBoxLayout>
-#include <QWidget>
 
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kcoreauthorized.h>
 #include <kcolorscheme.h>
 #include <kdesktopfile.h>
-#include <kiconloader.h>
-#include <kkeysequencewidget.h>
 #include <kplugininfo.h>
-
+#include <klocalizedstring.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kshortcut.h>
 #include <kwindowsystem.h>
-#include <kpushbutton.h>
 
 #if !PLASMA_NO_KUTILS
 #include <kcmoduleinfo.h>
@@ -65,29 +51,18 @@
 #include <kcmodule.h>
 #endif
 
-#if !PLASMA_NO_SOLID
-#include <solid/powermanagement.h>
-#endif
-
 #include "configloader.h"
 #include "containment.h"
 #include "corona.h"
 #include "package.h"
 #include "plasma.h"
 #include "scripting/appletscript.h"
-#include "svg.h"
-#include "framesvg.h"
-#include "private/framesvg_p.h"
-#include "theme.h"
 #include "paintutils.h"
 #include "abstractdialogmanager.h"
 #include "pluginloader.h"
 
 #include "private/associatedapplicationmanager_p.h"
 #include "private/containment_p.h"
-#include "private/package_p.h"
-#include "private/packages_p.h"
-#include "private/service_p.h"
 
 
 namespace Plasma
diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp
index b36a26209..cd52d91fc 100644
--- a/src/plasma/containment.cpp
+++ b/src/plasma/containment.cpp
@@ -33,17 +33,13 @@
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 #include <qtemporaryfile.h>
+#include <qmimedatabase.h>
 
 #include <kaction.h>
 #include <kcoreauthorized.h>
 #include <klocalizedstring.h>
-#include <kmenu.h>
-#include <kmessagebox.h>
-#include <qmimedatabase.h>
 #include <kservicetypetrader.h>
 
-#include <kwindowsystem.h>
-
 #if !PLASMA_NO_KIO
 #include "kio/jobclasses.h" // for KIO::JobFlags
 #include "kio/job.h"
@@ -54,7 +50,6 @@
 #include "containmentactionspluginsconfig.h"
 #include "corona.h"
 #include "pluginloader.h"
-#include "svg.h"
 
 #include "private/applet_p.h"
 #include "private/containmentactionspluginsconfig_p.h"
@@ -349,7 +344,6 @@ void Containment::setContainmentType(Containment::Type type)
     }
 
     d->type = type;
-    d->checkContainmentFurniture();
 }
 
 Corona *Containment::corona() const
diff --git a/src/plasma/private/applet_p.cpp b/src/plasma/private/applet_p.cpp
index 1dbea570d..17e4a98e5 100644
--- a/src/plasma/private/applet_p.cpp
+++ b/src/plasma/private/applet_p.cpp
@@ -26,7 +26,6 @@
 #include <config-plasma.h>
 
 #include <QFile>
-#include <QHostInfo>
 #include <QVBoxLayout>
 #include <qstandardpaths.h>
 
@@ -357,11 +356,6 @@ void AppletPrivate::setIsContainment(bool nowIsContainment, bool forceUpdate)
 
     delete mainConfig;
     mainConfig = 0;
-
-    Containment *c = q->containment();
-    if (c) {
-        c->d->checkContainmentFurniture();
-    }
 }
 
 // put all setup routines for script here. at this point we can assume that
diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
index a92d9e632..b9e2b483a 100644
--- a/src/plasma/private/containment_p.cpp
+++ b/src/plasma/private/containment_p.cpp
@@ -22,44 +22,25 @@
 
 #include "private/containment_p.h"
 
-#include <QApplication>
-#include <QClipboard>
-#include <QMimeData>
-#include <QMimeDatabase>
-#include <QDropEvent>
-#include <qtemporaryfile.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <kcoreauthorized.h>
 #include <kiconloader.h>
-#include <klocale.h>
 #include <klocalizedstring.h>
-#include <kurlmimedata.h>
 #include <kwindowsystem.h>
 
 #include "config-plasma.h"
 
-#if !PLASMA_NO_KIO
-#include "kio/jobclasses.h" // for KIO::JobFlags
-#include "kio/job.h"
-#include "kio/scheduler.h"
-#endif
-
 #include "containmentactions.h"
-#include "containmentactionspluginsconfig.h"
 #include "corona.h"
 #include "pluginloader.h"
-#include "svg.h"
 
 #include "private/applet_p.h"
-#include "private/containmentactionspluginsconfig_p.h"
 
 
 namespace Plasma
 {
 
-bool ContainmentPrivate::s_positioningPanels = false;
 QHash<QString, ContainmentActions*> ContainmentPrivate::globalActionPlugins;
 
 const char ContainmentPrivate::defaultWallpaper[] = "image";
@@ -105,13 +86,6 @@ void ContainmentPrivate::addDefaultActions(KActionCollection *actions, Containme
     action->setData(Containment::ControlTool);
 }
 
-void ContainmentPrivate::checkContainmentFurniture()
-{
-    if (q->isContainment() &&
-        (type == Containment::DesktopContainment || type == Containment::PanelContainment)) {
-    }
-}
-
 void ContainmentPrivate::setScreen(int newScreen)
 {
     // What we want to do in here is:
diff --git a/src/plasma/private/containment_p.h b/src/plasma/private/containment_p.h
index fa86d7b06..56055f812 100644
--- a/src/plasma/private/containment_p.h
+++ b/src/plasma/private/containment_p.h
@@ -77,7 +77,6 @@ public:
      */
     void containmentConstraintsEvent(Plasma::Constraints constraints);
 
-    void checkContainmentFurniture();
     bool isPanelContainment() const;
     void setLockToolText();
     void appletDeleted(Applet*);
@@ -100,8 +99,6 @@ public:
      */
     static void addDefaultActions(KActionCollection *actions, Containment *c = 0);
 
-    static bool s_positioningPanels;
-
     Containment *q;
     FormFactor formFactor;
     Location location;