diff --git a/mongoose.h b/mongoose.h
index 9298148f..e43f0c7a 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -539,8 +539,7 @@ static __inline struct tm *localtime_r(time_t *t, struct tm *tm) {
 #endif
 
 
-#include <ctype.h>
-#include <string.h>
+
 
 struct mg_str {
   const char *ptr;  // Pointer to string data
diff --git a/src/str.h b/src/str.h
index 80a995b1..2fee0315 100644
--- a/src/str.h
+++ b/src/str.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <ctype.h>
-#include <string.h>
+#include "arch.h"
 
 struct mg_str {
   const char *ptr;  // Pointer to string data
diff --git a/test/mongoose_custom.h b/test/mongoose_custom.h
index 522be510..7c2c6996 100644
--- a/test/mongoose_custom.h
+++ b/test/mongoose_custom.h
@@ -3,6 +3,7 @@
 
 #define _POSIX_TIMERS
 
+#include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>