diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
index 9e93ba6ea9..95b68e68ea 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
@@ -33,7 +33,7 @@ _ecore_evas_directfb_render(Ecore_Evas *ee)
    Eina_List *updates, *ll;
    Ecore_Evas *ee2;
 
-#ifdef BUILD_ECORE_EVAS_BUFFER
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
    EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
      {
 	if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
index 15464e70b8..62a3e748bf 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
@@ -228,7 +228,7 @@ _ecore_evas_idle_enter(void *data __UNUSED__)
 	     Ecore_Evas *ee2;
 #endif
 	     if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
-#ifdef BUILD_ECORE_EVAS_BUFFER
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
 	     EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
 	       {
 		  if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
index c755b66d15..758c65c3f0 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
@@ -129,9 +129,22 @@ _ecore_evas_idle_enter(void *data __UNUSED__)
    for (l = (Ecore_List2 *)ecore_evases; l; l = l->next)
      {
 	Ecore_Evas *ee;
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
+	Eina_List *ll;
+	Ecore_Evas *ee2;
+#endif
 
 	ee = (Ecore_Evas *)l;
 
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
+	EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
+	  {
+	     if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
+	     _ecore_evas_buffer_render(ee2);
+	     if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
+	  }
+#endif
+
 	if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
 
 	if (ee->prop.avoid_damage) _ecore_evas_render(ee);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
index d904c72340..7c25c66022 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
@@ -68,12 +68,10 @@ static void
 _ecore_evas_win32_render(Ecore_Evas *ee)
 {
    Eina_List *updates;
-#ifdef BUILD_ECORE_EVAS_BUFFER
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
    Eina_List *ll;
    Ecore_Evas *ee2;
-#endif
 
-#ifdef BUILD_ECORE_EVAS_BUFFER
    EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
      {
 	if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
index 4fc4d24fe2..3e0e0b4faa 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
@@ -64,12 +64,10 @@ static void
 _ecore_evas_wince_render(Ecore_Evas *ee)
 {
    Eina_List *updates = NULL;
-#ifdef BUILD_ECORE_EVAS_BUFFER
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
    Eina_List *ll;
    Ecore_Evas *ee2;
-#endif
 
-#ifdef BUILD_ECORE_EVAS_BUFFER
    EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
      {
 	if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index 93deafb84a..dbc6359409 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -144,12 +144,10 @@ _ecore_evas_x_render(Ecore_Evas *ee)
    Evas_Rectangle *r;
    Eina_List *updates, *l;
    int rend = 0;
-#ifdef BUILD_ECORE_EVAS_BUFFER
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
    Eina_List *ll;
    Ecore_Evas *ee2;
-#endif
 
-#ifdef BUILD_ECORE_EVAS_BUFFER
    EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
      {
 	if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);