Single Point of Truth cleanup.

34 files changed, 10 insertions, 110 deletions

diff --git a/test/a64l.c b/test/a64l.c
index 84d5b15..d580a69 100644
--- a/test/a64l.c
+++ b/test/a64l.c
@@ -1,8 +1,5 @@
-/* a64l and l64() require <stdlib.h> */
-
 /*
  * Items: a64l(, l64a(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/abort.c b/test/abort.c
index 1581668..655a3ab 100644
--- a/test/abort.c
+++ b/test/abort.c
@@ -1,8 +1,5 @@
-/* abort() requires <stdlib.h> */
-
 /*
  * Items: abort(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/abs.c b/test/abs.c
index bf0a144..15214af 100644
--- a/test/abs.c
+++ b/test/abs.c
@@ -1,8 +1,5 @@
-/* abs() requires <stdlib.h> */
-
 /*
  * Items: abs(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/access.c b/test/access.c
index 7307fd5..4f18431 100644
--- a/test/access.c
+++ b/test/access.c
@@ -1,8 +1,5 @@
-/* access() requires <stdlib.h> */
-
 /*
  * Items: access(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/acos.c b/test/acos.c
index bc8d64f..e9766c3 100644
--- a/test/acos.c
+++ b/test/acos.c
@@ -1,8 +1,5 @@
-/* acos() requires <math.h> */
-
 /*
  * Items: acos(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/acosh.c b/test/acosh.c
index 1e39d91..d524708 100644
--- a/test/acosh.c
+++ b/test/acosh.c
@@ -1,8 +1,5 @@
-/* acosh() requires <stdlib.h> */
-
 /*
  * Items: acosh(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/advance.c b/test/advance.c
index 681428d..d0af0b8 100644
--- a/test/advance.c
+++ b/test/advance.c
@@ -1,8 +1,5 @@
-/* advance() requires <stdlib.h> */
-
 /*
  * Items: advance(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/alarm.c b/test/alarm.c
index c3fc7a1..d4fbb89 100644
--- a/test/alarm.c
+++ b/test/alarm.c
@@ -1,8 +1,5 @@
-/* alarm() requires <unistd.h> */
-
 /*
  * Items: alarm(
- * Requires: <unistd.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/asin.c b/test/asin.c
index f102999..26a8746 100644
--- a/test/asin.c
+++ b/test/asin.c
@@ -1,8 +1,5 @@
-/* asin() requires <stdlib.h> */
-
 /*
  * Items: asin(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/asinh.c b/test/asinh.c
index 8b9151e..5d6fbae 100644
--- a/test/asinh.c
+++ b/test/asinh.c
@@ -1,8 +1,5 @@
-/* asinh() requires <stdlib.h> */
-
 /*
  * Items: asinh(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atan.c b/test/atan.c
index ce96f21..d26c2ed 100644
--- a/test/atan.c
+++ b/test/atan.c
@@ -1,8 +1,5 @@
-/* atan() requires <math.h> */
-
 /*
  * Items: atan(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atan2.c b/test/atan2.c
index 003d445..ac6f861 100644
--- a/test/atan2.c
+++ b/test/atan2.c
@@ -1,8 +1,5 @@
-/* atan2() requires <stdlib.h> */
-
 /*
  * Items: atan2(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atanh.c b/test/atanh.c
index 8adca10..e5b6fbb 100644
--- a/test/atanh.c
+++ b/test/atanh.c
@@ -1,8 +1,5 @@
-/* atanh() requires <stdlib.h> */
-
 /*
  * Items: atanh(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atexit.c b/test/atexit.c
index 9295a71..606fa0b 100644
--- a/test/atexit.c
+++ b/test/atexit.c
@@ -1,8 +1,5 @@
-/* atexit() requires <stdlib.h> */
-
 /*
  * Items: atexit(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atof.c b/test/atof.c
index 7925e2e..aedd5d4 100644
--- a/test/atof.c
+++ b/test/atof.c
@@ -1,8 +1,5 @@
-/* atof requires <stdlib.h> */
-
 /*
  * Items: atofl(, l64a(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atoi.c b/test/atoi.c
index 661c344..747af4e 100644
--- a/test/atoi.c
+++ b/test/atoi.c
@@ -1,8 +1,5 @@
-/* atoi requires <stdlib.h> */
-
 /*
  * Items: atoil(, l64a(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/atol.c b/test/atol.c
index 71d342f..abe62b3 100644
--- a/test/atol.c
+++ b/test/atol.c
@@ -1,8 +1,5 @@
-/* atol requires <stdlib.h> */
-
 /*
  * Items: atoll(, l64a(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/basename.c b/test/basename.c
index b1f1eee..d9d2326 100644
--- a/test/basename.c
+++ b/test/basename.c
@@ -1,8 +1,5 @@
-/* basename(3) requires <libgen.h> */
-
 /*
  * Items: basename(
- * Requires: <libgen.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/bcmp.c b/test/bcmp.c
index 1d0923b..2f1389b 100644
--- a/test/bcmp.c
+++ b/test/bcmp.c
@@ -1,8 +1,5 @@
-/* bcmp(3) needs <string.h> */
-
 /*
  * Items: bcmp(
- * Requires: <string.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/bcopy.c b/test/bcopy.c
index a2d3f49..c18c229 100644
--- a/test/bcopy.c
+++ b/test/bcopy.c
@@ -1,8 +1,5 @@
-/* bcopy(3) needs <string.h> */
-
 /*
  * Items: bcopy(
- * Requires: <string.h>
  * Standardized-By: SuS
  * Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/brk.c b/test/brk.c
index e13c46b..12aff23 100644
--- a/test/brk.c
+++ b/test/brk.c
@@ -1,8 +1,5 @@
-/* brk() requires <stdlib.h> */
-
 /*
  * Items: brk(
- * Requires: <unistd.h>
  * Standardized-By: SuS
  * Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/bsd_signal.c b/test/bsd_signal.c
index 8be2f94..cd90979 100644
--- a/test/bsd_signal.c
+++ b/test/bsd_signal.c
@@ -1,8 +1,5 @@
-/* bsd_signal(3) needs <string.h> */ 
-
 /*
  * Items: bsd_signal(
- * Requires: <signal.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/bsort.c b/test/bsort.c
index 89d7ddb..3d4561e 100644
--- a/test/bsort.c
+++ b/test/bsort.c
@@ -1,19 +1,16 @@
-/* bsort() requires <stdlib.h> */
-
-/* example taken pretty much directly from SuS */
-
 /*
  * Items: bsort(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
 
+/* example taken pretty much directly from SuS */
+
 #ifndef __DEHEADER__
 #include <stdio.h>
+#include <string.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
 
 #define TABSIZE    1000
 
diff --git a/test/btowc.c b/test/btowc.c
index 9511d46..c37aab9 100644
--- a/test/btowc.c
+++ b/test/btowc.c
@@ -1,8 +1,5 @@
-/* btowc() requires <stdlib.h> */
-
 /*
  * Items: btowc(
- * Requires: <unistd.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/bzero.c b/test/bzero.c
index f1a243c..e1416cc 100644
--- a/test/bzero.c
+++ b/test/bzero.c
@@ -1,8 +1,5 @@
-/* bzero(3) needs <string.h> */
-
 /*
  * Items: bzero(
- * Requires: <string.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/calloc.c b/test/calloc.c
index 04e19cd..27105a6 100644
--- a/test/calloc.c
+++ b/test/calloc.c
@@ -1,8 +1,5 @@
-/* calloc(3) needs <stdlib.h> */
-
 /*
  * Items: calloc(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/catclose.c b/test/catclose.c
index f0ad008..ddfc924 100644
--- a/test/catclose.c
+++ b/test/catclose.c
@@ -1,8 +1,5 @@
-/* catclose(3) needs <nl_types.h> */
-
 /*
  * Items: catclose(
- * Requires: <nl_types.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/catgets.c b/test/catgets.c
index 43ecca3..23530a7 100644
--- a/test/catgets.c
+++ b/test/catgets.c
@@ -1,8 +1,5 @@
-/* catgets(3) needs <nl_types.h> */
-
 /*
  * Items: catgets(
- * Requires: <nl_types.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/catopen.c b/test/catopen.c
index 9a03c55..6393025 100644
--- a/test/catopen.c
+++ b/test/catopen.c
@@ -1,8 +1,5 @@
-/* catopen(3) needs <nl_types.h> */
-
 /*
  * Items: catopen(
- * Requires: <nl_types.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/cbrt.c b/test/cbrt.c
index 7beb7ca..304d0e0 100644
--- a/test/cbrt.c
+++ b/test/cbrt.c
@@ -1,8 +1,5 @@
-/* cbrt() requires <math.h> */
-
 /*
  * Items: cbrt(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/ceil.c b/test/ceil.c
index 2a8de42..b34844f 100644
--- a/test/ceil.c
+++ b/test/ceil.c
@@ -1,8 +1,5 @@
-/* ceil() requires <math.h> */
-
 /*
  * Items: ceil(
- * Requires: <stdlib.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/regress.chk b/test/regress.chk
index c3042c4..3283b32 100644
--- a/test/regress.chk
+++ b/test/regress.chk
@@ -9,9 +9,9 @@ deheader: ./brk.c includes <unistd.h>
 deheader: ./asinh.c includes <math.h>
 deheader: ./atol.c has requires <stdlib.h> from \Wl64a\s*\(
 deheader: ./atol.c includes <stdlib.h>
+deheader: ./umask.c has requires <sys/stat.h>,<sys/types.h> from \Wumask\s*\(
 deheader: ./umask.c includes <sys/stat.h>
 deheader: ./umask.c includes <sys/types.h>
-deheader: ./umask.c has requires <sys/stat.h>,<sys/types.h> from \Wumask\s*\(
 deheader: ./a64l.c has requires <stdlib.h> from \Wa64l\s*\(
 deheader: ./a64l.c includes <stdlib.h>
 deheader: ./bcmp.c has requires <string.h> from \Wbcmp\s*\(
@@ -51,8 +51,9 @@ deheader: ./asin.c includes <math.h>
 deheader: ./bsort.c has requires <stdlib.h> from \Wbsort\s*\(
 deheader: ./bsort.c includes <stdio.h>
 deheader: ignoring <stdio.h> (conditional inclusion)
-deheader: ./bsort.c includes <stdlib.h>
 deheader: ./bsort.c includes <string.h>
+deheader: ignoring <string.h> (conditional inclusion)
+deheader: ./bsort.c includes <stdlib.h>
 deheader: ./catgets.c has requires <nl_types.h> from \Wcatgets\s*\(
 deheader: ./catgets.c includes <nl_types.h>
 deheader: ./cbrt.c has requires <math.h> from \Wcbrt\s*\(
@@ -73,9 +74,7 @@ deheader: in ./catopen.c, retaining required '#include <nl_types.h>\n'
 deheader: in ./brk.c, retaining required '#include <unistd.h>\n'
 deheader: ./string.c without <string.h> succeeded.
 deheader: remove <string.h> from ./string.c
-deheader: ./bsort.c without <string.h> succeeded.
 deheader: in ./bsort.c, retaining required '#include <stdlib.h>\n'
-deheader: remove <string.h> from ./bsort.c
 deheader: in ./catclose.c, retaining required '#include <nl_types.h>\n'
 deheader: in ./cbrt.c, retaining required '#include <math.h>\n'
 deheader: in ./ceil.c, retaining required '#include <math.h>\n'
@@ -114,4 +113,4 @@ deheader: in ./catgets.c, retaining required '#include <nl_types.h>\n'
 deheader: in ./bcmp.c, retaining required '#include <string.h>\n'
 deheader: in ./a64l.c, retaining required '#include <stdlib.h>\n'
 deheader: in ./advance.c, retaining required '#include <regexp.h>\n'
-deheader: saw 36 files, 39 includes, 10 removed
+deheader: saw 36 files, 38 includes, 9 removed
diff --git a/test/sbrk.c b/test/sbrk.c
index c8bfca7..a45010a 100644
--- a/test/sbrk.c
+++ b/test/sbrk.c
@@ -1,8 +1,5 @@
-/* sbrk() requires <stdlib.h> */
-
 /*
  * Items: sbrk(
- * Requires: <unistd.h>
  * Standardized-By: SuS
  * Not-Detected-by: gcc-4.4.3 + Linux
  */
diff --git a/test/umask.c b/test/umask.c
index fa6d04a..b66861c 100644
--- a/test/umask.c
+++ b/test/umask.c
@@ -1,16 +1,13 @@
-/* this file tests the requirement rules */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
 /*
  * Items: umask(
- * Requires: <sys/types.h>,<sys/stat.h>
  * Standardized-By: SuS
  * Detected-by: gcc-4.4.3 + Linux
  * Not-detected-by: BSD
  */
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 main(int arg, char **argv)
 {
     umask(777);