diff --git a/Makefile b/Makefile
index dae76e87b..9a0f75e06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -fPIC -I. -Ithirdparty -Ithirdparty/ae
+CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -fPIC -I. -Ithirdparty -Ithirdparty/ae -Wno-typedef-redefinition
 BUILD = build
 
 all: hiredis $(BUILD)/libcommon.a
diff --git a/logging.c b/logging.c
index 301ed4b11..09cad7856 100644
--- a/logging.c
+++ b/logging.c
@@ -1,5 +1,7 @@
 #include "logging.h"
 
+#include <stdint.h>
+#include <inttypes.h>
 #include <hiredis/hiredis.h>
 #include <utstring.h>
 
@@ -52,13 +54,13 @@ void ray_log(ray_logger *logger,
   UT_string *timestamp;
   utstring_new(timestamp);
   gettimeofday(&tv, NULL);
-  utstring_printf(timestamp, "%ld.%ld", tv.tv_sec, tv.tv_usec);
+  utstring_printf(timestamp, "%ld.%ld", tv.tv_sec, (long) tv.tv_usec);
 
   UT_string *origin_id;
   utstring_new(origin_id);
   if (logger->is_direct) {
     db_handle *db = (db_handle *) logger->conn;
-    utstring_printf(origin_id, "%ld:%s", db->client_id, "");
+    utstring_printf(origin_id, "%" PRId64 ":%s", db->client_id, "");
     redisAsyncCommand(db->context, NULL, NULL, log_fmt,
                       utstring_body(timestamp), logger->client_type,
                       utstring_body(origin_id), log_levels[log_level],