diff --git a/src/bin/embryo/embryo_cc_amx.h b/src/bin/embryo/embryo_cc_amx.h
index 5a00e525f8..d93861a465 100644
--- a/src/bin/embryo/embryo_cc_amx.h
+++ b/src/bin/embryo/embryo_cc_amx.h
@@ -66,7 +66,7 @@
 #define sEXPMAX         19	/* maximum name length for file version <= 6 */
 #define sNAMEMAX        31	/* maximum name length of symbol name */
 
-#if defined (_MSC_VER) || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
+#if (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
 # pragma pack(1)
 # define EMBRYO_STRUCT_PACKED
 #elif defined (__GNUC__) || (defined (__SUNPRO_C) && __SUNPRO_C >= 0x5100)
@@ -142,7 +142,7 @@
       int nametable  ;	/* name table, file version 7 only */
    } EMBRYO_STRUCT_PACKED AMX_HEADER;
 
-#if defined _MSC_VER || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
+#if (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
 # pragma pack()
 #endif
 
diff --git a/src/bin/embryo/embryo_cc_sc.h b/src/bin/embryo/embryo_cc_sc.h
index 965e580942..d088d0cd3b 100644
--- a/src/bin/embryo/embryo_cc_sc.h
+++ b/src/bin/embryo/embryo_cc_sc.h
@@ -35,13 +35,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <setjmp.h>
-
-#ifndef _MSC_VER
-# include <stdint.h>
-#else
-# include <stddef.h>
-# include <Evil.h>
-#endif
+#include <stdint.h>
 
 #include "embryo_cc_amx.h"
 
diff --git a/src/bin/embryo/embryo_cc_sc7.c b/src/bin/embryo/embryo_cc_sc7.c
index db4fa69fba..7aad7b01c4 100644
--- a/src/bin/embryo/embryo_cc_sc7.c
+++ b/src/bin/embryo/embryo_cc_sc7.c
@@ -51,17 +51,8 @@
 
 #include "embryo_cc_sc.h"
 
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4125)	/* decimal digit terminates octal escape sequence */
-#endif
-
 #include "embryo_cc_sc7.scp"
 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 static void         stgstring(char *start, char *end);
 static void         stgopt(char *start, char *end);
 
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index ec420c6154..006948d46c 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -5,10 +5,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef _MSC_VER
-# include <process.h>
-#endif
-
 #ifdef _WIN32
 # include <Evil.h>
 #endif
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 4c4c81772a..634e87d3f3 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -28,26 +28,16 @@
 # include <ieeefp.h> // for Solaris
 #endif
 
-#ifdef _MSC_VER
-# include <float.h>
-#endif
-
 #ifdef HAVE_ISFINITE
 # define ECORE_FINITE(t)  isfinite(t)
 #else
-# ifdef _MSC_VER
-#  define ECORE_FINITE(t) _finite(t)
-# else
-#  define ECORE_FINITE(t) finite(t)
-# endif
+# define ECORE_FINITE(t) finite(t)
 #endif
 
 //#define FIX_HZ 1
 
 #ifdef FIX_HZ
-# ifndef _MSC_VER
-#  include <sys/param.h>
-# endif
+# include <sys/param.h>
 # ifndef HZ
 #  define HZ 100
 # endif
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index c8fbb87ae4..f26f6bd25d 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -12,21 +12,15 @@
 #endif
 
 #ifdef HAVE_ISFINITE
-# define ECORE_FINITE(t)  isfinite(t)
+# define ECORE_FINITE(t) isfinite(t)
 #else
-# ifdef _MSC_VER
-#  define ECORE_FINITE(t) _finite(t)
-# else
-#  define ECORE_FINITE(t) finite(t)
-# endif
+# define ECORE_FINITE(t) finite(t)
 #endif
 
 #define FIX_HZ 1
 
 #ifdef FIX_HZ
-# ifndef _MSC_VER
-#  include <sys/param.h>
-# endif
+# include <sys/param.h>
 # ifndef HZ
 #  define HZ 100
 # endif
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index c70e04eabb..ad60ca37c9 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -12,23 +12,15 @@
 #  undef EAPI
 # endif
 
-# ifdef _MSC_VER
-#  ifdef BUILDING_DLL
-#   define EAPI __declspec(dllexport)
-#  else // ifdef BUILDING_DLL
-#   define EAPI __declspec(dllimport)
-#  endif // ifdef BUILDING_DLL
-# else // ifdef _MSC_VER
-#  ifdef __GNUC__
-#   if __GNUC__ >= 4
-#    define EAPI __attribute__ ((visibility("default")))
-#   else // if __GNUC__ >= 4
-#    define EAPI
-#   endif // if __GNUC__ >= 4
-#  else // ifdef __GNUC__
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else // if __GNUC__ >= 4
 #   define EAPI
-#  endif // ifdef __GNUC__
-# endif // ifdef _MSC_VER
+#  endif // if __GNUC__ >= 4
+# else // ifdef __GNUC__
+#  define EAPI
+# endif // ifdef __GNUC__
 
 # warning The Ecore_Drm library has been deprecated. Please use the Ecore_Drm2 library
 
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index 19f00cf929..bede4e5406 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -7,23 +7,15 @@
 #  undef EAPI
 # endif
 
-# ifdef _MSC_VER
-#  ifdef BUILDING_DLL
-#   define EAPI __declspec(dllexport)
-#  else // ifdef BUILDING_DLL
-#   define EAPI __declspec(dllimport)
-#  endif // ifdef BUILDING_DLL
-# else // ifdef _MSC_VER
-#  ifdef __GNUC__
-#   if __GNUC__ >= 4
-#    define EAPI __attribute__ ((visibility("default")))
-#   else // if __GNUC__ >= 4
-#    define EAPI
-#   endif // if __GNUC__ >= 4
-#  else // ifdef __GNUC__
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else // if __GNUC__ >= 4
 #   define EAPI
-#  endif // ifdef __GNUC__
-# endif // ifdef _MSC_VER
+#  endif // if __GNUC__ >= 4
+# else // ifdef __GNUC__
+#  define EAPI
+# endif // ifdef __GNUC__
 
 # ifdef EFL_BETA_API_SUPPORT
 
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index baeb5f1db9..4c3b13f0e4 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -11,10 +11,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
 # include <sys/mman.h>
diff --git a/src/lib/ecore_ipc/ecore_ipc_private.h b/src/lib/ecore_ipc/ecore_ipc_private.h
index 72ec014e7c..c964acd733 100644
--- a/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -38,7 +38,7 @@ typedef struct _Ecore_Ipc_Msg_Head Ecore_Ipc_Msg_Head;
 #define ECORE_IPC_TYPE 0x0f
 #define ECORE_IPC_SSL  0xf0
 
-#if defined (_MSC_VER) || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
+#if (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
 # pragma pack(1)
 # define ECORE_IPC_STRUCT_PACKED
 #elif defined (__GNUC__) || (defined (__SUNPRO_C) && __SUNPRO_C >= 0x5100)
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 03e3dec743..3a6afa19fc 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -8,23 +8,15 @@
 # undef EAPI
 #endif // ifdef EAPI
 
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
-# else // ifdef BUILDING_DLL
-#  define EAPI __declspec(dllimport)
-# endif // ifdef BUILDING_DLL
-#else // ifdef _MSC_VER
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else // if __GNUC__ >= 4
-#   define EAPI
-#  endif // if __GNUC__ >= 4
-# else // ifdef __GNUC__
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+#  define EAPI __attribute__ ((visibility("default")))
+# else // if __GNUC__ >= 4
 #  define EAPI
-# endif // ifdef __GNUC__
-#endif // ifdef _MSC_VER
+# endif // if __GNUC__ >= 4
+#else // ifdef __GNUC__
+# define EAPI
+#endif // ifdef __GNUC__
 
 #define ECORE_X_VERSION_MAJOR EFL_VERSION_MAJOR
 #define ECORE_X_VERSION_MINOR EFL_VERSION_MINOR
diff --git a/src/lib/edje/edje_module.c b/src/lib/edje/edje_module.c
index 318393d704..eb2d6c97ee 100644
--- a/src/lib/edje/edje_module.c
+++ b/src/lib/edje/edje_module.c
@@ -106,9 +106,7 @@ _edje_module_init(void)
    /* 1. libedje.so/../edje/modules/ */
    paths[0] = eina_module_symbol_path_get(_edje_module_init, "/edje/modules");
    /* 2. PREFIX/edje/modules/ */
-#ifndef _MSC_VER
    paths[1] = strdup(PACKAGE_LIB_DIR "/edje/modules");
-#endif
 
    for (j = 0; j < ((sizeof (paths) / sizeof (char *)) - 1); ++j)
      for (i = j + 1; i < sizeof (paths) / sizeof (char *); ++i)
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index a8ecdb8929..b6465c7df8 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -26,10 +26,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#ifdef _MSC_VER
-# include <Evil.h>
-#endif
-
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_rbtree.h"
@@ -143,7 +139,7 @@ struct _Eina_Hash_Each
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
-  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+  || defined (__BORLANDC__) || defined (__TURBOC__)
 # define get16bits(d) (*((const uint16_t *)(d)))
 #endif
 
diff --git a/src/lib/embryo/embryo_private.h b/src/lib/embryo/embryo_private.h
index b63dbbdc8b..4bf8ceb2c6 100644
--- a/src/lib/embryo/embryo_private.h
+++ b/src/lib/embryo/embryo_private.h
@@ -270,7 +270,7 @@ struct _Embryo_Program
    void          *data;
 };
 
-#if defined (_MSC_VER) || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
+#if (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
 # pragma pack(1)
 # define EMBRYO_STRUCT_PACKED
 #elif defined (__GNUC__) || (defined (__SUNPRO_C) && __SUNPRO_C >= 0x5100)
@@ -306,7 +306,7 @@ struct _Embryo_Header
    int nametable; /* name table, file version 7 only */
 } EMBRYO_STRUCT_PACKED;
 
-#if defined _MSC_VER || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
+#if (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
 # pragma pack()
 #endif
 
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index 1e74816458..be32be7a14 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -5,10 +5,6 @@
 #include <sys/time.h>
 #include <time.h>
 
-#ifdef _MSC_VER
-# include <winsock2.h>
-#endif
-
 #ifdef _WIN32
 # include <Evil.h>
 #endif
diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c
index ad03284b83..5cbf90a201 100644
--- a/src/lib/evas/canvas/evas_async_events.c
+++ b/src/lib/evas/canvas/evas_async_events.c
@@ -2,9 +2,7 @@
 # include <config.h>
 #endif
 
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <errno.h>
 
 #ifdef _WIN32
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index cbdef108ff..f73b77dab1 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -66,10 +66,8 @@ static FcConfig *fc_config = NULL;
 /* FIXME move these helper function to eina_file or eina_path */
 /* get the casefold feature! */
 #include <fnmatch.h>
-#ifndef _MSC_VER
-# include <unistd.h>
-# include <sys/param.h>
-#endif
+#include <unistd.h>
+#include <sys/param.h>
 int
 _file_path_is_full_path(const char *path)
 {
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index bdcd5e8500..b4cabf845b 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -147,7 +147,6 @@ evas_module_paths_init(void)
      evas_module_paths = _evas_module_append(evas_module_paths, path);
 
    /* 2. PREFIX/lib/evas/modules/ */
-#ifndef _MSC_VER
    path = PACKAGE_LIB_DIR "/evas/modules";
    if (!eina_list_search_unsorted(evas_module_paths, (Eina_Compare_Cb) strcmp, path))
      {
@@ -155,7 +154,6 @@ evas_module_paths_init(void)
         if (path)
           evas_module_paths = _evas_module_append(evas_module_paths, path);
      }
-#endif
 }
 
 #define EVAS_EINA_STATIC_MODULE_DEFINE(Tn, Name) \
diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c
index 6144759616..19eabe4835 100644
--- a/src/lib/evas/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
@@ -13,10 +13,8 @@
 #include <sys/stat.h>
 /* get the casefold feature! */
 #include <fnmatch.h>
-#ifndef _MSC_VER
-# include <unistd.h>
-# include <sys/param.h>
-#endif
+#include <unistd.h>
+#include <sys/param.h>
 
 #ifdef _WIN32
 # include <Evil.h>
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 6518b16f93..27332c0c67 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -21,11 +21,8 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <ctype.h>
-
-#ifndef _MSC_VER
-# include <stdint.h>
+#include <stdint.h>
 #include <unistd.h>
-#endif
 
 #ifdef _WIN32
 # include <Evil.h>