lib: Eliminate some redundant includes of xapian.h

Most files including this already include database-private.h which
includes xapian.h already.

diff --git a/lib/database.cc b/lib/database.cc
index 414460d276b31f7df23895d51749540fc4876c47..82c078867a52dee07a61dbaf6bea77044d578398 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -24,7 +24,6 @@
 
 #include <sys/time.h>
 #include <signal.h>
 
 #include <sys/time.h>
 #include <signal.h>

-#include <xapian.h>

 
 #include <glib.h> /* g_free, GPtrArray, GHashTable */
 
 
 #include <glib.h> /* g_free, GPtrArray, GHashTable */
 

diff --git a/lib/directory.cc b/lib/directory.cc
index f576e33673bec51e2c5912c6a78447634416ba71..2540ca7647fa99e976593d052fed6b55437c9380 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -21,8 +21,6 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
 #include "notmuch-private.h"
 #include "database-private.h"
 

-#include <xapian.h>
-

 struct _notmuch_filenames {
     Xapian::TermIterator iterator;
     Xapian::TermIterator end;
 struct _notmuch_filenames {
     Xapian::TermIterator iterator;
     Xapian::TermIterator end;

diff --git a/lib/message.cc b/lib/message.cc
index 71f5619fe0c04435cc5a5996ff48d995288fe5a0..bf9f1edb84b6404f1c06b35d8c76607eca4d2b73 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -25,8 +25,6 @@
 
 #include <gmime/gmime.h>
 
 
 #include <gmime/gmime.h>
 

-#include <xapian.h>
-

 struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
 struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;

diff --git a/lib/query.cc b/lib/query.cc
index 9acf2b03b84da6729f78a8e6ee843a7eb35d0afd..7916421e4a0068847a0fc13b71514c1258893a42 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -23,8 +23,6 @@
 
 #include <glib.h> /* GHashTable, GPtrArray */
 
 
 #include <glib.h> /* GHashTable, GPtrArray */
 

-#include <xapian.h>
-

 struct _notmuch_query {
     notmuch_database_t *notmuch;
     const char *query_string;
 struct _notmuch_query {
     notmuch_database_t *notmuch;
     const char *query_string;

diff --git a/lib/thread.cc b/lib/thread.cc
index c29140397feb78e81cbb284e8ae52df75e3df22f..7f15586286d9441e1199c6f63c1867944b4b645b 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -21,8 +21,6 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
 #include "notmuch-private.h"
 #include "database-private.h"
 

-#include <xapian.h>
-

 #include <gmime/gmime.h>
 #include <glib.h> /* GHashTable */
 
 #include <gmime/gmime.h>
 #include <glib.h> /* GHashTable */