diff --git a/daemon/src/dbus/Makefile.am b/daemon/src/dbus/Makefile.am
index 63e6ccbd011d6cd2507b4cf55b367baff6c0d813..f3af972f04edfa38bef84b8ef016173478b63378 100644
--- a/daemon/src/dbus/Makefile.am
+++ b/daemon/src/dbus/Makefile.am
@@ -50,7 +50,6 @@ $(service_DATA): $(service_in_files) Makefile
 EXTRA_DIST = README $(service_in_files) \
 			 callmanager-introspec.xml \
 			 configurationmanager-introspec.xml \
-			 contactmanager-introspec.xml \
 			 instance-introspec.xml \
 			 org.freedesktop.NetworkManager.xml
 
diff --git a/daemon/src/dbus/contactmanager-introspec.xml b/daemon/src/dbus/contactmanager-introspec.xml
deleted file mode 100644
index 89d39efb192ecd3fe0604f080a95ff58129368d1..0000000000000000000000000000000000000000
--- a/daemon/src/dbus/contactmanager-introspec.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.ContactManager">
-    
-  <!-- Contacts related methods -->
-  
-    <!-- Called by the client to get all saved contacts -->
-    <method name="getContacts">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="out"/>
-    </method>
-    
-    <!-- Called by the client to save all local contacts -->
-    <method name="setContacts">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-    </method>
-   
-  <!--      ///////////////////////               -->
-
-  <!-- Presence related methods -->
- 
-    <!-- Called by the client to set its new presence status -->
-    <method name="setPresence">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="presence" direction="in"/>
-      <arg type="s" name="additionalInfo" direction="in"/>
-    </method>
-  
-    <!-- Called by the daemon when a contact presence changes -->
-    <method name="setContactPresence">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="presence" direction="in"/>
-      <arg type="s" name="additionalInfo" direction="in"/>
-    </method>
-
-  </interface>
-</node>
diff --git a/daemon/src/dbus/contactmanager.cpp b/daemon/src/dbus/contactmanager.cpp
deleted file mode 100644
index 1514db5a65116990d631e767540ad0164f185d23..0000000000000000000000000000000000000000
--- a/daemon/src/dbus/contactmanager.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
- *  Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#include <contactmanager.h>
-#include "../manager.h"
-
-const char* ContactManager::SERVER_PATH = "/org/sflphone/SFLphone/ContactManager";
-
-std::map< std::string, std::string >
-ContactManager::getContacts (const std::string& accountID UNUSED)
-{
-    // TODO
-    std::map< std::string, std::string > ret;
-    return ret;
-}
-
-void
-ContactManager::setContacts (const std::string& accountID UNUSED, const std::map< std::string UNUSED, std::string >& details UNUSED)
-{
-    // TODO
-}
-
-void
-ContactManager::setPresence (const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
-{
-    // TODO
-}
-
-void
-ContactManager::setContactPresence (const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
-{
-    // TODO
-}
diff --git a/daemon/src/dbus/contactmanager.h b/daemon/src/dbus/contactmanager.h
deleted file mode 100644
index 7b8ead34a28d369d664619ccdb7220eec3198841..0000000000000000000000000000000000000000
--- a/daemon/src/dbus/contactmanager.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
- *  Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#ifndef CONTACTMANAGER_H
-#define CONTACTMANAGER_H
-
-#include "contactmanager-glue.h"
-#include <dbus-c++/dbus.h>
-
-
-class ContactManager
-    : public org::sflphone::SFLphone::ContactManager_adaptor,
-  public DBus::IntrospectableAdaptor,
-  public DBus::ObjectAdaptor
-{
-    public:
-
-        ContactManager (DBus::Connection& connection);
-        static const char* SERVER_PATH;
-
-    public:
-        std::map< std::string, std::string > getContacts (const std::string& accountID);
-        void setContacts (const std::string& accountID, const std::map< std::string, std::string >& details);
-        void setPresence (const std::string& accountID, const std::string& presence, const std::string& additionalInfo);
-        void setContactPresence (const std::string& accountID, const std::string& presence, const std::string& additionalInfo);
-
-};
-
-
-#endif//CONTACTMANAGER_H
diff --git a/gnome/src/dbus/contactmanager-introspec.xml b/gnome/src/dbus/contactmanager-introspec.xml
deleted file mode 100644
index 89d39efb192ecd3fe0604f080a95ff58129368d1..0000000000000000000000000000000000000000
--- a/gnome/src/dbus/contactmanager-introspec.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.ContactManager">
-    
-  <!-- Contacts related methods -->
-  
-    <!-- Called by the client to get all saved contacts -->
-    <method name="getContacts">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="out"/>
-    </method>
-    
-    <!-- Called by the client to save all local contacts -->
-    <method name="setContacts">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-    </method>
-   
-  <!--      ///////////////////////               -->
-
-  <!-- Presence related methods -->
- 
-    <!-- Called by the client to set its new presence status -->
-    <method name="setPresence">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="presence" direction="in"/>
-      <arg type="s" name="additionalInfo" direction="in"/>
-    </method>
-  
-    <!-- Called by the daemon when a contact presence changes -->
-    <method name="setContactPresence">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="presence" direction="in"/>
-      <arg type="s" name="additionalInfo" direction="in"/>
-    </method>
-
-  </interface>
-</node>
diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c
index 1835935eeddfa86c22201518232f8a3a021dbcdd..c9fdf210f59ab1a9854244de9b9e6a46246fe0c7 100644
--- a/gnome/src/eel-gconf-extensions.c
+++ b/gnome/src/eel-gconf-extensions.c
@@ -28,9 +28,8 @@
 
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
-#include <gtk/gtkmessagedialog.h>
 
 static GConfClient *global_gconf_client = NULL;
 
diff --git a/gnome/src/icons/icon_factory.c b/gnome/src/icons/icon_factory.c
index fc833625b0779f67f08510a59d45a8025e8b2d08..a888aec6eb96ae189af172e5d419a1a59721dcaf 100644
--- a/gnome/src/icons/icon_factory.c
+++ b/gnome/src/icons/icon_factory.c
@@ -32,7 +32,7 @@
 #include "icons/pixmap_data.h"
 
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include "icons/pixmap_data.h"
 #include "sflphone_const.h"
 
diff --git a/gnome/src/widget/minidialog.c b/gnome/src/widget/minidialog.c
index 3867d19e7373031ab9e1f76bbd466e9fb1654eca..dd45a1dcf02868d8d8c030ad96c96ff908227757 100644
--- a/gnome/src/widget/minidialog.c
+++ b/gnome/src/widget/minidialog.c
@@ -23,8 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
 #include <gtk/gtk.h>
 #include "sflphone_const.h"
 #include "minidialog.h"
diff --git a/gnome/src/widget/minidialog.h b/gnome/src/widget/minidialog.h
index 55d83d9c0c93547bd8349b07b1d73f36c7e96ce2..6f02b83be4a8432dccca4669cc5c3afc18b0c104 100644
--- a/gnome/src/widget/minidialog.h
+++ b/gnome/src/widget/minidialog.h
@@ -28,8 +28,6 @@
 #define __PIDGIN_MINI_DIALOG_H__
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
 
 G_BEGIN_DECLS
 
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.lucid b/tools/build-system/launchpad/sflphone-common/debian/control.lucid
index 589438b8092f496a00726aa3d0fee45c7fe3d9d4..f6e582f1de301dcdd79876f91b89bec322db0ec6 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control.lucid
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.lucid
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone-common
 Priority: optional
 Architecture: any
-Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++, libdbus-c++-1.0
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++, libdbus-c++-1-0
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.maverick b/tools/build-system/launchpad/sflphone-common/debian/control.maverick
index 6c560539523895e0288a02b3c912bf6b542d0f6c..193c95477ecd9faec1db82ed49f977f825e50dc0 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control.maverick
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.maverick
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone-common
 Priority: optional
 Architecture: any
-Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1.0
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1-0
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.natty b/tools/build-system/launchpad/sflphone-common/debian/control.natty
index 6c560539523895e0288a02b3c912bf6b542d0f6c..193c95477ecd9faec1db82ed49f977f825e50dc0 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control.natty
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.natty
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone-common
 Priority: optional
 Architecture: any
-Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1.0
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1-0
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org