5 files changed, 8 insertions, 5 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index b03509a313..7de7168d62 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -17,7 +17,6 @@
 #include "nvim/charset.h"
 #include "nvim/cmdexpand.h"
 #include "nvim/eval.h"
-#include "nvim/ex_cmds_defs.h"
 #include "nvim/gettext.h"
 #include "nvim/globals.h"
 #include "nvim/log.h"
@@ -29,7 +28,6 @@
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
 #include "nvim/version.h"
 #include "nvim/vim.h"
 
diff --git a/src/nvim/os/lang.c b/src/nvim/os/lang.c
index 652b851903..c3958cb3f2 100644
--- a/src/nvim/os/lang.c
+++ b/src/nvim/os/lang.c
@@ -5,6 +5,7 @@
 # define Boolean CFBoolean  // Avoid conflict with API's Boolean
 # define FileInfo CSFileInfo  // Avoid conflict with API's Fileinfo
 # include <CoreServices/CoreServices.h>
+
 # undef Boolean
 # undef FileInfo
 #endif
@@ -17,6 +18,7 @@
 #include "nvim/ascii.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
+#include "nvim/cmdexpand_defs.h"
 #include "nvim/eval.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/garray.h"
@@ -30,7 +32,6 @@
 #include "nvim/os/shell.h"
 #include "nvim/path.h"
 #include "nvim/profile.h"
-#include "nvim/types.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/os/lang.h b/src/nvim/os/lang.h
index bb1ebfb721..ad64b38916 100644
--- a/src/nvim/os/lang.h
+++ b/src/nvim/os/lang.h
@@ -1,6 +1,7 @@
 #ifndef NVIM_OS_LANG_H
 #define NVIM_OS_LANG_H
 
+#include "nvim/cmdexpand_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/types.h"
 
diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h
index a7496130cc..006dfbfc04 100644
--- a/src/nvim/os/os.h
+++ b/src/nvim/os/os.h
@@ -4,9 +4,12 @@
 #include <stdbool.h>
 #include <uv.h>
 
+#include "nvim/buffer_defs.h"
+#include "nvim/cmdexpand_defs.h"
+#include "nvim/garray.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/stdpaths_defs.h"
-#include "nvim/vim.h"
+#include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/env.h.generated.h"
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c
index 411ba91fa7..b23d2b7b13 100644
--- a/src/nvim/os/users.c
+++ b/src/nvim/os/users.c
@@ -10,10 +10,10 @@
 
 #include "auto/config.h"
 #include "nvim/ascii.h"
+#include "nvim/cmdexpand_defs.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
 #include "nvim/os/os.h"
-#include "nvim/types.h"
 #include "nvim/vim.h"
 #ifdef HAVE_PWD_FUNCS
 # include <pwd.h>