diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 1decc8d5f9..89b256396b 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -9,15 +9,12 @@
 struct event;
 struct event_base;
 
-
 #ifdef HAVE_EVENT2_EVENT_H
 #include <event2/util.h>
-#else
-#ifndef EVUTIL_SOCKET_DEFINED
+#elif !defined(EVUTIL_SOCKET_DEFINED)
 #define EVUTIL_SOCKET_DEFINED
 #define evutil_socket_t int
 #endif
-#endif
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);
diff --git a/src/common/util.h b/src/common/util.h
index ebbcf78bdc..d657db674e 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -276,7 +276,7 @@ typedef struct ratelim_t {
 char *rate_limit_log(ratelim_t *lim, time_t now);
 
 /* File helpers */
-ssize_t write_all(tor_socket_t fd, const char *buf, size_t count, int isSocket);
+ssize_t write_all(tor_socket_t fd, const char *buf, size_t count,int isSocket);
 ssize_t read_all(tor_socket_t fd, char *buf, size_t count, int isSocket);
 
 /** Return values from file_status(); see that function's documentation