diff --git a/kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp
index c42f01b895bc857b5c502323db1b037478aa54f9..2e1134a05929bd9f3ea874b984205f042c0e0500 100755
--- a/kde/src/SFLPhone.cpp
+++ b/kde/src/SFLPhone.cpp
@@ -22,24 +22,15 @@
#include "SFLPhone.h"
#include <unistd.h>
-#include <KApplication>
#include <KStandardAction>
-#include <KMenu>
#include <KAction>
-#include <KToolBar>
#include <KStatusBar>
-#include <QtGui/QStatusBar>
#include <QtGui/QCursor>
#include <KActionCollection>
#include <QtCore/QString>
-#include <QtGui/QListWidgetItem>
-#include <QtGui/QKeyEvent>
-#include <QErrorMessage>
-#include <KSystemTrayIcon>
#include <KNotification>
#include <QActionGroup>
#include <QLabel>
-#include <QListWidget>
#include <kshortcutsdialog.h>
#include "lib/sflphone_const.h"
@@ -52,7 +43,6 @@
#include "AccountWizard.h"
#include "widgets/HistoryDock.h"
#include "widgets/BookmarkDock.h"
-#include "lib/Contact.h"
#include "SFLPhoneView.h"
#include "widgets/SFLPhoneTray.h"
@@ -184,7 +174,7 @@ void SFLPhone::setupActions()
action_screen->addAction(action_main);
action_close = KStandardAction::close(this, SLOT(close()), this);
- action_quit = KStandardAction::quit(this, SLOT(quitButton()), this);
+ action_quit = KStandardAction::quit(this, SLOT(quitButton()), this);
action_configureSflPhone = KStandardAction::preferences(m_pView, SLOT(configureSflPhone()), this);
action_configureSflPhone->setText(i18n("Configure SFLphone"));
diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
index 89c3b4688e02aec98b48f31b3352752376ceecd2..8569449006ec5e3fd1cd69461e33c830692e8efa 100755
--- a/kde/src/SFLPhoneView.cpp
+++ b/kde/src/SFLPhoneView.cpp
@@ -21,32 +21,21 @@
#include "SFLPhoneView.h"
-#include <QtGui/QLabel>
#include <QtGui/QContextMenuEvent>
-#include <QtGui/QBrush>
#include <QtGui/QPalette>
#include <QtGui/QInputDialog>
#include <QtGui/QWidget>
#include <QtCore/QString>
-#include <QtGui/QKeyEvent>
#include <QErrorMessage>
-#include <KXmlGuiWindow>
#include "conf/ConfigurationDialog.h"
#include "AccountWizard.h"
-#include "lib/Contact.h"
-#include "lib/AccountList.h"
-#include "CallView.h"
#include <klocale.h>
-#include <kstandardaction.h>
-#include <kactioncollection.h>
#include <kaction.h>
#include <kmenu.h>
#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseelist.h>
#include "lib/sflphone_const.h"
#include "conf/ConfigurationSkeleton.h"
@@ -54,11 +43,8 @@
#include "lib/callmanager_interface_singleton.h"
#include "lib/instance_interface_singleton.h"
#include "ActionSetAccountFirst.h"
-#include "widgets/ContactItemWidget.h"
#include "SFLPhone.h"
#include "lib/typedefs.h"
-#include "widgets/Dialpad.h"
-#include "widgets/CallTreeItem.h"
using namespace KABC;
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index bf978941af455c5527e6d822b7c2af868e17cc09..913811145dfee08522ee522c39419ed3611d706d 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/Account.cpp
@@ -21,10 +21,8 @@
#include "Account.h"
-#include <QtGui/QApplication>
#include <QDebug>
#include <QtCore/QString>
-#include <QtGui/QColor>
#include "sflphone_const.h"
#include "configurationmanager_interface_singleton.h"
diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp
index 5ade85b1ab1004cb5f861a2b6bc319ada47c7531..352b2b46e8900eee16363b306f9d2c63ffef340d 100644
--- a/kde/src/lib/CallModel.hpp
+++ b/kde/src/lib/CallModel.hpp
@@ -1,5 +1,4 @@
#include <QHash>
-#include <QVector>
#include <QDragEnterEvent>
#include <QDebug>
#include "Call.h"
diff --git a/kde/src/lib/Contact.cpp b/kde/src/lib/Contact.cpp
index 84eee4a9203d960cc2bf9ff6d5d9e4befa1b794c..774e6dea4ffbdd6ac7dc37d59b387f8dd3154b88 100644
--- a/kde/src/lib/Contact.cpp
+++ b/kde/src/lib/Contact.cpp
@@ -24,8 +24,6 @@
#include <kabc/addressee.h>
#include <kabc/picture.h>
#include <kabc/phonenumber.h>
-#include <QtGui/QListWidgetItem>
-#include <QtGui/QWidget>
#include <QPixmap>
#include "sflphone_const.h"
diff --git a/kde/src/widgets/AccountItemWidget.cpp b/kde/src/widgets/AccountItemWidget.cpp
index 5c552496cd0ee50642e654b3ff924337ed515bae..1d5af8408d793f11203234945327a02710312757 100755
--- a/kde/src/widgets/AccountItemWidget.cpp
+++ b/kde/src/widgets/AccountItemWidget.cpp
@@ -22,7 +22,7 @@
#include "AccountItemWidget.h"
#include <QtGui/QHBoxLayout>
-#include <QtCore/QDebug>
+#include <QDebug>
#include "lib/sflphone_const.h"
diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp
index 127db14f401ee3096f03e7b06940bcb336f789a5..3598de053147110b51caadbcde00f938f11813d7 100644
--- a/kde/src/widgets/CallTreeItem.cpp
+++ b/kde/src/widgets/CallTreeItem.cpp
@@ -22,7 +22,6 @@
#include <klocale.h>
#include <kdebug.h>
-#include <unistd.h>
#include "lib/sflphone_const.h"
#include "CallTreeItem.h"
@@ -30,10 +29,6 @@
#include "lib/Call.h"
#include "AkonadiBackend.h"
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-
#include <QtGui/QWidget>
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index d7bb2c354906e0d3da8f7c043a57ae74ceffe610..81291d2f9f22bc0a34c6a270db7c63514cac5bdc 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -11,26 +11,9 @@
#include <klineedit.h>
#include <KLocalizedString>
#include <QtGui/QLabel>
+#include <QComboBox>
-#include <akonadi/collectionfilterproxymodel.h>
-#include <akonadi/contact/contactstreemodel.h>
-#include <akonadi/kmime/messagemodel.h>
-#include <akonadi/changerecorder.h>
-#include <kabc/addressee.h>
-#include <kabc/picture.h>
-#include <kabc/phonenumber.h>
-#include <kabc/vcard.h>
-#include <kabc/field.h>
-#include <kabc/vcardline.h>
-#include <kabc/contactgroup.h>
-#include <akonadi/itemfetchscope.h>
-#include <akonadi/entitydisplayattribute.h>
-#include <akonadi/recursiveitemfetchjob.h>
#include <kicon.h>
-#include <akonadi/entitytreeview.h>
-#include <akonadi/itemview.h>
-#include <akonadi/collectioncombobox.h>
-
#include "AkonadiBackend.h"
#include "ContactItemWidget.h"
#include "conf/ConfigurationSkeleton.h"
diff --git a/kde/src/widgets/ContactItemWidget.cpp b/kde/src/widgets/ContactItemWidget.cpp
index ac2224c3a89c620d2a1c7a7c447b45121c6761b9..17d5d6c53cd45d4036bc37cbc7d3e91e26956e7c 100644
--- a/kde/src/widgets/ContactItemWidget.cpp
+++ b/kde/src/widgets/ContactItemWidget.cpp
@@ -18,7 +18,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
-#include <QtCore/QStringList>
#include <QtCore/QMimeData>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
@@ -27,12 +26,7 @@
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
#include <KIcon>
-#include <kabc/addressee.h>
-#include <kabc/picture.h>
-#include <kabc/phonenumber.h>
#include <lib/Contact.h>
@@ -42,12 +36,10 @@
#include <kaction.h>
#include "lib/sflphone_const.h"
-#include "lib/Contact.h"
#include "ContactItemWidget.h"
#include "AkonadiBackend.h"
#include "widgets/BookmarkDock.h"
#include "SFLPhone.h"
-#include "conf/ConfigurationSkeleton.h"
///Constructor
ContactItemWidget::ContactItemWidget(QWidget *parent)
diff --git a/kde/src/widgets/HistoryDock.cpp b/kde/src/widgets/HistoryDock.cpp
index d3c385e36ce9bec632d30c4d26876a1cf12ee71a..7fd7e0f2d730595b8063e94557afe8927e967889 100644
--- a/kde/src/widgets/HistoryDock.cpp
+++ b/kde/src/widgets/HistoryDock.cpp
@@ -1,6 +1,5 @@
#include "HistoryDock.h"
-#include <QtGui/QVBoxLayout>
#include <kicon.h>
#include <klineedit.h>
#include <QtGui/QTreeWidget>
@@ -8,12 +7,12 @@
#include <QtGui/QPushButton>
#include <QtGui/QLabel>
#include <QDebug>
-#include <QDate>
#include <QtGui/QTreeWidgetItem>
#include <QtCore/QString>
#include <kdatewidget.h>
#include <QHeaderView>
#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
#include <QDate>
#include "SFLPhone.h"
#include "widgets/HistoryTreeItem.h"
diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp
index f4038e04f8b950ab7cb5da25dcad9fcff46517c7..12f4b053860d32030718a32e64901210c66ed65b 100644
--- a/kde/src/widgets/HistoryTreeItem.cpp
+++ b/kde/src/widgets/HistoryTreeItem.cpp
@@ -22,16 +22,12 @@
#include <QtGui/QGridLayout>
#include <QtGui/QMenu>
-#include <klocale.h>
-#include <kdebug.h>
-#include <unistd.h>
-#include <kaction.h>
+#include <KLocale>
+#include <KDebug>
+#include <KAction>
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
#include <KIcon>
-#include <QLabel>
#include "lib/sflphone_const.h"
#include "HistoryTreeItem.h"
@@ -39,7 +35,6 @@
#include "lib/Contact.h"
#include "SFLPhone.h"
#include "widgets/BookmarkDock.h"
-#include "conf/ConfigurationSkeleton.h"
#include "lib/Call.h"
const char * HistoryTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, ICON_CURRENT, ICON_DIALING, ICON_HOLD, ICON_FAILURE, ICON_BUSY, ICON_TRANSFER, ICON_TRANSF_HOLD, "", "", ICON_CONFERENCE};
diff --git a/kde/src/widgets/SFLPhoneTray.cpp b/kde/src/widgets/SFLPhoneTray.cpp
index c2a00f404cd57aa82bc142c0c9828813ccfc3c9d..a14cbe51a0d439e7d697ded7b3686cacdc38bb7b 100755
--- a/kde/src/widgets/SFLPhoneTray.cpp
+++ b/kde/src/widgets/SFLPhoneTray.cpp
@@ -1,4 +1,4 @@
-/************************************** *************************************
+/***************************************************************************
* Copyright (C) 2009-2010 by Savoir-Faire Linux *
* Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
* Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*