diff --git a/C/adtdefs.c b/C/adtdefs.c
index f28dc250d..259d95dce 100644
--- a/C/adtdefs.c
+++ b/C/adtdefs.c
@@ -319,7 +319,7 @@ Yap_LookupMaybeWideAtomWithLength(wchar_t *atom, size_t len)
     while (len--) {*ptr++ = *p++;}
     ptr[0] = '\0';
     at = LookupWideAtom(ptr0);
-    Yap_FreeCodeSpace(ptr0);
+    Yap_FreeCodeSpace((char *)ptr0);
     return at;
   } else {
     char *ptr, *ptr0;
diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index f8c886dc2..1579278be 100755
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -117,14 +117,14 @@ typedef unsigned __int64 uint64_t;
 typedef uintptr_t	PL_fid_t;	/* opaque foreign context handle */
 #endif
 
-typedef void *function_t;
+typedef void *pl_function_t;
 
 #define fid_t PL_fid_t			/* avoid AIX name-clash */
 
 typedef struct _PL_extension
 { const char 		*predicate_name;	/* Name of the predicate */
   short		arity;			/* Arity of the predicate */
-  function_t	function;		/* Implementing functions */
+  pl_function_t	function;		/* Implementing functions */
   short		flags;			/* Or of PL_FA_... */
 } PL_extension;
 
@@ -444,8 +444,8 @@ extern X_API term_t PL_exception(qid_t);
 extern X_API term_t PL_exception(qid_t);
 extern X_API int PL_call_predicate(module_t, int, predicate_t, term_t);
 extern X_API int PL_call(term_t, module_t);
-extern X_API void PL_register_foreign(const char *, int, foreign_t (*)(void), int);
-extern X_API void PL_register_foreign_in_module(const char *, const char *, int, foreign_t (*)(void), int);
+extern X_API void PL_register_foreign(const char *, int, pl_function_t, int);
+extern X_API void PL_register_foreign_in_module(const char *, const char *, int, pl_function_t, int);
 extern X_API void PL_register_extensions(const PL_extension *);
 extern X_API void PL_load_extensions(const PL_extension *);
 extern X_API int PL_handle_signals(void);
diff --git a/library/yap2swi/yap2swi.c b/library/yap2swi/yap2swi.c
index e22747019..6640ea059 100755
--- a/library/yap2swi/yap2swi.c
+++ b/library/yap2swi/yap2swi.c
@@ -2462,7 +2462,7 @@ X_API int PL_call(term_t tp, module_t m)
   return out;
 }
 
-X_API void PL_register_foreign_in_module(const char *module, const char *name, int arity, foreign_t (*function)(void), int flags)
+X_API void PL_register_foreign_in_module(const char *module, const char *name, int arity, pl_function_t function, int flags)
 {
   Term tmod;
   Int nflags = 0;
@@ -2495,7 +2495,7 @@ X_API void PL_register_extensions(const PL_extension *ptr)
   PL_load_extensions(ptr);
 }
 
-X_API void PL_register_foreign(const char *name, int arity, foreign_t (*function)(void), int flags)
+X_API void PL_register_foreign(const char *name, int arity, pl_function_t function, int flags)
 {
   PL_register_foreign_in_module(NULL, name, arity, function, flags);
 }
diff --git a/packages/sgml/quote.c b/packages/sgml/quote.c
index 8e6ba42c0..049138c67 100644
--- a/packages/sgml/quote.c
+++ b/packages/sgml/quote.c
@@ -26,7 +26,7 @@
 #include <SWI-Prolog.h>
 #include <stdlib.h>
 #ifdef HAVE_MALLOC_H
-#include HAVE_MALLOC_H
+#include <malloc.h>
 #endif
 #include "error.h"
 #include <errno.h>