diff --git a/src/yggdrasil/tun.go b/src/yggdrasil/tun.go
index 95a81017..b69fb3d3 100644
--- a/src/yggdrasil/tun.go
+++ b/src/yggdrasil/tun.go
@@ -18,16 +18,6 @@ func (tun *tunDevice) init(core *Core) {
   tun.core = core
 }
 
-func (tun *tunDevice) setup(ifname string, addr string, mtu int) error {
-        config := water.Config{ DeviceType: water.TUN }
-        if ifname != "" && ifname != "auto" { config.Name = ifname }
-	iface, err := water.New(config)
-	if err != nil { panic(err) }
-  tun.iface = iface
-  tun.mtu = mtu //1280 // Lets default to the smallest thing allowed for now
-  return tun.setupAddress(addr)
-}
-
 func (tun *tunDevice) write() error {
   for {
     data := <-tun.recv
@@ -55,4 +45,3 @@ func (tun *tunDevice) read() error {
 func (tun *tunDevice) close() error {
   return tun.iface.Close()
 }
-
diff --git a/src/yggdrasil/tun_linux.go b/src/yggdrasil/tun_linux.go
index 7dc03ac9..7a142bb2 100644
--- a/src/yggdrasil/tun_linux.go
+++ b/src/yggdrasil/tun_linux.go
@@ -7,6 +7,20 @@ import "fmt"
 import "os/exec"
 import "strings"
 
+import water "github.com/songgao/water"
+
+func (tun *tunDevice) setup(ifname string, addr string, mtu int) error {
+        config := water.Config{ DeviceType: water.TUN }
+        if ifname != "" && ifname != "auto" {
+          config.Name = ifname
+        }
+	iface, err := water.New(config)
+	if err != nil { panic(err) }
+  tun.iface = iface
+  tun.mtu = mtu //1280 // Lets default to the smallest thing allowed for now
+  return tun.setupAddress(addr)
+}
+
 func (tun *tunDevice) setupAddress(addr string) error {
   // Set address
   cmd := exec.Command("ip", "-f", "inet6",
@@ -33,4 +47,3 @@ func (tun *tunDevice) setupAddress(addr string) error {
   }
   return nil
 }
-
diff --git a/src/yggdrasil/tun_other.go b/src/yggdrasil/tun_other.go
index 06a8f63b..c2bcc2f8 100644
--- a/src/yggdrasil/tun_other.go
+++ b/src/yggdrasil/tun_other.go
@@ -2,11 +2,21 @@
 
 package yggdrasil
 
+import water "github.com/songgao/water"
+
 // This is to catch unsupported platforms
 // If your platform supports tun devices, you could try configuring it manually
 
+func (tun *tunDevice) setup(ifname string, addr string, mtu int) error {
+        config := water.Config{ DeviceType: water.TUN }
+	iface, err := water.New(config)
+	if err != nil { panic(err) }
+  tun.iface = iface
+  tun.mtu = mtu //1280 // Lets default to the smallest thing allowed for now
+  return tun.setupAddress(addr)
+}
+
 func (tun *tunDevice) setupAddress(addr string) error {
   tun.core.log.Println("Platform not supported, you must set the address of", tun.iface.Name(), "to", addr)
   return nil
 }
-