diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 70a5579f4e..679feee895 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -13,11 +13,10 @@ lib/ecore_evas/ecore_evas_util.c \
 lib/ecore_evas/ecore_evas_x.c \
 lib/ecore_evas/ecore_evas_fb.c \
 lib/ecore_evas/ecore_evas_buffer.c \
-lib/ecore_evas/ecore_evas_directfb.c \
+lib/ecore_evas/ecore_evas_deprecated.c \
 lib/ecore_evas/ecore_evas_win32.c \
 lib/ecore_evas/ecore_evas_sdl.c \
 lib/ecore_evas/ecore_evas_cocoa.c \
-lib/ecore_evas/ecore_evas_wince.c \
 lib/ecore_evas/ecore_evas_ews.c \
 lib/ecore_evas/ecore_evas_psl1ght.c \
 lib/ecore_evas/ecore_evas_wayland_shm.c \
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 01f13b6fc6..20e7ba37f6 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -1183,33 +1183,33 @@ EAPI Ecore_Evas     *ecore_evas_software_wince_new(Ecore_WinCE_Window *parent,
                                                    int                 x,
                                                    int                 y,
                                                    int                 width,
-                                                   int                 height);
+                                                   int                 height) EINA_DEPRECATED;
 
 EAPI Ecore_Evas     *ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent,
                                                       int                 x,
                                                       int                 y,
                                                       int                 width,
-                                                      int                 height);
+                                                      int                 height) EINA_DEPRECATED;
 
 EAPI Ecore_Evas     *ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent,
                                                         int                 x,
                                                         int                 y,
                                                         int                 width,
-                                                        int                 height);
+                                                        int                 height) EINA_DEPRECATED;
 
 EAPI Ecore_Evas     *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent,
                                                          int                 x,
                                                          int                 y,
                                                          int                 width,
-                                                         int                 height);
+                                                         int                 height) EINA_DEPRECATED;
 
 EAPI Ecore_Evas     *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent,
                                                        int                 x,
                                                        int                 y,
                                                        int                 width,
-                                                       int                 height);
+                                                       int                 height) EINA_DEPRECATED;
 
-EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
+EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
 
 EAPI Ecore_Evas *ecore_evas_cocoa_new(Ecore_Cocoa_Window *parent,
 				      int x,
diff --git a/src/lib/ecore_evas/ecore_evas_wince.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
similarity index 81%
rename from src/lib/ecore_evas/ecore_evas_wince.c
rename to src/lib/ecore_evas/ecore_evas_deprecated.c
index 142a85059c..6e0621fa11 100644
--- a/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -10,6 +10,11 @@
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
 
+
+/* Ecore_Evas WinCE support was removed. However we keep the functions
+ * to not break ABI.
+ */
+
 EAPI Ecore_Evas *
 ecore_evas_software_wince_new(Ecore_WinCE_Window *parent EINA_UNUSED,
                               int                 x EINA_UNUSED,
@@ -65,3 +70,19 @@ ecore_evas_software_wince_window_get(const Ecore_Evas *ee EINA_UNUSED)
 {
    return NULL;
 }
+
+/* Ecore_Evas DirectFB support was removed. However we keep the functions
+ * to not break ABI.
+ */
+
+EAPI Ecore_Evas *
+ecore_evas_directfb_new(const char *disp_name EINA_UNUSED, int windowed EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
+{
+   return NULL;
+}
+
+EAPI Ecore_DirectFB_Window *
+ecore_evas_directfb_window_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+  return NULL;
+}
diff --git a/src/lib/ecore_evas/ecore_evas_directfb.c b/src/lib/ecore_evas/ecore_evas_directfb.c
deleted file mode 100644
index 9557d12722..0000000000
--- a/src/lib/ecore_evas/ecore_evas_directfb.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#include <Ecore.h>
-#include "ecore_private.h"
-
-#include "ecore_evas_private.h"
-#include "Ecore_Evas.h"
-
-/* Ecore_Evas DirectFB support was removed. However we keep the functions
- * to not break ABI.
- */
-
-EAPI Ecore_Evas *
-ecore_evas_directfb_new(const char *disp_name EINA_UNUSED, int windowed EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
-{
-   return NULL;
-}
-
-EAPI Ecore_DirectFB_Window *
-ecore_evas_directfb_window_get(const Ecore_Evas *ee EINA_UNUSED)
-{
-  return NULL;
-}