diff --git a/src/bin/common/signals.c b/src/bin/common/signals.c
index b68bbca9a..8e60158a8 100644
--- a/src/bin/common/signals.c
+++ b/src/bin/common/signals.c
@@ -1,4 +1,3 @@
-#include "history.h"
 #include "signals.h"
 
 const Signals signals = {
diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h
index 63669ba1e..a2bb4386f 100644
--- a/src/bin/common/signals.h
+++ b/src/bin/common/signals.h
@@ -1,6 +1,8 @@
 #ifndef SIGNALS_H
 #define SIGNALS_H
 
+#include "eflete.h"
+
 typedef struct {
    const struct {
       const char *del;
diff --git a/src/bin/config/config.c b/src/bin/config/config.c
index e36a4d7ae..81804186f 100644
--- a/src/bin/config/config.c
+++ b/src/bin/config/config.c
@@ -1,6 +1,5 @@
 #include "config.h"
 #include "shortcuts.h"
-#include "enventor_module.h"
 
 #define CONFIG_FILE        "eflete.cfg"
 #define CONFIG_FILE_KEY    "config"
diff --git a/src/bin/editor/editor_top_level.c b/src/bin/editor/editor_top_level.c
index cfbfd45d1..8cb49ff66 100644
--- a/src/bin/editor/editor_top_level.c
+++ b/src/bin/editor/editor_top_level.c
@@ -1,8 +1,6 @@
 #define ALLOW_DIRECT_EDJE_EDIT_CALLS
 #include "editor.h"
 #include "editor_macro.h"
-#include "change.h"
-#include "diff.h"
 
 extern int _editor_signals_blocked;
 
diff --git a/src/bin/eflete.c b/src/bin/eflete.c
index 7b540deee..96e01b3c0 100644
--- a/src/bin/eflete.c
+++ b/src/bin/eflete.c
@@ -18,8 +18,6 @@
  */
 
 #include "eflete.h"
-#include "main_window.h"
-#include "shortcuts.h"
 #include "config.h"
 #include "syntax_color.h"
 
diff --git a/src/bin/exporter/eflete_exporter.c b/src/bin/exporter/eflete_exporter.c
index 4eccd618b..0b1057466 100644
--- a/src/bin/exporter/eflete_exporter.c
+++ b/src/bin/exporter/eflete_exporter.c
@@ -18,7 +18,6 @@
    #include "eflete_config.h"
 #endif
 
-#include "common_macro.h"
 #include "logger.h"
 #include <assert.h>
 
diff --git a/src/bin/external/enventor_module.c b/src/bin/external/enventor_module.c
index ee414e20e..8f7dbe9e5 100644
--- a/src/bin/external/enventor_module.c
+++ b/src/bin/external/enventor_module.c
@@ -17,9 +17,6 @@
  * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
  */
 
-#include "project_manager2.h"
-#include "enventor_module.h"
-
 #ifdef HAVE_ENVENTOR
 
 #define MAX_SCALE 3.0
diff --git a/src/bin/project_manager/group_manager.c b/src/bin/project_manager/group_manager.c
index 95756b8f2..f2854f2e5 100644
--- a/src/bin/project_manager/group_manager.c
+++ b/src/bin/project_manager/group_manager.c
@@ -18,8 +18,6 @@
  */
 
 #include "project_manager2.h"
-#include "widget_list.h"
-
 #include "group_manager.h"
 #include "group_manager_resources.h"
 
diff --git a/src/bin/resource_manager/resource_manager_build.c b/src/bin/resource_manager/resource_manager_build.c
index 8ed872c86..0452fab14 100644
--- a/src/bin/resource_manager/resource_manager_build.c
+++ b/src/bin/resource_manager/resource_manager_build.c
@@ -1,9 +1,6 @@
 #include "resource_manager2.h"
 #include "resource_manager_private.h"
 #include "project_manager2.h"
-#include "string_common.h"
-
-/***********************************************/
 
 Eina_Bool
 _resource_usage_resource_add(Resource2 *origin, Resource2 *used)
diff --git a/src/bin/resource_manager/resource_manager_load.c b/src/bin/resource_manager/resource_manager_load.c
index 68128d2bb..29c8039c7 100644
--- a/src/bin/resource_manager/resource_manager_load.c
+++ b/src/bin/resource_manager/resource_manager_load.c
@@ -1,7 +1,6 @@
 #include "resource_manager2.h"
 #include "resource_manager_private.h"
 #include "project_manager2.h"
-#include "string_common.h"
 
 Eina_Bool
 _global_data_resources_load(Project *project)
diff --git a/src/bin/resource_manager/resource_manager_react.c b/src/bin/resource_manager/resource_manager_react.c
index f4ce7c275..03c73084f 100644
--- a/src/bin/resource_manager/resource_manager_react.c
+++ b/src/bin/resource_manager/resource_manager_react.c
@@ -22,7 +22,6 @@
 #include "resource_manager_private.h"
 #include "project_manager2.h"
 #include "tabs.h"
-#include "string_common.h"
 
 /* CALLBACK FUNCTIONS */
 
diff --git a/src/bin/ui/history_ui.c b/src/bin/ui/history_ui.c
index 8ee266b34..315a1325d 100644
--- a/src/bin/ui/history_ui.c
+++ b/src/bin/ui/history_ui.c
@@ -2,8 +2,6 @@
 #include "change.h"
 #include "project_manager2.h"
 #include "history.h"
-#include "widget_macro.h"
-#include "main_window.h"
 #include "shortcuts.h"
 
 typedef struct {
diff --git a/src/bin/ui/live_view/elementary/live_frame.c b/src/bin/ui/live_view/elementary/live_frame.c
index 6c982a544..ace1447b2 100644
--- a/src/bin/ui/live_view/elementary/live_frame.c
+++ b/src/bin/ui/live_view/elementary/live_frame.c
@@ -18,7 +18,6 @@
  */
 
 #include "live_elementary_widgets.h"
-#include "widget_macro.h"
 
 static void
 _on_frame_swallow_check(void *data EINA_UNUSED,
diff --git a/src/bin/ui/live_view/elementary/live_genlist.c b/src/bin/ui/live_view/elementary/live_genlist.c
index 6803ac29c..418739246 100644
--- a/src/bin/ui/live_view/elementary/live_genlist.c
+++ b/src/bin/ui/live_view/elementary/live_genlist.c
@@ -18,7 +18,6 @@
  */
 
 #include "live_elementary_widgets.h"
-#include "widget_macro.h"
 
 static void
 _on_genlist_swallow_check(void *data EINA_UNUSED,
diff --git a/src/bin/ui/live_view/elementary/live_popup.c b/src/bin/ui/live_view/elementary/live_popup.c
index 54aab330d..cedd27fcd 100644
--- a/src/bin/ui/live_view/elementary/live_popup.c
+++ b/src/bin/ui/live_view/elementary/live_popup.c
@@ -18,7 +18,6 @@
  */
 
 #include "live_elementary_widgets.h"
-#include "main_window.h" /* strlen_safe */
 
 static void
 _on_popup_swallow_check(void *data EINA_UNUSED,
diff --git a/src/bin/ui/live_view/elementary/live_slider.c b/src/bin/ui/live_view/elementary/live_slider.c
index 38eb0eecc..a74545acb 100644
--- a/src/bin/ui/live_view/elementary/live_slider.c
+++ b/src/bin/ui/live_view/elementary/live_slider.c
@@ -18,7 +18,6 @@
  */
 
 #include "live_elementary_widgets.h"
-#include "main_window.h" /* strlen_safe */
 
 Evas_Object *
 widget_slider_create(Evas_Object *parent, const Group2 *group)
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 272b655f7..a6d99f394 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -19,7 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
    #include "eflete_config.h"
-#endif /* include eflete_config.h */
+#endif
 
 #include "main_window.h"
 #include "history_ui.h"
diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index 6f05f58c7..d0a675fdd 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -1,6 +1,5 @@
 #include "main_window.h"
 #include "tabs.h"
-#include "workspace.h"
 #include "shortcuts.h"
 #include "project_manager2.h"
 
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index 319a2bcce..da6c6a404 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -18,7 +18,6 @@
  */
 
 #include "main_window.h"
-#include "widget_macro.h"
 #include "project_manager2.h"
 #include "config.h"
 #include "shortcuts.h"
diff --git a/src/bin/ui/property/property_color_control.c b/src/bin/ui/property/property_color_control.c
index 0e2f7fb7e..90f6ac6ea 100644
--- a/src/bin/ui/property/property_color_control.c
+++ b/src/bin/ui/property/property_color_control.c
@@ -19,7 +19,6 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "main_window.h"
 
 typedef struct {
    int r, g, b, a;
diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c
index dffb48454..48682c6fa 100644
--- a/src/bin/ui/property/property_common.c
+++ b/src/bin/ui/property/property_common.c
@@ -20,10 +20,8 @@
 #include "property.h"
 #include "property_private.h"
 #include "property_common.h"
-#include "widget_macro.h"
 #include "sound_player.h"
 #include "shortcuts.h"
-#include "main_window.h"
 
 /* hack to disable spinner value changes when scrolling */
 static void
diff --git a/src/bin/ui/property/property_common_image.c b/src/bin/ui/property/property_common_image.c
index add4ba608..0b9b9b2c1 100644
--- a/src/bin/ui/property/property_common_image.c
+++ b/src/bin/ui/property/property_common_image.c
@@ -19,7 +19,6 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "main_window.h"
 
 static Eina_Bool
 _on_image_editor_done(void *data,
diff --git a/src/bin/ui/property/property_common_tween.c b/src/bin/ui/property/property_common_tween.c
index 7fc09d97e..4d03f4524 100644
--- a/src/bin/ui/property/property_common_tween.c
+++ b/src/bin/ui/property/property_common_tween.c
@@ -19,7 +19,6 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "main_window.h"
 #include "project_manager2.h"
 
 /* gengrid base functions */
diff --git a/src/bin/ui/property/property_group.c b/src/bin/ui/property/property_group.c
index 10ec1b7e9..d0dd6900f 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -31,13 +31,11 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "group_manager.h"
 #include "history.h"
 #include "change.h"
 #include "project_manager2.h"
 #include "validator.h"
 #include "shortcuts.h"
-#include "string_common.h"
 
 #define PART_MASK(TYPE) (1u << TYPE)
 #define PART_RECTANGLE PART_MASK(EDJE_PART_TYPE_RECTANGLE)
diff --git a/src/bin/ui/property/property_image_selector.c b/src/bin/ui/property/property_image_selector.c
index b0f704809..2fcfa60b3 100644
--- a/src/bin/ui/property/property_image_selector.c
+++ b/src/bin/ui/property/property_image_selector.c
@@ -19,7 +19,6 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "main_window.h"
 
 static Eina_Bool
 _on_image_done(void *data,
diff --git a/src/bin/ui/property/property_private.h b/src/bin/ui/property/property_private.h
index 77fe0a927..0b6f823b7 100644
--- a/src/bin/ui/property/property_private.h
+++ b/src/bin/ui/property/property_private.h
@@ -19,7 +19,7 @@
 
 #include "main_window.h"
 #include "syntax_color.h"
-
+#include "property.h"
 
 #ifndef PROPERTY_PRIVATE_H
 #define PROPERTY_PRIVATE_H
diff --git a/src/bin/ui/property/property_script.c b/src/bin/ui/property/property_script.c
index ba694c053..621543247 100644
--- a/src/bin/ui/property/property_script.c
+++ b/src/bin/ui/property/property_script.c
@@ -19,7 +19,6 @@
 
 #include "property.h"
 #include "property_private.h"
-#include "main_window.h"
 
 static void
 _btn_script_manager_cb(void *data,
diff --git a/src/bin/ui/property/property_sound.c b/src/bin/ui/property/property_sound.c
index d50dd4efa..1b7ba32ab 100644
--- a/src/bin/ui/property/property_sound.c
+++ b/src/bin/ui/property/property_sound.c
@@ -20,8 +20,6 @@
 #include "property.h"
 #include "property_private.h"
 #include "sound_player.h"
-#include "main_window.h"
-#include "project_manager2.h"
 
 #define SOUND_MASK(TYPE) (1u << TYPE)
 #define SOUND_SAMPLE SOUND_MASK(SOUND_TYPE_SAMPLE)
diff --git a/src/bin/ui/script_manager.c b/src/bin/ui/script_manager.c
index 394a64882..17ec5aefd 100644
--- a/src/bin/ui/script_manager.c
+++ b/src/bin/ui/script_manager.c
@@ -29,12 +29,9 @@
 #endif
 
 #include "modal_window.h"
-#include "property.h"
 #include "property_private.h"
 #include "history.h"
 #include "change.h"
-#include "syntax_color.h"
-#include "eflete.h"
 
 typedef struct _Script_Manager Script_Manager;
 
diff --git a/src/bin/ui/splash.c b/src/bin/ui/splash.c
index db72f491d..7a96fb06b 100644
--- a/src/bin/ui/splash.c
+++ b/src/bin/ui/splash.c
@@ -1,5 +1,4 @@
 #include "main_window.h"
-#include "widget_macro.h"
 
 struct _Splash_Data
 {
diff --git a/src/bin/ui/tab_home_common.c b/src/bin/ui/tab_home_common.c
index 4b16a4dfa..2af9c5014 100644
--- a/src/bin/ui/tab_home_common.c
+++ b/src/bin/ui/tab_home_common.c
@@ -18,12 +18,10 @@
  */
 
 #include "tabs_private.h"
-#include "tabs.h"
 #include "main_window.h"
 #include "project_navigator.h"
 #include "config.h"
 #include "project_common.h"
-#include "widget_list.h"
 
 void
 meta_controls_add(Evas_Object *layout, Meta_Data_Controls *meta)
diff --git a/src/bin/ui/tab_home_info.c b/src/bin/ui/tab_home_info.c
index 8721928e1..1bcfdc2d0 100644
--- a/src/bin/ui/tab_home_info.c
+++ b/src/bin/ui/tab_home_info.c
@@ -18,7 +18,6 @@
  */
 
 #include "tabs_private.h"
-#include "tabs.h"
 #include "main_window.h"
 
 struct _Tab_Home_Info
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 2733b7e5d..8e3c052bb 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -21,7 +21,6 @@
 #include "workspace.h"
 #include "tabs.h"
 #include "history.h"
-#include "project_manager2.h"
 #include "main_window.h"
 #include "change.h"
 
diff --git a/src/bin/ui/workspace/groupview.c b/src/bin/ui/workspace/groupview.c
index 4f4c939ba..91b5a829e 100644
--- a/src/bin/ui/workspace/groupview.c
+++ b/src/bin/ui/workspace/groupview.c
@@ -19,7 +19,6 @@
 
 #include "groupview.h"
 #include "groupview_private.h"
-#include "cursor.h"
 #include "project_manager2.h"
 
 #define MY_CLASS_NAME "Groupview"
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index b403e5d22..b594bd88b 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -21,7 +21,6 @@
 #include "main_window.h"
 #include "groupview.h"
 #include "container.h"
-#include "eflete.h"
 #include "group_navigator.h"
 #include "history.h"
 #include "history_ui.h"
diff --git a/tests/test_alloc/mem_malloc.c b/tests/test_alloc/mem_malloc.c
index 4cfa8fa14..d5b891bde 100644
--- a/tests/test_alloc/mem_malloc.c
+++ b/tests/test_alloc/mem_malloc.c
@@ -1,4 +1,3 @@
-
 #include "test_alloc.h"
 
 /**
diff --git a/tests/test_alloc/test_alloc.h b/tests/test_alloc/test_alloc.h
index 06362060d..b52164cd7 100644
--- a/tests/test_alloc/test_alloc.h
+++ b/tests/test_alloc/test_alloc.h
@@ -1,5 +1,3 @@
-
-// #include "utc_common.h"
 #include "config.h"
 
 #include "../eflete_check.h"
diff --git a/tests/test_change/change_diff_add.c b/tests/test_change/change_diff_add.c
index eafbeb808..09e3f81b9 100644
--- a/tests/test_change/change_diff_add.c
+++ b/tests/test_change/change_diff_add.c
@@ -1,4 +1,6 @@
 
+#include <stdbool.h>
+
 #include "test_change.h"
 
 /**
diff --git a/tests/test_change/test_change.h b/tests/test_change/test_change.h
index 980e9fb31..b327f12ef 100644
--- a/tests/test_change/test_change.h
+++ b/tests/test_change/test_change.h
@@ -1,6 +1,3 @@
-
-// #include "utc_common.h"
-#include "config.h"
 #include "change.h"
 #include "diff.h"