diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 34634b9..cace2a4 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -31,6 +31,7 @@
 
 #include "my_config.h"
 
+#include <stdexcept>
 #include <algorithm>
 #include <cmath>  // std::isinf
 #include <functional>
diff --git a/router/src/harness/src/logging/registry.cc b/router/src/harness/src/logging/registry.cc
index 6a8c6d2..f2fb910 100644
--- a/router/src/harness/src/logging/registry.cc
+++ b/router/src/harness/src/logging/registry.cc
@@ -25,7 +25,7 @@
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#define getpid GetCurrentProcessId
+#define usergetpid GetCurrentProcessId
 #endif
 
 #include "my_compiler.h"
@@ -381,7 +381,7 @@ extern "C" void log_message(LogLevel level, const char *module, const char *fmt,
              "logging the following message as '%s' instead",
              module, g_main_app_log_domain.c_str());
     logger.handle(
-        {LogLevel::kError, getpid(), now, g_main_app_log_domain, msg});
+        {LogLevel::kError, usergetpid(), now, g_main_app_log_domain, msg});
 
     // And switch log domain to main application domain for the original
     // log message
@@ -393,7 +393,7 @@ extern "C" void log_message(LogLevel level, const char *module, const char *fmt,
   vsnprintf(message, sizeof(message), fmt, ap);
 
   // Build the record for the handler.
-  Record record{level, getpid(), now, module, message};
+  Record record{level, usergetpid(), now, module, message};
 
   // Pass the record to the correct logger. The record should be
   // passed to only one logger since otherwise the handler can get
diff --git a/router/src/http/include/mysqlrouter/http_common.h b/router/src/http/include/mysqlrouter/http_common.h
index 53da427..0ce9c33 100644
--- a/router/src/http/include/mysqlrouter/http_common.h
+++ b/router/src/http/include/mysqlrouter/http_common.h
@@ -32,6 +32,8 @@
 #include <functional>  // std::function
 #include <memory>
 #include <vector>
+#include <string>
+#include <stdexcept>
 
 struct evhttp_uri;
 struct evhttp_request;
diff --git a/router/src/router/include/mysqlrouter/uri.h b/router/src/router/include/mysqlrouter/uri.h
index 70be6d7..2d524cc 100644
--- a/router/src/router/include/mysqlrouter/uri.h
+++ b/router/src/router/include/mysqlrouter/uri.h
@@ -27,6 +27,7 @@
 
 #include "router_config.h"
 
+#include <stdexcept>
 #include <cstdint>
 #include <exception>
 #include <map>