diff --git a/src/Account.cpp b/src/Account.cpp
index 913811145dfee08522ee522c39419ed3611d706d..449ea381fec539095ddd550a83594453918ce332 100644
--- a/src/Account.cpp
+++ b/src/Account.cpp
@@ -19,12 +19,17 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+//Parent
#include "Account.h"
-#include <QDebug>
+//Qt
+#include <QtCore/QDebug>
#include <QtCore/QString>
+//SFLPhone
#include "sflphone_const.h"
+
+//SFLPhone lib
#include "configurationmanager_interface_singleton.h"
///Match state name to user readable string
diff --git a/src/AccountList.cpp b/src/AccountList.cpp
index be54288e7e3948e8209b2a5416f04acef6b7da52..e97a34c6e95cd71d8502bd80e26df318d611936f 100644
--- a/src/AccountList.cpp
+++ b/src/AccountList.cpp
@@ -19,10 +19,14 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
#include "AccountList.h"
+
+//SFLPhone
#include "sflphone_const.h"
-#include "configurationmanager_interface_singleton.h"
+//SFLPhone library
+#include "configurationmanager_interface_singleton.h"
///Constructors
diff --git a/src/Call.cpp b/src/Call.cpp
index eaf51ffdfd44883bfef395d40cec3dabf0e3fb5a..3e3e8dd3744769e3e1257b7712672a6278785940 100644
--- a/src/Call.cpp
+++ b/src/Call.cpp
@@ -18,10 +18,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "Call.h"
+//SFLPhone library
#include "CallModel.h"
-
#include "callmanager_interface_singleton.h"
#include "configurationmanager_interface_singleton.h"
#include "ContactBackend.h"
diff --git a/src/CallModel.cpp b/src/CallModel.cpp
index 39c87e3395e206d2b07105d980a0c5ab3cdfbd37..61e057ac52696c43971ce45c0a78ccd60d6040f5 100644
--- a/src/CallModel.cpp
+++ b/src/CallModel.cpp
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
#include <CallModel.h>
bool CallModelBase::dbusInit = false;
diff --git a/src/CallModel.hpp b/src/CallModel.hpp
index 352b2b46e8900eee16363b306f9d2c63ffef340d..973c8dac9707290d95f92a5f579369baa7699cba 100644
--- a/src/CallModel.hpp
+++ b/src/CallModel.hpp
@@ -1,6 +1,30 @@
-#include <QHash>
-#include <QDragEnterEvent>
-#include <QDebug>
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ **************************************************************************/
+
+//Qt
+#include <QtCore/QHash>
+#include <QtCore/QDebug>
+#include <QtGui/QDragEnterEvent>
+
+//SFLPhone library
#include "Call.h"
#include "AccountList.h"
#include "dbus/metatypes.h"
@@ -8,10 +32,12 @@
#include "configurationmanager_interface_singleton.h"
#include "instance_interface_singleton.h"
#include "sflphone_const.h"
-#include "unistd.h"
#include "typedefs.h"
#include "ContactBackend.h"
+//System
+#include "unistd.h"
+
//Static member
template <typename CallWidget, typename Index> QString CallModel<CallWidget,Index>::m_pPriorAccountId = "" ;
template <typename CallWidget, typename Index> AccountList* CallModel<CallWidget,Index>::m_pAccountList = 0 ;
diff --git a/src/Contact.cpp b/src/Contact.cpp
index 774e6dea4ffbdd6ac7dc37d59b387f8dd3154b88..5764a94632373c2197f9b8cc972de9d201821605 100644
--- a/src/Contact.cpp
+++ b/src/Contact.cpp
@@ -18,14 +18,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "Contact.h"
+//Qt
#include <QtCore/QDebug>
-#include <kabc/addressee.h>
-#include <kabc/picture.h>
-#include <kabc/phonenumber.h>
-#include <QPixmap>
+#include <QtGui/QPixmap>
+//SFLPhone library
#include "sflphone_const.h"
///Constructor
diff --git a/src/ContactBackend.cpp b/src/ContactBackend.cpp
index f95c0284ea31cc1d7b034d66b2d650430af615df..cedbd31dc4bb17c41cbc183288371e1eef24db1d 100644
--- a/src/ContactBackend.cpp
+++ b/src/ContactBackend.cpp
@@ -1,7 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+//Parent
#include "ContactBackend.h"
+//SFLPhone library
#include "Contact.h"
-#include <QHash>
+
+//Qt
+#include <QtCore/QHash>
ContactBackend::ContactBackend(QObject* parent) : QObject(parent)
{
diff --git a/src/ContactBackend.h b/src/ContactBackend.h
index 1a3cc57a0c92c5f950b4d929d1117262c779ddb4..a4a1180676a667fb61a653c1dd4a2794f4cb9844 100644
--- a/src/ContactBackend.h
+++ b/src/ContactBackend.h
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
#ifndef CONTACT_BACKEND_H
#define CONTACT_BACKEND_H
diff --git a/src/Item.cpp b/src/Item.cpp
index 7f2b2a40a87872591c03ee333d5f8744297eba2e..4875cf965897763c6970666b7dc4886982abc13a 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -18,6 +18,10 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+//Parent
#include "Item.h"
-#include <QListWidgetItem>
+
+//Qt
+#include <QtGui/QListWidgetItem>