diff --git a/configure b/configure
index 586f8b896..3ff6863cf 100755
--- a/configure
+++ b/configure
@@ -6837,10 +6837,8 @@ fi
         if test "$target_win64" = no
         then
 	  LDFLAGS="-Wl,--large-address-aware $LDFLAGS"
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
-        else
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll -lws2_32"
         fi
+        SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
         SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll"
         SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll"
         SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll  ../../packages/PLStream/plstream.dll"
diff --git a/configure.in b/configure.in
index 3a398f5e7..3f0b6f19b 100755
--- a/configure.in
+++ b/configure.in
@@ -977,10 +977,8 @@ dnl Linux has both elf and a.out, in this case we found elf
         if test "$target_win64" = no
         then
 	  LDFLAGS="-Wl,--large-address-aware $LDFLAGS"
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
-        else
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll -lws2_32"
         fi
+        SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
         SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll"
         SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll"
         SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll  ../../packages/PLStream/plstream.dll"
diff --git a/include/yap_structs.h b/include/yap_structs.h
index eb7ba6822..e7c1858ec 100755
--- a/include/yap_structs.h
+++ b/include/yap_structs.h
@@ -29,7 +29,11 @@
 
 /* Type definitions */
 
-typedef unsigned long YAP_CELL;  /* this is common to all current machines */
+#if _WIN64
+typedef unsigned long long YAP_CELL;  
+#else
+typedef unsigned long YAP_CELL;  
+#endif
 
 typedef int YAP_Bool;