diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index c43f95f43c..34ce08205f 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 int main( int argc, char* argv[] )
     {
@@ -54,6 +54,6 @@ int main( int argc, char* argv[] )
 #warning D-BUS TODO
 // kwin* , and an attach to dbus is missing as well
 #endif
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
     }
diff --git a/data/update_window_settings.cpp b/data/update_window_settings.cpp
index 42623ac709..6481fd7df5 100644
--- a/data/update_window_settings.cpp
+++ b/data/update_window_settings.cpp
@@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
 //Added by qt3to4:
 #include <QByteArray>
 #include <Q3PtrList>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 struct SessionInfo
     {
@@ -170,6 +170,6 @@ int main()
 #warning D-BUS TODO
 // kwin* , and an attach to dbus is missing as well
 #endif
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
     }
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 706be1d03d..a23a3567df 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -44,7 +44,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -63,7 +63,7 @@
 #include <kdecorationfactory.h>
 #include <kvbox.h>
 #include "kwindecorationadaptor.h"
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 // KCModule plugin interface
 // =========================
@@ -534,8 +534,8 @@ void KWinDecorationModule::save()
 	emit pluginSave( &kwinConfig );
 
 	kwinConfig.sync();
-        QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-        kwin->call( "reconfigure" );
+        QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+        kwin.call( "reconfigure" );
 }
 
 
diff --git a/kcmkwin/kwindecoration/kwindecorationadaptor.h b/kcmkwin/kwindecoration/kwindecorationadaptor.h
index 97a1d44f2b..fa0859871d 100644
--- a/kcmkwin/kwindecoration/kwindecorationadaptor.h
+++ b/kcmkwin/kwindecoration/kwindecorationadaptor.h
@@ -11,7 +11,7 @@
 #define KWINDECORATIONADAPTOR_H_55611149668415
 
 #include <QtCore/QObject>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 00965d7fef..488ac58f29 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -21,7 +21,7 @@
 //Added by qt3to4:
 #include <QVBoxLayout>
 
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include <kapplication.h>
 #include <kglobal.h>
@@ -179,8 +179,8 @@ void KWinOptions::save()
 #warning D-BUS TODO
 // All these calls in kcmkwin modules should be actually kwin*, because of multihead.
 #endif
-  QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-  kwin->call( "reconfigure" );
+  QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+  kwin.call( "reconfigure" );
 }
 
 
@@ -253,8 +253,8 @@ void KActionsOptions::save()
   emit KCModule::changed( false );
   // Send signal to kwin
   mConfig->sync();
-  QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-  kwin->call( "reconfigure" );
+  QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+  kwin.call( "reconfigure" );
 }
 
 
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index 9b9bb6b550..fd3dc8b03e 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -37,7 +37,7 @@
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kseparator.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ -571,8 +571,8 @@ void KTitleBarActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
   }
 }
 
@@ -847,8 +847,8 @@ void KWindowActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
   }
 }
 
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 3b54c82c68..5b55eaa5d2 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -49,7 +49,7 @@
 #include <kglobal.h>
 #include <kprocess.h>
 #include <QTabWidget>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ -497,8 +497,8 @@ void KFocusConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-        kwin->call( "reconfigure" );
+        QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+        kwin.call( "reconfigure" );
     }
     emit KCModule::changed(false);
 }
@@ -724,8 +724,8 @@ void KAdvancedConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-        kwin->call( "reconfigure" );
+        QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+        kwin.call( "reconfigure" );
     }
     emit KCModule::changed(false);
 }
@@ -1188,8 +1188,8 @@ void KMovingConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-        kwin->call( "reconfigure" );
+        QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+        kwin.call( "reconfigure" );
     }
     emit KCModule::changed(false);
 }
@@ -1591,8 +1591,8 @@ void KTranslucencyConfig::save( void )
   if (standAlone)
   {
     config->sync();
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
   }
   emit KCModule::changed(false);
 }
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index a2df3dd173..94223c373b 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include "ruleslist.h"
 
@@ -67,8 +67,8 @@ void KCMRules::save()
     emit KCModule::changed( false );
     // Send signal to kwin
     config.sync();
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
     }
 
 void KCMRules::defaults()
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index fac6bf317d..7790712242 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -21,7 +21,7 @@
 #include <kconfig.h>
 #include <klocale.h>
 #include <kwin.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include <X11/Xlib.h>
 #include <fixx11h.h>
@@ -257,8 +257,8 @@ static int edit( Window wid, bool whole_app )
         delete orig_rule;
         }
     saveRules( rules );
-    QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
-    kwin->call( "reconfigure" );
+    QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
+    kwin.call( "reconfigure" );
     return 0;
     }
     
diff --git a/kwinadaptor.h b/kwinadaptor.h
index 74ea0452f3..1f6883263c 100644
--- a/kwinadaptor.h
+++ b/kwinadaptor.h
@@ -11,7 +11,7 @@
 #define KWINADAPTOR_H_187881149684785
 
 #include <QtCore/QObject>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
@@ -91,15 +91,15 @@ public:
 
 public: // PROPERTIES
 public Q_SLOTS: // METHODS
-    Q_ASYNC void cascadeDesktop();
+    Q_NOREPLY void cascadeDesktop();
     void circulateDesktopApplications();
     int currentDesktop();
     void doNotManage(const QString &name);
-    Q_ASYNC void killWindow();
+    Q_NOREPLY void killWindow();
     bool kompmgrIsRunning();
     void nextDesktop();
     void previousDesktop();
-    Q_ASYNC void reconfigure();
+    Q_NOREPLY void reconfigure();
     void refresh();
     bool setCurrentDesktop(int desktop);
     void setDesktopLayout(int orientation, int x, int y);
@@ -109,7 +109,7 @@ public Q_SLOTS: // METHODS
     void showWindowMenuAt(qlonglong winId, int x, int y);
     void startKompmgr();
     void stopKompmgr();
-    Q_ASYNC void unclutterDesktop();
+    Q_NOREPLY void unclutterDesktop();
 Q_SIGNALS: // SIGNALS
     void dcopResetAllClients();
     void kompmgrStarted();
diff --git a/main.cpp b/main.cpp
index bd4f63b4bb..256bdce244 100644
--- a/main.cpp
+++ b/main.cpp
@@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QX11Info>
 #include <stdio.h>
 #include <fixx11h.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include "atoms.h"
 #include "options.h"
@@ -124,8 +124,8 @@ Application::Application( )
 
     initting = false; // startup done, we are up and running now.
     
-    QDBusInterfacePtr ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );   
-    ksplash->call( "upAndRunning", QString( "wm started" ));
+    QDBusInterface ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );   
+    ksplash.call( "upAndRunning", QString( "wm started" ));
     XEvent e;
     e.xclient.type = ClientMessage;
     e.xclient.message_type = XInternAtom( QX11Info::display(), "_KDE_SPLASH_PROGRESS", False );
diff --git a/workspace.cpp b/workspace.cpp
index c70c0fb6d2..4f1d456d6b 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kipc.h>
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 #include "plugins.h"
 #include "client.h"