diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 5b999909b197fca08a28908fdcc5746271c0e4d1..d327d8b41e59a1061542bab6b6efcc33c68bb0ba 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -36,7 +36,6 @@
 
 #include <chrono>
 #include <map>
-#include <mutex>
 
 #include "config.h"
 
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index 71e3b464d9ae10889d3aa6edacb386ff89e915cc..92775c9492afbafa354f718db93b89b2c45f9888 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -32,6 +32,9 @@
  */
 
 #include <grpc++/server_context.h>
+
+#include <mutex>
+
 #include <grpc++/impl/call.h>
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>