diff --git a/Sources/InfomaniakCore/Networking/Requests/UserAgentAdapter.swift b/Sources/InfomaniakCore/Networking/Requests/UserAgentAdapter.swift
index ca6c030..c698b84 100644
--- a/Sources/InfomaniakCore/Networking/Requests/UserAgentAdapter.swift
+++ b/Sources/InfomaniakCore/Networking/Requests/UserAgentAdapter.swift
@@ -16,8 +16,6 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if canImport(UIKit)
-
 import Alamofire
 import Foundation
 
@@ -41,5 +39,3 @@ public class UserAgentAdapter: RequestAdapter {
         completion(.success(adaptedRequest))
     }
 }
-
-#endif
diff --git a/Sources/InfomaniakCore/Networking/UserAgentBuilder.swift b/Sources/InfomaniakCore/Networking/UserAgentBuilder.swift
index 429fbb5..0cf2442 100644
--- a/Sources/InfomaniakCore/Networking/UserAgentBuilder.swift
+++ b/Sources/InfomaniakCore/Networking/UserAgentBuilder.swift
@@ -16,11 +16,11 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if canImport(UIKit)
-
 import Foundation
 import MachO
+#if canImport(UIKit)
 import UIKit
+#endif
 
 /// Something to construct a standard Infomaniak User-Agent
 public struct UserAgentBuilder {
@@ -56,8 +56,13 @@ public struct UserAgentBuilder {
         let hardwareDevice = modelIdentifier() ?? "unknownModel"
 
         let operatingSystemVersion = ProcessInfo.processInfo.operatingSystemVersion
+        #if canImport(UIKit)
+        let osName = UIDevice.current.systemName
+        #else
+        let osName = "macOS"
+        #endif
         let operatingSystemNameAndVersion =
-            "\(UIDevice.current.systemName) \(operatingSystemVersion.majorVersion).\(operatingSystemVersion.minorVersion).\(operatingSystemVersion.patchVersion)"
+            "\(osName) \(operatingSystemVersion.majorVersion).\(operatingSystemVersion.minorVersion).\(operatingSystemVersion.patchVersion)"
 
         let cpuArchitecture = microarchitecture() ?? "unknownArch"
 
@@ -67,5 +72,3 @@ public struct UserAgentBuilder {
         return "\(executableName)/\(appVersion) (\(hardwareDevice); \(operatingSystemNameAndVersion); \(cpuArchitecture))"
     }
 }
-
-#endif