[gtkglext] [GB#603829] Use single GTK+ includes (Second patch)

[Mukund Sivaraman <muks src gnome org>]

commit 10e05cd56615ab5296cf44bc6e4bfb677b7ac93d
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Dec 6 13:21:36 2009 +0530

    [GB#603829] Use single GTK+ includes (Second patch)

 gdk/gdkglconfig.c          |    2 +-
 gdk/gdkglconfig.h          |    2 +-
 gdk/gdkgldrawable.c        |    2 +-
 gdk/gdkglpixmap.c          |    2 +-
 gdk/gdkglpixmap.h          |    2 +-
 gdk/gdkgltypes.h           |    2 +-
 gdk/gdkglwindow.h          |    2 +-
 gdk/x11/gdkglconfig-x11.c  |    2 +-
 gdk/x11/gdkglfont-x11.c    |    2 +-
 gdk/x11/gdkgloverlay-x11.c |    2 +-
 gdk/x11/gdkglquery-x11.c   |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gdk/gdkglconfig.c b/gdk/gdkglconfig.c
index 7743d05..3780092 100644
--- a/gdk/gdkglconfig.c
+++ b/gdk/gdkglconfig.c
@@ -20,7 +20,7 @@
 #include "gdkglconfig.h"
 
 #ifdef GDKGLEXT_MULTIHEAD_SUPPORT
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
 
 gboolean _gdk_gl_config_no_standard_colormap = FALSE;
diff --git a/gdk/gdkglconfig.h b/gdk/gdkglconfig.h
index 0698abc..58dbafe 100644
--- a/gdk/gdkglconfig.h
+++ b/gdk/gdkglconfig.h
@@ -22,7 +22,7 @@
 #include <gdk/gdkgldefs.h>
 #include <gdk/gdkgltypes.h>
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkgldrawable.c b/gdk/gdkgldrawable.c
index 8518336..64e3e1e 100644
--- a/gdk/gdkgldrawable.c
+++ b/gdk/gdkgldrawable.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  */
 
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 
 #include "gdkglprivate.h"
 #include "gdkglcontext.h"
diff --git a/gdk/gdkglpixmap.c b/gdk/gdkglpixmap.c
index b2971fe..1445256 100644
--- a/gdk/gdkglpixmap.c
+++ b/gdk/gdkglpixmap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  */
 
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 
 #include "gdkglprivate.h"
 #include "gdkglconfig.h"
diff --git a/gdk/gdkglpixmap.h b/gdk/gdkglpixmap.h
index 38593a1..4f14d0c 100644
--- a/gdk/gdkglpixmap.h
+++ b/gdk/gdkglpixmap.h
@@ -22,7 +22,7 @@
 #include <gdk/gdkgldefs.h>
 #include <gdk/gdkgltypes.h>
 
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/gdkgltypes.h b/gdk/gdkgltypes.h
index 2bdb1c5..28f6310 100644
--- a/gdk/gdkgltypes.h
+++ b/gdk/gdkgltypes.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_GL_TYPES_H__
 #define __GDK_GL_TYPES_H__
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
  
diff --git a/gdk/gdkglwindow.h b/gdk/gdkglwindow.h
index 9e68659..aeda2bc 100644
--- a/gdk/gdkglwindow.h
+++ b/gdk/gdkglwindow.h
@@ -22,7 +22,7 @@
 #include <gdk/gdkgldefs.h>
 #include <gdk/gdkgltypes.h>
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/x11/gdkglconfig-x11.c b/gdk/x11/gdkglconfig-x11.c
index 9be25b2..b7a71eb 100644
--- a/gdk/x11/gdkglconfig-x11.c
+++ b/gdk/x11/gdkglconfig-x11.c
@@ -28,7 +28,7 @@
 #include "gdkglconfig-x11.h"
 
 #ifdef GDKGLEXT_MULTIHEAD_SUPPORT
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
 
 #ifdef HAVE_LIBXMU
diff --git a/gdk/x11/gdkglfont-x11.c b/gdk/x11/gdkglfont-x11.c
index 7221eb9..961c567 100644
--- a/gdk/x11/gdkglfont-x11.c
+++ b/gdk/x11/gdkglfont-x11.c
@@ -25,7 +25,7 @@
 #include "gdkglfont.h"
 
 #ifdef GDKGLEXT_MULTIHEAD_SUPPORT
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 #endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
 
 /*
diff --git a/gdk/x11/gdkgloverlay-x11.c b/gdk/x11/gdkgloverlay-x11.c
index b18ab38..78bbf0d 100644
--- a/gdk/x11/gdkgloverlay-x11.c
+++ b/gdk/x11/gdkgloverlay-x11.c
@@ -21,7 +21,7 @@
 #include "gdkgloverlay-x11.h"
 
 #ifdef GDKGLEXT_MULTIHEAD_SUPPORT
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
 
 #include <X11/Xmd.h>
diff --git a/gdk/x11/gdkglquery-x11.c b/gdk/x11/gdkglquery-x11.c
index 9f2e46c..cd7250b 100644
--- a/gdk/x11/gdkglquery-x11.c
+++ b/gdk/x11/gdkglquery-x11.c
@@ -30,7 +30,7 @@
 #include "gdkglquery.h"
 
 #ifdef GDKGLEXT_MULTIHEAD_SUPPORT
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 #endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
 
 /**