diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c
index 34af8c7a6..ebe31d05b 100644
--- a/src/tray/na-tray-manager.c
+++ b/src/tray/na-tray-manager.c
@@ -34,9 +34,7 @@
 #elif defined (GDK_WINDOWING_WIN32)
 #include <gdk/gdkwin32.h>
 #endif
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "na-marshal.h"
 
diff --git a/src/tray/na-tray-manager.h b/src/tray/na-tray-manager.h
index 53914031c..f325453b1 100644
--- a/src/tray/na-tray-manager.h
+++ b/src/tray/na-tray-manager.h
@@ -24,10 +24,10 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtkwidget.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
 
 #include "na-tray-child.h"