diff --git a/ChangeLog b/ChangeLog
index 9cad23d5ff..ddb3f01930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
 2003-01-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix display of
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9cad23d5ff..ddb3f01930 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
 2003-01-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix display of
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9cad23d5ff..ddb3f01930 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
 2003-01-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix display of
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9cad23d5ff..ddb3f01930 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
 2003-01-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix display of
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9cad23d5ff..ddb3f01930 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Wed Jan  8 18:43:03 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkdisplay-x11.c: #include <stdlib.h> for putenv,
+	<string.h> for strlen.
+
+	* gdk/x11/gdkscreen-x11.c: #include <stdlib.h> for getenv,
+	<string.h> for strrchr.
+
+	* tests/testgtk.c (create_saved_position): "x" and "y" properties
+	for widgets no longer exist, use gtk_window_move instead.
+
+	* test/testtextbuffer.c (check_get_set_text): cast strlen to
+	int for g_error.
+
 2003-01-08  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix display of
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 7c4a328a4e..dda26b1712 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -23,6 +23,8 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <glib.h>
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 3ad5cd9f11..8036f1fb31 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -21,6 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
+#include <string.h>
+
 #include <config.h>
 #include <glib.h>
 #include "gdkscreen.h"
diff --git a/tests/testgtk.c b/tests/testgtk.c
index d33ee7b876..35f7dc1bf2 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2996,13 +2996,13 @@ create_saved_position (GtkWidget *widget)
 
       window = g_object_connect (gtk_widget_new (GTK_TYPE_WINDOW,
 						 "type", GTK_WINDOW_TOPLEVEL,
-						 "x", upositionx,
-						 "y", upositiony,
 						 "title", "Saved Position",
 						 NULL),
 				 "signal::configure_event", uposition_configure, NULL,
 				 NULL);
 
+      gtk_window_move (GTK_WINDOW (window), upositionx, upositiony);
+
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (widget));
       
diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c
index 7f48c039b3..808eea6fa3 100644
--- a/tests/testtextbuffer.c
+++ b/tests/testtextbuffer.c
@@ -169,7 +169,7 @@ check_get_set_text (GtkTextBuffer *buffer,
 
   if (n != strlen (str))
     g_error ("Sum of chars in lines is %d but buffer byte count is %d",
-             n, strlen (str));
+             n, (int) strlen (str));
   
   gtk_text_buffer_set_text (buffer, "", -1);