diff -burN tracker-0.5.3.no-mysql/configure.in tracker-0.5.3/configure.in
--- tracker-0.5.3.no-mysql/configure.in	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/configure.in	2007-01-10 00:21:44.000000000 -0600
@@ -223,13 +223,10 @@
 	 	)
 
 ####################################################################
-# Optional database/indexer component checks
+# External SQLite check
 ####################################################################
 
-
 SQLITE_REQUIRED=3.2
-AC_DEFINE(USING_SQLITE, [], [Define if we are using sqlite])
-AM_CONDITIONAL(USING_SQLITE, true)
 
 AC_ARG_ENABLE(external_sqlite, 
 	AC_HELP_STRING(
@@ -239,16 +236,18 @@
 
 if test "x$enable_external_sqlite" = "xyes"; 
 then
-	
 	# Check for SQLite3
 	PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
 	AC_SUBST(SQLITE3_CFLAGS)
 	AC_SUBST(SQLITE3_LIBS)
+
+	AC_DEFINE(USING_EXTERNAL_SQLITE, [], [Define if we are using sqlite])
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true)
 else
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
 fi		
 
+
 ###############################################################################
 # Check for file monitor backends
 ###############################################################################
diff -burN tracker-0.5.3.no-mysql/src/trackerd/Makefile.am tracker-0.5.3/src/trackerd/Makefile.am
--- tracker-0.5.3.no-mysql/src/trackerd/Makefile.am	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/Makefile.am	2007-01-10 00:20:48.000000000 -0600
@@ -1,5 +1,5 @@
 if USING_EXTERNAL_SQLITE
-additional_flags= $(SQLITE3_CFLAGS)
+additional_flags= $(SQLITE3_CFLAGS) -I/usr/include
 additional_libs= $(SQLITE3_LIBS)
 else
 additional_flags= -I$(top_builddir)/src/sqlite3
Files tracker-0.5.3.no-mysql/src/trackerd/.Makefile.am.swp and tracker-0.5.3/src/trackerd/.Makefile.am.swp differ
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h tracker-0.5.3/src/trackerd/tracker-db.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-db.h	2007-01-10 00:01:50.000000000 -0600
@@ -29,9 +29,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
 #include "tracker-db-sqlite.h"
-#endif
 
 gboolean	tracker_db_is_file_up_to_date 	(DBConnection *db_con, const char *uri, guint32 *id);
 FileInfo *	tracker_db_get_file_info	(DBConnection *db_con, FileInfo *info);
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h tracker-0.5.3/src/trackerd/tracker-db-sqlite.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-db-sqlite.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-db-sqlite.h	2007-01-10 00:04:35.000000000 -0600
@@ -22,7 +22,12 @@
 #ifndef _TRACKER_SQLITE_DB_H_
 #define _TRACKER_SQLITE_DB_H_
 
+#ifdef USING_EXTERNAL_SQLITE
+#include <sqlite3.h>
+#else
 #include "../sqlite3/sqlite3.h"
+#endif
+
 #include <glib.h>
 
 #include "tracker-utils.h"
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-evolution.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-evolution.h	2007-01-10 00:02:02.000000000 -0600
@@ -30,9 +30,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h tracker-0.5.3/src/trackerd/tracker-mbox.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox.h	2007-01-10 00:01:29.000000000 -0600
@@ -30,9 +30,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 typedef enum {
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-kmail.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-kmail.h	2007-01-10 00:02:10.000000000 -0600
@@ -29,9 +29,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*
diff -burN tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h
--- tracker-0.5.3.no-mysql/src/trackerd/tracker-mbox-thunderbird.h	2007-01-09 23:56:45.000000000 -0600
+++ tracker-0.5.3/src/trackerd/tracker-mbox-thunderbird.h	2007-01-10 00:01:43.000000000 -0600
@@ -30,9 +30,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*