From d3247dd10a7ab82f18c1dc69de780552552adedb Mon Sep 17 00:00:00 2001
From: Cedric Bail <cedric.bail@samsung.com>
Date: Mon, 22 Jul 2013 20:25:10 +0900
Subject: [PATCH] elementary: fix header inclusion order.

---
 legacy/elementary/src/bin/config.c                           | 2 +-
 legacy/elementary/src/bin/elementary_codegen.c               | 4 ++--
 legacy/elementary/src/bin/quicklaunch.c                      | 3 ++-
 legacy/elementary/src/bin/test_main_menu.c                   | 2 +-
 legacy/elementary/src/edje_externals/elm.c                   | 4 ++++
 legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c | 4 ++++
 legacy/elementary/src/modules/access_output/mod.c            | 3 ++-
 .../datetime_input_ctxpopup/datetime_input_ctxpopup.c        | 5 +++--
 legacy/elementary/src/modules/prefs/prefs_iface.c            | 4 ++++
 legacy/elementary/src/modules/test_entry/mod.c               | 3 ++-
 legacy/elementary/src/modules/test_map/mod.c                 | 5 +++--
 11 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c
index 60ae145a91..b9c81006e0 100644
--- a/legacy/elementary/src/bin/config.c
+++ b/legacy/elementary/src/bin/config.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 typedef struct _Theme               Theme;
diff --git a/legacy/elementary/src/bin/elementary_codegen.c b/legacy/elementary/src/bin/elementary_codegen.c
index b12c79eb34..4f270581f8 100644
--- a/legacy/elementary/src/bin/elementary_codegen.c
+++ b/legacy/elementary/src/bin/elementary_codegen.c
@@ -1,5 +1,3 @@
-#include <Elementary.h>
-
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
@@ -12,6 +10,8 @@
 #include <Edje_Edit.h>
 #include <Eina.h>
 
+#include <Elementary.h>
+
 #include <ctype.h>
 #include <fcntl.h>
 #include <locale.h>
diff --git a/legacy/elementary/src/bin/quicklaunch.c b/legacy/elementary/src/bin/quicklaunch.c
index 3913a745e1..4caad3be03 100644
--- a/legacy/elementary/src/bin/quicklaunch.c
+++ b/legacy/elementary/src/bin/quicklaunch.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
@@ -18,6 +17,8 @@
 #include <signal.h>
 #include <sys/wait.h>
 
+#include <Elementary.h>
+
 #ifdef HAVE_ENVIRON
 extern char **environ;
 #endif
diff --git a/legacy/elementary/src/bin/test_main_menu.c b/legacy/elementary/src/bin/test_main_menu.c
index f031fd73de..e7a527df2d 100644
--- a/legacy/elementary/src/bin/test_main_menu.c
+++ b/legacy/elementary/src/bin/test_main_menu.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static void
diff --git a/legacy/elementary/src/edje_externals/elm.c b/legacy/elementary/src/edje_externals/elm.c
index 4233228106..9a316fbbb7 100644
--- a/legacy/elementary/src/edje_externals/elm.c
+++ b/legacy/elementary/src/edje_externals/elm.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
 #include "Elementary.h"
 #include "private.h"
 
diff --git a/legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c b/legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c
index 97468a3076..fec7f8f3c8 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
 #include <Eina.h>
 #include <Elementary.h>
 
diff --git a/legacy/elementary/src/modules/access_output/mod.c b/legacy/elementary/src/modules/access_output/mod.c
index 91e5bb2d28..4a9816e222 100644
--- a/legacy/elementary/src/modules/access_output/mod.c
+++ b/legacy/elementary/src/modules/access_output/mod.c
@@ -1,8 +1,9 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
 
+#include <Elementary.h>
+
 /* to enable this module
 export ELM_MODULES="access_output>access/api"
 export ELM_ACCESS_MODE=1
diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 5773b264f0..d5595edd77 100644
--- a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -1,9 +1,10 @@
-#include <Elementary.h>
-#include "elm_priv.h"
 #ifdef HAVE_CONFIG_H
 #include "elementary_config.h"
 #endif
 
+#include <Elementary.h>
+#include "elm_priv.h"
+
 #define DATETIME_FIELD_COUNT    6
 #define FIELD_FORMAT_LEN        3
 #define DISKSELECTOR_MIN_ITEMS  4
diff --git a/legacy/elementary/src/modules/prefs/prefs_iface.c b/legacy/elementary/src/modules/prefs/prefs_iface.c
index f3ec071994..5d1b12bcc1 100644
--- a/legacy/elementary/src/modules/prefs/prefs_iface.c
+++ b/legacy/elementary/src/modules/prefs/prefs_iface.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
 #include "Elementary.h"
 #include "private.h"
 
diff --git a/legacy/elementary/src/modules/test_entry/mod.c b/legacy/elementary/src/modules/test_entry/mod.c
index 0b978e6ad6..c3620b2e76 100644
--- a/legacy/elementary/src/modules/test_entry/mod.c
+++ b/legacy/elementary/src/modules/test_entry/mod.c
@@ -1,8 +1,9 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
 
+#include <Elementary.h>
+
 // module api funcs needed
 EAPI int
 elm_modapi_init(void *m __UNUSED__)
diff --git a/legacy/elementary/src/modules/test_map/mod.c b/legacy/elementary/src/modules/test_map/mod.c
index a075cdd2a0..4bbdcea29e 100644
--- a/legacy/elementary/src/modules/test_map/mod.c
+++ b/legacy/elementary/src/modules/test_map/mod.c
@@ -1,9 +1,10 @@
-#include "Elementary.h"
-#include <Eina.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
 
+#include "Elementary.h"
+#include <Eina.h>
+
 EAPI char *
 map_module_source_name_get(void)
 {