diff --git a/event.c b/event.c
index 0a8d574d..7e71ec2b 100644
--- a/event.c
+++ b/event.c
@@ -1151,7 +1151,7 @@ event_base_init_common_timeout(struct event_base *base,
 		}
 	}
 	if (base->n_common_timeouts == MAX_COMMON_TIMEOUTS) {
-		event_warn("%s: Too many common timeouts already in use; "
+		event_warnx("%s: Too many common timeouts already in use; "
 		    "we only support %d per event_base", __func__,
 		    MAX_COMMON_TIMEOUTS);
 		goto done;
@@ -1477,7 +1477,7 @@ event_base_loop(struct event_base *base, int flags)
 	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
 
 	if (base->running_loop) {
-		event_warn("%s: reentrant invocation.  Only one event_base_loop"
+		event_warnx("%s: reentrant invocation.  Only one event_base_loop"
 		    " can run on each event_base at once.", __func__);
 		EVBASE_RELEASE_LOCK(base, th_base_lock);
 		return -1;
diff --git a/evutil.c b/evutil.c
index 54d49e16..9bf0d92d 100644
--- a/evutil.c
+++ b/evutil.c
@@ -268,7 +268,7 @@ evutil_make_socket_nonblocking(evutil_socket_t fd)
 	{
 		u_long nonblocking = 1;
 		if (ioctlsocket(fd, FIONBIO, &nonblocking) == SOCKET_ERROR) {
-			event_warn("fcntl(%d, F_GETFL)", (int)fd);
+			event_sock_warn(fd, "fcntl(%d, F_GETFL)", (int)fd);
 			return -1;
 		}
 	}
diff --git a/signal.c b/signal.c
index f840e259..4a5763ab 100644
--- a/signal.c
+++ b/signal.c
@@ -379,7 +379,7 @@ evsig_handler(int sig)
 	ev_uint8_t msg;
 
 	if (evsig_base == NULL) {
-		event_warn(
+		event_warnx(
 			"%s: received signal %d, but have no base configured",
 			__func__, sig);
 		return;