From d064bd696ccc443a7ece9cfc8816999c69943223 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Mon, 1 Nov 2010 22:31:45 -0700
Subject: [PATCH] lib: Eliminate some redundant includes of xapian.h

Most files including this already include database-private.h which
includes xapian.h already.
---
 lib/database.cc  | 1 -
 lib/directory.cc | 2 --
 lib/message.cc   | 2 --
 lib/query.cc     | 2 --
 lib/thread.cc    | 2 --
 5 files changed, 9 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 414460d2..82c07886 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -24,7 +24,6 @@
 
 #include <sys/time.h>
 #include <signal.h>
-#include <xapian.h>
 
 #include <glib.h> /* g_free, GPtrArray, GHashTable */
 
diff --git a/lib/directory.cc b/lib/directory.cc
index f576e336..2540ca76 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -21,8 +21,6 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
-#include <xapian.h>
-
 struct _notmuch_filenames {
     Xapian::TermIterator iterator;
     Xapian::TermIterator end;
diff --git a/lib/message.cc b/lib/message.cc
index 71f5619f..bf9f1edb 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -25,8 +25,6 @@
 
 #include <gmime/gmime.h>
 
-#include <xapian.h>
-
 struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
diff --git a/lib/query.cc b/lib/query.cc
index 9acf2b03..7916421e 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -23,8 +23,6 @@
 
 #include <glib.h> /* GHashTable, GPtrArray */
 
-#include <xapian.h>
-
 struct _notmuch_query {
     notmuch_database_t *notmuch;
     const char *query_string;
diff --git a/lib/thread.cc b/lib/thread.cc
index c2914039..7f155862 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -21,8 +21,6 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
-#include <xapian.h>
-
 #include <gmime/gmime.h>
 #include <glib.h> /* GHashTable */