--- libgsm/phonemgr-utils.c~	2011-07-05 15:38:52.000000000 -0500
+++ libgsm/phonemgr-utils.c	2012-07-20 10:09:52.901944672 -0500
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 #include <gnokii.h>
 
 #include <bluetooth/bluetooth.h>
--- cut-n-paste/e-contact-entry/e-contact-entry.c~	2011-07-05 15:38:52.000000000 -0500
+++ cut-n-paste/e-contact-entry/e-contact-entry.c	2012-07-20 10:21:44.592521155 -0500
@@ -39,9 +39,7 @@
 #include <glib/gi18n.h>
 
 #include <libedataserver/e-source.h>
-#include <libebook/e-book.h>
-#include <libebook/e-book-view.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 
 #include "e-contact-entry.h"
 #include "econtactentry-marshal.h"
--- cut-n-paste/e-contact-entry/e-contact-entry.h~	2012-07-20 10:22:00.000000000 -0500
+++ cut-n-paste/e-contact-entry/e-contact-entry.h	2012-07-20 10:30:35.064119221 -0500
@@ -23,7 +23,6 @@
 #ifndef CONTACT_ENTRY_H
 #define CONTACT_ENTRY_H
 
-#include <libedataserver/e-source-group.h>
 #include <libedataserver/e-source-list.h>
 #include <libebook/e-contact.h>
 #include <gtk/gtk.h>
--- cut-n-paste/e-contact-entry/e-contact-entry.h~	2012-07-20 10:50:21.000000000 -0500
+++ cut-n-paste/e-contact-entry/e-contact-entry.h	2012-07-20 10:50:41.604554284 -0500
@@ -24,7 +24,7 @@
 #define CONTACT_ENTRY_H
 
 #include <libedataserver/e-source-list.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
--- cut-n-paste/e-contact-entry/e-contact-entry.c~	2012-07-20 11:11:33.000000000 -0500
+++ cut-n-paste/e-contact-entry/e-contact-entry.c	2012-07-20 11:12:16.095471898 -0500
@@ -38,7 +38,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 #include <libebook/libebook.h>
 
 #include "e-contact-entry.h"
--- cut-n-paste/e-contact-entry/e-contact-entry.h~	2012-07-20 11:12:43.000000000 -0500
+++ cut-n-paste/e-contact-entry/e-contact-entry.h	2012-07-20 11:20:22.405379048 -0500
@@ -23,7 +23,7 @@
 #ifndef CONTACT_ENTRY_H
 #define CONTACT_ENTRY_H
 
-#include <libedataserver/e-source-list.h>
+#include <libedataserver/libedataserver.h>
 #include <libebook/libebook.h>
 #include <gtk/gtk.h>
 
