[gtk+] Revert a change to the plug/socket headers

[Matthias Clasen <matthiasc src gnome org>]

commit 20008c33cb9c82571aa8f6ffdf0fd86b4cb3bc5f
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 2 08:28:34 2011 -0400

    Revert a change to the plug/socket headers
    
    I was trying to avoid including gtk.h here, but this breaks
    some of our tests, and there's a good chance that 3rd party
    code also relies on this include.

 gtk/gtkplug.h   |    1 -
 gtk/gtksocket.h |    3 +--
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 8ccfbda..7c44bdc 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -37,7 +37,6 @@
 #include <gdk/gdkx.h>
 
 #include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
 
 
 G_BEGIN_DECLS
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index a8d6ebc..2415b14 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -30,8 +30,7 @@
 #ifndef __GTK_SOCKET_H__
 #define __GTK_SOCKET_H__
 
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11