From 20008c33cb9c82571aa8f6ffdf0fd86b4cb3bc5f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 2 Nov 2011 08:28:34 -0400
Subject: [PATCH] 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 insertion(+), 3 deletions(-)

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 8ccfbda43c..7c44bdc404 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 a8d6ebcdf4..2415b142d9 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