Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -21,12 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <assert.h>
 
-#include <sys/time.h>
-
 #ifdef OF_APPLE_RUNTIME
 # include <dlfcn.h>
 #endif
 
 #import "OFObject.h"

Index: src/macros.h
==================================================================
--- src/macros.h
+++ src/macros.h
@@ -29,10 +29,12 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/time.h>
+
 #include "platform.h"
 
 #ifdef OF_OBJFW_RUNTIME
 # ifdef OF_COMPILING_OBJFW
 #  import "ObjFW_RT.h"
@@ -857,14 +859,14 @@
 #elif defined(OF_HAVE_RANDOM)
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
 	srandom((unsigned)(tv.tv_sec ^ tv.tv_usec));
-	return (((uint32_t)(random()) << 16) | ((uint32_t)(random()) & 0xFFFF);
+	return (((uint32_t)(random()) << 16) | ((uint32_t)(random()) & 0xFFFF));
 #else
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
 	srand((unsigned)(t.tv_sec ^ t.tv_usec));
-	return (((uint32_t)(rand()) << 16) | ((uint32_t)(rand()) & 0xFFFF);
+	return (((uint32_t)(rand()) << 16) | ((uint32_t)(rand()) & 0xFFFF));
 #endif
 }