diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 00e79414cb..4dc46f7a73 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -661,12 +661,8 @@
 #    define select(n,r,w,x,t) select_s(n,r,w,x,t)
 #    define ioctl(x,y,z) ioctlsocket(x,y,(char *)(z))
 #    include <tcp.h>
-#    ifdef word
-#      undef word
-#    endif
-#    ifdef byte
-#      undef byte
-#    endif
+#    undef word
+#    undef byte
 
 #  endif /* MSDOS */
 
diff --git a/lib/setup-vms.h b/lib/setup-vms.h
index d74f4ad630..0fd5e542b7 100644
--- a/lib/setup-vms.h
+++ b/lib/setup-vms.h
@@ -374,11 +374,9 @@ static struct passwd *vms_getpwuid(uid_t uid)
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #ifndef AI_NUMERICHOST
-#ifdef USE_IPV6
 #undef USE_IPV6
 #endif
 #endif
-#endif
 
 /* VAX symbols are always in uppercase */
 #ifdef __VAX