diff --git a/src/lib/efreet/Efreet_Mime.h b/src/lib/efreet/Efreet_Mime.h
index 5bfd4182f4..cbde578876 100644
--- a/src/lib/efreet/Efreet_Mime.h
+++ b/src/lib/efreet/Efreet_Mime.h
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef _WIN32
-# ifdef EFL_EFREET_MIME_BUILD
+# ifdef EFL_EFREET_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
diff --git a/src/lib/efreet/Efreet_Trash.h b/src/lib/efreet/Efreet_Trash.h
index a32be6586f..64af9ea74c 100644
--- a/src/lib/efreet/Efreet_Trash.h
+++ b/src/lib/efreet/Efreet_Trash.h
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef _WIN32
-# ifdef EFL_EFREET_TRASH_BUILD
+# ifdef EFL_EFREET_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index e2a4bfdc2e..10f171ea84 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -9,6 +9,8 @@
 # include <winsock2.h>
 #endif
 
+#include <Ecore_File.h>
+
 /* define macros and variable for using the eina logging system  */
 #define EFREET_MODULE_LOG_DOM _efreet_base_log_dom
 static int _efreet_base_log_dom = -1;
@@ -16,8 +18,6 @@ static int _efreet_base_log_dom = -1;
 #include "Efreet.h"
 #include "efreet_private.h"
 
-#include <Ecore_File.h>
-
 static Efreet_Version _version = { VMAJ, VMIN, VMIC, VREV };
 EAPI Efreet_Version *efreet_version = &_version;
 
diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
index 2c648dbbfb..d112fe4f27 100644
--- a/src/lib/efreet/efreet_mime.c
+++ b/src/lib/efreet/efreet_mime.c
@@ -8,8 +8,14 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
 
 #ifdef _WIN32
 # include <winsock2.h>