elementary: fix header inclusion order.

11 files changed, 28 insertions, 11 deletions

diff --git a/src/bin/config.c b/src/bin/config.c
index 60ae145a9..b9c81006e 100644
--- a/src/bin/config.c
+++ b/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/src/bin/elementary_codegen.c b/src/bin/elementary_codegen.c
index b12c79eb3..4f270581f 100644
--- a/src/bin/elementary_codegen.c
+++ b/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/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index 3913a745e..4caad3be0 100644
--- a/src/bin/quicklaunch.c
+++ b/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/src/bin/test_main_menu.c b/src/bin/test_main_menu.c
index f031fd73d..e7a527df2 100644
--- a/src/bin/test_main_menu.c
+++ b/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/src/edje_externals/elm.c b/src/edje_externals/elm.c
index 423322810..9a316fbbb 100644
--- a/src/edje_externals/elm.c
+++ b/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/src/lib/elm_gesture_layer_extra_gestures.c b/src/lib/elm_gesture_layer_extra_gestures.c
index 97468a307..fec7f8f3c 100644
--- a/src/lib/elm_gesture_layer_extra_gestures.c
+++ b/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/src/modules/access_output/mod.c b/src/modules/access_output/mod.c
index 91e5bb2d2..4a9816e22 100644
--- a/src/modules/access_output/mod.c
+++ b/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/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 5773b264f..d5595edd7 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/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/src/modules/prefs/prefs_iface.c b/src/modules/prefs/prefs_iface.c
index f3ec07199..5d1b12bcc 100644
--- a/src/modules/prefs/prefs_iface.c
+++ b/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/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c
index 0b978e6ad..c3620b2e7 100644
--- a/src/modules/test_entry/mod.c
+++ b/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/src/modules/test_map/mod.c b/src/modules/test_map/mod.c
index a075cdd2a..4bbdcea29 100644
--- a/src/modules/test_map/mod.c
+++ b/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)
 {