diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
index 73c2353d4..bfbea0c8d 100644
--- a/src/lib/base/Event.h
+++ b/src/lib/base/Event.h
@@ -8,7 +8,8 @@
 #pragma once
 
 #include "common/Common.h"
-#include "common/StdMap.h"
+
+#include <map>
 
 class EventData
 {
diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h
index 110b0d409..0c603f397 100644
--- a/src/lib/base/EventQueue.h
+++ b/src/lib/base/EventQueue.h
@@ -13,10 +13,10 @@
 #include "base/IEventQueue.h"
 #include "base/PriorityQueue.h"
 #include "base/Stopwatch.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "mt/CondVar.h"
 
+#include <map>
 #include <queue>
 
 class Mutex;
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 40883e395..ef3c253e8 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(common STATIC
   IInterface.h
   StdExcept.h
   StdIStream.h
-  StdMap.h
   StdOStream.h
   StdSet.h
   Settings.h
diff --git a/src/lib/common/StdMap.h b/src/lib/common/StdMap.h
deleted file mode 100644
index 8af32d13b..000000000
--- a/src/lib/common/StdMap.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <map>
diff --git a/src/lib/deskflow/KeyMap.h b/src/lib/deskflow/KeyMap.h
index 2254e805b..4e854b7c7 100644
--- a/src/lib/deskflow/KeyMap.h
+++ b/src/lib/deskflow/KeyMap.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include "base/String.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/KeyTypes.h"
 
+#include <map>
 #include <vector>
 
 #ifdef TEST_ENV
diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h
index 426d24e0f..761b2d9be 100644
--- a/src/lib/net/SocketMultiplexer.h
+++ b/src/lib/net/SocketMultiplexer.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "arch/IArchNetwork.h"
-#include "common/StdMap.h"
 
 #include <list>
+#include <map>
 
 template <class T> class CondVar;
 class Mutex;
diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h
index 2964eff3a..424d3edde 100644
--- a/src/lib/platform/MSWindowsDesks.h
+++ b/src/lib/platform/MSWindowsDesks.h
@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 #include "deskflow/OptionTypes.h"
 #include "mt/CondVar.h"
 #include "mt/Mutex.h"
 
+#include <map>
 #include <string>
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h
index d1111241d..8bbfa3ffb 100644
--- a/src/lib/platform/OSXKeyState.h
+++ b/src/lib/platform/OSXKeyState.h
@@ -8,12 +8,12 @@
 #pragma once
 
 #include "OSXAutoTypes.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/KeyState.h"
 
 #include <Carbon/Carbon.h>
 
+#include <map>
 #include <vector>
 
 class IOSXKeyResource;
diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h
index 2e6b4450d..011ab9292 100644
--- a/src/lib/platform/OSXScreen.h
+++ b/src/lib/platform/OSXScreen.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdMap.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/PlatformScreen.h"
 #include "platform/OSXClipboard.h"
@@ -16,10 +15,12 @@
 
 #include <Carbon/Carbon.h>
 #include <IOKit/IOMessage.h>
-#include <bitset>
 #include <mach/mach_init.h>
 #include <mach/mach_interface.h>
 #include <mach/mach_port.h>
+
+#include <bitset>
+#include <map>
 #include <memory>
 #include <vector>
 
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h
index fcc0886d7..cb6ac7f91 100644
--- a/src/lib/platform/XWindowsClipboard.h
+++ b/src/lib/platform/XWindowsClipboard.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/IClipboard.h"
 
 #include <list>
+#include <map>
 #include <vector>
 
 #if X_DISPLAY_MISSING
diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp
index fb7086382..08d9db929 100644
--- a/src/lib/platform/XWindowsKeyState.cpp
+++ b/src/lib/platform/XWindowsKeyState.cpp
@@ -15,7 +15,6 @@
 #include "platform/XWindowsKeyState.h"
 
 #include "base/Log.h"
-#include "common/StdMap.h"
 #include "deskflow/AppUtil.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ClientArgs.h"
@@ -23,6 +22,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <map>
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else
diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index 691340da8..8fe560960 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "deskflow/KeyState.h"
 
+#include <map>
 #include <vector>
 
 #if X_DISPLAY_MISSING
diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h
index 931dfa3b1..51791eed4 100644
--- a/src/lib/platform/XWindowsScreenSaver.h
+++ b/src/lib/platform/XWindowsScreenSaver.h
@@ -8,9 +8,10 @@
 #pragma once
 
 #include "base/IEventQueue.h"
-#include "common/StdMap.h"
 #include "deskflow/IScreenSaver.h"
 
+#include <map>
+
 #if X_DISPLAY_MISSING
 #error X11 is required to build deskflow
 #else
diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h
index 71e4e11a1..d30b854c8 100644
--- a/src/lib/platform/XWindowsUtil.h
+++ b/src/lib/platform/XWindowsUtil.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/StdMap.h"
 
+#include <map>
 #include <string>
 #include <vector>
 
diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h
index 8faf404a4..99abb8b45 100644
--- a/src/lib/server/Config.h
+++ b/src/lib/server/Config.h
@@ -9,7 +9,6 @@
 
 #include "base/String.h"
 #include "base/XBase.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/OptionTypes.h"
@@ -18,6 +17,7 @@
 #include "server/InputFilter.h"
 
 #include <iosfwd>
+#include <map>
 
 namespace deskflow::server {
 class Config;
diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h
index 30693cccc..7e1a49dd6 100644
--- a/src/lib/server/InputFilter.h
+++ b/src/lib/server/InputFilter.h
@@ -7,13 +7,14 @@
 
 #pragma once
 
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 #include "deskflow/ProtocolTypes.h"
 
+#include <map>
+
 class PrimaryClient;
 class Event;
 class IEventQueue;
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index b862682a4..c11b48483 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -10,7 +10,6 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "base/Stopwatch.h"
-#include "common/StdMap.h"
 #include "common/StdSet.h"
 #include "deskflow/Clipboard.h"
 #include "deskflow/ClipboardTypes.h"
@@ -22,6 +21,7 @@
 #include "deskflow/ServerArgs.h"
 #include "server/Config.h"
 
+#include <map>
 #include <memory>
 #include <vector>