5 files changed, 12 insertions, 5 deletions
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 9690d58e0b..493ebffc63 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_BUFFER_H
 #define NVIM_BUFFER_H
 
+#include "nvim/pos.h"  // for linenr_T
+
 /* Values for buflist_getfile() */
 #define GETF_SETMARK    0x01    /* set pcmark before jumping */
 #define GETF_ALT        0x02    /* jumping to alternate file (not buf num) */
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 1edc1bb8c6..4eafa46c10 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -16,6 +16,7 @@
 
 #include <stdbool.h>
 
+#include "nvim/pos.h"      // for linenr_T
 #include "nvim/normal.h"
 
 /*
diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h
index 7523aff792..3f5e295c18 100644
--- a/src/nvim/ex_eval.h
+++ b/src/nvim/ex_eval.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_EX_EVAL_H
 #define NVIM_EX_EVAL_H
 
+#include "nvim/pos.h"           // for linenr_T
+
 /*
  * A list used for saving values of "emsg_silent".  Used by ex_try() to save the
  * value of "emsg_silent" if it was non-zero.  When this is done, the CSF_SILENT
diff --git a/src/nvim/pos.h b/src/nvim/pos.h
index 11f62ad480..7cfb52b283 100644
--- a/src/nvim/pos.h
+++ b/src/nvim/pos.h
@@ -1,6 +1,12 @@
 #ifndef NVIM_POS_H
 #define NVIM_POS_H
 
+typedef long linenr_T;         // line number type
+typedef int colnr_T;           // column number type
+
+#define MAXLNUM (0x7fffffffL)  // maximum (invalid) line number
+#define MAXCOL  (0x7fffffffL)  // maximum column number, 31 bits
+
 /*
  * position in file or buffer
  */
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 1ff49c8011..5cde6e7989 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -9,6 +9,7 @@
 # define NVIM_VIM_H
 
 #include "nvim/types.h"
+#include "nvim/pos.h"  // for linenr_T, MAXCOL, etc...
 
 /* Some defines from the old feature.h */
 #define SESSION_FILE "Session.vim"
@@ -354,13 +355,8 @@ enum {
 #define PERROR(msg) \
   (void) emsg3((char_u *) "%s: %s", (char_u *)msg, (char_u *)strerror(errno))
 
-typedef long linenr_T;                  /* line number type */
-typedef int colnr_T;                    /* column number type */
 typedef unsigned short disptick_T;      /* display tick type */
 
-#define MAXLNUM (0x7fffffffL)           /* maximum (invalid) line number */
-#define MAXCOL (0x7fffffffL)          /* maximum column number, 31 bits */
-
 #define SHOWCMD_COLS 10                 /* columns needed by shown command */
 #define STL_MAX_ITEM 80                 /* max nr of %<flag> in statusline */