2 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 8a407a4513..4777e00a76 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -20,6 +20,11 @@
 #include "nvim/ascii.h"
 #include "nvim/pos.h"
 #include "nvim/charset.h"
+#include "nvim/garray.h"
+#include "nvim/gettext.h"
+#include "nvim/macros.h"
+#include "nvim/mbyte.h"
+#include "nvim/message.h"
 // TODO(ZyX-I): Move line_breakcheck out of misc1
 #include "nvim/misc1.h"  // For line_breakcheck
 
diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index 3b41314b46..791b191009 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -3,9 +3,11 @@
 
 #include <limits.h>
 #include <stddef.h>
-#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
+#include <stdbool.h>
 
+#include "nvim/types.h"
 #include "nvim/hashtab.h"
 #include "nvim/garray.h"
 #include "nvim/mbyte.h"