--- a/src/common/rand.c	Sat Oct 17 11:44:08 2015 -0400
+++ b/src/common/rand.c	Sat Oct 17 11:48:17 2015 -0400
@@ -23,13 +23,12 @@
 
 #include <fcntl.h>
 #include <stdio.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
 
 #include <nomad/types.h>
 #include <nomad/rand.h>
 #include <nomad/config.h>
+#include <nomad/error.h>
 
 uint32_t rand32(void)
 {
@@ -43,13 +42,13 @@
 	if (fd == -1) {
 		fprintf(stderr, "Failed to get random number: %s",
 		        strerror(errno));
-		assert(0);
+		ASSERT(0);
 	}
 
 	if (read(fd, &ret, sizeof(ret)) != sizeof(ret)) {
 		fprintf(stderr, "Failed to get random number: %s",
 		        strerror(errno));
-		assert(0);
+		ASSERT(0);
 	}
 
 	close(fd);