diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 1f9ec6788..9083b73f5 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -202,7 +202,7 @@ src/bin/e_xsettings.h \
 src/bin/e_zoomap.h \
 src/bin/e_zone.h
 
-if HAVE_WAYLAND_CLIENTS
+if HAVE_WAYLAND
 ENLIGHTENMENTHEADERS += \
 src/bin/e_uuid_store.h \
 src/bin/e_comp_wl_data.h \
@@ -377,7 +377,7 @@ src/bin/e_randr.c \
 src/bin/e_xsettings.c
 endif
 
-if HAVE_WAYLAND_CLIENTS
+if HAVE_WAYLAND
 enlightenment_src += \
 src/bin/e_uuid_store.c \
 src/bin/e_comp_wl_data.c \
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index c773805cc..6195ec6f1 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1,9 +1,5 @@
 #include "e.h"
 
-#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
-# include "e_comp_wl.h"
-#endif
-
 #define OVER_FLOW 1
 //#define SHAPE_DEBUG
 //#define BORDER_ZOOMAPS
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 084ab350b..a12083702 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -155,6 +155,8 @@
 #include "e_comp_canvas.h"
 #include "e_utils.h"
 #include "e_hints.h"
-#ifdef HAVE_WAYLAND_CLIENTS
-#  include "e_uuid_store.h"
+
+#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
+# include "e_comp_wl.h"
+# include "e_uuid_store.h"
 #endif