diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index 0b3a25e54..54259949e 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -64,7 +64,7 @@ const
 int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
 #else
 
-#ifdef NEED_H_ERRLIST_DECLARATION
+#ifndef HAVE_H_ERRLIST_DECLARATION
 extern const char *h_errlist[];
 extern int h_nerr;
 #endif
diff --git a/lib/roken/roken.h b/lib/roken/roken.h
index 98bc70157..7f6204112 100644
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -134,7 +134,7 @@ char *strerror(int eno);
 char *hstrerror(int herr);
 #endif
 
-#ifdef NEED_H_ERRNO_DECLARATION
+#ifndef HAVE_H_ERRNO_DECLARATION
 extern int h_errno;
 #endif
 
@@ -285,17 +285,17 @@ void vsyslog(int pri, const char *fmt, va_list ap);
 #endif
 #endif
 
-#ifdef NEED_OPTARG_DECLARATION
+#ifndef HAVE_OPTARG_DECLARATION
 extern char *optarg;
 #endif
-#ifdef NEED_OPTIND_DECLARATION
+#ifndef HAVE_OPTIND_DECLARATION
 extern int optind;
 #endif
-#ifdef NEED_OPTERR_DECLARATION
+#ifndef HAVE_OPTERR_DECLARATION
 extern int opterr;
 #endif
 
-#ifdef NEED___PROGNAME_DECLARATION
+#ifndef HAVE___PROGNAME_DECLARATION
 extern const char *__progname;
 #endif
 
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 98bc70157..7f6204112 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -134,7 +134,7 @@ char *strerror(int eno);
 char *hstrerror(int herr);
 #endif
 
-#ifdef NEED_H_ERRNO_DECLARATION
+#ifndef HAVE_H_ERRNO_DECLARATION
 extern int h_errno;
 #endif
 
@@ -285,17 +285,17 @@ void vsyslog(int pri, const char *fmt, va_list ap);
 #endif
 #endif
 
-#ifdef NEED_OPTARG_DECLARATION
+#ifndef HAVE_OPTARG_DECLARATION
 extern char *optarg;
 #endif
-#ifdef NEED_OPTIND_DECLARATION
+#ifndef HAVE_OPTIND_DECLARATION
 extern int optind;
 #endif
-#ifdef NEED_OPTERR_DECLARATION
+#ifndef HAVE_OPTERR_DECLARATION
 extern int opterr;
 #endif
 
-#ifdef NEED___PROGNAME_DECLARATION
+#ifndef HAVE___PROGNAME_DECLARATION
 extern const char *__progname;
 #endif