diff --git a/c/dirpath.c b/c/dirpath.c
index 8d47f86..2550418 100644
--- a/c/dirpath.c
+++ b/c/dirpath.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -101,6 +102,8 @@ char *get_exename(char *buf, size_t size)
     char *p, *path, *pathcpy, filename[PATH_MAX];
     struct stat sbuf;
 
+    (void)size;
+
     pid = getpid();
 
     mib[0] = CTL_KERN;
diff --git a/c/equalhash.c b/c/equalhash.c
index ae3e387..6811138 100644
--- a/c/equalhash.c
+++ b/c/equalhash.c
@@ -1,3 +1,4 @@
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/c/socket.c b/c/socket.c
index 755c196..0c96988 100644
--- a/c/socket.c
+++ b/c/socket.c
@@ -1,3 +1,5 @@
+#include <sys/select.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/c/utf8.c b/c/utf8.c
index 123ca39..56ad796 100644
--- a/c/utf8.c
+++ b/c/utf8.c
@@ -13,8 +13,6 @@
   A UTF-8 validation routine is included.
 */
 
-#define _XOPEN_SOURCE 700
-
 #include <assert.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/scripts/build.sh b/scripts/build.sh
index f114b81..f0178a1 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -2,7 +2,7 @@
 set -eu
 CC="${CC:-clang}"
 CFLAGS="-Wall -Wextra -Wno-strict-aliasing -std=gnu99"
-CFLAGS="$CFLAGS -O2 -falign-functions"
+CFLAGS="$CFLAGS -O2"  # -falign-functions
 CFLAGS="$CFLAGS -I ../c -D NDEBUG -D USE_COMPUTED_GOTO"
 LFLAGS="-lm"
 builddir="build-$(uname | tr A-Z- a-z_)-$(uname -m | tr A-Z- a-z_)"