diff -up evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.c.avoid-exposing-db-h evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.c
--- evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.c.avoid-exposing-db-h	2012-06-03 20:12:39.000000000 -0400
+++ evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.c	2012-06-27 08:39:11.096596229 -0400
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <db.h>
+
 #include "e-book-backend-db-cache.h"
 #include "e-book-backend.h"
 #include "e-book-backend-sexp.h"
diff -up evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.h.avoid-exposing-db-h evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.h
--- evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.h.avoid-exposing-db-h	2012-06-03 20:12:39.000000000 -0400
+++ evolution-data-server-3.5.3/addressbook/libedata-book/e-book-backend-db-cache.h	2012-06-27 08:39:11.096596229 -0400
@@ -27,10 +27,12 @@
 #define E_BOOK_BACKEND_DB_CACHE_H
 
 #include <libebook/libebook.h>
-#include "db.h"
 
 G_BEGIN_DECLS
 
+/* Avoid including <db.h> in a public header file. */
+typedef struct __db DB;
+
 EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
 gchar *e_book_backend_db_cache_get_filename (DB *db);
 void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);