Practically everything changed.

2008-06-30 Cody Russell <bratsche@gnome.org> * Practically everything changed. Change all references of GIMP Toolkit (and variations of it) to GTK+ Toolkit, showing no mercy at all to our beloved ancestry. (#540529) svn path=/trunk/; revision=20709
author: Cody Russell <bratsche@gnome.org> 2008-06-30 23:01:56 +0000
committer: Cody Russell <bratsche@src.gnome.org> 2008-06-30 23:01:56 +0000
commit: fce9c8b7d45145c4556650843218e0b76c065c18 (patch)
tree: b333f179ae474f6446ccb7a1c3525c968718b8a2 /gtk
parent: 971023d9221084d8d40e690fa8e44a4296f2cff1 (diff)
download: gdk-pixbuf-fce9c8b7d45145c4556650843218e0b76c065c18.tar.gz
389 files changed, 389 insertions, 389 deletions
diff --git a/gtk/compose-parse.py b/gtk/compose-parse.py
index af86939cd..bbff041ca 100755
--- a/gtk/compose-parse.py
+++ b/gtk/compose-parse.py
@@ -37,7 +37,7 @@ keysymdatabase = {}
 keysymunicodedatabase = {}
 unicodedatabase = {}
 
-headerfile_start = """/* GTK - The GIMP Tool Kit
+headerfile_start = """/* GTK - The GTK+ Toolkit
  * Copyright (C) 2007, 2008 GNOME Foundation
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c
index c3e9c910c..9dbf9fe6c 100644
--- a/gtk/gen-paper-names.c
+++ b/gtk/gen-paper-names.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2006 Matthias Clasen
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtk-win32.rc.in b/gtk/gtk-win32.rc.in
index 89832f4fc..c216bf13f 100644
--- a/gtk/gtk-win32.rc.in
+++ b/gtk/gtk-win32.rc.in
@@ -14,7 +14,7 @@ VS_VERSION_INFO VERSIONINFO
       BLOCK "040904B0"
       BEGIN
 	VALUE "CompanyName", "The GTK developer community"
-	VALUE "FileDescription", "GIMP Toolkit"
+	VALUE "FileDescription", "GTK+ Toolkit"
 	VALUE "FileVersion", "@GTK_VERSION@.0"
 	VALUE "InternalName", "libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@"
 	VALUE "LegalCopyright", "Copyright � 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2005."
diff --git a/gtk/gtk.h b/gtk/gtk.h
index c3d7a4d19..cfdb3c194 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index b922084e5..2ccd145f3 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 CodeFactory AB
  * Copyright (C) 2001, 2002 Anders Carlsson
  * Copyright (C) 2003, 2004 Matthias Clasen <mclasen@redhat.com>
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 02f2fbec0..5ed38fbb0 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
 
    Copyright (C) 2001 CodeFactory AB
    Copyright (C) 2001 Anders Carlsson <andersca@codefactory.se>
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 436e3c3f2..6f8a361d8 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 2001 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 80780dba5..369f9616e 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 2001 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index cb57aaa92..e6d074477 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 8703f5287..ef1711112 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index f33d78fb1..54fe7ba9a 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 2001 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 208704920..42a6ca6ab 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 2001 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 1a781e7a5..29618c299 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 6442b2b85..227a285c2 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 3fb1d0bb7..839c86fdf 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 7c3177b68..1381bed89 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 630ab3012..7dae23887 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 1d8b388b1..cf2e9f6ff 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index 1fcbcba18..ab09d5c9a 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 10e33c42b..7954653cb 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 9daa14a75..018e67d25 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index f37359334..77bd2e267 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 10ea5e8d0..01449a376 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index fc5b8381c..4c5689c6b 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 2661b29d2..14a0efa94 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkAspectFrame: Ensure that the child window has a specified aspect ratio
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 668c38400..3a18c8b09 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 289718df4..efff2a6f6 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1,5 +1,5 @@
 /* 
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1999  Red Hat, Inc.
  * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
  * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index b39afef43..8bb91e0b7 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -1,5 +1,5 @@
 /* 
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1999  Red Hat, Inc.
  * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
  * Copyright (C) 2003  Matthias Clasen <mclasen@redhat.com>
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 609e45dc3..edb23ad00 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index f0666a210..eb82522ba 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index e8138137c..d1ccf3000 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 6dd8c53e2..39496ddc0 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 8924180a5..ecbd63d23 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkBindingSet: Keybinding manager for GtkObjects.
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 8d679cd80..80e798dba 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkBindingSet: Keybinding manager for GtkObjects.
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index f78e88388..4b13d6006 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 28d42a3e3..af4921bd6 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index bff876d0c..247c3bcab 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2006-2007 Async Open Source,
  *                         Johan Dahlin <jdahlin@async.com.br>
  *
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 8ba1da951..494611de2 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998-2002 James Henstridge <james@daa.com.au>
  * Copyright (C) 2006-2007 Async Open Source,
  *                         Johan Dahlin <jdahlin@async.com.br>,
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index e6fe549c0..1113f2e70 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2006-2007 Async Open Source,
  *                         Johan Dahlin <jdahlin@async.com.br>
  *
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 606b33d70..7a701d1b1 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index a8c1e8e4e..42b941775 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 29f786717..fba31ea93 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GTK Calendar Widget
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 840e320f0..7ec125e44 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GTK Calendar Widget
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index ece626b7f..bca325d50 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 1b50086ab..a158050f6 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 38ad2fada..997c248d0 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 0098b79b6..1488b4a99 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 6c209ee72..569ce2dba 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  * Copyright (C) 2004 Nokia Corporation
  * Copyright (C) 2006-2008 Imendio AB
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 2ce993758..5b57f3d2a 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  * Copyright (C) 2004 Nokia Corporation
  *
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 742c9b359..4ff99c00a 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 796f3c99b..2b25b8fec 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, 
  * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>  
  *
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 06cbf66ef..f84812b94 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
  * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
  *
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 61e3e0f75..7f2978d1a 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 21c1460a4..d9b233982 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index d8dfbab68..780274d59 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index fedb02958..6dc4a55b4 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index be36d7b78..c2ede9128 100644
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 395883693..4fbf4de7b 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index a93ddeec7..914ac5c98 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index f56dbe89b..35d80d40c 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 7d8e7e137..52f10f4cc 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, 
  * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>  
  *
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index e9cabffa7..58df8ae8d 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald
  * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
  *
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 51975c019..3b603ee5c 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1997 David Mosberger
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h
index d97b4f5bb..5a30b6288 100644
--- a/gtk/gtkcurve.h
+++ b/gtk/gtkcurve.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 219097323..a568ccc01 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 94aaeb3bd..9a01b4277 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 5cc1841b8..34d7ea6dc 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 5dbeb03ac..ee474467c 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1999 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 40cf0f64e..37dd4124a 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1999 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 0fabdeca1..a149a4552 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 6faf85403..b0a66c60e 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 2ad71fc5a..2bd8dd14c 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index a6574a1c3..fa623a5c0 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index ec57b16be..5bc0d5862 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 0abd6803a..0b42c99f8 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 2019b1eee..adbca160f 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 4be6d648b..4f7f978a1 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index f5ba09bd9..86356e78a 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 78b63e394..0574b68b5 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index ebfead7aa..8ac0b0cea 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  *
  * Copyright (C) 2003 Sun Microsystems, Inc.
  *
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index dc07a6ce7..5d0500512 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  *
  * Copyright (C) 2003 Sun Microsystems, Inc.
  *
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 685c7ab44..67e50670e 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooser.c: Abstract interface for file selector GUIs
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 0e08c7da6..eaafa9c9d 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooser.h: Abstract interface for file selector GUIs
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 08c0c2f9e..72b1fa01d 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserdefault.c: Default implementation of GtkFileChooser
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserdefault.h b/gtk/gtkfilechooserdefault.h
index d4fbda742..714acce85 100644
--- a/gtk/gtkfilechooserdefault.h
+++ b/gtk/gtkfilechooserdefault.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserdefault.h: Default implementation of GtkFileChooser
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index c180a05c2..2d63a2c41 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserdialog.c: File selector dialog
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index e792fd74a..984668472 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserdialog.h: File selector dialog
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 327c5423c..d426d7cc6 100644
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserembed.h: Abstract sizing interface for file selector implementations
  * Copyright (C) 2004, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserembed.h b/gtk/gtkfilechooserembed.h
index 65888981e..3d85659f3 100644
--- a/gtk/gtkfilechooserembed.h
+++ b/gtk/gtkfilechooserembed.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserembed.h: Abstract sizing interface for file selector implementations
  * Copyright (C) 2004, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 1b08132a7..538907e2d 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserentry.c: Entry with filename completion
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserentry.h b/gtk/gtkfilechooserentry.h
index 2818fd9da..df89b65ac 100644
--- a/gtk/gtkfilechooserentry.h
+++ b/gtk/gtkfilechooserentry.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserentry.h: Entry with filename completion
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index 39be43366..ac5fae28f 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserprivate.h: Interface definition for file selector GUIs
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index b80d362ed..df9254681 100644
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechoosersettings.c: Internal settings for the GtkFileChooser widget
  * Copyright (C) 2006, Novell, Inc.
  *
diff --git a/gtk/gtkfilechoosersettings.h b/gtk/gtkfilechoosersettings.h
index c7c4179d3..8eaffbfec 100644
--- a/gtk/gtkfilechoosersettings.h
+++ b/gtk/gtkfilechoosersettings.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechoosersettings.h: Internal settings for the GtkFileChooser widget
  * Copyright (C) 2006, Novell, Inc.
  *
diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index c7f34550c..7a14975e8 100644
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserutils.c: Private utility functions useful for
  *                        implementing a GtkFileChooser interface
  * Copyright (C) 2003, Red Hat, Inc.
diff --git a/gtk/gtkfilechooserutils.h b/gtk/gtkfilechooserutils.h
index c5c1aa75a..0470ce480 100644
--- a/gtk/gtkfilechooserutils.h
+++ b/gtk/gtkfilechooserutils.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserutils.h: Private utility functions useful for
  *                        implementing a GtkFileChooser interface
  * Copyright (C) 2003, Red Hat, Inc.
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index bb0792117..bdd2e30da 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserwidget.c: Embeddable file selector widget
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 1dedeb7a4..c491613d5 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilechooserwidget.h: Embeddable file selector widget
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 6738fc3fb..45ae48fc2 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilefilter.c: Filters for selecting a file subset
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index dde1fa931..295f411d3 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilefilter.h: Filters for selecting a file subset
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 6bad09c49..2744b0219 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index 882356687..7241c5133 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 83a8b2c7c..bd73b9e9b 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilesystem.c: Filesystem abstraction functions.
  * Copyright (C) 2003, Red Hat, Inc.
  * Copyright (C) 2007-2008 Carlos Garnacho
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index 87eaf5423..0b3dd9374 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilesystem.h: Filesystem abstraction functions.
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 7918f881f..281eb5394 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilesystemmodel.c: GtkTreeModel wrapping a GtkFileSystem
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
index 750fa3366..aa08fde47 100644
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkfilesystemmodel.h: GtkTreeModel wrapping a GtkFileSystem
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 96c4a8d9e..a6df36c3a 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 645a272e6..ae002e3f0 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index a4c6788cd..8e6de94ca 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1,5 +1,5 @@
 /* 
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es>
  * All rights reserved.
  *
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 134097096..0e6f2ba17 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es>
  * All rights reserved
  * Based on gnome-color-picker by Federico Mena <federico@nuclecu.unam.mx>
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 00520e70f..15d762fa6 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Massively updated for Pango by Owen Taylor, May 2000
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 125537b2f..e75475bd8 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkFontSelection widget for Gtk+, by Damon Chaplin, May 1998.
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 2c2dc2d56..ffb924d26 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index b9d3785ce..07ee31f22 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c
index fb733c852..717087265 100644
--- a/gtk/gtkgamma.c
+++ b/gtk/gtkgamma.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1997 David Mosberger
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h
index 207732843..a719d78f5 100644
--- a/gtk/gtkgamma.h
+++ b/gtk/gtkgamma.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1997 David Mosberger
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c
index 8e6bc9f8d..b090e30f2 100644
--- a/gtk/gtkgc.c
+++ b/gtk/gtkgc.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h
index 5fcb1a2cf..0d1040a57 100644
--- a/gtk/gtkgc.h
+++ b/gtk/gtkgc.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index d5188a433..e12ef6963 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 1998 Elliot Lee
  *
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 9ee0fccfd..2645b0878 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 1998 Elliot Lee
  *
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index d7835faaa..2175383e8 100644
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index 65d6df975..5f5546bfd 100644
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index 7f806b32f..da0560c0c 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index 4283999a0..4527f62c1 100644
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index 365a53f56..fc4bd5b6e 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h
index f2c8ad581..0a6aaa91f 100644
--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c
index caba1b3fb..d6e993939 100644
--- a/gtk/gtkhruler.c
+++ b/gtk/gtkhruler.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index 1e167e1c9..7acd00280 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 966d2085f..3f99e5a95 100644
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index e1818bdab..2da0141cd 100644
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 1ec5c651f..e67bdf795 100644
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2001 Red Hat, Inc.
  *
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index f170a10f6..23a88d95d 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index a660fad1f..10012052d 100644
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 7ea9a545d..b5e7a6c00 100644
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 6bcc09f9c..679236149 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *               2008 Johan Dahlin
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 574b101d0..91461457c 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 56e317114..f56816f29 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 42b0475a0..ce78cd7ad 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 369375a0a..1bedb505c 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 1b8990032..af18dbe11 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 10ba2a8b1..b6e4f9769 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index b1f3575ad..2864dcf32 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 1089e6dbc..32fd5e6af 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 2c44db25a..166e6dfc3 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index ddc0dfdb7..ab6ba9824 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Tool Kit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2007, 2008 GNOME Foundation
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index a8c9afb36..4790fe632 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h
index 794b36fcf..e1d7364b5 100644
--- a/gtk/gtkimmodule.h
+++ b/gtk/gtkimmodule.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index e6ec521c6..0aef5c3ca 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index f02bd30db..2a63c5ab6 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 01cc5a149..65ecbfd28 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index e9609d7d5..01ce634e5 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 463dd098d..5b1565a4a 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 5625f9945..5afa922e6 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index dde270169..2cb820a7e 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 9a6e407c9..23d3197ee 100644
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 15a4bd375..428784cdb 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkItemFactory: Flexible item factory with automatic rc handling
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index bd9332f52..c123d6a07 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkItemFactory: Flexible item factory with automatic rc handling
diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c
index 2cd108f0f..045bb57f5 100644
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -1,6 +1,6 @@
 /* gtkkeyhash.c: Keymap aware matching of key bindings
  *
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2002, Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkkeyhash.h b/gtk/gtkkeyhash.h
index cbc6679b1..5b75d63ff 100644
--- a/gtk/gtkkeyhash.h
+++ b/gtk/gtkkeyhash.h
@@ -1,6 +1,6 @@
 /* gtkkeyhash.h: Keymap aware matching of key bindings
  *
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2002, Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6d51ab1b5..08bf9a781 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 27e300dad..9e3a6a77f 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 426376c5b..b5f74522f 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index d9743c63e..dda7fbdb3 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 358600e51..cc2769e72 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtklinkbutton.c - an hyperlink-enabled button
  * 
  * Copyright (C) 2006 Emmanuele Bassi <ebassi@gmail.com>
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 8be025c97..fce92c44c 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtklinkbutton.h - an hyperlink-enabled button
  *
  * Copyright (C) 2005 Emmanuele Bassi <ebassi@gmail.com>
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 1d8a804bb..1d0ab9202 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklist.h b/gtk/gtklist.h
index 08154859b..461e8d22f 100644
--- a/gtk/gtklist.h
+++ b/gtk/gtklist.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 4dd304bd6..f3303bef9 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 545765d04..e1ebe4c5f 100644
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 47207d3a2..17bde9765 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 975057e86..01aa07b14 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9d96c75ba..d9abe030c 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 3521e5ded..d873a6a12 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 3b9677bb4..a0678aa78 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index bb32d1674..04ea6a3d6 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 340bed967..4e6f1ca6f 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 8bd3c7f9e..a53a69860 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 6eac58ab0..d4ff3df4e 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index b38051e47..705f0eab5 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index b3d7ab25e..10f2e6835 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  *
  * Copyright (C) 2003 Ricardo Fernandez Pascual
  * Copyright (C) 2004 Paolo Borelli
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index ec50e3401..a1a67d249 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  *
  * Copyright (C) 2003 Ricardo Fernandez Pascual
  * Copyright (C) 2004 Paolo Borelli
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index ba6526205..21db6c5d4 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 947773c76..6bf39e206 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index bd82805da..df13dfe15 100644
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 6e34f9ec3..ebab8d403 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index 51a951451..6258f8aed 100644
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -1,6 +1,6 @@
 /* gtkmnemonichash.c: Sets of mnemonics with cycling
  *
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2002, Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmnemonichash.h b/gtk/gtkmnemonichash.h
index 534137f07..b802d4a1c 100644
--- a/gtk/gtkmnemonichash.h
+++ b/gtk/gtkmnemonichash.h
@@ -1,6 +1,6 @@
 /* gtkmnemonichash.h: Sets of mnemonics with cycling
  *
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2002, Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 526a5b8c3..ed425b896 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright 1998-2002 Tim Janik, Red Hat, Inc., and others.
  * Copyright (C) 2003 Alex Graveley
  *
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index 84bc86ca6..26151b4c0 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright 1998-2002 Tim Janik, Red Hat, Inc., and others.
  * Copyright (C) 2003 Alex Graveley
  *
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 8d17ba884..400782be7 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) Christian Kellner <gicmo@gnome.org>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index b0a6b04f3..69c9bf151 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) Christian Kellner <gicmo@gnome.org>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index d0f034ceb..00dc13a50 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 3e4ea32cc..cb5b34193 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index a2dde92d8..0c51f5cc7 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 39e808c4a..e05af2252 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 5ccb9deb6..fc2a15231 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h
index 50fa9ea5c..3a1bea483 100644
--- a/gtk/gtkoldeditable.h
+++ b/gtk/gtkoldeditable.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 896d17ae7..3fc3634f0 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Jsh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
index 8521020ed..32d4a4024 100644
--- a/gtk/gtkoptionmenu.h
+++ b/gtk/gtkoptionmenu.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index ba98cffd6..64f3ed13a 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkpagesetup.c: Page Setup
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 635c7efb9..0759e35b0 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkpagesetup.h: Page Setup
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index bd48803f4..1d002d883 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index f81610598..bbcc58dc2 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 44de5c9ec..c5abd1404 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkpapersize.c: Paper Size
  * Copyright (C) 2006, Red Hat, Inc.
  * Copyright © 2006, 2007 Christian Persch
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index d7940e62d..90a49c682 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkpapersize.h: Paper Size
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index 2190f88ae..d22013498 100644
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Insensitive pixmap building code by Eckehard Berns from GNOME Stock
diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h
index 747a04d95..04e8869ea 100644
--- a/gtk/gtkpixmap.h
+++ b/gtk/gtkpixmap.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkplug-stub.c b/gtk/gtkplug-stub.c
index 92c5f1095..498b969f0 100644
--- a/gtk/gtkplug-stub.c
+++ b/gtk/gtkplug-stub.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkplug-win32.c b/gtk/gtkplug-win32.c
index 58f62c9ee..e16e90191 100644
--- a/gtk/gtkplug-win32.c
+++ b/gtk/gtkplug-win32.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2005 Novell, Inc.
  *
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index 028b2fe28..c837cf0bd 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 08182749e..4229b5ed2 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index cb9040aff..c45d40453 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkplugprivate.h b/gtk/gtkplugprivate.h
index 74f0374bc..e411c9d6a 100644
--- a/gtk/gtkplugprivate.h
+++ b/gtk/gtkplugprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index f0f38798e..a836d329e 100644
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index e4b211d71..449ed67ec 100644
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprint-win32.c b/gtk/gtkprint-win32.c
index 69b508a6e..ec034199b 100644
--- a/gtk/gtkprint-win32.c
+++ b/gtk/gtkprint-win32.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation.c: Print Operation
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprint-win32.h b/gtk/gtkprint-win32.h
index 643834937..c8f48774a 100644
--- a/gtk/gtkprint-win32.h
+++ b/gtk/gtkprint-win32.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprint-win32.h: Win32 Print utils
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index e9c00d8f2..31cf0c44c 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintbackend.h: Abstract printer backend interfaces
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index a33f6d80f..c13454ddc 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintbackend.h: Abstract printer backend interfaces
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c
index c280881f8..ec58a1d23 100644
--- a/gtk/gtkprintcontext.c
+++ b/gtk/gtkprintcontext.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintcontext.c: Print Context
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index debeed6ae..510794bfe 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintcontext.h: Print Context
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index 39165bd9b..0c57b9578 100644
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation.h: Print Operation
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c
index 983dc65d5..c898b5e9c 100644
--- a/gtk/gtkprinteroption.c
+++ b/gtk/gtkprinteroption.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprinteroption.c: Handling possible settings for a specific printer setting
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h
index cce698696..0b648979b 100644
--- a/gtk/gtkprinteroption.h
+++ b/gtk/gtkprinteroption.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprinteroption.h: printer option
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index eb84a3448..8d097fc29 100644
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintbackend.h: Abstract printer backend interfaces
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionset.h
index 1a2cfca8e..8ba5e2574 100644
--- a/gtk/gtkprinteroptionset.h
+++ b/gtk/gtkprinteroptionset.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprinteroptionset.h: printer option set
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperation-private.h b/gtk/gtkprintoperation-private.h
index 3595314b4..0c1ca0dd0 100644
--- a/gtk/gtkprintoperation-private.h
+++ b/gtk/gtkprintoperation-private.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation.h: Print Operation
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 16c7eb263..329361238 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation-unix.c: Print Operation Details for Unix 
  *                           and Unix-like platforms
  * Copyright (C) 2006, Red Hat, Inc.
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index f368e4283..7c65fbc07 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation-win32.c: Print Operation Details for Win32
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index ff0edff63..3a182c5fb 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation.c: Print Operation
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 6e6565fc0..3ff288e1c 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperation.h: Print Operation
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index 5363fcd65..391135a0c 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperationpreview.c: Abstract print preview interface
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index a36b4afb7..ea0b8ab22 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintoperationpreview.h: Abstract print preview interface
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 803163de8..2cd8fb737 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintsettings.c: Print Settings
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 169e22b28..ce293cfc8 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkprintsettings.h: Print Settings
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c
index 33896a55a..8234eeffc 100644
--- a/gtk/gtkprintutils.c
+++ b/gtk/gtkprintutils.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkpapersize.c: Paper Size
  * Copyright (C) 2006, Red Hat, Inc.
  *
diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutils.h
index 765d1eb57..911953a1e 100644
--- a/gtk/gtkprintutils.h
+++ b/gtk/gtkprintutils.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2006, Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index c423f7b1e..dae3824b5 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index 7e528adb9..a268ce862 100644
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h
index fbd86387f..1dccbfe37 100644
--- a/gtk/gtkprogress.h
+++ b/gtk/gtkprogress.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 8f5e1463f..8712959ac 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index a62b584ae..f11ef7186 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c
index 2b113e17c..0efe69a0c 100644
--- a/gtk/gtkradioaction.c
+++ b/gtk/gtkradioaction.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 2b7d72361..4e0be2485 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 6fd857dec..153c6043d 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 3e7abf81d..b1569d859 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 6e7579c9a..01b0be472 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index d7af6bbbf..10a6a9dfc 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 32023ebaf..3ade7d4a3 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2001 Red Hat, Inc.
  *
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 5efa7547a..7857b98be 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 89a6c4527..874b143a1 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 1ca2d3313..8f30c1feb 100644
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkrc.key.emacs b/gtk/gtkrc.key.emacs
index 199006fec..906419005 100644
--- a/gtk/gtkrc.key.emacs
+++ b/gtk/gtkrc.key.emacs
@@ -1,4 +1,4 @@
-# GTK - The GIMP Toolkit
+# GTK - The GTK+ Toolkit
 # Copyright (C) 2002 Owen Taylor
 #
 # This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkrecentaction.c b/gtk/gtkrecentaction.c
index 449eaad3c..8eab3425b 100644
--- a/gtk/gtkrecentaction.c
+++ b/gtk/gtkrecentaction.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Recent chooser action for GtkUIManager
  *
  * Copyright (C) 2007, Emmanuele Bassi
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index 96d5ca6a1..7df690063 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Recent chooser action for GtkUIManager
  *
  * Copyright (C) 2007, Emmanuele Bassi
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index 31157b98d..c4001f097 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooser.c - Abstract interface for recent file selectors GUIs
  *
  * Copyright (C) 2006, Emmanuele Bassi
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 2b5dd7e55..2919390a3 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooser.h - Abstract interface for recent file selectors GUIs
  *
  * Copyright (C) 2006, Emmanuele Bassi
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index cd777938e..08ddbb4e4 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserdefault.c
  * Copyright (C) 2005-2006, Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentchooserdefault.h b/gtk/gtkrecentchooserdefault.h
index 71dec2a45..37a226f1b 100644
--- a/gtk/gtkrecentchooserdefault.h
+++ b/gtk/gtkrecentchooserdefault.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserdefault.h
  * Copyright (C) 2006 Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 723be8f62..fab1a1765 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserdialog.c: Recent files selector dialog
  * Copyright (C) 2006 Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index d8c12214a..4b5623a88 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserdialog.h: Recent files selector dialog
  * Copyright (C) 2006 Emmanuele Bassi
  *
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 43a1b2cd3..664bf9fe0 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchoosermenu.c - Recently used items menu widget
  * Copyright (C) 2005, Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index 6b401d691..f444f7007 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchoosermenu.h - Recently used items menu widget
  * Copyright (C) 2006, Emmanuele Bassi
  *
diff --git a/gtk/gtkrecentchooserwidget.c b/gtk/gtkrecentchooserwidget.c
index 211d852a7..4f21a248a 100644
--- a/gtk/gtkrecentchooserwidget.c
+++ b/gtk/gtkrecentchooserwidget.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserwidget.c: embeddable recently used resources chooser widget
  * Copyright (C) 2006 Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index d5aa58f51..53efe4bd9 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentchooserwidget.h: embeddable recently used resources chooser widget
  * Copyright (C) 2006 Emmanuele Bassi
  *
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index 5de81cf20..eb12c6381 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentfilter.h - Filter object for recently used resources
  * Copyright (C) 2006, Emmanuele Bassi
  * 
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 3be8e5e97..6a28b1cb2 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentfilter.h - Filter object for recently used resources
  * Copyright (C) 2006, Emmanuele Bassi
  *
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index fea41ad65..2fc11b891 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentmanager.c: a manager for the recently used resources
  *
  * Copyright (C) 2006 Emmanuele Bassi
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 4127e67b2..e5a9e206a 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentmanager.h: a manager for the recently used resources
  *
  * Copyright (C) 2006 Emmanuele Bassi
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 49bf8e5ea..463f6ddc3 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index 2ef078490..0bb43e695 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 249d71a54..d9e6884d0 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2001 Red Hat, Inc.
  *
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 3addba6ea..d35ce544f 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 19093669b..8800cedf6 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2005 Ronald S. Bultje
  * Copyright (C) 2006, 2007 Christian Persch
  * Copyright (C) 2006 Jan Arne Petersen
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 7384db05c..0b4e2e545 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2005 Ronald S. Bultje
  * Copyright (C) 2006, 2007 Christian Persch
  * Copyright (C) 2006 Jan Arne Petersen
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 26dba3030..2cb73b23d 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2001 Red Hat, Inc.
  *
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 72d859500..0861ed908 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index dc279bfb9..090e233f0 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index b36071ca9..bad33a2b7 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 56c14473f..e06825adf 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index d685b3a7f..f8c3ed176 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 28808c15d..b2d584e94 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index b6400f9a4..13a0e2e0b 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index e59de238f..d0dbbfefa 100644
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index b8080ac5b..1630f8421 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8b63b69ee..fad288d8b 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 4be0772c6..5271e63f3 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index a9bcd0de6..53ce5aa97 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
  *
  * All rights reserved.
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index 111edd32c..2d4c1c5af 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
  *
  * All rights reserved.
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 2132088b8..227e304bc 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 7de9302bf..ac4eb5910 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index b110c38b9..7a8e9b95e 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtksizegroup.c: 
  * Copyright (C) 2001 Red Hat Software
  *
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index ecd2ceacf..9dc15fb52 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtksizegroup.h:
  * Copyright (C) 2000 Red Hat Software
  *
diff --git a/gtk/gtksocket-stub.c b/gtk/gtksocket-stub.c
index fbc8aedcf..65126d722 100644
--- a/gtk/gtksocket-stub.c
+++ b/gtk/gtksocket-stub.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksocket-win32.c b/gtk/gtksocket-win32.c
index 3bf1f47fc..e62152d24 100644
--- a/gtk/gtksocket-win32.c
+++ b/gtk/gtksocket-win32.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2005 Novell, Inc.
  *
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index b1faae7f8..cf20b9ff3 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 12ca8120c..0917d0acd 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index db347c06f..440cafd0d 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtksocketprivate.h b/gtk/gtksocketprivate.h
index 44a6c6b36..12fd96a1a 100644
--- a/gtk/gtksocketprivate.h
+++ b/gtk/gtksocketprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index a2f63e9ec..3962bc860 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkSpinButton widget for GTK+
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index b513f9ae7..29261050c 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkSpinButton widget for GTK+
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 4a630e4eb..2e7c73b2e 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson
  *
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 3ca102b6c..9f074f834 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson
  *
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index aa40c1298..ab8a9ca5d 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc. 
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index f259d89de..87ed44bc6 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index e22d9fe2a..3e6abbc4a 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 781f2d59b..f0267370d 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index cd1e05578..fc2e35d9e 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index 39fe9b996..44d9e6b2a 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index f6615206e..0ba944e6e 100644
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index 2a5b7fed1..882e7c52a 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 8d34911f2..091f756a0 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktext.h b/gtk/gtktext.h
index a2be7faf5..abd41b09b 100644
--- a/gtk/gtktext.h
+++ b/gtk/gtktext.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index 627b2fc68..146be781a 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextbtree.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index a15ea87df..feca45834 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextbuffer.c Copyright (C) 2000 Red Hat, Inc.
  *                 Copyright (C) 2004 Nokia Corporation
  *
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index fd1131410..d49f9db97 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextbuffer.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 20cee010b..e5b0c599b 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextchild.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 37d4c2d4d..75e838798 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextiter.c Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 44ba8721e..9d1a7420d 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextiter.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h
index ff1893dfb..560869816 100644
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextiterprivate.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 044d54714..3f4bd6469 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextlayout.c - calculate the layout of the text
  *
  * Copyright (c) 1992-1994 The Regents of the University of California.
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index a2e8aa3a5..a039b771c 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextlayout.h
  *
  * Copyright (c) 1992-1994 The Regents of the University of California.
diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h
index d2ff38137..3bb9ffc39 100644
--- a/gtk/gtktextmarkprivate.h
+++ b/gtk/gtktextmarkprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
index 394703b9d..9eb45bcd1 100644
--- a/gtk/gtktextsegment.h
+++ b/gtk/gtktextsegment.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextsegment.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h
index b3363d925..39605c015 100644
--- a/gtk/gtktexttagprivate.h
+++ b/gtk/gtktexttagprivate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktexttagprivate.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index 660a5cd5a..4be29e5ab 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index ecc172d1c..3c6b64c67 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c
index 3e72302b6..ed047292c 100644
--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktexttypes.c Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index c624aeaf3..c66c62709 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktexttypes.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index dc05880d4..700900f66 100644
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextutil.h b/gtk/gtktextutil.h
index 8b346520b..abe95abde 100644
--- a/gtk/gtktextutil.h
+++ b/gtk/gtktextutil.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 75b73bdf9..c6089fa09 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextview.c Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 2dfe23ff4..5abee5021 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtktextview.h Copyright (C) 2000 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 919562a56..06c006794 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Themes added by The Rasterman <raster@redhat.com>
diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index 0991f7d07..93a4045ca 100644
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Themes added by The Rasterman <raster@redhat.com>
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 71d3c2ef4..b8c98db5c 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkQueryTips: Query onscreen widgets for their tooltips
diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h
index 4973a986e..3623e4a5b 100644
--- a/gtk/gtktipsquery.h
+++ b/gtk/gtktipsquery.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GtkQueryTips: Query onscreen widgets for their tooltips
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 9e911d8e1..a1966c7e6 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 5f7254632..e42f0b7ac 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtktoggleactionprivate.h b/gtk/gtktoggleactionprivate.h
index 9e1841ad8..29887d87e 100644
--- a/gtk/gtktoggleactionprivate.h
+++ b/gtk/gtktoggleactionprivate.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 33505a925..18adcfb42 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 009688a7b..fde888f22 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 8d126482a..c4a794327 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * GtkToolbar copyright (C) Federico Mena
  *
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 818969756..486d9d5ff 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * GtkToolbar copyright (C) Federico Mena
  *
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index fcd07aa5f..5c610559a 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2007  Openismus GmbH
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index a414346b9..5767f4f86 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h
index a86085652..0c043e69b 100644
--- a/gtk/gtktooltips.h
+++ b/gtk/gtktooltips.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 56c63216a..96adf1144 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktree.h b/gtk/gtktree.h
index 7e9da0eb5..f8013dc68 100644
--- a/gtk/gtktree.h
+++ b/gtk/gtktree.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index c137e3482..3508516a7 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h
index 0fef9e21e..3a0f5e4b5 100644
--- a/gtk/gtktreeitem.h
+++ b/gtk/gtktreeitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index 986f9ff18..187de8ce7 100644
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 48b664c2a..a71c7e293 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 256e416e1..dd0874efd 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 240c7d30b..2e8b14495 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -1,5 +1,5 @@
 /*
- * GTK - The GIMP Toolkit
+ * GTK - The GTK+ Toolkit
  * Copyright (C) 1998, 1999 Red Hat, Inc.
  * All rights reserved.
  *
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index e42db03b3..c5e95f76a 100644
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 901bc709a..0997dcc36 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index 57edf83fa..f13e5c46e 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index 68286559d..4baa2947d 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in
index 9db626884..ac9c0783b 100644
--- a/gtk/gtkversion.h.in
+++ b/gtk/gtkversion.h.in
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 17605cc34..b6221fb20 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index cc496f4be..4ae799ccb 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index d17585139..a2e99cd13 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2007 Red Hat, Inc.
  *
  * Authors:
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index c69724fe1..977525917 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2007 Red Hat, Inc.
  *
  * Authors:
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index 335d4352d..bc83abec8 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index 37bc52a08..1f464cbe1 100644
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c
index 612307a8a..3cfe468ad 100644
--- a/gtk/gtkvruler.c
+++ b/gtk/gtkvruler.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 8126c3232..64777e329 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 3961ee074..c7e032e06 100644
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index ac9bf5f44..49805e735 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index fb6903858..aa9965d34 100644
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 2001 Red Hat, Inc.
  *
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index 184be409b..d084ec7f1 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index c199b29a9..90c82708d 100644
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index 8d57eef39..8168bea26 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5c5a2f606..765d77a04 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index dfc423e90..47231a1f7 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwin32embed.c b/gtk/gtkwin32embed.c
index b386f93f9..35853f8ee 100644
--- a/gtk/gtkwin32embed.c
+++ b/gtk/gtkwin32embed.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkwin32embed.c: Utilities for Win32 embedding
  * Copyright (C) 2005, Novell, Inc.
  *
diff --git a/gtk/gtkwin32embed.h b/gtk/gtkwin32embed.h
index 4e2223ef3..5c0cd639e 100644
--- a/gtk/gtkwin32embed.h
+++ b/gtk/gtkwin32embed.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkwin32embed.h: Utilities for Win32 embedding
  * Copyright (C) 2005, Novell, Inc.
  *
diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 4d4831189..0d9fa5d0b 100644
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwin32embedwidget.h b/gtk/gtkwin32embedwidget.h
index 87d6d233e..fa74512b8 100644
--- a/gtk/gtkwin32embedwidget.h
+++ b/gtk/gtkwin32embedwidget.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c
index 9e2bc1815..0097ba18a 100644
--- a/gtk/gtkwindow-decorate.c
+++ b/gtk/gtkwindow-decorate.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwindow-decorate.h b/gtk/gtkwindow-decorate.h
index 9f182f457..37d179bf3 100644
--- a/gtk/gtkwindow-decorate.h
+++ b/gtk/gtkwindow-decorate.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a565cf165..29e966cad 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index bd8545e3d..531d3f074 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index 37462f91c..f83b343d6 100644
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkxembed.c: Utilities for the XEMBED protocol
  * Copyright (C) 2001, 2003, Red Hat, Inc.
  *
diff --git a/gtk/gtkxembed.h b/gtk/gtkxembed.h
index 5de99e9a9..673afabb8 100644
--- a/gtk/gtkxembed.h
+++ b/gtk/gtkxembed.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkxembed.c: Utilities for the XEMBED protocol
  * Copyright (C) 2003, Red Hat, Inc.
  *
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 300e15afd..aac76e648 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * autotestfilechooser.c: Automated unit tests for the GtkFileChooser widget
  * Copyright (C) 2005, Novell, Inc.
  *
diff --git a/gtk/tests/recentmanager.c b/gtk/tests/recentmanager.c
index 6f0fa5839..75cab8f77 100644
--- a/gtk/tests/recentmanager.c
+++ b/gtk/tests/recentmanager.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * gtkrecentmanager.c: a manager for the recently used resources
  *
  * Copyright (C) 2006 Emmanuele Bassi
diff --git a/gtk/theme-bits/decompose-bits.c b/gtk/theme-bits/decompose-bits.c
index 99d84a40f..6adf7a92b 100644
--- a/gtk/theme-bits/decompose-bits.c
+++ b/gtk/theme-bits/decompose-bits.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2002, Owen Taylor
  *
  * This library is free software; you can redistribute it and/or
author	Cody Russell <bratsche@gnome.org>	2008-06-30 23:01:56 +0000
committer	Cody Russell <bratsche@src.gnome.org>	2008-06-30 23:01:56 +0000
commit	fce9c8b7d45145c4556650843218e0b76c065c18 (patch)
tree	b333f179ae474f6446ccb7a1c3525c968718b8a2 /gtk
parent	971023d9221084d8d40e690fa8e44a4296f2cff1 (diff)
download	gdk-pixbuf-fce9c8b7d45145c4556650843218e0b76c065c18.tar.gz