diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index db212ae97..b8d0420f0 100644
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -87,7 +87,9 @@ typedef unsigned __int64 uint64_t;
 #else
 #include <inttypes.h>			/* more portable than stdint.h */
 #endif
+#if  !defined(_MSC_VER) 
 typedef uintptr_t	PL_fid_t;	/* opaque foreign context handle */
+#endif
 
 typedef void *function_t;
 
@@ -425,7 +427,7 @@ extern X_API void PL_erase(record_t);
 extern X_API int PL_action(int,...);
 extern X_API void *PL_malloc(int);
 extern X_API void PL_free(void *);
-extern X_API int  PL_eval_expression_to_int_64_ex(term_t t, int64_t *val);
+extern X_API int  PL_eval_expression_to_int64_ex(term_t t, int64_t *val);
 
 #define PL_register_foreign(name, arity, function, flags) PL_register_foreign_in_module(NULL, (name), (arity), (function), (flags))
 
diff --git a/include/SWI-Stream.h b/include/SWI-Stream.h
index ca3f5c04e..dd1e1762c 100644
--- a/include/SWI-Stream.h
+++ b/include/SWI-Stream.h
@@ -47,7 +47,7 @@
 #include <stddef.h>
 #ifdef __WINDOWS__
 typedef __int64 int64_t;
-#if (_MSC_VER < 1300)
+#if (_MSC_VER < 1300) && !defined(__MINGW32__)
 typedef long intptr_t;
 typedef unsigned long uintptr_t;
 #endif
diff --git a/library/yap2swi/yap2swi.c b/library/yap2swi/yap2swi.c
index 3ae108565..c6fef0a18 100644
--- a/library/yap2swi/yap2swi.c
+++ b/library/yap2swi/yap2swi.c
@@ -2195,7 +2195,7 @@ PL_free(void *obj)
 }
 
 X_API int
-PL_eval_expression_to_int_64_ex(term_t t, int64_t *val)
+PL_eval_expression_to_int64_ex(term_t t, int64_t *val)
 {
   Term res = Yap_Eval(Yap_GetFromSlot(t));
   if (!res) {
diff --git a/packages/chr b/packages/chr
index c325e4564..e071f01c1 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit c325e4564bb8d4e32c27f2061df85f13d315974e
+Subproject commit e071f01c1d9015e6d3fabc73092a6e902541485a