5 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/api/deprecated.c b/src/nvim/api/deprecated.c
index 8398a3a5b1..ff9f8ff18e 100644
--- a/src/nvim/api/deprecated.c
+++ b/src/nvim/api/deprecated.c
@@ -1,4 +1,3 @@
-#include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c
index 61debb70fe..b0053dbb34 100644
--- a/src/nvim/api/options.c
+++ b/src/nvim/api/options.c
@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "nvim/api/keysets.h"
@@ -13,9 +12,10 @@
 #include "nvim/buffer.h"
 #include "nvim/eval/window.h"
 #include "nvim/globals.h"
+#include "nvim/macros.h"
 #include "nvim/memory.h"
 #include "nvim/option.h"
-#include "nvim/types.h"
+#include "nvim/option_vars.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 
diff --git a/src/nvim/api/private/converter.c b/src/nvim/api/private/converter.c
index 1188b04bdc..6e6d054374 100644
--- a/src/nvim/api/private/converter.c
+++ b/src/nvim/api/private/converter.c
@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 
 #include "klib/kvec.h"
 #include "nvim/api/private/converter.h"
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index c898925af8..1483650739 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -2,6 +2,7 @@
 #include <inttypes.h>
 #include <msgpack/pack.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
index 0e6daf6b95..4b16e26103 100644
--- a/src/nvim/api/win_config.c
+++ b/src/nvim/api/win_config.c
@@ -1,5 +1,4 @@
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "klib/kvec.h"