4 files changed, 50 insertions, 13 deletions
diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data
index 3392ad1324..21be6ff59a 100644
--- a/conform/data/sys/mman.h-data
+++ b/conform/data/sys/mman.h-data
@@ -17,11 +17,13 @@ constant MCL_FUTURE
 
 constant MAP_FAILED
 
+#ifndef POSIX
 constant POSIX_MADV_NORMAL
 constant POSIX_MADV_SEQUENTIAL
 constant POSIX_MADV_RANDOM
 constant POSIX_MADV_WILLNEED
 constant POSIX_MADV_DONTNEED
+#endif
 
 optional-constant POSIX_TYPED_MEM_ALLOCATE
 optional-constant POSIX_TYPED_MEM_ALLOCATE_CONTIG
@@ -42,7 +44,9 @@ function int msync (void*, size_t, int)
 function int munlock (const void*, size_t)
 function int munlockall (void)
 function int munmap (void*, size_t)
+#ifndef POSIX
 function int posix_madvise (void*, size_t, int)
+#endif
 optional-function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*)
 optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*)
 optional-function int posix_typed_mem_open (const char*, int, int)
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index 547f607b1f..a7db93f576 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -1,5 +1,29 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11
 
+#if !defined POSIX && !defined POSIX2008
+type blkcnt_t
+type blksize_t
+#endif
+#ifndef POSIX
+type dev_t
+type ino_t
+type mode_t
+type nlink_t
+type uid_t
+type gid_t
+type off_t
+type time_t
+#else
+# define dev_t __dev_t
+# define ino_t __ino_t
+# define mode_t __mode_t
+# define nlink_t __nlink_t
+# define uid_t __uid_t
+# define gid_t __gid_t
+# define off_t __off_t
+# define time_t __time_t
+#endif
+
 type {struct stat}
 
 element {struct stat} dev_t st_dev
@@ -20,18 +44,6 @@ element {struct stat} blksize_t st_blksize
 element {struct stat} blkcnt_t st_blocks
 #endif
 
-#if !defined POSIX && !defined POSIX2008
-type blkcnt_t
-type blksize_t
-#endif
-type dev_t
-type ino_t
-type mode_t
-type nlink_t
-type uid_t
-type gid_t
-type off_t
-type time_t
 # if defined XOPEN2K8 || defined POSIX2008
 type {struct timespec}
 element {struct timespec} time_t tv_sec
@@ -97,7 +109,9 @@ function int fstat (int, struct stat*)
 function int fstatat (int, const char*, struct stat*, int)
 function int futimens (int, const struct timespec[2])
 # endif
+#if !defined POSIX
 function int lstat (const char*, struct stat*)
+#endif
 function int mkdir (const char*, mode_t)
 # if defined XOPEN2K8 || defined POSIX2008
 function int mkdirat (int, const char*, mode_t)
diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data
index 2befff56a1..824392d498 100644
--- a/conform/data/sys/types.h-data
+++ b/conform/data/sys/types.h-data
@@ -1,15 +1,19 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11
 type blkcnt_t
+#if !defined POSIX
 type blksize_t
 type clock_t
 type clockid_t
+#endif
 type dev_t
 # if !defined POSIX
 type fsblkcnt_t
 type fsfilcnt_t
 # endif
 type gid_t
+#if !defined POSIX
 type id_t
+#endif
 type ino_t
 # if !defined POSIX && !defined POSIX2008
 type key_t
@@ -19,17 +23,21 @@ type nlink_t
 type off_t
 type pid_t
 type pthread_attr_t
+#if !defined POSIX
 type pthread_barrier_t
 type pthread_barrierattr_t
+#endif
 type pthread_cond_t
 type pthread_condattr_t
 type pthread_key_t
 type pthread_mutex_t
 type pthread_mutexattr_t
 type pthread_once_t
+#if !defined POSIX
 type pthread_rwlock_t
 type pthread_rwlockattr_t
 type pthread_spinlock_t
+#endif
 type pthread_t
 type size_t
 type ssize_t
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 56dea06cfd..818766921d 100644
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -1,4 +1,9 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11
+#ifdef  POSIX
+# define pid_t __pid_t
+# define uid_t __uid_t
+#endif
+
 constant WNOHANG
 constant WUNTRACED
 
@@ -20,6 +25,7 @@ constant WCONTINUED
 constant WNOHANG
 constant WNOWAIT
 
+#if !defined POSIX
 type idtype_t
 
 constant P_ALL
@@ -27,6 +33,7 @@ constant P_PID
 constant P_PGID
 
 type id_t
+#endif
 
 type siginfo_t
 
@@ -40,18 +47,22 @@ element siginfo_t int si_status
 element siginfo_t long si_band
 element siginfo_t {union sigval} si_value
 
+#if !defined POSIX
 type {struct rusage}
 
 element {struct rusage} {struct timeval} ru_utime
 element {struct rusage} {struct timeval} ru_stime
+#endif
 
 type pid_t
 
 function pid_t wait (int*)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
 function pid_t wait3 (int*, int, struct rusage*)
 #endif
+#if !defined POSIX
 function int waitid (idtype_t, id_t, siginfo_t*, int)
+#endif
 function pid_t waitpid (pid_t, int*, int)
 
 allow-header signal.h