diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 3b2207f80b..4a698052ee 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -87,8 +87,8 @@ file(MAKE_DIRECTORY ${LINT_SUPPRESSES_ROOT}/src)
 
 file(GLOB NVIM_SOURCES *.c)
 file(GLOB NVIM_HEADERS *.h)
-file(GLOB XDIFF_SOURCES xdiff/*.c)
-file(GLOB XDIFF_HEADERS xdiff/*.h)
+file(GLOB XDIFF_SOURCES ../xdiff/*.c)
+file(GLOB XDIFF_HEADERS ../xdiff/*.h)
 
 foreach(subdir
         os
diff --git a/src/nvim/xdiff/COPYING b/src/xdiff/COPYING
similarity index 100%
rename from src/nvim/xdiff/COPYING
rename to src/xdiff/COPYING
diff --git a/src/nvim/xdiff/README.txt b/src/xdiff/README.txt
similarity index 100%
rename from src/nvim/xdiff/README.txt
rename to src/xdiff/README.txt
diff --git a/src/nvim/xdiff/xdiff.h b/src/xdiff/xdiff.h
similarity index 99%
rename from src/nvim/xdiff/xdiff.h
rename to src/xdiff/xdiff.h
index f3dac80d3f..49985a0e9a 100644
--- a/src/nvim/xdiff/xdiff.h
+++ b/src/xdiff/xdiff.h
@@ -119,7 +119,7 @@ typedef struct s_bdiffparam {
 	long bsize;
 } bdiffparam_t;
 
-#include "../memory.h"
+#include "../nvim/memory.h"
 
 #define xdl_malloc(x) xmalloc((x))
 #define xdl_free(ptr) xfree(ptr)
diff --git a/src/nvim/xdiff/xdiffi.c b/src/xdiff/xdiffi.c
similarity index 100%
rename from src/nvim/xdiff/xdiffi.c
rename to src/xdiff/xdiffi.c
diff --git a/src/nvim/xdiff/xdiffi.h b/src/xdiff/xdiffi.h
similarity index 100%
rename from src/nvim/xdiff/xdiffi.h
rename to src/xdiff/xdiffi.h
diff --git a/src/nvim/xdiff/xemit.c b/src/xdiff/xemit.c
similarity index 100%
rename from src/nvim/xdiff/xemit.c
rename to src/xdiff/xemit.c
diff --git a/src/nvim/xdiff/xemit.h b/src/xdiff/xemit.h
similarity index 100%
rename from src/nvim/xdiff/xemit.h
rename to src/xdiff/xemit.h
diff --git a/src/nvim/xdiff/xhistogram.c b/src/xdiff/xhistogram.c
similarity index 100%
rename from src/nvim/xdiff/xhistogram.c
rename to src/xdiff/xhistogram.c
diff --git a/src/nvim/xdiff/xinclude.h b/src/xdiff/xinclude.h
similarity index 100%
rename from src/nvim/xdiff/xinclude.h
rename to src/xdiff/xinclude.h
diff --git a/src/nvim/xdiff/xmacros.h b/src/xdiff/xmacros.h
similarity index 100%
rename from src/nvim/xdiff/xmacros.h
rename to src/xdiff/xmacros.h
diff --git a/src/nvim/xdiff/xpatience.c b/src/xdiff/xpatience.c
similarity index 100%
rename from src/nvim/xdiff/xpatience.c
rename to src/xdiff/xpatience.c
diff --git a/src/nvim/xdiff/xprepare.c b/src/xdiff/xprepare.c
similarity index 100%
rename from src/nvim/xdiff/xprepare.c
rename to src/xdiff/xprepare.c
diff --git a/src/nvim/xdiff/xprepare.h b/src/xdiff/xprepare.h
similarity index 100%
rename from src/nvim/xdiff/xprepare.h
rename to src/xdiff/xprepare.h
diff --git a/src/nvim/xdiff/xtypes.h b/src/xdiff/xtypes.h
similarity index 100%
rename from src/nvim/xdiff/xtypes.h
rename to src/xdiff/xtypes.h
diff --git a/src/nvim/xdiff/xutils.c b/src/xdiff/xutils.c
similarity index 100%
rename from src/nvim/xdiff/xutils.c
rename to src/xdiff/xutils.c
diff --git a/src/nvim/xdiff/xutils.h b/src/xdiff/xutils.h
similarity index 100%
rename from src/nvim/xdiff/xutils.h
rename to src/xdiff/xutils.h