10 files changed, 58 insertions, 58 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index c32e861a04..f41e9a73fe 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -3,21 +3,21 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "api/buffer.h"
-#include "api/helpers.h"
-#include "api/defs.h"
-#include "vim.h"
-#include "buffer.h"
-#include "memline.h"
-#include "memory.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "ex_cmds.h"
-#include "mark.h"
-#include "fileio.h"
-#include "move.h"
-#include "window.h"
-#include "undo.h"
+#include "nvim/api/buffer.h"
+#include "nvim/api/helpers.h"
+#include "nvim/api/defs.h"
+#include "nvim/vim.h"
+#include "nvim/buffer.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/mark.h"
+#include "nvim/fileio.h"
+#include "nvim/move.h"
+#include "nvim/window.h"
+#include "nvim/undo.h"
 
 // Find a window that contains "buf" and switch to it.
 // If there is no such window, use the current window and change "curbuf".
diff --git a/src/nvim/api/buffer.h b/src/nvim/api/buffer.h
index 04f9422c19..e8b0e596a5 100644
--- a/src/nvim/api/buffer.h
+++ b/src/nvim/api/buffer.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "api/defs.h"
+#include "nvim/api/defs.h"
 
 /// Gets the buffer line count
 ///
diff --git a/src/nvim/api/helpers.c b/src/nvim/api/helpers.c
index 8d77ebfeea..aa76a5dc24 100644
--- a/src/nvim/api/helpers.c
+++ b/src/nvim/api/helpers.c
@@ -2,17 +2,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "api/helpers.h"
-#include "api/defs.h"
-#include "vim.h"
-#include "buffer.h"
-#include "window.h"
-#include "memory.h"
-#include "eval.h"
-#include "option.h"
-#include "option_defs.h"
-
-#include "lib/khash.h"
+#include "nvim/api/helpers.h"
+#include "nvim/api/defs.h"
+#include "nvim/vim.h"
+#include "nvim/buffer.h"
+#include "nvim/window.h"
+#include "nvim/memory.h"
+#include "nvim/eval.h"
+#include "nvim/option.h"
+#include "nvim/option_defs.h"
+
+#include "nvim/lib/khash.h"
 
 #if defined(ARCH_64)
 typedef uint64_t ptr_int_t;
diff --git a/src/nvim/api/helpers.h b/src/nvim/api/helpers.h
index 53538a8e28..a3b264256b 100644
--- a/src/nvim/api/helpers.h
+++ b/src/nvim/api/helpers.h
@@ -3,8 +3,8 @@
 
 #include <stdbool.h>
 
-#include "api/defs.h"
-#include "vim.h"
+#include "nvim/api/defs.h"
+#include "nvim/vim.h"
 
 #define set_api_error(message, err)                \
   do {                                             \
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index 27f0aba99c..c577453b37 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -2,10 +2,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "api/tabpage.h"
-#include "api/vim.h"
-#include "api/defs.h"
-#include "api/helpers.h"
+#include "nvim/api/tabpage.h"
+#include "nvim/api/vim.h"
+#include "nvim/api/defs.h"
+#include "nvim/api/helpers.h"
 
 int64_t tabpage_get_window_count(Tabpage tabpage, Error *err)
 {
diff --git a/src/nvim/api/tabpage.h b/src/nvim/api/tabpage.h
index ccd6c7ab9e..f4c0d2eac7 100644
--- a/src/nvim/api/tabpage.h
+++ b/src/nvim/api/tabpage.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "api/defs.h"
+#include "nvim/api/defs.h"
 
 /// Gets the number of windows in a tabpage
 ///
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 4cf1815f83..44f805ed38 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -3,21 +3,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "api/vim.h"
-#include "api/helpers.h"
-#include "api/defs.h"
-#include "api/buffer.h"
-#include "vim.h"
-#include "buffer.h"
-#include "window.h"
-#include "types.h"
-#include "ascii.h"
-#include "ex_docmd.h"
-#include "screen.h"
-#include "memory.h"
-#include "message.h"
-#include "eval.h"
-#include "misc2.h"
+#include "nvim/api/vim.h"
+#include "nvim/api/helpers.h"
+#include "nvim/api/defs.h"
+#include "nvim/api/buffer.h"
+#include "nvim/vim.h"
+#include "nvim/buffer.h"
+#include "nvim/window.h"
+#include "nvim/types.h"
+#include "nvim/ascii.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/screen.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/eval.h"
+#include "nvim/misc2.h"
 
 #define LINE_BUFFER_SIZE 4096
 
diff --git a/src/nvim/api/vim.h b/src/nvim/api/vim.h
index ceb696ff76..27e2639b34 100644
--- a/src/nvim/api/vim.h
+++ b/src/nvim/api/vim.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "api/defs.h"
+#include "nvim/api/defs.h"
 
 /// Send keys to vim input buffer, simulating user input.
 ///
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 2653a9b6af..7196d949bb 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -2,13 +2,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "api/window.h"
-#include "api/defs.h"
-#include "api/helpers.h"
-#include "vim.h"
-#include "window.h"
-#include "screen.h"
-#include "misc2.h"
+#include "nvim/api/window.h"
+#include "nvim/api/defs.h"
+#include "nvim/api/helpers.h"
+#include "nvim/vim.h"
+#include "nvim/window.h"
+#include "nvim/screen.h"
+#include "nvim/misc2.h"
 
 
 Buffer window_get_buffer(Window window, Error *err)
diff --git a/src/nvim/api/window.h b/src/nvim/api/window.h
index e9baa3f170..9a85601015 100644
--- a/src/nvim/api/window.h
+++ b/src/nvim/api/window.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "api/defs.h"
+#include "nvim/api/defs.h"
 
 /// Gets the current buffer in a window
 ///