diff -ruN src/libtracker/tracker-files.c src/libtracker/tracker-files.c
--- src/libtracker/tracker-files.c	2006-08-02 17:17:42.000000000 +0200
+++ src/libtracker/tracker-files.c	2006-08-27 03:14:10.000000000 +0200
@@ -18,13 +18,12 @@
  * Boston, MA 02111-1307, USA. 
  */
 
+#include <locale.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "../libtracker/tracker.h" 
-
 
+#include "../libtracker/tracker.h" 
 
 #define USAGE "usage: \ntracker-files -s ServiceType\t: Gets files with ServiceType (Documents, Music, Images, Videos, Text, Development, Other)\ntracker-files -m Mime1 [Mime2...] : Get all files that match one of the specified mime types\n"
 
@@ -62,6 +61,9 @@
 	GError *error = NULL;
 	ServiceType type;
 
+
+	setlocale (LC_ALL, "");
+
 	if (argc < 3) {
 		g_print (USAGE);
 		return 1;
diff -ruN src/libtracker/tracker-get-meta-for-folder.c src/libtracker/tracker-get-meta-for-folder.c
--- src/libtracker/tracker-get-meta-for-folder.c	2006-08-02 17:06:57.000000000 +0200
+++ src/libtracker/tracker-get-meta-for-folder.c	2006-08-27 03:14:10.000000000 +0200
@@ -18,10 +18,11 @@
  * Boston, MA 02111-1307, USA. 
  */
 
-#include <stdio.h>
+#include <locale.h>
 #include <glib.h>
-#include "../libtracker/tracker.h" 
+#include <glib-object.h>
 
+#include "../libtracker/tracker.h" 
 
 static void
 get_meta_table_data (gpointer key,
@@ -59,6 +60,8 @@
 	TrackerClient *client = NULL;
 
 
+	setlocale (LC_ALL, "");
+
 	if (argc < 2) {
 		g_print ("usage - tracker-meta-folder FOLDER [Metadata1...]\n");
 		return 1;
diff -ruN src/libtracker/tracker-query.c src/libtracker/tracker-query.c
--- src/libtracker/tracker-query.c	2006-08-02 17:06:57.000000000 +0200
+++ src/libtracker/tracker-query.c	2006-08-27 03:14:10.000000000 +0200
@@ -18,9 +18,13 @@
  * Boston, MA 02111-1307, USA. 
  */
 
+#include <locale.h>
+#include <sys/param.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <glib.h>
+#include <glib-object.h>
+#include <glib/gstdio.h>
+
 #include "../libtracker/tracker.h" 
 
 static char *tmp;
@@ -62,6 +66,8 @@
 	GError *error = NULL;
 	TrackerClient *client = NULL;
 
+
+	setlocale (LC_ALL, "");
 	
 	if (argc < 2) {
 		g_print ("usage - tracker-query File [Metadata Fields1...]\nMetadata fields are defined at http://freedesktop.org/wiki/Standards/shared-filemetadata-spec\nExample usage: tracker-query file.rdf File.Format File.Size\n");
@@ -122,5 +128,3 @@
 	return 0;
 
 }
-
-
diff -ruN src/libtracker/tracker-search.c src/libtracker/tracker-search.c
--- src/libtracker/tracker-search.c	2006-08-02 17:06:57.000000000 +0200
+++ src/libtracker/tracker-search.c	2006-08-27 03:14:10.000000000 +0200
@@ -17,7 +17,9 @@
  * Boston, MA 02111-1307, USA. 
  */
 
+#include <locale.h>
 #include <glib.h>
+
 #include "../libtracker/tracker.h" 
 
 static GMainLoop 	*loop;
@@ -56,6 +58,8 @@
 	TrackerClient *client = NULL;
 
 
+	setlocale (LC_ALL, "");
+
 	if (argc < 2) {
 		g_print ("usage - tracker-search SearchTerm1  [Searchterm2...]\nMultiple search terms are ANDed by default\n");
 		return 1;
diff -ruN src/libtracker/tracker-stats.c src/libtracker/tracker-stats.c
--- src/libtracker/tracker-stats.c	2006-07-30 17:59:50.000000000 +0200
+++ src/libtracker/tracker-stats.c	2006-08-27 03:14:10.000000000 +0200
@@ -18,11 +18,12 @@
  * Boston, MA 02111-1307, USA. 
  */
 
-#include <stdio.h>
+#include <locale.h>
 #include <string.h>
 #include <glib.h>
-#include "../libtracker/tracker.h" 
+#include <glib-object.h>
 
+#include "../libtracker/tracker.h" 
 
 #define TOTAL_COUNT "Total files indexed"
 
@@ -77,6 +78,8 @@
 	TrackerClient *client = NULL;
 
 
+	setlocale (LC_ALL, "");
+
 	if (argc > 1) {
 		g_print ("usage - tracker-stats\n");
 		return 1;
diff -ruN src/libtracker/tracker-tag.c src/libtracker/tracker-tag.c
--- src/libtracker/tracker-tag.c	2006-08-02 17:45:12.000000000 +0200
+++ src/libtracker/tracker-tag.c	2006-08-27 03:14:10.000000000 +0200
@@ -17,9 +17,13 @@
  * Boston, MA 02111-1307, USA. 
  */
 
+#include <locale.h>
+#include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include <glib-object.h>
+
 #include "../libtracker/tracker.h" 
 
 #define USAGE "usage: \ntracker-tag\t\t\t\t: Gets stats for all tags\ntracker-tag -a File Tag1 [Tag2...]\t: Add Tags to File\ntracker-tag -l File \t\t\t: List all tags on a File\ntracker-tag -r File Tag1 [Tag2...] \t: Remove Tags from File\ntracker-tag -R File  \t\t\t: Remove all tags from File\ntracker-tag -s Tag1 [Tag2...] \t\t: Search files for specified tags. Multiple tags are always ANDed in the search\n"
@@ -73,6 +77,8 @@
 	GError *error = NULL;
 
 
+	setlocale (LC_ALL, "");
+
 	client =  tracker_connect (FALSE);
 
 	if (!client) {