diff --git a/src/version.c b/src/version.c
index 18acc39..2e64eec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    378,
+/**/
     377,
 /**/
     376,
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h
index 476b20c..a8bc1dc 100644
--- a/src/xdiff/xdiff.h
+++ b/src/xdiff/xdiff.h
@@ -108,7 +108,7 @@
 	long bsize;
 } bdiffparam_t;
 
-#include "vim.h"
+#include "../vim.h"
 
 #define xdl_malloc(x) lalloc((x), TRUE)
 #define xdl_free(ptr) vim_free(ptr)
diff --git a/src/xdiff/xpatience.c b/src/xdiff/xpatience.c
index c187129..00af0ff 100644
--- a/src/xdiff/xpatience.c
+++ b/src/xdiff/xpatience.c
@@ -206,7 +206,7 @@
  */
 static struct entry *find_longest_common_sequence(struct hashmap *map)
 {
-	struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *));
+	struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *));
 	int longest = 0, i;
 	struct entry *entry;