diff -NurdB workrave-1.6.2-orig/common/include/nls.h workrave-1.6.2/common/include/nls.h
--- workrave-1.6.2-orig/common/include/nls.h	2005-03-28 11:42:00.000000000 -0500
+++ workrave-1.6.2/common/include/nls.h	2005-03-28 14:40:17.000000000 -0500
@@ -27,28 +27,23 @@
 
 #include <glib/glist.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 -NurdB workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc
--- workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc	2005-03-28 11:42:00.000000000 -0500
+++ workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc	2005-03-28 15:17:39.000000000 -0500
@@ -22,12 +22,12 @@
 
 #include "debug.hh"
 
-#include "RemoteControl.hh"
 
 #include "GUI.hh"
 #include "AppletWindow.hh"
 
 #include "Menus.hh"
+#include "RemoteControl.hh"
 
 WR_INIT()