diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index bddb4f62aa8..3ecfad98af6 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -34,10 +34,8 @@
 #ifndef GRPCXX_SERVER_H
 #define GRPCXX_SERVER_H
 
-#include <condition_variable>
 #include <list>
 #include <memory>
-#include <mutex>
 
 #include <grpc++/completion_queue.h>
 #include <grpc++/config.h>
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index bb3c2d1405f..0fe4b4d8e30 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -33,8 +33,6 @@
 
 #include <grpc++/server_context.h>
 
-#include <mutex>
-
 #include <grpc++/impl/call.h>
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
diff --git a/src/cpp/server/thread_pool.h b/src/cpp/server/thread_pool.h
index 41e2009ff16..c773cdb629a 100644
--- a/src/cpp/server/thread_pool.h
+++ b/src/cpp/server/thread_pool.h
@@ -37,9 +37,6 @@
 #include <grpc++/config.h>
 #include <grpc++/thread_pool_interface.h>
 
-#include <condition_variable>
-#include <thread>
-#include <mutex>
 #include <queue>
 #include <vector>