diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 3e7266d8c..2974e46e6 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -377,7 +377,7 @@ src/bin/e_comp_wl_input.c \
 src/bin/e_comp_wl.c
 endif
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@
 src_bin_enlightenment_SOURCES = \
 src/bin/e_main.c \
 $(enlightenment_src)
diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk
index fbed0220a..750a3de45 100644
--- a/src/modules/Makefile_ibox.mk
+++ b/src/modules/Makefile_ibox.mk
@@ -10,7 +10,7 @@ iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH)
 iboxpkg_LTLIBRARIES = src/modules/ibox/module.la
 
 src_modules_ibox_module_la_LIBADD = $(MOD_LIBS)
-src_modules_ibox_module_la_CPPFLAGS = -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT $(MOD_CPPFLAGS)
+src_modules_ibox_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_ibox_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_ibox_module_la_SOURCES = src/modules/ibox/e_mod_main.c \
 			 src/modules/ibox/e_mod_main.h \
diff --git a/src/modules/conf_theme/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c
index 6659c5c95..7486a1d6e 100644
--- a/src/modules/conf_theme/e_int_config_color_classes.c
+++ b/src/modules/conf_theme/e_int_config_color_classes.c
@@ -1,6 +1,4 @@
 #include "e.h"
-#define EFL_BETA_API_SUPPORT
-#include <elm_color_class.h>
 
 static char *
 _translate(char *str)