diff --git a/include/mimalloc-types.h b/include/mimalloc-types.h
index 2f16020f..613aae82 100644
--- a/include/mimalloc-types.h
+++ b/include/mimalloc-types.h
@@ -8,7 +8,6 @@ terms of the MIT license. A copy of the license can be found in the file
 #ifndef MIMALLOC_TYPES_H
 #define MIMALLOC_TYPES_H
 
-#include <stdlib.h>   // size_t etc.
 #include <stddef.h>   // ptrdiff_t
 #include <stdint.h>   // uintptr_t, uint16_t, etc
 
diff --git a/include/mimalloc.h b/include/mimalloc.h
index ec09f119..e8a40ab6 100644
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -69,7 +69,6 @@ terms of the MIT license. A copy of the license can be found in the file
 // Includes
 // ------------------------------------------------------
 
-#include <stdlib.h>     // size_t, malloc etc.
 #include <stdbool.h>    // bool
 #include <stdio.h>      // FILE
 
diff --git a/src/alloc-aligned.c b/src/alloc-aligned.c
index 3ef93c83..4fcf433a 100644
--- a/src/alloc-aligned.c
+++ b/src/alloc-aligned.c
@@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc.h"
 #include "mimalloc-internal.h"
 
-#include <string.h>  // memset
+#include <string.h>  // memset, memcpy
 
 // ------------------------------------------------------
 // Aligned Allocation
diff --git a/src/alloc.c b/src/alloc.c
index d5050b03..a5078dc5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -8,7 +8,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc-internal.h"
 #include "mimalloc-atomic.h"
 
-#include <string.h>  // memset
+#include <string.h>  // memset, memcpy, strlen
+#include <stdlib.h>  // malloc, exit
 
 #define MI_IN_ALLOC_C
 #include "alloc-override.c"
@@ -463,7 +464,7 @@ char* mi_heap_realpath(mi_heap_t* heap, const char* fname, char* resolved_name)
   }
 }
 #else
-#include <unistd.h>
+#include <unistd.h>  // pathconf
 static size_t mi_path_max() {
   static size_t path_max = 0;
   if (path_max <= 0) {
diff --git a/src/init.c b/src/init.c
index 5b2d3c8e..12dcd5dc 100644
--- a/src/init.c
+++ b/src/init.c
@@ -7,7 +7,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc.h"
 #include "mimalloc-internal.h"
 
-#include <string.h>  // memcpy
+#include <string.h>  // memcpy, memset
+#include <stdlib.h>  // atexit
 
 // Empty page used to initialize the small free pages array
 const mi_page_t _mi_page_empty = {
diff --git a/src/options.c b/src/options.c
index 0f588740..02ca4800 100644
--- a/src/options.c
+++ b/src/options.c
@@ -8,7 +8,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc-internal.h"
 
 #include <stdio.h>
-#include <string.h> // strcmp
+#include <stdlib.h> // strtol
+#include <string.h> // strncpy, strncat, strlen, strstr
 #include <ctype.h>  // toupper
 #include <stdarg.h>
 
diff --git a/src/os.c b/src/os.c
index f9705992..950676ed 100644
--- a/src/os.c
+++ b/src/os.c
@@ -11,7 +11,7 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc.h"
 #include "mimalloc-internal.h"
 
-#include <string.h>  // memset
+#include <string.h>  // strerror
 #include <errno.h>
 
 #if defined(_WIN32)
diff --git a/src/page.c b/src/page.c
index fc7c4f01..1ac026f3 100644
--- a/src/page.c
+++ b/src/page.c
@@ -15,8 +15,6 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "mimalloc-internal.h"
 #include "mimalloc-atomic.h"
 
-#include <string.h>  // memset, memcpy
-
 /* -----------------------------------------------------------
   Definition of page queues for each block size
 ----------------------------------------------------------- */