11 files changed, 15 insertions, 16 deletions
diff --git a/src/string/memcpy_s.c b/src/string/memcpy_s.c
index 366a879c..8bdee520 100644
--- a/src/string/memcpy_s.c
+++ b/src/string/memcpy_s.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "sys/_nonstd_.h"
+#include <string.h>
+#include "_assert.h"
 
 /** copy memory **/
 errno_t memcpy_s(void * restrict s1, rsize_t s1max, const void * restrict s2, rsize_t n)
diff --git a/src/string/memmove_s.c b/src/string/memmove_s.c
index c489161d..69bc7208 100644
--- a/src/string/memmove_s.c
+++ b/src/string/memmove_s.c
@@ -1,6 +1,6 @@
-#include "string.h"
-#include "stdlib.h"
-#include "sys/_nonstd_.h"
+#include <string.h>
+#include <stdlib.h>
+#include "_assert.h"
 
 /** move memory **/
 errno_t memmove_s(void *s1, rsize_t s1max, const void *s2, rsize_t n)
diff --git a/src/string/memset_s.c b/src/string/memset_s.c
index 71e3add1..661b8d8b 100644
--- a/src/string/memset_s.c
+++ b/src/string/memset_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** fill memory **/
 errno_t memset_s(void *s, rsize_t smax, int c, rsize_t n)
diff --git a/src/string/strcat_s.c b/src/string/strcat_s.c
index 14db822d..a8efb98f 100644
--- a/src/string/strcat_s.c
+++ b/src/string/strcat_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** concatenate strings **/
 errno_t strcat_s(char * restrict s1, rsize_t s1max, const char * restrict s2)
diff --git a/src/string/strcpy_s.c b/src/string/strcpy_s.c
index 15e624b4..5522fc26 100644
--- a/src/string/strcpy_s.c
+++ b/src/string/strcpy_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 #include <limits.h>
 
 /** copy string **/
diff --git a/src/string/strerror_s.c b/src/string/strerror_s.c
index 293bb81d..c1e85cac 100644
--- a/src/string/strerror_s.c
+++ b/src/string/strerror_s.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "errno.h"
+#include <string.h>
+#include <errno.h>
 #include "__strerror.h"
 
 /** convert error number to string **/
diff --git a/src/string/strerrorlen_s.c b/src/string/strerrorlen_s.c
index 8b0d99bf..63eaaff6 100644
--- a/src/string/strerrorlen_s.c
+++ b/src/string/strerrorlen_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 size_t strerrorlen_s(errno_t errnum)
 {
diff --git a/src/string/strncat_s.c b/src/string/strncat_s.c
index 2c6d65e6..cbada131 100644
--- a/src/string/strncat_s.c
+++ b/src/string/strncat_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** concatenate bounded string **/
 errno_t strncat_s(char * restrict s1, rsize_t s1max, const char * restrict s2, rsize_t n)
diff --git a/src/string/strncpy_s.c b/src/string/strncpy_s.c
index 39b045a9..a228f360 100644
--- a/src/string/strncpy_s.c
+++ b/src/string/strncpy_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** copy bounded string **/
 errno_t strncpy_s(char * restrict s1, rsize_t s1max, const char * restrict s2, rsize_t n)
diff --git a/src/string/strnlen_s.c b/src/string/strnlen_s.c
index f1221961..9862974f 100644
--- a/src/string/strnlen_s.c
+++ b/src/string/strnlen_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 size_t strnlen_s(const char *s, size_t maxsize)
 {
diff --git a/src/string/strtok_s.c b/src/string/strtok_s.c
index 9742d09c..caeb4c6d 100644
--- a/src/string/strtok_s.c
+++ b/src/string/strtok_s.c
@@ -1,5 +1,4 @@
-#include "string.h"
-#include "stddef.h"
+#include <string.h>
 
 char * strtok_s(char * restrict s1, rsize_t * restrict s1max, const char * restrict s2, char **restrict ptr)
 {