diff --git a/ChangeLog b/ChangeLog
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 632dcd8b2c..3ce8773f76 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* gtk/gtkcolorsel.c, gtk/gtkwidget.c, gtk/gtktreeview.c:
+	Remove stale gdk backend includes.
+ 
 2001-10-10  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkcombo.c (gtk_combo_class_init): add enable_empty
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index b78a8fd10c..dda756b38f 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -28,14 +28,6 @@
 #include "gdkconfig.h"
 #include <math.h>
 
-#if defined (GDK_WINDOWING_X11)
-#include "x11/gdkx.h"
-#elif defined (GDK_WINDOWING_WIN32)
-#include "win32/gdkwin32.h"
-#elif defined (GDK_WINDOWING_FB)
-#include "linux-fb/gdkfb.h"
-#endif
-
 #include "gdk/gdkkeysyms.h"
 #include "gtkcolorsel.h"
 #include "gtkhsv.h"
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 88c8f1994c..0e184a0209 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -38,14 +38,6 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 
-#if defined (GDK_WINDOWING_X11)
-#include "x11/gdkx.h"
-#elif defined (GDK_WINDOWING_WIN32)
-#include "win32/gdkwin32.h"
-#elif defined(GDK_WINDOWING_FB)
-#include "linux-fb/gdkfb.h"
-#endif
-
 #define GTK_TREE_VIEW_SEARCH_DIALOG_KEY "gtk-tree-view-search-dialog"
 
 #define SCROLL_EDGE_SIZE 15