5 files changed, 6 insertions, 7 deletions
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index f11012ec40..010589da1e 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -22,8 +22,8 @@
  * modification, are permitted only as authorized by the OpenLDAP
  * Public License.
  *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
+ * A copy of this license is available in file COPYING.OPENLDAP in
+ * the top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
 
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 7a7e644238..61c6de7174 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 89107dafbf..696d42dcd9 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -24,7 +24,7 @@
 
 #include "e-minicard-label.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 2d43aca39e..0f9ae7c143 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <misc/e-canvas-background.h>
 #include <misc/e-canvas.h>
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 8853e7f748..f0faf7899c 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -50,8 +50,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-init.h>
 #include <misc/e-canvas.h>