diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index b20576d2fb..dc4d435712 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -253,6 +253,8 @@
 /* This include has been added to support Eo in Evas */
 #include <Eo.h>
 
+#include <Evas_Loader.h>
+
 #ifdef EAPI
 # undef EAPI
 #endif
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 7849548b4a..ba3fc8271c 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -536,20 +536,6 @@ typedef enum _Evas_Border_Fill_Mode
    EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid, even if it has transparency on it */
 } Evas_Border_Fill_Mode; /**< How an image's center region (the complement to the border region) should be rendered by Evas */
 
-typedef enum _Evas_Image_Scale_Hint
-{
-   EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
-   EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
-   EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
-} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
-
-typedef enum _Evas_Image_Animated_Loop_Hint
-{
-   EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
-   EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
-   EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
-} Evas_Image_Animated_Loop_Hint;
-
 typedef enum _Evas_Engine_Render_Mode
 {
    EVAS_RENDER_MODE_BLOCKING = 0,
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 6ea32982b7..9a2fa9213f 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -1,21 +1,5 @@
 #include <Eo.h>
 
-#ifdef _WIN32
-# ifdef EAPI
-#  undef EAPI
-# endif
-# ifdef EFL_EVAS_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif /* ! DLL_EXPORT */
-# else
-#  define EAPI
-# endif /* ! EFL_EVAS_BUILD */
-#else
-#endif /* ! _WIN32 */
-
 EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
 EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
 EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN;
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index 4f53b7ddb1..3121139733 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -1,13 +1,25 @@
 #ifndef _EVAS_LOADER_H
 #define _EVAS_LOADER_H
 
-#include <Eina.h>
-
 typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts;
 typedef struct _Evas_Image_Animated  Evas_Image_Animated;
 typedef struct _Evas_Image_Property  Evas_Image_Property;
 typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
 
+typedef enum _Evas_Image_Animated_Loop_Hint
+{
+   EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
+   EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
+   EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
+} Evas_Image_Animated_Loop_Hint;
+
+typedef enum _Evas_Image_Scale_Hint
+{
+   EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
+   EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
+   EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
+} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
+
 struct _Evas_Image_Property
 {
    unsigned int  w;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 9e1e3a8cb0..8dbdfe8cbe 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,22 +1,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-#ifdef _WIN32
-# ifdef EAPI
-#  undef EAPI
-# endif
-# ifdef EFL_EVAS_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif /* ! DLL_EXPORT */
-# else
-#  define EAPI
-# endif /* ! EFL_EVAS_BUILD */
-#else
-#endif /* ! _WIN32 */
-
 int _evas_event_counter = 0;
 
 EVAS_MEMPOOL(_mp_pc);
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index f051a72a0a..336b7a6231 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -50,7 +50,6 @@
 #include <Eina.h>
 #include "Evas.h"
 //#include "Evas_GL.h"
-#include "Evas_Loader.h"
 
 #ifndef HAVE_LROUND
 /* right now i dont care about rendering bugs on platforms without lround
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index b2f2948810..855a130b0d 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -9,7 +9,6 @@
 #include <eina_safety_checks.h>
 
 #include "Evas.h"
-#include "Evas_Loader.h"
 
 #include "../file/evas_module.h"
 #include "../file/evas_path.h"