diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go
index 056beeaa9..5203d0f78 100644
--- a/core/commands/mount_nofuse.go
+++ b/core/commands/mount_nofuse.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd dragonfly
-// +build nofuse
+// +build !windows,nofuse
 
 package commands
 
diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go
index eeb9782d2..84abbdae2 100644
--- a/core/commands/mount_unix.go
+++ b/core/commands/mount_unix.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd
-// +build !nofuse
+// +build !windows,!nofuse
 
 package commands
 
diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go
index 60c1b986c..7f824ef3e 100644
--- a/fuse/node/mount_nofuse.go
+++ b/fuse/node/mount_nofuse.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd dragonfly
-// +build nofuse
+// +build !windows,nofuse
 
 package node
 
diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go
index af79a7406..2a20452bc 100644
--- a/fuse/node/mount_unix.go
+++ b/fuse/node/mount_unix.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd
-// +build !nofuse
+// +build !windows,!nofuse
 
 package node
 
@@ -9,11 +8,12 @@ import (
 	"strings"
 	"sync"
 
+	logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
+
 	core "github.com/ipfs/go-ipfs/core"
 	ipns "github.com/ipfs/go-ipfs/fuse/ipns"
 	mount "github.com/ipfs/go-ipfs/fuse/mount"
 	rofs "github.com/ipfs/go-ipfs/fuse/readonly"
-	logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
 )
 
 var log = logging.Logger("node")