diff --git a/kinfocenter/main.cpp b/kinfocenter/main.cpp
index 9298cc0f..7a16f6ec 100644
--- a/kinfocenter/main.cpp
+++ b/kinfocenter/main.cpp
@@ -26,7 +26,6 @@
 //KDE
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <config-workspace.h>
 
 KicApp::KicApp() : KApplication()
 {
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 16d110ee..ea5df6cf 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -23,7 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include "config-workspace.h"
 #include "shutdowndlg.h"
 #include "kworkspace/kdisplaymanager.h"
 
diff --git a/statusnotifierwatcher/statusnotifierwatcher.cpp b/statusnotifierwatcher/statusnotifierwatcher.cpp
index 4103b660..33cb7658 100644
--- a/statusnotifierwatcher/statusnotifierwatcher.cpp
+++ b/statusnotifierwatcher/statusnotifierwatcher.cpp
@@ -18,6 +18,8 @@
  ***************************************************************************/
 
 #include "statusnotifierwatcher.h"
+#include "statusnotifierwatcheradaptor.h"
+#include "statusnotifieritem_interface.h"
 
 #include <QDBusConnection>
 #include <QDBusServiceWatcher>
@@ -29,11 +31,6 @@
 #include <kpluginloader.h>
 #include <kdeversion.h>
 
-#include "statusnotifierwatcheradaptor.h"
-#include "statusnotifieritem_interface.h"
-#include <config-workspace.h>
-
-
 static inline KAboutData aboutData()
 {
     return KAboutData("statusnotifierwatcher", 0, ki18n("statusnotifierwatcher"), KDE_VERSION_STRING);
diff --git a/systemsettings/app/main.cpp b/systemsettings/app/main.cpp
index 30da68fc..907fe275 100644
--- a/systemsettings/app/main.cpp
+++ b/systemsettings/app/main.cpp
@@ -26,7 +26,6 @@
 #include <KCmdLineArgs>
 #include <KUniqueApplication>
 #include <kdeversion.h>
-#include <config-workspace.h>
 
 #include "SystemSettingsApp.h"
 #include "SettingsBase.h"
@@ -34,10 +33,23 @@
 int main(int argc, char *argv[])
 {
     // About data
-    KAboutData aboutData("systemsettings", 0, ki18n("System Settings"), KDE_VERSION_STRING, ki18n("Central configuration center for KDE."), KAboutData::License_GPL, ki18n("(c) 2009, Ben Cooksley"));
-    aboutData.addAuthor(ki18n("Ben Cooksley"), ki18n("Maintainer"), "bcooksley@kde.org");
-    aboutData.addAuthor(ki18n("Mathias Soeken"), ki18n("Developer"), "msoeken@informatik.uni-bremen.de");
-    aboutData.addAuthor(ki18n("Will Stephenson"), ki18n("Internal module representation, internal module model"), "wstephenson@kde.org");
+    KAboutData aboutData(
+        "systemsettings", 0, ki18n("System Settings"), KDE_VERSION_STRING,
+        ki18n("Central configuration center for KDE."),
+        KAboutData::License_GPL,
+        ki18n("(c) 2009, Ben Cooksley")
+    );
+    aboutData.addAuthor(
+        ki18n("Ben Cooksley"), ki18n("Maintainer"), "bcooksley@kde.org"
+    );
+    aboutData.addAuthor(
+        ki18n("Mathias Soeken"), ki18n("Developer"), "msoeken@informatik.uni-bremen.de"
+    );
+    aboutData.addAuthor(
+        ki18n("Will Stephenson"),
+        ki18n("Internal module representation, internal module model"),
+        "wstephenson@kde.org"
+    );
 
     aboutData.setProgramIconName("preferences-system");
     KCmdLineArgs::init(argc, argv, &aboutData);