diff --git a/cmd/cloudflared/generic_service.go b/cmd/cloudflared/generic_service.go
index e7ceb705..fcea4136 100644
--- a/cmd/cloudflared/generic_service.go
+++ b/cmd/cloudflared/generic_service.go
@@ -6,7 +6,9 @@ import (
 	"fmt"
 	"os"
 
-	cli "github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v2"
+
+	"github.com/kjake/cloudflared/cmd/cloudflared/cliutil"
 )
 
 func runApp(app *cli.App, graceShutdownC chan struct{}) {
diff --git a/diagnostic/system_collector_unix.go b/diagnostic/system_collector_unix.go
index ebfaa64a..9468ffd7 100644
--- a/diagnostic/system_collector_unix.go
+++ b/diagnostic/system_collector_unix.go
@@ -1,4 +1,4 @@
-//go:build !darwin || !linux || freebsd || openbsd || netbsd 
+//go:build !windows && !darwin && !linux
 
 package diagnostic