diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 98f4aae9a..0e1ba062b 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1,7 +1,4 @@
 #include "e.h"
-#include "e_comp.h"
-#include "e_comp_cfdata.h"
-#include "e_comp_update.h"
 #ifdef HAVE_WAYLAND_CLIENTS
 #include "e_comp_wl.h"
 #endif
diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index d1596d2c1..d6e852e65 100644
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -7,6 +7,9 @@ typedef struct _E_Comp_Zone E_Comp_Zone;
 #ifndef E_MOD_COMP_H
 #define E_MOD_COMP_H
 
+# include "e_comp_cfdata.h"
+# include "e_comp_update.h"
+
 typedef enum
 {
    E_COMP_ENGINE_NONE = 0,
diff --git a/src/modules/conf_comp/e_mod_config.c b/src/modules/conf_comp/e_mod_config.c
index d71361ac8..7914089e5 100644
--- a/src/modules/conf_comp/e_mod_config.c
+++ b/src/modules/conf_comp/e_mod_config.c
@@ -1,7 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_comp.h"
-#include "e_comp_cfdata.h"
 
 struct _E_Config_Dialog_Data
 {
diff --git a/src/modules/conf_comp/e_mod_config_match.c b/src/modules/conf_comp/e_mod_config_match.c
index e0944d851..4823404b6 100644
--- a/src/modules/conf_comp/e_mod_config_match.c
+++ b/src/modules/conf_comp/e_mod_config_match.c
@@ -1,7 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_comp.h"
-#include "e_comp_cfdata.h"
 
 
 typedef struct _Match_Config
diff --git a/src/modules/conf_comp/e_mod_main.c b/src/modules/conf_comp/e_mod_main.c
index 4589ca59e..cf5a416bd 100644
--- a/src/modules/conf_comp/e_mod_main.c
+++ b/src/modules/conf_comp/e_mod_main.c
@@ -1,7 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_comp.h"
-#include "e_comp_cfdata.h"
 
 static E_Int_Menu_Augmentation *maug = NULL;
 
diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c
index 577eaf49e..53ea3ab0c 100644
--- a/src/modules/wizard/page_150.c
+++ b/src/modules/wizard/page_150.c
@@ -1,7 +1,5 @@
 /* Ask about compositing */
 #include "e_wizard.h"
-#include "e_comp.h"
-#include "e_comp_cfdata.h"
 
 static int do_gl = 0;
 static int do_vsync = 0;