diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 70520fc7a2..472043b649 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -92,7 +92,7 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
 
    /* this one will never be satisfied in legacy */
    if (eolian_function_is_beta(fid))
-     eina_strbuf_append_printf(buf, "#ifdef %s_BETA\n", cnameu);
+     eina_strbuf_append(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
    /* XXX: is this right? we expose potentially internal stuff into legacy */
    if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED))
      eina_strbuf_append_printf(buf, "#ifdef %s_PROTECTED\n", cnameu);
@@ -174,10 +174,10 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
      }
    eina_strbuf_append(buf, ";\n");
 
-   if (eolian_function_is_beta(fid))
-     eina_strbuf_append_printf(buf, "#endif\n");
    if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED))
      eina_strbuf_append_printf(buf, "#endif\n");
+   if (eolian_function_is_beta(fid))
+     eina_strbuf_append_printf(buf, "#endif /* EFL_BETA_API_SUPPORT */\n");
 }
 
 void
@@ -267,7 +267,7 @@ events:
 
              if (eolian_event_is_beta(ev))
                {
-                  eina_strbuf_append_printf(buf, "\n#ifdef %s_BETA\n", cnameu);
+                  eina_strbuf_append(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
                }
              if (evs == EOLIAN_SCOPE_PROTECTED)
                {
@@ -292,7 +292,7 @@ events:
              if (evs == EOLIAN_SCOPE_PROTECTED)
                eina_strbuf_append(buf, "#endif\n");
              if (eolian_event_is_beta(ev))
-               eina_strbuf_append(buf, "#endif\n");
+               eina_strbuf_append(buf, "#endif /* EFL_BETA_API_SUPPORT */\n");
 
              eina_stringshare_del(evn);
           }
diff --git a/src/examples/ecore/ecore_promise2_example.c b/src/examples/ecore/ecore_promise2_example.c
index bdf153d7ba..a88b1ff13e 100644
--- a/src/examples/ecore/ecore_promise2_example.c
+++ b/src/examples/ecore/ecore_promise2_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT 1
 #include <Efl_Core.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/examples/ecore/efl_io_buffered_stream_example.c b/src/examples/ecore/efl_io_buffered_stream_example.c
index 3338bae396..c7fe102890 100644
--- a/src/examples/ecore/efl_io_buffered_stream_example.c
+++ b/src/examples/ecore/efl_io_buffered_stream_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index b7e526bd3c..25a81140bd 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c
index ee945cce7b..0a1fd65297 100644
--- a/src/examples/ecore/efl_io_copier_simple_example.c
+++ b/src/examples/ecore/efl_io_copier_simple_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Core.h>
 
 static void
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 9367716729..62e6035450 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 
diff --git a/src/examples/ecore/efl_net_control_example.c b/src/examples/ecore/efl_net_control_example.c
index 3053c87cad..408ea8e6c9 100644
--- a/src/examples/ecore/efl_net_control_example.c
+++ b/src/examples/ecore/efl_net_control_example.c
@@ -1,6 +1,7 @@
 #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
 #endif
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <ctype.h>
diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index f1a97eefe9..70861dc438 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_simple_example.c b/src/examples/ecore/efl_net_dialer_simple_example.c
index 219da892f1..1285dae2f1 100644
--- a/src/examples/ecore/efl_net_dialer_simple_example.c
+++ b/src/examples/ecore/efl_net_dialer_simple_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c b/src/examples/ecore/efl_net_dialer_udp_example.c
index 3b13a60ca7..bb01b58f8a 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_unix_example.c b/src/examples/ecore/efl_net_dialer_unix_example.c
index b610dd42a6..f0298aed4a 100644
--- a/src/examples/ecore/efl_net_dialer_unix_example.c
+++ b/src/examples/ecore/efl_net_dialer_unix_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
index fd0c09818c..037a0aca52 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c
index e0b72e4991..e46a8c78a9 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_example.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index d98e66bb35..b599336960 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index a68e9b9fb9..6477ad2a3d 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_session_example.c b/src/examples/ecore/efl_net_session_example.c
index 683f3414e0..fbefb21791 100644
--- a/src/examples/ecore/efl_net_session_example.c
+++ b/src/examples/ecore/efl_net_session_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index 45dc189d09..0bc77c3477 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index 2babc8b6a0..33b67d2b21 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -1,3 +1,4 @@
+#define EFL_BETA_API_SUPPORT
 #include <Efl_Net.h>
 #include <Ecore_Getopt.h>
 #include <fcntl.h>
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index cdfcc81732..f09265f37b 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1,4 +1,3 @@
-#define EFL_GFX_FILTER_BETA
 #define EFL_GFX_SIZE_HINT_PROTECTED
 
 #include "edje_private.h"
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 859fcc2851..010b1aff6b 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -9,7 +9,6 @@
 
 #define _EDJE_EDIT_EO_CLASS_TYPE
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 
 #include "edje_private.h"
 
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 98311b8525..25a00022b4 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -40,7 +40,6 @@
 #endif
 
 // auto_unref
-#define EFL_CANVAS_LAYOUT_BETA
 #define EFL_CANVAS_OBJECT_PROTECTED
 #define EFL_LAYOUT_CALC_PROTECTED
 
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 5a715b35ed..b7ca9c02d2 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -1,5 +1,4 @@
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 #define EFL_PART_PROTECTED
 
 #include "edje_private.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 75ffcd984c..aee86025d6 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -2,9 +2,7 @@
 # include <config.h>
 #endif
 
-#define EFL_CANVAS_SCENE_BETA
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 #define EFL_PART_PROTECTED
 
 #include "eo_internal.h"
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index 84b958f694..20ca327282 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -21,7 +21,6 @@
 # include <config.h>
 #endif
 
-#define EIO_SENTRY_BETA 1
 
 #include <Eo.h>
 #include "Ecore.h"
diff --git a/src/lib/elementary/efl_access_action.c b/src/lib/elementary/efl_access_action.c
index 8e56d79fd2..da5cd1b4e2 100644
--- a/src/lib/elementary/efl_access_action.c
+++ b/src/lib/elementary/efl_access_action.c
@@ -3,7 +3,6 @@
 #endif
 
 #define EFL_ACCESS_ACTION_PROTECTED
-#define EFL_ACCESS_ACTION_BETA
 
 #include <Elementary.h>
 #include "elm_widget.h"
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index f4a3c653bc..83f7640249 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -3,7 +3,6 @@
 #endif
 
 #define EFL_ACCESS_COMPONENT_PROTECTED
-#define EFL_ACCESS_COMPONENT_BETA
 #define EFL_ACCESS_OBJECT_PROTECTED
 
 #include <Elementary.h>
diff --git a/src/lib/elementary/efl_access_widget_action.c b/src/lib/elementary/efl_access_widget_action.c
index bb0c920f49..47b2f2724a 100644
--- a/src/lib/elementary/efl_access_widget_action.c
+++ b/src/lib/elementary/efl_access_widget_action.c
@@ -4,7 +4,6 @@
 
 #define EFL_ACCESS_ACTION_PROTECTED
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
-#define EFL_ACCESS_ACTION_BETA
 
 #include <Elementary.h>
 #include "elm_widget.h"
diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c
index 9b0e9c680d..88e2269826 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.c
+++ b/src/lib/elementary/efl_ui_anchor_popup.c
@@ -3,7 +3,6 @@
 #endif
 
 #define EFL_UI_POPUP_PROTECTED
-#define EFL_UI_ANCHOR_POPUP_BETA
 
 #include <Elementary.h>
 
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index 4ed23e7d76..df79eb9762 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -7,7 +7,6 @@
 #define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
 #define ELM_LAYOUT_PROTECTED
 
-#define EFL_UI_SELECTION_MANAGER_BETA
 
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 4db9968d90..c9ecd825b5 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -5,7 +5,6 @@
 #define ELM_LAYOUT_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 9590838c1e..16876a068c 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -6,7 +6,6 @@
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #include <Elementary.h>
 
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c
index 9ff9934b79..237343a024 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -5,7 +5,6 @@
 #define ELM_LAYOUT_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 1a0f9aa812..e7d4bfced9 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -5,7 +5,6 @@
 #define ELM_LAYOUT_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 5481803e4e..fe454690a0 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -5,7 +5,6 @@
 #define EFL_ACCESS_SELECTION_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 #define EFL_UI_FOCUS_COMPOSITION_PROTECTED
 #define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
 
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 3e7c8d9b5e..d23e2919b3 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_UI_SCROLL_ALERT_POPUP_BETA
 #define EFL_PART_PROTECTED
 
 #include <Elementary.h>
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index d88e0d4b15..866b79e11c 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -4,7 +4,6 @@
 
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index ef8cc1a52b..be2e773bc4 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -5,7 +5,6 @@
 #define ELM_LAYOUT_PROTECTED
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_SCROLLBAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_selection.c b/src/lib/elementary/efl_ui_selection.c
index 2fd60c4a38..675eb0cf99 100644
--- a/src/lib/elementary/efl_ui_selection.c
+++ b/src/lib/elementary/efl_ui_selection.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_UI_SELECTION_MANAGER_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index f7b37f3799..f191f87e02 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_UI_TAB_BAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index 5fbae19c3c..45758cbc98 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#define EFL_UI_TAB_BAR_BETA
 
 #include <Elementary.h>
 #include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 67a2a01bba..5840051086 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -6,7 +6,6 @@
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define ELM_WIDGET_PROTECTED
 #define ELM_WIDGET_ITEM_PROTECTED
-#define EFL_CANVAS_OBJECT_BETA
 #define EFL_INPUT_EVENT_PROTECTED
 #define EFL_UI_L10N_PROTECTED
 #define EFL_UI_FOCUS_OBJECT_PROTECTED
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 74d741f4e2..442194e1cb 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7,13 +7,10 @@
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 #define EFL_INPUT_EVENT_PROTECTED
 #define EFL_GFX_SIZE_HINT_PROTECTED
-#define EFL_CANVAS_OBJECT_BETA
 #define EFL_CANVAS_OBJECT_PROTECTED
 #define EFL_UI_L10N_PROTECTED
 #define EFL_UI_WIN_INLINED_PROTECTED
 #define EFL_UI_FOCUS_OBJECT_PROTECTED
-#define EFL_UI_WIN_BETA
-#define EFL_CANVAS_SCENE_BETA
 #define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
 #define EFL_PART_PROTECTED
 #define IPA_YLNO_ESU_LANRETNI_MLE
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index fd8a4337e5..dabc798777 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -5,7 +5,6 @@
 #define EFL_ACCESS_OBJECT_PROTECTED
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
 #define EFL_UI_WIDGET_PROTECTED
-//#define EFL_UI_WIDGET_BETA
 #define ELM_WIDGET_ITEM_PROTECTED
 #define EFL_UI_L10N_PROTECTED
 #define EFL_PART_PROTECTED
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 0001287ca7..6dabb93164 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -11,7 +11,6 @@
 
 #define EFL_ACCESS_OBJECT_PROTECTED
 #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
-#define ELM_INTERFACE_FILESELECTOR_BETA
 #define EFL_PART_PROTECTED
 #define EFL_UI_FOCUS_COMPOSITION_PROTECTED
 
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 82b9c699f2..6724a0e080 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -3,7 +3,6 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_PROTECTED
-#define ELM_INTERFACE_FILESELECTOR_BETA
 
 #include <Elementary.h>
 #include "Eio_Eo.h"
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 1a963bd6d8..0c0290ea88 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -4,7 +4,6 @@
 #endif
 
 #define EFL_ACCESS_OBJECT_PROTECTED
-#define ELM_INTERFACE_FILESELECTOR_BETA
 #define EFL_PART_PROTECTED
 
 #include <Elementary.h>
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index c726711d94..9bff045c04 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -11,17 +11,7 @@
 
 #if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
 #define EFL_UI_WIDGET_PROTECTED
-#define EFL_UI_WIDGET_BETA
 #define EFL_CANVAS_OBJECT_PROTECTED
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
-#define EFL_ACCESS_OBJECT_BETA
-#define EFL_ACCESS_COMPONENT_BETA
-#define EFL_ACCESS_EDITABLE_TEXT_BETA
-#define EFL_ACCESS_IMAGE_BETA
-#define EFL_ACCESS_SELECTION_BETA
-#define EFL_ACCESS_TEXT_BETA
-#define EFL_ACCESS_VALUE_BETA
-#define EFL_ACCESS_WIDGET_ACTION_BETA
 #define EFL_UI_FOCUS_OBJECT_PROTECTED
 #endif
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 91ad3dfc93..4b1eb17609 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -10,7 +10,6 @@
 #define EFL_ACCESS_TEXT_PROTECTED
 #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
 
-#define EFL_ACCESS_ACTION_BETA
 
 #include "atspi/atspi-constants.h"
 
diff --git a/src/lib/elementary/elm_interface_fileselector.c b/src/lib/elementary/elm_interface_fileselector.c
index 091911100a..cd2c1957c6 100644
--- a/src/lib/elementary/elm_interface_fileselector.c
+++ b/src/lib/elementary/elm_interface_fileselector.c
@@ -2,7 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_FILESELECTOR_BETA
 
 #include <Elementary.h>
 #include "Eio_Eo.h"
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 8e59f0ac6b..ed5eb36f34 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -4,7 +4,6 @@
 
 #define EFL_CANVAS_OBJECT_PROTECTED
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 
 #include <Evas.h>
 #include <Ecore.h>
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 2cd1f51fd9..6c55790d1c 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,5 +1,3 @@
-#define EFL_CANVAS_OBJECT_BETA
-#define EVAS_CANVAS_BETA
 
 #include "evas_common_private.h"
 #include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 9891a68b15..75f4c2cfc0 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -1,4 +1,3 @@
-#define EFL_CANVAS_OBJECT_BETA
 
 #include "evas_image_private.h"
 #include "evas_image.eo.h"
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 0d574c5418..1c70871c96 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1,4 +1,3 @@
-#define EVAS_CANVAS_BETA
 #define EFL_INPUT_EVENT_PROTECTED
 
 #include "evas_common_private.h"
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index fb8177639f..49647136f0 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1,5 +1,4 @@
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 
 #include "evas_common_private.h"
 #include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8f218fa8c2..aa0ac8359a 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1,5 +1,4 @@
 #define EFL_CANVAS_OBJECT_PROTECTED
-#define EFL_CANVAS_OBJECT_BETA
 #define EFL_GFX_SIZE_HINT_PROTECTED
 
 #include "evas_common_private.h"
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index a5ff430772..03e036beab 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,5 +1,4 @@
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 
 #include "evas_common_private.h"
 #include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index bc18487e95..fb49c4abc4 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1,6 +1,4 @@
-#define EFL_CANVAS_OBJECT_BETA
 #define EFL_CANVAS_GROUP_PROTECTED
-#define EFL_CANVAS_GROUP_BETA
 
 #include "evas_common_private.h"
 #include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index e73bea08ab..578db6427f 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -62,7 +62,6 @@
  * @todo write @ref textblock_layout
  */
 
-#define EFL_CANVAS_OBJECT_BETA
 #define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
 
 #include "evas_common_private.h"
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h
index 16a690decc..1b63422e7b 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -41,7 +41,7 @@ EWAPI extern long BAZ;
 
 EWAPI const Efl_Class *class_simple_class_get(void);
 
-#ifdef CLASS_SIMPLE_BETA
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief Common desc for a
  *
@@ -55,9 +55,9 @@ EWAPI const Efl_Class *class_simple_class_get(void);
  * @ingroup Class_Simple
  */
 EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value);
-#endif
+#endif /* EFL_BETA_API_SUPPORT */
 
-#ifdef CLASS_SIMPLE_BETA
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief Common desc for a
  *
@@ -68,11 +68,11 @@ EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value);
  * @ingroup Class_Simple
  */
 EOAPI int efl_canvas_object_simple_a_get(const Eo *obj);
-#endif
+#endif /* EFL_BETA_API_SUPPORT */
 
 EOAPI void efl_canvas_object_simple_b_set(Eo *obj);
 
-#ifdef CLASS_SIMPLE_BETA
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief comment foo
  *
@@ -87,7 +87,7 @@ EOAPI void efl_canvas_object_simple_b_set(Eo *obj);
  * @ingroup Class_Simple
  */
 EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d);
-#endif
+#endif /* EFL_BETA_API_SUPPORT */
 
 EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x);