From bd97127e6c1a17835d9d02c252522c0218467528 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 8 Nov 2011 14:37:35 +0100
Subject: [PATCH] immodule: Fix includes

Make includes not rely on gtkimmodule.h including gtk.h. This will be
important once we remove gtkimmodule from the include files.

That way, we can achieve not pulling deprecated headers automatically.
---
 gtk/gtkimmodule.c       | 2 ++
 gtk/gtkimmulticontext.c | 2 ++
 gtk/queryimmodules.c    | 1 +
 3 files changed, 5 insertions(+)

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 093a557d9b..de03fda507 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -38,6 +38,8 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
+#include "deprecated/gtkrc.h"
+
 #define SIMPLE_ID "gtk-im-context-simple"
 
 /**
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 5d21643245..dee54ec174 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -24,8 +24,10 @@
 
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
+#include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkradiomenuitem.h"
+#include "gtkseparatormenuitem.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 3e01bf0632..2c7aa772c6 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -39,6 +39,7 @@
 
 #include "gtk/gtkimmodule.h"
 #include "gtk/gtkversion.h"
+#include "gtk/deprecated/gtkrc.h"
 
 static void
 escape_string (GString *contents, const char *str)