Introduce nvim namespace: Fix project-local includes.

Prepend 'nvim/' in all project-local (non-system) includes.

134 files changed, 1667 insertions, 1667 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
 ///
diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c
index 54f88f8757..192c3c5afe 100644
--- a/src/nvim/arabic.c
+++ b/src/nvim/arabic.c
@@ -11,8 +11,8 @@
 /// Stand-Alone - unicode form-B isolated char denoted with  a_s_* (NOT USED)
 ///
 
-#include "vim.h"
-#include "arabic.h"
+#include "nvim/vim.h"
+#include "nvim/arabic.h"
 
 // Arabic ISO-10646-1 character set definition
 
diff --git a/src/nvim/blowfish.c b/src/nvim/blowfish.c
index 67712a2fbc..d48724ada4 100644
--- a/src/nvim/blowfish.c
+++ b/src/nvim/blowfish.c
@@ -12,10 +12,10 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "blowfish.h"
-#include "message.h"
-#include "sha256.h"
+#include "nvim/vim.h"
+#include "nvim/blowfish.h"
+#include "nvim/message.h"
+#include "nvim/sha256.h"
 
 #define ARRAY_LENGTH(A) (sizeof(A) / sizeof(A[0]))
 
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 7cd773b55c..6c5b30cfc7 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -26,46 +26,46 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "digraph.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "indent.h"
-#include "indent_c.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "move.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "spell.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/digraph.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 // Todo(stefan991): remove this macro
 #define INVALID_DEVICE_ID UINT64_MAX
@@ -4059,7 +4059,7 @@ void do_modelines(int flags)
   --entered;
 }
 
-#include "version_defs.h"            /* for version number */
+#include "nvim/version_defs.h"            /* for version number */
 
 /*
  * chk_modeline() - check a single line for a mode string
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index d78cf0651f..0f70e7e4ed 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -2,19 +2,19 @@
 #define NEOVIM_BUFFER_DEFS_H
 
 // for garray_T
-#include "garray.h"
+#include "nvim/garray.h"
 // for pos_T and lpos_T
-#include "pos.h"
+#include "nvim/pos.h"
 // for the number window-local and buffer-local options
-#include "option_defs.h"
+#include "nvim/option_defs.h"
 // for jump list and tag stack sizes in a buffer and mark types
-#include "mark_defs.h"
+#include "nvim/mark_defs.h"
 // for u_header_T
-#include "undo_defs.h"
+#include "nvim/undo_defs.h"
 // for hashtab_T
-#include "hashtab.h"
+#include "nvim/hashtab.h"
 // for dict_T
-#include "eval_defs.h"
+#include "nvim/eval_defs.h"
 
 typedef struct window_S win_T;
 typedef struct wininfo_S wininfo_T;
@@ -24,22 +24,22 @@ typedef struct file_buffer buf_T;       /* forward declaration */
 typedef struct memfile memfile_T;
 
 // for struct memline (it needs memfile_T)
-#include "memline_defs.h"
+#include "nvim/memline_defs.h"
 
 // for struct memfile, bhdr_T, blocknr_T... (it needs buf_T)
-#include "memfile_defs.h"
+#include "nvim/memfile_defs.h"
 
 /*
  * This is here because regexp_defs.h needs win_T and buf_T. regprog_T is
  * used below.
  */
-#include "regexp_defs.h"
+#include "nvim/regexp_defs.h"
 
 // for  synstate_T (needs reg_extmatch_T, win_T and buf_T)
-#include "syntax_defs.h"
+#include "nvim/syntax_defs.h"
 
 // for signlist_T
-#include "sign_defs.h"
+#include "nvim/sign_defs.h"
 
 /*
  * The taggy struct is used to store the information about a :tag command.
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 5217eb2c0a..f0a1441a31 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -6,18 +6,18 @@
 #include <wctype.h>
 #include <wchar.h>  // for towupper() and towlower()
 
-#include "vim.h"
-#include "charset.h"
-#include "farsi.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "move.h"
-#include "os_unix.h"
+#include "nvim/vim.h"
+#include "nvim/charset.h"
+#include "nvim/farsi.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/os_unix.h"
 
 static int win_chartabsize(win_T *wp, char_u *p, colnr_T col);
 
diff --git a/src/nvim/crypt.c b/src/nvim/crypt.c
index 72d4a89c63..e0f49f7e40 100644
--- a/src/nvim/crypt.c
+++ b/src/nvim/crypt.c
@@ -11,12 +11,12 @@
 // Based on blowfish by Bruce Schneier (http://www.schneier.com/blowfish.html)
 // and sha256 by Christophe Devine.
 
-#include "vim.h"
-#include "misc2.h"
-#include "blowfish.h"
-#include "ex_getln.h"
-#include "message.h"
-#include "option.h"
+#include "nvim/vim.h"
+#include "nvim/misc2.h"
+#include "nvim/blowfish.h"
+#include "nvim/ex_getln.h"
+#include "nvim/message.h"
+#include "nvim/option.h"
 
 static void make_crc_tab(void);
 
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 19db088817..c8c42cfbac 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -1,9 +1,9 @@
-#include "vim.h"
-#include "cursor_shape.h"
-#include "misc2.h"
-#include "ex_getln.h"
-#include "charset.h"
-#include "syntax.h"
+#include "nvim/vim.h"
+#include "nvim/cursor_shape.h"
+#include "nvim/misc2.h"
+#include "nvim/ex_getln.h"
+#include "nvim/charset.h"
+#include "nvim/syntax.h"
 
 /*
  * Handling of cursor and mouse pointer shapes in various modes.
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index e360edc665..a5b4b64751 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -2,31 +2,31 @@
 ///
 /// Code for diff'ing two, three or four buffers.
 
-#include "vim.h"
-#include "diff.h"
-#include "buffer.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "fileio.h"
-#include "fold.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "path.h"
-#include "screen.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/diff.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/screen.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 
 static int diff_busy = FALSE;    // ex_diffgetput() is busy
 
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 7ab8bd181d..f119587b8a 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -2,21 +2,21 @@
 ///
 /// code for digraphs
 
-#include "vim.h"
-#include "digraph.h"
-#include "charset.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "getchar.h"
-#include "mbyte.h"
-#include "message.h"
-#include "misc2.h"
-#include "memory.h"
-#include "garray.h"
-#include "normal.h"
-#include "screen.h"
-#include "ui.h"
+#include "nvim/vim.h"
+#include "nvim/digraph.h"
+#include "nvim/charset.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/getchar.h"
+#include "nvim/mbyte.h"
+#include "nvim/message.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/garray.h"
+#include "nvim/normal.h"
+#include "nvim/screen.h"
+#include "nvim/ui.h"
 
 typedef int result_T;
 
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 146a8bba70..e44ea3d120 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -12,46 +12,46 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "edit.h"
-#include "buffer.h"
-#include "charset.h"
-#include "digraph.h"
-#include "eval.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "indent_c.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "path.h"
-#include "popupmnu.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/event.h"
+#include "nvim/vim.h"
+#include "nvim/edit.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/digraph.h"
+#include "nvim/eval.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/popupmnu.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/event.h"
 
 /*
  * definitions used for CTRL-X submode
diff --git a/src/nvim/edit.h b/src/nvim/edit.h
index 3ab0f1ba59..152373590e 100644
--- a/src/nvim/edit.h
+++ b/src/nvim/edit.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_EDIT_H
 #define NEOVIM_EDIT_H
 
-#include "vim.h"
+#include "nvim/vim.h"
 
 /*
  * Array indexes used for cptext argument of ins_compl_add().
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 98ab1ea2fe..b2ed7a486c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -13,59 +13,59 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "eval.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "if_cscope.h"
-#include "indent_c.h"
-#include "indent.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "file_search.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "popupmnu.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "sha256.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "version.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/job.h"
-#include "os/rstream.h"
-#include "os/rstream_defs.h"
-#include "os/time.h"
+#include "nvim/vim.h"
+#include "nvim/eval.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/if_cscope.h"
+#include "nvim/indent_c.h"
+#include "nvim/indent.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/file_search.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/popupmnu.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/sha256.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/version.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/job.h"
+#include "nvim/os/rstream.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/time.h"
 
 #if defined(FEAT_FLOAT)
 # include <math.h>
@@ -313,7 +313,7 @@ typedef struct {
  * The reason to use this table anyway is for very quick access to the
  * variables with the VV_ defines.
  */
-#include "version_defs.h"
+#include "nvim/version_defs.h"
 
 /* values for vv_flags: */
 #define VV_COMPAT       1       /* compatible, also used without "v:" */
diff --git a/src/nvim/eval_defs.h b/src/nvim/eval_defs.h
index aa086c3278..b0661fd991 100644
--- a/src/nvim/eval_defs.h
+++ b/src/nvim/eval_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_EVAL_DEFS_H
 #define NEOVIM_EVAL_DEFS_H
 
-#include "hashtab.h"
+#include "nvim/hashtab.h"
 
 typedef int varnumber_T;
 typedef double float_T;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 3613a02cb3..7c3592bb4b 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -13,52 +13,52 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "version_defs.h"
-#include "ex_cmds.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "digraph.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/version_defs.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/digraph.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 
 static int linelen(int *has_tab);
 static void do_filter(linenr_T line1, linenr_T line2, exarg_T *eap,
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 0837e5386e..3a76e2028c 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -12,38 +12,38 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "version_defs.h"
-#include "ex_cmds2.h"
-#include "buffer.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "term.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/version_defs.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 
 static void cmd_source(char_u *fname, exarg_T *eap);
 
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 6497e98480..b6285db274 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -5,7 +5,7 @@
  * Do ":help credits" in Vim to see a list of people who contributed.
  */
 
-#include "normal.h"
+#include "nvim/normal.h"
 
 /*
  * This file defines the Ex commands.
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 87ce252434..88b0c6be77 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -12,56 +12,56 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "ex_docmd.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "digraph.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hardcopy.h"
-#include "if_cscope.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "menu.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "crypt.h"
-#include "file_search.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "version.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/digraph.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hardcopy.h"
+#include "nvim/if_cscope.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/menu.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/crypt.h"
+#include "nvim/file_search.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/version.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 static int quitmore = 0;
 static int ex_pressedreturn = FALSE;
@@ -242,7 +242,7 @@ static void ex_folddo(exarg_T *eap);
  * Declare cmdnames[].
  */
 #define DO_DECLARE_EXCMD
-#include "ex_cmds_defs.h"
+#include "nvim/ex_cmds_defs.h"
 
 /*
  * Table used to quickly search for a command, based on its first character.
@@ -8534,7 +8534,7 @@ put_view (
   /*
    * Local options.  Need to go to the window temporarily.
    * Store only local values when using ":mkview" and when ":mksession" is
-   * used and 'sessionoptions' doesn't include "options".
+   * used and 'sessionoptions' doesn't include "nvim/options".
    * Some folding options are always stored when "folds" is included,
    * otherwise the folds would not be restored correctly.
    */
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index fc0887ca03..089fa0dc69 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -10,16 +10,16 @@
  * ex_eval.c: functions for Ex command line for the +eval feature.
  */
 
-#include "vim.h"
-#include "ex_eval.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "message.h"
-#include "misc2.h"
-#include "memory.h"
-#include "regexp.h"
+#include "nvim/vim.h"
+#include "nvim/ex_eval.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/message.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/regexp.h"
 
 
 static void free_msglist(struct msglist *l);
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 8e2d7cc9ae..e9977187c5 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -13,49 +13,49 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "arabic.h"
-#include "ex_getln.h"
-#include "buffer.h"
-#include "charset.h"
-#include "digraph.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "if_cscope.h"
-#include "indent.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "menu.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "cursor_shape.h"
-#include "keymap.h"
-#include "garray.h"
-#include "move.h"
-#include "ops.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "window.h"
-#include "ui.h"
-#include "os/os.h"
-#include "os/event.h"
+#include "nvim/vim.h"
+#include "nvim/arabic.h"
+#include "nvim/ex_getln.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/digraph.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/if_cscope.h"
+#include "nvim/indent.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/menu.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/cursor_shape.h"
+#include "nvim/keymap.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/window.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
+#include "nvim/os/event.h"
 
 /*
  * Variables shared between getcmdline(), redrawcmdline() and others.
diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index ea9432ac8b..df91330ee3 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -4,18 +4,18 @@
 ///
 
 
-#include "edit.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "getchar.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "screen.h"
-#include "vim.h"
+#include "nvim/edit.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/getchar.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/screen.h"
+#include "nvim/vim.h"
 
 
 #define SRC_EDT 0
diff --git a/src/nvim/farsi.h b/src/nvim/farsi.h
index c5ee336a0f..9206d7c3f9 100644
--- a/src/nvim/farsi.h
+++ b/src/nvim/farsi.h
@@ -11,8 +11,8 @@
 #ifndef NEOVIM_FARSI_H
 #define NEOVIM_FARSI_H
 
-#include "normal.h"
-#include "types.h"
+#include "nvim/normal.h"
+#include "nvim/types.h"
 
 // Farsi character set definition
 
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 96f0b71b73..4e08dc0955 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -46,20 +46,20 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "file_search.h"
-#include "charset.h"
-#include "fileio.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "os_unix.h"
-#include "path.h"
-#include "tag.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/file_search.h"
+#include "nvim/charset.h"
+#include "nvim/fileio.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/tag.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 static char_u   *ff_expand_buffer = NULL; /* used for expanding filenames */
 
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 4fc73d8ebf..e6e0b589b6 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -12,44 +12,44 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "fileio.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "crypt.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "sha256.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/fileio.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/crypt.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/sha256.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 
 #if defined(HAVE_UTIME) && defined(HAVE_UTIME_H)
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index 960ba26fa3..d97983e4d8 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_FILEIO_H
 #define NEOVIM_FILEIO_H
 
-#include "buffer_defs.h"
-#include "os/os.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/os/os.h"
 
 /*
  * Struct to save values in before executing autocommands for a buffer that is
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 143b35ea10..e1ff74f598 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -13,25 +13,25 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "fold.h"
-#include "charset.h"
-#include "diff.h"
-#include "eval.h"
-#include "ex_docmd.h"
-#include "indent.h"
-#include "mark.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "move.h"
-#include "option.h"
-#include "screen.h"
-#include "syntax.h"
-#include "undo.h"
+#include "nvim/vim.h"
+#include "nvim/fold.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/eval.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/indent.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/screen.h"
+#include "nvim/syntax.h"
+#include "nvim/undo.h"
 
 /* local declarations. {{{1 */
 /* typedef fold_T {{{2 */
diff --git a/src/nvim/garray.c b/src/nvim/garray.c
index e1046ceb5e..cd274fc1a3 100644
--- a/src/nvim/garray.c
+++ b/src/nvim/garray.c
@@ -4,15 +4,15 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "ascii.h"
-#include "misc2.h"
-#include "memory.h"
-#include "path.h"
-#include "garray.h"
-
-// #include "globals.h"
-#include "memline.h"
+#include "nvim/vim.h"
+#include "nvim/ascii.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/path.h"
+#include "nvim/garray.h"
+
+// #include "nvim/globals.h"
+#include "nvim/memline.h"
 
 /// Clear an allocated growing array.
 void ga_clear(garray_T *gap)
diff --git a/src/nvim/garray.h b/src/nvim/garray.h
index 2a0deacef7..694d073f94 100644
--- a/src/nvim/garray.h
+++ b/src/nvim/garray.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_GARRAY_H
 #define NEOVIM_GARRAY_H
 
-#include "func_attr.h"
+#include "nvim/func_attr.h"
 
 /// Structure used for growing arrays.
 /// This is used to store information that only grows, is deleted all at
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 99dbc11e4d..ca6ca2e14e 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -17,32 +17,32 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "getchar.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "regexp.h"
-#include "screen.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
+#include "nvim/vim.h"
+#include "nvim/getchar.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
 
 /*
  * These buffers are used for storing:
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index d856a4c155..36689c2c94 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -10,9 +10,9 @@
 
 #include <stdbool.h>
 
-#include "ex_eval.h"
-#include "mbyte.h"
-#include "menu.h"
+#include "nvim/ex_eval.h"
+#include "nvim/mbyte.h"
+#include "nvim/menu.h"
 
 /*
  * definition of global variables
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 1c334e76de..3c4fba134a 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -12,29 +12,29 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "version_defs.h"
-#include "hardcopy.h"
-#include "buffer.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "fileio.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "option.h"
-#include "path.h"
-#include "screen.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/version_defs.h"
+#include "nvim/hardcopy.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/fileio.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/screen.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
 
 /*
  * To implement printing on a platform, the following functions must be
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
index f8ec7453be..4918a0226f 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -20,11 +20,11 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "hashtab.h"
-#include "message.h"
-#include "memory.h"
-#include "misc2.h"
+#include "nvim/vim.h"
+#include "nvim/hashtab.h"
+#include "nvim/message.h"
+#include "nvim/memory.h"
+#include "nvim/misc2.h"
 
 // Magic value for algorithm that walks through the array.
 #define PERTURB_SHIFT 5
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index b000b03444..31e52f9605 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -8,29 +8,29 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#include "vim.h"
-#include "if_cscope.h"
-#include "charset.h"
-#include "eval.h"
-#include "fileio.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "os/time.h"
-#include "path.h"
-#include "quickfix.h"
-#include "tag.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/if_cscope.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/fileio.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/os/time.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/tag.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #if defined(UNIX)
 # include <sys/wait.h>
 #endif
-#include "if_cscope_defs.h"
+#include "nvim/if_cscope_defs.h"
 
 static void cs_usage_msg(csid_e x);
 static int cs_add(exarg_T *eap);
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 61fe5ab251..0c8a9370ef 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -1,14 +1,14 @@
-#include "indent.h"
-#include "eval.h"
-#include "charset.h"
-#include "memline.h"
-#include "memory.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "option.h"
-#include "regexp.h"
-#include "search.h"
-#include "undo.h"
+#include "nvim/indent.h"
+#include "nvim/eval.h"
+#include "nvim/charset.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/option.h"
+#include "nvim/regexp.h"
+#include "nvim/search.h"
+#include "nvim/undo.h"
 
 static int lisp_match(char_u *p);
 
diff --git a/src/nvim/indent.h b/src/nvim/indent.h
index 8b2ebfaf89..8b1c96bf5a 100644
--- a/src/nvim/indent.h
+++ b/src/nvim/indent.h
@@ -1,6 +1,6 @@
 #ifndef NEOVIM_INDENT_H
 #define NEOVIM_INDENT_H
-#include "vim.h"
+#include "nvim/vim.h"
 int get_indent(void);
 int get_indent_lnum(linenr_T lnum);
 int get_indent_buf(buf_T *buf, linenr_T lnum);
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 77ca3a34cb..71d4d8f0dc 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -1,14 +1,14 @@
-#include "vim.h"
-#include "misc1.h"
-#include "charset.h"
-#include "edit.h"
-#include "indent.h"
-#include "indent_c.h"
-#include "memline.h"
-#include "memory.h"
-#include "misc2.h"
-#include "option.h"
-#include "search.h"
+#include "nvim/vim.h"
+#include "nvim/misc1.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/misc2.h"
+#include "nvim/option.h"
+#include "nvim/search.h"
 
 
 static char_u   *skip_string(char_u *p);
diff --git a/src/nvim/indent_c.h b/src/nvim/indent_c.h
index 7b181e6768..b2642958ea 100644
--- a/src/nvim/indent_c.h
+++ b/src/nvim/indent_c.h
@@ -1,6 +1,6 @@
 #ifndef NEOVIM_INDENT_C_H
 #define NEOVIM_INDENT_C_H
-#include "vim.h"
+#include "nvim/vim.h"
 int cin_islabel(void);
 int cin_iscase(char_u *s, int strict);
 int cin_isscopedecl(char_u *s);
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index bec179c913..8b4015b97c 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -3,11 +3,11 @@
  * special key codes.
  */
 
-#include "vim.h"
-#include "keymap.h"
-#include "charset.h"
-#include "edit.h"
-#include "term.h"
+#include "nvim/vim.h"
+#include "nvim/keymap.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/term.h"
 
 
 /*
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h
index 6b73b980e4..ada7da05b1 100644
--- a/src/nvim/lib/khash.h
+++ b/src/nvim/lib/khash.h
@@ -26,7 +26,7 @@
 /*
   An example:
 
-#include "khash.h"
+#include "nvim/khash.h"
 KHASH_MAP_INIT_INT(32, char)
 int main() {
 	int ret, is_missing;
@@ -129,8 +129,8 @@ int main() {
 #include <string.h>
 #include <limits.h>
 
-#include "func_attr.h"
-#include "memory.h"
+#include "nvim/func_attr.h"
+#include "nvim/memory.h"
 
 /* compiler specific configuration */
 
diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h
index f8b16ea9fa..65f87ed5e3 100644
--- a/src/nvim/lib/klist.h
+++ b/src/nvim/lib/klist.h
@@ -29,8 +29,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "func_attr.h"
-#include "memory.h"
+#include "nvim/func_attr.h"
+#include "nvim/memory.h"
 
 #define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f)                       \
     typedef struct {                                                    \
diff --git a/src/nvim/log.c b/src/nvim/log.c
index 5d536c62e5..a187cc4755 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -7,11 +7,11 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "log.h"
-#include "misc1.h"
-#include "types.h"
-#include "os/os.h"
-#include "os/time.h"
+#include "nvim/log.h"
+#include "nvim/misc1.h"
+#include "nvim/types.h"
+#include "nvim/os/os.h"
+#include "nvim/os/time.h"
 
 #define USR_LOG_FILE "$HOME/.nvimlog"
 
diff --git a/src/nvim/log.h b/src/nvim/log.h
index 45c8fdbfd8..255808efbe 100644
--- a/src/nvim/log.h
+++ b/src/nvim/log.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "func_attr.h"
+#include "nvim/func_attr.h"
 
 #define DEBUG_LOG_LEVEL 0
 #define INFO_LOG_LEVEL 1
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 828a6d5200..caeefe1582 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -10,47 +10,47 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "vim.h"
-#include "main.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "if_cscope.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "crypt.h"
-#include "garray.h"
-#include "log.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "ops.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "screen.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "version.h"
-#include "window.h"
-#include "os/input.h"
-#include "os/os.h"
-#include "os/signal.h"
+#include "nvim/vim.h"
+#include "nvim/main.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/if_cscope.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/crypt.h"
+#include "nvim/garray.h"
+#include "nvim/log.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/screen.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/version.h"
+#include "nvim/window.h"
+#include "nvim/os/input.h"
+#include "nvim/os/os.h"
+#include "nvim/os/signal.h"
 
 /* Maximum number of commands from + or -c arguments. */
 #define MAX_ARG_CMDS 10
diff --git a/src/nvim/main.h b/src/nvim/main.h
index df3e10aa38..8a40d12126 100644
--- a/src/nvim/main.h
+++ b/src/nvim/main.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_MAIN_H
 #define NEOVIM_MAIN_H
 
-#include "normal.h"
+#include "nvim/normal.h"
 
 void main_loop(int cmdwin, int noexmode);
 void getout(int exitval);
diff --git a/src/nvim/map.c b/src/nvim/map.c
index 3e2bbe03e0..40868e5b92 100644
--- a/src/nvim/map.c
+++ b/src/nvim/map.c
@@ -1,12 +1,12 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "map.h"
-#include "map_defs.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/map.h"
+#include "nvim/map_defs.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
-#include "lib/khash.h"
+#include "nvim/lib/khash.h"
 
 typedef struct {
   void *ptr;
diff --git a/src/nvim/map.h b/src/nvim/map.h
index 9e61b903d5..32dde0fad2 100644
--- a/src/nvim/map.h
+++ b/src/nvim/map.h
@@ -4,7 +4,7 @@
 
 #include <stdbool.h>
 
-#include "map_defs.h"
+#include "nvim/map_defs.h"
 
 /// Creates a new `Map` instance
 ///
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 5aa1212c0d..31876cb51e 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -12,29 +12,29 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "mark.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "fileio.h"
-#include "fold.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "normal.h"
-#include "option.h"
-#include "path.h"
-#include "quickfix.h"
-#include "search.h"
-#include "term.h"
-#include "ui.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/mark.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/search.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
 
 /*
  * This file contains routines to maintain and manipulate marks.
diff --git a/src/nvim/mark.h b/src/nvim/mark.h
index 203e10d118..9de8aef828 100644
--- a/src/nvim/mark.h
+++ b/src/nvim/mark.h
@@ -1,9 +1,9 @@
 #ifndef NEOVIM_MARK_H
 #define NEOVIM_MARK_H
 
-#include "buffer_defs.h"
-#include "mark_defs.h"
-#include "pos.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/mark_defs.h"
+#include "nvim/pos.h"
 
 /* mark.c */
 int setmark(int c);
diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h
index eb8d5a9767..a67fbc2945 100644
--- a/src/nvim/mark_defs.h
+++ b/src/nvim/mark_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_MARK_DEFS_H
 #define NEOVIM_MARK_DEFS_H
 
-#include "pos.h"
+#include "nvim/pos.h"
 
 /*
  * marks: positions in a file
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 09cb1ce35b..38728c2eea 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -79,20 +79,20 @@
 #include <string.h>
 # include <wchar.h>
 
-#include "vim.h"
-#include "mbyte.h"
-#include "charset.h"
-#include "fileio.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "option.h"
-#include "screen.h"
-#include "spell.h"
-#include "ui.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/mbyte.h"
+#include "nvim/charset.h"
+#include "nvim/fileio.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/option.h"
+#include "nvim/screen.h"
+#include "nvim/spell.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
 
 # define WINBYTE BYTE
 
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index 9431101d8d..77468bb855 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -33,18 +33,18 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "memfile.h"
-#include "fileio.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "os_unix.h"
-#include "path.h"
-#include "ui.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/memfile.h"
+#include "nvim/fileio.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
 
 #define MEMFILE_PAGE_SIZE 4096          /* default page size */
 
diff --git a/src/nvim/memfile.h b/src/nvim/memfile.h
index 283d7795ca..ae1f4fdd27 100644
--- a/src/nvim/memfile.h
+++ b/src/nvim/memfile.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_MEMFILE_H
 #define NEOVIM_MEMFILE_H
 
-#include "buffer_defs.h"
-#include "memfile_defs.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/memfile_defs.h"
 
 /* memfile.c */
 memfile_T *mf_open(char_u *fname, int flags);
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index a01506756f..f21f007bbb 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -43,32 +43,32 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "memline.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "eval.h"
-#include "fileio.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "crypt.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "screen.h"
-#include "sha256.h"
-#include "spell.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/memline.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/eval.h"
+#include "nvim/fileio.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/crypt.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/screen.h"
+#include "nvim/sha256.h"
+#include "nvim/spell.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 #ifndef UNIX            /* it's in os_unix_defs.h for Unix */
 # include <time.h>
diff --git a/src/nvim/memline.h b/src/nvim/memline.h
index 6f68409ba4..40bfb69996 100644
--- a/src/nvim/memline.h
+++ b/src/nvim/memline.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_MEMLINE_H
 #define NEOVIM_MEMLINE_H
 
-#include "types.h"
-#include "func_attr.h"
+#include "nvim/types.h"
+#include "nvim/func_attr.h"
 
 int ml_open(buf_T *buf);
 void ml_set_crypt_key(buf_T *buf, char_u *old_key, int old_cm);
diff --git a/src/nvim/memline_defs.h b/src/nvim/memline_defs.h
index 5878cfd7d9..100a923843 100644
--- a/src/nvim/memline_defs.h
+++ b/src/nvim/memline_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_MEMLINE_DEFS_H
 #define NEOVIM_MEMLINE_DEFS_H
 
-#include "memfile_defs.h"
+#include "nvim/memfile_defs.h"
 
 /*
  * When searching for a specific line, we remember what blocks in the tree
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 53214d5265..cd04abdbb9 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -3,44 +3,44 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "vim.h"
-#include "misc2.h"
-#include "file_search.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "move.h"
-#include "option.h"
-#include "ops.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/misc2.h"
+#include "nvim/file_search.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/ops.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 static void try_to_free_memory();
 
diff --git a/src/nvim/memory.h b/src/nvim/memory.h
index 0249b19464..9c6f5a1b1d 100644
--- a/src/nvim/memory.h
+++ b/src/nvim/memory.h
@@ -1,9 +1,9 @@
 #ifndef NEOVIM_MEMORY_H
 #define NEOVIM_MEMORY_H
 
-#include "func_attr.h"
-#include "types.h"
-#include "vim.h"
+#include "nvim/func_attr.h"
+#include "nvim/types.h"
+#include "nvim/vim.h"
 
 char_u *alloc(unsigned size) FUNC_ATTR_MALLOC FUNC_ATTR_ALLOC_SIZE(1);
 
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index e454b8c971..557b7211b0 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -13,19 +13,19 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "menu.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_docmd.h"
-#include "getchar.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "garray.h"
-#include "term.h"
+#include "nvim/vim.h"
+#include "nvim/menu.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/getchar.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/garray.h"
+#include "nvim/term.h"
 
 
 #define MENUDEPTH   10          /* maximum depth of menus */
diff --git a/src/nvim/message.c b/src/nvim/message.c
index feb1226e6d..0e4d83a54b 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -14,27 +14,27 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "message.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_eval.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "mbyte.h"
-#include "memory.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "garray.h"
-#include "ops.h"
-#include "option.h"
-#include "normal.h"
-#include "screen.h"
-#include "term.h"
-#include "ui.h"
-#include "os/os.h"
-#include "os/event.h"
+#include "nvim/vim.h"
+#include "nvim/message.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_eval.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/mbyte.h"
+#include "nvim/memory.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/garray.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/normal.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
+#include "nvim/os/event.h"
 
 #if defined(FEAT_FLOAT)
 # include <math.h>
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 26b649331a..f90772b057 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -12,44 +12,44 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "version_defs.h"
-#include "misc1.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "indent_c.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc2.h"
-#include "garray.h"
-#include "move.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/version_defs.h"
+#include "nvim/misc1.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 static char_u *vim_version_dir(char_u *vimdir);
 static char_u *remove_tail(char_u *p, char_u *pend, char_u *name);
 static void init_users(void);
diff --git a/src/nvim/misc1.h b/src/nvim/misc1.h
index a46b305fae..7ace8dffcf 100644
--- a/src/nvim/misc1.h
+++ b/src/nvim/misc1.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_MISC1_H
 #define NEOVIM_MISC1_H
 
-#include "vim.h"
+#include "nvim/vim.h"
 
 int open_line(int dir, int flags, int second_line_indent);
 int get_leader_len(char_u *line, char_u **flags, int backward,
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
index 8d556db347..c094672df4 100644
--- a/src/nvim/misc2.c
+++ b/src/nvim/misc2.c
@@ -11,45 +11,45 @@
  */
 #include <string.h>
 
-#include "vim.h"
-#include "misc2.h"
-#include "file_search.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "move.h"
-#include "option.h"
-#include "ops.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/misc2.h"
+#include "nvim/file_search.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/ops.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 
 static int coladvance2(pos_T *pos, int addspaces, int finetune,
                        colnr_T wcol);
diff --git a/src/nvim/misc2.h b/src/nvim/misc2.h
index 2e292c8fc7..a0a4ec694c 100644
--- a/src/nvim/misc2.h
+++ b/src/nvim/misc2.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_MISC2_H
 #define NEOVIM_MISC2_H
 
-#include "func_attr.h"
-#include "os/shell.h"
+#include "nvim/func_attr.h"
+#include "nvim/os/shell.h"
 
 /* misc2.c */
 int virtual_active(void);
diff --git a/src/nvim/move.c b/src/nvim/move.c
index f234d968a6..06ca570545 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -16,18 +16,18 @@
  * The 'scrolloff' option makes this a bit complicated.
  */
 
-#include "vim.h"
-#include "move.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "fold.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "popupmnu.h"
-#include "screen.h"
+#include "nvim/vim.h"
+#include "nvim/move.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/fold.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/popupmnu.h"
+#include "nvim/screen.h"
 
 static void comp_botline(win_T *wp);
 static void redraw_for_cursorline(win_T *wp);
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index dc0035fe85..cdd1a76716 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -14,46 +14,46 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "normal.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "digraph.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "indent_c.h"
-#include "main.h"
-#include "mark.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "move.h"
-#include "ops.h"
-#include "option.h"
-#include "quickfix.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/event.h"
+#include "nvim/vim.h"
+#include "nvim/normal.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/digraph.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/indent_c.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/move.h"
+#include "nvim/ops.h"
+#include "nvim/option.h"
+#include "nvim/quickfix.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/event.h"
 
 /*
  * The Visual area is remembered for reselection.
diff --git a/src/nvim/normal.h b/src/nvim/normal.h
index c5ca1b9bde..5ee7e08a46 100644
--- a/src/nvim/normal.h
+++ b/src/nvim/normal.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_NORMAL_H
 #define NEOVIM_NORMAL_H
 
-#include "pos.h"
+#include "nvim/pos.h"
 
 /*
  * Arguments for operators.
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 30606b077e..8f92af8725 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -13,35 +13,35 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "ops.h"
-#include "buffer.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_getln.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "path.h"
-#include "screen.h"
-#include "search.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/ops.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
 
 /*
  * Registers:
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index 51bb64cf29..93a221fd7e 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_OPS_H
 #define NEOVIM_OPS_H
 
-#include "func_attr.h"
-#include "types.h"
+#include "nvim/func_attr.h"
+#include "nvim/types.h"
 
 /* ops.c */
 int get_op_type(int char1, int char2);
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 89069d96ef..cc612cae08 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -35,46 +35,46 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "option.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "digraph.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hardcopy.h"
-#include "indent_c.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "crypt.h"
-#include "garray.h"
-#include "cursor_shape.h"
-#include "move.h"
-#include "normal.h"
-#include "os_unix.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "spell.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/option.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/digraph.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hardcopy.h"
+#include "nvim/indent_c.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/crypt.h"
+#include "nvim/garray.h"
+#include "nvim/cursor_shape.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 /*
  * The options that are local to a window or buffer have "indir" set to one of
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index cfd6a6d31f..1cb1f2ebca 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OPTION_DEFS_H
 #define NEOVIM_OPTION_DEFS_H
 
-#include "types.h"
+#include "nvim/types.h"
 
 // option_defs.h: definition of global variables for settable options
 
diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c
index 2427db2a14..10766ca76e 100644
--- a/src/nvim/os/channel.c
+++ b/src/nvim/os/channel.c
@@ -3,18 +3,18 @@
 #include <uv.h>
 #include <msgpack.h>
 
-#include "lib/klist.h"
-#include "os/channel.h"
-#include "os/channel_defs.h"
-#include "os/rstream.h"
-#include "os/rstream_defs.h"
-#include "os/wstream.h"
-#include "os/wstream_defs.h"
-#include "os/job.h"
-#include "os/job_defs.h"
-#include "os/msgpack_rpc.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/lib/klist.h"
+#include "nvim/os/channel.h"
+#include "nvim/os/channel_defs.h"
+#include "nvim/os/rstream.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/wstream.h"
+#include "nvim/os/wstream_defs.h"
+#include "nvim/os/job.h"
+#include "nvim/os/job_defs.h"
+#include "nvim/os/msgpack_rpc.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
 typedef struct {
   ChannelProtocol protocol;
diff --git a/src/nvim/os/channel.h b/src/nvim/os/channel.h
index c58e91a0e5..6dd0288279 100644
--- a/src/nvim/os/channel.h
+++ b/src/nvim/os/channel.h
@@ -3,7 +3,7 @@
 
 #include <uv.h>
 
-#include "os/channel_defs.h"
+#include "nvim/os/channel_defs.h"
 
 /// Initializes the module
 void channel_init(void);
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index e6cdb92ea8..0c4f9e7060 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -2,8 +2,8 @@
 
 #include <uv.h>
 
-#include "os/os.h"
-#include "misc2.h"
+#include "nvim/os/os.h"
+#include "nvim/misc2.h"
 
 #ifdef HAVE__NSGETENVIRON
 #include <crt_externs.h>
diff --git a/src/nvim/os/event.c b/src/nvim/os/event.c
index 2c25852778..a89dcdc2ed 100644
--- a/src/nvim/os/event.c
+++ b/src/nvim/os/event.c
@@ -4,17 +4,17 @@
 
 #include <uv.h>
 
-#include "lib/klist.h"
-#include "os/event.h"
-#include "os/input.h"
-#include "os/channel.h"
-#include "os/server.h"
-#include "os/signal.h"
-#include "os/rstream.h"
-#include "os/job.h"
-#include "vim.h"
-#include "memory.h"
-#include "misc2.h"
+#include "nvim/lib/klist.h"
+#include "nvim/os/event.h"
+#include "nvim/os/input.h"
+#include "nvim/os/channel.h"
+#include "nvim/os/server.h"
+#include "nvim/os/signal.h"
+#include "nvim/os/rstream.h"
+#include "nvim/os/job.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
+#include "nvim/misc2.h"
 
 // event will be cleaned up after it gets processed
 #define _destroy_event(x)  // do nothing
diff --git a/src/nvim/os/event.h b/src/nvim/os/event.h
index 5ddca46875..9f1c2e5449 100644
--- a/src/nvim/os/event.h
+++ b/src/nvim/os/event.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "os/event_defs.h"
-#include "os/job_defs.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/job_defs.h"
 
 void event_init(void);
 void event_teardown(void);
diff --git a/src/nvim/os/event_defs.h b/src/nvim/os/event_defs.h
index 428ae50f3e..c5de8b9ece 100644
--- a/src/nvim/os/event_defs.h
+++ b/src/nvim/os/event_defs.h
@@ -1,8 +1,8 @@
 #ifndef NEOVIM_OS_EVENT_DEFS_H
 #define NEOVIM_OS_EVENT_DEFS_H
 
-#include "os/job_defs.h"
-#include "os/rstream_defs.h"
+#include "nvim/os/job_defs.h"
+#include "nvim/os/rstream_defs.h"
 
 typedef enum {
   kEventSignal,
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 89eb4c8691..f2df3e77e8 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -1,11 +1,11 @@
 // fs.c -- filesystem access
 
-#include "os/os.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "path.h"
+#include "nvim/os/os.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/path.h"
 
 static bool is_executable(const char_u *name);
 static bool is_executable_in_path(const char_u *name);
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 4310edd514..a673a6c8b8 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -4,15 +4,15 @@
 
 #include <uv.h>
 
-#include "os/input.h"
-#include "os/event.h"
-#include "os/rstream_defs.h"
-#include "os/rstream.h"
-#include "vim.h"
-#include "ui.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "term.h"
+#include "nvim/os/input.h"
+#include "nvim/os/event.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/rstream.h"
+#include "nvim/vim.h"
+#include "nvim/ui.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/term.h"
 
 #define READ_BUFFER_SIZE 256
 
diff --git a/src/nvim/os/job.c b/src/nvim/os/job.c
index 7940338b70..ac79a5b882 100644
--- a/src/nvim/os/job.c
+++ b/src/nvim/os/job.c
@@ -3,20 +3,20 @@
 
 #include <uv.h>
 
-#include "os/uv_helpers.h"
-#include "os/job.h"
-#include "os/job_defs.h"
-#include "os/rstream.h"
-#include "os/rstream_defs.h"
-#include "os/wstream.h"
-#include "os/wstream_defs.h"
-#include "os/event.h"
-#include "os/event_defs.h"
-#include "os/time.h"
-#include "os/shell.h"
-#include "vim.h"
-#include "memory.h"
-#include "term.h"
+#include "nvim/os/uv_helpers.h"
+#include "nvim/os/job.h"
+#include "nvim/os/job_defs.h"
+#include "nvim/os/rstream.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/wstream.h"
+#include "nvim/os/wstream_defs.h"
+#include "nvim/os/event.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/time.h"
+#include "nvim/os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
+#include "nvim/term.h"
 
 #define EXIT_TIMEOUT 25
 #define MAX_RUNNING_JOBS 100
diff --git a/src/nvim/os/job.h b/src/nvim/os/job.h
index db147f2c24..e73ecc1223 100644
--- a/src/nvim/os/job.h
+++ b/src/nvim/os/job.h
@@ -10,8 +10,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "os/event_defs.h"
-#include "os/rstream_defs.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/rstream_defs.h"
 
 /// Initializes job control resources
 void job_init(void);
diff --git a/src/nvim/os/job_defs.h b/src/nvim/os/job_defs.h
index e98b639154..13bc2f3ab0 100644
--- a/src/nvim/os/job_defs.h
+++ b/src/nvim/os/job_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OS_JOB_DEFS_H
 #define NEOVIM_OS_JOB_DEFS_H
 
-#include "os/rstream_defs.h"
+#include "nvim/os/rstream_defs.h"
 
 typedef struct job Job;
 
diff --git a/src/nvim/os/mem.c b/src/nvim/os/mem.c
index e5549340ff..6c8b49d04e 100644
--- a/src/nvim/os/mem.c
+++ b/src/nvim/os/mem.c
@@ -2,7 +2,7 @@
 
 #include <uv.h>
 
-#include "os/os.h"
+#include "nvim/os/os.h"
 
 uint64_t os_get_total_mem_kib(void) {
   // Convert bytes to KiB.
diff --git a/src/nvim/os/msgpack_rpc.c b/src/nvim/os/msgpack_rpc.c
index 45c0b3aa21..3ce0d7b63c 100644
--- a/src/nvim/os/msgpack_rpc.c
+++ b/src/nvim/os/msgpack_rpc.c
@@ -1,8 +1,8 @@
 #include <msgpack.h>
 
-#include "os/msgpack_rpc.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/os/msgpack_rpc.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
 static bool msgpack_rpc_to_uint16_t(msgpack_object *obj, uint16_t *arg);
 
diff --git a/src/nvim/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h
index 7f754bfca1..8c1c9bcd7b 100644
--- a/src/nvim/os/msgpack_rpc.h
+++ b/src/nvim/os/msgpack_rpc.h
@@ -6,7 +6,7 @@
 
 #include <msgpack.h>
 
-#include "api/defs.h"
+#include "nvim/api/defs.h"
 
 /// Validates the basic structure of the msgpack-rpc call and fills `res`
 /// with the basic response structure.
diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h
index b30872f06d..7a1ecf4e34 100644
--- a/src/nvim/os/os.h
+++ b/src/nvim/os/os.h
@@ -2,7 +2,7 @@
 #define NEOVIM_OS_OS_H
 #include <uv.h>
 
-#include "vim.h"
+#include "nvim/vim.h"
 
 /// Change to the given directory.
 ///
diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c
index e14075c8db..1dc30be582 100644
--- a/src/nvim/os/rstream.c
+++ b/src/nvim/os/rstream.c
@@ -4,13 +4,13 @@
 
 #include <uv.h>
 
-#include "os/uv_helpers.h"
-#include "os/rstream_defs.h"
-#include "os/rstream.h"
-#include "os/event_defs.h"
-#include "os/event.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/os/uv_helpers.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/rstream.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/event.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
 struct rstream {
   uv_buf_t uvbuf;
diff --git a/src/nvim/os/rstream.h b/src/nvim/os/rstream.h
index 5eb3e97f55..ee0098204e 100644
--- a/src/nvim/os/rstream.h
+++ b/src/nvim/os/rstream.h
@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <uv.h>
 
-#include "os/event_defs.h"
-#include "os/rstream_defs.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/rstream_defs.h"
 
 /// Creates a new RStream instance. A RStream encapsulates all the boilerplate
 /// necessary for reading from a libuv stream.
diff --git a/src/nvim/os/server.c b/src/nvim/os/server.c
index bda9602936..e9a11809ae 100644
--- a/src/nvim/os/server.c
+++ b/src/nvim/os/server.c
@@ -5,15 +5,15 @@
 
 #include <uv.h>
 
-#include "os/channel_defs.h"
-#include "os/channel.h"
-#include "os/server.h"
-#include "os/os.h"
-#include "vim.h"
-#include "memory.h"
-#include "message.h"
-#include "fileio.h"
-#include "map.h"
+#include "nvim/os/channel_defs.h"
+#include "nvim/os/channel.h"
+#include "nvim/os/server.h"
+#include "nvim/os/os.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/fileio.h"
+#include "nvim/map.h"
 
 #define MAX_CONNECTIONS 32
 #define ADDRESS_MAX_SIZE 256
diff --git a/src/nvim/os/server.h b/src/nvim/os/server.h
index b9459a81af..0a5e798e8b 100644
--- a/src/nvim/os/server.h
+++ b/src/nvim/os/server.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OS_SERVER_H
 #define NEOVIM_OS_SERVER_H
 
-#include "os/channel_defs.h"
+#include "nvim/os/channel_defs.h"
 
 /// Initializes the module
 void server_init();
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index d14e355d19..420e01b024 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -4,19 +4,19 @@
 
 #include <uv.h>
 
-#include "os/shell.h"
-#include "os/signal.h"
-#include "types.h"
-#include "vim.h"
-#include "message.h"
-#include "ascii.h"
-#include "memory.h"
-#include "term.h"
-#include "misc2.h"
-#include "screen.h"
-#include "memline.h"
-#include "option_defs.h"
-#include "charset.h"
+#include "nvim/os/shell.h"
+#include "nvim/os/signal.h"
+#include "nvim/types.h"
+#include "nvim/vim.h"
+#include "nvim/message.h"
+#include "nvim/ascii.h"
+#include "nvim/memory.h"
+#include "nvim/term.h"
+#include "nvim/misc2.h"
+#include "nvim/screen.h"
+#include "nvim/memline.h"
+#include "nvim/option_defs.h"
+#include "nvim/charset.h"
 
 #define BUFFER_LENGTH 1024
 
diff --git a/src/nvim/os/shell.h b/src/nvim/os/shell.h
index 776c36d384..9e64be35bf 100644
--- a/src/nvim/os/shell.h
+++ b/src/nvim/os/shell.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "types.h"
+#include "nvim/types.h"
 
 // Flags for mch_call_shell() second argument
 typedef enum {
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index d3bedad09c..68a455c5a2 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -2,18 +2,18 @@
 
 #include <uv.h>
 
-#include "types.h"
-#include "vim.h"
-#include "globals.h"
-#include "memline.h"
-#include "eval.h"
-#include "term.h"
-#include "memory.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "os/event_defs.h"
-#include "os/event.h"
-#include "os/signal.h"
+#include "nvim/types.h"
+#include "nvim/vim.h"
+#include "nvim/globals.h"
+#include "nvim/memline.h"
+#include "nvim/eval.h"
+#include "nvim/term.h"
+#include "nvim/memory.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/os/event_defs.h"
+#include "nvim/os/event.h"
+#include "nvim/os/signal.h"
 
 static uv_signal_t sint, spipe, shup, squit, sterm, swinch;
 #ifdef SIGPWR
diff --git a/src/nvim/os/signal.h b/src/nvim/os/signal.h
index 79fdc8d79c..7f4c24c89b 100644
--- a/src/nvim/os/signal.h
+++ b/src/nvim/os/signal.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OS_SIGNAL_H
 #define NEOVIM_OS_SIGNAL_H
 
-#include "os/event_defs.h"
+#include "nvim/os/event_defs.h"
 
 void signal_init(void);
 void signal_stop(void);
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index 1dc7ca68d4..2a607de36d 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -4,9 +4,9 @@
 
 #include <uv.h>
 
-#include "os/time.h"
-#include "vim.h"
-#include "term.h"
+#include "nvim/os/time.h"
+#include "nvim/vim.h"
+#include "nvim/term.h"
 
 static uv_mutex_t delay_mutex;
 static uv_cond_t delay_cond;
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c
index e7b362637b..f4eaf61f74 100644
--- a/src/nvim/os/users.c
+++ b/src/nvim/os/users.c
@@ -2,9 +2,9 @@
 
 #include <uv.h>
 
-#include "os/os.h"
-#include "garray.h"
-#include "misc2.h"
+#include "nvim/os/os.h"
+#include "nvim/garray.h"
+#include "nvim/misc2.h"
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
diff --git a/src/nvim/os/uv_helpers.c b/src/nvim/os/uv_helpers.c
index 62b021de5e..f8371c04c2 100644
--- a/src/nvim/os/uv_helpers.c
+++ b/src/nvim/os/uv_helpers.c
@@ -1,8 +1,8 @@
 #include <uv.h>
 
-#include "os/uv_helpers.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/os/uv_helpers.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
 /// Common structure that will always be assigned to the `data` field of
 /// libuv handles. It has fields for many types of pointers, and allow a single
diff --git a/src/nvim/os/uv_helpers.h b/src/nvim/os/uv_helpers.h
index 9d4cea30b2..eed2c55c3a 100644
--- a/src/nvim/os/uv_helpers.h
+++ b/src/nvim/os/uv_helpers.h
@@ -3,9 +3,9 @@
 
 #include <uv.h>
 
-#include "os/wstream_defs.h"
-#include "os/rstream_defs.h"
-#include "os/job_defs.h"
+#include "nvim/os/wstream_defs.h"
+#include "nvim/os/rstream_defs.h"
+#include "nvim/os/job_defs.h"
 
 /// Gets the RStream instance associated with a libuv handle
 ///
diff --git a/src/nvim/os/wstream.c b/src/nvim/os/wstream.c
index 0b289e80f5..382c95e31d 100644
--- a/src/nvim/os/wstream.c
+++ b/src/nvim/os/wstream.c
@@ -3,11 +3,11 @@
 
 #include <uv.h>
 
-#include "os/uv_helpers.h"
-#include "os/wstream.h"
-#include "os/wstream_defs.h"
-#include "vim.h"
-#include "memory.h"
+#include "nvim/os/uv_helpers.h"
+#include "nvim/os/wstream.h"
+#include "nvim/os/wstream_defs.h"
+#include "nvim/vim.h"
+#include "nvim/memory.h"
 
 struct wstream {
   uv_stream_t *stream;
diff --git a/src/nvim/os/wstream.h b/src/nvim/os/wstream.h
index 4a557ffd9f..ab41991e87 100644
--- a/src/nvim/os/wstream.h
+++ b/src/nvim/os/wstream.h
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <uv.h>
 
-#include "os/wstream_defs.h"
+#include "nvim/os/wstream_defs.h"
 
 /// Creates a new WStream instance. A WStream encapsulates all the boilerplate
 /// necessary for writing to a libuv stream.
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 93cd0272a8..351f9a5837 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -27,34 +27,34 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "os_unix.h"
-#include "buffer.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "path.h"
-#include "screen.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "os/os.h"
-#include "os/time.h"
-#include "os/event.h"
-#include "os/input.h"
-#include "os/shell.h"
-#include "os/signal.h"
-#include "os/job.h"
+#include "nvim/vim.h"
+#include "nvim/os_unix.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/path.h"
+#include "nvim/screen.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
+#include "nvim/os/time.h"
+#include "nvim/os/event.h"
+#include "nvim/os/input.h"
+#include "nvim/os/shell.h"
+#include "nvim/os/signal.h"
+#include "nvim/os/job.h"
 
 #if defined(HAVE_SYS_IOCTL_H)
 # include <sys/ioctl.h>
diff --git a/src/nvim/os_unix.h b/src/nvim/os_unix.h
index 9122ff81aa..e3e255d7c2 100644
--- a/src/nvim/os_unix.h
+++ b/src/nvim/os_unix.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_OS_UNIX_H
 #define NEOVIM_OS_UNIX_H
 
-#include "os/shell.h"
+#include "nvim/os/shell.h"
 
 /* os_unix.c */
 void mch_write(char_u *s, int len);
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 541e1e1724..c6a074378e 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1,31 +1,31 @@
 #include <stdlib.h>
 
-#include "vim.h"
-#include "path.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "file_search.h"
-#include "garray.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "option.h"
-#include "os/os.h"
-#include "os/shell.h"
-#include "os_unix.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "tag.h"
-#include "types.h"
-#include "ui.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/path.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/file_search.h"
+#include "nvim/garray.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/option.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
+#include "nvim/os_unix.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/tag.h"
+#include "nvim/types.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
 
 #define URL_SLASH       1               /* path_is_url() has found "://" */
 #define URL_BACKSLASH   2               /* path_is_url() has found ":\\" */
diff --git a/src/nvim/path.h b/src/nvim/path.h
index 51503c3bdd..ac7cddf11d 100644
--- a/src/nvim/path.h
+++ b/src/nvim/path.h
@@ -1,9 +1,9 @@
 #ifndef NEOVIM_PATH_H
 #define NEOVIM_PATH_H
 
-#include "func_attr.h"
-#include "types.h"
-#include "garray.h"
+#include "nvim/func_attr.h"
+#include "nvim/types.h"
+#include "nvim/garray.h"
 
 /// Return value for the comparison of two files. Also @see path_full_compare.
 typedef enum file_comparison {
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index b64f336d83..aa5f80c8ac 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -2,17 +2,17 @@
 ///
 /// Popup menu (PUM)
 //
-#include "vim.h"
-#include "popupmnu.h"
-#include "charset.h"
-#include "ex_cmds.h"
-#include "memline.h"
-#include "misc2.h"
-#include "move.h"
-#include "option.h"
-#include "screen.h"
-#include "search.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/popupmnu.h"
+#include "nvim/charset.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/memline.h"
+#include "nvim/misc2.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/window.h"
 
 static pumitem_T *pum_array = NULL; // items of displayed pum
 static int pum_size;                // nr of items in "pum_array"
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 94b2b05501..0689b9a12b 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -12,38 +12,38 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "quickfix.h"
-#include "buffer.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/quickfix.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 
 struct dir_stack_T {
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 35d8e30129..d7e675478f 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -45,18 +45,18 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "regexp.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "mark.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
+#include "nvim/vim.h"
+#include "nvim/regexp.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
 
 #ifdef REGEXP_DEBUG
 /* show/save debugging data when BT engine is used */
@@ -6961,7 +6961,7 @@ static regengine_T bt_regengine =
 };
 
 
-#include "regexp_nfa.c"
+#include "nvim/regexp_nfa.c"
 
 static regengine_T nfa_regengine =
 {
diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h
index 5bed390636..c638a7276f 100644
--- a/src/nvim/regexp_defs.h
+++ b/src/nvim/regexp_defs.h
@@ -12,7 +12,7 @@
 #ifndef NEOVIM_REGEXP_DEFS_H
 #define NEOVIM_REGEXP_DEFS_H
 
-#include "pos.h"
+#include "nvim/pos.h"
 
 /*
  * The number of sub-matches is limited to 10.
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 0cd374d91f..9855092ab4 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -4,8 +4,8 @@
  * This file is included in "regexp.c".
  */
 
-#include "misc2.h"
-#include "garray.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
 
 /*
  * Logging of NFA engine.
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index aa021c032e..9043e707c0 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -88,44 +88,44 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "arabic.h"
-#include "screen.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "main.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "menu.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "path.h"
-#include "popupmnu.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "version.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/arabic.h"
+#include "nvim/screen.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/menu.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/popupmnu.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/version.h"
+#include "nvim/window.h"
 
 #define MB_FILLER_CHAR '<'  /* character used when a double-width character
                              * doesn't fit. */
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 891db71549..c20c44b450 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -11,36 +11,36 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "search.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "indent.h"
-#include "main.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/search.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/indent.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
 
 static void save_re_pat(int idx, char_u *pat, int magic);
 static void set_vv_searchforward(void);
diff --git a/src/nvim/sha256.c b/src/nvim/sha256.c
index 0ccb13d763..549448a6e0 100644
--- a/src/nvim/sha256.c
+++ b/src/nvim/sha256.c
@@ -15,8 +15,8 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "sha256.h"
+#include "nvim/vim.h"
+#include "nvim/sha256.h"
 
 static void sha256_process(context_sha256_T *ctx, char_u data[64]);
 
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 5392fe4a70..1071bfb362 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -287,37 +287,37 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "spell.h"
-#include "buffer.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "syntax.h"
-#include "term.h"
-#include "ui.h"
-#include "undo.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/spell.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/undo.h"
+#include "nvim/os/os.h"
 
 #ifndef UNIX            // it's in os_unix_defs.h for Unix
 # include <time.h>      // for time_t
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 72a1f11460..fbad71e3c6 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -1,45 +1,45 @@
 #include <string.h>
 
-#include "vim.h"
-#include "strings.h"
-#include "misc2.h"
-#include "file_search.h"
-#include "blowfish.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "memfile.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "move.h"
-#include "option.h"
-#include "ops.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "spell.h"
-#include "syntax.h"
-#include "tag.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/shell.h"
+#include "nvim/vim.h"
+#include "nvim/strings.h"
+#include "nvim/misc2.h"
+#include "nvim/file_search.h"
+#include "nvim/blowfish.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/memfile.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/ops.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/spell.h"
+#include "nvim/syntax.h"
+#include "nvim/tag.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/shell.h"
 
 /*
  * Copy "string" into newly allocated memory.
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 41128868fc..50ce4ea1c9 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -13,32 +13,32 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "vim.h"
-#include "syntax.h"
-#include "charset.h"
-#include "eval.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "fileio.h"
-#include "fold.h"
-#include "hashtab.h"
-#include "indent_c.h"
-#include "mbyte.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "keymap.h"
-#include "garray.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "regexp.h"
-#include "screen.h"
-#include "term.h"
-#include "ui.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/syntax.h"
+#include "nvim/charset.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/hashtab.h"
+#include "nvim/indent_c.h"
+#include "nvim/mbyte.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/keymap.h"
+#include "nvim/garray.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/os/os.h"
 
 /*
  * Structure that stores information about a highlight group.
@@ -81,9 +81,9 @@ static garray_T highlight_ga;   /* highlight groups for 'highlight' option */
 #define MAX_HL_ID       20000   /* maximum value for a highlight ID. */
 
 /* Flags to indicate an additional string for highlight name completion. */
-static int include_none = 0;    /* when 1 include "None" */
-static int include_default = 0; /* when 1 include "default" */
-static int include_link = 0;    /* when 2 include "link" and "clear" */
+static int include_none = 0;    /* when 1 include "nvim/None" */
+static int include_default = 0; /* when 1 include "nvim/default" */
+static int include_link = 0;    /* when 2 include "nvim/link" and "clear" */
 
 /*
  * The "term", "cterm" and "gui" arguments can be any combination of the
diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h
index f3e7e87c7b..1146ffe6ec 100644
--- a/src/nvim/syntax.h
+++ b/src/nvim/syntax.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_SYNTAX_H
 #define NEOVIM_SYNTAX_H
 
-#include "buffer_defs.h"
+#include "nvim/buffer_defs.h"
 
 typedef int guicolor_T;
 
diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h
index aed2913f81..820b81ee92 100644
--- a/src/nvim/syntax_defs.h
+++ b/src/nvim/syntax_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_SYNTAX_DEFS_H
 #define NEOVIM_SYNTAX_DEFS_H
 
-#include "regexp_defs.h"
+#include "nvim/regexp_defs.h"
 
 /* struct passed to in_id_list() */
 struct sp_syn {
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index bfef5366d9..77a81e7c1c 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -12,39 +12,39 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "tag.h"
-#include "buffer.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "fold.h"
-#include "if_cscope.h"
-#include "mark.h"
-#include "mbyte.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "file_search.h"
-#include "garray.h"
-#include "memory.h"
-#include "move.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "term.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/tag.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/if_cscope.h"
+#include "nvim/mark.h"
+#include "nvim/mbyte.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/file_search.h"
+#include "nvim/garray.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/term.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
 
 /*
  * Structure to hold pointers to various items in a tag line.
diff --git a/src/nvim/term.c b/src/nvim/term.c
index 61dc6f4631..c4f0ee2580 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -24,31 +24,31 @@
 #define tgetstr tgetstr_defined_wrong
 #include <string.h>
 
-#include "vim.h"
-#include "term.h"
-#include "buffer.h"
-#include "charset.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_getln.h"
-#include "fileio.h"
-#include "getchar.h"
-#include "message.h"
-#include "misc2.h"
-#include "garray.h"
-#include "keymap.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "popupmnu.h"
-#include "screen.h"
-#include "syntax.h"
-#include "ui.h"
-#include "window.h"
-#include "os/os.h"
-#include "os/time.h"
+#include "nvim/vim.h"
+#include "nvim/term.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/fileio.h"
+#include "nvim/getchar.h"
+#include "nvim/message.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/keymap.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/popupmnu.h"
+#include "nvim/screen.h"
+#include "nvim/syntax.h"
+#include "nvim/ui.h"
+#include "nvim/window.h"
+#include "nvim/os/os.h"
+#include "nvim/os/time.h"
 
 #ifdef HAVE_TGETENT
 # ifdef HAVE_TERMIOS_H
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 4678416200..a1254ea04f 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -17,27 +17,27 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "ui.h"
-#include "diff.h"
-#include "ex_cmds2.h"
-#include "fold.h"
-#include "main.h"
-#include "mbyte.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "garray.h"
-#include "memory.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "os/time.h"
-#include "os/input.h"
-#include "os/signal.h"
-#include "screen.h"
-#include "term.h"
-#include "window.h"
+#include "nvim/vim.h"
+#include "nvim/ui.h"
+#include "nvim/diff.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/fold.h"
+#include "nvim/main.h"
+#include "nvim/mbyte.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/garray.h"
+#include "nvim/memory.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/os/time.h"
+#include "nvim/os/input.h"
+#include "nvim/os/signal.h"
+#include "nvim/screen.h"
+#include "nvim/term.h"
+#include "nvim/window.h"
 
 void ui_write(char_u *s, int len)
 {
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 47ce8ee8da..d0a2213fe5 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -82,28 +82,28 @@
 
 #include <string.h>
 
-#include "vim.h"
-#include "undo.h"
-#include "edit.h"
-#include "eval.h"
-#include "fileio.h"
-#include "fold.h"
-#include "mark.h"
-#include "memline.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "memory.h"
-#include "crypt.h"
-#include "garray.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "screen.h"
-#include "sha256.h"
-#include "os/os.h"
-#include "os/time.h"
+#include "nvim/vim.h"
+#include "nvim/undo.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/crypt.h"
+#include "nvim/garray.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/screen.h"
+#include "nvim/sha256.h"
+#include "nvim/os/os.h"
+#include "nvim/os/time.h"
 
 static long get_undolevel(void);
 static void u_unch_branch(u_header_T *uhp);
diff --git a/src/nvim/undo.h b/src/nvim/undo.h
index 7f12ba577c..c019d8856e 100644
--- a/src/nvim/undo.h
+++ b/src/nvim/undo.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_UNDO_H
 #define NEOVIM_UNDO_H
 
-#include "undo_defs.h"
+#include "nvim/undo_defs.h"
 
 /* undo.c */
 int u_save_cursor(void);
diff --git a/src/nvim/undo_defs.h b/src/nvim/undo_defs.h
index f1e6c83c32..25097b3160 100644
--- a/src/nvim/undo_defs.h
+++ b/src/nvim/undo_defs.h
@@ -1,7 +1,7 @@
 #ifndef NEOVIM_UNDO_DEFS_H
 #define NEOVIM_UNDO_DEFS_H
 
-#include "pos.h"
+#include "nvim/pos.h"
 
 /* Structure to store info about the Visual area. */
 typedef struct {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d4df349741..9515c4daee 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -10,15 +10,15 @@
 /// All the remarks about older versions have been removed, they are not very
 /// interesting.
 
-#include "vim.h"
-#include "version.h"
-#include "charset.h"
-#include "memline.h"
-#include "message.h"
-#include "misc2.h"
-#include "screen.h"
-
-#include "version_defs.h"
+#include "nvim/vim.h"
+#include "nvim/version.h"
+#include "nvim/charset.h"
+#include "nvim/memline.h"
+#include "nvim/message.h"
+#include "nvim/misc2.h"
+#include "nvim/screen.h"
+
+#include "nvim/version_defs.h"
 
 char *Version = VIM_VERSION_SHORT;
 static char *mediumVersion = VIM_VERSION_MEDIUM;
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 0032032fcf..73ad6c42b8 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -8,7 +8,7 @@
 #ifndef NEOVIM_VIM_H
 # define NEOVIM_VIM_H
 
-#include "types.h"
+#include "nvim/types.h"
 
 /* Included when ported to cmake */
 /* This is needed to replace TRUE/FALSE macros by true/false from c99 */
@@ -45,7 +45,7 @@ Error: configure did not run properly.Check auto/config.log.
 # define VIMPACKAGE     "vim"
 #endif
 
-#include "os_unix_defs.h"       /* bring lots of system header files */
+#include "nvim/os_unix_defs.h"       /* bring lots of system header files */
 
 # ifdef HAVE_LOCALE_H
 #  include <locale.h>
@@ -95,10 +95,10 @@ typedef uint16_t u8char_T;
 typedef uint32_t u8char_T;
 # endif
 
-#include "ascii.h"
-#include "keymap.h"
-#include "term_defs.h"
-#include "macros.h"
+#include "nvim/ascii.h"
+#include "nvim/keymap.h"
+#include "nvim/term_defs.h"
+#include "nvim/macros.h"
 
 #include <errno.h>
 
@@ -419,7 +419,7 @@ enum {
 /* Values for find_ident_under_cursor() */
 #define FIND_IDENT      1       /* find identifier (word) */
 #define FIND_STRING     2       /* find any string (WORD) */
-#define FIND_EVAL       4       /* include "->", "[]" and "." */
+#define FIND_EVAL       4       /* include "nvim/->", "[]" and "." */
 
 /* Values for file_name_in_line() */
 #define FNAME_MESS      1       /* give error message */
@@ -1255,9 +1255,9 @@ enum {
 typedef int VimClipboard;       /* This is required for the prototypes. */
 
 
-#include "buffer_defs.h"         /* buffer and windows */
-#include "ex_cmds_defs.h"        /* Ex command defines */
-#include "proto.h"          /* function prototypes */
+#include "nvim/buffer_defs.h"         /* buffer and windows */
+#include "nvim/ex_cmds_defs.h"        /* Ex command defines */
+#include "nvim/proto.h"          /* function prototypes */
 
 /* This has to go after the include of proto.h, as proto/gui.pro declares
  * functions of these names. The declarations would break if the defines had
@@ -1275,7 +1275,7 @@ typedef int VimClipboard;       /* This is required for the prototypes. */
 
 
 
-#include "globals.h"        /* global variables and messages */
+#include "nvim/globals.h"        /* global variables and messages */
 
 /*
  * Return byte length of character that starts with byte "b".
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 27582184d7..ba4420685f 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6,45 +6,45 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#include "vim.h"
-#include "window.h"
-#include "buffer.h"
-#include "charset.h"
-#include "diff.h"
-#include "edit.h"
-#include "eval.h"
-#include "ex_cmds.h"
-#include "ex_cmds2.h"
-#include "ex_docmd.h"
-#include "ex_eval.h"
-#include "ex_getln.h"
-#include "farsi.h"
-#include "fileio.h"
-#include "fold.h"
-#include "getchar.h"
-#include "hashtab.h"
-#include "main.h"
-#include "mark.h"
-#include "memline.h"
-#include "memory.h"
-#include "message.h"
-#include "misc1.h"
-#include "misc2.h"
-#include "file_search.h"
-#include "garray.h"
-#include "move.h"
-#include "normal.h"
-#include "option.h"
-#include "os_unix.h"
-#include "path.h"
-#include "quickfix.h"
-#include "regexp.h"
-#include "screen.h"
-#include "search.h"
-#include "syntax.h"
-#include "term.h"
-#include "undo.h"
-#include "os/os.h"
+#include "nvim/vim.h"
+#include "nvim/window.h"
+#include "nvim/buffer.h"
+#include "nvim/charset.h"
+#include "nvim/diff.h"
+#include "nvim/edit.h"
+#include "nvim/eval.h"
+#include "nvim/ex_cmds.h"
+#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
+#include "nvim/ex_eval.h"
+#include "nvim/ex_getln.h"
+#include "nvim/farsi.h"
+#include "nvim/fileio.h"
+#include "nvim/fold.h"
+#include "nvim/getchar.h"
+#include "nvim/hashtab.h"
+#include "nvim/main.h"
+#include "nvim/mark.h"
+#include "nvim/memline.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
+#include "nvim/misc1.h"
+#include "nvim/misc2.h"
+#include "nvim/file_search.h"
+#include "nvim/garray.h"
+#include "nvim/move.h"
+#include "nvim/normal.h"
+#include "nvim/option.h"
+#include "nvim/os_unix.h"
+#include "nvim/path.h"
+#include "nvim/quickfix.h"
+#include "nvim/regexp.h"
+#include "nvim/screen.h"
+#include "nvim/search.h"
+#include "nvim/syntax.h"
+#include "nvim/term.h"
+#include "nvim/undo.h"
+#include "nvim/os/os.h"
 
 static void win_init(win_T *newp, win_T *oldp, int flags);
 static void win_init_some(win_T *newp, win_T *oldp);