diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 090a12ca05..5b292a5445 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1086,7 +1086,6 @@ modules_elementary_access_output_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/elementary \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 modules_elementary_access_output_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 modules_elementary_access_output_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1114,7 +1113,6 @@ modules_elementary_clock_input_ctxpopup_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/elementary \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 modules_elementary_clock_input_ctxpopup_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 modules_elementary_clock_input_ctxpopup_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1170,7 +1168,6 @@ modules_elementary_prefs_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/elementary \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 
 if HAVE_WINDOWS
@@ -1205,7 +1202,6 @@ modules_elementary_test_entry_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/elementary \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 modules_elementary_test_entry_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 modules_elementary_test_entry_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1232,7 +1228,6 @@ modules_elementary_test_map_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/elementary \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 modules_elementary_test_map_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 modules_elementary_test_map_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1271,7 +1266,6 @@ modules_elementary_web_none_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/modules/elementary/web/none \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 modules_elementary_web_none_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 modules_elementary_web_none_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1341,7 +1335,6 @@ edje_external_elementary_module_la_CPPFLAGS = \
 -I$(top_builddir)/src/edje_externals \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@
 edje_external_elementary_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
 edje_external_elementary_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
index 9e9d08dcb2..1bfbd083ff 100644
--- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
@@ -3,11 +3,11 @@
 #endif
 
 #include <Elementary.h>
-#include "elm_module_helper.h"
 #include "elm_widget.h"
 #include "efl_ui_clock_private.h"
 #include "elm_ctxpopup_item.eo.h"
 #include "elm_ctxpopup.eo.h"
+#include "elm_module_helper.h"
 
 #define CLOCK_FIELD_COUNT       8
 #define FIELD_FORMAT_LEN        3