diff --git a/src/configuredialog/configureaccountpage.cpp b/src/configuredialog/configureaccountpage.cpp
--- a/src/configuredialog/configureaccountpage.cpp
+++ b/src/configuredialog/configureaccountpage.cpp
@@ -37,18 +37,19 @@
 #include <AkonadiWidgets/agenttypedialog.h>
 #include <AkonadiCore/agentinstancecreatejob.h>
 
+#include <KComboBox>
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KComboBox>
 #include "kmail_debug.h"
 
-#include <QVBoxLayout>
+#include <QAbstractItemView>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QMenu>
-#include <KConfigGroup>
 #include <QLabel>
 #include <QProcess>
+#include <QVBoxLayout>
 
 QString AccountsPage::helpAnchor() const
 {
diff --git a/src/configuredialog/configuresecuritypage.cpp b/src/configuredialog/configuresecuritypage.cpp
--- a/src/configuredialog/configuresecuritypage.cpp
+++ b/src/configuredialog/configuresecuritypage.cpp
@@ -34,10 +34,12 @@
 #include <KLocalizedString>
 #include <KCMultiDialog>
 #include <KMessageBox>
-#include <QWhatsThis>
-#include <QDBusConnection>
 #include "kmail_debug.h"
 
+#include <QButtonGroup>
+#include <QDBusConnection>
+#include <QWhatsThis>
+
 QString SecurityPage::helpAnchor() const
 {
     return QStringLiteral("configure-security");