diff --git a/charsetsDlg.cpp b/charsetsDlg.cpp
index a34306968..153a7eae4 100644
--- a/charsetsDlg.cpp
+++ b/charsetsDlg.cpp
@@ -2,7 +2,6 @@
 
 #include "charsetsDlg.h"
 
-#include <qlayout.h>
 #include <qlabel.h>
 #include <qframe.h>
 #include <qcheckbox.h>
diff --git a/kfileio.cpp b/kfileio.cpp
index 3be806300..9bf7a6acc 100644
--- a/kfileio.cpp
+++ b/kfileio.cpp
@@ -1,7 +1,6 @@
 // kfileio.cpp
 // Author: Stefan Taferner <taferner@kde.org>
 
-#include <kapp.h>
 #include <kapp.h>
 #include <qmessagebox.h>
 #include <qstring.h>
diff --git a/kmacctmgr.cpp b/kmacctmgr.cpp
index 538e4a8c3..a9ea8f87e 100644
--- a/kmacctmgr.cpp
+++ b/kmacctmgr.cpp
@@ -10,7 +10,6 @@
 #include <assert.h>
 #include <kconfig.h>
 #include <kapp.h>
-#include <kapp.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/kmacctseldlg.cpp b/kmacctseldlg.cpp
index b28a99fb9..3dbf622bd 100644
--- a/kmacctseldlg.cpp
+++ b/kmacctseldlg.cpp
@@ -1,7 +1,6 @@
 // kmacctseldlg.cpp
 
 #include <qpushbutton.h>
-#include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
 #include <kapp.h>
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 759b8ca3f..923033173 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -24,7 +24,6 @@
 #include <assert.h>
 #include <kapp.h>
 #include <kiconloader.h>
-#include <kapp.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <ktablistbox.h>
diff --git a/kmcomposewin.h b/kmcomposewin.h
index 780fea550..a8b5c6750 100644
--- a/kmcomposewin.h
+++ b/kmcomposewin.h
@@ -6,7 +6,6 @@
 
 
 #include <qstring.h>
-#include <qlineedit.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qevent.h>
diff --git a/kmfolderseldlg.cpp b/kmfolderseldlg.cpp
index 2a4a4d2e5..4a2c10c72 100644
--- a/kmfolderseldlg.cpp
+++ b/kmfolderseldlg.cpp
@@ -6,7 +6,6 @@
 #include "kmglobal.h"
 #include "kmfolderdir.h"
 
-#include <kapp.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlayout.h>
diff --git a/kmidentity.cpp b/kmidentity.cpp
index 8beff4f5d..b86a8aa0b 100644
--- a/kmidentity.cpp
+++ b/kmidentity.cpp
@@ -3,7 +3,6 @@
 #include "kmidentity.h"
 #include "kfileio.h"
 
-#include <kapp.h>
 #include <kconfig.h>
 #include <kapp.h>
 
diff --git a/kmiostatusdlg.cpp b/kmiostatusdlg.cpp
index 82b2cf916..5a47359fa 100644
--- a/kmiostatusdlg.cpp
+++ b/kmiostatusdlg.cpp
@@ -6,7 +6,6 @@
 
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <kapp.h>
 #include <klocale.h>
 #include <kapp.h>
 
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index 2201392e5..af733980f 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -8,7 +8,6 @@
 #include "kmaccount.h"
 #include "kmacctmgr.h"
 #include "kbusyptr.h"
-#include "kmmessage.h"
 #include "kmfoldertree.h"
 #include "kmheaders.h"
 #include "kmreaderwin.h"
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index fd4fb61bf..52d779f7f 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -28,7 +28,6 @@
 #include <kcursor.h>
 #include <krun.h>
 #include <mimelib/mimepp.h>
-#include <qregexp.h>
 #include <qstring.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/kmsender.cpp b/kmsender.cpp
index 30880ca43..92792dfc9 100644
--- a/kmsender.cpp
+++ b/kmsender.cpp
@@ -13,14 +13,12 @@
 #include "kmiostatusdlg.h"
 
 #include <kconfig.h>
-#include <kapp.h>
 #include <kprocess.h>
 #include <kapp.h>
 #include <qregexp.h>
 
 #ifdef KRN
 #include <kapp.h>
-#include <kapp.h>
 extern KApplication *app;
 extern KMIdentity *identity;
 #endif
diff --git a/kmsettings.cpp b/kmsettings.cpp
index 4f42a1702..1df13c6c1 100644
--- a/kmsettings.cpp
+++ b/kmsettings.cpp
@@ -18,7 +18,6 @@
 #include "kfontutils.h"
 #include "kmtopwidget.h"
 
-#include <kapp.h>
 #include <kapp.h>
 #include <kfiledialog.h>
 #include <ktablistbox.h>
diff --git a/main.cpp b/main.cpp
index 425941ccf..05c6eb4a5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,7 +21,6 @@
 #include "kmsettings.h"
 #include "kmreaderwin.h"
 
-#include <kapp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <kapp.h>