--- gnome-libs-1.4.2/support/poptint.h.prototypes	2000-02-26 07:30:08.000000000 +0000
+++ gnome-libs-1.4.2/support/poptint.h	2008-08-30 08:49:08.000000000 +0100
@@ -45,7 +45,7 @@
 
 #define	xfree(_a)	free((void *)_a)
 
-#ifdef HAVE_LIBINTL_H
+#ifdef ENABLE_NLS
 #include <libintl.h>
 #endif
 
--- gnome-libs-1.4.2/libgnomeui/gnome-dock-layout.c.prototypes	2002-01-06 21:30:17.000000000 +0000
+++ gnome-libs-1.4.2/libgnomeui/gnome-dock-layout.c	2008-08-30 08:49:08.000000000 +0100
@@ -20,6 +20,8 @@
    Author: Ettore Perazzoli <ettore@comm2000.it>
 */
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
--- gnome-libs-1.4.2/libgnomeui/gnome-window.c.prototypes	2001-06-14 16:09:43.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/gnome-window.c	2008-08-30 08:49:08.000000000 +0100
@@ -22,6 +22,8 @@
  */
 
 
+#include <string.h>
+
 #include <config.h>
 #include <string.h>
 #include <glib.h>
--- gnome-libs-1.4.2/libgnomeui/gnome_segv.c.prototypes	2002-04-24 15:04:17.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/gnome_segv.c	2008-08-30 08:49:08.000000000 +0100
@@ -6,6 +6,10 @@
 #ifndef _POSIX_SOURCE
 #  define _POSIX_SOURCE 1
 #endif
+/* Needed for putenv under GNU Libc */
+#ifndef _XOPEN_SOURCE
+#  define _XOPEN_SOURCE 1
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>