diff --git a/include/libmes-mini.h b/include/mes/lib-mini.h
similarity index 95%
rename from include/libmes-mini.h
rename to include/mes/lib-mini.h
index f93c9015..ed141a92 100644
--- a/include/libmes-mini.h
+++ b/include/mes/lib-mini.h
@@ -18,8 +18,8 @@
* along with GNU Mes. If not, see .
*/
-#ifndef __MES_LIBMES_MINI_H
-#define __MES_LIBMES_MINI_H
+#ifndef __MES_LIB_MINI_H
+#define __MES_LIB_MINI_H
#if !WITH_GLIBC
@@ -85,7 +85,8 @@ int oputs (char const* s);
#if !WITH_GLIBC
size_t strlen (char const* s);
+ssize_t _write ();
ssize_t write (int filedes, void const *buffer, size_t size);
#endif // !WITH_GLIBC
-#endif //__MES_LIBMES_MINI_H
+#endif //__MES_LIB_MINI_H
diff --git a/include/libmes.h b/include/mes/lib.h
similarity index 94%
rename from include/libmes.h
rename to include/mes/lib.h
index e15a0e40..71fb8a17 100644
--- a/include/libmes.h
+++ b/include/mes/lib.h
@@ -18,10 +18,10 @@
* along with GNU Mes. If not, see .
*/
-#ifndef __MES_LIBMES_H
-#define __MES_LIBMES_H
+#ifndef __MES_LIB_H
+#define __MES_LIB_H
-#include
+#include
#if WITH_GLIBC
int mes_open (char const *file_name, int flags, ...);
@@ -56,4 +56,4 @@ int oputc (int c);
int oputs (char const* s);
char *search_path (char const *file_name);
-#endif //__MES_LIBMES_H
+#endif //__MES_LIB_H
diff --git a/include/stdio.h b/include/stdio.h
index 9395d39b..b305fe46 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -20,7 +20,7 @@
#ifndef __MES_STDIO_H
#define __MES_STDIO_H 1
-#include
+#include
#if WITH_GLIBC
#ifndef _GNU_SOURCE
diff --git a/lib/abtol.c b/lib/abtol.c
index 25b3afa6..2fc3d607 100644
--- a/lib/abtol.c
+++ b/lib/abtol.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
long
abtol (char const **p, int base)
diff --git a/lib/ctype/isdigit.c b/lib/ctype/isdigit.c
index b29b1728..71798cc2 100644
--- a/lib/ctype/isdigit.c
+++ b/lib/ctype/isdigit.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
isdigit (int c)
diff --git a/lib/ctype/isspace.c b/lib/ctype/isspace.c
index 2ac7a47c..50f6e337 100644
--- a/lib/ctype/isspace.c
+++ b/lib/ctype/isspace.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
isspace (int c)
diff --git a/lib/ctype/isxdigit.c b/lib/ctype/isxdigit.c
index 9a3bfe6a..54b28571 100644
--- a/lib/ctype/isxdigit.c
+++ b/lib/ctype/isxdigit.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
isxdigit (int c)
diff --git a/lib/libc.c b/lib/libc.c
index b37fc9bd..27abb994 100644
--- a/lib/libc.c
+++ b/lib/libc.c
@@ -21,10 +21,10 @@
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include
#include
#include
diff --git a/lib/libmes.c b/lib/libmes.c
index 49974b67..d002fa16 100644
--- a/lib/libmes.c
+++ b/lib/libmes.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
#include
diff --git a/lib/libtcc1.c b/lib/libtcc1.c
index 1ae0fa69..64e2ce4c 100644
--- a/lib/libtcc1.c
+++ b/lib/libtcc1.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
double
__divdi3 (double a, double b)
diff --git a/lib/linux/libc.c b/lib/linux/libc.c
index 7f6a1fc7..b08db6ba 100644
--- a/lib/linux/libc.c
+++ b/lib/linux/libc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/linux/x86-mes-gcc/crt0.c b/lib/linux/x86-mes-gcc/crt0.c
index 668cea15..8f46282f 100644
--- a/lib/linux/x86-mes-gcc/crt0.c
+++ b/lib/linux/x86-mes-gcc/crt0.c
@@ -23,7 +23,7 @@
// instead of calling main, it seems to call either _main or ___main,
// let's try _main first
-#include
+#include
int _main (int argc, char *argv[]);
void
diff --git a/lib/linux/x86-mes-gcc/crt1.c b/lib/linux/x86-mes-gcc/crt1.c
index 859469fe..a1c721e2 100644
--- a/lib/linux/x86-mes-gcc/crt1.c
+++ b/lib/linux/x86-mes-gcc/crt1.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
//int main (int argc, char *argv[], char *envp[]);
void
diff --git a/lib/linux/x86-mes/crt1.c b/lib/linux/x86-mes/crt1.c
index a93b519b..e4ef3c38 100644
--- a/lib/linux/x86-mes/crt1.c
+++ b/lib/linux/x86-mes/crt1.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include "libmes-mini.h"
+#include "mes/lib-mini.h"
int main (int argc, char *argv[], char *envp[]);
diff --git a/lib/linux/x86_64-mes-gcc/crt0.c b/lib/linux/x86_64-mes-gcc/crt0.c
index d744d90c..b0fd0357 100644
--- a/lib/linux/x86_64-mes-gcc/crt0.c
+++ b/lib/linux/x86_64-mes-gcc/crt0.c
@@ -23,7 +23,7 @@
// instead of calling main, it seems to call either _main or ___main,
// let's try _main first
-#include
+#include
int main (int argc, char *argv[]);
// gcc x86_64 calling convention:
diff --git a/lib/linux/x86_64-mes-gcc/crt1.c b/lib/linux/x86_64-mes-gcc/crt1.c
index 89af8e4c..ed4cacef 100644
--- a/lib/linux/x86_64-mes-gcc/crt1.c
+++ b/lib/linux/x86_64-mes-gcc/crt1.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
// int main (int argc, char *argv[]);
// gcc x86_64 calling convention:
diff --git a/lib/linux/x86_64-mes/crt1.c b/lib/linux/x86_64-mes/crt1.c
index d3bce233..6449a99d 100644
--- a/lib/linux/x86_64-mes/crt1.c
+++ b/lib/linux/x86_64-mes/crt1.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include "libmes-mini.h"
+#include "mes/lib-mini.h"
int main (int argc, char *argv[], char *envp[]);
int
diff --git a/lib/mes/abtol.c b/lib/mes/abtol.c
index e0c30f42..d16a6ea4 100644
--- a/lib/mes/abtol.c
+++ b/lib/mes/abtol.c
@@ -18,7 +18,8 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
+#include
long
abtol (char const **p, int base)
diff --git a/lib/mes/eputc.c b/lib/mes/eputc.c
index 7164fd74..05fc9837 100644
--- a/lib/mes/eputc.c
+++ b/lib/mes/eputc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
eputc (int c)
diff --git a/lib/mes/eputs.c b/lib/mes/eputs.c
index db7b26d5..bc3997af 100644
--- a/lib/mes/eputs.c
+++ b/lib/mes/eputs.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
eputs (char const* s)
diff --git a/lib/mes/fdgetc.c b/lib/mes/fdgetc.c
index 09bca8b6..373474c6 100644
--- a/lib/mes/fdgetc.c
+++ b/lib/mes/fdgetc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/mes/fdputc.c b/lib/mes/fdputc.c
index 14f4f6f6..bd1eda43 100644
--- a/lib/mes/fdputc.c
+++ b/lib/mes/fdputc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
fdputc (int c, int fd)
diff --git a/lib/mes/fdputs.c b/lib/mes/fdputs.c
index 472799cd..784fc0c5 100644
--- a/lib/mes/fdputs.c
+++ b/lib/mes/fdputs.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
fdputs (char const* s, int fd)
diff --git a/lib/mes/fdungetc.c b/lib/mes/fdungetc.c
index 06d59b28..05d28662 100644
--- a/lib/mes/fdungetc.c
+++ b/lib/mes/fdungetc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
fdungetc (int c, int fd)
diff --git a/lib/mes/itoa.c b/lib/mes/itoa.c
index 95b6d034..b274ac09 100644
--- a/lib/mes/itoa.c
+++ b/lib/mes/itoa.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
itoa (int x)
diff --git a/lib/mes/ltoa.c b/lib/mes/ltoa.c
index 8b91566e..f4829a80 100644
--- a/lib/mes/ltoa.c
+++ b/lib/mes/ltoa.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
ltoa (long x)
diff --git a/lib/mes/ltoab.c b/lib/mes/ltoab.c
index 7aee68cc..56112307 100644
--- a/lib/mes/ltoab.c
+++ b/lib/mes/ltoab.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
ltoab (long x, int base)
diff --git a/lib/mes/ntoab.c b/lib/mes/ntoab.c
index 5fcfe5ac..26e60fe9 100644
--- a/lib/mes/ntoab.c
+++ b/lib/mes/ntoab.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
ntoab (long x, int base, int signed_p)
diff --git a/lib/mes/oputc.c b/lib/mes/oputc.c
index ba47365a..95fc1648 100644
--- a/lib/mes/oputc.c
+++ b/lib/mes/oputc.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
oputc (int c)
diff --git a/lib/mes/oputs.c b/lib/mes/oputs.c
index 3f5f4905..82731528 100644
--- a/lib/mes/oputs.c
+++ b/lib/mes/oputs.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
oputs (char const* s)
diff --git a/lib/mes/search-path.c b/lib/mes/search-path.c
index 7db59578..035ac6c1 100644
--- a/lib/mes/search-path.c
+++ b/lib/mes/search-path.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
search_path (char const *file_name)
diff --git a/lib/mes/ultoa.c b/lib/mes/ultoa.c
index c3099d3e..3319296b 100644
--- a/lib/mes/ultoa.c
+++ b/lib/mes/ultoa.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
ultoa (unsigned long x)
diff --git a/lib/mes/utoa.c b/lib/mes/utoa.c
index 742e04ce..63370bfc 100644
--- a/lib/mes/utoa.c
+++ b/lib/mes/utoa.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
char *
utoa (unsigned x)
diff --git a/lib/posix/execl.c b/lib/posix/execl.c
index 2142acde..e5f89c1b 100644
--- a/lib/posix/execl.c
+++ b/lib/posix/execl.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/posix/execvp.c b/lib/posix/execvp.c
index 15d84604..74476d8a 100644
--- a/lib/posix/execvp.c
+++ b/lib/posix/execvp.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stdio/fopen.c b/lib/stdio/fopen.c
index 2a73ddd3..05ec8bbf 100644
--- a/lib/stdio/fopen.c
+++ b/lib/stdio/fopen.c
@@ -19,7 +19,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
//#if __GNUC__ && __x86_64__
diff --git a/lib/stdio/fread.c b/lib/stdio/fread.c
index 593f8ded..58a2c4c2 100644
--- a/lib/stdio/fread.c
+++ b/lib/stdio/fread.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stdio/fseek.c b/lib/stdio/fseek.c
index f53c7b72..281bfca0 100644
--- a/lib/stdio/fseek.c
+++ b/lib/stdio/fseek.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stdio/fwrite.c b/lib/stdio/fwrite.c
index 7fc163de..533f3fd3 100644
--- a/lib/stdio/fwrite.c
+++ b/lib/stdio/fwrite.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
size_t
diff --git a/lib/stdio/vfprintf.c b/lib/stdio/vfprintf.c
index 1e3cc3ea..2b251246 100644
--- a/lib/stdio/vfprintf.c
+++ b/lib/stdio/vfprintf.c
@@ -18,6 +18,7 @@
* along with GNU Mes. If not, see .
*/
+#include
#include
#include
#include
diff --git a/lib/stdio/vsnprintf.c b/lib/stdio/vsnprintf.c
index e949a3f5..2021227e 100644
--- a/lib/stdio/vsnprintf.c
+++ b/lib/stdio/vsnprintf.c
@@ -18,8 +18,9 @@
* along with GNU Mes. If not, see .
*/
-#include
-#include
+#include
+#include
+#include
int
vsnprintf (char *str, size_t size, char const* format, va_list ap)
diff --git a/lib/stdio/vsscanf.c b/lib/stdio/vsscanf.c
index e1604448..23aa3053 100644
--- a/lib/stdio/vsscanf.c
+++ b/lib/stdio/vsscanf.c
@@ -18,6 +18,7 @@
* along with GNU Mes. If not, see .
*/
+#include
#include
#include
diff --git a/lib/stdlib/atoi.c b/lib/stdlib/atoi.c
index cc02dca4..3f113723 100644
--- a/lib/stdlib/atoi.c
+++ b/lib/stdlib/atoi.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
atoi (char const *s)
diff --git a/lib/stdlib/exit.c b/lib/stdlib/exit.c
index 29be6d12..252ecf92 100644
--- a/lib/stdlib/exit.c
+++ b/lib/stdlib/exit.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
void (*__call_at_exit) (void);
diff --git a/lib/stdlib/puts.c b/lib/stdlib/puts.c
index be51f47b..d7ada8b7 100644
--- a/lib/stdlib/puts.c
+++ b/lib/stdlib/puts.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
puts (char const* s)
diff --git a/lib/stdlib/strtol.c b/lib/stdlib/strtol.c
index 3a5f7a14..0c592b2d 100644
--- a/lib/stdlib/strtol.c
+++ b/lib/stdlib/strtol.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
long
diff --git a/lib/string/strlen.c b/lib/string/strlen.c
index 0f6df8ad..5d9446b4 100644
--- a/lib/string/strlen.c
+++ b/lib/string/strlen.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
size_t
strlen (char const* s)
diff --git a/lib/stub/__cleanup.c b/lib/stub/__cleanup.c
index f7299fca..0b90e564 100644
--- a/lib/stub/__cleanup.c
+++ b/lib/stub/__cleanup.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
__cleanup ()
diff --git a/lib/stub/atof.c b/lib/stub/atof.c
index 3cc951d9..19f6771d 100644
--- a/lib/stub/atof.c
+++ b/lib/stub/atof.c
@@ -1,6 +1,6 @@
/* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen
*
* This file is part of GNU Mes.
*
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
atof (int x)
diff --git a/lib/stub/chown.c b/lib/stub/chown.c
index bf44169a..3fc5e4c4 100644
--- a/lib/stub/chown.c
+++ b/lib/stub/chown.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/ctime.c b/lib/stub/ctime.c
index 30c7475b..859fc36c 100644
--- a/lib/stub/ctime.c
+++ b/lib/stub/ctime.c
@@ -18,7 +18,8 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
+#include
int
ctime (int x)
diff --git a/lib/stub/fpurge.c b/lib/stub/fpurge.c
index 991cd493..2e923da4 100644
--- a/lib/stub/fpurge.c
+++ b/lib/stub/fpurge.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/freadahead.c b/lib/stub/freadahead.c
index 136b03a7..0c3f9969 100644
--- a/lib/stub/freadahead.c
+++ b/lib/stub/freadahead.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
size_t
diff --git a/lib/stub/frexp.c b/lib/stub/frexp.c
index 22c1e6cf..f26e1aea 100644
--- a/lib/stub/frexp.c
+++ b/lib/stub/frexp.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
frexp (int x)
diff --git a/lib/stub/fscanf.c b/lib/stub/fscanf.c
index daae853d..c6497483 100644
--- a/lib/stub/fscanf.c
+++ b/lib/stub/fscanf.c
@@ -18,8 +18,8 @@
* along with GNU Mes. If not, see .
*/
-#include
-#include
+#include
+#include
int
fscanf (FILE *stream, char const *template, ...)
diff --git a/lib/stub/getlogin.c b/lib/stub/getlogin.c
index 725929f7..5420f320 100644
--- a/lib/stub/getlogin.c
+++ b/lib/stub/getlogin.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
char *
diff --git a/lib/stub/getpwnam.c b/lib/stub/getpwnam.c
index 472b42aa..c37d895f 100644
--- a/lib/stub/getpwnam.c
+++ b/lib/stub/getpwnam.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
struct passwd *
diff --git a/lib/stub/getpwuid.c b/lib/stub/getpwuid.c
index 647fd54e..4081ffa3 100644
--- a/lib/stub/getpwuid.c
+++ b/lib/stub/getpwuid.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
struct passwd *
diff --git a/lib/stub/gmtime.c b/lib/stub/gmtime.c
index 85e45ddd..c1b262b9 100644
--- a/lib/stub/gmtime.c
+++ b/lib/stub/gmtime.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/stub/ldexp.c b/lib/stub/ldexp.c
index 9e28e4c5..d7c4c071 100644
--- a/lib/stub/ldexp.c
+++ b/lib/stub/ldexp.c
@@ -18,8 +18,8 @@
* along with GNU Mes. If not, see .
*/
-#include
-#include
+#include
+#include
double
ldexp (double x, int exp)
diff --git a/lib/stub/localtime.c b/lib/stub/localtime.c
index 5010557c..308ef400 100644
--- a/lib/stub/localtime.c
+++ b/lib/stub/localtime.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/stub/mprotect.c b/lib/stub/mprotect.c
index 09ce99a0..c3a66eae 100644
--- a/lib/stub/mprotect.c
+++ b/lib/stub/mprotect.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/pclose.c b/lib/stub/pclose.c
index 244bcc74..88806f6b 100644
--- a/lib/stub/pclose.c
+++ b/lib/stub/pclose.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
pclose (int x)
diff --git a/lib/stub/popen.c b/lib/stub/popen.c
index 294a24c3..ee4cf63d 100644
--- a/lib/stub/popen.c
+++ b/lib/stub/popen.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
popen (int x)
diff --git a/lib/stub/rand.c b/lib/stub/rand.c
index 2e07282f..21365edb 100644
--- a/lib/stub/rand.c
+++ b/lib/stub/rand.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/rewind.c b/lib/stub/rewind.c
index e62d3fb8..b0027551 100644
--- a/lib/stub/rewind.c
+++ b/lib/stub/rewind.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
rewind (int x)
diff --git a/lib/stub/setbuf.c b/lib/stub/setbuf.c
index debf05b7..b0d3e4bc 100644
--- a/lib/stub/setbuf.c
+++ b/lib/stub/setbuf.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
setbuf (int x)
diff --git a/lib/stub/setlocale.c b/lib/stub/setlocale.c
index e4fe783f..7005ba43 100644
--- a/lib/stub/setlocale.c
+++ b/lib/stub/setlocale.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
char *
diff --git a/lib/stub/setvbuf.c b/lib/stub/setvbuf.c
index 1abe6639..66751b91 100644
--- a/lib/stub/setvbuf.c
+++ b/lib/stub/setvbuf.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigaction.c b/lib/stub/sigaction.c
index 683ddf35..304392e5 100644
--- a/lib/stub/sigaction.c
+++ b/lib/stub/sigaction.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigaddset.c b/lib/stub/sigaddset.c
index 063c5ac9..3259a054 100644
--- a/lib/stub/sigaddset.c
+++ b/lib/stub/sigaddset.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigblock.c b/lib/stub/sigblock.c
index 766b1c87..241331af 100644
--- a/lib/stub/sigblock.c
+++ b/lib/stub/sigblock.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigdelset.c b/lib/stub/sigdelset.c
index a9335a2c..78312e0e 100644
--- a/lib/stub/sigdelset.c
+++ b/lib/stub/sigdelset.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigemptyset.c b/lib/stub/sigemptyset.c
index 337e3f8c..de7f2a29 100644
--- a/lib/stub/sigemptyset.c
+++ b/lib/stub/sigemptyset.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/stub/sigsetmask.c b/lib/stub/sigsetmask.c
index 4c6b570c..f455ce06 100644
--- a/lib/stub/sigsetmask.c
+++ b/lib/stub/sigsetmask.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
sigsetmask (int x)
diff --git a/lib/stub/strftime.c b/lib/stub/strftime.c
index ad7a26be..02b16cc6 100644
--- a/lib/stub/strftime.c
+++ b/lib/stub/strftime.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
size_t
strftime (char *s, size_t size, char const *template,
diff --git a/lib/stub/strtod.c b/lib/stub/strtod.c
index 9a74fe0f..4638fcae 100644
--- a/lib/stub/strtod.c
+++ b/lib/stub/strtod.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
double
diff --git a/lib/stub/sys_siglist.c b/lib/stub/sys_siglist.c
index 6f4aef35..97411002 100644
--- a/lib/stub/sys_siglist.c
+++ b/lib/stub/sys_siglist.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
sys_siglist (int x)
diff --git a/lib/stub/system.c b/lib/stub/system.c
index 401854aa..8cfdd1de 100644
--- a/lib/stub/system.c
+++ b/lib/stub/system.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
system (int x)
diff --git a/lib/stub/times.c b/lib/stub/times.c
index 4de69cbd..3aed3f48 100644
--- a/lib/stub/times.c
+++ b/lib/stub/times.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/stub/ttyname.c b/lib/stub/ttyname.c
index 093e5c06..12359387 100644
--- a/lib/stub/ttyname.c
+++ b/lib/stub/ttyname.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
char *
diff --git a/lib/stub/umask.c b/lib/stub/umask.c
index 41c736b6..ca2e2ec9 100644
--- a/lib/stub/umask.c
+++ b/lib/stub/umask.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
umask (int x)
diff --git a/lib/stub/utime.c b/lib/stub/utime.c
index 67247c9a..06c8a67a 100644
--- a/lib/stub/utime.c
+++ b/lib/stub/utime.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
int
utime (int x)
diff --git a/lib/tests/assert/50-assert.c b/lib/tests/assert/50-assert.c
index 73c197d8..7b5c7a98 100644
--- a/lib/tests/assert/50-assert.c
+++ b/lib/tests/assert/50-assert.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/tests/dirent/90-readdir.c b/lib/tests/dirent/90-readdir.c
index 5b4043be..3e89e1d5 100644
--- a/lib/tests/dirent/90-readdir.c
+++ b/lib/tests/dirent/90-readdir.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/tests/mes/30-oputs.c b/lib/tests/mes/30-oputs.c
index 62c2811f..eaa5df34 100644
--- a/lib/tests/mes/30-oputs.c
+++ b/lib/tests/mes/30-oputs.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#if 0
#include
diff --git a/lib/tests/mes/50-itoa.c b/lib/tests/mes/50-itoa.c
index dd856fb2..bd4a1be1 100644
--- a/lib/tests/mes/50-itoa.c
+++ b/lib/tests/mes/50-itoa.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
int
diff --git a/lib/tests/posix/50-getenv.c b/lib/tests/posix/50-getenv.c
index 2397c164..e1c74344 100644
--- a/lib/tests/posix/50-getenv.c
+++ b/lib/tests/posix/50-getenv.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include "libmes.h"
+#include "mes/lib.h"
#include "stdlib.h"
int
diff --git a/lib/tests/posix/90-unsetenv.c b/lib/tests/posix/90-unsetenv.c
index ccf8f828..2ec154ee 100644
--- a/lib/tests/posix/90-unsetenv.c
+++ b/lib/tests/posix/90-unsetenv.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
#include
diff --git a/lib/tests/setjmp/80-setjmp.c b/lib/tests/setjmp/80-setjmp.c
index 8c07349c..64228846 100644
--- a/lib/tests/setjmp/80-setjmp.c
+++ b/lib/tests/setjmp/80-setjmp.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/tests/signal/90-signal.c b/lib/tests/signal/90-signal.c
index 380209d6..fb6e3a7f 100644
--- a/lib/tests/signal/90-signal.c
+++ b/lib/tests/signal/90-signal.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
#include
diff --git a/lib/tests/stdio/70-printf-hello.c b/lib/tests/stdio/70-printf-hello.c
index f61246af..598ba355 100644
--- a/lib/tests/stdio/70-printf-hello.c
+++ b/lib/tests/stdio/70-printf-hello.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include
#include
diff --git a/lib/tests/stdio/70-printf-simple.c b/lib/tests/stdio/70-printf-simple.c
index 02814bc0..aba3bae5 100644
--- a/lib/tests/stdio/70-printf-simple.c
+++ b/lib/tests/stdio/70-printf-simple.c
@@ -18,7 +18,7 @@
* along with GNU Mes. If not, see .
*/
-#include
+#include
#include