diff --git a/src/client.rs b/src/client.rs
index a60251980..dbd893c5a 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -90,7 +90,6 @@ pub const LOGIN_MSG_PASSWORD_EMPTY: &str = "Empty Password";
 pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password";
 pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
 pub const LOGIN_MSG_OFFLINE: &str = "Offline";
-#[cfg(target_os = "linux")]
 pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported";
 #[cfg(target_os = "linux")]
 pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index 67fc286e6..64a221141 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -614,10 +614,10 @@ pub fn main_get_error() -> String {
     get_error()
 }
 
-pub fn main_show_option(key: String) -> SyncReturn<bool> {
-    if key.eq(config::CONFIG_OPTION_ALLOW_LINUX_HEADLESS) {
-        #[cfg(all(target_os = "linux", feature = "linux_headless"))]
-        #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
+pub fn main_show_option(_key: String) -> SyncReturn<bool> {
+    #[cfg(all(target_os = "linux", feature = "linux_headless"))]
+    #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
+    if _key.eq(config::CONFIG_OPTION_ALLOW_LINUX_HEADLESS) {
         return SyncReturn(true)
     }
     SyncReturn(false)
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 7e0f39809..bc101e697 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -2391,10 +2391,11 @@ async fn start_ipc(
             args.push("--hide");
         };
 
+        #[cfg(target_os = "linux")]
         #[cfg(any(
             feature = "flatpak",
             feature = "appimage",
-            not(all(target_os = "linux", feature = "linux_headless"))
+            not(feature = "linux_headless")
         ))]
         let user = None;
         #[cfg(all(target_os = "linux", feature = "linux_headless"))]