diff --git a/internal/devicescale/devicescale_xwindow.go b/internal/devicescale/devicescale_unix.go
similarity index 96%
rename from internal/devicescale/devicescale_xwindow.go
rename to internal/devicescale/devicescale_unix.go
index c740c54f6..4ab4fb807 100644
--- a/internal/devicescale/devicescale_xwindow.go
+++ b/internal/devicescale/devicescale_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build freebsd linux
+// +build dragonfly freebsd linux netbsd openbsd solaris
 // +build !js
 // +build !android
 
diff --git a/internal/ui/ui_xwindow.go b/internal/ui/ui_unix.go
similarity index 93%
rename from internal/ui/ui_xwindow.go
rename to internal/ui/ui_unix.go
index c98df9f2b..8b0ae0006 100644
--- a/internal/ui/ui_xwindow.go
+++ b/internal/ui/ui_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build freebsd linux
+// +build dragonfly freebsd linux netbsd openbsd solaris
 // +build !js
 // +build !android