diff -NurdpB workrave-1.8.4/common/include/nls.h workrave-1.8.4-patched/common/include/nls.h
--- workrave-1.8.4/common/include/nls.h	2007-03-04 13:56:45.000000000 -0500
+++ workrave-1.8.4-patched/common/include/nls.h	2007-03-15 17:59:05.000000000 -0500
@@ -25,28 +25,23 @@
 #ifndef WORKRAVE_NLS_H
 #define WORKRAVE_NLS_H
 
-#ifdef HAVE_GNOME
-#  include <gnome.h>
-#else
-#  ifdef ENABLE_NLS
-#    include <locale.h>
-#      include <libintl.h>
-#      define _(String) gettext (String)
-#      ifdef gettext_noop
-#          define N_(String) gettext_noop (String)
-#      else
-#          define N_(String) (String)
-#      endif
+#ifdef ENABLE_NLS
+#  ifdef HAVE_GNOME
+#    include <gnome.h>
 #  else
-/* Stubs that do something close enough.  */
-#      define textdomain(String) (String)
-#      define gettext(String) (String)
-#      define dgettext(Domain,Message) (Message)
-#      define dcgettext(Domain,Message,Type) (Message)
-#      define bindtextdomain(Domain,Directory) (Domain)
-#      define _(String) (String)
+#    include <locale.h>
+#    include <libintl.h>
+#    define _(String) gettext (String)
+#    ifdef gettext_noop
+#      define N_(String) gettext_noop (String)
+#    else
 #      define N_(String) (String)
+#    endif
 #  endif
+#else
+/* Stubs that do something close enough.  */
+#  define _(String) (String)
+#  define N_(String) (String)
 #endif
 
 #ifdef __cplusplus
diff -NurdpB workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc
--- workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc	2007-03-04 13:56:38.000000000 -0500
+++ workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc	2007-03-15 17:59:43.000000000 -0500
@@ -22,13 +22,12 @@ static const char rcsid[] = "$Id: Remote
 
 #include "debug.hh"
 
-#include "RemoteControl.hh"
-
 #include "GUI.hh"
 #include "AppletControl.hh"
 #include "GnomeAppletWindow.hh"
 
 #include "Menus.hh"
+#include "RemoteControl.hh"
 
 WR_INIT()