diff --git a/ChangeLog b/ChangeLog
index 777021da9..c00f254fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Bug fixes:
 - #7092 Synergy is running after quit on Linux
 - #7095 Update account and upgrade links
 - #7096 The system duplicates hotkeys in setup
+- #7099 SYNERGY-854 Fix compilation with msvc 2014
 - #7100 No configuration available on Windows
 - #7097 The title "Enterprise" disappeares after clicking on "Preferences"
 
diff --git a/src/lib/synergy/KeyMap.h b/src/lib/synergy/KeyMap.h
index d12fd755f..71c566fbc 100644
--- a/src/lib/synergy/KeyMap.h
+++ b/src/lib/synergy/KeyMap.h
@@ -103,6 +103,11 @@ public:
 		};
 		union Data {
 		public:
+			Data() = default;
+			Data(Data &&) = default;
+			Data(const Data&) = default;
+			Data& operator=(const Data&) = default;
+
 			Button		m_button {};
 			Group		m_group;
 		};
diff --git a/src/lib/synergy/win32/AppUtilWindows.cpp b/src/lib/synergy/win32/AppUtilWindows.cpp
index 471098788..94d005162 100644
--- a/src/lib/synergy/win32/AppUtilWindows.cpp
+++ b/src/lib/synergy/win32/AppUtilWindows.cpp
@@ -33,7 +33,7 @@
 #include "common/Version.h"
 #include "wintoastlib.h"
 
-#include <thread>
+#include <memory>
 #include <sstream>
 #include <iostream>
 #include <conio.h>