4 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 04fe56952f..597864845e 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -440,13 +440,10 @@ set(NO_SINGLE_CHECK_HEADERS
   quickfix.h
   regexp.h
   regexp_defs.h
-  screen.h
-  search.h
   sha256.h
   sign_defs.h
   spell.h
   spellfile.h
-  syntax.h
   syntax_defs.h
   tag.h
   terminal.h
diff --git a/src/nvim/screen.h b/src/nvim/screen.h
index 81a8b9ed4c..17515d4253 100644
--- a/src/nvim/screen.h
+++ b/src/nvim/screen.h
@@ -3,6 +3,10 @@
 
 #include <stdbool.h>
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/pos.h"
+
 /*
  * flags for update_screen()
  * The higher the value, the higher the priority
diff --git a/src/nvim/search.h b/src/nvim/search.h
index d4e40cb287..cb50742990 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -4,6 +4,12 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/eval/typval.h"
+#include "nvim/normal.h"
+#include "nvim/os/time.h"
+
 /* Values for the find_pattern_in_path() function args 'type' and 'action': */
 #define FIND_ANY        1
 #define FIND_DEFINE     2
diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h
index 574e3372e2..bb733ead30 100644
--- a/src/nvim/syntax.h
+++ b/src/nvim/syntax.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include "nvim/buffer_defs.h"
-
+#include "nvim/ex_cmds_defs.h"
 
 /// Terminal highlighting attribute bits.
 /// Attributes above HL_ALL are used for syntax highlighting.