diff -Nur libs/plasma/abstractrunner.h libs/plasma/abstractrunner.h
--- libs/plasma/abstractrunner.h	2008-05-14 18:24:21.000000000 +0800
+++ libs/plasma/abstractrunner.h	2008-05-14 18:24:27.000000000 +0800
@@ -53,6 +53,15 @@
     Q_OBJECT
 
     public:
+
+        /**
+         * Constructs a Runner object. Since AbstractRunner has pure virtuals,
+         * this constructor can not be called directly. Rather a subclass must
+         * be created
+         */
+        explicit AbstractRunner(QObject* parent = 0, const QString& serviceId = QString());
+        AbstractRunner(QObject* parent, const QVariantList& args);
+
         enum Speed { SlowSpeed,
                      NormalSpeed
                    };
@@ -185,14 +194,6 @@
         friend class RunnerManager;
 
         /**
-         * Constructs a Runner object. Since AbstractRunner has pure virtuals,
-         * this constructor can not be called directly. Rather a subclass must
-         * be created
-         */
-        explicit AbstractRunner(QObject* parent = 0, const QString& serviceId = QString());
-        AbstractRunner(QObject* parent, const QVariantList& args);
-
-        /**
          * Provides access to the runner's configuration object.
          */
         KConfigGroup config() const;
diff -Nur libs/plasma/applet.h plasma/applet.h
--- libs/plasma/applet.h	2008-05-14 18:24:21.000000000 +0800
+++ plasma/applet.h	2008-05-14 18:24:31.000000000 +0800
@@ -73,6 +73,26 @@
     Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)
 
     public:
+
+        /**
+         * Call this method when the applet fails to launch properly. An
+         * optional reason can be provided.
+         *
+         * Not that all children items will be deleted when this method is
+         * called. If you have pointers to these items, you will need to
+         * reset them after calling this method.
+         *
+         * @param failed true when the applet failed, false when it succeeded
+         * @param reason an optional reason to show the user why the applet
+         *               failed to launch
+         **/
+        void setFailedToLaunch(bool failed, const QString& reason = QString());
+
+        /**
+         * Sets whether or not this Applet is acting as a Containment
+         */
+        void setIsContainment(bool isContainment);
+
         typedef QList<Applet*> List;
         typedef QHash<QString, Applet*> Dict;
 
@@ -542,20 +562,6 @@
         virtual void init();
 
         /**
-         * Call this method when the applet fails to launch properly. An
-         * optional reason can be provided.
-         *
-         * Not that all children items will be deleted when this method is
-         * called. If you have pointers to these items, you will need to
-         * reset them after calling this method.
-         *
-         * @param failed true when the applet failed, false when it succeeded
-         * @param reason an optional reason to show the user why the applet
-         *               failed to launch
-         **/
-        void setFailedToLaunch(bool failed, const QString& reason = QString());
-
-        /**
          * Called when a request to save the state of the applet is made
          * during runtime
          **/
@@ -597,11 +603,6 @@
         virtual void createConfigurationInterface(KConfigDialog *parent);
 
         /**
-         * Sets whether or not this Applet is acting as a Containment
-         */
-        void setIsContainment(bool isContainment);
-
-        /**
          * Called when any of the geometry constraints have been updated.
          *
          * This is always called prior to painting and should be used as an
diff -Nur libs/plasma/datacontainer.h plasma/datacontainer.h
--- libs/plasma/datacontainer.h	2008-05-14 18:24:21.000000000 +0800
+++ plasma/datacontainer.h	2008-05-14 18:24:36.000000000 +0800
@@ -48,6 +48,11 @@
         //typedef QHash<QString, DataEngine::SourceDict> Grouping;
 
         /**
+         * Returns how long ago, in msecs, that the data in this container was last updated
+         **/
+        uint timeSinceLastUpdate() const;
+
+        /**
          * Constructs a default DataContainer, which has no name or data
          * associated with it
          **/
@@ -60,6 +65,16 @@
         const DataEngine::Data data() const;
 
         /**
+         * Indicates that the data should be treated as dirty the next time hasUpdates() is called.
+         *
+         * why? because if one SignalRelay times out just after another, the minimum update
+         * interval stops a real update from being done - but that relay still needs to be given
+         * data, because it won't have been in the queue and won't have gotten that last update.
+         * when it checks hasUpdates() we'll lie, and then everything will return to normal.
+         **/
+        void setNeedsUpdate(bool update = true);
+
+        /**
          * Set a value for a key. This also marks this source as needing
          * to signal an update. After calling this, a call to checkForUpdate()
          * is done by the engine. This allows for batching updates.
@@ -121,21 +136,6 @@
          **/
         void checkForUpdate();
 
-        /**
-         * Returns how long ago, in msecs, that the data in this container was last updated
-         **/
-        uint timeSinceLastUpdate() const;
-
-        /**
-         * Indicates that the data should be treated as dirty the next time hasUpdates() is called.
-         *
-         * why? because if one SignalRelay times out just after another, the minimum update
-         * interval stops a real update from being done - but that relay still needs to be given
-         * data, because it won't have been in the queue and won't have gotten that last update.
-         * when it checks hasUpdates() we'll lie, and then everything will return to normal.
-         **/
-        void setNeedsUpdate(bool update = true);
-
 protected Q_SLOTS:
         /**
          * Check if the DataContainer is still in use.