diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl
index 166508b649..7af1b3bd12 100755
--- a/src/rpc/genprotocol.pl
+++ b/src/rpc/genprotocol.pl
@@ -31,7 +31,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef
 open TARGET, ">$target"
     or die "cannot create $target: $!";
 
-my $fixup = $^O eq "linux";
+my $fixup = $^O eq "linux" || $^O eq "cygwin";
 
 if ($mode eq "-c") {
     print TARGET "#include <config.h>\n";
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 3187215079..fee87ef3bb 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -38,6 +38,8 @@
 #ifdef __linux__
 # include <linux/sockios.h>
 # include <linux/if_vlan.h>
+#elif !defined(AF_PACKET)
+# undef HAVE_STRUCT_IFREQ
 #endif
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 0440a738fc..e246b2c53d 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -45,7 +45,7 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 
-#ifdef HAVE_NET_IF_H
+#if defined(HAVE_NET_IF_H) && defined(SIOCBRADDBR)
 static int virNetDevSetupControlFull(const char *ifname,
                                      struct ifreq *ifr,
                                      int domain,