diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index bddb4f62aa86ef5eccaecc2dd0f0ae1d74569c6b..3ecfad98af6450437d71f11efb61b1d82fc3d591 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 bb3c2d1405fb273210f8e909ae3037a51fd75882..0fe4b4d8e301057a0642655cc4195c328572ed9d 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 41e2009ff1663d3ac76316f340caeff1f7c80d14..c773cdb629a091fc0664729f29c6033d151b2d3e 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>