Introduce nvim namespace: Fix project-local includes.

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

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".

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
 ///

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 "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 "lib/khash.h"
+#include "nvim/lib/khash.h"
 
 #if defined(ARCH_64)
 typedef uint64_t ptr_int_t;

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 {                                             \

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)
 {

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
 ///

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
 

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.
 ///

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)

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
 ///

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
 

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]))
 

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

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.

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);
 

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);
 

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.

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
 

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;
 

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

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().

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:" */

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;

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,

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);
 

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.

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.
    */

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);

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.

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

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
 

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 */
 

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)

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

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 */

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 "nvim/vim.h"
+#include "nvim/ascii.h"
+#include "nvim/misc2.h"
+#include "nvim/memory.h"
+#include "nvim/path.h"
+#include "nvim/garray.h"
 
-// #include "globals.h"
-#include "memline.h"
+// #include "nvim/globals.h"
+#include "nvim/memline.h"
 
 /// Clear an allocated growing array.
 void ga_clear(garray_T *gap)

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

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:

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

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

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

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);

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);
 

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);

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);

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);

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"
 
 
 /*

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 */
 

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 {                                                    \

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"
 

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

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

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);

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;

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
 ///

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.

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);

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

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
 

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 */
 

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);

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>

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);

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

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();
 

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);
 

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 */

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>

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);

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,

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);

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);

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);

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.

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.

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:

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);

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

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
 

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;

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);

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>

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

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);

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,

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);

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
 

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

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);

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;
 

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.

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);
 

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.

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.
 ///

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;

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.

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

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();

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
 

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 {