Fix include paths and formatting inconsistencies

4 files changed, 11 insertions, 7 deletions

diff --git a/lib/libc/inttypes/imaxabs.c b/lib/libc/inttypes/imaxabs.c
index 3af1df67..c5137ecc 100644
--- a/lib/libc/inttypes/imaxabs.c
+++ b/lib/libc/inttypes/imaxabs.c
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint.h> // for intmax_t
 
 intmax_t imaxabs(intmax_t j)
 {
diff --git a/lib/libc/inttypes/imaxdiv.c b/lib/libc/inttypes/imaxdiv.c
index 36fd6d20..4bfa635a 100644
--- a/lib/libc/inttypes/imaxdiv.c
+++ b/lib/libc/inttypes/imaxdiv.c
@@ -1,4 +1,6 @@
-#include <inttypes.h>
+#include "stdint.h" // for intmax_t
+
+#include <inttypes.h> // for imaxdiv_t, imaxdiv
 
 imaxdiv_t imaxdiv(intmax_t num, intmax_t den)
 {
diff --git a/lib/libc/inttypes/strtoimax.c b/lib/libc/inttypes/strtoimax.c
index f66e58a0..a8f0820b 100644
--- a/lib/libc/inttypes/strtoimax.c
+++ b/lib/libc/inttypes/strtoimax.c
@@ -28,9 +28,11 @@
  * SUCH DAMAGE.
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
+#include "stdint.h" // for intmax_t, INTMAX_MAX, INTMAX_MIN
+
+#include <ctype.h>    // for isalpha, isdigit, isspace, isupper, isxdigit
+#include <errno.h>    // for errno, ERANGE, EINVAL
+#include <inttypes.h> // for strtoimax
 
 /*
  * Convert a string to an intmax_t
diff --git a/lib/libc/inttypes/strtoumax.c b/lib/libc/inttypes/strtoumax.c
index 500e255a..46eecf06 100644
--- a/lib/libc/inttypes/strtoumax.c
+++ b/lib/libc/inttypes/strtoumax.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
-#include <stdlib.h>
+#include <stdint.h> // for uintmax_t
+#include <stdlib.h> // for strtoull
 
 uintmax_t strtoumax(const char *restrict s, char **restrict p, int base)
 {