diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
index c8719e16b..47af8c305 100644
--- a/src/lib/arch/Arch.h
+++ b/src/lib/arch/Arch.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #if SYSAPI_WIN32
 
diff --git a/src/lib/arch/IArchString.cpp b/src/lib/arch/IArchString.cpp
index 0fa6d5448..88ca2c99a 100644
--- a/src/lib/arch/IArchString.cpp
+++ b/src/lib/arch/IArchString.cpp
@@ -7,7 +7,7 @@
 
 #include "arch/IArchString.h"
 #include "arch/Arch.h"
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <climits>
 #include <cstdlib>
diff --git a/src/lib/arch/IArchString.h b/src/lib/arch/IArchString.h
index 529b39cb4..d3ad84b8b 100644
--- a/src/lib/arch/IArchString.h
+++ b/src/lib/arch/IArchString.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include "common/Common.h"
 #include "common/IInterface.h"
-#include "common/common.h"
 
 #include <stdarg.h>
 
diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h
index b7bff11d9..aab274d0a 100644
--- a/src/lib/arch/XArch.h
+++ b/src/lib/arch/XArch.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "common/stdexcept.h"
 #include <string>
 
diff --git a/src/lib/arch/multibyte.h b/src/lib/arch/multibyte.h
index 86d953dbe..e1844b1bb 100644
--- a/src/lib/arch/multibyte.h
+++ b/src/lib/arch/multibyte.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "arch/Arch.h"
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <climits>
 #include <cstdlib>
diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
index a092b5bf7..f5a6b90b4 100644
--- a/src/lib/base/Event.h
+++ b/src/lib/base/Event.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "common/stdmap.h"
 
 class EventData
diff --git a/src/lib/base/IEventQueueBuffer.h b/src/lib/base/IEventQueueBuffer.h
index 9bc56f1c4..e822bda78 100644
--- a/src/lib/base/IEventQueueBuffer.h
+++ b/src/lib/base/IEventQueueBuffer.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "common/Common.h"
 #include "common/IInterface.h"
-#include "common/common.h"
 
 class Event;
 class EventQueueTimer;
diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h
index 78266b538..47b25ed96 100644
--- a/src/lib/base/Log.h
+++ b/src/lib/base/Log.h
@@ -9,7 +9,7 @@
 
 #include "arch/Arch.h"
 #include "arch/IArchMultithread.h"
-#include "common/common.h"
+#include "common/Common.h"
 #include "common/stdlist.h"
 
 #include <stdarg.h>
diff --git a/src/lib/base/LogOutputters.h b/src/lib/base/LogOutputters.h
index 3e14e3b6c..fc257a30b 100644
--- a/src/lib/base/LogOutputters.h
+++ b/src/lib/base/LogOutputters.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "base/ILogOutputter.h"
-#include "common/common.h"
+#include "common/Common.h"
 #include "common/stddeque.h"
 #include "mt/Thread.h"
 
diff --git a/src/lib/base/Path.h b/src/lib/base/Path.h
index 87d83e03e..aac684ee9 100644
--- a/src/lib/base/Path.h
+++ b/src/lib/base/Path.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <common/common.h>
+#include "common/Common.h"
 #include <string>
 
 namespace deskflow {
diff --git a/src/lib/base/Stopwatch.h b/src/lib/base/Stopwatch.h
index 973c610b3..e82bf3539 100644
--- a/src/lib/base/Stopwatch.h
+++ b/src/lib/base/Stopwatch.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 //! A timer class
 /*!
diff --git a/src/lib/base/String.h b/src/lib/base/String.h
index 74fbdd538..8fd6f7fd5 100644
--- a/src/lib/base/String.h
+++ b/src/lib/base/String.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include <string>
 
 #include <stdarg.h>
diff --git a/src/lib/base/Unicode.h b/src/lib/base/Unicode.h
index 6f72894d3..0b518014b 100644
--- a/src/lib/base/Unicode.h
+++ b/src/lib/base/Unicode.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "arch/IArchString.h"
-#include "common/common.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 9782d4610..b2043cc1a 100644
--- a/src/lib/client/HelloBack.h
+++ b/src/lib/client/HelloBack.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "deskflow/ProtocolTypes.h"
 #include "io/IStream.h"
 
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 0568aba7a..19e612c1d 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -4,7 +4,7 @@
 configure_file(constants.h.in constants.h @ONLY)
 
 add_library(common STATIC
-  common.h
+  Common.h
   IInterface.h
   stddeque.h
   stdexcept.h
diff --git a/src/lib/common/common.h b/src/lib/common/Common.h
similarity index 100%
rename from src/lib/common/common.h
rename to src/lib/common/Common.h
diff --git a/src/lib/common/IInterface.h b/src/lib/common/IInterface.h
index a5b721200..8d138a6c3 100644
--- a/src/lib/common/IInterface.h
+++ b/src/lib/common/IInterface.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "Common.h"
 
 //! Base class of interfaces
 /*!
diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h
index 5e85f8a30..bb428ffb6 100644
--- a/src/lib/deskflow/App.h
+++ b/src/lib/deskflow/App.h
@@ -9,7 +9,7 @@
 
 #include "base/EventQueue.h"
 #include "base/Log.h"
-#include "common/common.h"
+#include "common/Common.h"
 #include "deskflow/IApp.h"
 
 #if SYSAPI_WIN32
diff --git a/src/lib/deskflow/Chunk.h b/src/lib/deskflow/Chunk.h
index 9a374d146..6b8baf8e3 100644
--- a/src/lib/deskflow/Chunk.h
+++ b/src/lib/deskflow/Chunk.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include <base/EventTypes.h>
 
 class Chunk : public EventData
diff --git a/src/lib/deskflow/ClipboardChunk.h b/src/lib/deskflow/ClipboardChunk.h
index 8a768c64e..3d4b5c613 100644
--- a/src/lib/deskflow/ClipboardChunk.h
+++ b/src/lib/deskflow/ClipboardChunk.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "deskflow/Chunk.h"
 #include "deskflow/ClipboardTypes.h"
 
diff --git a/src/lib/deskflow/ClipboardTypes.h b/src/lib/deskflow/ClipboardTypes.h
index a1cf6645e..9bee5372a 100644
--- a/src/lib/deskflow/ClipboardTypes.h
+++ b/src/lib/deskflow/ClipboardTypes.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 //! Clipboard ID
 /*!
diff --git a/src/lib/deskflow/DaemonApp.h b/src/lib/deskflow/DaemonApp.h
index 1e74abfa9..bb680b4f3 100644
--- a/src/lib/deskflow/DaemonApp.h
+++ b/src/lib/deskflow/DaemonApp.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <string>
 
diff --git a/src/lib/deskflow/FileChunk.h b/src/lib/deskflow/FileChunk.h
index de9a41e2a..0f1fbf8da 100644
--- a/src/lib/deskflow/FileChunk.h
+++ b/src/lib/deskflow/FileChunk.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "deskflow/Chunk.h"
 
 #include <string>
diff --git a/src/lib/deskflow/KeyTypes.h b/src/lib/deskflow/KeyTypes.h
index 0f4b158b4..6650fbf73 100644
--- a/src/lib/deskflow/KeyTypes.h
+++ b/src/lib/deskflow/KeyTypes.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 //! Key ID
 /*!
diff --git a/src/lib/io/Filesystem.cpp b/src/lib/io/Filesystem.cpp
index 2f1b27af1..ec1992bb6 100644
--- a/src/lib/io/Filesystem.cpp
+++ b/src/lib/io/Filesystem.cpp
@@ -7,7 +7,7 @@
 
 #include "Filesystem.h"
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <fstream>
 
diff --git a/src/lib/io/StreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp
index 66beec13d..d84369d3e 100644
--- a/src/lib/io/StreamBuffer.cpp
+++ b/src/lib/io/StreamBuffer.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "io/StreamBuffer.h"
-#include "common/common.h"
+#include "common/Common.h"
 
 //
 // StreamBuffer
diff --git a/src/lib/mt/CondVar.h b/src/lib/mt/CondVar.h
index 461261bd9..1972b60cf 100644
--- a/src/lib/mt/CondVar.h
+++ b/src/lib/mt/CondVar.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#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 a2f19be51..702aec236 100644
--- a/src/lib/mt/Lock.h
+++ b/src/lib/mt/Lock.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 class Mutex;
 class CondVarBase;
diff --git a/src/lib/net/XSocket.h b/src/lib/net/XSocket.h
index 2c81a91f9..d48cfb337 100644
--- a/src/lib/net/XSocket.h
+++ b/src/lib/net/XSocket.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "base/XBase.h"
-#include "common/common.h"
+#include "common/Common.h"
 #include "io/XIO.h"
 
 //! Generic socket exception
diff --git a/src/lib/platform/MSWindowsDropTarget.cpp b/src/lib/platform/MSWindowsDropTarget.cpp
index 84005cb7c..d65236701 100644
--- a/src/lib/platform/MSWindowsDropTarget.cpp
+++ b/src/lib/platform/MSWindowsDropTarget.cpp
@@ -7,7 +7,7 @@
 #include "platform/MSWindowsDropTarget.h"
 
 #include "base/Log.h"
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <Shlobj.h>
 #include <stdio.h>
diff --git a/src/lib/platform/OSXDragSimulator.h b/src/lib/platform/OSXDragSimulator.h
index 51ba8113d..0657cb66c 100644
--- a/src/lib/platform/OSXDragSimulator.h
+++ b/src/lib/platform/OSXDragSimulator.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 
diff --git a/src/lib/platform/OSXPasteboardPeeker.h b/src/lib/platform/OSXPasteboardPeeker.h
index b27f88f94..5aa74dd68 100644
--- a/src/lib/platform/OSXPasteboardPeeker.h
+++ b/src/lib/platform/OSXPasteboardPeeker.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 
diff --git a/src/lib/platform/OSXScreenSaverUtil.h b/src/lib/platform/OSXScreenSaverUtil.h
index 5fcf0ae77..08003c5d7 100644
--- a/src/lib/platform/OSXScreenSaverUtil.h
+++ b/src/lib/platform/OSXScreenSaverUtil.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #if defined(__cplusplus)
 extern "C"
diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp
index b7ab20c85..5e364ca64 100644
--- a/src/lib/platform/XWindowsClipboard.cpp
+++ b/src/lib/platform/XWindowsClipboard.cpp
@@ -10,7 +10,7 @@
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/Stopwatch.h"
-#include "common/common.h"
+#include "common/Common.h"
 #include "common/stdvector.h"
 #include "platform/XWindowsClipboardBMPConverter.h"
 #include "platform/XWindowsClipboardHTMLConverter.h"
diff --git a/src/test/unittests/client/HelloBackTests.cpp b/src/test/unittests/client/HelloBackTests.cpp
index 287105542..121a7162e 100644
--- a/src/test/unittests/client/HelloBackTests.cpp
+++ b/src/test/unittests/client/HelloBackTests.cpp
@@ -6,7 +6,7 @@
 
 #include "client/HelloBack.h"
 
-#include "common/common.h"
+#include "common/Common.h"
 #include "mock/io/MockStream.h"
 
 #include <array>