diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index da4fdac6639..3a54d9f4f91 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -55,10 +55,6 @@
 #include "winnt.h"
 #include "wscontrol.h"
 
-#ifdef __NetBSD__
-#undef if_type
-#endif
-
 /* FIXME: The rest of the socket() cdecl<->stdapi stack corruption problem
  * discussed above.
  */
diff --git a/dlls/wsock32/wscontrol.h b/dlls/wsock32/wscontrol.h
index eaeb8a6e983..b44bb36698d 100644
--- a/dlls/wsock32/wscontrol.h
+++ b/dlls/wsock32/wscontrol.h
@@ -103,6 +103,11 @@ typedef struct IPAddrEntry
    ushort         iae_pad;
 } IPAddrEntry;
 
+#ifdef __NetBSD__
+#undef if_type
+#undef if_mtu
+#undef if_lastchange
+#endif
 
 #define	MAX_PHYSADDR_SIZE    8
 #define	MAX_IFDESCR_LEN      256