diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 004a3e8..c210540 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ACCOUNT_CHOOSER_H__
 #define __EMPATHY_ACCOUNT_CHOOSER_H__
 
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 6ead048..a89081f 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 7e8e5a2..9187c1e 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index f4e40a8..1a50230 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_AVATAR_CHOOSER_H__
 #define __EMPATHY_AVATAR_CHOOSER_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index ddb446a..2271ecc 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_AVATAR_IMAGE_H__
 #define __EMPATHY_AVATAR_IMAGE_H__
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 2883c4d..6c79826 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -20,7 +20,7 @@
  * Authors: Raphael Slinckx <raphael@slinckx.net>
  */
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "empathy-cell-renderer-activatable.h"
 
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.h b/libempathy-gtk/empathy-cell-renderer-activatable.h
index 5962c20..d58a082 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.h
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
 #define __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
 
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 09fe8bd..6fb7cfd 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -29,7 +29,7 @@
  *     start the new one).
  */
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-expander.h"
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.h b/libempathy-gtk/empathy-cell-renderer-expander.h
index fc569de..00e36f5 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.h
+++ b/libempathy-gtk/empathy-cell-renderer-expander.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_EXPANDER_H__
 #define __EMPATHY_CELL_RENDERER_EXPANDER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-cell-renderer-text.h b/libempathy-gtk/empathy-cell-renderer-text.h
index 540c2eb..48ded96 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.h
+++ b/libempathy-gtk/empathy-cell-renderer-text.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CELL_RENDERER_TEXT_H__
 #define __EMPATHY_CELL_RENDERER_TEXT_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-chat-text-view.h b/libempathy-gtk/empathy-chat-text-view.h
index 7c4ff34..0180f21 100644
--- a/libempathy-gtk/empathy-chat-text-view.h
+++ b/libempathy-gtk/empathy-chat-text-view.h
@@ -27,7 +27,7 @@
 #ifndef __EMPATHY_CHAT_TEXT_VIEW_H__
 #define __EMPATHY_CHAT_TEXT_VIEW_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 893cf83..f3478be 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_CHAT_VIEW_H__
 #define __EMPATHY_CHAT_VIEW_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 74d7e06..12fac96 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -28,7 +28,7 @@
 #ifndef __EMPATHY_CHAT_H__
 #define __EMPATHY_CHAT_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index 13ea099..007a6b0 100644
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_CONTACT_LIST_STORE_H__
 #define __EMPATHY_CONTACT_LIST_STORE_H__
 
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 0c48764..e9c3457 100644
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_CONTACT_LIST_VIEW_H__
 #define __EMPATHY_CONTACT_LIST_VIEW_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 
diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 8126a8e..262ec96 100644
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_CONTACT_MENU_H__
 #define __EMPATHY_CONTACT_MENU_H__
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
 
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index 9858496..df4a8b1 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_IRC_NETWORK_DIALOG_H__
 #define __EMPATHY_IRC_NETWORK_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libempathy/empathy-irc-network.h>
 
diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index c1781d0..08887c5 100644
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 62c5458..dd30e3a 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -25,8 +25,7 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
diff --git a/src/empathy-about-dialog.h b/src/empathy-about-dialog.h
index 3e8f405..a290b32 100644
--- a/src/empathy-about-dialog.h
+++ b/src/empathy-about-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ABOUT_DIALOG_H__
 #define __EMPATHY_ABOUT_DIALOG_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 40ea24f..b8c3d36 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_ACCOUNTS_DIALOG_H__
 #define __EMPATHY_ACCOUNTS_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 835d672..c46ef8f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -29,7 +29,7 @@
 #define __EMPATHY_CHAT_WINDOW_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libempathy-gtk/empathy-chat.h>
diff --git a/src/empathy-main-window.h b/src/empathy-main-window.h
index 562fa12..3d34e6c 100644
--- a/src/empathy-main-window.h
+++ b/src/empathy-main-window.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_MAIN_WINDOW_H__
 #define __EMPATHY_MAIN_WINDOW_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-map-view.h b/src/empathy-map-view.h
index 80a05a1..6628f1e 100644
--- a/src/empathy-map-view.h
+++ b/src/empathy-map-view.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_MAP_VIEW_H__
 #define __EMPATHY_MAP_VIEW_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-preferences.h b/src/empathy-preferences.h
index 6cc86d1..aba5882 100644
--- a/src/empathy-preferences.h
+++ b/src/empathy-preferences.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_PREFERENCES_H__
 #define __EMPATHY_PREFERENCES_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index be82ca7..30ffa57 100644
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -34,9 +34,7 @@
 #define STOP_PROFILER(name)
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 /* Spinner cache implementation */
 
diff --git a/src/ephy-spinner.h b/src/ephy-spinner.h
index 4435fe3..769d54a 100644
--- a/src/ephy-spinner.h
+++ b/src/ephy-spinner.h
@@ -25,8 +25,7 @@
 #ifndef EPHY_SPINNER_H
 #define EPHY_SPINNER_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
