diff --git a/plasma/applet.h b/plasma/applet.h
index b83ed35b6..08f47ce63 100644
--- a/plasma/applet.h
+++ b/plasma/applet.h
@@ -753,13 +753,10 @@ class PLASMA_EXPORT Applet : public QObject
         friend class Containment;
         friend class ContainmentPrivate;
         friend class AppletScript;
-        friend class AppletHandle;
         friend class AppletPrivate;
         friend class AccessAppletJobPrivate;
         friend class GraphicsViewAppletPrivate;
         friend class PluginLoader;
-        friend class PopupApplet;
-        friend class PopupAppletPrivate;
         friend class AssociatedApplicationManager;
 };
 
diff --git a/plasma/corona.cpp b/plasma/corona.cpp
index fd0631619..96cfe2709 100644
--- a/plasma/corona.cpp
+++ b/plasma/corona.cpp
@@ -614,8 +614,6 @@ Containment *CoronaPrivate::addContainment(const QString &name, const QVariantLi
 
         if (loadingNull) {
             containment->setDrawWallpaper(false);
-        } else {
-            containment->setLaunchErrorMessage(false);
         }
 
         // we want to provide something and don't care about the failure to launch
diff --git a/plasma/includes/Plasma/Wallpaper b/plasma/includes/Plasma/Wallpaper
deleted file mode 100644
index b41e8ac07..000000000
--- a/plasma/includes/Plasma/Wallpaper
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../plasma/wallpaper.h"
diff --git a/plasma/includes/Plasma/WallpaperScript b/plasma/includes/Plasma/WallpaperScript
deleted file mode 100644
index 744d1cd27..000000000
--- a/plasma/includes/Plasma/WallpaperScript
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../plasma/scripting/wallpaperscript.h"
diff --git a/plasma/scripting/appletscript.h b/plasma/scripting/appletscript.h
index cd25e9d07..290fc8a26 100644
--- a/plasma/scripting/appletscript.h
+++ b/plasma/scripting/appletscript.h
@@ -158,11 +158,6 @@ Q_SIGNALS:
      */
     void saveState(KConfigGroup &group) const;
 
-    /**
-     * @see PopupApplet
-     */
-    void popupEvent(bool popped) const;
-
 public Q_SLOTS:
 
     /**
@@ -211,7 +206,6 @@ protected:
 
 private:
     friend class Applet;
-    friend class PopupApplet;
 
     AppletScriptPrivate *const d;
 };
diff --git a/plasma/scripting/scriptengine.h b/plasma/scripting/scriptengine.h
index a839964d5..443f5d4a7 100644
--- a/plasma/scripting/scriptengine.h
+++ b/plasma/scripting/scriptengine.h
@@ -40,8 +40,6 @@ class AppletScript;
 class DataEngine;
 class DataEngineScript;
 class RunnerScript;
-class Wallpaper;
-class WallpaperScript;
 class ScriptEnginePrivate;
 
 /**
@@ -119,17 +117,6 @@ PLASMA_EXPORT DataEngineScript *loadScriptEngine(const QString &language, DataEn
  **/
 PLASMA_EXPORT RunnerScript *loadScriptEngine(const QString &language, AbstractRunner *runner);
 
-/**
- * Loads an Wallpaper script engine for the given language.
- *
- * @param language the language to load for
- * @param runner the Plasma::Wallpaper for this script
- * @return pointer to the RunnerScript or 0 on failure; the caller is responsible
- *         for the return object which will be parented to the Wallpaper
- **/
-PLASMA_EXPORT WallpaperScript *loadScriptEngine(const QString &language, Wallpaper *wallpaper);
-
-
 } // namespace Plasma
 
 #endif