diff --git a/ChangeLog b/ChangeLog
index 1d3fff6cd..bdd501687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
+	gtk/gtkcombobox.c, gtk/gtkcomboboxentry.c, gtk/gtkentrycompletion.c,
+	gtk/gtktreemodelfilter.c, gtk/gtkcellrenderertoggle.c: Fix includes.
+
 Thu Oct 23 15:13:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* NEWS: Partial update for 2.3.0.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d3fff6cd..bdd501687 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
+	gtk/gtkcombobox.c, gtk/gtkcomboboxentry.c, gtk/gtkentrycompletion.c,
+	gtk/gtktreemodelfilter.c, gtk/gtkcellrenderertoggle.c: Fix includes.
+
 Thu Oct 23 15:13:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* NEWS: Partial update for 2.3.0.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1d3fff6cd..bdd501687 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
+	gtk/gtkcombobox.c, gtk/gtkcomboboxentry.c, gtk/gtkentrycompletion.c,
+	gtk/gtktreemodelfilter.c, gtk/gtkcellrenderertoggle.c: Fix includes.
+
 Thu Oct 23 15:13:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* NEWS: Partial update for 2.3.0.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d3fff6cd..bdd501687 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
+	gtk/gtkcombobox.c, gtk/gtkcomboboxentry.c, gtk/gtkentrycompletion.c,
+	gtk/gtktreemodelfilter.c, gtk/gtkcellrenderertoggle.c: Fix includes.
+
 Thu Oct 23 15:13:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* NEWS: Partial update for 2.3.0.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d3fff6cd..bdd501687 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Oct 23 20:21:16 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcelllayout.c, gtk/gtkcellview.c gtk/gtkcellviewmenuitem.c,
+	gtk/gtkcombobox.c, gtk/gtkcomboboxentry.c, gtk/gtkentrycompletion.c,
+	gtk/gtktreemodelfilter.c, gtk/gtkcellrenderertoggle.c: Fix includes.
+
 Thu Oct 23 15:13:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* NEWS: Partial update for 2.3.0.
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 3cf99d6ea..29ccc8936 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkcelllayout.h>
+#include "gtkcelllayout.h"
 
 GType
 gtk_cell_layout_get_type (void)
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 030f610f2..f05c69e62 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -18,7 +18,7 @@
  */
 
 #include <stdlib.h>
-#include <gtk/gtkcellrenderertoggle.h>
+#include "gtkcellrenderertoggle.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktreeprivate.h"
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 65d4d5b53..c5dfe7257 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -17,12 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkintl.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
+#include "gtkcellview.h"
+#include "gtkcelllayout.h"
+#include "gtkintl.h"
+#include "gtksignal.h"
+#include "gtkcellrenderertext.h"
+#include "gtkcellrendererpixbuf.h"
 #include <gobject/gmarshal.h>
 
 typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
diff --git a/gtk/gtkcellviewmenuitem.c b/gtk/gtkcellviewmenuitem.c
index d69435f7f..a757b3930 100644
--- a/gtk/gtkcellviewmenuitem.c
+++ b/gtk/gtkcellviewmenuitem.c
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkcellviewmenuitem.h>
-#include <gtk/gtkcellview.h>
+#include "gtkcellviewmenuitem.h"
+#include "gtkcellview.h"
 
 struct _GtkCellViewMenuItemPrivate
 {
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index e221ad04e..4f3ecf003 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -17,29 +17,29 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcellviewmenuitem.h>
+#include "gtkcombobox.h"
+#include "gtkcelllayout.h"
+#include "gtkcellview.h"
+#include "gtkcellviewmenuitem.h"
 
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkwindow.h>
+#include "gtktreeselection.h"
+#include "gtkframe.h"
+#include "gtktogglebutton.h"
+#include "gtkvseparator.h"
+#include "gtkarrow.h"
+#include "gtkmenu.h"
+#include "gtkmain.h"
+#include "gtkeventbox.h"
+#include "gtkcellrenderertext.h"
+#include "gtkbindings.h"
+#include "gtkliststore.h"
+#include "gtkwindow.h"
 
 #include <gdk/gdkkeysyms.h>
 
-#include <string.h>
 #include <gobject/gvaluecollector.h>
 
+#include <string.h>
 #include <stdarg.h>
 
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c
index 887049cf2..8dfed57eb 100644
--- a/gtk/gtkcomboboxentry.c
+++ b/gtk/gtkcomboboxentry.c
@@ -17,11 +17,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkcelllayout.h>
+#include "gtkcomboboxentry.h"
+#include "gtkcelllayout.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcellrenderertext.h>
+#include "gtkentry.h"
+#include "gtkcellrenderertext.h"
 
 #include "gtkintl.h"
 
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 74eacfdae..a63277fb2 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -17,21 +17,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkentryprivate.h>
-#include <gtk/gtkcelllayout.h>
+#include "gtkentrycompletion.h"
+#include "gtkentryprivate.h"
+#include "gtkcelllayout.h"
 
-#include <gtk/gtkintl.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshalers.h>
+#include "gtkintl.h"
+#include "gtkcellrenderertext.h"
+#include "gtktreeselection.h"
+#include "gtktreeview.h"
+#include "gtkscrolledwindow.h"
+#include "gtkvbox.h"
+#include "gtkwindow.h"
+#include "gtkentry.h"
+#include "gtkmain.h"
+#include "gtksignal.h"
+#include "gtkmarshalers.h"
 
 #include <string.h>
 
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 74e10588f..7061bf234 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -19,7 +19,7 @@
  */
 
 #include "gtktreemodelfilter.h"
-#include <gtk/gtkintl.h>
+#include "gtkintl.h"
 #include <string.h>
 
 /* ITER FORMAT: