diff --git a/mpi/longlong.h b/mpi/longlong.h
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -305,7 +305,7 @@
     (ph) = __ph; \
   } while (0)
 # define count_leading_zeros(count, x) \
-  __asm__ ("clz %0, %1\n"                                               \
+  __asm__ ("clz %w0, %w1\n"                                               \
            : "=r" ((count))                                             \
            : "r" ((UDItype)(x)))
 #endif /* __aarch64__ */
diff --git a/random/rndlinux.c b/random/rndlinux.c
--- a/random/rndlinux.c
+++ b/random/rndlinux.c
@@ -29,6 +29,9 @@
 #ifdef HAVE_GETTIMEOFDAY
 # include <sys/times.h>
 #endif
+#if defined(__APPLE__)
+# include <sys/random.h>
+#endif
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>