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

@@ -19,6 +19,8 @@
 #ifndef __GTK_BOX_PRIVATE_H__
 #define __GTK_BOX_PRIVATE_H__
 
+#include "gtkbox.h"
+
 G_BEGIN_DECLS
 
 

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"
 
 
 /**

gtk/gtkvbox.c

@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include "gtkboxprivate.h"
 #include "gtkorientable.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkvbox.h"