Introduce nvim namespace: Fix project-local includes.

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

29 files changed, 132 insertions, 132 deletions

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.