diff --git a/src/lib/arch/ArchException.h b/src/lib/arch/ArchException.h
index d245be679..c29551ea0 100644
--- a/src/lib/arch/ArchException.h
+++ b/src/lib/arch/ArchException.h
@@ -8,10 +8,7 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <stdexcept>
-#include <string>
 
 //! Generic thread exception
 /*!
diff --git a/src/lib/arch/ArchString.cpp b/src/lib/arch/ArchString.cpp
index 6122a4b62..bc4b24212 100644
--- a/src/lib/arch/ArchString.cpp
+++ b/src/lib/arch/ArchString.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "arch/ArchString.h"
+#include "common/Common.h"
 
 #include <climits>
-#include <cstdlib>
 #include <cstring>
 #include <mutex>
 
diff --git a/src/lib/arch/ArchString.h b/src/lib/arch/ArchString.h
index 4e312b14d..55fe7f8a0 100644
--- a/src/lib/arch/ArchString.h
+++ b/src/lib/arch/ArchString.h
@@ -8,9 +8,8 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <stdarg.h>
+#include <stdint.h>
 
 //! Interface for architecture dependent string operations
 /*!
diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h
index be210b613..6a2487b39 100644
--- a/src/lib/arch/IArchDaemon.h
+++ b/src/lib/arch/IArchDaemon.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <functional>
 #include <string>
 
diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h
index 3476383bb..f14119a07 100644
--- a/src/lib/arch/IArchLog.h
+++ b/src/lib/arch/IArchLog.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "base/LogLevel.h"
-#include "common/Common.h"
 
 //! Interface for architecture dependent logging
 /*!
diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h
index 24ec2f3cf..a0bf4c69c 100644
--- a/src/lib/arch/IArchMultithread.h
+++ b/src/lib/arch/IArchMultithread.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/Common.h"
+#include <cstdint>
 
 /*!
 \class ArchCondImpl
diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h
index 1f856cfa3..0ae897d67 100644
--- a/src/lib/arch/IArchNetwork.h
+++ b/src/lib/arch/IArchNetwork.h
@@ -8,9 +8,8 @@
 
 #pragma once
 
-#include "common/Common.h"
+#include <cstdint>
 #include <string>
-
 #include <vector>
 
 class ArchThreadImpl;
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 0377c9b3d..9f5e95c87 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -11,6 +11,7 @@
 #include "arch/ArchException.h"
 #include "arch/unix/ArchMultithreadPosix.h"
 #include "arch/unix/XArchUnix.h"
+#include "common/Common.h"
 
 #include <arpa/inet.h>
 #include <cstring>
diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp
index dbf279a0d..9536d66a3 100644
--- a/src/lib/base/Event.cpp
+++ b/src/lib/base/Event.cpp
@@ -7,6 +7,9 @@
 
 #include "base/Event.h"
 
+#include <assert.h>
+#include <cstdlib>
+
 //
 // Event
 //
diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
index c7d0efffe..b8b62a219 100644
--- a/src/lib/base/Event.h
+++ b/src/lib/base/Event.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "EventTypes.h"
-#include "common/Common.h"
 
 using deskflow::EventTypes;
 
diff --git a/src/lib/base/IEventJob.h b/src/lib/base/IEventJob.h
index d710c00f5..cc83cd7ad 100644
--- a/src/lib/base/IEventJob.h
+++ b/src/lib/base/IEventJob.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 class Event;
 
 //! Event handler interface
diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h
index 48957efa6..a5bb63b1a 100644
--- a/src/lib/base/IEventQueue.h
+++ b/src/lib/base/IEventQueue.h
@@ -10,7 +10,6 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "common/Common.h"
 
 #include <functional>
 #include <string>
diff --git a/src/lib/base/IEventQueueBuffer.h b/src/lib/base/IEventQueueBuffer.h
index 2e4ca99d7..ea79f6481 100644
--- a/src/lib/base/IEventQueueBuffer.h
+++ b/src/lib/base/IEventQueueBuffer.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include "common/Common.h"
+#include <assert.h>
+#include <cstdint>
 
 class Event;
 class EventQueueTimer;
diff --git a/src/lib/base/IJob.h b/src/lib/base/IJob.h
index d128e5c46..8e150e9fb 100644
--- a/src/lib/base/IJob.h
+++ b/src/lib/base/IJob.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 //! Job interface
 /*!
 A job is an interface for executing some function.
diff --git a/src/lib/base/ILogOutputter.h b/src/lib/base/ILogOutputter.h
index 4e4a57978..a3ea2c489 100644
--- a/src/lib/base/ILogOutputter.h
+++ b/src/lib/base/ILogOutputter.h
@@ -10,7 +10,6 @@
 
 #include "base/Log.h"
 #include "base/LogLevel.h"
-#include "common/Common.h"
 
 //! Outputter interface
 /*!
diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp
index 35d98d0a2..442f57682 100644
--- a/src/lib/base/Log.cpp
+++ b/src/lib/base/Log.cpp
@@ -9,6 +9,7 @@
 #include "arch/Arch.h"
 #include "base/LogLevel.h"
 #include "base/LogOutputters.h"
+#include "common/Common.h"
 #include "common/Constants.h"
 
 #include <cstdarg>
diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h
index ba875f595..f18905a2a 100644
--- a/src/lib/base/Log.h
+++ b/src/lib/base/Log.h
@@ -9,7 +9,6 @@
 
 #include "arch/Arch.h"
 #include "arch/IArchMultithread.h"
-#include "common/Common.h"
 
 #include <mutex>
 
diff --git a/src/lib/base/LogOutputters.h b/src/lib/base/LogOutputters.h
index 44306c4ce..03ee1df73 100644
--- a/src/lib/base/LogOutputters.h
+++ b/src/lib/base/LogOutputters.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "base/ILogOutputter.h"
-#include "common/Common.h"
 #include "mt/Thread.h"
 
 //! Stop traversing log chain outputter
diff --git a/src/lib/base/Stopwatch.h b/src/lib/base/Stopwatch.h
index cc4c58007..ed7632617 100644
--- a/src/lib/base/Stopwatch.h
+++ b/src/lib/base/Stopwatch.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 //! A timer class
 /*!
 This class measures time intervals.  All time interval measurement
diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp
index 9a95b27c6..02aa70593 100644
--- a/src/lib/base/String.cpp
+++ b/src/lib/base/String.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <cstdarg>
 #include <cstdint>
+#include <cstring>
 #include <sstream>
 #include <vector>
 
diff --git a/src/lib/base/String.h b/src/lib/base/String.h
index 9c8df53d1..c6491f699 100644
--- a/src/lib/base/String.h
+++ b/src/lib/base/String.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <string>
 
 //! std::string utilities
diff --git a/src/lib/base/Unicode.h b/src/lib/base/Unicode.h
index 8fbe7af5f..edb486feb 100644
--- a/src/lib/base/Unicode.h
+++ b/src/lib/base/Unicode.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "arch/ArchString.h"
-#include "common/Common.h"
+
 #include <string>
 
 //! Unicode utility functions
diff --git a/src/lib/client/HelloBack.h b/src/lib/client/HelloBack.h
index dcf3b9b28..21e1e59b7 100644
--- a/src/lib/client/HelloBack.h
+++ b/src/lib/client/HelloBack.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
 #include "deskflow/ProtocolTypes.h"
 #include "io/IStream.h"
 
diff --git a/src/lib/deskflow/AppUtil.cpp b/src/lib/deskflow/AppUtil.cpp
index cfbeffe25..013b20d7c 100644
--- a/src/lib/deskflow/AppUtil.cpp
+++ b/src/lib/deskflow/AppUtil.cpp
@@ -8,6 +8,7 @@
 #include "deskflow/AppUtil.h"
 
 #include "algorithm"
+#include <assert.h>
 
 AppUtil *AppUtil::s_instance = nullptr;
 
diff --git a/src/lib/deskflow/Chunk.h b/src/lib/deskflow/Chunk.h
index 8ce66d455..98eb858d8 100644
--- a/src/lib/deskflow/Chunk.h
+++ b/src/lib/deskflow/Chunk.h
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include "common/Common.h"
 #include <base/Event.h>
 
+#include <cstring>
+
 class Chunk : public EventData
 {
 public:
diff --git a/src/lib/deskflow/ClipboardChunk.h b/src/lib/deskflow/ClipboardChunk.h
index 99529ce44..9cf87cf41 100644
--- a/src/lib/deskflow/ClipboardChunk.h
+++ b/src/lib/deskflow/ClipboardChunk.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
 #include "deskflow/Chunk.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/ProtocolTypes.h"
diff --git a/src/lib/deskflow/ClipboardTypes.h b/src/lib/deskflow/ClipboardTypes.h
index 9bee5372a..9886220f2 100644
--- a/src/lib/deskflow/ClipboardTypes.h
+++ b/src/lib/deskflow/ClipboardTypes.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/Common.h"
+#include <cstdint>
 
 //! Clipboard ID
 /*!
diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h
index 33dde6848..ad25a4377 100644
--- a/src/lib/deskflow/IApp.h
+++ b/src/lib/deskflow/IApp.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 using StartupFunc = int (*)(int, char **);
 
 namespace deskflow {
diff --git a/src/lib/deskflow/IAppUtil.h b/src/lib/deskflow/IAppUtil.h
index 2fefb8ccd..f0108a2ae 100644
--- a/src/lib/deskflow/IAppUtil.h
+++ b/src/lib/deskflow/IAppUtil.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
 #include "deskflow/IApp.h"
 
 #include <string>
diff --git a/src/lib/deskflow/IClipboard.cpp b/src/lib/deskflow/IClipboard.cpp
index 3de0747a6..73a3f84b7 100644
--- a/src/lib/deskflow/IClipboard.cpp
+++ b/src/lib/deskflow/IClipboard.cpp
@@ -7,6 +7,7 @@
 
 #include "deskflow/IClipboard.h"
 
+#include <assert.h>
 #include <vector>
 
 //
diff --git a/src/lib/deskflow/IClipboard.h b/src/lib/deskflow/IClipboard.h
index 389fd4f39..171cbc0a7 100644
--- a/src/lib/deskflow/IClipboard.h
+++ b/src/lib/deskflow/IClipboard.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/Common.h"
 
+#include <cstdint>
 #include <string>
 
 //! Clipboard interface
diff --git a/src/lib/deskflow/IKeyState.cpp b/src/lib/deskflow/IKeyState.cpp
index e5d3aa270..20caa0089 100644
--- a/src/lib/deskflow/IKeyState.cpp
+++ b/src/lib/deskflow/IKeyState.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "deskflow/IKeyState.h"
+#include "common/Common.h"
 
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/lib/deskflow/IKeyState.h b/src/lib/deskflow/IKeyState.h
index 279ade7a2..fd5e14584 100644
--- a/src/lib/deskflow/IKeyState.h
+++ b/src/lib/deskflow/IKeyState.h
@@ -11,7 +11,6 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "base/IEventQueue.h"
-#include "common/Common.h"
 #include "deskflow/KeyTypes.h"
 
 #include <set>
diff --git a/src/lib/deskflow/IPrimaryScreen.h b/src/lib/deskflow/IPrimaryScreen.h
index cf6c00577..7b874a866 100644
--- a/src/lib/deskflow/IPrimaryScreen.h
+++ b/src/lib/deskflow/IPrimaryScreen.h
@@ -10,7 +10,6 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "common/Common.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 
diff --git a/src/lib/deskflow/IScreen.h b/src/lib/deskflow/IScreen.h
index b498c101c..4e3a23ef6 100644
--- a/src/lib/deskflow/IScreen.h
+++ b/src/lib/deskflow/IScreen.h
@@ -10,7 +10,6 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "common/Common.h"
 #include "deskflow/ClipboardTypes.h"
 
 class IClipboard;
diff --git a/src/lib/deskflow/IScreenSaver.h b/src/lib/deskflow/IScreenSaver.h
index 57f728aa7..9d56e7c5e 100644
--- a/src/lib/deskflow/IScreenSaver.h
+++ b/src/lib/deskflow/IScreenSaver.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "base/Event.h"
-#include "common/Common.h"
 
 //! Screen saver interface
 /*!
diff --git a/src/lib/deskflow/ISecondaryScreen.h b/src/lib/deskflow/ISecondaryScreen.h
index 8dba51c51..f64d65193 100644
--- a/src/lib/deskflow/ISecondaryScreen.h
+++ b/src/lib/deskflow/ISecondaryScreen.h
@@ -10,7 +10,6 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "common/Common.h"
 #include "deskflow/MouseTypes.h"
 
 //! Secondary screen interface
diff --git a/src/lib/deskflow/KeyTypes.h b/src/lib/deskflow/KeyTypes.h
index 1e4612fc4..027412205 100644
--- a/src/lib/deskflow/KeyTypes.h
+++ b/src/lib/deskflow/KeyTypes.h
@@ -7,8 +7,7 @@
 
 #pragma once
 
-#include "common/Common.h"
-
+#include <stdint.h>
 //! Key ID
 /*!
 Type to hold a key symbol identifier.  The encoding is UTF-32, using
diff --git a/src/lib/io/IStream.h b/src/lib/io/IStream.h
index 57a3d4e3f..50f1defd5 100644
--- a/src/lib/io/IStream.h
+++ b/src/lib/io/IStream.h
@@ -11,7 +11,6 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "base/IEventQueue.h"
-#include "common/Common.h"
 
 class IEventQueue;
 
diff --git a/src/lib/io/StreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp
index 7b4fb4b72..51648281d 100644
--- a/src/lib/io/StreamBuffer.cpp
+++ b/src/lib/io/StreamBuffer.cpp
@@ -6,7 +6,8 @@
  */
 
 #include "io/StreamBuffer.h"
-#include "common/Common.h"
+
+#include <assert.h>
 
 //
 // StreamBuffer
diff --git a/src/lib/mt/CondVar.h b/src/lib/mt/CondVar.h
index f49742248..ee20267c2 100644
--- a/src/lib/mt/CondVar.h
+++ b/src/lib/mt/CondVar.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "common/Common.h"
 #include "mt/Mutex.h"
 
 class Stopwatch;
diff --git a/src/lib/mt/Lock.h b/src/lib/mt/Lock.h
index 0141a648c..d68a174ff 100644
--- a/src/lib/mt/Lock.h
+++ b/src/lib/mt/Lock.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 class Mutex;
 class CondVarBase;
 
diff --git a/src/lib/net/IDataSocket.cpp b/src/lib/net/IDataSocket.cpp
index 95cddc63a..e0233a8cc 100644
--- a/src/lib/net/IDataSocket.cpp
+++ b/src/lib/net/IDataSocket.cpp
@@ -8,6 +8,8 @@
 #include "net/IDataSocket.h"
 #include "base/EventQueue.h"
 
+#include <assert.h>
+
 //
 // IDataSocket
 //
diff --git a/src/lib/net/ISocket.h b/src/lib/net/ISocket.h
index aa229dd99..1be324922 100644
--- a/src/lib/net/ISocket.h
+++ b/src/lib/net/ISocket.h
@@ -10,7 +10,6 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "common/Common.h"
 
 class NetworkAddress;
 
diff --git a/src/lib/net/ISocketFactory.h b/src/lib/net/ISocketFactory.h
index ca13181f7..353881e4c 100644
--- a/src/lib/net/ISocketFactory.h
+++ b/src/lib/net/ISocketFactory.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "arch/IArchNetwork.h"
-#include "common/Common.h"
 #include "net/SecurityLevel.h"
 
 class IDataSocket;
diff --git a/src/lib/net/ISocketMultiplexerJob.h b/src/lib/net/ISocketMultiplexerJob.h
index 0c243d35d..c7384df9a 100644
--- a/src/lib/net/ISocketMultiplexerJob.h
+++ b/src/lib/net/ISocketMultiplexerJob.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "arch/IArchNetwork.h"
-#include "common/Common.h"
 
 //! Socket multiplexer job
 /*!
diff --git a/src/lib/net/SocketException.h b/src/lib/net/SocketException.h
index df5d9d15b..702893590 100644
--- a/src/lib/net/SocketException.h
+++ b/src/lib/net/SocketException.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "base/BaseException.h"
-#include "common/Common.h"
 #include "io/IOException.h"
 
 /**
diff --git a/src/lib/platform/IMSWindowsClipboardFacade.h b/src/lib/platform/IMSWindowsClipboardFacade.h
index af65e6dd3..6020a328b 100644
--- a/src/lib/platform/IMSWindowsClipboardFacade.h
+++ b/src/lib/platform/IMSWindowsClipboardFacade.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
diff --git a/src/lib/platform/IOSXKeyResource.h b/src/lib/platform/IOSXKeyResource.h
index 7175bbc52..79a5015e1 100644
--- a/src/lib/platform/IOSXKeyResource.h
+++ b/src/lib/platform/IOSXKeyResource.h
@@ -9,6 +9,8 @@
 
 #include "deskflow/KeyState.h"
 
+#include <CoreServices/CoreServices.h>
+
 class IOSXKeyResource
 {
 public:
diff --git a/src/lib/platform/OSXCocoaApp.h b/src/lib/platform/OSXCocoaApp.h
index 64590774a..b1a49be41 100644
--- a/src/lib/platform/OSXCocoaApp.h
+++ b/src/lib/platform/OSXCocoaApp.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #import <CoreFoundation/CoreFoundation.h>
 
 #if defined(__cplusplus)
diff --git a/src/lib/platform/OSXPasteboardPeeker.h b/src/lib/platform/OSXPasteboardPeeker.h
index 5aa74dd68..d780f8642 100644
--- a/src/lib/platform/OSXPasteboardPeeker.h
+++ b/src/lib/platform/OSXPasteboardPeeker.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #import <CoreFoundation/CoreFoundation.h>
 
 #if defined(__cplusplus)
diff --git a/src/lib/platform/OSXScreenSaverUtil.h b/src/lib/platform/OSXScreenSaverUtil.h
index 08003c5d7..83a0bf262 100644
--- a/src/lib/platform/OSXScreenSaverUtil.h
+++ b/src/lib/platform/OSXScreenSaverUtil.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #if defined(__cplusplus)
 extern "C"
 {
diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp
index b3af59847..4187696ac 100644
--- a/src/lib/platform/XWindowsClipboard.cpp
+++ b/src/lib/platform/XWindowsClipboard.cpp
@@ -10,7 +10,6 @@
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/Stopwatch.h"
-#include "common/Common.h"
 #include "platform/XWindowsClipboardBMPConverter.h"
 #include "platform/XWindowsClipboardHTMLConverter.h"
 #include "platform/XWindowsClipboardTextConverter.h"
diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index d387b6afe..9dd90ce19 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "Config.h"
 #include "deskflow/KeyState.h"
 
 #include <map>
diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp
index c103b975e..d979bee72 100644
--- a/src/lib/server/Config.cpp
+++ b/src/lib/server/Config.cpp
@@ -15,6 +15,7 @@
 #include "net/SocketException.h"
 #include "server/Server.h"
 
+#include <assert.h>
 #include <cstdlib>
 #include <istream>
 #include <ostream>
diff --git a/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp b/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp
index 65ef06f1d..4cd439da0 100644
--- a/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp
+++ b/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp
@@ -6,7 +6,6 @@
 
 #include "client/HelloBack.h"
 
-#include "common/Common.h"
 #include "unittests/legacytests/mock/io/MockStream.h"
 
 #include <array>