diff --git a/libs/hbb_common/protos/message.proto b/libs/hbb_common/protos/message.proto
index 48e79d5d4..d064cd122 100644
--- a/libs/hbb_common/protos/message.proto
+++ b/libs/hbb_common/protos/message.proto
@@ -341,20 +341,20 @@ message CliprdrServerFormatDataResponse {
 message CliprdrFileContentsRequest {
   int32 conn_id = 1;
   int32 stream_id = 2;
-	int32 list_index = 3;
-	int32 dw_flags = 4;
-	int32 n_position_low = 5;
-	int32 n_position_high = 6;
-	int32 cb_requested = 7;
-	bool have_clip_data_id = 8;
-	int32 clip_data_id = 9;
+  int32 list_index = 3;
+  int32 dw_flags = 4;
+  int32 n_position_low = 5;
+  int32 n_position_high = 6;
+  int32 cb_requested = 7;
+  bool have_clip_data_id = 8;
+  int32 clip_data_id = 9;
 }
 
 message CliprdrFileContentsResponse {
   int32 conn_id = 1;
   int32 msg_flags = 3;
   int32 stream_id = 4;
-	bytes requested_data = 5;
+  bytes requested_data = 5;
 }
 
 message Cliprdr {
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 97413e0ce..8b46978a4 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1,7 +1,6 @@
 use super::{input_service::*, *};
 #[cfg(windows)]
-use crate::{clipboard_file::*, common::update_clipboard, ipc};
-#[cfg(not(windows))]
+use crate::clipboard_file::*;
 use crate::{common::update_clipboard, ipc};
 use hbb_common::{
     config::Config,
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 02b6410cb..0f72ae62f 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -1,10 +1,5 @@
 #[cfg(windows)]
-use crate::{
-    client::*,
-    clipboard_file::*,
-    common::{self, check_clipboard, update_clipboard, ClipboardContext, CLIPBOARD_INTERVAL},
-};
-#[cfg(not(windows))]
+use crate::clipboard_file::*;
 use crate::{
     client::*,
     common::{self, check_clipboard, update_clipboard, ClipboardContext, CLIPBOARD_INTERVAL},