diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am
index da9e75b0e1..96c28a5903 100644
--- a/legacy/elementary/src/bin/Makefile.am
+++ b/legacy/elementary/src/bin/Makefile.am
@@ -31,73 +31,73 @@ endif
 EXTRA_PROGRAMS = elementary_test elementary_config
 
 elementary_test_SOURCES = \
-test.c \
-test_bg.c \
-test_icon.c \
-test_box.c \
-test_button.c \
-test_transit.c \
-test_fileselector_button.c \
-test_fileselector_entry.c \
-test_toggle.c \
-test_table.c \
-test_gengrid.c \
-test_clock.c \
-test_layout.c \
-test_hover.c \
-test_entry.c \
-test_anchorview.c \
-test_anchorblock.c \
-test_toolbar.c \
-test_hoversel.c \
-test_list.c \
-test_inwin.c \
-test_scaling.c \
-test_slider.c \
 test_actionslider.c \
-test_genlist.c \
-test_check.c \
-test_pager.c \
-test_radio.c \
-test_win_state.c \
-test_progressbar.c \
-test_fileselector.c \
-test_separator.c \
-test_scroller.c \
-test_spinner.c \
-test_index.c \
-test_photocam.c \
-test_photo.c \
-test_thumb.c \
-test_icon_desktops.c \
-test_notify.c \
-test_slideshow.c \
-test_menu.c \
-test_panel.c \
-test_panes.c \
-test_map.c \
-test_weather.c \
-test_flip.c \
-test_label.c \
-test_conform.c \
-test_multi.c \
-test_floating.c \
-test_launcher.c \
+test_anchorblock.c \
+test_anchorview.c \
 test_anim.c \
+test_bg.c \
+test_box.c \
+test_bubble.c \
+test_button.c \
+test.c \
 test_calendar.c \
-test_tooltip.c \
+test_check.c \
+test_clock.c \
+test_colorselector.c \
+test_conform.c \
+test_ctxpopup.c \
 test_cursor.c \
-test_focus.c \
+test_diskselector.c \
+test_entry.c \
+test_fileselector_button.c \
+test_fileselector.c \
+test_fileselector_entry.c \
+test_flip.c \
+test_flipselector.c \
+test_floating.c \
 test_focus2.c \
 test_focus3.c \
-test_flipselector.c \
-test_diskselector.c \
-test_colorselector.c \
-test_ctxpopup.c \
-test_bubble.c \
+test_focus.c \
+test_gengrid.c \
+test_genlist.c \
+test_hover.c \
+test_hoversel.c \
+test_icon.c \
+test_icon_desktops.c \
+test_index.c \
+test_inwin.c \
+test_label.c \
+test_launcher.c \
+test_layout.c \
+test_list.c \
+test_map.c \
+test_menu.c \
+test_multi.c \
+test_notify.c \
+test_pager.c \
+test_panel.c \
+test_panes.c \
+test_photo.c \
+test_photocam.c \
+test_progressbar.c \
+test_radio.c \
+test_scaling.c \
+test_scroller.c \
 test_segment_control.c \
+test_separator.c \
+test_slider.c \
+test_slideshow.c \
+test_spinner.c \
 test_store.c \
-test_win_inline.c
+test_table.c \
+test_thumb.c \
+test_toggle.c \
+test_toolbar.c \
+test_tooltip.c \
+test_transit.c \
+test_weather.c \
+test_win_inline.c \
+test_win_state.c
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
 	@ELEMENTARY_EWEATHER_LIBS@ \
diff --git a/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am
index 0dba20b54c..1bfd60e927 100644
--- a/legacy/elementary/src/edje_externals/Makefile.am
+++ b/legacy/elementary/src/edje_externals/Makefile.am
@@ -27,36 +27,36 @@ pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = private.h \
 modules.inc \
-elm.c \
 elm_anchorblock.c \
 elm_anchorview.c \
 elm_bubble.c \
 elm_button.c \
+elm.c \
 elm_check.c \
 elm_clock.c \
-elm_fileselector.c \
 elm_fileselector_button.c \
+elm_fileselector.c \
 elm_fileselector_entry.c \
-elm_genlist.c \
 elm_gengrid.c \
+elm_genlist.c \
 elm_hoversel.c \
+elm_icon.c \
+elm_label.c \
 elm_list.c \
 elm_map.c \
+elm_notify.c \
+elm_panes.c \
 elm_photocam.c \
 elm_progressbar.c \
 elm_radio.c \
 elm_scrolled_entry.c \
+elm_scroller.c \
 elm_slider.c \
 elm_slideshow.c \
 elm_spinner.c \
 elm_thumb.c \
 elm_toggle.c \
-elm_toolbar.c \
-elm_notify.c \
-elm_panes.c \
-elm_label.c \
-elm_icon.c \
-elm_scroller.c
+elm_toolbar.c
 
 module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
 module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 0d0ac23275..c29d1033a4 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -37,87 +37,81 @@ includesdir = $(includedir)/elementary-@VMAJ@
 
 libelementary_la_SOURCES = \
 elm_priv.h \
-\
-elm_main.c \
-elm_util.c \
-elm_theme.c \
-elm_module.c \
-elm_store.c \
-\
-elm_win.c \
-elm_widget.c \
-elm_bg.c \
-elm_icon.c \
-elm_image.c \
-elm_box.c \
-elm_button.c \
-elm_scroller.c \
-elm_label.c \
-elm_toggle.c \
-elm_frame.c \
-elm_table.c \
-elm_gengrid.c \
-elm_clock.c \
-elm_layout.c \
-elm_hover.c \
-elm_entry.c \
-elm_bubble.c \
-elm_photo.c \
-elm_toolbar.c \
-elm_list.c \
-elm_slider.c \
-elm_actionslider.c \
-elm_genlist.c \
-elm_check.c \
-elm_radio.c \
-elm_pager.c \
-elm_progressbar.c \
-elm_separator.c \
-elm_spinner.c \
-elm_index.c \
-elm_photocam.c \
-elm_notify.c \
-elm_slideshow.c \
-elm_menu.c \
-elm_panel.c \
-elm_panes.c \
-elm_map.c \
-elm_flip.c \
-elm_conform.c \
-elm_mapbuf.c \
-elm_thumb.c \
-elm_config.c \
-elm_font.c \
-elm_animator.c \
-elm_transit.c \
-elm_calendar.c \
-elm_flipselector.c \
-elm_diskselector.c \
-elm_colorselector.c \
-elm_segment_control.c \
-\
 elc_anchorblock.c \
 elc_anchorview.c \
 elc_ctxpopup.c \
-elc_fileselector.c \
 elc_fileselector_button.c \
+elc_fileselector.c \
 elc_fileselector_entry.c \
 elc_hoversel.c \
 elc_scrolled_entry.c \
-\
-els_tooltip.c \
+elm_actionslider.c \
+elm_animator.c \
+elm_bg.c \
+elm_box.c \
+elm_bubble.c \
+elm_button.c \
+elm_calendar.c \
+elm_check.c \
+elm_clock.c \
+elm_cnp_helper.c \
+elm_colorselector.c \
+elm_config.c \
+elm_conform.c \
+elm_diskselector.c \
+elm_entry.c \
+elm_flip.c \
+elm_flipselector.c \
+elm_font.c \
+elm_frame.c \
+elm_gengrid.c \
+elm_genlist.c \
+elm_hover.c \
+elm_icon.c \
+elm_image.c \
+elm_index.c \
+elm_label.c \
+elm_layout.c \
+elm_list.c \
+elm_main.c \
+elm_mapbuf.c \
+elm_map.c \
+elm_menu.c \
+elm_module.c \
+elm_notify.c \
+elm_pager.c \
+elm_panel.c \
+elm_panes.c \
+elm_photo.c \
+elm_photocam.c \
+elm_progressbar.c \
+elm_radio.c \
+elm_scroller.c \
+elm_segment_control.c \
+elm_separator.c \
+elm_slider.c \
+elm_slideshow.c \
+elm_spinner.c \
+elm_store.c \
+elm_table.c \
+elm_theme.c \
+elm_thumb.c \
+elm_toggle.c \
+elm_toolbar.c \
+elm_transit.c \
+elm_util.c \
+elm_widget.c \
+elm_win.c \
+els_box.c \
+els_box.h \
 els_cursor.c \
+els_icon.c \
+els_icon.h \
 els_pan.c \
 els_pan.h \
 els_scroller.c \
 els_scroller.h \
-els_box.c \
-els_box.h \
-els_icon.c \
-els_icon.h \
-\
-elm_cnp_helper.c
-
+els_tooltip.c
 
 libelementary_la_CFLAGS =
 libelementary_la_LIBADD = \