Index: src/xfmedia-remote.c
===================================================================
--- src/xfmedia-remote.c	(revision 19403)
+++ src/xfmedia-remote.c	(working copy)
@@ -40,17 +40,26 @@
 #include <getopt.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
+#include <glib.h>
+
+#if defined(HAVE_LOCALE_H) && defined(ENABLE_NLS)
 #include <locale.h>
+#include <glib/gi18n.h>
 #endif
 
-#include <glib.h>
 
-/* for _() only; no need to link in the actual library */
-#include <libxfce4util/libxfce4util.h>
-
 #include <xfmedia/xfmedia-remote-client.h>
 
+#ifdef BDEBUG
+#define DBG(...)                G_STMT_START{                               \
+    fprintf(stderr, "DBG[%s:%d] %s(): ", __FILE__, __LINE__, __DBG_FUNC__); \
+    fprintf(stderr, __VA_ARGS__);                                           \
+    fprintf(stderr, "\n");                                                  \
+}G_STMT_END
+#else
+#define DBG(...)   G_STMT_START{ (void)0; }G_STMT_END
+#endif
+
 enum {
     OPT_SESSION = 1000,
     OPT_PING,
@@ -145,9 +154,15 @@
     gboolean possibly_play_too = FALSE;
     XfmediaRemoteStatus ret;
     
-    xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+#ifdef ENABLE_NLS
+    bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+# endif
+    textdomain(GETTEXT_PACKAGE);
     if(!setlocale(LC_ALL, ""))
         g_warning("Locale not supported; using 'C'.");
+#endif
     
     if(argc == 1) {
         xfmedia_remote_print_usage(argv[0]);
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 19403)
+++ src/Makefile.am	(working copy)
@@ -87,8 +87,7 @@
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DBINDIR=\"$(bindir)\" \
 	@GLIB_CFLAGS@ \
-	@DBUS_CFLAGS@ \
-	@LIBXFCE4UTIL_CFLAGS@
+	@DBUS_CFLAGS@
 
 xfmedia_remote_LDADD = \
 	$(top_builddir)/xfmedia/libxfmedia-remote-client.la \
Index: src/remote.c
===================================================================
--- src/remote.c	(revision 19403)
+++ src/remote.c	(working copy)
@@ -55,6 +55,10 @@
 #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
 #endif
 
+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
+#endif
+
 #endif  /* HAVE_DBUS */
 
 #include <libxfce4util/libxfce4util.h>