From 4f9fc252dafd014bb87ee4251fc0f4e009bbda4f Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 5 Oct 2011 18:48:29 -0700
Subject: [PATCH] box: Fix includes so hbox/vbox compile warning-free

And make sure most of the code is included before undeffing deprecated
code.
---
 gtk/gtkboxprivate.h | 2 ++
 gtk/gtkhbox.c       | 4 ++--
 gtk/gtkvbox.c       | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkboxprivate.h b/gtk/gtkboxprivate.h
index 9a4d463a4c..9628d3c306 100644
--- a/gtk/gtkboxprivate.h
+++ b/gtk/gtkboxprivate.h
@@ -19,6 +19,8 @@
 #ifndef __GTK_BOX_PRIVATE_H__
 #define __GTK_BOX_PRIVATE_H__
 
+#include "gtkbox.h"
+
 G_BEGIN_DECLS
 
 
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index 021fb22d68..cdfada50b4 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
+#include "gtkboxprivate.h"
+#include "gtkorientable.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkhbox.h"
-#include "gtkorientable.h"
-#include "gtkboxprivate.h"
 
 
 /**
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index 9251291f11..e3515eb643 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include "gtkboxprivate.h"
 #include "gtkorientable.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkvbox.h"