diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 92e27db29..8de74c419 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -8,10 +8,8 @@
 
 #include "server/Server.h"
 
-#include "arch/Arch.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
-#include "base/TMethodJob.h"
 #include "deskflow/AppUtil.h"
 #include "deskflow/DeskflowException.h"
 #include "deskflow/IPlatformScreen.h"
@@ -20,7 +18,6 @@
 #include "deskflow/ProtocolTypes.h"
 #include "deskflow/Screen.h"
 #include "deskflow/StreamChunker.h"
-#include "mt/Thread.h"
 #include "net/TCPSocket.h"
 #include "server/ClientListener.h"
 #include "server/ClientProxy.h"
@@ -35,7 +32,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <stdexcept>
 
 using namespace deskflow::server;
 
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index 9b4f8d240..24ebd3f21 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -9,18 +9,15 @@
 #pragma once
 
 #include "base/Event.h"
-#include "base/EventTypes.h"
 #include "base/Stopwatch.h"
 #include "deskflow/Clipboard.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
-#include "deskflow/OptionTypes.h"
 #include "server/Config.h"
 
 #include <climits>
 #include <map>
-#include <memory>
 #include <set>
 #include <vector>