diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h
index c7b3563da..f0119ba9c 100644
--- a/src/lib/arch/IArchFile.h
+++ b/src/lib/arch/IArchFile.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "common/stdstring.h"
+#include <string>
 
 //! Interface for architecture dependent file system operations
 /*!
diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h
index db57cf456..c752769dd 100644
--- a/src/lib/arch/IArchNetwork.h
+++ b/src/lib/arch/IArchNetwork.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "common/stdstring.h"
+#include <string>
 
 #include <vector>
 
diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h
index 0a3696f6d..bb9d9ddb9 100644
--- a/src/lib/arch/IArchSystem.h
+++ b/src/lib/arch/IArchSystem.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "common/stdstring.h"
+#include <string>
 
 //! Interface for architecture dependent system queries
 /*!
diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h
index 3ab91fad4..4d6006f82 100644
--- a/src/lib/arch/XArch.h
+++ b/src/lib/arch/XArch.h
@@ -20,7 +20,7 @@
 
 #include "common/common.h"
 #include "common/stdexcept.h"
-#include "common/stdstring.h"
+#include <string>
 
 //! Generic thread exception
 /*!
diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h
index ed95191b7..2bda6581d 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.h
+++ b/src/lib/arch/win32/ArchDaemonWindows.h
@@ -21,7 +21,7 @@
 #include "arch/IArchDaemon.h"
 #include "arch/IArchMultithread.h"
 #include "common/constants.h"
-#include "common/stdstring.h"
+#include <string>
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h
index abb3b7b31..82bcd3a6d 100644
--- a/src/lib/arch/win32/ArchMiscWindows.h
+++ b/src/lib/arch/win32/ArchMiscWindows.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/stdset.h"
-#include "common/stdstring.h"
+#include <string>
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
diff --git a/src/lib/base/String.h b/src/lib/base/String.h
index f38fdf3ee..80fde0405 100644
--- a/src/lib/base/String.h
+++ b/src/lib/base/String.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/common.h"
-#include "common/stdstring.h"
+#include <string>
 
 #include <stdarg.h>
 #include <vector>
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 0efa646ac..2648f7f7b 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -22,7 +22,6 @@ add_library(common INTERFACE
   stdpre.h
   stdset.h
   stdsstream.h
-  stdstring.h
   stdvector.h
   ${CMAKE_CURRENT_BINARY_DIR}/constants.h
 )
diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h
deleted file mode 100644
index b0caa6f3e..000000000
--- a/src/lib/common/stdstring.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "stdpre.h"
-
-#include <string>
-
-#include "stdpost.h"