diff --git a/command/ca/acme/eab/sigchild.go b/command/ca/acme/eab/sigchild.go
index 7f0e5715f..f2e55f122 100644
--- a/command/ca/acme/eab/sigchild.go
+++ b/command/ca/acme/eab/sigchild.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package eab
 
diff --git a/command/ca/acme/eab/sigchild_windows.go b/command/ca/acme/eab/sigchild_windows.go
index 4398a2499..7c2edccc4 100644
--- a/command/ca/acme/eab/sigchild_windows.go
+++ b/command/ca/acme/eab/sigchild_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package eab
 
diff --git a/go.mod b/go.mod
index 0f9a01328..070b74b49 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/Microsoft/go-winio v0.6.2
-	github.com/ccoveille/go-safecast v1.7.0
+	github.com/ccoveille/go-safecast v1.8.1
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/go-jose/go-jose/v3 v3.0.4
 	github.com/google/go-cmp v0.7.0
diff --git a/go.sum b/go.sum
index f544e7146..b341d9d1d 100644
--- a/go.sum
+++ b/go.sum
@@ -84,8 +84,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
 github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/ccoveille/go-safecast v1.7.0 h1:i+0eldPFBeXCTARGyocNS6BNRomquA/GhTZVNEtaIXI=
-github.com/ccoveille/go-safecast v1.7.0/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
+github.com/ccoveille/go-safecast v1.8.1 h1:RoucjfYKKcx2lFmIjRjuo8AeX9k/GaZn5SUMHlA3kMw=
+github.com/ccoveille/go-safecast v1.8.1/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
diff --git a/internal/cast/cast.go b/internal/cast/cast.go
index c97f09fe3..6e0b44543 100644
--- a/internal/cast/cast.go
+++ b/internal/cast/cast.go
@@ -17,7 +17,7 @@ type number interface {
 }
 
 func SafeUint(x int) (uint, error) {
-	return safecast.ToUint(x)
+	return safecast.Convert[uint](x)
 }
 
 func Uint(x int) uint {
@@ -30,7 +30,7 @@ func Uint(x int) uint {
 }
 
 func SafeInt(x uint) (int, error) {
-	return safecast.ToInt(x)
+	return safecast.Convert[int](x)
 }
 
 func Int(x uint) int {
@@ -43,7 +43,7 @@ func Int(x uint) int {
 }
 
 func SafeInt64[T number](x T) (int64, error) {
-	return safecast.ToInt64(x)
+	return safecast.Convert[int64](x)
 }
 
 func Int64[T number](x T) int64 {
@@ -56,7 +56,7 @@ func Int64[T number](x T) int64 {
 }
 
 func SafeUint64[T signed](x T) (uint64, error) {
-	return safecast.ToUint64(x)
+	return safecast.Convert[uint64](x)
 }
 
 func Uint64[T signed](x T) uint64 {
@@ -69,7 +69,7 @@ func Uint64[T signed](x T) uint64 {
 }
 
 func SafeInt32[T signed](x T) (int32, error) {
-	return safecast.ToInt32(x)
+	return safecast.Convert[int32](x)
 }
 
 func Int32[T signed](x T) int32 {
@@ -82,7 +82,7 @@ func Int32[T signed](x T) int32 {
 }
 
 func SafeUint32[T number](x T) (uint32, error) {
-	return safecast.ToUint32(x)
+	return safecast.Convert[uint32](x)
 }
 
 func Uint32[T number](x T) uint32 {
@@ -95,7 +95,7 @@ func Uint32[T number](x T) uint32 {
 }
 
 func SafeUint8(x int) (uint8, error) {
-	return safecast.ToUint8(x)
+	return safecast.Convert[uint8](x)
 }
 
 func Uint8(x int) uint8 {
diff --git a/internal/sshutil/agent_unix.go b/internal/sshutil/agent_unix.go
index 07aa4350f..5675f2c16 100644
--- a/internal/sshutil/agent_unix.go
+++ b/internal/sshutil/agent_unix.go
@@ -1,5 +1,4 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sshutil
 
diff --git a/utils/sysutils/sysutils_unix.go b/utils/sysutils/sysutils_unix.go
index b462d76e1..00e3de96e 100644
--- a/utils/sysutils/sysutils_unix.go
+++ b/utils/sysutils/sysutils_unix.go
@@ -1,5 +1,4 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sysutils