diff --git a/talk/ctl.c b/talk/ctl.c
index f7e7a6f4..b1748396 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 381e58c7..504b9bfd 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 6c4d869d..5d48298b 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talk/get_names.c b/talk/get_names.c
index 0301fc5b..1a1ca4d5 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 
 #include <sys/param.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talk/invite.c b/talk/invite.c
index dac87f31..725dd003 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #include <sys/time.h>
 #include <signal.h>
 #include <netinet/in.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talk/look_up.c b/talk/look_up.c
index 777b316f..0115d03a 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talkd/announce.c b/talkd/announce.c
index cdd98e58..c621c2ae 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talkd/print.c b/talkd/print.c
index 7287743b..2d4863b0 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talkd/process.c b/talkd/process.c
index 62c1e220..b1625e92 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -52,7 +52,7 @@ static char sccsid[] = "@(#)process.c	8.2 (Berkeley) 11/16/93";
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talkd/table.c b/talkd/table.c
index 6acd9a78..a9075ebe 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -51,7 +51,7 @@ static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>
diff --git a/talkd/talkd.c b/talkd/talkd.c
index d2f7102e..f910fc28 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifndef HAVE_OSOCKADDR
+#ifdef HAVE_OSOCKADDR_H
 #include <osockaddr.h>
 #endif
 #include <protocols/talkd.h>