diff --git a/src/ChangeLog b/src/ChangeLog
index 67694db1..a63c3373 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-07  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* host.c (NO_ADDRESS): Define NO_ADDRESS only after the system
+	headers have been included.
+
 2005-04-06  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* http.c (pconn): Include NTLM data, which is per-connection.
diff --git a/src/host.c b/src/host.c
index 272ed4f1..585b93c7 100644
--- a/src/host.c
+++ b/src/host.c
@@ -55,10 +55,6 @@ so, delete this exception statement from your version.  */
 # define SET_H_ERRNO(err) WSASetLastError (err)
 #endif /* WINDOWS */
 
-#ifndef NO_ADDRESS
-# define NO_ADDRESS NO_DATA
-#endif
-
 #include <errno.h>
 
 #include "wget.h"
@@ -78,6 +74,10 @@ extern int h_errno;
 # endif
 #endif
 
+#ifndef NO_ADDRESS
+# define NO_ADDRESS NO_DATA
+#endif
+
 /* Lists of IP addresses that result from running DNS queries.  See
    lookup_host for details.  */