diff --git a/client.cpp b/client.cpp
index a65dc3472d..96c6542102 100644
--- a/client.cpp
+++ b/client.cpp
@@ -5,7 +5,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
 //#define QT_CLEAN_NAMESPACE
 #include <klocale.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <kdebug.h>
 #include <kshortcut.h>
 #include <dcopclient.h>
diff --git a/clients/icewm/config/config.cpp b/clients/icewm/config/config.cpp
index 01963a6921..bae62a146e 100644
--- a/clients/icewm/config/config.cpp
+++ b/clients/icewm/config/config.cpp
@@ -30,9 +30,9 @@
 #include <qwhatsthis.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <kdirwatch.h>
-#include <kapp.h>
+#include <kapplication.h>
 
 
 extern "C"
diff --git a/clients/icewm/icewm.cpp b/clients/icewm/icewm.cpp
index 239a0c7ead..fd4d9a241a 100644
--- a/clients/icewm/icewm.cpp
+++ b/clients/icewm/icewm.cpp
@@ -41,7 +41,7 @@
 */
 
 #include <kconfig.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdrawutil.h>
diff --git a/clients/kde/ResizeMid.cpp b/clients/kde/ResizeMid.cpp
index 6a5c869e50..ad2cc1e2e5 100644
--- a/clients/kde/ResizeMid.cpp
+++ b/clients/kde/ResizeMid.cpp
@@ -22,7 +22,7 @@
 
 #include <qpainter.h>
 #include <qstyle.h>
-#include <kapp.h>
+#include <kapplication.h>
 
 #include "ResizeMid.h"
 #include "Manager.h"
diff --git a/clients/kde/ResizeSide.cpp b/clients/kde/ResizeSide.cpp
index 7bceba0dee..b93e0cc001 100644
--- a/clients/kde/ResizeSide.cpp
+++ b/clients/kde/ResizeSide.cpp
@@ -22,7 +22,7 @@
 
 #include <qpixmap.h>
 #include <qstyle.h>
-#include <kapp.h>
+#include <kapplication.h>
 
 #include "ResizeSide.h"
 #include "Manager.h"
diff --git a/clients/kwmtheme/cli_installer/main.cpp b/clients/kwmtheme/cli_installer/main.cpp
index 25806a49ad..6fcc3676a6 100644
--- a/clients/kwmtheme/cli_installer/main.cpp
+++ b/clients/kwmtheme/cli_installer/main.cpp
@@ -1,9 +1,9 @@
 #include <qfile.h>
 #include <qdir.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 82e1797f75..1e9a39889a 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -5,7 +5,7 @@
 #include <qdrawutil.h>
 #include <qpainter.h>
 #include <kpixmapeffect.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <klocale.h>
 #include <qbitmap.h>
 #include <qstyle.h>
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 7d13148bb4..8f48df2e30 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -7,7 +7,7 @@
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
 #include <kglobal.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <klocale.h>
 #include <qbitmap.h>
 #include "../../workspace.h"
diff --git a/clients/riscos/Manager.cpp b/clients/riscos/Manager.cpp
index 13c0fde7da..7e0dc53eb5 100644
--- a/clients/riscos/Manager.cpp
+++ b/clients/riscos/Manager.cpp
@@ -29,7 +29,7 @@
 #include <qlayout.h>
 #include <qvariant.h>
 
-#include <kapp.h>
+#include <kapplication.h>
 
 #include "../../options.h"
 #include "../../workspace.h"
diff --git a/clients/system/systemclient.cpp b/clients/system/systemclient.cpp
index 582149a3e2..0b18850761 100644
--- a/clients/system/systemclient.cpp
+++ b/clients/system/systemclient.cpp
@@ -5,7 +5,7 @@
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <qbitmap.h>
 #include "../../workspace.h"
 #include "../../options.h"
diff --git a/clients/web/Web.cpp b/clients/web/Web.cpp
index eb0d1bec14..eb6fc80eef 100644
--- a/clients/web/Web.cpp
+++ b/clients/web/Web.cpp
@@ -30,9 +30,9 @@
 #undef Bool
 
 #include <kconfig.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 
-#include <kapp.h>
+#include <kapplication.h>
 #include <kwin/options.h>
 
 #include "Web.h"
diff --git a/options.cpp b/options.cpp
index da67488579..ebbbc2b149 100644
--- a/options.cpp
+++ b/options.cpp
@@ -6,7 +6,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include "options.h"
 #include <qpalette.h>
 #include <qpixmap.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/plugins.cpp b/plugins.cpp
index 07eab41642..d74799a424 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -5,7 +5,7 @@ Copyright (C) 1999, 2000    Daniel M. Duley <mosfet@kde.org>
 ******************************************************************/
 #include <kglobal.h>
 #include <kconfig.h>
-#include <kstddirs.h>
+#include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>