--- xen-4.14.0/xen/include/crypto/rijndael.h.orig	2020-07-23 16:07:51.000000000 +0100
+++ xen-4.14.0/xen/include/crypto/rijndael.h	2020-10-24 14:59:34.349318594 +0100
@@ -52,7 +52,7 @@
 
 int	rijndaelKeySetupEnc(unsigned int [], const unsigned char [], int);
 int	rijndaelKeySetupDec(unsigned int [], const unsigned char [], int);
-void	rijndaelEncrypt(const unsigned int [], int, const unsigned char [],
-	    unsigned char []);
+void	rijndaelEncrypt(const unsigned int [], int, const unsigned char [16],
+	    unsigned char [16]);
 
 #endif /* __RIJNDAEL_H */
--- xen-4.14.0/xen/include/crypto/vmac.h.orig	2020-07-23 16:07:51.000000000 +0100
+++ xen-4.14.0/xen/include/crypto/vmac.h	2020-10-24 15:45:49.246467465 +0100
@@ -142,7 +142,7 @@
 
 #define vmac_update vhash_update
 
-void vhash_update(unsigned char m[],
+void vhash_update(uint8_t *m,
           unsigned int mbytes,
           vmac_ctx_t *ctx);
 
--- xen-4.14.0/tools/libs/foreignmemory/linux.c.orig	2020-07-23 16:07:51.000000000 +0100
+++ xen-4.14.0/tools/libs/foreignmemory/linux.c	2020-10-25 21:36:00.982040566 +0000
@@ -162,7 +162,7 @@
 void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,
                                  uint32_t dom, void *addr,
                                  int prot, int flags, size_t num,
-                                 const xen_pfn_t arr[/*num*/], int err[/*num*/])
+                                 const xen_pfn_t arr[num], int err[num])
 {
     int fd = fmem->fd;
     privcmd_mmapbatch_v2_t ioctlx;
--- xen-4.14.0/tools/libs/foreignmemory/minios.c.orig	2020-07-23 16:07:51.000000000 +0100
+++ xen-4.14.0/tools/libs/foreignmemory/minios.c	2020-10-26 22:36:12.423883688 +0000
@@ -42,7 +42,7 @@
 void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,
                                  uint32_t dom, void *addr,
                                  int prot, int flags, size_t num,
-                                 const xen_pfn_t arr[/*num*/], int err[/*num*/])
+                                 const xen_pfn_t arr[num], int err[num])
 {
     unsigned long pt_prot = 0;
     if (prot & PROT_READ)