refactor/single-include: window.h, version.h (#6570)

src/nvim/CMakeLists.txt

@@ -456,8 +456,6 @@ set(NO_SINGLE_CHECK_HEADERS
   ui_bridge.h
   undo.h
   undo_defs.h
-  version.h
-  window.h
 )
 foreach(hfile ${NVIM_HEADERS})
   get_test_target(test-includes "${hfile}" relative_path texe)

src/nvim/version.h

@@ -1,6 +1,8 @@
 #ifndef NVIM_VERSION_H
 #define NVIM_VERSION_H
 
+#include "nvim/ex_cmds_defs.h"
+
 // defined in version.c
 extern char* Version;
 extern char* longVersion;

src/nvim/window.h

@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include "nvim/buffer_defs.h"
+
 /* Values for file_name_in_line() */
 #define FNAME_MESS      1       /* give error message */
 #define FNAME_EXP       2       /* expand to path */