From 4603a4a27f5861599dd793a71403c3caf21616b3 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Tue, 12 Oct 2010 07:39:53 +0000
Subject: Don't include individual gdk or gtk headers directly

---
diff --git a/src/sugar/eggaccelerators.h b/src/sugar/eggaccelerators.h
index 96d5390..423b274 100644
--- a/src/sugar/eggaccelerators.h
+++ b/src/sugar/eggaccelerators.h
@@ -21,7 +21,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
diff --git a/src/sugar/eggdesktopfile.c b/src/sugar/eggdesktopfile.c
index d095a2f..ea8549e 100644
--- a/src/sugar/eggdesktopfile.c
+++ b/src/sugar/eggdesktopfile.c
@@ -32,7 +32,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 struct EggDesktopFile {
diff --git a/src/sugar/sugar-address-entry.c b/src/sugar/sugar-address-entry.c
index 0309880..0fb9756 100644
--- a/src/sugar/sugar-address-entry.c
+++ b/src/sugar/sugar-address-entry.c
@@ -18,7 +18,7 @@
  */
 
 #include <math.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 #include "sugar-address-entry.h"
 
diff --git a/src/sugar/sugar-address-entry.h b/src/sugar/sugar-address-entry.h
index 60c56ab..43e1d0e 100644
--- a/src/sugar/sugar-address-entry.h
+++ b/src/sugar/sugar-address-entry.h
@@ -20,7 +20,7 @@
 #ifndef __SUGAR_ADDRESS_ENTRY_H__
 #define __SUGAR_ADDRESS_ENTRY_H__
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/sugar/sugar-key-grabber.h b/src/sugar/sugar-key-grabber.h
index ab02870..9abc887 100644
--- a/src/sugar/sugar-key-grabber.h
+++ b/src/sugar/sugar-key-grabber.h
@@ -21,7 +21,7 @@
 #define __SUGAR_KEY_GRABBER_H__
 
 #include <glib-object.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/sugar/sugar-menu.c b/src/sugar/sugar-menu.c
index f19dc4b..74580fa 100644
--- a/src/sugar/sugar-menu.c
+++ b/src/sugar/sugar-menu.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "sugar-menu.h"
 
diff --git a/src/sugar/sugar-menu.h b/src/sugar/sugar-menu.h
index 74ce891..c3bb3d0 100644
--- a/src/sugar/sugar-menu.h
+++ b/src/sugar/sugar-menu.h
@@ -20,7 +20,7 @@
 #ifndef __SUGAR_MENU_H__
 #define __SUGAR_MENU_H__
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
--
cgit v0.9.1