Index: src/libtracker-gtk/tracker-utils.h
===================================================================
--- src/libtracker-gtk/tracker-utils.h	(Revision 505)
+++ src/libtracker-gtk/tracker-utils.h	(Arbeitskopie)
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "../libtracker/tracker.h""
+#include <tracker.h>
 
 GList *tracker_keyword_array_to_glist(gchar **array);
 GList *tracker_get_all_keywords (TrackerClient *tracker_client);
Index: src/libtracker-gtk/Makefile.am
===================================================================
--- src/libtracker-gtk/Makefile.am	(Revision 505)
+++ src/libtracker-gtk/Makefile.am	(Arbeitskopie)
@@ -1,7 +1,6 @@
 
 INCLUDES = \
 	$(LIBTRACKERGTK_CFLAGS) \
-	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/libtracker
 
 libtracker_gtkincdir = $(includedir)/libtracker-gtk
Index: src/libtracker-gtk/tracker-keyword-store.h
===================================================================
--- src/libtracker-gtk/tracker-keyword-store.h	(Revision 505)
+++ src/libtracker-gtk/tracker-keyword-store.h	(Arbeitskopie)
@@ -27,7 +27,7 @@
 
 #include <gtk/gtkliststore.h>
 
-#include "../libtracker/tracker.h"
+#include <tracker.h>
 
 G_BEGIN_DECLS
 
Index: src/tracker-search-tool/tracker-search-tool.h
===================================================================
--- src/tracker-search-tool/tracker-search-tool.h	(Revision 505)
+++ src/tracker-search-tool/tracker-search-tool.h	(Arbeitskopie)
@@ -39,12 +39,11 @@
 
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
-#ifdef ENABLE_LIBTRACKERGTK
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#endif /* ENABLE_LIBTRACKERGTK */
+
 #include "../libtracker/tracker.h"
 
 #define MAX_SEARCH_RESULTS 10
@@ -121,9 +120,7 @@
 	int			current_page;
 	int			type;
 	service_info_t  	*current_service;
-#ifdef ENABLE_LIBTRACKERGTK
 	GtkWidget		*metatile;
-#endif /* ENABLE_LIBTRACKER_GTK */	
 	GtkWidget		*no_results_label;
 	GtkWidget		*initial_label;
 	GtkWidget		*count_label;
Index: src/tracker-search-tool/tracker-search-tool-callbacks.c
===================================================================
--- src/tracker-search-tool/tracker-search-tool-callbacks.c	(Revision 505)
+++ src/tracker-search-tool/tracker-search-tool-callbacks.c	(Arbeitskopie)
@@ -48,9 +48,7 @@
 #include "tracker-search-tool.h"
 #include "tracker-search-tool-callbacks.h"
 #include "tracker-search-tool-support.h"
-#ifdef ENABLE_LIBTRACKERGTK
 #include "../libtracker-gtk/tracker-metadata-tile.h"
-#endif /* ENABLE_LIBTRACKERGTK */
 
 #define SILENT_WINDOW_OPEN_LIMIT 5
 
@@ -393,7 +391,6 @@
 
 }
 
-#ifdef ENABLE_LIBTRACKERGTK
 void
 update_metadata_tile (GSearchWindow *gsearch)
 {
@@ -434,7 +431,6 @@
 	g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
 	g_list_free (list);
 }
-#endif /* ENABLE_LIBTRACKERGTK */
 
 void
 open_file_cb (GtkAction * action,
@@ -1047,9 +1043,8 @@
 			}
 		}
 	}
-#ifdef ENABLE_LIBTRACKERGTK
+
 	update_metadata_tile (gsearch);
-#endif /* ENABLE_LIBTRACKERGTK */
 
 	return FALSE;
 }
Index: src/tracker-search-tool/Makefile.am
===================================================================
--- src/tracker-search-tool/Makefile.am	(Revision 505)
+++ src/tracker-search-tool/Makefile.am	(Arbeitskopie)
@@ -23,10 +23,6 @@
 #schema_in_file = tracker-search-tool.schemas.in
 #schema_DATA = $(schema_in_file:.schemas.in=.schemas)
 
-if ENABLE_LIBTRACKERGTK
-TRACKERGTK_LIBS=$(top_builddir)/src/libtracker-gtk/libtracker-gtk.la
-endif
-
 tracker_search_tool_SOURCES =     \
 	tracker-search-tool-support.c   \
 	tracker-search-tool-support.h   \
@@ -43,7 +39,7 @@
 	$(GNOMEVFS_LIBS)    \
 	$(GNOMEDESKTOP_LIBS) \
 	$(DBUS_LIBS)	\
-	$(TRACKERGTK_LIBS) \
+        $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
 	$(top_builddir)/src/libtracker/libtrackerclient.la 
 
 #man_MANS = tracker-search-tool.1
Index: src/tracker-search-tool/tracker-search-tool.c
===================================================================
--- src/tracker-search-tool/tracker-search-tool.c	(Revision 505)
+++ src/tracker-search-tool/tracker-search-tool.c	(Arbeitskopie)
@@ -48,9 +48,7 @@
 #include "tracker-search-tool-callbacks.h"
 #include "tracker-search-tool-support.h"
 #include "sexy-icon-entry.h"
-#ifdef ENABLE_LIBTRACKERGTK
 #include "../libtracker-gtk/tracker-metadata-tile.h"
-#endif /* ENABLE_LIBTRACKERGTK */
 
 #define TRACKER_SEARCH_TOOL_DEFAULT_ICON_SIZE 32
 #define TRACKER_SEARCH_TOOL_STOCK "panel-searchtool"
@@ -2671,12 +2669,10 @@
 	gtk_widget_set_sensitive (gsearch->forward_button, FALSE);
 	gtk_widget_set_sensitive (gsearch->back_button, FALSE);
 
-#ifdef ENABLE_LIBTRACKERGTK
 	/* metadata_tile */
 	gsearch->metatile = tracker_metadata_tile_new ();
 	gtk_widget_show (gsearch->metatile);
 	gtk_box_pack_start (GTK_BOX (main_container), gsearch->metatile, FALSE, FALSE, 0);
-#endif /* ENABLE_LIBTRACKERGTK */
 
 	gtk_window_set_focus (GTK_WINDOW (gsearch->window),
 		GTK_WIDGET (gsearch->search_entry));