[gnome-initial-setup] Move includes back into private page files

[Jasper St. Pierre <jstpierre src gnome org>]

commit d131b7835e8f0de13649c0596333dc8db6098b54
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jun 22 15:17:18 2012 -0400

    Move includes back into private page files

 gnome-initial-setup/gis-goa-page.c      |    6 ++++++
 gnome-initial-setup/gis-goa-page.h      |    5 -----
 gnome-initial-setup/gis-location-page.c |    6 ++++++
 gnome-initial-setup/gis-location-page.h |    6 ------
 gnome-initial-setup/gis-network-page.c  |    6 ++++++
 gnome-initial-setup/gis-network-page.h  |    6 ------
 6 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/gnome-initial-setup/gis-goa-page.c b/gnome-initial-setup/gis-goa-page.c
index 32321f6..14ae83e 100644
--- a/gnome-initial-setup/gis-goa-page.c
+++ b/gnome-initial-setup/gis-goa-page.c
@@ -4,6 +4,12 @@
 
 #include "config.h"
 #include "gis-goa-page.h"
+
+#define GOA_API_IS_SUBJECT_TO_CHANGE
+#include <goa/goa.h>
+#define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE
+#include <goabackend/goabackend.h>
+
 #include "cc-online-accounts-add-account-dialog.h"
 
 #include <glib/gi18n.h>
diff --git a/gnome-initial-setup/gis-goa-page.h b/gnome-initial-setup/gis-goa-page.h
index dee5737..bb38692 100644
--- a/gnome-initial-setup/gis-goa-page.h
+++ b/gnome-initial-setup/gis-goa-page.h
@@ -5,11 +5,6 @@
 
 #include "gnome-initial-setup.h"
 
-#define GOA_API_IS_SUBJECT_TO_CHANGE
-#include <goa/goa.h>
-#define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE
-#include <goabackend/goabackend.h>
-
 G_BEGIN_DECLS
 
 void gis_prepare_online_page (SetupData *setup);
diff --git a/gnome-initial-setup/gis-location-page.c b/gnome-initial-setup/gis-location-page.c
index f15b98b..57b9b59 100644
--- a/gnome-initial-setup/gis-location-page.c
+++ b/gnome-initial-setup/gis-location-page.c
@@ -14,6 +14,12 @@
 #include <geoclue/geoclue-master.h>
 #include <geoclue/geoclue-position.h>
 
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+#include <libgweather/location-entry.h>
+
+#include "cc-timezone-map.h"
+#include "timedated.h"
+
 #define DEFAULT_TZ "Europe/London"
 
 typedef struct _LocationData LocationData;
diff --git a/gnome-initial-setup/gis-location-page.h b/gnome-initial-setup/gis-location-page.h
index 1bdd338..9d5fc83 100644
--- a/gnome-initial-setup/gis-location-page.h
+++ b/gnome-initial-setup/gis-location-page.h
@@ -5,12 +5,6 @@
 
 #include "gnome-initial-setup.h"
 
-#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-#include <libgweather/location-entry.h>
-
-#include "cc-timezone-map.h"
-#include "timedated.h"
-
 G_BEGIN_DECLS
 
 void gis_prepare_location_page (SetupData *setup);
diff --git a/gnome-initial-setup/gis-network-page.c b/gnome-initial-setup/gis-network-page.c
index f1fd898..c42a5fb 100644
--- a/gnome-initial-setup/gis-network-page.c
+++ b/gnome-initial-setup/gis-network-page.c
@@ -10,6 +10,12 @@
 
 #include <gtk/gtk.h>
 
+#include <nm-client.h>
+#include <nm-device-wifi.h>
+#include <nm-access-point.h>
+#include <nm-utils.h>
+#include <nm-remote-settings.h>
+
 #include "panel-cell-renderer-signal.h"
 #include "panel-cell-renderer-mode.h"
 #include "panel-cell-renderer-security.h"
diff --git a/gnome-initial-setup/gis-network-page.h b/gnome-initial-setup/gis-network-page.h
index cd18fb3..0687683 100644
--- a/gnome-initial-setup/gis-network-page.h
+++ b/gnome-initial-setup/gis-network-page.h
@@ -5,12 +5,6 @@
 
 #include "gnome-initial-setup.h"
 
-#include <nm-client.h>
-#include <nm-device-wifi.h>
-#include <nm-access-point.h>
-#include <nm-utils.h>
-#include <nm-remote-settings.h>
-
 G_BEGIN_DECLS
 
 void gis_prepare_network_page (SetupData *setup);