move defines from vim.h

buffer.h:
   buflist_getfile() flags
   buflist_new() flags
   buf_freeall() flags
   do_buffer() flags

charset.h:
   chartab[] flags

edit.h:
   in_cinkeys() flags
   change_indent() flags
   beginline() flags
   insertchar() flags
   nv_mousescroll() flags

eval.c
   AUTOLOAD_CHAR

eval.h:
   enum for vimvars[]

ex_cmds.h:
   do_ecmd
   read_viminfo flags

ex_cmds2.h:
   check_changed() flags
   do_source() flags

ex_cmds_defs.h:
   BAD_* flags

ex_docmd.h:
   VALID_PATH VALID_HEAD
   EXMODE_*
   do_cmdline() flags
added include

ex_getln.c
   *_ESC_CHARS definitions

ex_getln.h:
   history table flags - used by add_to_history()

fileio.h:
   readfile() flags
   event_T definition

getchar.h:
   ins_typebuf() flags
   KEYLEN_*

globals.h:
   NO_SCREEN
   NO_BUFFERS
   SEA_* defines
   current_SID flags
   hlf_T enum
   HL_FLAGS
   do_profiling() flags
   schar_T
   sattr_T

indent.h:
   set_indent() flags

macros.h:
   BINARY_FILE_IO flags

mbyte.h:
   MB_BYTE2LEN*
   ENC_*

memfile.h:
   mf_sync() flags

misc1.h:
   open_line() flags

message.h:
   do_dialog() flags
   vim_dialogyesno() flags
   DLG_BUTTON_*

normal.h:
   find_ident_under_cursor() flags

ops.h:
   do_put() flags
   operator ID's

option.h:
   buf_copy_options() flags
   OPT_* flags

os_unix.h:
   mch_nodetype() flags

quickfix.h:
   skip_vimgrep_pat() flags

regexp.h:
   vim_regcomp() flags
   values for reg_do_extmatch

search.h:
   do_search() flags
   search_regcomp() flags
   findmatchlimit() flags

syntax.h:
   HL_* flags
      HL_FOLD is used in buffer_defs.h but nvim
      compiles just fine with the defines in
      syntax.h

tag.h:
   do_tag() flags
   find_tags() flags

term.h:
   TBUFSZ flags
   MOUSE flags

ui.h:
   jump_to_mouse() flags

window.h:
   file_name_in_line() flags
   win_split() flags
   MIN_LINES
   MIN_COLUMNS

Remove VimClipboard which should have been removed with PR #921.

34 files changed, 743 insertions, 718 deletions

diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index e62db843c7..9690d58e0b 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -1,6 +1,34 @@
 #ifndef NVIM_BUFFER_H
 #define NVIM_BUFFER_H
 
+/* Values for buflist_getfile() */
+#define GETF_SETMARK    0x01    /* set pcmark before jumping */
+#define GETF_ALT        0x02    /* jumping to alternate file (not buf num) */
+#define GETF_SWITCH     0x04    /* respect 'switchbuf' settings when jumping */
+
+/* Values for buflist_new() flags */
+#define BLN_CURBUF      1       /* May re-use curbuf for new buffer */
+#define BLN_LISTED      2       /* Put new buffer in buffer list */
+#define BLN_DUMMY       4       /* Allocating dummy buffer */
+
+/* Values for action argument for do_buffer() */
+#define DOBUF_GOTO      0       /* go to specified buffer */
+#define DOBUF_SPLIT     1       /* split window and go to specified buffer */
+#define DOBUF_UNLOAD    2       /* unload specified buffer(s) */
+#define DOBUF_DEL       3       /* delete specified buffer(s) from buflist */
+#define DOBUF_WIPE      4       /* delete specified buffer(s) really */
+
+/* Values for start argument for do_buffer() */
+#define DOBUF_CURRENT   0       /* "count" buffer from current buffer */
+#define DOBUF_FIRST     1       /* "count" buffer from first buffer */
+#define DOBUF_LAST      2       /* "count" buffer from last buffer */
+#define DOBUF_MOD       3       /* "count" mod. buffer from current buffer */
+
+/* flags for buf_freeall() */
+#define BFA_DEL         1       /* buffer is going to be deleted */
+#define BFA_WIPE        2       /* buffer is going to be wiped out */
+#define BFA_KEEP_UNDO   4       /* do not free undo information */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "buffer.h.generated.h"
 #endif
diff --git a/src/nvim/charset.h b/src/nvim/charset.h
index 78d6f2a76c..995ad123ae 100644
--- a/src/nvim/charset.h
+++ b/src/nvim/charset.h
@@ -1,6 +1,14 @@
 #ifndef NVIM_CHARSET_H
 #define NVIM_CHARSET_H
 
+/*
+ * Flags for chartab[].
+ */
+#define CT_CELL_MASK    0x07    /* mask: nr of display cells (1, 2 or 4) */
+#define CT_PRINT_CHAR   0x10    /* flag: set for printable chars */
+#define CT_ID_CHAR      0x20    /* flag: set for ID chars */
+#define CT_FNAME_CHAR   0x40    /* flag: set for file name chars */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "charset.h.generated.h"
 #endif
diff --git a/src/nvim/edit.h b/src/nvim/edit.h
index 52b8ae923b..0289b2c3a6 100644
--- a/src/nvim/edit.h
+++ b/src/nvim/edit.h
@@ -14,6 +14,34 @@
 
 typedef int (*IndentGetter)(void);
 
+/* Values for in_cinkeys() */
+#define KEY_OPEN_FORW   0x101
+#define KEY_OPEN_BACK   0x102
+#define KEY_COMPLETE    0x103   /* end of completion */
+
+/* Values for change_indent() */
+#define INDENT_SET      1       /* set indent */
+#define INDENT_INC      2       /* increase indent */
+#define INDENT_DEC      3       /* decrease indent */
+
+/* flags for beginline() */
+#define BL_WHITE        1       /* cursor on first non-white in the line */
+#define BL_SOL          2       /* use 'sol' option */
+#define BL_FIX          4       /* don't leave cursor on a NUL */
+
+/* flags for insertchar() */
+#define INSCHAR_FORMAT  1       /* force formatting */
+#define INSCHAR_DO_COM  2       /* format comments */
+#define INSCHAR_CTRLV   4       /* char typed just after CTRL-V */
+#define INSCHAR_NO_FEX  8       /* don't use 'formatexpr' */
+#define INSCHAR_COM_LIST 16     /* format comments with list/2nd line indent */
+
+/* direction for nv_mousescroll() and ins_mousescroll() */
+#define MSCR_DOWN       0       /* DOWN must be FALSE */
+#define MSCR_UP         1
+#define MSCR_LEFT       -1
+#define MSCR_RIGHT      -2
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "edit.h.generated.h"
 #endif
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 8db50d6517..5216c7fb28 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -88,6 +88,9 @@
 #define DO_NOT_FREE_CNT 99999   /* refcount for dict or list that should not
                                    be freed. */
 
+#define AUTOLOAD_CHAR '#'       /* Character used as separator in autoload 
+                                   function/variable names. */
+
 /*
  * In a hashtab item "hi_key" points to "di_key" in a dictitem.
  * This avoids adding a pointer to the hashtab item.
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 7daea8fc71..66953faeb7 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -1,6 +1,70 @@
 #ifndef NVIM_EVAL_H
 #define NVIM_EVAL_H
 
+/* Defines for Vim variables.  These must match vimvars[] in eval.c! */
+enum {
+    VV_COUNT,
+    VV_COUNT1,
+    VV_PREVCOUNT,
+    VV_ERRMSG,
+    VV_WARNINGMSG,
+    VV_STATUSMSG,
+    VV_SHELL_ERROR,
+    VV_THIS_SESSION,
+    VV_VERSION,
+    VV_LNUM,
+    VV_TERMRESPONSE,
+    VV_FNAME,
+    VV_LANG,
+    VV_LC_TIME,
+    VV_CTYPE,
+    VV_CC_FROM,
+    VV_CC_TO,
+    VV_FNAME_IN,
+    VV_FNAME_OUT,
+    VV_FNAME_NEW,
+    VV_FNAME_DIFF,
+    VV_CMDARG,
+    VV_FOLDSTART,
+    VV_FOLDEND,
+    VV_FOLDDASHES,
+    VV_FOLDLEVEL,
+    VV_PROGNAME,
+    VV_SEND_SERVER,
+    VV_DYING,
+    VV_EXCEPTION,
+    VV_THROWPOINT,
+    VV_REG,
+    VV_CMDBANG,
+    VV_INSERTMODE,
+    VV_VAL,
+    VV_KEY,
+    VV_PROFILING,
+    VV_FCS_REASON,
+    VV_FCS_CHOICE,
+    VV_BEVAL_BUFNR,
+    VV_BEVAL_WINNR,
+    VV_BEVAL_LNUM,
+    VV_BEVAL_COL,
+    VV_BEVAL_TEXT,
+    VV_SCROLLSTART,
+    VV_SWAPNAME,
+    VV_SWAPCHOICE,
+    VV_SWAPCOMMAND,
+    VV_CHAR,
+    VV_MOUSE_WIN,
+    VV_MOUSE_LNUM,
+    VV_MOUSE_COL,
+    VV_OP,
+    VV_SEARCHFORWARD,
+    VV_HLSEARCH,
+    VV_OLDFILES,
+    VV_WINDOWID,
+    VV_PROGPATH,
+    VV_JOB_DATA,
+    VV_LEN, /* number of v: vars */
+};
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval.h.generated.h"
 #endif
diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h
index 1e7c85b2ba..eabbbd15ac 100644
--- a/src/nvim/ex_cmds.h
+++ b/src/nvim/ex_cmds.h
@@ -3,6 +3,25 @@
 
 #include <stdbool.h>
 
+/* flags for do_ecmd() */
+#define ECMD_HIDE       0x01    /* don't free the current buffer */
+#define ECMD_SET_HELP   0x02    /* set b_help flag of (new) buffer before
+                                   opening file */
+#define ECMD_OLDBUF     0x04    /* use existing buffer if it exists */
+#define ECMD_FORCEIT    0x08    /* ! used in Ex command */
+#define ECMD_ADDBUF     0x10    /* don't edit, just add to buffer list */
+
+/* for lnum argument in do_ecmd() */
+#define ECMD_LASTL      (linenr_T)0     /* use last position in loaded file */
+#define ECMD_LAST       (linenr_T)-1    /* use last position in all files */
+#define ECMD_ONE        (linenr_T)1     /* use first line */
+
+/* flags for read_viminfo() and children */
+#define VIF_WANT_INFO           1       /* load non-mark info */
+#define VIF_WANT_MARKS          2       /* load file marks */
+#define VIF_FORCEIT             4       /* overwrite info already read */
+#define VIF_GET_OLDFILES        8       /* load v:oldfiles */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_cmds.h.generated.h"
 #endif
diff --git a/src/nvim/ex_cmds2.h b/src/nvim/ex_cmds2.h
index 7022591501..0a164cdeb8 100644
--- a/src/nvim/ex_cmds2.h
+++ b/src/nvim/ex_cmds2.h
@@ -7,6 +7,20 @@
 
 typedef void (*DoInRuntimepathCB)(char_u *, void *);
 
+/*
+ * flags for check_changed()
+ */
+#define CCGD_AW         1       /* do autowrite if buffer was changed */
+#define CCGD_MULTWIN    2       /* check also when several wins for the buf */
+#define CCGD_FORCEIT    4       /* ! used */
+#define CCGD_ALLBUF     8       /* may write all buffers */
+#define CCGD_EXCMD      16      /* may suggest using ! */
+
+/* last argument for do_source() */
+#define DOSO_NONE       0
+#define DOSO_VIMRC      1       /* loading vimrc file */
+#define DOSO_GVIMRC     2       /* loading gvimrc file */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_cmds2.h.generated.h"
 #endif
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 55476cd90d..1edc1bb8c6 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -70,6 +70,11 @@
 typedef struct exarg exarg_T;
 #endif
 
+/* behavior for bad character, "++bad=" argument */
+#define BAD_REPLACE     '?'     /* replace it with '?' (default) */
+#define BAD_KEEP        -1      /* leave it */
+#define BAD_DROP        -2      /* erase it */
+
 /*
  * This array maps ex command names to command codes.
  * The order in which command names are listed below is significant --
diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h
index 7825fcd4fb..cd3ef2738d 100644
--- a/src/nvim/ex_docmd.h
+++ b/src/nvim/ex_docmd.h
@@ -1,6 +1,22 @@
 #ifndef NVIM_EX_DOCMD_H
 #define NVIM_EX_DOCMD_H
 
+/* flags for do_cmdline() */
+#define DOCMD_VERBOSE   0x01    /* included command in error message */
+#define DOCMD_NOWAIT    0x02    /* don't call wait_return() and friends */
+#define DOCMD_REPEAT    0x04    /* repeat exec. until getline() returns NULL */
+#define DOCMD_KEYTYPED  0x08    /* don't reset KeyTyped */
+#define DOCMD_EXCRESET  0x10    /* reset exception environment (for debugging)*/
+#define DOCMD_KEEPLINE  0x20    /* keep typed line for repeating with "." */
+
+/* defines for eval_vars() */
+#define VALID_PATH              1
+#define VALID_HEAD              2
+
+/* Values for exmode_active (0 is no exmode) */
+#define EXMODE_NORMAL           1
+#define EXMODE_VIM              2
+
 typedef char_u *(*LineGetter)(int, void *, int);
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 80faecf481..ad0bcdc150 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3002,6 +3002,7 @@ char_u *vim_strsave_fnameescape(char_u *fname, int shell) FUNC_ATTR_NONNULL_RET
 {
   char_u      *p;
 #ifdef BACKSLASH_IN_FILENAME
+#define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
   char_u buf[20];
   int j = 0;
 
@@ -3012,6 +3013,8 @@ char_u *vim_strsave_fnameescape(char_u *fname, int shell) FUNC_ATTR_NONNULL_RET
   buf[j] = NUL;
   p = vim_strsave_escaped(fname, buf);
 #else
+#define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
+#define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
   p = vim_strsave_escaped(fname, shell ? SHELL_ESC_CHARS : PATH_ESC_CHARS);
   if (shell && csh_like_shell()) {
     /* For csh and similar shells need to put two backslashes before '!'.
diff --git a/src/nvim/ex_getln.h b/src/nvim/ex_getln.h
index 6175c30924..2b82f934d5 100644
--- a/src/nvim/ex_getln.h
+++ b/src/nvim/ex_getln.h
@@ -23,6 +23,16 @@
 #define WILD_ESCAPE             128
 #define WILD_ICASE              256
 
+/*
+ * There are four history tables:
+ */
+#define HIST_CMD        0       /* colon commands */
+#define HIST_SEARCH     1       /* search commands */
+#define HIST_EXPR       2       /* expressions (from entering = register) */
+#define HIST_INPUT      3       /* input() lines */
+#define HIST_DEBUG      4       /* debug commands */
+#define HIST_COUNT      5       /* number of history tables */
+
 typedef char_u *(*CompleteListItemGetter)(expand_T *, int);
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index 399d93d77c..7e4ced554d 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -4,6 +4,104 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/os/os.h"
 
+/* Values for readfile() flags */
+#define READ_NEW        0x01    /* read a file into a new buffer */
+#define READ_FILTER     0x02    /* read filter output */
+#define READ_STDIN      0x04    /* read from stdin */
+#define READ_BUFFER     0x08    /* read from curbuf (converting stdin) */
+#define READ_DUMMY      0x10    /* reading into a dummy buffer */
+#define READ_KEEP_UNDO  0x20    /* keep undo info*/
+
+/*
+ * Events for autocommands.
+ */
+typedef enum auto_event {
+  EVENT_BUFADD = 0,             /* after adding a buffer to the buffer list */
+  EVENT_BUFNEW,                 /* after creating any buffer */
+  EVENT_BUFDELETE,              /* deleting a buffer from the buffer list */
+  EVENT_BUFWIPEOUT,             /* just before really deleting a buffer */
+  EVENT_BUFENTER,               /* after entering a buffer */
+  EVENT_BUFFILEPOST,            /* after renaming a buffer */
+  EVENT_BUFFILEPRE,             /* before renaming a buffer */
+  EVENT_BUFLEAVE,               /* before leaving a buffer */
+  EVENT_BUFNEWFILE,             /* when creating a buffer for a new file */
+  EVENT_BUFREADPOST,            /* after reading a buffer */
+  EVENT_BUFREADPRE,             /* before reading a buffer */
+  EVENT_BUFREADCMD,             /* read buffer using command */
+  EVENT_BUFUNLOAD,              /* just before unloading a buffer */
+  EVENT_BUFHIDDEN,              /* just after buffer becomes hidden */
+  EVENT_BUFWINENTER,            /* after showing a buffer in a window */
+  EVENT_BUFWINLEAVE,            /* just after buffer removed from window */
+  EVENT_BUFWRITEPOST,           /* after writing a buffer */
+  EVENT_BUFWRITEPRE,            /* before writing a buffer */
+  EVENT_BUFWRITECMD,            /* write buffer using command */
+  EVENT_CMDWINENTER,            /* after entering the cmdline window */
+  EVENT_CMDWINLEAVE,            /* before leaving the cmdline window */
+  EVENT_COLORSCHEME,            /* after loading a colorscheme */
+  EVENT_COMPLETEDONE,           /* after finishing insert complete */
+  EVENT_FILEAPPENDPOST,         /* after appending to a file */
+  EVENT_FILEAPPENDPRE,          /* before appending to a file */
+  EVENT_FILEAPPENDCMD,          /* append to a file using command */
+  EVENT_FILECHANGEDSHELL,       /* after shell command that changed file */
+  EVENT_FILECHANGEDSHELLPOST,   /* after (not) reloading changed file */
+  EVENT_FILECHANGEDRO,          /* before first change to read-only file */
+  EVENT_FILEREADPOST,           /* after reading a file */
+  EVENT_FILEREADPRE,            /* before reading a file */
+  EVENT_FILEREADCMD,            /* read from a file using command */
+  EVENT_FILETYPE,               /* new file type detected (user defined) */
+  EVENT_FILEWRITEPOST,          /* after writing a file */
+  EVENT_FILEWRITEPRE,           /* before writing a file */
+  EVENT_FILEWRITECMD,           /* write to a file using command */
+  EVENT_FILTERREADPOST,         /* after reading from a filter */
+  EVENT_FILTERREADPRE,          /* before reading from a filter */
+  EVENT_FILTERWRITEPOST,        /* after writing to a filter */
+  EVENT_FILTERWRITEPRE,         /* before writing to a filter */
+  EVENT_FOCUSGAINED,            /* got the focus */
+  EVENT_FOCUSLOST,              /* lost the focus to another app */
+  EVENT_GUIENTER,               /* after starting the GUI */
+  EVENT_GUIFAILED,              /* after starting the GUI failed */
+  EVENT_INSERTCHANGE,           /* when changing Insert/Replace mode */
+  EVENT_INSERTENTER,            /* when entering Insert mode */
+  EVENT_INSERTLEAVE,            /* when leaving Insert mode */
+  EVENT_JOBACTIVITY,            /* when job sent some data */
+  EVENT_MENUPOPUP,              /* just before popup menu is displayed */
+  EVENT_QUICKFIXCMDPOST,        /* after :make, :grep etc. */
+  EVENT_QUICKFIXCMDPRE,         /* before :make, :grep etc. */
+  EVENT_QUITPRE,                /* before :quit */
+  EVENT_SESSIONLOADPOST,        /* after loading a session file */
+  EVENT_STDINREADPOST,          /* after reading from stdin */
+  EVENT_STDINREADPRE,           /* before reading from stdin */
+  EVENT_SYNTAX,                 /* syntax selected */
+  EVENT_TERMCHANGED,            /* after changing 'term' */
+  EVENT_TERMRESPONSE,           /* after setting "v:termresponse" */
+  EVENT_USER,                   /* user defined autocommand */
+  EVENT_VIMENTER,               /* after starting Vim */
+  EVENT_VIMLEAVE,               /* before exiting Vim */
+  EVENT_VIMLEAVEPRE,            /* before exiting Vim and writing .viminfo */
+  EVENT_VIMRESIZED,             /* after Vim window was resized */
+  EVENT_WINENTER,               /* after entering a window */
+  EVENT_WINLEAVE,               /* before leaving a window */
+  EVENT_ENCODINGCHANGED,        /* after changing the 'encoding' option */
+  EVENT_INSERTCHARPRE,          /* before inserting a char */
+  EVENT_CURSORHOLD,             /* cursor in same position for a while */
+  EVENT_CURSORHOLDI,            /* idem, in Insert mode */
+  EVENT_FUNCUNDEFINED,          /* if calling a function which doesn't exist */
+  EVENT_REMOTEREPLY,            /* upon string reception from a remote vim */
+  EVENT_SWAPEXISTS,             /* found existing swap file */
+  EVENT_SOURCEPRE,              /* before sourcing a Vim script */
+  EVENT_SOURCECMD,              /* sourcing a Vim script using command */
+  EVENT_SPELLFILEMISSING,       /* spell file missing */
+  EVENT_CURSORMOVED,            /* cursor was moved */
+  EVENT_CURSORMOVEDI,           /* cursor was moved in Insert mode */
+  EVENT_TABLEAVE,               /* before leaving a tab page */
+  EVENT_TABENTER,               /* after entering a tab page */
+  EVENT_SHELLCMDPOST,           /* after ":!cmd" */
+  EVENT_SHELLFILTERPOST,        /* after ":1,2!cmd", ":w !cmd", ":r !cmd". */
+  EVENT_TEXTCHANGED,            /* text was modified */
+  EVENT_TEXTCHANGEDI,           /* text was modified in Insert mode*/
+  NUM_EVENTS                    /* MUST be the last one */
+} event_T;
+
 /*
  * Struct to save values in before executing autocommands for a buffer that is
  * not the current buffer.
diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
index 802201c4e1..bdf65909b6 100644
--- a/src/nvim/getchar.h
+++ b/src/nvim/getchar.h
@@ -1,6 +1,17 @@
 #ifndef NVIM_GETCHAR_H
 #define NVIM_GETCHAR_H
 
+/* Values for "noremap" argument of ins_typebuf().  Also used for
+ * map->m_noremap and menu->noremap[]. */
+#define REMAP_YES       0       /* allow remapping */
+#define REMAP_NONE      -1      /* no remapping */
+#define REMAP_SCRIPT    -2      /* remap script-local mappings only */
+#define REMAP_SKIP      -3      /* no remapping for first char */
+
+#define KEYLEN_PART_KEY -1      /* keylen value for incomplete key-code */
+#define KEYLEN_PART_MAP -2      /* keylen value for incomplete mapping */
+#define KEYLEN_REMOVED  9999    /* keylen value for removed sequence */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "getchar.h.generated.h"
 #endif
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index ceb0953d14..871674907b 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -18,6 +18,11 @@
  * definition of global variables
  */
 
+/* Values for "starting" */
+#define NO_SCREEN       2       /* no screen updating yet */
+#define NO_BUFFERS      1       /* not all buffers loaded yet */
+/*			0	   not starting anymore */
+
 /*
  * Number of Rows and Columns in the screen.
  * Must be long to be able to use them as options in option.c.
@@ -33,6 +38,12 @@ EXTERN long Rows                        /* nr of rows in the screen */
 EXTERN long Columns INIT(= 80);         /* nr of columns in the screen */
 
 /*
+ * The characters and attributes cached for the screen.
+ */
+typedef char_u schar_T;
+typedef unsigned short sattr_T;
+
+/*
  * The characters that are currently on the screen are kept in ScreenLines[].
  * It is a single block of characters, the size of the screen plus one line.
  * The attributes for those characters are kept in ScreenAttrs[].
@@ -212,6 +223,11 @@ EXTERN int ex_nesting_level INIT(= 0);          /* nesting level */
 EXTERN int debug_break_level INIT(= -1);        /* break below this level */
 EXTERN int debug_did_msg INIT(= FALSE);         /* did "debug mode" message */
 EXTERN int debug_tick INIT(= 0);                /* breakpoint change count */
+
+/* Values for "do_profiling". */
+#define PROF_NONE       0       /* profiling not started */
+#define PROF_YES        1       /* profiling busy */
+#define PROF_PAUSED     2       /* profiling paused */
 EXTERN int do_profiling INIT(= PROF_NONE);      /* PROF_ values */
 
 /*
@@ -297,6 +313,14 @@ EXTERN int may_garbage_collect INIT(= FALSE);
 EXTERN int want_garbage_collect INIT(= FALSE);
 EXTERN int garbage_collect_at_exit INIT(= FALSE);
 
+/* Special values for current_SID. */
+#define SID_MODELINE    -1      /* when using a modeline */
+#define SID_CMDARG      -2      /* for "--cmd" argument */
+#define SID_CARG        -3      /* for "-c" argument */
+#define SID_ENV         -4      /* for sourcing environment variable */
+#define SID_ERROR       -5      /* option was reset because of an error */
+#define SID_NONE        -6      /* don't set scriptID */
+
 /* ID of script being sourced or was sourced to define the current function. */
 EXTERN scid_T current_SID INIT(= 0);
 
@@ -326,6 +350,65 @@ EXTERN int did_check_timestamps INIT(= FALSE);      /* did check timestamps
                                                        recently */
 EXTERN int no_check_timestamps INIT(= 0);       /* Don't check timestamps */
 
+/*
+ * Values for index in highlight_attr[].
+ * When making changes, also update HL_FLAGS below!  And update the default
+ * value of 'highlight' in option.c.
+ */
+typedef enum {
+  HLF_8 = 0         /* Meta & special keys listed with ":map", text that is
+                       displayed different from what it is */
+  , HLF_AT          /* @ and ~ characters at end of screen, characters that
+                       don't really exist in the text */
+  , HLF_D           /* directories in CTRL-D listing */
+  , HLF_E           /* error messages */
+  , HLF_I           /* incremental search */
+  , HLF_L           /* last search string */
+  , HLF_M           /* "--More--" message */
+  , HLF_CM          /* Mode (e.g., "-- INSERT --") */
+  , HLF_N           /* line number for ":number" and ":#" commands */
+  , HLF_CLN         /* current line number */
+  , HLF_R           /* return to continue message and yes/no questions */
+  , HLF_S           /* status lines */
+  , HLF_SNC         /* status lines of not-current windows */
+  , HLF_C           /* column to separate vertically split windows */
+  , HLF_T           /* Titles for output from ":set all", ":autocmd" etc. */
+  , HLF_V           /* Visual mode */
+  , HLF_VNC         /* Visual mode, autoselecting and not clipboard owner */
+  , HLF_W           /* warning messages */
+  , HLF_WM          /* Wildmenu highlight */
+  , HLF_FL          /* Folded line */
+  , HLF_FC          /* Fold column */
+  , HLF_ADD         /* Added diff line */
+  , HLF_CHD         /* Changed diff line */
+  , HLF_DED         /* Deleted diff line */
+  , HLF_TXD         /* Text Changed in diff line */
+  , HLF_CONCEAL     /* Concealed text */
+  , HLF_SC          /* Sign column */
+  , HLF_SPB         /* SpellBad */
+  , HLF_SPC         /* SpellCap */
+  , HLF_SPR         /* SpellRare */
+  , HLF_SPL         /* SpellLocal */
+  , HLF_PNI         /* popup menu normal item */
+  , HLF_PSI         /* popup menu selected item */
+  , HLF_PSB         /* popup menu scrollbar */
+  , HLF_PST         /* popup menu scrollbar thumb */
+  , HLF_TP          /* tabpage line */
+  , HLF_TPS         /* tabpage line selected */
+  , HLF_TPF         /* tabpage line filler */
+  , HLF_CUC         /* 'cursurcolumn' */
+  , HLF_CUL         /* 'cursurline' */
+  , HLF_MC          /* 'colorcolumn' */
+  , HLF_COUNT       /* MUST be the last one */
+} hlf_T;
+
+/* The HL_FLAGS must be in the same order as the HLF_ enums!
+ * When changing this also adjust the default for 'highlight'. */
+#define HL_FLAGS {'8', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', 'N', 'r', 's', \
+                  'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', 'A', 'C', 'D', \
+                  'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', 'x', 'X', '*', \
+                  '#', '_', '!', '.', 'o'}
+
 EXTERN int highlight_attr[HLF_COUNT];       /* Highl. attr for each context. */
 # define USER_HIGHLIGHT
 #ifdef USER_HIGHLIGHT
@@ -728,6 +811,12 @@ EXTERN int msg_silent INIT(= 0);        /* don't print messages */
 EXTERN int emsg_silent INIT(= 0);       /* don't print error messages */
 EXTERN int cmd_silent INIT(= FALSE);      /* don't echo the command line */
 
+/* Values for swap_exists_action: what to do when swap file already exists */
+#define SEA_NONE        0       /* don't use dialog */
+#define SEA_DIALOG      1       /* use dialog when possible */
+#define SEA_QUIT        2       /* quit editing the file */
+#define SEA_RECOVER     3       /* recover the file */
+
 #define HAS_SWAP_EXISTS_ACTION
 EXTERN int swap_exists_action INIT(= SEA_NONE);
 /* For dialog when swap file already
diff --git a/src/nvim/indent.h b/src/nvim/indent.h
index 26773a62d8..6552157d20 100644
--- a/src/nvim/indent.h
+++ b/src/nvim/indent.h
@@ -3,6 +3,11 @@
 
 #include "nvim/vim.h"
 
+/* flags for set_indent() */
+#define SIN_CHANGED     1       /* call changed_bytes() when line changed */
+#define SIN_INSERT      2       /* insert indent before existing text */
+#define SIN_UNDO        4       /* save line for undo before changing it */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "indent.h.generated.h"
 #endif
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 93ae72987c..fab4f548c8 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -97,6 +97,16 @@
  */
 #define vim_isbreak(c) (breakat_flags[(char_u)(c)])
 
+#ifdef BINARY_FILE_IO
+# define WRITEBIN   "wb"        /* no CR-LF translation */
+# define READBIN    "rb"
+# define APPENDBIN  "ab"
+#else
+# define WRITEBIN   "w"
+# define READBIN    "r"
+# define APPENDBIN  "a"
+#endif
+
 #  define mch_fopen(n, p)       fopen((n), (p))
 #   define mch_open(n, m, p)    open((n), (m), (p))
 
diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h
index d52f174152..0cfe2c4bab 100644
--- a/src/nvim/mbyte.h
+++ b/src/nvim/mbyte.h
@@ -3,6 +3,31 @@
 
 #include <stdbool.h>
 
+/*
+ * Return byte length of character that starts with byte "b".
+ * Returns 1 for a single-byte character.
+ * MB_BYTE2LEN_CHECK() can be used to count a special key as one byte.
+ * Don't call MB_BYTE2LEN(b) with b < 0 or b > 255!
+ */
+#define MB_BYTE2LEN(b)         mb_bytelen_tab[b]
+#define MB_BYTE2LEN_CHECK(b)   (((b) < 0 || (b) > 255) ? 1 : mb_bytelen_tab[b])
+
+/* properties used in enc_canon_table[] (first three mutually exclusive) */
+#define ENC_8BIT       0x01
+#define ENC_DBCS       0x02
+#define ENC_UNICODE    0x04
+
+#define ENC_ENDIAN_B   0x10        /* Unicode: Big endian */
+#define ENC_ENDIAN_L   0x20        /* Unicode: Little endian */
+
+#defi