6 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 493ebffc63..a8220c65a0 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -2,6 +2,7 @@
 #define NVIM_BUFFER_H
 
 #include "nvim/pos.h"  // for linenr_T
+#include "nvim/ex_cmds_defs.h"  // for exarg_T
 
 /* Values for buflist_getfile() */
 #define GETF_SETMARK    0x01    /* set pcmark before jumping */
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 9d81388a3c..e827642d8a 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -2,10 +2,12 @@
 #define NVIM_BUFFER_DEFS_H
 
 #include <stdbool.h>
+// for FILE
+#include <stdio.h>
 
 // for garray_T
 #include "nvim/garray.h"
-// for pos_T and lpos_T
+// for pos_T, lpos_T and linenr_T
 #include "nvim/pos.h"
 // for the number window-local and buffer-local options
 #include "nvim/option_defs.h"
diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h
index 3f5e295c18..30871c7711 100644
--- a/src/nvim/ex_eval.h
+++ b/src/nvim/ex_eval.h
@@ -2,6 +2,7 @@
 #define NVIM_EX_EVAL_H
 
 #include "nvim/pos.h"           // for linenr_T
+#include "nvim/ex_cmds_defs.h"  // for exarg_T
 
 /*
  * A list used for saving values of "emsg_silent".  Used by ex_try() to save the
diff --git a/src/nvim/message.h b/src/nvim/message.h
index f04005a7ad..c620597f33 100644
--- a/src/nvim/message.h
+++ b/src/nvim/message.h
@@ -2,6 +2,7 @@
 #define NVIM_MESSAGE_H
 
 #include <stdbool.h>
+#include "nvim/eval_defs.h"  // for typval_T
 
 /*
  * Types of dialogs passed to do_dialog().
diff --git a/src/nvim/normal.h b/src/nvim/normal.h
index 341da6d473..599f4771b9 100644
--- a/src/nvim/normal.h
+++ b/src/nvim/normal.h
@@ -2,6 +2,7 @@
 #define NVIM_NORMAL_H
 
 #include "nvim/pos.h"
+#include "nvim/buffer_defs.h"  // for win_T
 
 /* Values for find_ident_under_cursor() */
 #define FIND_IDENT      1       /* find identifier (word) */
diff --git a/src/nvim/undo_defs.h b/src/nvim/undo_defs.h
index 6263dd91d4..2579f13b93 100644
--- a/src/nvim/undo_defs.h
+++ b/src/nvim/undo_defs.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_UNDO_DEFS_H
 #define NVIM_UNDO_DEFS_H
 
+#include <time.h>  // for time_t
+
 #include "nvim/pos.h"
 
 /* Structure to store info about the Visual area. */