diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index 2f00700e7..e03c4f2eb 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -11,31 +11,23 @@
 #include "arch/Arch.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
-#include "base/TMethodJob.h"
 #include "client/ServerProxy.h"
 #include "common/Settings.h"
-#include "deskflow/AppUtil.h"
+#include "deskflow/Clipboard.h"
 #include "deskflow/DeskflowException.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/PacketStreamFilter.h"
-#include "deskflow/ProtocolTypes.h"
 #include "deskflow/ProtocolUtil.h"
 #include "deskflow/Screen.h"
 #include "deskflow/StreamChunker.h"
-#include "mt/Thread.h"
 #include "net/IDataSocket.h"
 #include "net/ISocketFactory.h"
 #include "net/SecureSocket.h"
 #include "net/TCPSocket.h"
 
-#include <algorithm>
 #include <cstdlib>
 #include <cstring>
-#include <fstream>
-#include <iterator>
 #include <memory>
-#include <sstream>
-#include <stdexcept>
 
 using namespace deskflow::client;
 
diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h
index cc31769c5..31f52b9e5 100644
--- a/src/lib/client/Client.h
+++ b/src/lib/client/Client.h
@@ -11,9 +11,7 @@
 #include "deskflow/IClient.h"
 
 #include "HelloBack.h"
-#include "base/EventTypes.h"
-#include "deskflow/Clipboard.h"
-#include "mt/CondVar.h"
+#include "deskflow/IClipboard.h"
 #include "net/NetworkAddress.h"
 
 #include <climits>