diff --git a/cpp/iedriver/ActionSimulators/ActionSimulator.h b/cpp/iedriver/ActionSimulators/ActionSimulator.h
index 4eac93fd71e5a..90d5328a419b8 100644
--- a/cpp/iedriver/ActionSimulators/ActionSimulator.h
+++ b/cpp/iedriver/ActionSimulators/ActionSimulator.h
@@ -17,6 +17,7 @@
 #ifndef WEBDRIVER_IE_ACTIONSIMULATOR_H_
 #define WEBDRIVER_IE_ACTIONSIMULATOR_H_
 
+#include <string>
 #include <vector>
 
 #include "../CustomTypes.h"
diff --git a/cpp/iedriver/ActionSimulators/SendMessageActionSimulator.h b/cpp/iedriver/ActionSimulators/SendMessageActionSimulator.h
index 00e0be2c00492..e0542df75eb3f 100644
--- a/cpp/iedriver/ActionSimulators/SendMessageActionSimulator.h
+++ b/cpp/iedriver/ActionSimulators/SendMessageActionSimulator.h
@@ -29,8 +29,6 @@
 #define WD_CLIENT_MIDDLE_MOUSE_BUTTON 1
 #define WD_CLIENT_RIGHT_MOUSE_BUTTON 2
 
-#include <vector>
-
 #include "ActionSimulator.h"
 
 namespace webdriver {
diff --git a/cpp/iedriver/CommandHandlerRepository.h b/cpp/iedriver/CommandHandlerRepository.h
index e0331cbffbdcc..56cde4a3733d2 100644
--- a/cpp/iedriver/CommandHandlerRepository.h
+++ b/cpp/iedriver/CommandHandlerRepository.h
@@ -19,6 +19,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 
 namespace webdriver {
 
diff --git a/cpp/iedriver/CookieManager.cpp b/cpp/iedriver/CookieManager.cpp
index 1de1b443bb531..91b400159334a 100644
--- a/cpp/iedriver/CookieManager.cpp
+++ b/cpp/iedriver/CookieManager.cpp
@@ -16,7 +16,6 @@
 
 #include "CookieManager.h"
 
-#include <map>
 #include <UrlMon.h>
 #include <wininet.h>
 
diff --git a/cpp/iedriver/CookieManager.h b/cpp/iedriver/CookieManager.h
index a7c43f12fe90f..908205222edcf 100644
--- a/cpp/iedriver/CookieManager.h
+++ b/cpp/iedriver/CookieManager.h
@@ -18,6 +18,7 @@
 #define WEBDRIVER_COOKIEMANAGER_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 namespace webdriver {
diff --git a/cpp/iedriver/InputState.h b/cpp/iedriver/InputState.h
index d447b53563e8d..4b27a86501d9f 100644
--- a/cpp/iedriver/InputState.h
+++ b/cpp/iedriver/InputState.h
@@ -18,6 +18,7 @@
 #define WEBDRIVER_IE_INPUTSTATE_H_
 
 #include <ctime>
+#include <string>
 
 namespace webdriver {